Merge dev

BrandonPacewic · BrandonPacewic · commit 237268122c81 · 2025-08-21T10:13:45.000-07:00
* 'dev' of github.com:Autodesk/synthesis:
  fix: make returns consistent
  fix: make the test match id not overlap with unit tests
  feat: update assetpack
  feat: load match mode configs from manifest file instead
diff --git a/fission/public/assetpack.zip b/fission/public/assetpack.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:23bfaf7899d84b00331c12bf1ada20d27d3c50856b14bb5733821b44848812ba
-size 193147860
+oid sha256:ea7be96ce500ebef474d55314ad0e547dac7015763664574978417016d64a6f6
+size 193148563
diff --git a/fission/src/main.tsx b/fission/src/main.tsx
@@ -4,5 +4,4 @@ import "./index.css"
 import APS from "./aps/APS"
 
 window.convertAuthToken = code => APS.convertAuthToken(code)
-
 ReactDOM.createRoot(document.getElementById("root")!).render(<Synthesis />)
diff --git a/fission/src/systems/match_mode/DefaultMatchModeConfigs.ts b/fission/src/systems/match_mode/DefaultMatchModeConfigs.ts
@@ -1,70 +1,44 @@
 import type { MatchModeConfig } from "@/ui/panels/configuring/MatchModeConfigPanel"
