electrobun 0.0.19-beta.76 → 0.0.19-beta.78

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

@@ -1,6 +1,6 @@
-import { join, dirname, resolve } from "path";
+import { join, dirname, resolve, basename } from "path";
 import { homedir } from "os";
-import { renameSync, unlinkSync, mkdirSync, rmdirSync, statSync } from "fs";
+import { renameSync, unlinkSync, mkdirSync, rmdirSync, statSync, readdirSync } from "fs";
 import tar from "tar";
 import { ZstdInit } from "@oneidentity/zstd-js/wasm";
 import { OS as currentOS, ARCH as currentArch } from '../../shared/platform';
@@ -14,8 +14,8 @@ function getAppDataDir(): string {
       // Use LOCALAPPDATA to match extractor location
       return process.env.LOCALAPPDATA || join(homedir(), "AppData", "Local");
     case 'linux':
-      // Use XDG_CONFIG_HOME or fallback to ~/.config
-      return process.env.XDG_CONFIG_HOME || join(homedir(), ".config");
+      // Use XDG_DATA_HOME or fallback to ~/.local/share to match extractor
+      return process.env.XDG_DATA_HOME || join(homedir(), ".local", "share");
     default:
       // Fallback to home directory with .config
       return join(homedir(), ".config");
@@ -345,16 +345,23 @@ const Updater = {
           join(extractionFolder, appBundleSubpath)
         );
         
-        // On Linux, we need to move the app from self-extraction to the app directory
+        // Platform-specific path handling
         let newAppBundlePath: string;
-        if (currentOS === 'linux') {
-          // Get the parent directory (one level up from self-extraction)
-          const parentDir = resolve(extractionFolder, "..");
-          newAppBundlePath = join(parentDir, "app_new");
+        if (currentOS === 'linux' || currentOS === 'win') {
+          // On Linux/Windows, the actual app is inside a subdirectory
+          // named <appname>-<channel> (e.g., "test1-canary")
+          // Use same sanitization as extractor: remove spaces and dots
+          const sanitizedName = localInfo.name.replace(/ /g, "").replace(/\./g, "-");
+          const appBundleName = `${sanitizedName}-${localInfo.channel}`;
+          newAppBundlePath = join(extractionFolder, appBundleName);
           
-          // Move the extracted app to a temporary location
-          renameSync(extractedAppPath, newAppBundlePath);
+          // Verify the extracted app exists
+          if (!statSync(newAppBundlePath, { throwIfNoEntry: false })) {
+            console.error(`Extracted app not found at: ${newAppBundlePath}`);
+            return;
+          }
         } else {
+          // On macOS, use the extracted app path directly
           newAppBundlePath = extractedAppPath;
         }
         // Platform-specific app path calculation
@@ -381,37 +388,50 @@ const Updater = {
             ".."
           );
         }
-        // Platform-specific backup naming and location
-        let backupAppBundlePath: string;
+        // Platform-specific backup handling
+        let backupPath: string;
         if (currentOS === 'macos') {
           // On macOS, backup in extraction folder with .app extension
-          backupAppBundlePath = join(extractionFolder, "backup.app");
+          backupPath = join(extractionFolder, "backup.app");
         } else {
-          // On Linux/Windows, keep backup in self-extraction folder
-          backupAppBundlePath = join(extractionFolder, "backup");
+          // On Linux/Windows, create a tar backup of the current app
+          backupPath = join(extractionFolder, "backup.tar");
         }
 
         try {
-          // Remove existing backup if it exists
-          if (statSync(backupAppBundlePath, { throwIfNoEntry: false })) {
-            rmdirSync(backupAppBundlePath, { recursive: true });
+          if (currentOS === 'macos') {
+            // On macOS, use rename approach
+            // Remove existing backup if it exists
+            if (statSync(backupPath, { throwIfNoEntry: false })) {
+              rmdirSync(backupPath, { recursive: true });
+            }
+            
+            // Move current running app to backup
+            renameSync(runningAppBundlePath, backupPath);
+            
+            // Move new app to running location
+            renameSync(newAppBundlePath, runningAppBundlePath);
           } else {
-            console.log("backupAppBundlePath does not exist");
-          }
-          
-          // Move current running app to backup
-          renameSync(runningAppBundlePath, backupAppBundlePath);
-          
-          // Move new app to running location
-          renameSync(newAppBundlePath, runningAppBundlePath);
-          
-          // On Linux, clean up the temporary app_new if it wasn't already moved
-          if (currentOS === 'linux') {
-            try {
-              rmdirSync(newAppBundlePath, { recursive: true });
-            } catch {
-              // Ignore if already moved
+            // On Linux/Windows, create tar backup and replace
+            // Remove existing backup.tar if it exists
+            if (statSync(backupPath, { throwIfNoEntry: false })) {
+              unlinkSync(backupPath);
             }
+            
+            // Create tar backup of current app
+            await tar.c(
+              {
+                file: backupPath,
+                cwd: dirname(runningAppBundlePath),
+              },
+              [basename(runningAppBundlePath)]
+            );
+            
+            // Remove current app
+            rmdirSync(runningAppBundlePath, { recursive: true });
+            
+            // Move new app to app location
+            renameSync(newAppBundlePath, runningAppBundlePath);
           }
         } catch (error) {
           console.error("Failed to replace app with new version", error);

package/package.json

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