electrobun 1.2.2-beta.1 → 1.2.2-beta.3

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

@@ -321,14 +321,40 @@ const Updater = {
         );
 
         const bunBinDir = dirname(process.execPath);
-        const bspatchPath = join(bunBinDir, "bspatch");
+        const bspatchBinName = currentOS === 'win' ? 'bspatch.exe' : 'bspatch';
+        const bspatchPath = join(bunBinDir, bspatchBinName);
 
         emitStatus('applying-patch', `Applying patch ${patchesApplied + 1} for ${currentHash.slice(0, 8)}...`, {
           currentHash,
           patchNumber: patchesApplied + 1,
         });
 
-        // Note: cwd should be Contents/MacOS/ where the binaries are in the amc app bundle
+        // Verify all files exist before invoking bspatch
+        if (!statSync(bspatchPath, { throwIfNoEntry: false })) {
+          emitStatus('patch-failed', `bspatch binary not found at ${bspatchPath}`, {
+            currentHash,
+            errorMessage: `bspatch not found: ${bspatchPath}`,
+          });
+          console.error("bspatch not found:", bspatchPath);
+          break;
+        }
+        if (!statSync(currentTarPath, { throwIfNoEntry: false })) {
+          emitStatus('patch-failed', `Old tar not found at ${currentTarPath}`, {
+            currentHash,
+            errorMessage: `old tar not found: ${currentTarPath}`,
+          });
+          console.error("old tar not found:", currentTarPath);
+          break;
+        }
+        if (!statSync(patchFilePath, { throwIfNoEntry: false })) {
+          emitStatus('patch-failed', `Patch file not found at ${patchFilePath}`, {
+            currentHash,
+            errorMessage: `patch not found: ${patchFilePath}`,
+          });
+          console.error("patch file not found:", patchFilePath);
+          break;
+        }
+
         try {
           const patchResult = Bun.spawnSync([
             bspatchPath,
@@ -343,7 +369,7 @@ const Updater = {
             if (updateInfo) {
               updateInfo.error = stderr || `bspatch failed with exit code ${patchResult.exitCode}`;
             }
-            emitStatus('patch-failed', `Patch application failed: ${stderr || 'unknown error'}`, {
+            emitStatus('patch-failed', `Patch application failed: ${stderr || `exit code ${patchResult.exitCode}`}`, {
               currentHash,
               errorMessage: stderr || `exit code ${patchResult.exitCode}`,
             });
@@ -353,6 +379,10 @@ const Updater = {
                 exitCode: patchResult.exitCode,
                 stdout,
                 stderr,
+                bspatchPath,
+                oldTar: currentTarPath,
+                newTar: tmpPatchedTarFilePath,
+                patch: patchFilePath,
               },
             );
             break;
@@ -362,7 +392,7 @@ const Updater = {
             currentHash,
             errorMessage: (error as Error).message,
           });
-          console.error("bspatch threw", error);
+          console.error("bspatch threw", error, { bspatchPath });
           break;
         }
 
@@ -374,19 +404,20 @@ const Updater = {
 
         emitStatus('extracting-version', 'Extracting version info from patched tar...', { currentHash });
 
-        let versionSubpath = "";
+        let hashFilePath = "";
         const untarDir = join(appDataFolder, "self-extraction", "tmpuntar");
         mkdirSync(untarDir, { recursive: true });
 
-        // extract just the version.json from the patched tar file so we can see what hash it is now
-        const resourcesDir = 'Resources'; // Always use capitalized Resources
+        // Extract the hash from the patched tar:
+        // - macOS/Windows: Resources/version.json (inside the app bundle directory)
+        // - Linux: metadata.json (alongside the AppImage, since AppImage is opaque)
+        const resourcesDir = 'Resources';
         await tar.x({
-          // gzip: false,
           file: tmpPatchedTarFilePath,
           cwd: untarDir,
           filter: (path: string) => {
-            if (path.endsWith(`${resourcesDir}/version.json`)) {
-              versionSubpath = path;
+            if (path.endsWith(`${resourcesDir}/version.json`) || path.endsWith('metadata.json')) {
+              hashFilePath = path;
               return true;
             } else {
               return false;
@@ -394,10 +425,16 @@ const Updater = {
           },
         });
 
-        const currentVersionJson = await Bun.file(
-          join(untarDir, versionSubpath)
+        if (!hashFilePath) {
+          emitStatus('error', 'Could not find version/metadata file in patched tar', { currentHash });
+          console.error("Neither Resources/version.json nor metadata.json found in patched tar:", tmpPatchedTarFilePath);
+          break;
+        }
+
+        const hashFileJson = await Bun.file(
+          join(untarDir, hashFilePath)
         ).json();
-        const nextHash = currentVersionJson.hash;
+        const nextHash = hashFileJson.hash;
 
         if (seenHashes.includes(nextHash)) {
           emitStatus('error', 'Cyclical update detected, falling back to full download', { currentHash: nextHash });

package/package.json

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

package/src/cli/index.ts

@@ -2065,7 +2065,7 @@ if (commandArg === "init") {
       // 3. Icon file
       // 4. Metadata
       
-      const tempDirName = `${appFileName}-installer-contents`;
+      const tempDirName = `${appFileName}-tar-staging`;
       const tempDirPath = join(buildFolder, tempDirName);
       
       // Clean up any existing temp directory
@@ -2078,7 +2078,7 @@ if (commandArg === "init") {
       const innerDirPath = join(tempDirPath, appFileName);
       mkdirSync(innerDirPath, { recursive: true });
       
-      // Copy AppImage
+      // Copy AppImage (the inner app bundle on Linux)
       const appImageDestPath = join(innerDirPath, `${appFileName}.AppImage`);
       cpSync(appImagePath, appImageDestPath, { dereference: true });
       
@@ -2099,7 +2099,8 @@ if (commandArg === "init") {
         identifier: config.app.identifier,
         name: config.app.name,
         version: config.app.version,
-        channel: buildEnvironment
+        channel: buildEnvironment,
+        hash: hash,
       };
       writeFileSync(join(innerDirPath, 'metadata.json'), JSON.stringify(metadata, null, 2));