bunite-core 0.4.0 → 0.6.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bunite-core",
   "description": "Uniting UI and Bun",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "type": "module",
   "scripts": {
     "setup:cef": "bun ../tools/bunite-dev/scripts/setup-cef.ts",
@@ -12,7 +12,6 @@
     ".": "./src/bun/index.ts",
     "./bun": "./src/bun/index.ts",
     "./view": "./src/view/index.ts",
-    "./webview-polyfill": "./src/shared/webviewPolyfill.ts",
     "./shared/rpc": "./src/shared/rpc.ts",
     "./package.json": "./package.json"
   },

package/src/shared/rpc.ts

@@ -374,9 +374,7 @@ function defineSideRpc<
   Schema extends BuniteRpcSchema,
   Side extends "bun" | "webview"
 >(
-  config: BuniteRpcConfig<Schema, Side> & {
-    extraRequestHandlers?: Record<string, (...args: any[]) => unknown>;
-  }
+  config: BuniteRpcConfig<Schema, Side>
 ) {
   type RemoteSide = Side extends "bun" ? "webview" : "bun";
   type LocalSchema = {
@@ -390,10 +388,7 @@ function defineSideRpc<
 
   const rpc = createRpc<LocalSchema, RemoteSchema>({
     maxRequestTime: config.maxRequestTime,
-    requestHandler: {
-      ...(config.handlers.requests ?? {}),
-      ...(config.extraRequestHandlers ?? {})
-    } as RpcRequestHandler<LocalSchema["requests"]>,
+    requestHandler: config.handlers.requests,
     transport: {
       registerHandler: () => {}
     }
@@ -417,17 +412,13 @@ function defineSideRpc<
 }
 
 export function defineBunRpc<Schema extends BuniteRpcSchema>(
-  config: BuniteRpcConfig<Schema, "bun"> & {
-    extraRequestHandlers?: Record<string, (...args: any[]) => unknown>;
-  }
+  config: BuniteRpcConfig<Schema, "bun">
 ) {
   return defineSideRpc<Schema, "bun">(config);
 }
 
 export function defineWebviewRpc<Schema extends BuniteRpcSchema>(
-  config: BuniteRpcConfig<Schema, "webview"> & {
-    extraRequestHandlers?: Record<string, (...args: any[]) => unknown>;
-  }
+  config: BuniteRpcConfig<Schema, "webview">
 ) {
   return defineSideRpc<Schema, "webview">(config);
 }

package/src/shared/webRpcHandler.ts

@@ -12,9 +12,7 @@ export type WebRpcClient<Schema extends BuniteRpcSchema = BuniteRpcSchema> = {
 };
 
 export function createWebRpcHandler<Schema extends BuniteRpcSchema>(
-  config: BuniteRpcConfig<Schema, "bun"> & {
-    extraRequestHandlers?: Record<string, (...args: any[]) => unknown>;
-  }
+  config: BuniteRpcConfig<Schema, "bun">
 ) {
   type Entry = { client: WebRpcClient<Schema>; receive: (raw: ArrayBuffer | Uint8Array) => void };
 

package/src/shared/webviewPolyfill.ts

@@ -1,8 +1,11 @@
 // Iframe-based fallback for web browsers. No-op when the native element is already registered by the CEF preload.
-if (
-  typeof customElements !== "undefined" &&
-  !customElements.get("bunite-webview")
-) {
+// HTMLElement reference is lazy so this module is import-safe in Node/Bun.
+
+let cachedClass: CustomElementConstructor | null = null;
+
+function definePolyfillClass(): CustomElementConstructor {
+  if (cachedClass) return cachedClass;
+
   class BuniteWebviewPolyfill extends HTMLElement {
     static observedAttributes = ["src"];
 
@@ -69,5 +72,18 @@ if (
     }
   }
 
-  customElements.define("bunite-webview", BuniteWebviewPolyfill);
+  cachedClass = BuniteWebviewPolyfill;
+  return cachedClass;
+}
+
+/**
+ * Register the `<bunite-webview>` iframe polyfill. No-op in non-browser
+ * environments and when the native CEF preload has already registered the element.
+ * `BuniteView` calls this automatically on construction; call directly only when
+ * using `<bunite-webview>` markup without instantiating `BuniteView`.
+ */
+export function registerBuniteWebviewPolyfill() {
+  if (typeof customElements === "undefined") return;
+  if (customElements.get("bunite-webview")) return;
+  customElements.define("bunite-webview", definePolyfillClass());
 }

package/src/view/index.ts

@@ -1,4 +1,4 @@
-import "../shared/webviewPolyfill";
+import { registerBuniteWebviewPolyfill } from "../shared/webviewPolyfill";
 import {
   defineWebviewRpc,
   type BuniteRpcConfig,
@@ -24,11 +24,19 @@ type BuniteWindowGlobals = Window &
     __bunite_decrypt?: (data: Uint8Array) => Promise<Uint8Array>;
   };
 
-const buniteWindow = window as BuniteWindowGlobals;
-const WEBVIEW_ID = buniteWindow.__buniteWebviewId;
-const RPC_SOCKET_PORT = buniteWindow.__buniteRpcSocketPort;
+type BuniteEnv = {
+  window: BuniteWindowGlobals | null;
+  webviewId: number | undefined;
+  rpcPort: number | undefined;
+  isNative: boolean;
+};
 
-const isNative = WEBVIEW_ID != null && RPC_SOCKET_PORT != null;
+function readBuniteEnv(): BuniteEnv {
+  const w = typeof window !== "undefined" ? (window as BuniteWindowGlobals) : null;
+  const webviewId = w?.__buniteWebviewId;
+  const rpcPort = w?.__buniteRpcSocketPort;
+  return { window: w, webviewId, rpcPort, isNative: webviewId != null && rpcPort != null };
+}
 
 function toArrayBuffer(bytes: Uint8Array): ArrayBuffer {
   const copy = new Uint8Array(bytes.byteLength);
@@ -41,10 +49,13 @@ export class BuniteView<T extends RpcWithTransport = RpcWithTransport> {
   rpc?: T;
   readonly transport: RpcTransport;
 
+  private env: BuniteEnv;
   private handler?: (packet: RpcPacket) => void;
   private pendingPackets: RpcPacket[] = [];
 
   constructor(config?: { rpc?: T }) {
+    registerBuniteWebviewPolyfill();
+    this.env = readBuniteEnv();
     this.rpc = config?.rpc;
 
     this.transport = {
@@ -60,9 +71,9 @@ export class BuniteView<T extends RpcWithTransport = RpcWithTransport> {
     };
 
     this.initSocketToBun();
-    if (isNative) {
-      buniteWindow.__bunite ??= {};
-      buniteWindow.__bunite.receiveMessageFromBun = (message) => {
+    if (this.env.isNative && this.env.window) {
+      this.env.window.__bunite ??= {};
+      this.env.window.__bunite.receiveMessageFromBun = (message) => {
         this.handler?.(message as RpcPacket);
       };
     }
@@ -70,7 +81,7 @@ export class BuniteView<T extends RpcWithTransport = RpcWithTransport> {
   }
 
   private sendPacket(packet: RpcPacket) {
-    if (isNative) {
+    if (this.env.isNative) {
       void this.bunBridge(packet).catch((error) => {
         log.error("Failed to send RPC packet", error);
       });
@@ -80,7 +91,7 @@ export class BuniteView<T extends RpcWithTransport = RpcWithTransport> {
   }
 
   initSocketToBun() {
-    if (!isNative) {
+    if (!this.env.isNative) {
       const proto = location.protocol === "https:" ? "wss:" : "ws:";
       const socket = new WebSocket(`${proto}//${location.host}/rpc`);
       socket.binaryType = "arraybuffer";
@@ -97,14 +108,14 @@ export class BuniteView<T extends RpcWithTransport = RpcWithTransport> {
       });
     } else {
       // Share a single WebSocket with the preload's bunite.invoke.
-      const globals = buniteWindow as any;
+      const globals = this.env.window as any;
       globals.__bunite ??= {};
       const existing = globals.__bunite._socket;
       if (existing && existing.readyState <= WebSocket.OPEN) {
         this.bunSocket = existing;
       } else {
         const socket = new WebSocket(
-          `ws://localhost:${RPC_SOCKET_PORT}/socket?webviewId=${WEBVIEW_ID}`
+          `ws://localhost:${this.env.rpcPort}/socket?webviewId=${this.env.webviewId}`
         );
         socket.binaryType = "arraybuffer";
         this.bunSocket = socket;
@@ -116,7 +127,7 @@ export class BuniteView<T extends RpcWithTransport = RpcWithTransport> {
         if (!binaryMessage) return;
 
         try {
-          const decrypt = buniteWindow.__bunite_decrypt;
+          const decrypt = this.env.window?.__bunite_decrypt;
           if (!decrypt) {
             log.error("No decrypt function available in preload globals");
             return;
@@ -151,7 +162,7 @@ export class BuniteView<T extends RpcWithTransport = RpcWithTransport> {
   async bunBridge(message: RpcPacket) {
     if (this.bunSocket?.readyState !== WebSocket.OPEN) return;
 
-    const encrypt = buniteWindow.__bunite_encrypt;
+    const encrypt = this.env.window?.__bunite_encrypt;
     if (!encrypt) {
       log.error("No encrypt function available in preload globals");
       return;
@@ -171,7 +182,7 @@ async function messageToUint8Array(data: unknown) {
 }
 
 export { log, type LogLevel } from "../shared/log";
-export { createRpcTransportDemuxer, createWebSocketTransport, defineWebviewRpc };
+export { createRpcTransportDemuxer, createWebSocketTransport, defineWebviewRpc, registerBuniteWebviewPolyfill };
 
 export type {
   BuniteRpcConfig,