electrobun 1.18.1 → 1.18.4-beta.3

package/README.md

@@ -66,6 +66,7 @@ Don't miss our:
 - [Marginalia](https://github.com/lars-hoeijmans/Marginalia) - a simple note taking app
 - [MarkBun](https://github.com/xiaochong/markbun) - fast, beautiful, Typora-like markdown desktop editor
 - [md-browse](https://github.com/needle-tools/md-browse) - a markdown-first browser that converts web pages to clean markdown
+- [moop](https://github.com/zrubinrattet/moop/) - desktop app for batch image optimization for the web
 - [Patchline](https://github.com/adwaithks/Patchline) - lightweight desktop Git client for reading patches and line diffs, then staging and committing changes
 - [peekachu](https://github.com/needle-tools/peekachu) - password manager for AIs; store secrets in your OS keychain and scrub output so AI assistants never see actual values
 - [PiBun](https://github.com/khairold/pibun) - desktop GUI for the Pi coding agent with chat, terminal, git integration, and plugin system

package/dist/api/bun/ElectrobunConfig.ts

@@ -112,6 +112,14 @@ export interface ElectrobunConfig {
 	 * Build configuration options
 	 */
 	build?: {
+		/**
+		 * Main process implementation to build and package.
+		 * - "bun": bundle and run the Bun main process entrypoint
+		 * - "zig": compile and run the Zig main process entrypoint
+		 * @default "bun"
+		 */
+		mainProcess?: "bun" | "zig";
+
 		/**
 		 * Bun process build configuration.
 		 * Accepts all Bun.build() options (plugins, sourcemap, minify, define, etc.)
@@ -125,6 +133,18 @@ export interface ElectrobunConfig {
 			entrypoint?: string;
 		} & BunBuildOptions;
 
+		/**
+		 * Zig main process build configuration.
+		 * Used when `build.mainProcess` is set to `"zig"`.
+		 */
+		zig?: {
+			/**
+			 * Entry point for the main Zig process
+			 * @default "src/zig/main.zig"
+			 */
+			entrypoint?: string;
+		};
+
 		/**
 		 * Browser view build configurations.
 		 * Each view accepts all Bun.build() options (plugins, sourcemap, minify, define, etc.)

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

@@ -1,5 +1,4 @@
-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,
@@ -7,10 +6,8 @@ import {
 	type RPCWithTransport,
 	defineElectrobunRPC,
 } from "../../shared/rpc.js";
-import { Updater } from "./Updater";
 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({
@@ -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.
@@ -345,7 +331,6 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 		if (!this.ptr || 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,10 +341,7 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
 			unregisterHandler() {},
 		});
 		this.rpcHandler = undefined;
-    
-    this.rpcHandler = undefined;
-    this.ptr = null;
-    native!.symbols.webviewRemove(ptr);
+		ffi.request.webviewRemove({ id: this.id });
 	}
 
 	static getById(id: number) {

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

@@ -5,11 +5,10 @@ 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();
 
 export type WindowOptionsType<T = undefined> = {
 	trafficLightOffset?: {
@@ -116,8 +115,7 @@ electrobunEventEmitter.on("close", (event: { data: { id: number } }) => {
 });
 
 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 +144,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 +179,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 +222,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,6 @@ import { ffi } from "../proc/native";
 import electrobunEventEmitter from "../events/eventEmitter";
 import { type Pointer } from "bun:ffi";
 import { WGPUView } from "./WGPUView";
-import { getNextWindowId } from "./windowIds";
 
 
 export type GpuWindowOptionsType = {
@@ -54,8 +53,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 +71,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 +95,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 +137,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/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");
 	}