fix: ts configs

rutmanz · rutmanz · commit edee81d927d0 · 2025-08-19T12:00:53.000-07:00
fix: try to make unit tests work

fix: actually make unit tests work

feat: add unit tests for default assets

fix: tsconfig issues again
diff --git a/fission/manifest.d.ts b/fission/manifest.d.ts
@@ -0,0 +1 @@
+export type ManifestFileType = Record<"robots"|"private"|"fields", { filename: string, hash: string }[]>
diff --git a/fission/package.json b/fission/package.json
@@ -21,8 +21,8 @@
     "fmt:fix": "bunx --bun biome format src --write",
     "style": "bun run fmt && bun run lint",
     "style:fix": "bun run fmt:fix && bun run lint:fix",
-    "assetpack": "git lfs pull && tar -xf public/assetpack.zip -C public/",
-    "assetpack:update": "cd public && zip -FS -r assetpack.zip Downloadables",
+    "assetpack": "git lfs pull && (rm -rf public/Downloadables;tar -xf public/assetpack.zip -C public/)",
+    "assetpack:update": "bun update_manifest.ts && cd public && zip -FS -r assetpack.zip Downloadables",
     "playwright:install": "bun x playwright install",
     "electron:start": "electron-forge start",
     "electron:package": "electron-forge package",
diff --git a/fission/src/mirabuf/DefaultAssetLoader.ts b/fission/src/mirabuf/DefaultAssetLoader.ts
@@ -1,16 +1,19 @@
 import { type MirabufCacheInfo, MiraType } from "@/mirabuf/MirabufLoader.ts"
