electrobun 1.18.1 → 1.18.4-beta.10

package/dist/api/{bun → sdks/bun}/core/Tray.ts

@@ -2,14 +2,12 @@ import { ffi, type MenuItemConfig, type Rectangle } from "../proc/native";
 import electrobunEventEmitter from "../events/eventEmitter";
 import { VIEWS_FOLDER } from "./Paths";
 import { join } from "path";
-import { type Pointer } from "bun:ffi";
 
 type NonDividerMenuItem = Exclude<
 	MenuItemConfig,
 	{ type: "divider" | "separator" }
 >;
 
-let nextTrayId = 1;
 const TrayMap: { [id: number]: Tray } = {};
 
 export type TrayOptions = {
@@ -21,9 +19,8 @@ export type TrayOptions = {
 };
 
 export class Tray {
-	id: number = nextTrayId++;
-	ptr: Pointer | null = null;
-	visible = true;
+	id = 0;
+	visible = false;
 	title = "";
 	image = "";
 	template = true;
@@ -44,36 +41,35 @@ export class Tray {
 		this.width = width;
 		this.height = height;
 
-		this.createNativeTray();
-
-		TrayMap[this.id] = this;
+		if (this.createNativeTray()) {
+			TrayMap[this.id] = this;
+		}
 	}
 
-	private createNativeTray() {
+	private createNativeTray(): boolean {
 		try {
-			this.ptr = ffi.request.createTray({
-				id: this.id,
+			const trayId = ffi.request.createTray({
 				title: this.title,
 				image: this.resolveImagePath(this.image),
 				template: this.template,
 				width: this.width,
 				height: this.height,
-			}) as Pointer;
+			}) as number;
+
+			if (!trayId) {
+				throw new Error("Tray creation returned an invalid id");
+			}
+
+			this.id = trayId;
 			this.visible = true;
+			return true;
 		} catch (error) {
 			console.warn("Tray creation failed:", error);
 			console.warn(
 				"System tray functionality may not be available on this platform",
 			);
-			this.ptr = null;
 			this.visible = false;
-		}
-
-		if (this.ptr && this.menu) {
-			ffi.request.setTrayMenu({
-				id: this.id,
-				menuConfig: JSON.stringify(menuConfigWithDefaults(this.menu)),
-			});
+			return false;
 		}
 	}
 
@@ -88,13 +84,13 @@ export class Tray {
 
 	setTitle(title: string) {
 		this.title = title;
-		if (!this.ptr) return;
+		if (!this.id) return;
 		ffi.request.setTrayTitle({ id: this.id, title });
 	}
 
 	setImage(imgPath: string) {
 		this.image = imgPath;
-		if (!this.ptr) return;
+		if (!this.id) return;
 		ffi.request.setTrayImage({
 			id: this.id,
 			image: this.resolveImagePath(imgPath),
@@ -103,7 +99,7 @@ export class Tray {
 
 	setMenu(menu: Array<MenuItemConfig>) {
 		this.menu = menu;
-		if (!this.ptr) return;
+		if (!this.id) return;
 		const menuWithDefaults = menuConfigWithDefaults(menu);
 		ffi.request.setTrayMenu({
 			id: this.id,
@@ -122,15 +118,19 @@ export class Tray {
 		}
 
 		if (!visible) {
-			if (this.ptr) {
-				ffi.request.removeTray({ id: this.id });
-				this.ptr = null;
-			}
+			if (this.id) ffi.request.hideTray({ id: this.id });
 			this.visible = false;
 			return;
 		}
 
-		this.createNativeTray();
+		if (!this.id) {
+			if (this.createNativeTray()) {
+				TrayMap[this.id] = this;
+			}
+			return;
+		}
+
+		this.visible = ffi.request.showTray({ id: this.id }) as boolean;
 	}
 
 	getBounds(): Rectangle {
@@ -139,12 +139,13 @@ export class Tray {
 
 	remove() {
 		console.log("Tray.remove() called for id:", this.id);
-		if (this.ptr) {
-			ffi.request.removeTray({ id: this.id });
-			this.ptr = null;
+		const trayId = this.id;
+		if (trayId) {
+			ffi.request.removeTray({ id: trayId });
 		}
 		this.visible = false;
-		delete TrayMap[this.id];
+		delete TrayMap[trayId];
+		this.id = 0;
 		console.log("Tray removed from TrayMap");
 	}
 

package/dist/api/{bun → sdks/bun}/core/Updater.ts

@@ -9,8 +9,8 @@ import {
 	readdirSync,
 } from "fs";
 import { execSync } from "child_process";
-import { OS as currentOS, ARCH as currentArch } from "../../shared/platform";
-import { getPlatformPrefix, getTarballFileName } from "../../shared/naming";
+import { OS as currentOS, ARCH as currentArch } from "../../../shared/platform";
+import { getPlatformPrefix, getTarballFileName } from "../../../shared/naming";
 import { quit } from "./Utils";
 
 // Update status types for granular progress tracking
@@ -855,7 +855,7 @@ const Updater = {
 				} else if (currentOS === "win") {
 					// 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),
+					// file name (e.g. "MyApp-canary" for canary, "MyApp" for production),
 					// so don't re-apply getAppFileName or it doubles the channel suffix.
 					newAppBundlePath = join(extractionDir, localInfo.name);
 
@@ -934,9 +934,9 @@ const Updater = {
 						}
 
 						// Also ensure other binaries are executable
-						const bunPath = join(appBundleDir, "bin", "bun");
-						if (statSync(bunPath, { throwIfNoEntry: false })) {
-							execSync(`chmod +x "${bunPath}"`);
+						const cottontailPath = join(appBundleDir, "bin", "cottontail");
+						if (statSync(cottontailPath, { throwIfNoEntry: false })) {
+							execSync(`chmod +x "${cottontailPath}"`);
 						}
 					}
 
@@ -974,13 +974,13 @@ const Updater = {
 setlocal
 
 :: Wait for the app and any CEF helper processes to fully exit.
-:: launcher.exe spawns bun.exe which spawns "bun Helper*.exe" processes that
+:: launcher.exe spawns cottontail.exe and "main 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 && 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
+tasklist /FI "IMAGENAME eq cottontail.exe" 2>NUL | find /I /N "cottontail.exe">NUL && goto waitsleep
+tasklist /FI "IMAGENAME eq main Helper.exe" 2>NUL | find /I /N "main Helper.exe">NUL && goto waitsleep
+tasklist 2>NUL | find /I "main Helper">NUL && goto waitsleep
 goto waitdone
 :waitsleep
 timeout /t 1 /nobreak >nul

package/dist/api/{bun → sdks/bun}/core/Utils.ts

@@ -3,7 +3,7 @@ import { electrobunEventEmitter } from "../events/eventEmitter";
 import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
 import { readFileSync } from "node:fs";
-import { OS } from "../../shared/platform";
+import { OS } from "../../../shared/platform";
 
 export const moveToTrash = (path: string) => {
 	return ffi.request.moveToTrash({ path });
@@ -137,9 +137,7 @@ export const quit = () => {
 	}
 
 	if (native) {
-		native.symbols.stopEventLoop();
-		native.symbols.waitForShutdownComplete(5000);
-		native.symbols.forceExit(0);
+		ffi.request.quitGracefully({ code: 0, timeoutMs: 5000 });
 	} else {
 		process.exit(0);
 	}
@@ -150,7 +148,7 @@ const _originalProcessExit = process.exit;
 process.exit = ((code?: number) => {
 	if (native) {
 		if (isQuitting) {
-			native.symbols.forceExit(code ?? 0);
+			ffi.request.quitGracefully({ code: code ?? 0, timeoutMs: 0 });
 			return;
 		}
 		quit();

package/dist/api/{bun → sdks/bun}/core/WGPUView.ts

@@ -6,8 +6,6 @@ const WGPUViewMap: {
 	[id: number]: WGPUView;
 } = {};
 
-let nextWGPUViewId = 1;
-
 export type WGPUViewOptions = {
 	frame: {
 		x: number;
@@ -34,8 +32,7 @@ const defaultOptions: Partial<WGPUViewOptions> = {
 };
 
 export class WGPUView {
-	id: number = nextWGPUViewId++;
-	ptr!: Pointer;
+	id: number = 0;
 	windowId!: number;
 	autoResize: boolean = true;
 	frame: {
@@ -51,6 +48,14 @@ export class WGPUView {
 	};
 	startTransparent: boolean = false;
 	startPassthrough: boolean = false;
+	isRemoved: boolean = false;
+
+	get ptr(): Pointer | null {
+		if (this.isRemoved) {
+			return null;
+		}
+		return ffi.request.getWGPUViewPointer({ id: this.id }) as Pointer | null;
+	}
 
 	constructor(options: Partial<WGPUViewOptions> = defaultOptions) {
 		this.frame = {
@@ -64,13 +69,12 @@ export class WGPUView {
 		this.startTransparent = options.startTransparent ?? false;
 		this.startPassthrough = options.startPassthrough ?? false;
 
+		this.id = this.init() as number;
 		WGPUViewMap[this.id] = this;
-		this.ptr = this.init() as Pointer;
 	}
 
 	init() {
 		return ffi.request.createWGPUView({
-			id: this.id,
 			windowId: this.windowId,
 			frame: {
 				width: this.frame.width,
@@ -107,20 +111,18 @@ export class WGPUView {
 	}
 
 	remove() {
-		// Check if already removed
-		if (this.ptr === null) {
+		if (this.isRemoved) {
 			return;
 		}
-		
+
+		this.isRemoved = true;
+		delete WGPUViewMap[this.id];
+
 		try {
 			ffi.request.wgpuViewRemove({ id: this.id });
 		} catch (e) {
 			console.error(`Error removing WGPU view ${this.id}:`, e);
 		}
-		
-		delete WGPUViewMap[this.id];
-		// Clear the pointer to prevent any accidental access
-		this.ptr = null as any;
 	}
 
 	getNativeHandle() {
@@ -131,6 +133,34 @@ export class WGPUView {
 		return WGPUViewMap[id];
 	}
 
+	static adoptExisting(id: number, options: Partial<WGPUViewOptions> = {}) {
+		const existing = WGPUViewMap[id];
+		if (existing) {
+			return existing;
+		}
+
+		const ptr = ffi.request.getWGPUViewPointer({ id }) as Pointer | null;
+		if (!ptr) {
+			return undefined;
+		}
+
+		const view = Object.create(WGPUView.prototype) as WGPUView;
+		view.id = id;
+		view.windowId = options.windowId ?? 0;
+		view.autoResize = options.autoResize === false ? false : true;
+		view.frame = {
+			x: options.frame?.x ?? defaultOptions.frame!.x,
+			y: options.frame?.y ?? defaultOptions.frame!.y,
+			width: options.frame?.width ?? defaultOptions.frame!.width,
+			height: options.frame?.height ?? defaultOptions.frame!.height,
+		};
+		view.startTransparent = options.startTransparent ?? false;
+		view.startPassthrough = options.startPassthrough ?? false;
+		view.isRemoved = false;
+		WGPUViewMap[id] = view;
+		return view;
+	}
+
 	static getAll() {
 		return Object.values(WGPUViewMap);
 	}

package/dist/api/{bun → sdks/bun}/index.ts

@@ -23,7 +23,7 @@ import {
 	type ElectrobunRPCSchema,
 	createRPC,
 	defineElectrobunRPC,
-} from "../shared/rpc.js";
+} from "../../shared/rpc.js";
 import type ElectrobunEvent from "./events/event";
 import * as PATHS from "./core/Paths";
 import * as Socket from "./core/Socket";
@@ -31,7 +31,7 @@ import WGPU from "./webGPU";
 import webgpu from "./webgpuAdapter";
 import * as three from "three";
 import * as babylon from "@babylonjs/core";
-import type { ElectrobunConfig } from "./ElectrobunConfig";
+import type { ElectrobunConfig } from "../../config/ElectrobunConfig";
 import { GlobalShortcut, Screen, Session, WGPUBridge } from "./proc/native";
 import type {
 	Display,
@@ -48,7 +48,7 @@ import { bridge, hasFFI } from "./proc/native";
 
 // Carrot boot state — populated from __bunnyCarrotBootstrap injected by Bunny Ears
 let _carrotManifest: Record<string, unknown> | null = null;
-let _carrotContext: { currentDir?: string; statePath?: string; logsPath?: string; permissions?: string[]; grantedPermissions?: Record<string, unknown>; authToken?: string | null; channel?: string } | null = null;
+let _carrotContext: { currentDir?: string; statePath?: string; logsPath?: string; authToken?: string | null; channel?: string } | null = null;
 
 const _bootstrap = (globalThis as any).__bunnyCarrotBootstrap as { manifest?: any; context?: any } | undefined;
 if (_bootstrap) {
@@ -104,7 +104,21 @@ export const Carrots = {
 		if (!bridge) throw new Error("Carrots.list() is only available when running as a carrot inside Bunny Ears");
 		return bridge.requestHost<Array<{
 			id: string; name: string; description: string; version: string;
-			mode: string; permissions: string[]; status: string; devMode: boolean;
+			mode: string; status: string; devMode: boolean;
+			remoteUIs?: Array<{ id: string; name: string; path: string }>;
+			slateUIs?: Array<{ id: string; name: string; path: string }>;
+			contributions?: {
+				fileActivators?: Array<{
+					baseName?: string;
+					nodeType?: "file" | "dir" | "any";
+					slate: {
+						type: string;
+						name?: string;
+						icon?: string;
+						config?: Record<string, unknown>;
+					};
+				}>;
+			};
 		}>>("list-carrots");
 	},
 	async start(carrotId: string) {
@@ -134,12 +148,6 @@ export const app = {
 	get manifest() {
 		return _carrotManifest;
 	},
-	get permissions() {
-		return _carrotContext?.permissions ?? [];
-	},
-	get grantedPermissions() {
-		return _carrotContext?.grantedPermissions ?? {};
-	},
 	get currentDir() {
 		return _carrotContext?.currentDir ?? "";
 	},
@@ -167,6 +175,27 @@ export const app = {
 			_carrotContext.authToken = token;
 		}
 	},
+	async setDeviceToken(token: string, tokenId?: string): Promise<void> {
+		if (!bridge) return;
+		await bridge.requestHost("set-device-token", { token, tokenId });
+	},
+	async getMachineInfo(): Promise<{ machineId: string; hostname: string; platform: string }> {
+		if (!bridge) {
+			return { machineId: "", hostname: "", platform: "" };
+		}
+		return bridge.requestHost<{ machineId: string; hostname: string; platform: string }>(
+			"get-machine-info",
+		);
+	},
+	async updateCarrots(): Promise<void> {
+		if (!bridge) return;
+		await bridge.requestHost("update-carrots");
+	},
+	async getWebBridgePort(): Promise<number | null> {
+		if (!bridge) return null;
+		const result = await bridge.requestHost<{ port: number | null }>("get-web-bridge-port");
+		return typeof result?.port === "number" ? result.port : null;
+	},
 	get channel() {
 		return _carrotContext?.channel ?? "";
 	},