electrobun 0.13.0-beta.22 → 0.13.0-beta.23

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

@@ -7,6 +7,7 @@ import { ZstdInit } from "@oneidentity/zstd-js/wasm";
 import { OS as currentOS, ARCH as currentArch } from '../../shared/platform';
 import { getPlatformFolder, getTarballFileName } from '../../shared/naming';
 import { native } from '../proc/native';
+import { quit } from './Utils';
 
 // Helper to join URL paths without breaking the protocol (path.join mangles https:// to https:/)
 function urlJoin(...parts: string[]): string {
@@ -624,6 +625,14 @@ const Updater = {
             const parentDir = dirname(runningAppBundlePath);
             const updateScriptPath = join(parentDir, 'update.bat');
             const backupDir = join(parentDir, 'app-backup');
+            const launcherPath = join(runningAppBundlePath, 'bin', 'launcher.exe');
+
+            // Convert paths to Windows format
+            const backupDirWin = backupDir.replace(/\//g, '\\');
+            const runningAppWin = runningAppBundlePath.replace(/\//g, '\\');
+            const newAppWin = newAppBundlePath.replace(/\//g, '\\');
+            const extractionDirWin = extractionDir.replace(/\//g, '\\');
+            const launcherPathWin = launcherPath.replace(/\//g, '\\');
 
             // Create a batch script that will:
             // 1. Wait for the current app to exit
@@ -644,47 +653,51 @@ if "%ERRORLEVEL%"=="0" (
 )
 
 :: Small extra delay to ensure all file handles are released
-timeout /t 1 /nobreak >nul
+timeout /t 2 /nobreak >nul
 
 :: Remove old backup if exists
-if exist "${backupDir.replace(/\//g, '\\')}" (
-    rmdir /s /q "${backupDir.replace(/\//g, '\\')}"
+if exist "${backupDirWin}" (
+    rmdir /s /q "${backupDirWin}"
 )
 
 :: Backup current app folder
-if exist "${runningAppBundlePath.replace(/\//g, '\\')}" (
-    move "${runningAppBundlePath.replace(/\//g, '\\')}" "${backupDir.replace(/\//g, '\\')}"
+if exist "${runningAppWin}" (
+    move "${runningAppWin}" "${backupDirWin}"
 )
 
 :: Move new app to current location
-move "${newAppBundlePath.replace(/\//g, '\\')}" "${runningAppBundlePath.replace(/\//g, '\\')}"
+move "${newAppWin}" "${runningAppWin}"
 
 :: Clean up extraction directory
-rmdir /s /q "${extractionDir.replace(/\//g, '\\')}" 2>nul
+rmdir /s /q "${extractionDirWin}" 2>nul
 
 :: Launch the new app
-start "" /d "${join(runningAppBundlePath, 'bin').replace(/\//g, '\\')}" launcher.exe
+start "" "${launcherPathWin}"
+
+:: Clean up scheduled tasks starting with ElectrobunUpdate_
+for /f "tokens=1" %%t in ('schtasks /query /fo list ^| findstr /i "ElectrobunUpdate_"') do (
+    schtasks /delete /tn "%%t" /f >nul 2>&1
+)
 
-:: Delete this update script
+:: Delete this update script after a short delay
+ping -n 2 127.0.0.1 >nul
 del "%~f0"
 `;
 
             await Bun.write(updateScriptPath, updateScript);
 
-            // Launch the update script detached - it will wait for us to exit
-            await Bun.spawn(["cmd", "/c", "start", "", "/min", updateScriptPath], { detached: true });
+            // Use Windows Task Scheduler to run the update script independently
+            // This ensures the script runs even after the app exits
+            const scriptPathWin = updateScriptPath.replace(/\//g, '\\');
+            const taskName = `ElectrobunUpdate_${Date.now()}`;
 
-            // Small delay to ensure the script starts
-            await new Promise(resolve => setTimeout(resolve, 200));
+            // Create a scheduled task that runs immediately and deletes itself
+            execSync(`schtasks /create /tn "${taskName}" /tr "cmd /c \\"${scriptPathWin}\\"" /sc once /st 00:00 /f`, { stdio: 'ignore' });
+            execSync(`schtasks /run /tn "${taskName}"`, { stdio: 'ignore' });
+            // The task will be cleaned up by Windows after it runs, or we delete it in the batch script
 
-            // Now exit - the script will take over
-            try {
-              native.symbols.killApp();
-              process.exit(0);
-            } catch (e) {
-              process.exit(0);
-            }
-            return; // Won't reach here, but for clarity
+            // Use quit() for graceful shutdown - this closes all windows and processes
+            quit();
           }
         } catch (error) {
           console.error("Failed to replace app with new version", error);
@@ -707,16 +720,8 @@ del "%~f0"
           Bun.spawn(["sh", "-c", `"${runningAppBundlePath}" &`], { detached: true});
         }
 
-        // 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);
-        }
+        // Use quit() for graceful shutdown
+        quit();
       }
     }
   },

package/package.json

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