-import { convertFeetToMeters } from "@/util/UnitConversions"
+import { API_URL } from "@/util/Consts.ts"
+
+type ManifestMatchModeConfig = Omit<MatchModeConfig, "id"> & { id: string }
+interface MatchConfigManifest {
+    private: Record<string, ManifestMatchModeConfig>
+    public: Record<string, ManifestMatchModeConfig>
+}
 
 /** The purpose of this class is to store any defaults related to match mode configurations. */
 class DefaultMatchModeConfigs {
-    static frcReefscape2025 = (): MatchModeConfig => {
-        return {
-            id: "FRC-Reefscape-2025",
-            name: "FRC Reefscape 2025",
-            isDefault: true,
-            autonomousTime: 15,
-            teleopTime: 135,
-            endgameTime: 20,
-            ignoreRotation: true,
-            maxHeight: Number.MAX_SAFE_INTEGER,
-            heightLimitPenalty: 0,
-            sideMaxExtension: convertFeetToMeters(1.5),
-            sideExtensionPenalty: 0,
-        }
-    }
+    private static readonly MANIFEST_LOCATION = `${API_URL}/match_configs/manifest.json`
+    private static _configs: MatchModeConfig[] = []
 
-    static frcCrescendo2024 = (): MatchModeConfig => {
-        return {
-            id: "FRC-Crescendo-2024",
-            name: "FRC Crescendo 2024",
-            isDefault: true,
-            autonomousTime: 15,
-            teleopTime: 135,
-            endgameTime: 20,
-            ignoreRotation: true,
-            maxHeight: convertFeetToMeters(4),
-            heightLimitPenalty: 2,
-            sideMaxExtension: convertFeetToMeters(1),
-            sideExtensionPenalty: 2,
-        }
+    static {
+        setTimeout(() => this.reload())
     }
-
-    static frcPowerUp2023 = (): MatchModeConfig => {
-        return {
-            id: "FRC-Power-Up-2023",
-            name: "FRC Power Up 2023",
-            isDefault: true,
-            autonomousTime: 15,
-            teleopTime: 135,
-            endgameTime: 30,
-            ignoreRotation: true,
-            maxHeight: convertFeetToMeters(6.5),
-            heightLimitPenalty: 5,
-            sideMaxExtension: convertFeetToMeters(4),
-            sideExtensionPenalty: 5,
+    static async reload() {
+        const manifest = await fetch(this.MANIFEST_LOCATION)
+        const json: MatchConfigManifest | undefined = await manifest.json().catch(e => {
+            console.error(e)
+            return undefined
+        })
+        if (json == null) {
+            console.error("Could not load match mode manifest")
+            return undefined
+        }
+        const keys: (keyof MatchConfigManifest)[] = import.meta.env.DEV
+            ? (["public", "private"] as const)
+            : (["public"] as const)
+        for (const key of keys) {
+            const configs = json[key as keyof MatchConfigManifest]
+            Object.entries(configs).forEach(([key, value]) => {
+                value.id = key
+                this._configs.push(value)
+            })
         }
     }
 
-    static matchTest = (): MatchModeConfig => {
-        return {
-            id: "Match-Test",
-            name: "Match Test",
-            isDefault: true,
-            autonomousTime: 5,
-            teleopTime: 15,
-            endgameTime: 5,
-            ignoreRotation: true,
-            maxHeight: Number.MAX_SAFE_INTEGER,
-            heightLimitPenalty: 0,
-            sideMaxExtension: Number.MAX_SAFE_INTEGER,
-            sideExtensionPenalty: 0,
-        }
+    public static get configs(): MatchModeConfig[] {
+        return this._configs
     }
 
     static fallbackValues = (): MatchModeConfig => {
@@ -76,22 +50,12 @@ class DefaultMatchModeConfigs {
             teleopTime: 135,
             endgameTime: 20,
             ignoreRotation: true,
-            maxHeight: Number.MAX_SAFE_INTEGER,
+            maxHeight: -1,
             heightLimitPenalty: 2,
-            sideMaxExtension: Number.MAX_SAFE_INTEGER,
+            sideMaxExtension: -1,
             sideExtensionPenalty: 2,
         }
     }
-
-    /** @returns {MatchModeConfig[]} New copies of the default match mode configs without reference to any others. */
-    public static get defaultMatchModeConfigCopies(): MatchModeConfig[] {
-        return [
-            DefaultMatchModeConfigs.frcReefscape2025(),
-            DefaultMatchModeConfigs.frcCrescendo2024(),
-            DefaultMatchModeConfigs.frcPowerUp2023(),
-            DefaultMatchModeConfigs.matchTest(),
-        ]
-    }
 }
 
 export default DefaultMatchModeConfigs
diff --git a/fission/src/systems/match_mode/RobotDimensionTracker.ts b/fission/src/systems/match_mode/RobotDimensionTracker.ts
@@ -34,7 +34,7 @@ class RobotDimensionTracker {
         World.sceneRenderer.mirabufSceneObjects.getRobots().forEach(robot => {
             const dimensions = this._ignoreRotation ? robot.getDimensionsWithoutRotation() : robot.getDimensions()
 
-            if (dimensions.height > this._maxHeight + BUFFER_HEIGHT) {
+            if (this._maxHeight !== -1 && dimensions.height > this._maxHeight + BUFFER_HEIGHT) {
                 if (!(this._robotLastFramePenalty.get(robot.id) ?? false)) {
                     SimulationSystem.robotPenalty(robot, this._heightLimitPenalty, "Height Expansion Limit")
                 }
@@ -44,8 +44,9 @@ class RobotDimensionTracker {
 
             const startingRobotSize = this._robotSize.get(robot.id) ?? { width: Infinity, depth: Infinity }
             if (
-                dimensions.width > startingRobotSize.width + this._sideMaxExtension + SIDE_BUFFER ||
-                dimensions.depth > startingRobotSize.depth + this._sideMaxExtension + SIDE_BUFFER
+                this._sideMaxExtension !== -1 &&
+                (dimensions.width > startingRobotSize.width + this._sideMaxExtension + SIDE_BUFFER ||
+                    dimensions.depth > startingRobotSize.depth + this._sideMaxExtension + SIDE_BUFFER)
             ) {
                 if (!(this._robotLastFramePenalty.get(robot.id) ?? false)) {
                     SimulationSystem.robotPenalty(robot, this._sideExtensionPenalty, "Side Expansion Limit")
diff --git a/fission/src/ui/panels/configuring/CreateNewMatchModeConfigPanel.tsx b/fission/src/ui/panels/configuring/CreateNewMatchModeConfigPanel.tsx
@@ -91,7 +91,7 @@ const FIELD_CONFIGS: Record<string, FieldConfig> = {
         type: "checkbox",
     },
     maxHeight: {
-        defaultValue: fallbackConfig.maxHeight === Number.MAX_SAFE_INTEGER ? 1.2 : fallbackConfig.maxHeight,
+        defaultValue: fallbackConfig.maxHeight === -1 ? 1.2 : fallbackConfig.maxHeight,
         rules: [VALIDATION_RULES.nonNegativeNumber("Max height must be a non-negative number")],
         type: "decimal",
     },
@@ -106,8 +106,7 @@ const FIELD_CONFIGS: Record<string, FieldConfig> = {
         type: "checkbox",
     },
     sideMaxExtension: {
-        defaultValue:
-            fallbackConfig.sideMaxExtension === Number.MAX_SAFE_INTEGER ? 0.5 : fallbackConfig.sideMaxExtension,
+        defaultValue: fallbackConfig.sideMaxExtension === -1 ? 0.5 : fallbackConfig.sideMaxExtension,
         rules: [VALIDATION_RULES.nonNegativeNumber("Side max extension must be a non-negative number")],
         type: "decimal",
     },
@@ -260,15 +259,13 @@ const CreateNewMatchModeConfigPanel: React.FC<PanelImplProps<void, void>> = ({ p
             teleopTime: parseInt(formState.teleopTime.value as string, 10),
             endgameTime: parseInt(formState.endgameTime.value as string, 10),
             ignoreRotation: formState.ignoreRotation.value as boolean,
-            maxHeight: formState.enableHeightPenalty.value
-                ? parseFloat(formState.maxHeight.value as string)
-                : Number.MAX_SAFE_INTEGER,
+            maxHeight: formState.enableHeightPenalty.value ? parseFloat(formState.maxHeight.value as string) : -1,
             heightLimitPenalty: formState.enableHeightPenalty.value
                 ? parseFloat(formState.heightLimitPenalty.value as string)
                 : 0,
             sideMaxExtension: formState.enableSideExtensionPenalty.value
                 ? parseFloat(formState.sideMaxExtension.value as string)
-                : Number.MAX_SAFE_INTEGER,
+                : -1,
             sideExtensionPenalty: formState.enableSideExtensionPenalty.value
                 ? parseFloat(formState.sideExtensionPenalty.value as string)
                 : 0,
diff --git a/fission/src/ui/panels/configuring/MatchModeConfigPanel.tsx b/fission/src/ui/panels/configuring/MatchModeConfigPanel.tsx
@@ -22,54 +22,54 @@ import CreateNewMatchModeConfigPanel from "./CreateNewMatchModeConfigPanel"
  */
 export interface MatchModeConfig {
     /** Unique identifier for this match mode configuration */
-    id: string
+    readonly id: string
 
     /** Human-readable name for this match mode configuration */
-    name: string
+    readonly name: string
 
     /** Whether this is a built-in default configuration (cannot be deleted) */
-    isDefault: boolean
+    readonly isDefault: boolean
 
     /** Duration of autonomous period in seconds (default: 15) */
-    autonomousTime: number
+    readonly autonomousTime: number
 
     /** Duration of teleoperated period in seconds (default: 135) */
-    teleopTime: number
+    readonly teleopTime: number
 
     /** Duration of endgame period in seconds (default: 20) */
-    endgameTime: number
+    readonly endgameTime: number
 
     /**
      * Whether to ignore robot rotation when calculating height violations.
      * If true, the height limit will be calculated relative to the base of the robot, rather than the base of the field
      * (default: true)
      */
-    ignoreRotation: boolean
+    readonly ignoreRotation: boolean
 
     /**
      * Maximum allowed robot height in meters (stored internally).
      * Set to Infinity for no height limit. (default: Infinity)
      */
-    maxHeight: number
+    readonly maxHeight: number
 
     /**
      * Points to penalize for height limit violations (default: 2).
      * Applied each time a robot exceeds maxHeight after cooldown period.
      */
-    heightLimitPenalty: number
+    readonly heightLimitPenalty: number
 
     /**
      * Maximum allowed robot side extension in meters
      * User input is in feet but converted to meters during config processing.
      * Set to Infinity for no side extension limit. (default: Infinity)
      */
-    sideMaxExtension: number
+    readonly sideMaxExtension: number
 
     /**
      * Points to penalize for side extension violations (default: 2).
      * Applied each time a robot exceeds sideMaxExtension after cooldown period.
      */
-    sideExtensionPenalty: number
+    readonly sideExtensionPenalty: number
 }
 
 const props: Readonly<{ id: keyof MatchModeConfig; expectedType: string; required: boolean }>[] = [
@@ -179,7 +179,8 @@ const MatchModeConfigPanel: React.FC<PanelImplProps<void, void>> = ({ panel }) =
     useEffect(() => {
         const loadConfigs = () => {
             try {
-                const defaultConfigs = DefaultMatchModeConfigs.defaultMatchModeConfigCopies
+                const defaultConfigs = DefaultMatchModeConfigs.configs
+                console.log(defaultConfigs)
                 const localConfigs = JSON.parse(window.localStorage.getItem("match-mode-configs") || "[]")
 
                 const combinedConfigs = [...defaultConfigs, ...localConfigs]
diff --git a/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx b/fission/src/ui/panels/mirabuf/ImportMirabufPanel.tsx
@@ -38,6 +38,7 @@ import {
 import { useStateContext } from "@/ui/helpers/StateProviderHelpers"
 import { CloseType, useUIContext } from "@/ui/helpers/UIProviderHelpers"
 import ImportLocalMirabufModal from "@/ui/modals/mirabuf/ImportLocalMirabufModal"
+import { API_URL } from "@/util/Consts.ts"
 import type TaskStatus from "@/util/TaskStatus"
 import type { ConfigurationType } from "../configuring/assembly-config/ConfigTypes"
 import InitialConfigPanel from "../configuring/initial-config/InitialConfigPanel"
@@ -192,18 +193,14 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
     useEffect(() => {
         // To remove the prettier warning
         const x = async () => {
-            // Detect if we're running in electron and use direct remote URL
-            const isElectron = window.electronAPI != null
-            const baseUrl = isElectron ? "https://synthesis.autodesk.com" : ""
-
-            fetch(`${baseUrl}/api/mira/manifest.json`)
+            fetch(`${API_URL}/mira/manifest.json`)
                 .then(x => x.json())
                 .then(x => {
                     const map = MirabufCachingService.getCacheMap(MiraType.ROBOT)
                     const robots: MirabufRemoteInfo[] = []
                     for (const src of x["robots"]) {
                         if (typeof src == "string") {
-                            const str = `${baseUrl}/api/mira/robots/${src}`
+                            const str = `${API_URL}/mira/robots/${src}`
                             if (!map[str]) robots.push({ displayName: src, src: str })
                         } else {
                             if (!map[src.src]) robots.push({ displayName: src.displayName, src: src.src })
@@ -212,7 +209,7 @@ const ImportMirabufPanel: React.FC<PanelImplProps<void, ImportMirabufPanelCustom
                     const fields: MirabufRemoteInfo[] = []
                     for (const src of x["fields"]) {
                         if (typeof src == "string") {
-                            const str = `${baseUrl}/api/mira/fields/${src}`
+                            const str = `${API_URL}/mira/fields/${src}`
                             if (!map[str]) fields.push({ displayName: src, src: str })
                         } else {
                             if (!map[src.src]) fields.push({ displayName: src.displayName, src: src.src })
diff --git a/fission/src/util/Consts.ts b/fission/src/util/Consts.ts
@@ -0,0 +1,3 @@
+const isElectron = window.electronAPI != null
+const baseUrl = isElectron ? "https://synthesis.autodesk.com" : ""
+export const API_URL = `${baseUrl}/api`
diff --git a/fission/vite.config.ts b/fission/vite.config.ts
@@ -2,9 +2,9 @@ import fs from "node:fs/promises"
 import basicSsl from "@vitejs/plugin-basic-ssl"
 import react from "@vitejs/plugin-react-swc"
 import * as path from "path"
-import { loadEnv, type ProxyOptions } from "vite"
+import {loadEnv, type ProxyOptions} from "vite"
 import glsl from "vite-plugin-glsl"
-import { defineConfig } from "vitest/config"
+import {defineConfig} from "vitest/config"
 
 const basePath = "/fission/"
 const serverPort = 3000
@@ -58,14 +58,15 @@ export default defineConfig(async ({ mode }) => {
     console.log(`Using ${useLocalAssets ? "local" : "remote"} mirabuf assets`)
 
     const proxies: Record<string, ProxyOptions> = {}
-    proxies["/api/mira"] = useLocalAssets
+    const assetProxy:ProxyOptions = useLocalAssets
         ? {
               target: `http://localhost:${mode === "test" ? 3001 : serverPort}`,
               changeOrigin: true,
               secure: false,
               rewrite: path =>
                   path
-                      .replace(/^\/api\/mira/, "/Downloadables/Mira")
+                      .replace(/^\/api/, "/Downloadables")
+                      .replace("mira", "Mira")
                       .replace("robots", "Robots")
                       .replace("fields", "Fields"),
           }
@@ -74,6 +75,8 @@ export default defineConfig(async ({ mode }) => {
               changeOrigin: true,
               secure: true,
           }
+    proxies["/api/mira"] = assetProxy
+    proxies["/api/match_configs"] = assetProxy
     proxies["/api/aps"] = useLocalAPS
         ? {
               target: `http://localhost:${dockerServerPort}/`,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+const isElectron = window.electronAPI != null`
	`2`	`+const baseUrl = isElectron ? "https://synthesis.autodesk.com" : ""`
	`3`	+export const API_URL = `${baseUrl}/api`