js-rpc2 1.2.1 → 1.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/lib.js +5 -7
- package/src/lib.test.js +1 -1
- package/src/server.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "js-rpc2",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.3",
|
|
4
4
|
"description": "js web websocket http rpc",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -26,9 +26,9 @@
|
|
|
26
26
|
"author": "yuanliwei",
|
|
27
27
|
"license": "MIT",
|
|
28
28
|
"devDependencies": {
|
|
29
|
+
"@koa/router": "^13.1.1",
|
|
29
30
|
"@types/node": "^22.13.14",
|
|
30
31
|
"koa": "^2.15.3",
|
|
31
|
-
"koa-router": "^13.0.1",
|
|
32
32
|
"ws": "^8.18.0"
|
|
33
33
|
}
|
|
34
34
|
}
|
package/src/lib.js
CHANGED
|
@@ -544,9 +544,8 @@ export function parseRpcItemData(array) {
|
|
|
544
544
|
* @param {WritableStreamDefaultWriter<Uint8Array>} writer
|
|
545
545
|
* @param {Uint8Array} buffer
|
|
546
546
|
* @param {(msg:string)=>void} logger
|
|
547
|
-
* @param {any} context
|
|
548
547
|
*/
|
|
549
|
-
export async function rpcRunServerDecodeBuffer(extension, writer, buffer, logger
|
|
548
|
+
export async function rpcRunServerDecodeBuffer(extension, writer, buffer, logger) {
|
|
550
549
|
/** @type{RPC_DATA} */
|
|
551
550
|
let box = null
|
|
552
551
|
let dataId = 0
|
|
@@ -554,8 +553,6 @@ export async function rpcRunServerDecodeBuffer(extension, writer, buffer, logger
|
|
|
554
553
|
let params = []
|
|
555
554
|
let time = Date.now()
|
|
556
555
|
try {
|
|
557
|
-
let store = extension.asyncLocalStorage
|
|
558
|
-
store.enterWith(context)
|
|
559
556
|
let o = parseRpcData(buffer)
|
|
560
557
|
dataId = o.id
|
|
561
558
|
let items = parseRpcItemData(o.data)
|
|
@@ -654,13 +651,14 @@ export function createRpcServerHelper(param) {
|
|
|
654
651
|
const encode = createEncodeStream(rpc_key_iv)
|
|
655
652
|
const decode = createDecodeStream(rpc_key_iv)
|
|
656
653
|
let writer = encode.writable.getWriter()
|
|
657
|
-
let context = param.context
|
|
658
654
|
decode.readable.pipeTo(new WritableStream({
|
|
659
655
|
async write(buffer) {
|
|
656
|
+
let asyncLocalStorage = param.extension.asyncLocalStorage
|
|
657
|
+
asyncLocalStorage.enterWith(param.context)
|
|
660
658
|
if (param.async) {
|
|
661
|
-
rpcRunServerDecodeBuffer(param.extension, writer, buffer, param.logger
|
|
659
|
+
rpcRunServerDecodeBuffer(param.extension, writer, buffer, param.logger).catch(console.error)
|
|
662
660
|
} else {
|
|
663
|
-
await rpcRunServerDecodeBuffer(param.extension, writer, buffer, param.logger
|
|
661
|
+
await rpcRunServerDecodeBuffer(param.extension, writer, buffer, param.logger)
|
|
664
662
|
}
|
|
665
663
|
},
|
|
666
664
|
async close() {
|
package/src/lib.test.js
CHANGED
|
@@ -4,7 +4,7 @@ import { createRpcClientHttp, createRpcClientWebSocket, sleep, Uint8Array_from }
|
|
|
4
4
|
import { createServer } from 'node:http'
|
|
5
5
|
import { WebSocketServer } from 'ws'
|
|
6
6
|
import Koa from 'koa'
|
|
7
|
-
import Router from 'koa
|
|
7
|
+
import Router from '@koa/router'
|
|
8
8
|
import { createRpcServerKoaRouter, createRpcServerWebSocket } from './server.js'
|
|
9
9
|
import { AsyncLocalStorage } from 'node:async_hooks'
|
|
10
10
|
import { Readable, Transform } from 'node:stream'
|