electrobun 1.11.4-beta.0 → 1.11.5-beta.2

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

@@ -1,5 +1,6 @@
 import { ffi, type ApplicationMenuItemConfig } from "../proc/native";
 import electrobunEventEmitter from "../events/eventEmitter";
+import { roleLabelMap } from "./menuRoles";
 
 type NonDividerMenuItem = {
 	type?: "normal";
@@ -30,32 +31,6 @@ export const on = (
 	electrobunEventEmitter.on(specificName, handler);
 };
 
-const roleLabelMap = {
-	quit: "Quit",
-	hide: "Hide",
-	hideOthers: "Hide Others",
-	showAll: "Show All",
-	undo: "Undo",
-	redo: "Redo",
-	cut: "Cut",
-	copy: "Copy",
-	paste: "Paste",
-	pasteAndMatchStyle: "Paste And Match Style",
-	delete: "Delete",
-	selectAll: "Select All",
-	startSpeaking: "Start Speaking",
-	stopSpeaking: "Stop Speaking",
-	enterFullScreen: "Enter FullScreen",
-	exitFullScreen: "Exit FullScreen",
-	toggleFullScreen: "Toggle Full Screen",
-	minimize: "Minimize",
-	zoom: "Zoom",
-	bringAllToFront: "Bring All To Front",
-	close: "Close",
-	cycleThroughWindows: "Cycle Through Windows",
-	showHelp: "Show Help",
-};
-
 const menuConfigWithDefaults = (
 	menu: Array<ApplicationMenuItemConfig>,
 ): Array<ApplicationMenuItemConfig> => {

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

@@ -1,6 +1,7 @@
 // TODO: have a context specific menu that excludes role
 import { ffi, type ApplicationMenuItemConfig } from "../proc/native";
 import electrobunEventEmitter from "../events/eventEmitter";
+import { roleLabelMap } from "./menuRoles";
 
 type NonDividerMenuItem = {
 	type?: "normal";
@@ -31,33 +32,6 @@ export const on = (
 	electrobunEventEmitter.on(specificName, handler);
 };
 
-// todo: Consolidate Application menu, context menu, and tray menus can all have roles.
-const roleLabelMap = {
-	quit: "Quit",
-	hide: "Hide",
-	hideOthers: "Hide Others",
-	showAll: "Show All",
-	undo: "Undo",
-	redo: "Redo",
-	cut: "Cut",
-	copy: "Copy",
-	paste: "Paste",
-	pasteAndMatchStyle: "Paste And Match Style",
-	delete: "Delete",
-	selectAll: "Select All",
-	startSpeaking: "Start Speaking",
-	stopSpeaking: "Stop Speaking",
-	enterFullScreen: "Enter FullScreen",
-	exitFullScreen: "Exit FullScreen",
-	toggleFullScreen: "Toggle Full Screen",
-	minimize: "Minimize",
-	zoom: "Zoom",
-	bringAllToFront: "Bring All To Front",
-	close: "Close",
-	cycleThroughWindows: "Cycle Through Windows",
-	showHelp: "Show Help",
-};
-
 const menuConfigWithDefaults = (
 	menu: Array<ApplicationMenuItemConfig>,
 ): Array<ApplicationMenuItemConfig> => {

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

@@ -96,37 +96,6 @@ function emitStatus(
 //             native.symbols.killApp();
 // }, 1000)
 
-// Create launcher script for AppImage
-async function createLinuxAppImageLauncherScript(
-	appImagePath: string,
-): Promise<void> {
-	const parentDir = dirname(appImagePath);
-	const launcherPath = join(parentDir, "run.sh");
-
-	const launcherContent = `#!/bin/bash
-# Electrobun AppImage Launcher
-# This script launches the AppImage
-
-# Get the directory where this script is located
-SCRIPT_DIR="$(cd "$(dirname "\${BASH_SOURCE[0]}")" && pwd)"
-APPIMAGE_PATH="$SCRIPT_DIR/$(basename "${appImagePath}")"
-
-# Force X11 backend for compatibility
-export GDK_BACKEND=x11
-
-# Launch the AppImage
-exec "$APPIMAGE_PATH" "$@"
-`;
-
-	await Bun.write(launcherPath, launcherContent);
-
-	// Make it executable
-	execSync(`chmod +x "${launcherPath}"`);
-
-	console.log(
-		`Created/updated Linux AppImage launcher script: ${launcherPath}`,
-	);
-}
 
 // Cross-platform app data directory
 function getAppDataDir(): string {
@@ -850,15 +819,15 @@ const Updater = {
 				// Platform-specific path handling
 				let newAppBundlePath: string;
 				if (currentOS === "linux") {
-					// On Linux, the tarball contains a directory named {appFileName}, and inside it is the AppImage
-					// Structure: extractionDir/{appFileName}/{appFileName}.AppImage
-					const innerDirName = localInfo.name.replace(/ /g, "");
-					const appImageName = `${localInfo.name.replace(/ /g, "").replace(/\./g, "-")}.AppImage`;
-					newAppBundlePath = join(extractionDir, innerDirName, appImageName);
+					// On Linux, the tarball contains a directory bundle, not an AppImage
+					// Structure: extractionDir/{appBundleName}
+					const appBundleName = `${localInfo.name.replace(/ /g, "").replace(/\./g, "")}-${localInfo.channel}`;
+					newAppBundlePath = join(extractionDir, appBundleName);
 
-					// Verify the AppImage exists
-					if (!statSync(newAppBundlePath, { throwIfNoEntry: false })) {
-						console.error(`AppImage not found at: ${newAppBundlePath}`);
+					// Verify the app bundle directory exists
+					const bundleStats = statSync(newAppBundlePath, { throwIfNoEntry: false });
+					if (!bundleStats || !bundleStats.isDirectory()) {
+						console.error(`App bundle directory not found at: ${newAppBundlePath}`);
 						console.log("Contents of extraction directory:");
 						try {
 							const files = readdirSync(extractionDir);
@@ -906,20 +875,16 @@ const Updater = {
 				}
 				// Platform-specific app path calculation
 				let runningAppBundlePath: string;
+				const appDataFolder = await Updater.appDataFolder();
+				
 				if (currentOS === "macos") {
 					// On macOS, executable is at Contents/MacOS/binary inside .app bundle
 					runningAppBundlePath = resolve(dirname(process.execPath), "..", "..");
+				} else if (currentOS === "linux" || currentOS === "win") {
+					// On Linux and Windows, use fixed 'app' folder to match extractor
+					runningAppBundlePath = join(appDataFolder, "app");
 				} else {
-					// Platform-specific app path calculation
-					const appDataFolder = await Updater.appDataFolder();
-					if (currentOS === "linux") {
-						// On Linux, store AppImage as a single file
-						const appImageName = `${localInfo.name.replace(/ /g, "").replace(/\./g, "-")}.AppImage`;
-						runningAppBundlePath = join(appDataFolder, appImageName);
-					} else {
-						// On Windows, use fixed 'app' folder to match extractor
-						runningAppBundlePath = join(appDataFolder, "app");
-					}
+					throw new Error(`Unsupported platform: ${currentOS}`);
 				}
 				try {
 					emitStatus("replacing-app", "Removing old version...");
@@ -946,30 +911,29 @@ const Updater = {
 							// Ignore errors - attribute may not exist
 						}
 					} else if (currentOS === "linux") {
-						// On Linux, remove existing AppImage and replace with new one
-						if (statSync(runningAppBundlePath, { throwIfNoEntry: false })) {
-							unlinkSync(runningAppBundlePath);
+						// On Linux, we now have directory bundles instead of AppImage files
+						// The app is stored in {appDataFolder}/app/
+						const appBundleDir = join(appDataFolder, "app");
+						
+						// Remove existing app directory if it exists
+						if (statSync(appBundleDir, { throwIfNoEntry: false })) {
+							rmdirSync(appBundleDir, { recursive: true });
 						}
 
-						// Move new AppImage to app location
-						renameSync(newAppBundlePath, runningAppBundlePath);
+						// Move new app bundle directory to app location
+						renameSync(newAppBundlePath, appBundleDir);
 
-						// Clean up the extracted inner directory (contains leftover icon, shortcut, metadata.json)
-						const innerDirName = localInfo.name.replace(/ /g, "");
-						const extractedInnerDir = join(extractionDir, innerDirName);
-						if (
-							statSync(extractedInnerDir, {
-								throwIfNoEntry: false,
-							})?.isDirectory()
-						) {
-							rmdirSync(extractedInnerDir, { recursive: true });
+						// Ensure launcher binary is executable
+						const launcherPath = join(appBundleDir, "bin", "launcher");
+						if (statSync(launcherPath, { throwIfNoEntry: false })) {
+							execSync(`chmod +x "${launcherPath}"`);
 						}
 
-						// Make AppImage executable
-						execSync(`chmod +x "${runningAppBundlePath}"`);
-
-						// Create/update launcher script that points to the AppImage
-						await createLinuxAppImageLauncherScript(runningAppBundlePath);
+						// Also ensure other binaries are executable
+						const bunPath = join(appBundleDir, "bin", "bun");
+						if (statSync(bunPath, { throwIfNoEntry: false })) {
+							execSync(`chmod +x "${bunPath}"`);
+						}
 					}
 
 					// Clean up stale files in extraction folder
@@ -1078,9 +1042,10 @@ del "%~f0"
 						detached: true,
 					} as any);
 				} else if (currentOS === "linux") {
-					// On Linux, launch the AppImage directly
+					// On Linux, launch the launcher binary inside the app directory
+					const launcherPath = join(runningAppBundlePath, "bin", "launcher");
 					// eslint-disable-next-line @typescript-eslint/no-explicit-any
-					Bun.spawn(["sh", "-c", `"${runningAppBundlePath}" &`], {
+					Bun.spawn(["sh", "-c", `"${launcherPath}" &`], {
 						detached: true,
 					} as any);
 				}

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

@@ -0,0 +1,181 @@
+/**
+ * Shared menu role definitions used by ApplicationMenu, ContextMenu, and Tray menus.
+ * These map to macOS NSResponder selectors for native text editing support.
+ */
+
+export const roleLabelMap: Record<string, string> = {
+	// Application roles
+	about: "About",
+	quit: "Quit",
+	hide: "Hide",
+	hideOthers: "Hide Others",
+	showAll: "Show All",
+
+	// Window roles
+	minimize: "Minimize",
+	zoom: "Zoom",
+	close: "Close",
+	bringAllToFront: "Bring All To Front",
+	cycleThroughWindows: "Cycle Through Windows",
+	enterFullScreen: "Enter Full Screen",
+	exitFullScreen: "Exit Full Screen",
+	toggleFullScreen: "Toggle Full Screen",
+
+	// Standard edit roles
+	undo: "Undo",
+	redo: "Redo",
+	cut: "Cut",
+	copy: "Copy",
+	paste: "Paste",
+	pasteAndMatchStyle: "Paste and Match Style",
+	delete: "Delete",
+	selectAll: "Select All",
+
+	// Speech roles
+	startSpeaking: "Start Speaking",
+	stopSpeaking: "Stop Speaking",
+
+	// Help
+	showHelp: "Show Help",
+
+	// Movement - basic
+	moveForward: "Move Forward",
+	moveBackward: "Move Backward",
+	moveLeft: "Move Left",
+	moveRight: "Move Right",
+	moveUp: "Move Up",
+	moveDown: "Move Down",
+
+	// Movement - by word
+	moveWordForward: "Move Word Forward",
+	moveWordBackward: "Move Word Backward",
+	moveWordLeft: "Move Word Left",
+	moveWordRight: "Move Word Right",
+
+	// Movement - by line
+	moveToBeginningOfLine: "Move to Beginning of Line",
+	moveToEndOfLine: "Move to End of Line",
+	moveToLeftEndOfLine: "Move to Left End of Line",
+	moveToRightEndOfLine: "Move to Right End of Line",
+
+	// Movement - by paragraph
+	moveToBeginningOfParagraph: "Move to Beginning of Paragraph",
+	moveToEndOfParagraph: "Move to End of Paragraph",
+	moveParagraphForward: "Move Paragraph Forward",
+	moveParagraphBackward: "Move Paragraph Backward",
+
+	// Movement - by document
+	moveToBeginningOfDocument: "Move to Beginning of Document",
+	moveToEndOfDocument: "Move to End of Document",
+
+	// Movement with selection - basic
+	moveForwardAndModifySelection: "Move Forward and Modify Selection",
+	moveBackwardAndModifySelection: "Move Backward and Modify Selection",
+	moveLeftAndModifySelection: "Move Left and Modify Selection",
+	moveRightAndModifySelection: "Move Right and Modify Selection",
+	moveUpAndModifySelection: "Move Up and Modify Selection",
+	moveDownAndModifySelection: "Move Down and Modify Selection",
+
+	// Movement with selection - by word
+	moveWordForwardAndModifySelection: "Move Word Forward and Modify Selection",
+	moveWordBackwardAndModifySelection: "Move Word Backward and Modify Selection",
+	moveWordLeftAndModifySelection: "Move Word Left and Modify Selection",
+	moveWordRightAndModifySelection: "Move Word Right and Modify Selection",
+
+	// Movement with selection - by line
+	moveToBeginningOfLineAndModifySelection:
+		"Move to Beginning of Line and Modify Selection",
+	moveToEndOfLineAndModifySelection:
+		"Move to End of Line and Modify Selection",
+	moveToLeftEndOfLineAndModifySelection:
+		"Move to Left End of Line and Modify Selection",
+	moveToRightEndOfLineAndModifySelection:
+		"Move to Right End of Line and Modify Selection",
+
+	// Movement with selection - by paragraph
+	moveToBeginningOfParagraphAndModifySelection:
+		"Move to Beginning of Paragraph and Modify Selection",
+	moveToEndOfParagraphAndModifySelection:
+		"Move to End of Paragraph and Modify Selection",
+	moveParagraphForwardAndModifySelection:
+		"Move Paragraph Forward and Modify Selection",
+	moveParagraphBackwardAndModifySelection:
+		"Move Paragraph Backward and Modify Selection",
+
+	// Movement with selection - by document
+	moveToBeginningOfDocumentAndModifySelection:
+		"Move to Beginning of Document and Modify Selection",
+	moveToEndOfDocumentAndModifySelection:
+		"Move to End of Document and Modify Selection",
+
+	// Page movement
+	pageUp: "Page Up",
+	pageDown: "Page Down",
+	pageUpAndModifySelection: "Page Up and Modify Selection",
+	pageDownAndModifySelection: "Page Down and Modify Selection",
+
+	// Scrolling
+	scrollLineUp: "Scroll Line Up",
+	scrollLineDown: "Scroll Line Down",
+	scrollPageUp: "Scroll Page Up",
+	scrollPageDown: "Scroll Page Down",
+	scrollToBeginningOfDocument: "Scroll to Beginning of Document",
+	scrollToEndOfDocument: "Scroll to End of Document",
+	centerSelectionInVisibleArea: "Center Selection in Visible Area",
+
+	// Deletion - character
+	deleteBackward: "Delete Backward",
+	deleteForward: "Delete Forward",
+	deleteBackwardByDecomposingPreviousCharacter:
+		"Delete Backward by Decomposing Previous Character",
+
+	// Deletion - word
+	deleteWordBackward: "Delete Word Backward",
+	deleteWordForward: "Delete Word Forward",
+
+	// Deletion - line
+	deleteToBeginningOfLine: "Delete to Beginning of Line",
+	deleteToEndOfLine: "Delete to End of Line",
+
+	// Deletion - paragraph
+	deleteToBeginningOfParagraph: "Delete to Beginning of Paragraph",
+	deleteToEndOfParagraph: "Delete to End of Paragraph",
+
+	// Selection
+	selectWord: "Select Word",
+	selectLine: "Select Line",
+	selectParagraph: "Select Paragraph",
+	selectToMark: "Select to Mark",
+	setMark: "Set Mark",
+	swapWithMark: "Swap with Mark",
+	deleteToMark: "Delete to Mark",
+
+	// Text transformation
+	capitalizeWord: "Capitalize Word",
+	uppercaseWord: "Uppercase Word",
+	lowercaseWord: "Lowercase Word",
+	transpose: "Transpose",
+	transposeWords: "Transpose Words",
+
+	// Insertion
+	insertNewline: "Insert Newline",
+	insertLineBreak: "Insert Line Break",
+	insertParagraphSeparator: "Insert Paragraph Separator",
+	insertTab: "Insert Tab",
+	insertBacktab: "Insert Backtab",
+	insertTabIgnoringFieldEditor: "Insert Tab Ignoring Field Editor",
+	insertNewlineIgnoringFieldEditor: "Insert Newline Ignoring Field Editor",
+
+	// Kill ring (Emacs-style)
+	yank: "Yank",
+	yankAndSelect: "Yank and Select",
+
+	// Completion
+	complete: "Complete",
+	cancelOperation: "Cancel Operation",
+
+	// Indentation
+	indent: "Indent",
+};
+
+export type MenuRole = keyof typeof roleLabelMap;

package/package.json

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