Merge dev

* dev:
  fix(format): remaining format issues
  fix: added missing imports
  fix: update bun lockfile
  fix: remove redundant test
  fix: remove git dependencies
  fix: refactoring issues
  fix: remove test artifacts
  fix: cleanup and format analytics tests
  feat: restructure analytics tests
  fix: firefox doesn't do analytics
  feat: add analytics testing
  feat: improve analytics tracking
  Fixed Promise Ordering: Download in parallel and then spawn in sequence.
  Order Promises
  Use 2023 Field
  Remove Unused Imports
  Format Fix
  Fix and New Access Strategy
  Create Load Default Option for Field and Robot with Gizmo and Assembly Panel attatched

Author: BrandonPacewic

fission/.gitignore

@@ -28,3 +28,6 @@ dist-ssr
 *.sw?
 
 yarn.lock
+
+test-results
+src/test/**/__screenshots__

fission/biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.1.2/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.1.3/schema.json",
   "vcs": { "enabled": false, "clientKind": "git", "useIgnoreFile": false },
   "files": { "ignoreUnknown": false },
   "formatter": {

fission/bun.lock

@@ -37,6 +37,7 @@
     "colord": "^2.9.3",
     "framer-motion": "^10.18.0",
     "lygia": "^1.3.3",
+    "msw": "^2.10.4",
     "notistack": "^3.0.2",
     "playwright": "^1.54.2",
     "postprocessing": "^6.37.6",

fission/package.json

@@ -7,5 +7,6 @@ declare module "@haensl/google-analytics" {
     function event(e: GaEvent)
     function exception(e: GaException)
     function setUserId({ id }: { id: string })
-    function setUserProperty({ name, value }: { name: string; value: string })
+    function setUserProperty({ name, value }: { name: string; value: unknown })
+    function install()
 }

fission/src/GA.d.ts

@@ -1,4 +1,5 @@
 declare interface Window {
     convertAuthToken(code: string): void
-    gtag: () => void
+    gtag?: (command: "config" | "set" | "get" | "event" | "consent", ...args: unknown[]) => void
+    dataLayer?: unknown[][]
 }

fission/src/Window.d.ts

@@ -143,6 +143,7 @@ class MirabufCachingService {
             const miraBuff = await resp.arrayBuffer()
 
             World.analyticsSystem?.event("Remote Download", {
+                assemblyName: name ?? fetchLocation,
                 type: miraType === MiraType.ROBOT ? "robot" : "field",
                 fileSize: miraBuff.byteLength,
             })
@@ -283,6 +284,13 @@ class MirabufCachingService {
             }
         }
 
+        World.analyticsSystem?.event("Local Upload", {
+            assemblyName: displayName,
+            fileSize: buffer.byteLength,
+            key,
+            type: miraType == MiraType.ROBOT ? "robot" : "field",
+        })
+
         if (!target) {
             const cacheInfo = await MirabufCachingService.storeInCache(key, buffer, miraType, displayName)
             if (cacheInfo) {
@@ -517,7 +525,7 @@ class MirabufCachingService {
             window.localStorage.setItem(miraType == MiraType.ROBOT ? robotsDirName : fieldsDirName, JSON.stringify(map))
 
             World.analyticsSystem?.event("Cache Store", {
-                name: name ?? "-",
+                assemblyName: name ?? "-",
                 key: key,
                 type: miraType == MiraType.ROBOT ? "robot" : "field",
                 fileSize: miraBuff.byteLength,

fission/src/mirabuf/MirabufLoader.ts

@@ -8,6 +8,8 @@ const SAMPLE_INTERVAL = 60000 // 1 minute
 const BETA_CODE_COOKIE_REGEX = /access_code=.*(;|$)/
 const MOBILE_USER_AGENT_REGEX = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i
 
+declare const GIT_COMMIT: string
+
 export interface AccumTimes {
     frames: number
     physicsTime: number
@@ -16,6 +18,42 @@ export interface AccumTimes {
     simulationTime: number
     totalTime: number
 }
+type MiraEvent = {
+    key?: string
+    type?: "robot" | "field"
+    assemblyName?: string
+    /**
+     * Size (in bytes) of the mirabuf file
+     */
+    fileSize?: number
+}
+export interface AnalyticsEvents {
+    "Performance Sample": {
+        frames: number
+        avgTotal: number
+        avgPhysics: number
+        avgScene: number
+        avgInput: number
+        avgSimulation: number
+    }
+    "APS Calls per Minute": unknown
+    "APS Login": unknown
+    "APS Download": MiraEvent
+
+    "Cache Get": MiraEvent
+    "Cache Store": MiraEvent
+    "Cache Remove": MiraEvent
+
+    "Remote Download": MiraEvent
+    "Local Upload": MiraEvent
+
+    "Devtool Cache Persist": MiraEvent
+
+    "Scheme Applied": {
+        isCustomized: boolean
+        schemeName: string
+    }
+}
 
 class AnalyticsSystem extends WorldSystem {
     private _lastSampleTime = Date.now()
@@ -38,7 +76,7 @@ class AnalyticsSystem extends WorldSystem {
         this.sendMetaData()
     }
 
-    public event(name: string, params?: { [key: string]: string | number }) {
+    public event<K extends keyof AnalyticsEvents>(name: K, params?: AnalyticsEvents[K]) {
         event({ name: name, params: params ?? {} })
     }
 
@@ -50,7 +88,11 @@ class AnalyticsSystem extends WorldSystem {
         setUserId({ id: id })
     }
 
-    public setUserProperty(name: string, value: string) {
+    public setUserProperty(name: string, value: unknown) {
+        if (name.includes(" ")) {
+            console.warn("GA user property names must not contain spaces")
+            return
+        }
         setUserProperty({ name: name, value: value })
     }
 
@@ -62,9 +104,8 @@ class AnalyticsSystem extends WorldSystem {
     }
 
     private sendMetaData() {
-        if (import.meta.env.DEV) {
-            this.setUserProperty("Internal Traffic", "true")
-        }
+        this.setUserProperty("isInternal", import.meta.env.DEV)
+        this.setUserProperty("commit", GIT_COMMIT)
 
         if (!this._consent) {
             return
@@ -73,15 +114,9 @@ class AnalyticsSystem extends WorldSystem {
         let betaCode = document.cookie.match(BETA_CODE_COOKIE_REGEX)?.[0]
         if (betaCode) {
             betaCode = betaCode.substring(betaCode.indexOf("=") + 1, betaCode.indexOf(";"))
-
-            this.setUserProperty("Beta Code", betaCode)
-        }
-
-        if (MOBILE_USER_AGENT_REGEX.test(navigator.userAgent)) {
-            this.setUserProperty("Is Mobile", "true")
-        } else {
-            this.setUserProperty("Is Mobile", "false")
+            this.setUserProperty("betaCode", betaCode)
         }
+        this.setUserProperty("isMobile", MOBILE_USER_AGENT_REGEX.test(navigator.userAgent))
     }
 
     private currentSampleInterval() {

fission/src/systems/analytics/AnalyticsSystem.ts

@@ -131,7 +131,7 @@ class InputSchemeManager {
                 result[scheme.schemeName] ??= {
                     scheme,
                     status: InputSchemeUseType.CONFLICT,
-                    conflicts_with_names: [...new Set(conflictingSchemes)].join(", "),
+                    conflictingSchemeNames: [...new Set(conflictingSchemes)].join(", "),
                 }
             } else {
                 result[scheme.schemeName] = {

fission/src/systems/input/InputSchemeManager.ts

@@ -1,6 +1,7 @@
 import type { KeyCode } from "@/systems/input/KeyboardTypes.ts"
 import { TouchControlsAxes } from "@/ui/components/TouchControls"
 import Joystick from "../scene/Joystick"
+import World from "../World"
 import WorldSystem from "../WorldSystem"
 import type { InputName, InputScheme, ModifierState } from "./InputTypes"
 import type Input from "./inputs/Input"
@@ -26,6 +27,14 @@ class InputSystem extends WorldSystem {
     /** Maps a brain index to an input scheme. */
     public static brainIndexSchemeMap: Map<number, InputScheme> = new Map()
 
+    public static setBrainIndexSchemeMapping(index: number, scheme: InputScheme) {
+        InputSystem.brainIndexSchemeMap.set(index, scheme)
+        World.analyticsSystem?.event("Scheme Applied", {
+            isCustomized: scheme.customized,
+            schemeName: scheme.schemeName,
+        })
+    }
+
     constructor() {
         super()