js-rpc2 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-rpc2",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "js web websocket http rpc",
   "main": "index.js",
   "type": "module",
@@ -26,7 +26,7 @@
   "author": "yuanliwei",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^22.9.4",
+    "@types/node": "^22.13.14",
     "koa": "^2.15.3",
     "koa-router": "^13.0.1",
     "ws": "^8.18.0"

package/src/lib.js

@@ -88,11 +88,11 @@ export async function buildBufferData(queue, key, iv) {
 /**
  * @param {Uint8Array<ArrayBuffer>} buffer
  * @param {CryptoKey} key
- * @param {Uint8Array} iv
- * @returns {Promise<[Uint8Array[],Uint8Array<ArrayBuffer>]>}
+ * @param {Uint8Array<ArrayBuffer>} iv
+ * @returns {Promise<[Uint8Array<ArrayBuffer>[],Uint8Array<ArrayBuffer>]>}
  */
 export async function parseBufferData(buffer, key, iv) {
-    /** @type{Uint8Array[]} */
+    /** @type{Uint8Array<ArrayBuffer>[]} */
     let queue = []
     let offset = 0
     let remain = new Uint8Array(0)
@@ -310,7 +310,7 @@ export async function encrypt(data, key, iv) {
 }
 
 /**
- * @param {Uint8Array} data 
+ * @param {Uint8Array<ArrayBuffer>} data 
  * @param {CryptoKey} key 
  * @param {Uint8Array} iv 
  * @returns 
@@ -632,7 +632,9 @@ export function createRpcServerHelper(param) {
         async close() {
             await writer.close()
         }
-    }))
+    })).catch(e => {
+        console.error(e)
+    })
 
     /** @type{RPC_HELPER_SERVER} */
     let ret = { writable: decode.writable, readable: encode.readable }

package/src/server.js

@@ -64,13 +64,17 @@ export function createRpcServerWebSocket(param) {
 export function createRpcServerKoaRouter(param) {
     param.router.post(param.path, async (ctx) => {
         let helper = createRpcServerHelper({ rpcKey: param.rpcKey, extension: param.extension })
-        await Readable.toWeb(ctx.req).pipeTo(helper.writable)
+        /** @type{ReadableStream} */
+        let a = Readable.toWeb(ctx.req)
+        await a.pipeTo(helper.writable)
         ctx.status = 200
         ctx.response.set({
             'Connection': 'keep-alive',
             'Cache-Control': 'no-cache',
             'Content-Type': 'application/octet-stream'
         })
-        ctx.body = Readable.fromWeb(helper.readable)
+        /** @type{object} */
+        let b = helper.readable
+        ctx.body = Readable.fromWeb(b)
     })
 }