electrobun 1.18.0 → 1.18.1-beta.0

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

@@ -10,7 +10,7 @@ import {
 } from "fs";
 import { execSync } from "child_process";
 import { OS as currentOS, ARCH as currentArch } from "../../shared/platform";
-import { getPlatformPrefix, getTarballFileName, getAppFileName } from "../../shared/naming";
+import { getPlatformPrefix, getTarballFileName } from "../../shared/naming";
 import { quit } from "./Utils";
 
 // Update status types for granular progress tracking
@@ -853,10 +853,11 @@ const Updater = {
 						return;
 					}
 				} else if (currentOS === "win") {
-					// On Windows, the actual app is inside a subdirectory
-					// Use same naming logic as CLI and extractor
-					const appBundleName = getAppFileName(localInfo.name, localInfo.channel);
-					newAppBundlePath = join(extractionDir, appBundleName);
+					// On Windows, the actual app is inside a subdirectory.
+					// version.json's `name` field already contains the formatted app
+					// file name (e.g. "MyApp-canary" for non-stable, "MyApp" for stable),
+					// so don't re-apply getAppFileName or it doubles the channel suffix.
+					newAppBundlePath = join(extractionDir, localInfo.name);
 
 					// Verify the extracted app exists
 					if (!statSync(newAppBundlePath, { throwIfNoEntry: false })) {
@@ -962,32 +963,57 @@ const Updater = {
 						const launcherPathWin = launcherPath.replace(/\//g, "\\");
 
 						// Create a batch script that will:
-						// 1. Wait for the current app to exit
-						// 2. Remove current app folder
-						// 3. Move new app to current location
+						// 1. Wait for the current app and its helper processes to exit
+						// 2. Remove current app folder (with retries — CEF helpers may briefly
+						//    keep libcef.dll locked after launcher.exe exits)
+						// 3. Move new app to current location (only if old folder is fully gone,
+						//    otherwise `move` would put it inside as a subdirectory)
 						// 4. Launch the new app
 						// 5. Clean up
 						const updateScript = `@echo off
 setlocal
 
-:: Wait for the app to fully exit (check if launcher.exe is still running)
+:: Wait for the app and any CEF helper processes to fully exit.
+:: launcher.exe spawns bun.exe which spawns "bun Helper*.exe" processes that
+:: keep libcef.dll locked; if we proceed too early, rmdir partially fails.
 :waitloop
-tasklist /FI "IMAGENAME eq launcher.exe" 2>NUL | find /I /N "launcher.exe">NUL
-if "%ERRORLEVEL%"=="0" (
-    timeout /t 1 /nobreak >nul
-    goto waitloop
-)
+tasklist /FI "IMAGENAME eq launcher.exe" 2>NUL | find /I /N "launcher.exe">NUL && goto waitsleep
+tasklist /FI "IMAGENAME eq bun.exe" 2>NUL | find /I /N "bun.exe">NUL && goto waitsleep
+tasklist /FI "IMAGENAME eq bun Helper.exe" 2>NUL | find /I /N "bun Helper.exe">NUL && goto waitsleep
+tasklist 2>NUL | find /I "bun Helper">NUL && goto waitsleep
+goto waitdone
+:waitsleep
+timeout /t 1 /nobreak >nul
+goto waitloop
+:waitdone
 
 :: Small extra delay to ensure all file handles are released
 timeout /t 2 /nobreak >nul
 
-:: Remove current app folder
-if exist "${runningAppWin}" (
-    rmdir /s /q "${runningAppWin}"
-)
-
-:: Move new app to current location
+:: Remove current app folder, retrying if rmdir fails (locked files etc.)
+set rmRetry=0
+:rmloop
+if not exist "${runningAppWin}" goto rmdone
+rmdir /s /q "${runningAppWin}" 2>nul
+if not exist "${runningAppWin}" goto rmdone
+set /a rmRetry=rmRetry+1
+if %rmRetry% GEQ 10 goto rmfailed
+timeout /t 2 /nobreak >nul
+goto rmloop
+:rmfailed
+echo Update failed: could not remove "${runningAppWin}" after retries.
+echo Files may still be locked by a helper process.
+pause
+exit /b 1
+:rmdone
+
+:: Move new app to current location (safe now that destination is gone)
 move "${newAppWin}" "${runningAppWin}"
+if not exist "${launcherPathWin}" (
+    echo Update failed: launcher not found at "${launcherPathWin}" after move.
+    pause
+    exit /b 1
+)
 
 :: Clean up extraction directory
 rmdir /s /q "${extractionDirWin}" 2>nul

package/package.json

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