js-rpc2 2.5.0 → 2.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-rpc2",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "js web websocket http rpc",
   "main": "index.js",
   "type": "module",

package/src/lib.js

@@ -893,7 +893,7 @@ export function base64encode(buffer) {
     const chars = []
     for (let i = 0; i < buffer.length; i += CHUNK_SZ) {
         const chunk = buffer.subarray(i, i + CHUNK_SZ)
-        chars.push(String.fromCharCode.apply(null, chunk))
+        chars.push(String.fromCharCode.apply(null, Array.from(chunk)))
     }
     return btoa(chars.join(''))
 }
@@ -993,42 +993,29 @@ export function createRpcClientChromeExtensions(param) {
 
 /**
  * @param {{
- * parentPort: NodeJSMessagePort;
+ * parentPort: MessagePort|NodeJSMessagePort;
  * extension: Object;
  * logger?:(msg:string)=>void;
  * }} param 
  */
-export function createRpcServerNodeJSWorker(param) {
-    const port = param.parentPort
-    let helper = createRpcServerHelper({
-        rpcKey: '', extension: param.extension, async: true, logger: param.logger
-    })
-    let writer = helper.writable.getWriter()
-    port.on('message', async (data) => {
-        await writer.write(data)
-    })
-    helper.readable.pipeTo(new WritableStream({
-        async write(chunk) {
-            port.postMessage(chunk)
-        }
-    }))
+export function createRpcServerWorker(param) {
+    /** @type{any} */
+    const parentPort = param.parentPort
+    parentPort.onmessage = (/** @type {{ ports: [any]; }} */ event) => {
+        parentPort.onmessage = null
+        let [port] = event.ports
+        createRpcServerMessagePort({ port, rpcKey: '', extension: param.extension, logger: param.logger })
+    }
 }
 
 /**
  * @param {{
- * worker:NodeJSWorker;
+ * worker:Worker|NodeJSWorker;
  * }} param
  */
-export function createRpcClientNodeJSWorker(param) {
-    let helper = createRpcClientHelper({ rpcKey: '' })
-    let writer = helper.writable.getWriter()
-    helper.readable.pipeTo(new WritableStream({
-        async write(chunk) {
-            param.worker.postMessage(chunk)
-        }
-    }))
-    param.worker.on('message', async (data) => {
-        await writer.write(data)
-    })
-    return createRPCProxy(helper.apiInvoke)
+export function createRpcClientWorker(param) {
+    let channel = new MessageChannel()
+    const client = createRpcClientMessagePort({ port: channel.port1, rpcKey: '' })
+    param.worker.postMessage(channel.port2, [/** @type{any} */(channel.port2)])
+    return client
 }

package/src/lib.test.js

@@ -1,6 +1,6 @@
 import { test } from 'node:test'
 import { deepStrictEqual, fail, ok, strictEqual } from 'node:assert'
-import { _testCreateRpcClientHttp, createRpcClientHttp, createRpcClientWebSocket, sleep, Uint8Array_from } from './lib.js'
+import { _testCreateRpcClientHttp, createRpcClientHttp, createRpcClientWorker, createRpcClientWebSocket, sleep, Uint8Array_from } from './lib.js'
 import { createServer } from 'node:http'
 import { WebSocketServer } from 'ws'
 import Koa from 'koa'
@@ -10,6 +10,11 @@ import { AsyncLocalStorage } from 'node:async_hooks'
 import { Readable, Transform } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
 import { Packr } from 'msgpackr'
+import { Worker } from 'node:worker_threads'
+
+/**
+ * @import {ExtensionApi} from './test-worker.js'
+ */
 
 test('basic', async () => {
     // node --test-name-pattern="^basic$" src/lib.test.js
@@ -586,4 +591,14 @@ test('msgpackr', async () => {
     delete data['error']
     delete value['error']
     deepStrictEqual(data, value)
+})
+
+test('test-rpc-NodeJSWorker', async () => {
+    // node --test --test-name-pattern="^test-rpc-NodeJSWorker$" src/lib.test.js
+    const worker = new Worker(new URL('./test-worker.js', import.meta.url))
+    /** @type{ExtensionApi} */
+    const rpc = createRpcClientWorker({ worker: worker })
+    console.info(await rpc.hello('123'))
+    deepStrictEqual(await rpc.hello('123'), 'hello 123')
+    await worker.terminate()
 })

package/src/server.js

@@ -32,7 +32,6 @@ export function createRpcServerWebSocket(param) {
 /**
  * @param {{
  * path: string; 
- * wss: WebSocketServer; 
  * rpcKey:string;
  * extension: {asyncLocalStorage:AsyncLocalStorage<{ws:WebSocket;request:IncomingMessage;}>;}; 
  * logger?:(msg:string)=>void;

package/src/test-worker.js

@@ -0,0 +1,13 @@
+import { parentPort } from 'node:worker_threads'
+import { createRpcServerWorker } from './lib.js'
+
+export const ExtensionApi = {
+    /**
+     * @param {any} name
+     */
+    async hello(name) {
+        return `hello ${name}`
+    }
+}
+
+createRpcServerWorker({ parentPort, extension: ExtensionApi, })