libshv-js 8.0.0 → 9.0.0

package/dist/rpcmessage.d.ts

@@ -51,7 +51,7 @@ type RpcResponseMeta = MetaMap<{
     [RPC_MESSAGE_CALLER_IDS]?: number | number[] | undefined;
 }>;
 export type RpcResponseValue = IMap<{
-    [RPC_MESSAGE_RESULT]: RpcValue;
+    [RPC_MESSAGE_RESULT]?: RpcValue;
 }> | IMap<{
     [RPC_MESSAGE_ERROR]: ErrorMap;
 }> | IMap<{

package/dist/ws-client.d.ts

@@ -211,10 +211,11 @@ export type CallRpcMethodOptions = {
     beforeSendHook?: (rpcMessage: RpcRequest) => RpcRequest;
     explicitNullParam?: boolean;
 };
-declare enum ShvApiVersion {
+export declare enum ShvApiVersion {
     V2 = 0,
     V3 = 1
 }
+export declare const pathMatchesSubscription: (subscriptionPath: string, signalPath: string, apiVersion: ShvApiVersion) => boolean;
 declare class WsClient {
     private requestId;
     private pingTimerId;

package/dist/ws-client.js

@@ -1,3 +1,4 @@
+import { minimatch } from 'minimatch';
 import { accessLevelFromAccessString } from './access.js';
 import { ChainPackReader, CHAINPACK_PROTOCOL_TYPE, ChainPackWriter, toChainPack } from './chainpack.js';
 import { CPON_PROTOCOL_TYPE, toCpon } from './cpon.js';
@@ -123,11 +124,19 @@ class RpcRequestPromise extends Promise {
         this.progressQuery = progressQuery;
     }
 }
-var ShvApiVersion;
+export var ShvApiVersion;
 (function (ShvApiVersion) {
     ShvApiVersion[ShvApiVersion["V2"] = 0] = "V2";
     ShvApiVersion[ShvApiVersion["V3"] = 1] = "V3";
 })(ShvApiVersion || (ShvApiVersion = {}));
+export const pathMatchesSubscription = (subscriptionPath, signalPath, apiVersion) => {
+    if (apiVersion === ShvApiVersion.V2) {
+        const remainder = signalPath.slice(subscriptionPath.length);
+        return signalPath.startsWith(subscriptionPath) && (remainder.length === 0 || remainder.startsWith('/'));
+    }
+    const recursivePathPrefix = subscriptionPath.endsWith('/**') ? subscriptionPath.slice(0, -3) : undefined;
+    return (recursivePathPrefix !== undefined && minimatch(signalPath, recursivePathPrefix)) || minimatch(signalPath, subscriptionPath);
+};
 class WsClient {
     requestId = 1;
     pingTimerId = undefined;
@@ -147,11 +156,12 @@ class WsClient {
         this.timeout = 'timeout' in options && options.timeout !== undefined ? options.timeout : DEFAULT_TIMEOUT;
         this.websocket = new WebSocket(options.wsUri);
         this.websocket.binaryType = 'arraybuffer';
-        const handleSignal = (signal) => {
+        const handleSignal = async (signal) => {
+            const apiVersion = await this.getShvApiVersion();
             for (const sub of this.subscriptions) {
                 const shvPath = signal.meta[RPC_MESSAGE_SHV_PATH];
                 const signalName = signal.meta[RPC_MESSAGE_METHOD];
-                if (shvPath.startsWith(sub.path) && signalName === sub.signal) {
+                if (pathMatchesSubscription(sub.path, shvPath, apiVersion) && signalName === sub.signal) {
                     sub.callback(shvPath, signalName, signal.value[RPC_MESSAGE_PARAMS]);
                 }
             }
@@ -362,7 +372,7 @@ class WsClient {
             const rpcMsg = parseMessage(rpcVal);
             this.logDebug(`message received: ${toCpon(rpcMsg)}`);
             if (isSignal(rpcMsg)) {
-                handleSignal(rpcMsg);
+                await handleSignal(rpcMsg);
             }
             else if (isRequest(rpcMsg)) {
                 await handleRequest(rpcMsg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libshv-js",
-  "version": "8.0.0",
+  "version": "9.0.0",
   "description": "Typescript implementation of libshv",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -46,5 +46,8 @@
     "eslint-plugin-unicorn": "^73.0.0",
     "typescript": "^6.0.2",
     "typescript-eslint": "^8.46.1"
+  },
+  "dependencies": {
+    "minimatch": "^10.2.6"
   }
 }