bunite-core 0.0.1 → 0.0.3

package/src/bun/proc/native.ts

@@ -3,6 +3,7 @@ import { existsSync } from "node:fs";
 import { delimiter, join } from "node:path";
 import { buniteEventEmitter } from "../events/eventEmitter";
 import { resolveNativeArtifacts, type ResolvedNativeArtifacts } from "../../shared/paths";
+import { log } from "../../shared/log";
 
 export type NativeBootstrapOptions = {
   allowStub?: boolean;
@@ -21,6 +22,8 @@ export type NativeRuntimeState = {
 type CStringPointer = Pointer;
 
 type NativeSymbols = {
+  bunite_abi_version: () => number;
+  bunite_set_log_level: (level: number) => void;
   bunite_init: (
     processHelperPath: CStringPointer,
     cefDir: CStringPointer,
@@ -43,18 +46,20 @@ type NativeSymbols = {
     hidden: boolean,
     minimized: boolean,
     maximized: boolean
-  ) => Pointer;
-  bunite_window_show: (windowPtr: Pointer) => void;
-  bunite_window_close: (windowPtr: Pointer) => void;
-  bunite_window_set_title: (windowPtr: Pointer, title: CStringPointer) => void;
-  bunite_window_minimize: (windowPtr: Pointer) => void;
-  bunite_window_unminimize: (windowPtr: Pointer) => void;
-  bunite_window_is_minimized: (windowPtr: Pointer) => boolean;
-  bunite_window_maximize: (windowPtr: Pointer) => void;
-  bunite_window_unmaximize: (windowPtr: Pointer) => void;
-  bunite_window_is_maximized: (windowPtr: Pointer) => boolean;
+  ) => boolean;
+  bunite_window_destroy: (windowId: number) => void;
+  bunite_window_reset_close_pending: (windowId: number) => void;
+  bunite_window_show: (windowId: number) => void;
+  bunite_window_close: (windowId: number) => void;
+  bunite_window_set_title: (windowId: number, title: CStringPointer) => void;
+  bunite_window_minimize: (windowId: number) => void;
+  bunite_window_unminimize: (windowId: number) => void;
+  bunite_window_is_minimized: (windowId: number) => boolean;
+  bunite_window_maximize: (windowId: number) => void;
+  bunite_window_unmaximize: (windowId: number) => void;
+  bunite_window_is_maximized: (windowId: number) => boolean;
   bunite_window_set_frame: (
-    windowPtr: Pointer,
+    windowId: number,
     x: number,
     y: number,
     width: number,
@@ -62,7 +67,7 @@ type NativeSymbols = {
   ) => void;
   bunite_view_create: (
     viewId: number,
-    windowPtr: Pointer | null,
+    windowId: number,
     url: CStringPointer,
     html: CStringPointer,
     preload: CStringPointer,
@@ -73,24 +78,31 @@ type NativeSymbols = {
     width: number,
     height: number,
     autoResize: boolean,
-    sandbox: boolean
-  ) => Pointer;
-  bunite_register_view_route: (path: CStringPointer) => void;
-  bunite_unregister_view_route: (path: CStringPointer) => void;
+    sandbox: boolean,
+    preloadOriginsJson: CStringPointer
+  ) => boolean;
+  bunite_register_appres_route: (path: CStringPointer) => void;
+  bunite_unregister_appres_route: (path: CStringPointer) => void;
   bunite_complete_route_request: (requestId: number, html: CStringPointer) => void;
-  bunite_view_set_visible: (viewPtr: Pointer, visible: boolean) => void;
-  bunite_view_set_bounds: (viewPtr: Pointer, x: number, y: number, width: number, height: number) => void;
-  bunite_view_set_anchor: (viewPtr: Pointer, mode: number, inset: number) => void;
-  bunite_view_go_back: (viewPtr: Pointer) => void;
-  bunite_view_reload: (viewPtr: Pointer) => void;
-  bunite_view_load_url: (viewPtr: Pointer, url: CStringPointer) => void;
-  bunite_view_load_html: (viewPtr: Pointer, html: CStringPointer) => void;
-  bunite_view_remove: (viewPtr: Pointer) => void;
-  bunite_view_open_devtools: (viewPtr: Pointer) => void;
-  bunite_view_close_devtools: (viewPtr: Pointer) => void;
-  bunite_view_toggle_devtools: (viewPtr: Pointer) => void;
+  bunite_view_set_visible: (viewId: number, visible: boolean) => void;
+  bunite_view_set_input_passthrough: (viewId: number, passthrough: boolean) => void;
+  bunite_view_set_mask_region: (viewId: number, rects: Pointer, count: number) => void;
+  bunite_view_bring_to_front: (viewId: number) => void;
+  bunite_view_set_bounds: (viewId: number, x: number, y: number, width: number, height: number) => void;
+  bunite_view_set_bounds_async: (viewId: number, x: number, y: number, width: number, height: number) => void;
+  bunite_view_set_anchor: (viewId: number, mode: number, inset: number) => void;
+  bunite_view_go_back: (viewId: number) => void;
+  bunite_view_reload: (viewId: number) => void;
+  bunite_view_execute_javascript: (viewId: number, script: CStringPointer) => void;
+  bunite_view_load_url: (viewId: number, url: CStringPointer) => void;
+  bunite_view_load_html: (viewId: number, html: CStringPointer) => void;
+  bunite_view_remove: (viewId: number) => void;
+  bunite_view_open_devtools: (viewId: number) => void;
+  bunite_view_close_devtools: (viewId: number) => void;
+  bunite_view_toggle_devtools: (viewId: number) => void;
   bunite_complete_permission_request: (requestId: number, state: number) => void;
   bunite_show_message_box: (
+    windowId: number,
     type: CStringPointer,
     title: CStringPointer,
     message: CStringPointer,
@@ -99,16 +111,6 @@ type NativeSymbols = {
     defaultId: number,
     cancelId: number
   ) => number;
-  bunite_show_browser_message_box: (
-    type: CStringPointer,
-    title: CStringPointer,
-    message: CStringPointer,
-    detail: CStringPointer,
-    buttons: CStringPointer,
-    defaultId: number,
-    cancelId: number
-  ) => number;
-  bunite_cancel_browser_message_box: (requestId: number) => void;
   bunite_set_webview_event_handler: (handler: JSCallback) => void;
   bunite_set_window_event_handler: (handler: JSCallback) => void;
 };
@@ -121,6 +123,14 @@ const messageBoxButtonSeparator = "\x1f";
 const unsetCancelId = -1;
 
 const nativeSymbolDefinitions = {
+  bunite_abi_version: {
+    args: [],
+    returns: FFIType.i32
+  },
+  bunite_set_log_level: {
+    args: [FFIType.i32],
+    returns: FFIType.void
+  },
   bunite_init: {
     args: [FFIType.cstring, FFIType.cstring, FFIType.bool, FFIType.bool, FFIType.cstring],
     returns: FFIType.bool
@@ -151,52 +161,60 @@ const nativeSymbolDefinitions = {
       FFIType.bool,
       FFIType.bool
     ],
-    returns: FFIType.ptr
+    returns: FFIType.bool
+  },
+  bunite_window_destroy: {
+    args: [FFIType.u32],
+    returns: FFIType.void
+  },
+  bunite_window_reset_close_pending: {
+    args: [FFIType.u32],
+    returns: FFIType.void
   },
   bunite_window_show: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_window_close: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_window_set_title: {
-    args: [FFIType.ptr, FFIType.cstring],
+    args: [FFIType.u32, FFIType.cstring],
     returns: FFIType.void
   },
   bunite_window_minimize: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_window_unminimize: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_window_is_minimized: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.bool
   },
   bunite_window_maximize: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_window_unmaximize: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_window_is_maximized: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.bool
   },
   bunite_window_set_frame: {
-    args: [FFIType.ptr, FFIType.f64, FFIType.f64, FFIType.f64, FFIType.f64],
+    args: [FFIType.u32, FFIType.f64, FFIType.f64, FFIType.f64, FFIType.f64],
     returns: FFIType.void
   },
   bunite_view_create: {
     args: [
       FFIType.u32,
-      FFIType.ptr,
+      FFIType.u32,
       FFIType.cstring,
       FFIType.cstring,
       FFIType.cstring,
@@ -207,15 +225,16 @@ const nativeSymbolDefinitions = {
       FFIType.f64,
       FFIType.f64,
       FFIType.bool,
-      FFIType.bool
+      FFIType.bool,
+      FFIType.cstring
     ],
-    returns: FFIType.ptr
+    returns: FFIType.bool
   },
-  bunite_register_view_route: {
+  bunite_register_appres_route: {
     args: [FFIType.cstring],
     returns: FFIType.void
   },
-  bunite_unregister_view_route: {
+  bunite_unregister_appres_route: {
     args: [FFIType.cstring],
     returns: FFIType.void
   },
@@ -224,47 +243,67 @@ const nativeSymbolDefinitions = {
     returns: FFIType.void
   },
   bunite_view_set_visible: {
-    args: [FFIType.ptr, FFIType.bool],
+    args: [FFIType.u32, FFIType.bool],
+    returns: FFIType.void
+  },
+  bunite_view_set_input_passthrough: {
+    args: [FFIType.u32, FFIType.bool],
+    returns: FFIType.void
+  },
+  bunite_view_set_mask_region: {
+    args: [FFIType.u32, FFIType.pointer, FFIType.u32],
+    returns: FFIType.void
+  },
+  bunite_view_bring_to_front: {
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_view_set_bounds: {
-    args: [FFIType.ptr, FFIType.f64, FFIType.f64, FFIType.f64, FFIType.f64],
+    args: [FFIType.u32, FFIType.f64, FFIType.f64, FFIType.f64, FFIType.f64],
+    returns: FFIType.void
+  },
+  bunite_view_set_bounds_async: {
+    args: [FFIType.u32, FFIType.f64, FFIType.f64, FFIType.f64, FFIType.f64],
     returns: FFIType.void
   },
   bunite_view_set_anchor: {
-    args: [FFIType.ptr, FFIType.i32, FFIType.f64],
+    args: [FFIType.u32, FFIType.i32, FFIType.f64],
     returns: FFIType.void
   },
   bunite_view_go_back: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_view_reload: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
+    returns: FFIType.void
+  },
+  bunite_view_execute_javascript: {
+    args: [FFIType.u32, FFIType.cstring],
     returns: FFIType.void
   },
   bunite_view_load_url: {
-    args: [FFIType.ptr, FFIType.cstring],
+    args: [FFIType.u32, FFIType.cstring],
     returns: FFIType.void
   },
   bunite_view_load_html: {
-    args: [FFIType.ptr, FFIType.cstring],
+    args: [FFIType.u32, FFIType.cstring],
     returns: FFIType.void
   },
   bunite_view_remove: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_view_open_devtools: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_view_close_devtools: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_view_toggle_devtools: {
-    args: [FFIType.ptr],
+    args: [FFIType.u32],
     returns: FFIType.void
   },
   bunite_complete_permission_request: {
@@ -273,6 +312,7 @@ const nativeSymbolDefinitions = {
   },
   bunite_show_message_box: {
     args: [
+      FFIType.u32,
       FFIType.cstring,
       FFIType.cstring,
       FFIType.cstring,
@@ -283,22 +323,6 @@ const nativeSymbolDefinitions = {
     ],
     returns: FFIType.i32
   },
-  bunite_show_browser_message_box: {
-    args: [
-      FFIType.cstring,
-      FFIType.cstring,
-      FFIType.cstring,
-      FFIType.cstring,
-      FFIType.cstring,
-      FFIType.i32,
-      FFIType.i32
-    ],
-    returns: FFIType.u32
-  },
-  bunite_cancel_browser_message_box: {
-    args: [FFIType.u32],
-    returns: FFIType.void
-  },
   bunite_set_webview_event_handler: {
     args: [FFIType.function],
     returns: FFIType.void
@@ -320,6 +344,19 @@ export function setRouteRequestHandler(handler: (requestId: number, path: string
   routeRequestHandler = handler;
 }
 
+// Per-view deferred resolvers for "view-ready" (OnAfterCreated).
+const viewReadyResolvers = new Map<number, () => void>();
+
+export function waitForViewReady(viewId: number): Promise<void> {
+  return new Promise((resolve) => {
+    viewReadyResolvers.set(viewId, resolve);
+  });
+}
+
+export function cancelWaitForViewReady(viewId: number) {
+  viewReadyResolvers.delete(viewId);
+}
+
 export function toCString(value: string): CStringPointer {
   const normalized = value.endsWith("\0") ? value : `${value}\0`;
   const buffer = Buffer.from(normalized, "utf8");
@@ -365,7 +402,7 @@ function tryLoadNativeLibrary(artifacts: ResolvedNativeArtifacts) {
       symbols: library.symbols as unknown as NativeSymbols
     } satisfies LoadedNativeLibrary;
   } catch (error) {
-    console.warn("[bunite] Failed to load native library via FFI.", error);
+    log.warn("Failed to load native library via FFI.", error);
     return null;
   }
 }
@@ -427,19 +464,19 @@ function registerNativeCallbacks(library: LoadedNativeLibrary) {
               viewId
             );
             break;
-          case "message-box-response":
-            buniteEventEmitter.emitEvent(
-              buniteEventEmitter.events.webview.messageBoxResponse(
-                maybeParsePayload(payload) as { requestId: number; response: number }
-              ),
-              viewId
-            );
-            break;
           case "route-request": {
             const parsed = maybeParsePayload(payload) as { requestId: number; path: string };
             routeRequestHandler?.(parsed.requestId, parsed.path);
             break;
           }
+          case "view-ready": {
+            const resolver = viewReadyResolvers.get(viewId);
+            if (resolver) {
+              viewReadyResolvers.delete(viewId);
+              resolver();
+            }
+            break;
+          }
         }
       },
       {
@@ -460,6 +497,23 @@ function registerNativeCallbacks(library: LoadedNativeLibrary) {
         const parsedPayload = maybeParsePayload(payload);
 
         switch (eventName) {
+          case "all-windows-closed":
+            buniteEventEmitter.emitEvent(
+              buniteEventEmitter.events.app.allWindowsClosed()
+            );
+            break;
+          case "close-requested": {
+            const crEvent = buniteEventEmitter.events.window.closeRequested({ id: windowId });
+            buniteEventEmitter.emitEvent(crEvent, windowId);
+            if (crEvent.responseWasSet && crEvent.response?.allow === false) {
+              nativeLibrary?.symbols.bunite_window_reset_close_pending(windowId);
+            } else {
+              queueMicrotask(() => {
+                nativeLibrary?.symbols.bunite_window_destroy(windowId);
+              });
+            }
+            break;
+          }
           case "close":
             buniteEventEmitter.emitEvent(
               buniteEventEmitter.events.window.close({ id: windowId }),
@@ -557,6 +611,14 @@ export async function initNativeRuntime(
   nativeLibrary = hasNativeArtifacts ? tryLoadNativeLibrary(artifacts) : null;
 
   if (nativeLibrary) {
+    const EXPECTED_ABI = 2;
+    const nativeAbi = nativeLibrary.symbols.bunite_abi_version();
+    if (nativeAbi !== EXPECTED_ABI) {
+      throw new Error(
+        `bunite native ABI mismatch: JS expects ${EXPECTED_ABI}, native reports ${nativeAbi}. ` +
+        `Rebuild native binaries with 'bun run build:native:win'.`
+      );
+    }
     registerNativeCallbacks(nativeLibrary);
     const chromiumFlagsJson = options.chromiumFlags
       ? JSON.stringify(options.chromiumFlags)
@@ -578,9 +640,7 @@ export async function initNativeRuntime(
   }
 
   if (!nativeLibrary) {
-    console.warn(
-      "[bunite] Native runtime packages were not found or could not be loaded. Initializing in stub mode."
-    );
+    log.warn("Native runtime packages were not found or could not be loaded. Initializing in stub mode.");
   }
 
   state = {
@@ -607,11 +667,15 @@ export function getNativeLibrary(): LoadedNativeLibrary | null {
   return nativeLibrary;
 }
 
+export function setNativeLogLevel(level: number): void {
+  nativeLibrary?.symbols.bunite_set_log_level(level);
+}
+
 export function completePermissionRequest(requestId: number, stateValue: number): void {
   nativeLibrary?.symbols.bunite_complete_permission_request(requestId, stateValue);
 }
 
-export function showNativeMessageBox(params: {
+export function showNativeMessageBox(windowId: number, params: {
   type?: string;
   title?: string;
   message?: string;
@@ -626,6 +690,7 @@ export function showNativeMessageBox(params: {
   }
 
   return native.symbols.bunite_show_message_box(
+    windowId,
     toCString(params.type ?? "info"),
     toCString(params.title ?? ""),
     toCString(params.message ?? ""),
@@ -635,32 +700,3 @@ export function showNativeMessageBox(params: {
     params.cancelId ?? unsetCancelId
   );
 }
-
-export function requestBrowserMessageBox(params: {
-  type?: string;
-  title?: string;
-  message?: string;
-  detail?: string;
-  buttons?: string[];
-  defaultId?: number;
-  cancelId?: number;
-}): number {
-  const native = getNativeLibrary();
-  if (!native) {
-    return 0;
-  }
-
-  return native.symbols.bunite_show_browser_message_box(
-    toCString(params.type ?? "info"),
-    toCString(params.title ?? ""),
-    toCString(params.message ?? ""),
-    toCString(params.detail ?? ""),
-    toCString((params.buttons ?? ["OK"]).join(messageBoxButtonSeparator)),
-    params.defaultId ?? 0,
-    params.cancelId ?? unsetCancelId
-  );
-}
-
-export function cancelBrowserMessageBoxRequest(requestId: number): void {
-  getNativeLibrary()?.symbols.bunite_cancel_browser_message_box(requestId);
-}

package/src/native/shared/callbacks.h

@@ -1,6 +1,6 @@
-#pragma once
-
-#include <cstdint>
-
-typedef void (*BuniteWebviewEventHandler)(uint32_t view_id, const char* event_name, const char* payload);
-typedef void (*BuniteWindowEventHandler)(uint32_t window_id, const char* event_name, const char* payload);
+#pragma once
+
+#include <cstdint>
+
+typedef void (*BuniteWebviewEventHandler)(uint32_t view_id, const char* event_name, const char* payload);
+typedef void (*BuniteWindowEventHandler)(uint32_t window_id, const char* event_name, const char* payload);