electrobun 0.1.10 → 0.1.13-beta.1

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/ApplicationMenu.ts

@@ -46,11 +46,14 @@ const menuConfigWithDefaults = (
     if (item.type === "divider" || item.type === "separator") {
       return { type: "divider" };
     } else {
+      // Use shared serialization method
+      const actionWithDataId = ffi.internal.serializeMenuAction(item.action || "", item.data);
+      
       return {
         label: item.label || roleLabelMap[item.role] || "",
         type: item.type || "normal",
         // application menus can either have an action or a role. not both.
-        ...(item.role ? { role: item.role } : { action: item.action || "" }),
+        ...(item.role ? { role: item.role } : { action: actionWithDataId }),
         // default enabled to true unless explicitly set to false
         enabled: item.enabled === false ? false : true,
         checked: Boolean(item.checked),

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

@@ -48,11 +48,14 @@ const menuConfigWithDefaults = (
     if (item.type === "divider" || item.type === "separator") {
       return { type: "divider" };
     } else {
+      // Use shared serialization method
+      const actionWithDataId = ffi.internal.serializeMenuAction(item.action || "", item.data);
+      
       return {
         label: item.label || roleLabelMap[item.role] || "",
         type: item.type || "normal",
         // application menus can either have an action or a role. not both.
-        ...(item.role ? { role: item.role } : { action: item.action || "" }),
+        ...(item.role ? { role: item.role } : { action: actionWithDataId }),
         // default enabled to true unless explicitly set to false
         enabled: item.enabled === false ? false : true,
         checked: Boolean(item.checked),

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/Tray.ts

@@ -112,10 +112,13 @@ const menuConfigWithDefaults = (
     if (item.type === "divider" || item.type === "separator") {
       return { type: "divider" };
     } else {
+      // Use shared serialization method
+      const actionWithDataId = ffi.internal.serializeMenuAction(item.action || "", item.data);
+      
       return {
         label: item.label || "",
         type: item.type || "normal",
-        action: item.action || "",
+        action: actionWithDataId,
         // default enabled to true unless explicitly set to false
         enabled: item.enabled === false ? false : true,
         checked: Boolean(item.checked),

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/dist/api/bun/proc/native.ts

@@ -7,7 +7,50 @@ import { BrowserView } from "../core/BrowserView";
 import { Updater } from "../core/Updater";
 import { Tray } from "../core/Tray";
 
+// Menu data reference system to avoid serialization overhead
+const menuDataRegistry = new Map<string, any>();
+let menuDataCounter = 0;
+
+function storeMenuData(data: any): string {
+  const id = `menuData_${++menuDataCounter}`;
+  menuDataRegistry.set(id, data);
+  return id;
+}
+
+function getMenuData(id: string): any {
+  return menuDataRegistry.get(id);
+}
 
+function clearMenuData(id: string): void {
+  menuDataRegistry.delete(id);
+}
+
+// Shared methods for EB delimiter serialization/deserialization
+const ELECTROBUN_DELIMITER = '|EB|';
+
+function serializeMenuAction(action: string, data: any): string {
+  const dataId = storeMenuData(data);
+  return `${ELECTROBUN_DELIMITER}${dataId}|${action}`;
+}
+
+function deserializeMenuAction(encodedAction: string): { action: string; data: any } {
+  let actualAction = encodedAction;
+  let data = undefined;
+  
+  if (encodedAction.startsWith(ELECTROBUN_DELIMITER)) {
+    const parts = encodedAction.split('|');
+    if (parts.length >= 4) { // ['', 'EB', 'dataId', 'actualAction', ...]
+      const dataId = parts[2];
+      actualAction = parts.slice(3).join('|'); // Rejoin in case action contains |
+      data = getMenuData(dataId);
+      
+      // Clean up data from registry after use
+      clearMenuData(dataId);
+    }
+  }
+  
+  return { action: actualAction, data };
+}
 
 // todo: set up FFI, this is already in the webworker.
 
@@ -765,6 +808,14 @@ export const ffi = {
       //   );
       // },
     
+  },
+   // Internal functions for menu data management
+  internal: {
+    storeMenuData,
+    getMenuData,
+    clearMenuData,
+    serializeMenuAction,
+    deserializeMenuAction,
   }
 }
 
@@ -1103,9 +1154,14 @@ const trayItemHandler = new JSCallback((id, action) => {
   // Note: Some invisible character that doesn't appear in .length
   // is causing issues      
   const actionString = (new CString(action).toString() || "").trim();
+  
+  // Use shared deserialization method
+  const { action: actualAction, data } = deserializeMenuAction(actionString);
+  
   const event = electrobunEventEmitter.events.tray.trayClicked({
     id,
-    action: actionString,
+    action: actualAction,
+    data, // Always include data property (undefined if no data)
   });
 
   let result;
@@ -1120,13 +1176,19 @@ const trayItemHandler = new JSCallback((id, action) => {
 
 
 const applicationMenuHandler = new JSCallback((id, action) => {  
+  const actionString = new CString(action).toString();
+  
+  // Use shared deserialization method
+  const { action: actualAction, data } = deserializeMenuAction(actionString);
+  
   const event = electrobunEventEmitter.events.app.applicationMenuClicked({
     id,
-    action: new CString(action),
+    action: actualAction,
+    data, // Always include data property (undefined if no data)
   });
   
   // global event
-  electrobunEventEmitter.emitEvent(event);  
+  electrobunEventEmitter.emitEvent(event);
 }, {
   args: [FFIType.u32, FFIType.cstring],
   returns: FFIType.void,
@@ -1134,8 +1196,14 @@ const applicationMenuHandler = new JSCallback((id, action) => {
 })
 
 const contextMenuHandler = new JSCallback((id, action) => {  
+  const actionString = new CString(action).toString();
+  
+  // Use shared deserialization method
+  const { action: actualAction, data } = deserializeMenuAction(actionString);
+  
   const event = electrobunEventEmitter.events.app.contextMenuClicked({
-    action: new CString(action),
+    action: actualAction,
+    data, // Always include data property (undefined if no data)
   });
 
   electrobunEventEmitter.emitEvent(event);
@@ -1329,7 +1397,9 @@ export const internalRpcHandlers = {
     webviewEvent: (params) => {
       console.log('-----------------+webviewEvent', params)
     },
-  }
+  },
+  
+ 
 };
 
 // todo: consider renaming to TrayMenuItemConfig
@@ -1340,6 +1410,7 @@ export type MenuItemConfig =
       label: string;
       tooltip?: string;
       action?: string;
+      data?: any;
       submenu?: Array<MenuItemConfig>;
       enabled?: boolean;
       checked?: boolean;
@@ -1353,6 +1424,7 @@ export type ApplicationMenuItemConfig =
       label: string;
       tooltip?: string;
       action?: string;
+      data?: any;
       submenu?: Array<ApplicationMenuItemConfig>;
       enabled?: boolean;
       checked?: boolean;
@@ -1364,6 +1436,7 @@ export type ApplicationMenuItemConfig =
       label?: string;
       tooltip?: string;
       role?: string;
+      data?: any;
       submenu?: Array<ApplicationMenuItemConfig>;
       enabled?: boolean;
       checked?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrobun",
-  "version": "0.1.10",
+  "version": "0.1.13-beta.1",
   "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

@@ -94,13 +94,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 +241,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) {

package/templates/multitab-browser/package.json

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