-import type { ManifestFileType } from "../../update_manifest.ts"
+import type { ManifestFileType } from "../../manifest.d.ts"
 
 export type DefaultAssetInfo = Required<Pick<MirabufCacheInfo, "hash" | "remotePath" | "miraType" | "name">>
 
 class DefaultAssetLoader {
     private static _assets: DefaultAssetInfo[] = []
-
+    private static _hasLoaded = false
     static {
-        setTimeout(() => this.refresh(), 1000)
+        setTimeout(() => {
+            if (!this._hasLoaded) this.refresh().catch(console.error)
+        }, 1000)
     }
 
-    private static async refresh() {
+    public static async refresh() {
+        this._hasLoaded = true
         this._assets = []
 
         const isElectron = window.electronAPI != null
diff --git a/fission/src/mirabuf/MirabufLoader.ts b/fission/src/mirabuf/MirabufLoader.ts
@@ -222,8 +222,7 @@ class MirabufCachingService {
 
             if (expectedHash != null && cached?.hash != null && cached?.hash != expectedHash) {
                 globalAddToast("warning", "Hash Mismatch", `Try downloading again`)
-                console.log(expectedHash, cached?.hash)
-                console.log(expectedHash == cached?.hash)
+                console.warn("mismatched hashes", expectedHash, cached?.hash)
                 // await this.remove(cached.hash)
             }
 
diff --git a/fission/src/test/bootstrap/AppMount.test.tsx b/fission/src/test/bootstrap/AppMount.test.tsx
@@ -53,6 +53,8 @@ describe("React Mounting", async () => {
     test("App fully mounts through main.tsx", async ({ annotate, skip }) => {
         skip(server.browser == "firefox", "WebGL bug in Github Actions on Firefox")
 
+        // biome-ignore lint/nursery/noTsIgnore: ts-expect-error doesn't work here for some reason
+        // @ts-ignore funky dynamic import
         await import("@/main.tsx")
 
         expect(window.convertAuthToken).toBeDefined()
diff --git a/fission/src/test/mirabuf/DefaultAssets.test.ts b/fission/src/test/mirabuf/DefaultAssets.test.ts
@@ -0,0 +1,40 @@
+import { assert, beforeAll, beforeEach, describe, expect, test, vi } from "vitest"
+import DefaultAssetLoader from "@/mirabuf/DefaultAssetLoader.ts"
+import MirabufLoader from "@/mirabuf/MirabufLoader.ts"
+import MirabufCachingService, { MiraType } from "@/mirabuf/MirabufLoader.ts"
+
+describe("Default Asset Tests", () => {
+    beforeAll(async () => {
+        await DefaultAssetLoader.refresh()
+        vi.spyOn(console, "log").mockImplementation(() => {})
+    })
+    beforeEach(async () => {
+        await MirabufLoader.removeAll()
+    })
+
+    test("Manifest loaded", () => {
+        expect(DefaultAssetLoader.fields.length).toBeGreaterThan(1)
+        expect(DefaultAssetLoader.robots.length).toBeGreaterThan(1)
+    })
+
+    test("Manifest hashes match assets (fields)", async () => {
+        for (const asset of DefaultAssetLoader.fields) {
+            const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
+            assert.exists(info)
+            expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
+            expect(asset.miraType).toBe(MiraType.FIELD)
+            await MirabufCachingService.remove(info.hash)
+        }
+        expect(MirabufCachingService.getAll()).toHaveLength(0)
+    })
+    test("Manifest hashes match assets (robots)", async () => {
+        for (const asset of DefaultAssetLoader.robots) {
+            const info = await MirabufCachingService.cacheRemote(asset.remotePath, asset.miraType)
+            assert.exists(info)
+            expect(asset.hash, `Hashes for "${info.name}" do not match`).toBe(info.hash)
+            expect(asset.miraType).toBe(MiraType.ROBOT)
+            await MirabufCachingService.remove(info.hash)
+        }
+        expect(MirabufCachingService.getAll()).toHaveLength(0)
+    })
+})
diff --git a/fission/src/test/mirabuf/FieldMiraEditor.test.ts b/fission/src/test/mirabuf/FieldMiraEditor.test.ts
@@ -1,13 +1,13 @@
 import { assert, describe, expect, test, vi } from "vitest"
 import MirabufCachingService, { MiraType } from "@/mirabuf/MirabufLoader.ts"
 import { createMirabuf } from "@/mirabuf/MirabufSceneObject.ts"
+import { mirabuf } from "@/proto/mirabuf"
 import {
     type Alliance,
     defaultRobotSpawnLocation,
     type ScoringZonePreferences,
 } from "@/systems/preferences/PreferenceTypes.ts"
 import FieldMiraEditor from "../../mirabuf/FieldMiraEditor.ts"
-import { mirabuf } from "../../proto/mirabuf"
 
 function mockParts(): mirabuf.IParts {
     return { userData: { data: {} } }
@@ -148,17 +148,18 @@ describe("Devtool Scoring Zones Caching Tests", () => {
 
 describe("Asset tests", () => {
     test("FRC Field 2018_v13 has spawn locations", async () => {
-        const file = await MirabufCachingService.cacheRemote("/api/mira/fields/FRC Field 2018_v13.mira", MiraType.FIELD)
-            .then(x => MirabufCachingService.get(x!.hash))
-            .catch(e => {
-                console.error("Could not get mirabuf file", e)
-                return undefined
-            })
+        const cacheInfo = await MirabufCachingService.cacheRemote(
+            "/api/mira/fields/FRC Field 2018_v13.mira",
+            MiraType.FIELD
+        )
+        assert.exists(cacheInfo)
+        const file = await MirabufCachingService.get(cacheInfo.hash)
         assert.exists(file)
 
         const mirabuf = await createMirabuf(file)
         assert.exists(mirabuf)
         assert.exists(mirabuf.fieldPreferences)
+        console.log(mirabuf.fieldPreferences)
         expect(mirabuf.fieldPreferences.spawnLocations.hasConfiguredLocations).toBe(true)
         expect(mirabuf.fieldPreferences.spawnLocations.red["1"]).not.toStrictEqual(defaultRobotSpawnLocation())
         expect(mirabuf.fieldPreferences.spawnLocations.default).not.toStrictEqual(defaultRobotSpawnLocation())
diff --git a/fission/src/test/mirabuf/MirabufLoader.test.ts b/fission/src/test/mirabuf/MirabufLoader.test.ts
@@ -146,6 +146,7 @@ describe("MirabufLoader", () => {
             expect(info).toBeDefined()
             expect(info?.miraType).toBe(MiraType.FIELD)
             expect(info?.name).toBe("FRC Field 2023 v7")
+            expect(info?.hash).toBe("96b0d75cf3fde2c90a9b63e2497170e37b3e40")
             const assembly = await MirabufLoader.get(info!.hash)
             expect(assembly).toBeDefined()
             expect(assembly?.info?.name).toBe(info!.name)
diff --git a/fission/src/ui/modals/MainMenuModal.tsx b/fission/src/ui/modals/MainMenuModal.tsx
@@ -46,10 +46,10 @@ const MainMenuModal: React.FC<ModalImplProps<void, MainMenuCustomProps>> = ({ mo
                     Promise.all([
                         MirabufCachingService.cacheRemote("/api/mira/fields/FRC Field 2023_v7.mira", MiraType.FIELD),
                         MirabufCachingService.cacheRemote("/api/mira/robots/Dozer_v9.mira", MiraType.ROBOT),
-                    ]).then(([cachedField, cachedRobot]) => {
+                    ]).then(async ([cachedField, cachedRobot]) => {
                         if (cachedField && cachedRobot) {
-                            spawnCachedMira(cachedField, MiraType.FIELD)
-                            spawnCachedMira(cachedRobot, MiraType.ROBOT)
+                            await spawnCachedMira(cachedField)
+                            await spawnCachedMira(cachedRobot)
                         }
                     })
                 }}
diff --git a/fission/src/util/TypeConversions.ts b/fission/src/util/TypeConversions.ts
@@ -1,7 +1,7 @@
 import type Jolt from "@azaleacolburn/jolt-physics"
 import type { RgbaColor } from "react-colorful"
 import * as THREE from "three"
-import type { mirabuf } from "../proto/mirabuf"
+import type { mirabuf } from "@/proto/mirabuf"
 import JOLT from "./loading/JoltSyncLoader"
 
 export function convertThreeToJoltQuat(a: THREE.Euler | THREE.Quaternion | undefined) {
diff --git a/fission/src/util/Utility.ts b/fission/src/util/Utility.ts
@@ -27,8 +27,8 @@ export function findListDifference<T>(previousList: T[], currentList: T[]): { ad
     return { added, removed }
 }
 
-export async function hashBuffer(buffer: ArrayBuffer, allowDateFallback: boolean = true): Promise<string> {
-    if (crypto?.subtle?.digest == null && allowDateFallback) {
+export async function hashBuffer(buffer: ArrayBuffer): Promise<string> {
+    if (crypto?.subtle?.digest == null) {
         console.warn("Crypto not available, using timestamp as key")
         return Date.now().toString(16)
     }
diff --git a/fission/tsconfig.json b/fission/tsconfig.json
@@ -40,12 +40,14 @@
         "noUnusedLocals": true,
         "noUnusedParameters": true,
         "noFallthroughCasesInSwitch": true,
+        "composite": true,
         "types": [
             "vite-plugin-glsl/ext"
-        ],
+        ]
     },
     "include": [
-        "src"
+        "src/**/*.ts",
+        "src/**/*.tsx"
     ],
     "references": [
         {
diff --git a/fission/tsconfig.node.json b/fission/tsconfig.node.json
@@ -6,8 +6,7 @@
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "allowImportingTsExtensions": true,
     "target": "ESNext"
   },
-  "include": ["vite.config.ts", "update_manifest.ts", "src/util/Utility.ts"]
+  "include": ["vite.config.ts", "update_manifest.ts"]
 }
diff --git a/fission/update_manifest.ts b/fission/update_manifest.ts
@@ -1,13 +1,9 @@
+import crypto from "node:crypto"
 import path from "node:path";
 import * as fs from "fs/promises"
-import {hashBuffer} from "./src/util/Utility.ts";
-
+import type {ManifestFileType} from "./manifest";
 
 const basepath = "public/Downloadables/Mira"
-const keys = ["fields", "robots", "private"] as const
-
-export type ManifestFileType = Record<typeof keys[number], { filename: string, hash: string }[]>
-
 const map: ManifestFileType = {fields: [], private: [], robots: []}
 
 const dirs = Object.keys(map) as (keyof typeof map)[]
@@ -27,4 +23,11 @@ async function main() {
     await fs.writeFile(path.join(basepath, "manifest.json"), JSON.stringify(map))
 }
 
-main().catch(console.error)
+main().catch(console.error)
+
+export async function hashBuffer(buffer:ArrayBuffer) {
+    const hashBuffer = await crypto.subtle.digest("SHA-1", buffer)
+    return Array.from(new Uint8Array(hashBuffer))
+        .map(x => x.toString(16))
+        .join("")
+}
diff --git a/fission/vite.config.ts b/fission/vite.config.ts
@@ -42,7 +42,7 @@ if (useSsl) {
 }
 
 const localAssetsExist = await fs
-    .access("./public/Downloadables/Mira", fs.constants.R_OK)
+    .access("./public/Downloadables/mira", fs.constants.R_OK)
     .then(() => true)
     .catch(() => false)
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export type ManifestFileType = Record<"robots"\|"private"\|"fields", { filename: string, hash: string }[]>`
Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,7 @@ class MirabufCachingService {`
`222`	`222`
`223`	`223`	`if (expectedHash != null && cached?.hash != null && cached?.hash != expectedHash) {`
`224`	`224`	globalAddToast("warning", "Hash Mismatch", `Try downloading again`)
`225`		`- console.log(expectedHash, cached?.hash)`
`226`		`- console.log(expectedHash == cached?.hash)`
	`225`	`+ console.warn("mismatched hashes", expectedHash, cached?.hash)`
`227`	`226`	`// await this.remove(cached.hash)`
`228`	`227`	`}`
`229`	`228`