electrobun 0.1.12 → 0.1.13-beta.2

package/README.md

@@ -60,7 +60,7 @@ Ways to get involved at this early stage:
 - cmake
 - webkit2gtk and GTK development packages
 
-Un Ubuntu/Debian based distros: `sudo apt install build-essential cmake pkg-config libgtk-3-dev libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev`
+On Ubuntu/Debian based distros: `sudo apt install build-essential cmake pkg-config libgtk-3-dev libwebkit2gtk-4.1-dev libayatana-appindicator3-dev librsvg2-dev`
 
 ### First-time Setup
 

package/dist/api/bun/core/Socket.ts

@@ -85,6 +85,9 @@ const startRPCServer = () => {
           // Anything beyond the backpressure limit will be dropped
           backpressureLimit: payloadLimit * 2,
           open(ws) {
+            if (!ws?.data) {
+              return;
+            }
             const { webviewId } = ws.data;
 
             if (!socketMap[webviewId]) {

package/dist/api/bun/core/Updater.ts

@@ -206,15 +206,36 @@ const Updater = {
           `from-${currentHash}.tar`
         );
 
+        const bunBinDir = dirname(process.execPath);
+        const bspatchPath = join(bunBinDir, "bspatch");
+
         // Note: cwd should be Contents/MacOS/ where the binaries are in the amc app bundle
         try {
-          Bun.spawnSync([
-            "bspatch",
+          const patchResult = Bun.spawnSync([
+            bspatchPath,
             currentTarPath,
             tmpPatchedTarFilePath,
             patchFilePath,
           ]);
+
+          if (patchResult.exitCode !== 0 || patchResult.success === false) {
+            const stderr = new TextDecoder().decode(patchResult.stderr || new Uint8Array());
+            const stdout = new TextDecoder().decode(patchResult.stdout || new Uint8Array());
+            if (updateInfo) {
+              updateInfo.error = stderr || `bspatch failed with exit code ${patchResult.exitCode}`;
+            }
+            console.error(
+              "bspatch failed",
+              {
+                exitCode: patchResult.exitCode,
+                stdout,
+                stderr,
+              },
+            );
+            break;
+          }
         } catch (error) {
+          console.error("bspatch threw", error);
           break;
         }
 
@@ -590,7 +611,15 @@ start "" launcher.exe
         // Cross-platform app launch
         switch (currentOS) {
           case 'macos':
-            await Bun.spawn(["open", runningAppBundlePath]);
+            // Use a detached shell so relaunch survives after killApp terminates the current process
+            await Bun.spawn(
+              [
+                "sh",
+                "-c",
+                `open "${runningAppBundlePath}" &`,
+              ],
+              { detached: true }
+            );
             break;
           case 'win':
             // On Windows, launch the run.bat file which handles versioning
@@ -606,22 +635,16 @@ start "" launcher.exe
             Bun.spawn(["sh", "-c", `${linuxLauncher} &`], { detached: true});
             break;
         }
-        // Use native killApp to properly clean up all resources on Windows/Linux
-        // macOS handles process.exit correctly
-        if (currentOS === 'linux' || currentOS === 'win') {
-          try {
-            native.symbols.killApp();
-            // Still call process.exit as a fallback
-            process.exit(0);
-          } catch (e) {
-            // Fallback if native binding fails
-            console.error('Failed to call native killApp:', e);
-            process.exit(0);
-          }
-        } else {
-          // macOS handles cleanup properly with process.exit
+        // Use native killApp to properly clean up all resources        
+        try {
+          native.symbols.killApp();
+          // Still call process.exit as a fallback
           process.exit(0);
-        }
+        } catch (e) {
+          // Fallback if native binding fails
+          console.error('Failed to call native killApp:', e);
+          process.exit(0);
+        }        
       }
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrobun",
-  "version": "0.1.12",
+  "version": "0.1.13-beta.2",
   "description": "Build ultra fast, tiny, and cross-platform desktop apps with Typescript.",
   "license": "MIT",
   "author": "Blackboard Technologies Inc.",
@@ -48,7 +48,8 @@
     "push:minor": "npm version minor && git push origin main --tags",
     "push:major": "npm version major && git push origin main --tags",
     "build:push:artifacts": "bun scripts/build-and-upload-artifacts.js",
-    "test": "bun build:dev && bun build:cli && cd tests && npm install && bun build:dev && bun start"
+    "test": "bun build:dev && bun build:cli && cd tests && npm install && bun build:dev && bun start",
+    "test:bsdiff": "cd src/bsdiff && ../../vendors/zig/zig build test && echo \"bsdiff tests passed\""
   },
   "devDependencies": {
     "@types/archiver": "^6.0.3",

package/src/cli/index.ts

@@ -13,6 +13,7 @@ import {
   symlinkSync,
   statSync,
   copyFileSync,
+  renameSync,
 } from "fs";
 import { execSync } from "child_process";
 import * as readline from "readline";
@@ -94,13 +95,18 @@ async function ensureCoreDependencies(targetOS?: 'macos' | 'win' | 'linux', targ
   
   // Check platform-specific binaries
   const requiredBinaries = [
-    platformPaths.BUN_BINARY,
-    platformPaths.LAUNCHER_RELEASE,
-    // Platform-specific native wrapper
-    platformOS === 'macos' ? platformPaths.NATIVE_WRAPPER_MACOS :
-    platformOS === 'win' ? platformPaths.NATIVE_WRAPPER_WIN :
-    platformPaths.NATIVE_WRAPPER_LINUX
+    platformPaths.BUN_BINARY
   ];
+  if (platformOS === 'macos') {
+    requiredBinaries.push(
+      platformPaths.LAUNCHER_RELEASE,
+      platformPaths.NATIVE_WRAPPER_MACOS
+    );
+  } else if (platformOS === 'win') {
+    requiredBinaries.push(platformPaths.NATIVE_WRAPPER_WIN);
+  } else {
+    requiredBinaries.push(platformPaths.NATIVE_WRAPPER_LINUX);
+  }
   
   // Check shared files (main.js should be in shared dist/)
   const requiredSharedFiles = [
@@ -236,13 +242,17 @@ async function ensureCoreDependencies(targetOS?: 'macos' | 'win' | 'linux', targ
     }
     
     // Verify extraction completed successfully - check platform-specific binaries only
-    const requiredBinaries = [
-      platformPaths.BUN_BINARY,
-      platformPaths.LAUNCHER_RELEASE,
-      platformOS === 'macos' ? platformPaths.NATIVE_WRAPPER_MACOS :
-      platformOS === 'win' ? platformPaths.NATIVE_WRAPPER_WIN :
-      platformPaths.NATIVE_WRAPPER_LINUX
-    ];
+    const requiredBinaries = [platformPaths.BUN_BINARY];
+    if (platformOS === 'macos') {
+      requiredBinaries.push(
+        platformPaths.LAUNCHER_RELEASE,
+        platformPaths.NATIVE_WRAPPER_MACOS
+      );
+    } else if (platformOS === 'win') {
+      requiredBinaries.push(platformPaths.NATIVE_WRAPPER_WIN);
+    } else {
+      requiredBinaries.push(platformPaths.NATIVE_WRAPPER_LINUX);
+    }
     
     const missingBinaries = requiredBinaries.filter(file => !existsSync(file));
     if (missingBinaries.length > 0) {
@@ -1743,25 +1753,41 @@ if (commandArg === "init") {
     // DMG creation for macOS only
     if (targetOS === 'macos') {
       console.log("creating dmg...");
-      // make a dmg
-      const dmgPath = join(buildFolder, `${appFileName}.dmg`);
-      artifactsToUpload.push(dmgPath);
+      const finalDmgPath = join(buildFolder, `${appFileName}.dmg`);
+      // NOTE: For some ungodly reason using the bare name in CI can conflict with some mysterious
+      // already mounted volume. I suspect the sanitized appFileName can match your github repo
+      // or some other tool is mounting something somewhere. Either way, as a workaround
+      // while creating the dmg for a stable build we temporarily give it a -stable suffix
+      // to match the behaviour of -canary builds.
+      const dmgCreationPath =
+        buildEnvironment === "stable"
+          ? join(buildFolder, `${appFileName}-stable.dmg`)
+          : finalDmgPath;
+      const baseVolumeName = sanitizeVolumeNameForHdiutil(appFileName);
+      const dmgVolumeName =
+        buildEnvironment === "stable"
+          ? `${baseVolumeName}-stable`
+          : baseVolumeName;
       // hdiutil create -volname "YourAppName" -srcfolder /path/to/YourApp.app -ov -format UDZO YourAppName.dmg
       // Note: use ULFO (lzfse) for better compatibility with large CEF frameworks and modern macOS
       execSync(
-        `hdiutil create -volname "${sanitizeVolumeNameForHdiutil(appFileName)}" -srcfolder ${escapePathForTerminal(
+        `hdiutil create -volname "${dmgVolumeName}" -srcfolder ${escapePathForTerminal(
           selfExtractingBundle.appBundleFolderPath
-        )} -ov -format ULFO ${escapePathForTerminal(dmgPath)}`
+        )} -ov -format ULFO ${escapePathForTerminal(dmgCreationPath)}`
       );
+      if (buildEnvironment === "stable" && dmgCreationPath !== finalDmgPath) {
+        renameSync(dmgCreationPath, finalDmgPath);
+      }
+      artifactsToUpload.push(finalDmgPath);
 
       if (shouldCodesign) {
-        codesignAppBundle(dmgPath);
+        codesignAppBundle(finalDmgPath);
       } else {
         console.log("skipping codesign");
       }
 
       if (shouldNotarize) {
-        notarizeAndStaple(dmgPath);
+        notarizeAndStaple(finalDmgPath);
       } else {
         console.log("skipping notarization");
       }

package/templates/multitab-browser/package.json

@@ -7,6 +7,6 @@
     "start": "electrobun build && electrobun dev"    
   },
   "dependencies": {
-    "electrobun": "0.0.19-beta.133"
+    "electrobun": "latest"
   }
 }