jsgar 1.6.1 → 1.7.1

package/dist/gar.umd.js

@@ -91,6 +91,8 @@
                 this.logLevel = 'INFO';
             }
 
+            this.activeSubscriptionGroup = 0;
+
             this.registerDefaultHandlers();
         }
 
@@ -210,9 +212,10 @@
          * Register a callback handler for a specific message type.
          * @param {string} messageType - Type of message
          * @param {Function} handler - Callback function
+         * @param subscriptionGroup - Subscription group for callback (default 0)
          */
-        registerHandler(messageType, handler) {
-            this.messageHandlers.set(messageType, handler);
+        registerHandler(messageType, handler, subscriptionGroup = 0) {
+            this.messageHandlers.set(subscriptionGroup ? `${messageType} ${subscriptionGroup}` : messageType, handler);
         }
 
         /**
@@ -287,28 +290,22 @@
         /**
          * Register handler for KeyIntroduction message.
          * @param {Function} handler - Callback with (keyId, name, _class)
+         * @param subscriptionGroup - The subscription group for callback (default 0)
          */
-        registerKeyIntroductionHandler(handler) {
+        registerKeyIntroductionHandler(handler, subscriptionGroup = 0) {
             this.registerHandler('KeyIntroduction', (msg) => {
                 const value = msg.value;
                 handler(value.key_id, value.name, value._class || null);
-            });
-        }
-
-        clearKeyIntroductionHandler() {
-            this.messageHandlers.delete('KeyIntroduction');
+            }, subscriptionGroup);
         }
 
         /**
          * Register handler for DeleteKey message.
          * @param {Function} handler - Callback with (keyId)
+         * @param subscriptionGroup - The subscription group for callback (default 0)
          */
-        registerDeleteKeyHandler(handler) {
-            this.registerHandler('DeleteKey', (msg) => handler(msg.value.key_id));
-        }
-
-        clearDeleteKeyHandler() {
-            this.messageHandlers.delete('DeleteKey');
+        registerDeleteKeyHandler(handler, subscriptionGroup = 0) {
+            this.registerHandler('DeleteKey', (msg) => handler(msg.value.key_id), subscriptionGroup);
         }
 
         /**
@@ -326,30 +323,24 @@
         /**
          * Register handler for DeleteRecord message.
          * @param {Function} handler - Callback with (keyId, topicId)
+         * @param subscriptionGroup - The subscription group for callback (default 0)
          */
-        registerDeleteRecordHandler(handler) {
+        registerDeleteRecordHandler(handler, subscriptionGroup = 0) {
             this.registerHandler('DeleteRecord', (msg) => {
                 handler(msg.value.key_id, msg.value.topic_id);
-            });
-        }
-
-        clearDeleteRecordHandler() {
-            this.messageHandlers.delete('DeleteRecord');
+            }, subscriptionGroup);
         }
 
         /**
          * Register handler for JSONRecordUpdate message.
          * @param {Function} handler - Callback with (keyId, topicId, value)
+         * @param subscriptionGroup - The subscription group for callback (default 0)
          */
-        registerRecordUpdateHandler(handler) {
+        registerRecordUpdateHandler(handler, subscriptionGroup = 0) {
             this.registerHandler('JSONRecordUpdate', (msg) => {
                 const recordId = msg.value.record_id;
                 handler(recordId.key_id, recordId.topic_id, msg.value.value);
-            });
-        }
-
-        clearRecordUpdateHandler() {
-            this.messageHandlers.delete('JSONRecordUpdate');
+            }, subscriptionGroup);
         }
 
         /**
@@ -482,6 +473,7 @@
             if (this.stoppedCallback) {
                 this.stoppedCallback();
             }
+            this.log('INFO', 'GAR client stopped');
         }
 
         /**
@@ -552,13 +544,16 @@
          */
         _processMessage(message) {
             const msgType = message.message_type;
+            let subscriptionGroup = 0;
             if (msgType === 'TopicIntroduction') {
                 this.serverTopicIdToName.set(message.value.topic_id, message.value.name);
                 this.serverTopicNameToId.set(message.value.name, message.value.topic_id);
             } else if (msgType === 'KeyIntroduction') {
+                subscriptionGroup = this.activeSubscriptionGroup;
                 this.serverKeyIdToName.set(message.value.key_id, message.value.name);
                 this.serverKeyNameToId.set(message.value.name, message.value.key_id);
             } else if (msgType === 'DeleteKey') {
+                subscriptionGroup = this.activeSubscriptionGroup;
                 this.serverKeyNameToId.delete(this.serverKeyIdToName.get(message.value.key_id) || "");
                 this.serverKeyIdToName.delete(message.value.key_id);
             } else if (msgType === 'Heartbeat') {
@@ -578,13 +573,17 @@
                 this._initialGracePeriod = true;
                 this._initialGraceDeadline = this.lastHeartbeatTime + this.heartbeatTimeout * 10;
             } else if (msgType === 'JSONRecordUpdate') {
+                subscriptionGroup = this.activeSubscriptionGroup;
                 const recordId = message.value.record_id;
                 const keyId = recordId.key_id;
                 const topicId = recordId.topic_id;
                 this.recordMap.set(`${keyId}:${topicId}`, message.value.value);
             } else if (msgType === 'DeleteRecord') {
-                const { key_id: keyId, topic_id: topicId } = message.value;
+                subscriptionGroup = this.activeSubscriptionGroup;
+                const {key_id: keyId, topic_id: topicId} = message.value;
                 this.recordMap.delete(`${keyId}:${topicId}`);
+            } else if (msgType === "ActiveSubscription") {
+                this.activeSubscriptionGroup = message["value"]["subscription_group"];
             } else if (msgType === 'Logoff') {
                 this.log('INFO', 'Received Logoff from server');
                 this.stop();
@@ -596,7 +595,7 @@
 
             this.checkHeartbeat();
 
-            const handler = this.messageHandlers.get(msgType);
+            const handler = this.messageHandlers.get(subscriptionGroup ? `${msgType} ${subscriptionGroup}` : msgType);
             if (handler) {
                 handler(message);
             }
@@ -623,6 +622,7 @@
             keyFilter = null,
             topicFilter = null,
             allMatchingKeys = false,
+            subscriptionGroup = 0,
             snapshotSizeLimit = 0
         ) {
             const keyId = keyName ? this.getAndPossiblyIntroduceKeyId(keyName) : 0;
@@ -639,7 +639,8 @@
                     topic_id: topicId,
                     _class: classFilter,
                     key_filter: keyFilter,
-                    topic_filter: topicFilter
+                    topic_filter: topicFilter,
+                    subscription_group: subscriptionGroup
                 }
             };
             this.sendMessage(subMsg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsgar",
-  "version": "1.6.1",
+  "version": "1.7.1",
   "description": "A Javascript client for the GAR protocol",
   "type": "module",
   "main": "dist/gar.umd.js",