electrobun 0.2.0-beta.7 → 0.2.0-beta.8

package/dist/main.js

@@ -73,8 +73,14 @@ function main() {
   let appEntrypointPath;
   if (existsSync(asarPath)) {
     console.log(`[LAUNCHER] Loading app code from ASAR: ${asarPath}`);
-    const asarLibPath = join(pathToMacOS, `libasar.${suffix}`);
+    let asarLibPath;
     let asarLib;
+    if (process.platform === "win32") {
+      asarLibPath = libPath;
+      console.log(`[LAUNCHER] Using native wrapper's ASAR reader: ${asarLibPath}`);
+    } else {
+      asarLibPath = join(pathToMacOS, `libasar.${suffix}`);
+    }
     try {
       asarLib = dlopen(asarLibPath, {
         asar_open: { args: ["cstring"], returns: "ptr" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrobun",
-  "version": "0.2.0-beta.7",
+  "version": "0.2.0-beta.8",
   "description": "Build ultra fast, tiny, and cross-platform desktop apps with Typescript.",
   "license": "MIT",
   "author": "Blackboard Technologies Inc.",

package/src/cli/index.ts

@@ -1120,19 +1120,21 @@ if (commandArg === "init") {
   //     mkdirSync(destLauncherFolder, {recursive: true});
   // }
   // cpSync(zigLauncherBinarySource, zigLauncherDestination, {recursive: true, dereference: true});
-  // Copy zig launcher for all builds (dev, canary, stable)
-  const bunCliLauncherBinarySource = targetPaths.LAUNCHER_RELEASE;
-  const bunCliLauncherDestination = join(appBundleMacOSPath, "launcher") + targetBinExt;
-  const destLauncherFolder = dirname(bunCliLauncherDestination);
-  if (!existsSync(destLauncherFolder)) {
-    // console.info('creating folder: ', destFolder);
-    mkdirSync(destLauncherFolder, { recursive: true });
-  }
+  // Copy zig launcher for all builds (dev, canary, stable) - macOS only
+  if (targetOS === 'macos') {
+    const bunCliLauncherBinarySource = targetPaths.LAUNCHER_RELEASE;
+    const bunCliLauncherDestination = join(appBundleMacOSPath, "launcher") + targetBinExt;
+    const destLauncherFolder = dirname(bunCliLauncherDestination);
+    if (!existsSync(destLauncherFolder)) {
+      // console.info('creating folder: ', destFolder);
+      mkdirSync(destLauncherFolder, { recursive: true });
+    }
 
-  cpSync(bunCliLauncherBinarySource, bunCliLauncherDestination, {
-    recursive: true,
-    dereference: true,
-  });
+    cpSync(bunCliLauncherBinarySource, bunCliLauncherDestination, {
+      recursive: true,
+      dereference: true,
+    });
+  }
 
   cpSync(targetPaths.MAIN_JS, join(appBundleFolderResourcesPath, 'main.js'), { dereference: true });
 
@@ -1460,13 +1462,42 @@ if (commandArg === "init") {
 
   // Copy libasar dynamic library for ASAR support
   const libExt = targetOS === 'win' ? '.dll' : targetOS === 'macos' ? '.dylib' : '.so';
-  const asarLibSource = join(dirname(targetPaths.BSPATCH), 'libasar' + libExt);
-  if (existsSync(asarLibSource)) {
-    const asarLibDestination = join(appBundleMacOSPath, 'libasar' + libExt);
-    cpSync(asarLibSource, asarLibDestination, {
-      recursive: true,
-      dereference: true,
-    });
+
+  if (process.platform === 'win32') {
+    // On Windows, copy BOTH x64 and ARM64 DLLs so launcher can choose at runtime
+    // (x64 Bun on ARM64 Windows can't detect real CPU architecture)
+    const x64DistPath = join(ELECTROBUN_DEP_PATH, 'dist-win-x64', 'zig-asar', 'x64', 'libasar.dll');
+    const x64VendorPath = join(ELECTROBUN_DEP_PATH, 'vendors', 'zig-asar', 'x64', 'libasar.dll');
+    const arm64DistPath = join(ELECTROBUN_DEP_PATH, 'dist-win-x64', 'zig-asar', 'arm64', 'libasar.dll');
+    const arm64VendorPath = join(ELECTROBUN_DEP_PATH, 'vendors', 'zig-asar', 'arm64', 'libasar.dll');
+
+    // Copy x64 version as default libasar.dll
+    const x64Source = existsSync(x64DistPath) ? x64DistPath : x64VendorPath;
+    if (existsSync(x64Source)) {
+      cpSync(x64Source, join(appBundleMacOSPath, 'libasar.dll'), {
+        recursive: true,
+        dereference: true,
+      });
+    }
+
+    // Copy ARM64 version as libasar-arm64.dll
+    const arm64Source = existsSync(arm64DistPath) ? arm64DistPath : arm64VendorPath;
+    if (existsSync(arm64Source)) {
+      cpSync(arm64Source, join(appBundleMacOSPath, 'libasar-arm64.dll'), {
+        recursive: true,
+        dereference: true,
+      });
+    }
+  } else {
+    // macOS/Linux: single architecture
+    const asarLibSource = join(dirname(targetPaths.BSPATCH), 'libasar' + libExt);
+    if (existsSync(asarLibSource)) {
+      const asarLibDestination = join(appBundleMacOSPath, 'libasar' + libExt);
+      cpSync(asarLibSource, asarLibDestination, {
+        recursive: true,
+        dereference: true,
+      });
+    }
   }
 
   // transpile developer's bun code
@@ -1593,17 +1624,23 @@ if (commandArg === "init") {
     const asarPath = join(appBundleFolderResourcesPath, "app.asar");
     const asarUnpackedPath = join(appBundleFolderResourcesPath, "app.asar.unpacked");
 
-    // Get zig-asar CLI path - on Windows, check if we need the ARM64 version
-    let zigAsarCli = join(targetPaths.BSPATCH).replace('bspatch', 'zig-asar');
-
-    // If the derived path doesn't exist and we're on Windows, try the runtime architecture vendor path
-    if (!existsSync(zigAsarCli) && process.platform === 'win32') {
-      const runtimeArch = process.arch === 'arm64' ? 'arm64' : 'x64';
-      const vendorPath = join(ELECTROBUN_DEP_PATH, 'vendors', 'zig-asar', runtimeArch, 'zig-asar.exe');
-      if (existsSync(vendorPath)) {
-        zigAsarCli = vendorPath;
-        console.log(`Using ${runtimeArch} zig-asar from vendors`);
-      }
+    // Get zig-asar CLI path - on Windows, try x64 first (most common), fall back to arm64
+    let zigAsarCli: string;
+    if (process.platform === 'win32') {
+      // Try x64 first from dist, then vendors
+      const x64DistPath = join(ELECTROBUN_DEP_PATH, 'dist-win-x64', 'zig-asar', 'x64', 'zig-asar.exe');
+      const x64VendorPath = join(ELECTROBUN_DEP_PATH, 'vendors', 'zig-asar', 'x64', 'zig-asar.exe');
+      const arm64DistPath = join(ELECTROBUN_DEP_PATH, 'dist-win-x64', 'zig-asar', 'arm64', 'zig-asar.exe');
+      const arm64VendorPath = join(ELECTROBUN_DEP_PATH, 'vendors', 'zig-asar', 'arm64', 'zig-asar.exe');
+
+      zigAsarCli = existsSync(x64DistPath) ? x64DistPath :
+                   existsSync(x64VendorPath) ? x64VendorPath :
+                   existsSync(arm64DistPath) ? arm64DistPath :
+                   arm64VendorPath;
+
+      console.log(`Using zig-asar from: ${zigAsarCli}`);
+    } else {
+      zigAsarCli = join(targetPaths.BSPATCH).replace('bspatch', 'zig-asar');
     }
 
     const appDirPath = appBundleAppCodePath;
@@ -1638,11 +1675,25 @@ if (commandArg === "init") {
       }
 
       // Run zig-asar pack
-      const asarResult = Bun.spawnSync([zigAsarCli, ...asarArgs], {
+      let asarResult = Bun.spawnSync([zigAsarCli, ...asarArgs], {
         stdio: ["ignore", "inherit", "inherit"],
         cwd: projectRoot,
       });
 
+      // If exit code 29 on Windows (binary can't run), try ARM64 version
+      if (asarResult.exitCode === 29 && process.platform === 'win32' && zigAsarCli.includes('x64')) {
+        console.log("x64 binary failed (exit code 29), trying ARM64 version...");
+        const arm64DistPath = join(ELECTROBUN_DEP_PATH, 'dist-win-x64', 'zig-asar', 'arm64', 'zig-asar.exe');
+        const arm64VendorPath = join(ELECTROBUN_DEP_PATH, 'vendors', 'zig-asar', 'arm64', 'zig-asar.exe');
+        zigAsarCli = existsSync(arm64DistPath) ? arm64DistPath : arm64VendorPath;
+
+        console.log(`Retrying with: ${zigAsarCli}`);
+        asarResult = Bun.spawnSync([zigAsarCli, ...asarArgs], {
+          stdio: ["ignore", "inherit", "inherit"],
+          cwd: projectRoot,
+        });
+      }
+
       if (asarResult.exitCode !== 0) {
         console.error("ASAR packing failed with exit code:", asarResult.exitCode);
         if (asarResult.stderr) {