libshv-js 3.1.3 → 3.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libshv-js",
-  "version": "3.1.3",
+  "version": "3.1.6",
   "description": "Typescript implementation of libshv",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -24,9 +24,11 @@
     "./ws-client.ts": "./src/ws-client.ts",
     "./zod.ts": "./src/zod.ts"
   },
+  "dependencies": {
+    "zod": "^3.23.8"
+  },
   "devDependencies": {
     "typescript": "^5.5.4",
-    "xo": "^0.59.3",
-    "zod": "^3.23.8"
+    "xo": "^0.59.3"
   }
 }

package/src/ws-client.ts

@@ -26,6 +26,7 @@ type SubscriptionCallback = (path: string, method: string, param?: RpcValue) =>
 type RpcResponseResolver = (rpc_msg: RpcResponse) => void;
 
 type Subscription = {
+    subscriber: string;
     path: string;
     method: string;
     callback: SubscriptionCallback;
@@ -135,6 +136,7 @@ class WsClient {
 
         this.websocket.addEventListener('close', () => {
             this.logDebug('DISCONNECTED');
+            this.subscriptions.length = 0;
             this.onDisconnected();
         });
 
@@ -227,20 +229,45 @@ class WsClient {
         }
     }
 
-    subscribe(path: string, method: string, callback: SubscriptionCallback) {
-        this.callRpcMethod('.broker/app', 'subscribe', new ShvMap({
-            method, path,
-        })).catch(() => {
-            this.logDebug(`Couldn't subscribe to ${path}, ${method}`);
-        });
-
+    subscribe(subscriber: string, path: string, method: string, callback: SubscriptionCallback) {
+        if (this.subscriptions.some(val => val.subscriber === subscriber && val.path === path && val.method === method)) {
+            this.logDebug(`Already subscribed {$path}:${method} for subscriber ${subscriber}`);
+            return;
+        }
+        // If this path:method has not been subscribed on the broker, do it now
+        if (!this.subscriptions.some(val => val.path === path && val.method === method)) {
+            this.callRpcMethod('.broker/app', 'subscribe', new ShvMap({
+                method, path,
+            })).catch(() => {
+                this.logDebug(`Couldn't subscribe to ${path}, ${method}`);
+            });
+        }
         this.subscriptions.push({
+            subscriber,
             path,
             method,
             callback,
         });
     }
 
+    unsubscribe(subscriber: string, path: string, method: string) {
+        const idx = this.subscriptions.findIndex(val => val.subscriber === subscriber && val.path === path && val.method === method);
+        if (idx === -1) {
+            this.logDebug(`No such subscription ${path}:${method} for subscriber ${subscriber}`);
+            return;
+        }
+        this.subscriptions.splice(idx, 1);
+        // Unsubscribe on the broker only if there are no other subscriptions of this path:method
+        if (this.subscriptions.some(val => val.path === path && val.method === method)) {
+            return;
+        }
+        this.callRpcMethod('.broker/app', 'unsubscribe', new ShvMap({
+            method, path,
+        })).catch(() => {
+            this.logDebug(`Couldn't unsubscribe ${path}, ${method}`);
+        });
+    }
+
     close() {
         this.websocket.close();
     }

package/src/zod.ts

@@ -2,6 +2,7 @@ import {z, type ZodType} from 'zod';
 import {IMap, Int, type RpcValue, ShvMap} from './rpcvalue';
 
 export const map = <T extends Record<string, ZodType<any, any, any>>>(schema: T) => z.custom<ShvMap<{[K in keyof T]: z.infer<T[K]>}>>((data: RpcValue) => data instanceof ShvMap && z.object(schema).safeParse(data.value).success);
+export const recmap = <T extends ZodType<any, any, any>>(schema: T) => z.custom<ShvMap<Record<string, z.infer<T>>>>((data: RpcValue) => data instanceof ShvMap && z.record(z.string(), schema).safeParse(data.value).success);
 export const imap = <T extends Record<string, ZodType<any, any, any>>>(schema: T) => z.custom<IMap<{[K in keyof T]: z.infer<T[K]>}>>((data: RpcValue) => data instanceof IMap && z.object(schema).safeParse(data.value).success);
 export const int = () => z.custom<Int>((data: RpcValue) => data instanceof Int);