electrobun 1.18.1 → 1.18.4-beta.10

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

@@ -1,16 +1,13 @@
-import { native, toCString, ffi } from "../proc/native";
-import * as fs from "fs";
+import { ffi } from "../proc/native";
 import electrobunEventEmitter from "../events/eventEmitter";
 import {
 	type ElectrobunRPCSchema,
 	type ElectrobunRPCConfig,
 	type RPCWithTransport,
 	defineElectrobunRPC,
-} from "../../shared/rpc.js";
-import { Updater } from "./Updater";
+} from "../../../shared/rpc.js";
 import { BuildConfig } from "./BuildConfig";
 import {
-	rpcPort,
 	sendMessageToWebviewViaSocket,
 	removeSocketForWebview,
 } from "./Socket";
@@ -20,7 +17,6 @@ import { type Pointer } from "bun:ffi";
 const BrowserViewMap: {
 	[id: number]: BrowserView<any>;
 } = {};
-let nextWebviewId = 1;
 
 export type BrowserViewOptions<T = undefined> = {
 	url: string | null;
@@ -38,7 +34,6 @@ export type BrowserViewOptions<T = undefined> = {
 	rpc: T;
 	hostWebviewId: number;
 	autoResize: boolean;
-
 	windowId: number;
 	navigationRules: string | null;
 	// Sandbox mode: when true, disables RPC and only allows event emission
@@ -52,8 +47,7 @@ export type BrowserViewOptions<T = undefined> = {
 	// renderer:
 };
 
-const hash = await Updater.localInfo.hash();
-const buildConfig = await BuildConfig.get();
+const buildConfig = BuildConfig.getSync();
 
 const defaultOptions: Partial<BrowserViewOptions> = {
 	url: null,
@@ -68,13 +62,8 @@ const defaultOptions: Partial<BrowserViewOptions> = {
 		height: 600,
 	},
 };
-// Note: we use the build's hash to separate from different apps and different builds
-// but we also want a randomId to separate different instances of the same app
-const randomId = Math.random().toString(36).substring(7);
-
 export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
-	id: number = nextWebviewId++;
-	ptr: Pointer | null = null;
+	id = 0;
 	hostWebviewId?: number;
 	windowId!: number;
 	renderer!: "cef" | "native";
@@ -95,9 +84,6 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 		width: 800,
 		height: 600,
 	};
-	pipePrefix!: string;
-	inStream!: fs.WriteStream;
-	outStream!: ReadableStream<Uint8Array>;
 	secretKey!: Uint8Array;
 	rpc?: T;
 	rpcHandler?: (msg: unknown) => void;
@@ -108,6 +94,13 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 	startPassthrough: boolean = false;
 	isRemoved: boolean = false;
 
+	get ptr(): Pointer | null {
+		if (this.isRemoved) {
+			return null;
+		}
+		return ffi.request.getWebviewPointer({ id: this.id }) as Pointer | null;
+	}
+
 	constructor(options: Partial<BrowserViewOptions<T>> = defaultOptions) {
 		// const rpc = options.rpc;
 
@@ -124,9 +117,6 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 		this.rpc = options.rpc;
 		this.secretKey = new Uint8Array(randomBytes(32));
 		this.partition = options.partition || null;
-		// todo (yoav): since collisions can crash the app add a function that checks if the
-		// file exists first
-		this.pipePrefix = `/private/tmp/electrobun_ipc_pipe_${hash}_${randomId}_${this.id}`;
 		this.hostWebviewId = options.hostWebviewId;
 		this.windowId = options.windowId ?? 0;
 		this.autoResize = options.autoResize === false ? false : true;
@@ -136,8 +126,8 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 		this.startTransparent = options.startTransparent ?? false;
 		this.startPassthrough = options.startPassthrough ?? false;
 
+		this.id = this.init() as number;
 		BrowserViewMap[this.id] = this;
-		this.ptr = this.init() as Pointer;
 
 		// If HTML content was provided, load it after webview creation.
 		if (this.html) {
@@ -148,21 +138,17 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 	}
 
 	init() {
-		this.createStreams();
+		this.initializeRpcTransport();
 
 		return ffi.request.createWebview({
-			id: this.id,
 			windowId: this.windowId,
+			hostWebviewId: this.hostWebviewId ?? null,
 			renderer: this.renderer,
-			rpcPort: rpcPort,
 			// todo: consider sending secretKey as base64
 			secretKey: this.secretKey.toString(),
-			hostWebviewId: this.hostWebviewId || null,
-			pipePrefix: this.pipePrefix,
 			partition: this.partition,
 			// Only pass URL if no HTML content is provided to avoid conflicts
 			url: this.html ? null : this.url,
-			html: this.html,
 			preload: this.preload,
 			viewsRoot: this.viewsRoot,
 			frame: {
@@ -180,7 +166,7 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 		});
 	}
 
-	createStreams() {
+	initializeRpcTransport() {
 		if (!this.rpc) {
 			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 			this.rpc = BrowserView.defineRPC({
@@ -191,23 +177,23 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 		this.rpc!.setTransport(this.createTransport());
 	}
 
-	sendMessageToWebviewViaExecute(jsonMessage: unknown) {
+	sendHostMessageToWebviewViaExecute(jsonMessage: unknown) {
 		const stringifiedMessage =
 			typeof jsonMessage === "string"
 				? jsonMessage
 				: JSON.stringify(jsonMessage);
 		// todo (yoav): make this a shared const with the browser api
-		const wrappedMessage = `window.__electrobun.receiveMessageFromBun(${stringifiedMessage})`;
+		const wrappedMessage = `window.__electrobun.receiveMessageFromHost(${stringifiedMessage})`;
 		this.executeJavascript(wrappedMessage);
 	}
 
-	sendInternalMessageViaExecute(jsonMessage: unknown) {
+	sendInternalHostMessageViaExecute(jsonMessage: unknown) {
 		const stringifiedMessage =
 			typeof jsonMessage === "string"
 				? jsonMessage
 				: JSON.stringify(jsonMessage);
 		// todo (yoav): make this a shared const with the browser api
-		const wrappedMessage = `window.__electrobun.receiveInternalMessageFromBun(${stringifiedMessage})`;
+		const wrappedMessage = `window.__electrobun.receiveInternalMessageFromHost(${stringifiedMessage})`;
 		this.executeJavascript(wrappedMessage);
 	}
 
@@ -224,7 +210,7 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 
 	loadURL(url: string) {
 		this.url = url;
-		native!.symbols.loadURLInWebView(this.ptr, toCString(this.url));
+		ffi.request.loadURLInWebView({ id: this.id, url: this.url });
 	}
 
 	loadHTML(html: string) {
@@ -232,18 +218,18 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 
 		if (this.renderer === "cef") {
 			// For CEF, store HTML content in native map and use scheme handler
-			native!.symbols.setWebviewHTMLContent(this.id, toCString(html));
+			ffi.request.setWebviewHTMLContent({ id: this.id, html });
 			this.loadURL("views://internal/index.html");
 		} else {
 			// For WKWebView, load HTML content directly
-			native!.symbols.loadHTMLInWebView(this.ptr, toCString(html));
+			ffi.request.loadHTMLInWebView({ id: this.id, html });
 		}
 	}
 
 	setNavigationRules(rules: string[]) {
 		this.navigationRules = JSON.stringify(rules);
 		const rulesJson = JSON.stringify(rules);
-		native!.symbols.setWebviewNavigationRules(this.ptr, toCString(rulesJson));
+		ffi.request.setWebviewNavigationRules({ id: this.id, rulesJson });
 	}
 
 	findInPage(
@@ -252,28 +238,28 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 	) {
 		const forward = options?.forward ?? true;
 		const matchCase = options?.matchCase ?? false;
-		native!.symbols.webviewFindInPage(
-			this.ptr,
-			toCString(searchText),
+		ffi.request.webviewFindInPage({
+			id: this.id,
+			searchText,
 			forward,
 			matchCase,
-		);
+		});
 	}
 
 	stopFindInPage() {
-		native!.symbols.webviewStopFind(this.ptr);
+		ffi.request.webviewStopFind({ id: this.id });
 	}
 
 	openDevTools() {
-		native!.symbols.webviewOpenDevTools(this.ptr);
+		ffi.request.webviewOpenDevTools({ id: this.id });
 	}
 
 	closeDevTools() {
-		native!.symbols.webviewCloseDevTools(this.ptr);
+		ffi.request.webviewCloseDevTools({ id: this.id });
 	}
 
 	toggleDevTools() {
-		native!.symbols.webviewToggleDevTools(this.ptr);
+		ffi.request.webviewToggleDevTools({ id: this.id });
 	}
 
 	/**
@@ -281,7 +267,7 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 	 * @param zoomLevel - The zoom level (1.0 = 100%, 1.5 = 150%, etc.)
 	 */
 	setPageZoom(zoomLevel: number) {
-		native!.symbols.webviewSetPageZoom(this.ptr, zoomLevel);
+		ffi.request.webviewSetPageZoom({ id: this.id, zoomLevel });
 	}
 
 	/**
@@ -289,7 +275,7 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 	 * @returns The current zoom level (1.0 = 100%)
 	 */
 	getPageZoom(): number {
-		return native!.symbols.webviewGetPageZoom(this.ptr) as number;
+		return ffi.request.webviewGetPageZoom({ id: this.id }) as number;
 	}
 
 	// todo (yoav): move this to a class that also has off, append, prepend, etc.
@@ -326,9 +312,9 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 				if (!sentOverSocket) {
 					try {
 						const messageString = JSON.stringify(message);
-						that.sendMessageToWebviewViaExecute(messageString);
+						that.sendHostMessageToWebviewViaExecute(messageString);
 					} catch (error) {
-						console.error("bun: failed to serialize message to webview", error);
+						console.error("host: failed to serialize message to webview", error);
 					}
 				}
 			},
@@ -342,10 +328,9 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 	};
 
 	remove() {
-		if (!this.ptr || this.isRemoved) {
+		if (this.isRemoved) {
 			return;
 		}
-		const ptr = this.ptr;
 		this.isRemoved = true;
 		// Drop JS-side references first so late callbacks cannot target a stale view.
 		delete BrowserViewMap[this.id];
@@ -356,16 +341,72 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 			unregisterHandler() {},
 		});
 		this.rpcHandler = undefined;
-    
-    this.rpcHandler = undefined;
-    this.ptr = null;
-    native!.symbols.webviewRemove(ptr);
+		try {
+			ffi.request.webviewRemove({ id: this.id });
+		} catch (error) {
+			console.error(`Error removing webview ${this.id}:`, error);
+		}
 	}
 
 	static getById(id: number) {
 		return BrowserViewMap[id];
 	}
 
+	// Core can create webviews before Bun has constructed a JS wrapper for them.
+	// Use this in native/runtime paths that need to ensure a wrapper exists.
+	static ensureWrapped<T extends RPCWithTransport = RPCWithTransport>(
+		id: number,
+		options: Partial<BrowserViewOptions<T>> = {},
+	) {
+		return (
+			(BrowserViewMap[id] as BrowserView<T> | undefined) ??
+			BrowserView.adoptExisting(id, options)
+		);
+	}
+
+	static adoptExisting<T extends RPCWithTransport = RPCWithTransport>(
+		id: number,
+		options: Partial<BrowserViewOptions<T>> = {},
+	) {
+		const existing = BrowserViewMap[id] as BrowserView<T> | undefined;
+		if (existing) {
+			return existing;
+		}
+
+		const ptr = ffi.request.getWebviewPointer({ id }) as Pointer | null;
+		if (!ptr) {
+			return undefined;
+		}
+
+		const view = Object.create(BrowserView.prototype) as BrowserView<T>;
+		view.id = id;
+		view.hostWebviewId = options.hostWebviewId;
+		view.windowId = options.windowId ?? 0;
+		view.renderer = options.renderer ?? defaultOptions.renderer ?? "native";
+		view.url = options.url ?? defaultOptions.url ?? null;
+		view.html = options.html ?? defaultOptions.html ?? null;
+		view.preload = options.preload ?? defaultOptions.preload ?? null;
+		view.viewsRoot = options.viewsRoot ?? defaultOptions.viewsRoot ?? null;
+		view.partition = options.partition ?? null;
+		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.secretKey = new Uint8Array(0);
+		view.rpc = options.rpc;
+		view.rpcHandler = undefined;
+		view.autoResize = options.autoResize === false ? false : true;
+		view.navigationRules = options.navigationRules ?? null;
+		view.sandbox = options.sandbox ?? false;
+		view.startTransparent = options.startTransparent ?? false;
+		view.startPassthrough = options.startPassthrough ?? false;
+		view.isRemoved = false;
+		BrowserViewMap[id] = view as BrowserView<any>;
+		return view;
+	}
+
 	static getAll() {
 		return Object.values(BrowserViewMap);
 	}

package/dist/api/{bun → sdks/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 { type RPCWithTransport } from "../../../shared/rpc.js";
 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 → sdks/bun}/core/BuildConfig.ts

@@ -1,8 +1,10 @@
+import { readFileSync } from "fs";
+
 export type BuildConfigType = {
+	mainProcess?: "cottontail" | "zig" | "rust" | "go" | "odin";
 	defaultRenderer: "native" | "cef";
 	availableRenderers: ("native" | "cef")[];
 	cefVersion?: string;
-	bunVersion?: string;
 	runtime?: {
 		exitOnLastWindowClosed?: boolean;
 		[key: string]: unknown;
@@ -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 → sdks/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/sdks/bun/core/Socket.ts

@@ -0,0 +1,22 @@
+import { ffi } from "../proc/native";
+
+export const removeSocketForWebview = (webviewId: number) => {
+	ffi.request.clearWebviewHostTransport({ id: webviewId });
+};
+
+// 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: unknown,
+): boolean => {
+	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;
+	}
+};