js-rpc2 2.0.0 → 2.1.0

package/package.json

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

package/src/lib.js

@@ -364,16 +364,24 @@ export const RPC_DATA_ARG_TYPE_FUNCTION = 0x7ff45f
  * @param {RPC_DATA} box
  */
 export function buildRpcData(box) {
-    return Uint8Array.from(packr.pack(box))
+    let type = box.type
+    let data = box.data
+    if (type == RPC_TYPE_CALL || type == RPC_TYPE_CALLBACK) {
+        data = data.map(({ type, data }) => [type, data])
+    }
+    return Uint8Array.from(packr.pack([box.id, type, data]))
 }
 
 /**
  * @param {Uint8Array} buffer
  */
 export function parseRpcData(buffer) {
+    let [id, type, data] = packr.unpack(buffer)
+    if (type == RPC_TYPE_CALL || type == RPC_TYPE_CALLBACK) {
+        data = data.map(([type, data]) => ({ type, data }))
+    }
     /** @type{RPC_DATA} */
-    let box = packr.unpack(buffer)
-    return box
+    return { id, type, data }
 }
 
 /**

package/src/types.ts

@@ -1,49 +1,49 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-
-export type ExtensionApi<T> = { asyncLocalStorage: AsyncLocalStorage<T> } & object;
-
-
-export type RPC_TYPE_CALL = 0xdf68f4cb
-export type RPC_TYPE_RETURN = 0x68b17581
-export type RPC_TYPE_CALLBACK = 0x8d65e5cc
-export type RPC_TYPE_ERROR = 0xa07c0f84
-
-export type RPC_DATA_ARG_TYPE_OTHERS = 0xa7f68c
-export type RPC_DATA_ARG_TYPE_FUNCTION = 0x7ff45f
-
-
-export type RPC_TYPES = RPC_TYPE_CALL |
-    RPC_TYPE_RETURN |
-    RPC_TYPE_CALLBACK |
-    RPC_TYPE_ERROR;
-
-
-export type PromiseResolvers = {
-    promise: Promise<any>;
-    resolve: (value: any | null) => void;
-    reject: (reason: any | null) => void;
-};
-
-export type CALLBACK_ITEM = {
-    id: number;
-    type: RPC_TYPES;
-    promise?: PromiseResolvers;
-    callback?: (...data: object[]) => void;
-};
-
-export type RPC_DATA_ARG_ITEM = { type: RPC_DATA_ARG_TYPE; data: object; };
-export type RPC_DATA = {
-    id: number;
-    type: RPC_TYPE_CALL | RPC_TYPE_CALLBACK;
-    data: { type: RPC_DATA_ARG_TYPE; data: any; }[];
-} | {
-    id: number;
-    type: RPC_TYPE_RETURN;
-    data: any;
-} | {
-    id: number;
-    type: RPC_TYPE_ERROR;
-    data: { message: string, stack: string };
-};
-
+import { AsyncLocalStorage } from "node:async_hooks";
+
+export type ExtensionApi<T> = { asyncLocalStorage: AsyncLocalStorage<T> } & object;
+
+
+export type RPC_TYPE_CALL = 0xdf68f4cb
+export type RPC_TYPE_RETURN = 0x68b17581
+export type RPC_TYPE_CALLBACK = 0x8d65e5cc
+export type RPC_TYPE_ERROR = 0xa07c0f84
+
+export type RPC_DATA_ARG_TYPE_OTHERS = 0xa7f68c
+export type RPC_DATA_ARG_TYPE_FUNCTION = 0x7ff45f
+
+
+export type RPC_TYPES = RPC_TYPE_CALL |
+    RPC_TYPE_RETURN |
+    RPC_TYPE_CALLBACK |
+    RPC_TYPE_ERROR;
+
+
+export type PromiseResolvers = {
+    promise: Promise<any>;
+    resolve: (value: any | null) => void;
+    reject: (reason: any | null) => void;
+};
+
+export type CALLBACK_ITEM = {
+    id: number;
+    type: RPC_TYPES;
+    promise?: PromiseResolvers;
+    callback?: (...data: object[]) => void;
+};
+
+export type RPC_DATA_ARG_ITEM = { type: RPC_DATA_ARG_TYPE; data: object; };
+export type RPC_DATA = {
+    id: number;
+    type: RPC_TYPE_CALL | RPC_TYPE_CALLBACK;
+    data: { type: RPC_DATA_ARG_TYPE; data: any; }[];
+} | {
+    id: number;
+    type: RPC_TYPE_RETURN;
+    data: any;
+} | {
+    id: number;
+    type: RPC_TYPE_ERROR;
+    data: { message: string, stack: string };
+};
+
 export type RPC_DATA_ARG_TYPE = RPC_DATA_ARG_TYPE_OTHERS | RPC_DATA_ARG_TYPE_FUNCTION;