js-rpc2 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-rpc2",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "js web websocket http rpc",
   "main": "index.js",
   "type": "module",
@@ -31,4 +31,4 @@
     "koa-router": "^13.0.1",
     "ws": "^8.18.0"
   }
-}
+}

package/src/lib.js

@@ -544,9 +544,8 @@ export function parseRpcItemData(array) {
  * @param {WritableStreamDefaultWriter<Uint8Array>} writer
  * @param {Uint8Array} buffer
  * @param {(msg:string)=>void} logger
- * @param {any} context
  */
-export async function rpcRunServerDecodeBuffer(extension, writer, buffer, logger, context) {
+export async function rpcRunServerDecodeBuffer(extension, writer, buffer, logger) {
     /** @type{RPC_DATA} */
     let box = null
     let dataId = 0
@@ -576,17 +575,7 @@ export async function rpcRunServerDecodeBuffer(extension, writer, buffer, logger
                 params.push(p.data)
             }
         }
-        let store = extension.asyncLocalStorage
-        let ret = await new Promise((resolve, reject) => {
-            store.run(context, async () => {
-                try {
-                    let ret = await extension[fnName](...params)
-                    resolve(ret)
-                } catch (error) {
-                    reject(error)
-                }
-            })
-        })
+        let ret = await extension[fnName](...params)
         if (Array.isArray(ret)) {
             box = { id: o.id, type: RPC_TYPE_RETURN_ARRAY, data: buildRpcItemData(ret), }
         } else {
@@ -662,13 +651,14 @@ export function createRpcServerHelper(param) {
     const encode = createEncodeStream(rpc_key_iv)
     const decode = createDecodeStream(rpc_key_iv)
     let writer = encode.writable.getWriter()
-    let context = param.context
     decode.readable.pipeTo(new WritableStream({
         async write(buffer) {
+            let asyncLocalStorage = param.extension.asyncLocalStorage
+            asyncLocalStorage.enterWith(param.context)
             if (param.async) {
-                rpcRunServerDecodeBuffer(param.extension, writer, buffer, param.logger, context).catch(console.error)
+                rpcRunServerDecodeBuffer(param.extension, writer, buffer, param.logger).catch(console.error)
             } else {
-                await rpcRunServerDecodeBuffer(param.extension, writer, buffer, param.logger, context)
+                await rpcRunServerDecodeBuffer(param.extension, writer, buffer, param.logger)
             }
         },
         async close() {

package/src/lib.test.js

@@ -286,9 +286,11 @@ test('测试RPC调用-KoaRouter', async () => {
 test('测试RPC调用-KoaRouter-AsyncLocalStorage', async () => {
     // node --test-name-pattern="^测试RPC调用-KoaRouter-AsyncLocalStorage$" src/lib.test.js
     const extension = {
+        /** @type{AsyncLocalStorage<Koa.ParameterizedContext<Koa.DefaultState, Koa.DefaultContext, any>>} */
         asyncLocalStorage: new AsyncLocalStorage(),
         hello: async function (/** @type {string} */ name) {
-            console.info('asyncLocalStorage.getStore', this.asyncLocalStorage.getStore())
+            let ctx = this.asyncLocalStorage.getStore()
+            strictEqual(ctx.path, '/abc')
             return `hello ${name}`
         },
     }
@@ -327,6 +329,7 @@ test('测试RPC调用-KoaRouter-AsyncLocalStorage', async () => {
         let string = await client.hello('asdfghjkl')
         console.info(string)
         strictEqual(string, 'hello asdfghjkl')
+        strictEqual(extension.asyncLocalStorage.getStore(), undefined)
     })
     console.info('over!')
 })
@@ -408,6 +411,30 @@ test('async-local-storage', async () => {
     await Promise.all([p1.promise, p2.promise])
 })
 
+test('async-local-storage-enterWith', async () => {
+    // node --test-name-pattern="^async-local-storage-enterWith$" src/lib.test.js
+    let store = new AsyncLocalStorage()
+    let p1 = Promise.withResolvers()
+    strictEqual(store.getStore(), undefined)
+    store.enterWith('v1')
+    strictEqual(store.getStore(), 'v1')
+    store.run('v2', async () => {
+        strictEqual(store.getStore(), 'v2')
+        let p2 = Promise.withResolvers()
+        setTimeout(() => {
+            strictEqual(store.getStore(), 'v2')
+            store.enterWith('v3')
+            strictEqual(store.getStore(), 'v3')
+            p2.resolve()
+        })
+        await p2.promise
+        strictEqual(store.getStore(), 'v2')
+        p1.resolve()
+    })
+    await p1.promise
+    strictEqual(store.getStore(), 'v1')
+})
+
 test('async-local-storage-stream', async () => {
     // node --test-name-pattern="^async-local-storage-stream$" src/lib.test.js
     let store = new AsyncLocalStorage()