fix path formatting issue

microsoft · Oct 11, 2024 · 2d0e14a · 2d0e14a
1 parent fe96733
commit 2d0e14a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pxtsim/simdriver.ts b/pxtsim/simdriver.ts
@@ -160,9 +160,13 @@ namespace pxsim {
                 } else {
                     const simUrl = this.getSimUrl();
                     // Ensure we preserve upload target path (/app/<sha>---simulator)
-                    const simPath = simUrl.pathname.replace(/---?.*/, "");
-                    // Construct the path. The "-" element delineates the extension key from the resource name.
-                    const simxPath = [simPath, "simx", key, "-", simx.index].join("/");
+                    let simPath = simUrl.pathname.replace(/---?.*/, "");
+                    // Remove leading and trailing slashes
+                    simPath = simPath.replace(/^\/+|\/+$/, "");
+                    // Construct the path. The "-" element delineates the extension key from the resource name
+                    let simxPath = [simPath, "simx", key, "-", simx.index].join("/");
+                    // Append a leading slash to `simxPath` unless it already has one (if `simPath` was an empty string then it will already have a leading slash)
+                    simxPath = simxPath.startsWith("/") ? simxPath : `/${simxPath}`;
                     simx.url = new URL(simxPath, simUrl.origin).toString();
                 }