bunite-core 0.1.0 → 0.2.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bunite-core",
   "description": "Uniting UI and Bun",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "type": "module",
   "scripts": {
     "setup:cef": "bun ../tools/bunite-dev/scripts/setup-cef.ts",
@@ -21,5 +21,8 @@
   ],
   "dependencies": {
     "msgpackr": "^1.11.9"
+  },
+  "optionalDependencies": {
+    "bunite-native-win-x64": "0.0.3"
   }
 }

package/src/bun/core/BrowserView.ts

@@ -2,8 +2,7 @@ import { ptr } from "bun:ffi";
 import { buildViewPreloadScript } from "../preload/inline";
 import { log } from "../../shared/log";
 import { buniteEventEmitter } from "../events/eventEmitter";
-import { defineBuniteRPC, type BuniteRPCConfig, type BuniteRPCSchema, type RPCPacket, type RPCTransport, type RPCWithTransport } from "../../shared/rpc";
-import { createWebRPCHandler } from "../../shared/webRpcHandler";
+import { type RPCPacket, type RPCTransport, type RPCWithTransport } from "../../shared/rpc";
 import { ensureNativeRuntime, getNativeLibrary, toCString, waitForViewReady, cancelWaitForViewReady } from "../proc/native";
 import { attachBrowserViewRegistry, getRPCPort, sendMessageToView } from "./Socket";
 import { randomBytes } from "node:crypto";
@@ -175,18 +174,6 @@ export class BrowserView<T extends RPCWithTransport = RPCWithTransport> {
     return Object.values(BrowserViewMap);
   }
 
-  static defineRPC<Schema extends BuniteRPCSchema>(
-    config: BuniteRPCConfig<Schema, "bun">
-  ) {
-    const rpc = defineBuniteRPC("bun", config);
-    const webRpc = createWebRPCHandler<Schema>(config);
-    return Object.assign(rpc, {
-      webHandler: webRpc,
-      webClients: webRpc.webClients,
-      broadcast: webRpc.broadcast,
-    });
-  }
-
   handleIncomingRPC(packet: RPCPacket) {
     this.pipe.receive(packet);
   }

package/src/bun/index.ts

@@ -7,7 +7,7 @@ import { BuniteEvent } from "./events/event";
 import { completePermissionRequest } from "./proc/native";
 import {
   createRPC,
-  defineBuniteRPC,
+  defineBunRPC,
   type BuniteRPCConfig,
   type BuniteRPCSchema,
   type RPCSchema,
@@ -15,6 +15,7 @@ import {
 } from "../shared/rpc";
 import { createTransportDemuxer, type TransportDemuxer } from "../shared/rpcDemux";
 import { createWebSocketTransport, type WebSocketLike, type WebSocketTransportPipe } from "../shared/webSocketTransport";
+import { createWebRPCHandler, type WebRPCClient } from "../shared/webRpcHandler";
 import type { MessageBoxOptions, MessageBoxResponse } from "./core/Utils";
 import { log, type LogLevel } from "../shared/log";
 
@@ -27,8 +28,9 @@ export {
   completePermissionRequest,
   createRPC,
   createTransportDemuxer,
+  createWebRPCHandler,
   createWebSocketTransport,
-  defineBuniteRPC,
+  defineBunRPC,
   log
 };
 
@@ -43,6 +45,7 @@ export type {
   RPCSchema,
   RPCWithTransport,
   TransportDemuxer,
+  WebRPCClient,
   WebSocketLike,
   WebSocketTransportPipe,
   WindowOptionsType

package/src/shared/rpc.ts

@@ -370,11 +370,10 @@ export function createRPC<
   };
 }
 
-export function defineBuniteRPC<
+function defineSideRPC<
   Schema extends BuniteRPCSchema,
   Side extends "bun" | "webview"
 >(
-  side: Side,
   config: BuniteRPCConfig<Schema, Side> & {
     extraRequestHandlers?: Record<string, (...args: any[]) => unknown>;
   }
@@ -416,3 +415,19 @@ export function defineBuniteRPC<
 
   return rpc;
 }
+
+export function defineBunRPC<Schema extends BuniteRPCSchema>(
+  config: BuniteRPCConfig<Schema, "bun"> & {
+    extraRequestHandlers?: Record<string, (...args: any[]) => unknown>;
+  }
+) {
+  return defineSideRPC<Schema, "bun">(config);
+}
+
+export function defineWebviewRPC<Schema extends BuniteRPCSchema>(
+  config: BuniteRPCConfig<Schema, "webview"> & {
+    extraRequestHandlers?: Record<string, (...args: any[]) => unknown>;
+  }
+) {
+  return defineSideRPC<Schema, "webview">(config);
+}

package/src/shared/webRpcHandler.ts

@@ -1,5 +1,5 @@
 import {
-  defineBuniteRPC,
+  defineBunRPC,
   type BuniteRPCConfig,
   type BuniteRPCSchema
 } from "./rpc";
@@ -8,7 +8,7 @@ import { log } from "./log";
 
 export type WebRPCClient<Schema extends BuniteRPCSchema = BuniteRPCSchema> = {
   ws: WebSocketLike;
-  rpc: ReturnType<typeof defineBuniteRPC<Schema, "bun">>;
+  rpc: ReturnType<typeof defineBunRPC<Schema>>;
 };
 
 export function createWebRPCHandler<Schema extends BuniteRPCSchema>(
@@ -24,7 +24,7 @@ export function createWebRPCHandler<Schema extends BuniteRPCSchema>(
   const handler = {
     open(ws: WebSocketLike) {
       const pipe = createWebSocketTransport(ws);
-      const rpc = defineBuniteRPC("bun", config);
+      const rpc = defineBunRPC(config);
       rpc.setTransport(pipe.transport);
 
       const client: WebRPCClient<Schema> = { ws, rpc: rpc as WebRPCClient<Schema>["rpc"] };

package/src/view/index.ts

@@ -1,6 +1,6 @@
 import "../shared/webviewPolyfill";
 import {
-  defineBuniteRPC,
+  defineWebviewRPC,
   type BuniteRPCConfig,
   type RPCPacket,
   type BuniteRPCSchema,
@@ -161,13 +161,6 @@ export class BuniteView<T extends RPCWithTransport = RPCWithTransport> {
     this.bunSocket.send(toArrayBuffer(encrypted));
   }
 
-  static defineRPC<Schema extends BuniteRPCSchema>(
-    config: BuniteRPCConfig<Schema, "webview">
-  ) {
-    const rpc = defineBuniteRPC("webview", config);
-    new BuniteView({ rpc });
-    return rpc;
-  }
 }
 
 async function messageToUint8Array(data: unknown) {
@@ -178,7 +171,7 @@ async function messageToUint8Array(data: unknown) {
 }
 
 export { log, type LogLevel } from "../shared/log";
-export { createTransportDemuxer, createWebSocketTransport, defineBuniteRPC };
+export { createTransportDemuxer, createWebSocketTransport, defineWebviewRPC };
 
 export type {
   BuniteRPCConfig,