js-rpc2 1.0.3 → 1.0.4

package/package.json

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

package/src/lib.js

@@ -574,7 +574,7 @@ export async function rpcRunServerDecodeBuffer(extension, writer, buffer) {
         box = {
             id: dataId,
             type: RPC_TYPE_ERROR,
-            data: buildRpcItemData([`Error:${error.message}\n${error.stack}`]),
+            data: buildRpcItemData([error.message, error.stack]),
         }
     }
     await writer.write(buildRpcData(box))
@@ -593,7 +593,11 @@ export function createRPCProxy(apiInvoke) {
             }
             proxy = new Proxy(Function, {
                 async apply(_target, _thisArg, argArray) {
-                    return await apiInvoke(String(p), argArray)
+                    try {
+                        return await apiInvoke(String(p), argArray)
+                    } catch (error) {
+                        throw new Error(error.message, { cause: error })
+                    }
                 }
             })
             map.set(p, proxy)
@@ -644,6 +648,20 @@ export function createRpcServerHelper(param) {
  * }} RPC_HELPER_CLIENT
  */
 
+class RPCError extends Error {
+    /**
+     * @param {string} message
+     * @param {string} stack
+     * @param {ErrorOptions} [option]
+     */
+    constructor(message, stack, option) {
+        super(message, option)
+        if (stack) {
+            this.stack = stack
+        }
+    }
+}
+
 /**
  * @param {{ rpcKey: string; }} param
  */
@@ -666,7 +684,7 @@ export function createRpcClientHelper(param) {
                 if (callbackFunctionMap.has(data.id)) {
                     let o = callbackFunctionMap.get(data.id)
                     if (data.type == RPC_TYPE_ERROR) {
-                        o.promise.reject(new Error(items.at(0).data))
+                        o.promise.reject(new RPCError(items.at(0).data, items.at(1).data))
                     }
                     if (data.type == RPC_TYPE_RETURN) {
                         callbackFunctionMap.delete(data.id)

package/src/lib.test.js

@@ -282,4 +282,48 @@ export async function runWithAbortController(func) {
         await func(ac)
         await sleep(1000)
     } finally { ac.abort() }
-}
+}
+
+
+test('error-stack', async () => {
+    // node --test-name-pattern="^error-stack$" src/lib.test.js
+
+    // server
+    const app = new Koa()
+    const router = new Router()
+    app.use(router.routes())
+    app.use(router.allowedMethods())
+    let server = createServer(app.callback()).listen(9000)
+
+    class RpcApi {
+        async hello() {
+            new URL('/')
+        }
+    }
+
+    const extension = new RpcApi()
+
+    createRpcServerKoaRouter({
+        path: '/rpc/abc',
+        router: router,
+        extension: extension,
+    })
+
+
+    // client
+
+    /** @type{RpcApi} */
+    const rpc = createRpcClientHttp({
+        // url: `/rpc/abc`,                      // in same site html page
+        url: `http://127.0.0.1:9000/rpc/abc`, // others
+    })
+
+    try {
+        let ret = await rpc.hello()
+        console.info(ret)
+    } catch (error) {
+        console.error(error)
+    }
+    server.close()
+
+})