electrobun 1.18.1 → 1.18.4-beta.5

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

@@ -3,13 +3,13 @@ import electrobunEventEmitter from "../events/eventEmitter";
 import { BrowserView } from "./BrowserView";
 import { type Pointer } from "bun:ffi";
 import { BuildConfig } from "./BuildConfig";
-import { quit } from "./Utils";
 import { type RPCWithTransport } from "../../shared/rpc.js";
-import { getNextWindowId } from "./windowIds";
-import { GpuWindowMap } from "./GpuWindow";
 import { WGPUView } from "./WGPUView";
 
-const buildConfig = await BuildConfig.get();
+const buildConfig = BuildConfig.getSync();
+ffi.request.setExitOnLastWindowClosed({
+	enabled: buildConfig.runtime?.exitOnLastWindowClosed ?? true,
+});
 
 export type WindowOptionsType<T = undefined> = {
 	trafficLightOffset?: {
@@ -73,7 +73,7 @@ export const BrowserWindowMap: {
 	[id: number]: BrowserWindow<RPCWithTransport>;
 } = {};
 
-// Clean up the window map when a window closes and optionally quit the app
+// Clean up JS wrapper state when a window closes. Native child cleanup is core-owned.
 electrobunEventEmitter.on("close", (event: { data: { id: number } }) => {
 	const windowId = event.data.id;
 	delete BrowserWindowMap[windowId];
@@ -89,35 +89,16 @@ electrobunEventEmitter.on("close", (event: { data: { id: number } }) => {
 	const wgpuViews = WGPUView.getAll().filter(v => v.windowId === windowId);
 	for (const view of wgpuViews) {
 		try {
-			// If ptr is null, the view was already cleaned up by the renderer or native cleanup
-			if (view.ptr === null) {
-				// Already cleaned up, skip
-			} else {
-				// Programmatic close path - remove the view
-				view.remove();
-			}
+			view.remove();
 		} catch (e) {
 			console.error(`Error cleaning up WGPU view ${view.id}:`, e);
-			// If remove() failed, at least mark it as cleaned up
-			view.ptr = null as any;
 		}
 	}
 
-	const exitOnLastWindowClosed =
-		buildConfig.runtime?.exitOnLastWindowClosed ?? true;
-
-	if (
-		exitOnLastWindowClosed &&
-		Object.keys(BrowserWindowMap).length === 0 &&
-		Object.keys(GpuWindowMap).length === 0
-	) {
-		quit();
-	}
 });
 
 export class BrowserWindow<T extends RPCWithTransport = RPCWithTransport> {
-	id: number = getNextWindowId();
-	ptr!: Pointer;
+	id = 0;
 	title: string = "Electrobun";
 	state: "creating" | "created" = "creating";
 	url: string | null = null;
@@ -146,6 +127,10 @@ export class BrowserWindow<T extends RPCWithTransport = RPCWithTransport> {
 	// todo (yoav): make this an array of ids or something
 	webviewId!: number;
 
+	get ptr(): Pointer | null {
+		return ffi.request.getWindowPointer({ winId: this.id }) as Pointer | null;
+	}
+
 	constructor(options: Partial<WindowOptionsType<T>> = defaultOptions) {
 		this.title = options.title || "New Window";
 		this.frame = options.frame
@@ -177,8 +162,7 @@ export class BrowserWindow<T extends RPCWithTransport = RPCWithTransport> {
 		hidden,
 		activate,
 	}: Partial<WindowOptionsType<T>>) {
-		this.ptr = ffi.request.createWindow({
-			id: this.id,
+		const windowId = ffi.request.createWindow({
 			title: this.title,
 			url: this.url || "",
 			frame: {
@@ -221,7 +205,13 @@ export class BrowserWindow<T extends RPCWithTransport = RPCWithTransport> {
 			hidden: hidden ?? false,
 			activate: activate ?? true,
 			trafficLightOffset: this.trafficLightOffset,
-		}) as Pointer;
+		});
+
+		if (!windowId) {
+			throw "Failed to create window";
+		}
+
+		this.id = windowId as number;
 
 		BrowserWindowMap[this.id] = this;
 

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

@@ -1,3 +1,5 @@
+import { readFileSync } from "fs";
+
 export type BuildConfigType = {
 	defaultRenderer: "native" | "cef";
 	availableRenderers: ("native" | "cef")[];
@@ -11,6 +13,13 @@ export type BuildConfigType = {
 
 let buildConfig: BuildConfigType | null = null;
 
+function fallbackBuildConfig(): BuildConfigType {
+	return {
+		defaultRenderer: "native",
+		availableRenderers: ["native"],
+	};
+}
+
 const BuildConfig = {
 	/**
 	 * Get the build configuration. Loads from build.json on first call, then returns cached value.
@@ -26,10 +35,28 @@ const BuildConfig = {
 			return buildConfig!;
 		} catch (error) {
 			// Fallback for dev mode or missing file
-			buildConfig = {
-				defaultRenderer: "native",
-				availableRenderers: ["native"],
-			};
+			buildConfig = fallbackBuildConfig();
+			return buildConfig;
+		}
+	},
+
+	/**
+	 * Get the build configuration synchronously.
+	 * Useful for modules that cannot use top-level await.
+	 */
+	getSync: (): BuildConfigType => {
+		if (buildConfig) {
+			return buildConfig;
+		}
+
+		try {
+			const resourcesDir = "Resources";
+			buildConfig = JSON.parse(
+				readFileSync(`../${resourcesDir}/build.json`, "utf8"),
+			) as BuildConfigType;
+			return buildConfig;
+		} catch (error) {
+			buildConfig = fallbackBuildConfig();
 			return buildConfig;
 		}
 	},

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

@@ -2,7 +2,7 @@ import { ffi } from "../proc/native";
 import electrobunEventEmitter from "../events/eventEmitter";
 import { type Pointer } from "bun:ffi";
 import { WGPUView } from "./WGPUView";
-import { getNextWindowId } from "./windowIds";
+import { BuildConfig } from "./BuildConfig";
 
 
 export type GpuWindowOptionsType = {
@@ -35,11 +35,16 @@ const defaultOptions: GpuWindowOptionsType = {
 	transparent: false,
 };
 
+const buildConfig = BuildConfig.getSync();
+ffi.request.setExitOnLastWindowClosed({
+	enabled: buildConfig.runtime?.exitOnLastWindowClosed ?? true,
+});
+
 export const GpuWindowMap: {
 	[id: number]: GpuWindow;
 } = {};
 
-// Clean up the window map when a window closes and optionally quit the app
+// Clean up JS wrapper state when a window closes. Native child cleanup is core-owned.
 electrobunEventEmitter.on("close", (event: { data: { id: number } }) => {
 	const windowId = event.data.id;
 	delete GpuWindowMap[windowId];
@@ -54,8 +59,7 @@ electrobunEventEmitter.on("close", (event: { data: { id: number } }) => {
 });
 
 export class GpuWindow {
-	id: number = getNextWindowId();
-	ptr!: Pointer;
+	id = 0;
 	title: string = "Electrobun";
 	state: "creating" | "created" = "creating";
 	transparent: boolean = false;
@@ -73,6 +77,10 @@ export class GpuWindow {
 	};
 	wgpuViewId!: number;
 
+	get ptr(): Pointer | null {
+		return ffi.request.getWindowPointer({ winId: this.id }) as Pointer | null;
+	}
+
 	constructor(options: Partial<GpuWindowOptionsType> = defaultOptions) {
 		this.title = options.title || "New Window";
 		this.frame = options.frame
@@ -93,8 +101,7 @@ export class GpuWindow {
 		transparent,
 		activate,
 	}: Partial<GpuWindowOptionsType>) {
-		this.ptr = ffi.request.createWindow({
-			id: this.id,
+		const windowId = ffi.request.createWindow({
 			title: this.title,
 			url: "",
 			frame: {
@@ -136,7 +143,13 @@ export class GpuWindow {
 			transparent: transparent ?? false,
 			activate: activate ?? true,
 			trafficLightOffset: this.trafficLightOffset,
-		}) as Pointer;
+		});
+
+		if (!windowId) {
+			throw "Failed to create window";
+		}
+
+		this.id = windowId as number;
 
 		GpuWindowMap[this.id] = this;
 

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

@@ -1,205 +1,22 @@
-import type { Server, ServerWebSocket } from "bun";
-import { BrowserView } from "./BrowserView";
-import { createCipheriv, createDecipheriv, randomBytes } from "crypto";
-
-function base64ToUint8Array(base64: string) {
-	{
-		return new Uint8Array(
-			atob(base64)
-				.split("")
-				.map((char) => char.charCodeAt(0)),
-		);
-	}
-}
-
-// Encrypt function
-function encrypt(secretKey: Uint8Array, text: string) {
-	const iv = new Uint8Array(randomBytes(12)); // IV for AES-GCM
-	const cipher = createCipheriv("aes-256-gcm", secretKey, iv);
-	const encrypted = Buffer.concat([
-		new Uint8Array(cipher.update(text, "utf8")),
-		new Uint8Array(cipher.final()),
-	]).toString("base64");
-	const tag = cipher.getAuthTag().toString("base64");
-	return { encrypted, iv: Buffer.from(iv).toString("base64"), tag };
-}
-
-// Decrypt function
-function decrypt(
-	secretKey: Uint8Array,
-	encryptedData: Uint8Array,
-	iv: Uint8Array,
-	tag: Uint8Array,
-) {
-	const decipher = createDecipheriv("aes-256-gcm", secretKey, iv);
-	decipher.setAuthTag(tag);
-	const decrypted = Buffer.concat([
-		new Uint8Array(decipher.update(encryptedData)),
-		new Uint8Array(decipher.final()),
-	]);
-	return decrypted.toString("utf8");
-}
-
-export const socketMap: {
-	[webviewId: string]: {
-		socket: null | ServerWebSocket<unknown>;
-		queue: string[];
-	};
-} = {};
+import { ffi } from "../proc/native";
 
 export const removeSocketForWebview = (webviewId: number) => {
-	const rpc = socketMap[webviewId];
-	if (!rpc) return;
-
-	rpc.socket = null;
-	delete socketMap[webviewId];
+	ffi.request.clearWebviewHostTransport({ id: webviewId });
 };
 
-const startRPCServer = () => {
-	const startPort = 50000;
-	const endPort = 65535;
-	const payloadLimit = 1024 * 1024 * 500; // 500MB
-	let port = startPort;
-	let server = null;
-
-	while (port <= endPort) {
-		try {
-			server = Bun.serve<{ webviewId: number }>({
-				port,
-				fetch(req: Request, server: Server<{ webviewId: number }>) {
-					const url = new URL(req.url);
-					//   const token = new URL(req.url).searchParams.get("token");
-					//   if (token !== AUTH_TOKEN)
-					//     return new Response("Unauthorized", { status: 401 });
-					//   console.log("fetch!!", url.pathname);
-					if (url.pathname === "/socket") {
-						const webviewIdString = url.searchParams.get("webviewId");
-						if (!webviewIdString) {
-							return new Response("Missing webviewId", { status: 400 });
-						}
-						const webviewId = parseInt(webviewIdString, 10);
-						const success = server.upgrade(req, { data: { webviewId } });
-						return success
-							? undefined
-							: new Response("Upgrade failed", { status: 500 });
-					}
-
-					console.log("unhandled RPC Server request", req.url);
-				},
-				websocket: {
-					idleTimeout: 960,
-					// 500MB max payload should be plenty
-					maxPayloadLength: payloadLimit,
-					// Anything beyond the backpressure limit will be dropped
-					backpressureLimit: payloadLimit * 2,
-					open(ws: ServerWebSocket<{ webviewId: number }>) {
-						if (!ws?.data) {
-							return;
-						}
-						const { webviewId } = ws.data;
-
-						if (!socketMap[webviewId]) {
-							socketMap[webviewId] = { socket: ws, queue: [] };
-						} else {
-							socketMap[webviewId].socket = ws;
-						}
-					},
-					close(ws: ServerWebSocket<{ webviewId: number }>, _code: number, _reason: string) {
-						if (!ws?.data) {
-							return;
-						}
-						const { webviewId } = ws.data;
-						// console.log("Closed:", webviewId, code, reason);
-						if (socketMap[webviewId]) {
-							socketMap[webviewId].socket = null;
-						}
-					},
-
-					message(ws: ServerWebSocket<{ webviewId: number }>, message: string | Buffer) {
-						if (!ws?.data) {
-							return;
-						}
-						const { webviewId } = ws.data;
-						const browserView = BrowserView.getById(webviewId);
-						if (!browserView) {
-							return;
-						}
-
-						if (browserView.rpcHandler) {
-							if (typeof message === "string") {
-								try {
-									const encryptedPacket = JSON.parse(message);
-									const decrypted = decrypt(
-										browserView.secretKey,
-										base64ToUint8Array(encryptedPacket.encryptedData),
-										base64ToUint8Array(encryptedPacket.iv),
-										base64ToUint8Array(encryptedPacket.tag),
-									);
-
-									// Note: At this point the secretKey for the webview id would
-									// have had to match the encrypted packet data, so we can trust
-									// that this message can be passed to this browserview's rpc
-									// methods.
-									browserView.rpcHandler(JSON.parse(decrypted));
-								} catch (error) {
-									console.log("Error handling message:", error);
-								}
-							} else if (message instanceof ArrayBuffer) {
-								console.log("TODO: Received ArrayBuffer message:", message);
-							}
-						}
-					},
-				},
-			});
-
-			break;
-		} catch (error: any) {
-			if (error.code === "EADDRINUSE") {
-				console.log(`Port ${port} in use, trying next port...`);
-				port++;
-			} else {
-				throw error;
-			}
-		}
-	}
-
-	return { rpcServer: server, rpcPort: port };
-};
-
-export const { rpcServer, rpcPort } = startRPCServer();
-
-// Will return true if message was sent over websocket
-// false if it was not (caller should fallback to postMessage/evaluateJS rpc)
+// Will return true if message was sent over the core-owned websocket transport.
+// False means the caller should fall back to the native bridge / evaluateJS path.
 export const sendMessageToWebviewViaSocket = (
 	webviewId: number,
-	message: any,
+	message: unknown,
 ): boolean => {
-	const rpc = socketMap[webviewId];
-	const browserView = BrowserView.getById(webviewId);
-
-	if (!browserView) return false;
-
-	if (rpc?.socket?.readyState === WebSocket.OPEN) {
-		try {
-			const unencryptedString = JSON.stringify(message);
-			const encrypted = encrypt(browserView.secretKey, unencryptedString);
-
-			const encryptedPacket = {
-				encryptedData: encrypted.encrypted,
-				iv: encrypted.iv,
-				tag: encrypted.tag,
-			};
-
-			const encryptedPacketString = JSON.stringify(encryptedPacket);
-
-			rpc.socket.send(encryptedPacketString);
-			return true;
-		} catch (error) {
-			console.error("Error sending message to webview via socket:", error);
-		}
+	try {
+		return ffi.request.sendHostMessageToWebviewViaTransport({
+			id: webviewId,
+			messageJson: JSON.stringify(message),
+		}) as boolean;
+	} catch (error) {
+		console.error("Error sending message to webview via host transport:", error);
+		return false;
 	}
-
-	return false;
 };
-
-console.log("Server started at", rpcServer?.url.origin);

package/dist/api/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/core/Utils.ts

@@ -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();