libshv-js 10.0.3 → 11.0.0

package/dist/rpcvalue.d.ts

@@ -1,10 +1,12 @@
 declare class UInt<T extends number = number> {
+    private readonly uintBrand;
     readonly value: T;
     constructor(u: T | UInt<T>);
     [Symbol.toPrimitive](): T;
     toString(): string;
 }
 declare class Double {
+    private readonly doubleBrand;
     readonly value: number;
     constructor(u: number);
 }

package/dist/ws-client.d.ts

@@ -227,7 +227,9 @@ declare class WsClient {
     private readonly options;
     private readonly timeout;
     private shvApiVersion;
+    private pendingWebSocketData;
     constructor(options: WsClientOptions<MethodHandler>);
+    private extractWebSocketDatagrams;
     private workflowsProcedure;
     private loginProcedure;
     callRpcMethod(shvPath: '.broker/currentClient', method: 'accessGrantForMethodCall', params: [string, string], options?: CallRpcMethodOptions): RpcRequestPromise<ResultOrError<string>>;

package/dist/ws-client.js

@@ -148,6 +148,7 @@ class WsClient {
     options;
     timeout;
     shvApiVersion = undefined;
+    pendingWebSocketData = new Uint8Array(0);
     constructor(options) {
         if (typeof options !== 'object') {
             throw new TypeError('No options object supplied');
@@ -368,19 +369,25 @@ class WsClient {
         };
         // eslint-disable-next-line @typescript-eslint/strict-void-return
         this.websocket.addEventListener('message', async (evt) => {
-            const rpcVal = dataToRpcValue(evt.data);
-            const parseMessage = this.options.parseMessage ?? defaultParseMessage;
-            const rpcMsg = parseMessage(rpcVal);
-            this.logDebug(`message received: ${toCpon(rpcMsg)}`);
-            if (isSignal(rpcMsg)) {
-                await handleSignal(rpcMsg);
-            }
-            else if (isRequest(rpcMsg)) {
-                await handleRequest(rpcMsg);
-            }
-            else if (isResponse(rpcMsg)) {
-                handleResponse(rpcMsg);
+            const incomingData = new Uint8Array(evt.data);
+            this.pendingWebSocketData = Uint8Array.from([...this.pendingWebSocketData, ...incomingData]);
+            const pendingHandlers = [];
+            for (const datagram of this.extractWebSocketDatagrams()) {
+                const rpcVal = dataToRpcValue(datagram);
+                const parseMessage = this.options.parseMessage ?? defaultParseMessage;
+                const rpcMsg = parseMessage(rpcVal);
+                this.logDebug(`message received: ${toCpon(rpcMsg)}`);
+                if (isSignal(rpcMsg)) {
+                    pendingHandlers.push(handleSignal(rpcMsg));
+                }
+                else if (isRequest(rpcMsg)) {
+                    pendingHandlers.push(handleRequest(rpcMsg));
+                }
+                else if (isResponse(rpcMsg)) {
+                    handleResponse(rpcMsg);
+                }
             }
+            await Promise.all(pendingHandlers);
         });
         this.websocket.addEventListener('error', evt => {
             console.log('WebSocket ERROR', evt);
@@ -393,6 +400,32 @@ class WsClient {
             this.loginProcedure(this.options);
         }
     }
+    extractWebSocketDatagrams() {
+        const datagrams = [];
+        let offset = 0;
+        while (offset < this.pendingWebSocketData.length) {
+            const reader = new ChainPackReader(this.pendingWebSocketData.slice(offset).buffer);
+            let length;
+            try {
+                length = reader.readUIntData();
+            }
+            catch (error) {
+                if (error instanceof RangeError) {
+                    break;
+                }
+                throw error;
+            }
+            const prefixLength = reader.ctx.index;
+            if (this.pendingWebSocketData.length - offset - prefixLength < length) {
+                break;
+            }
+            const end = offset + prefixLength + length;
+            datagrams.push(this.pendingWebSocketData.slice(offset, end).buffer);
+            offset = end;
+        }
+        this.pendingWebSocketData = this.pendingWebSocketData.slice(offset);
+        return datagrams;
+    }
     workflowsProcedure(options) {
         let workflowsObtained = false;
         this.websocket.addEventListener('open', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libshv-js",
-  "version": "10.0.3",
+  "version": "11.0.0",
   "description": "Typescript implementation of libshv",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",