js-rpc2 1.0.7 → 1.1.1

package/package.json

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

package/src/lib.js

@@ -589,7 +589,8 @@ export async function rpcRunServerDecodeBuffer(extension, writer, buffer, logger
     }
     if (logger) {
         logger(`time: ${Date.now() - time}ms ${fnName}(${params.map(o => {
-            if (typeof o == 'function') { return Function }
+            if (typeof o == 'function') { return `Function()` }
+            if (o instanceof Uint8Array) { return `Uint8Array(${o.length})` }
             return o
         }).join(', ')})`)
     }
@@ -744,6 +745,14 @@ export function createRpcClientHelper(param) {
         argArray.push(fnName)
         for (const arg of args) {
             if (arg instanceof Function) {
+                const isAsyncFunction = arg.constructor?.name === 'AsyncFunction'
+                if (!isAsyncFunction) {
+                    const receivedType = arg.constructor?.name || 'regular function'
+                    throw new Error(
+                        `Expected an AsyncFunction as the callback, but received a ${receivedType}. ` +
+                        'Ensure the callback is declared with "async function" or an arrow function using "async".'
+                    )
+                }
                 const key = uniqueKeyID++
                 keys.push(key)
                 callbackFunctionMap.set(key, { id: key, type: RPC_TYPE_CALLBACK, callback: arg })

package/src/lib.test.js

@@ -133,13 +133,13 @@ test('测试RPC调用-WebSocket', async () => {
         console.info(string)
         strictEqual(string, 'hello asdfghjkl')
 
-        let stringcallback = await client.callback('asdfghjkl', (progress) => {
+        let stringcallback = await client.callback('asdfghjkl', async (progress) => {
             console.info(`client : ${progress}`)
         })
         strictEqual(stringcallback, 'hello callback asdfghjkl')
 
         let callbackCount = 0
-        let stringcallback2 = await client.callback2('asdfghjkl', (progress, buffer) => {
+        let stringcallback2 = await client.callback2('asdfghjkl', async (progress, buffer) => {
             console.info(`client : ${progress}`, buffer)
             callbackCount++
         })
@@ -211,6 +211,9 @@ test('测试RPC调用-KoaRouter', async () => {
             router: router,
             rpcKey: '11474f3dfbb861700cb6c3864b328311',
             extension: extension,
+            logger(msg) {
+                console.info(msg)
+            },
         })
 
         server.addListener('request', app.callback())
@@ -233,7 +236,7 @@ test('测试RPC调用-KoaRouter', async () => {
         strictEqual(string, 'hello asdfghjkl')
 
         let callbackCount = 0
-        let stringcallback = await client.callback('asdfghjkl', (progress) => {
+        let stringcallback = await client.callback('asdfghjkl', async (progress) => {
             console.info(`client : ${progress}`)
             callbackCount++
         })
@@ -241,7 +244,7 @@ test('测试RPC调用-KoaRouter', async () => {
         strictEqual(3, callbackCount)
         strictEqual(stringcallback, 'hello callback asdfghjkl')
 
-        let stringcallback2 = await client.callback2('asdfghjkl', (progress, buffer) => {
+        let stringcallback2 = await client.callback2('asdfghjkl', async (progress, buffer) => {
             console.info(`client : ${progress}`, buffer)
         })
         strictEqual(stringcallback2, 'hello callback asdfghjkl')