feat: enable parallel builds

Author: SkySails

.cargo/config.toml

@@ -1,2 +1,3 @@
 [build]
 target = "wasm32-wasip1"
+target-dir = "targets/2020"

.gitignore

@@ -11,7 +11,8 @@ example/aircraft/PackageSources/SimObjects/Airplanes/Navigraph_Navigation_Data_I
 # Rust
 # will have compiled files and executables
 debug/
-target/
+targets
+
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
@@ -24,4 +25,5 @@ target/
 *.local
 .DS_Store
 
-dist
+dist
+

package.json

@@ -8,8 +8,8 @@
     "lint": "bun run --filter \"*\" lint",
     "typecheck": "bun run --filter \"*\" typecheck",
     "build:wasm": "bun ./scripts/cargo-msfs.ts",
-    "build:wasm:2020": "bun ./scripts/cargo-msfs.ts --version msfs2020",
-    "build:wasm:2024": "bun ./scripts/cargo-msfs.ts --version msfs2024",
+    "build:wasm:2020": "bun ./scripts/cargo-msfs.ts --version 2020",
+    "build:wasm:2024": "bun ./scripts/cargo-msfs.ts --version 2024",
     "package": "bun run build:wasm && bestzip wasm.zip dist/wasm/*"
   },
   "devDependencies": {
@@ -26,4 +26,4 @@
   "peerDependencies": {
     "typescript": "^5.0.0"
   }
-}
+}

scripts/cargo-msfs.ts

@@ -38,7 +38,7 @@ function findWorkspaceRoot() {
 }
 
 // Determine which version(s) to build based on command line argument --version
-const allowedVersions = ["msfs2020", "msfs2024"];
+const allowedVersions = ["2020", "2024"];
 
 const { values } = parseArgs({
   args: Bun.argv,
@@ -91,20 +91,28 @@ if (existsSync(outDir)) rmdirSync(outDir, { recursive: true });
 const relativeWorkdDir = process.cwd().replace(workspaceRoot, "").replaceAll("\\", "/");
 
 // Build the selected versions
-for (const version of versionsToBuild) {
-  console.info(`[*] Building for ${version}`);
-
-  // Create the subfolder
-  const simDir = join(outDir, version);
-  const relativeSimDir = simDir.replace(workspaceRoot, "").replaceAll("\\", "/");
-  mkdirSync(simDir, { recursive: true });
-
-  // Run cargo-msfs
-  await $`docker run \
-    -v ${workspaceRoot}:/workspace \
-    -w /workspace${relativeWorkdDir} \
-    ${IMAGE_NAME} \
-    bash -c "cargo-msfs build ${version} -i ./src/wasm -o ./${relativeSimDir}/msfs_navigation_data_interface.wasm"`.catch(
-    (err: { exitCode?: number }) => process.exit(err.exitCode ?? 1),
-  );
-}
+await Promise.all(
+  versionsToBuild.map(async simVersion => {
+    console.info(`[*] Building for ${simVersion}`);
+
+    // Create the subfolder
+    const simDir = join(outDir, simVersion);
+    const relativeSimDir = simDir.replace(workspaceRoot, "").replaceAll("\\", "/");
+    mkdirSync(simDir, { recursive: true });
+
+    // Run cargo-msfs
+    await $`docker run \
+      --rm -t \
+      --name msfs-${simVersion}-wasm-builder \
+      -v ${workspaceRoot}:/workspace \
+      -w /workspace${relativeWorkdDir} \
+      -e CARGO_TARGET_DIR=/workspace/targets/${simVersion} \
+      ${IMAGE_NAME} \
+      bash -c "cargo-msfs build msfs${simVersion} -i ./src/wasm -o ./${relativeSimDir}/msfs_navigation_data_interface.wasm 1> >(sed "s/^/[${simVersion}]/") 2> >(sed "s/^/[${simVersion}]/" >&2)"`.catch(
+      (err: { exitCode?: number; stderr?: Buffer }) => {
+        console.error(`[-] Error building for ${simVersion}: ${err.exitCode} ${err.stderr?.toString()}`);
+        process.exit(1);
+      },
+    );
+  }),
+);