jsgar 1.7.2 → 2.1.0

package/dist/gar.umd.js

@@ -50,7 +50,7 @@
             this.user = user;
             this.working_namespace = working_namespace;
             this.heartbeatTimeoutInterval = heartbeatTimeoutInterval;
-            this.version = 650269;
+            this.version = 650704;
 
             if (typeof window !== 'undefined' && window.location) {
                 this.application = window.location.href;
@@ -289,13 +289,13 @@
 
         /**
          * Register handler for KeyIntroduction message.
-         * @param {Function} handler - Callback with (keyId, name, _class)
+         * @param {Function} handler - Callback with (keyId, name, class_list)
          * @param subscriptionGroup - The subscription group for callback (default 0)
          */
         registerKeyIntroductionHandler(handler, subscriptionGroup = 0) {
             this.registerHandler('KeyIntroduction', (msg) => {
                 const value = msg.value;
-                handler(value.key_id, value.name, value._class || null);
+                handler(value.key_id, value.name, value.class_list || null);
             }, subscriptionGroup);
         }
 
@@ -343,18 +343,6 @@
             }, subscriptionGroup);
         }
 
-        /**
-         * Register handler for Shutdown message.
-         * @param {Function} handler - Callback with no arguments
-         */
-        registerShutdownHandler(handler) {
-            this.registerHandler('Shutdown', () => handler());
-        }
-
-        clearShutdownHandler() {
-            this.messageHandlers.delete('Shutdown');
-        }
-
         /**
          * Register a callback to handle heartbeat timeout events.
          * @param {Function} handler - Callback with no arguments
@@ -389,8 +377,8 @@
             this.registerLogoffHandler(() => this.log('INFO', 'Logoff received'));
             this.registerTopicIntroductionHandler((topicId, name) =>
                 this.log('DEBUG', `New server topic: ${name} (Server ID: ${topicId})`));
-            this.registerKeyIntroductionHandler((keyId, name, _class) =>
-                this.log('DEBUG', `New server key: ${name} (Server ID: ${keyId})`));
+            this.registerKeyIntroductionHandler((keyId, name, classList) =>
+                this.log('DEBUG', `New server key: ${name} : ${keyId} (Classes: ${JSON.stringify(classList)})`));
             this.registerDeleteKeyHandler((keyId) =>
                 this.log('DEBUG', `Delete key: ${this.serverKeyIdToName.get(keyId) || 'unknown'} (Server ID: ${keyId})`));
             this.registerSubscriptionStatusHandler(this._defaultSubscriptionStatusHandler.bind(this));
@@ -398,7 +386,6 @@
                 this.log('DEBUG', `Delete record: ${this.serverKeyIdToName.get(keyId) || 'unknown'} - ${this.serverTopicIdToName.get(topicId) || 'unknown'}`));
             this.registerRecordUpdateHandler((keyId, topicId, value) =>
                 this.log('DEBUG', `Record update: ${this.serverKeyIdToName.get(keyId) || 'unknown'} - ${this.serverTopicIdToName.get(topicId) || 'unknown'} = ${JSON.stringify(value)}`));
-            this.registerShutdownHandler(() => this.log('INFO', 'Shutdown received'));
         }
 
         /**
@@ -605,9 +592,9 @@
          * Send a subscription request using local IDs.
          * @param {string} name - Subscription name
          * @param {string} [mode='Streaming'] - Subscription mode
-         * @param {string|null} [keyName=null] - Key name
-         * @param {string|null} [topicName=null] - Topic name
-         * @param {string|null} [classFilter=null] - Class filter
+         * @param {string|Array<string>|null} [keyName=null] - Key name(s)
+         * @param {string|Array<string>|null} [topicName=null] - Topic name(s)
+         * @param {string|Array<string>|null} [className=null] - Class name(s)
          * @param {string|null} [keyFilter=null] - Key filter regex
          * @param {string|null} [topicFilter=null] - Topic filter regex
          * @param {boolean} [allMatchingKeys=false] - Retrieve all matching keys
@@ -619,15 +606,41 @@
             mode = 'Streaming',
             keyName = null,
             topicName = null,
-            classFilter = null,
+            className = null,
             keyFilter = null,
             topicFilter = null,
             allMatchingKeys = false,
             subscriptionGroup = 0,
             snapshotSizeLimit = 0
         ) {
-            const keyId = keyName ? this.getAndPossiblyIntroduceKeyId(keyName) : 0;
-            const topicId = topicName ? this.getAndPossiblyIntroduceTopicId(topicName) : 0;
+            // Convert className to array
+            let classList = null;
+            if (typeof className === 'string') {
+                classList = className.split(/\s+/).filter(Boolean);
+            } else if (Array.isArray(className)) {
+                classList = className;
+            }
+
+            let singleClass = Array.isArray(classList) && classList.length === 1 ? classList[0] : null;
+
+            // Convert keyName to array
+            let keyNames = [];
+            if (typeof keyName === 'string') {
+                keyNames = keyName.split(/\s+/).filter(Boolean);
+            } else if (Array.isArray(keyName)) {
+                keyNames = keyName;
+            }
+            const keyIdList = keyNames.map(x => this.getAndPossiblyIntroduceKeyId(x, singleClass));
+
+            // Convert topicName to array
+            let topicNames = [];
+            if (typeof topicName === 'string') {
+                topicNames = topicName.split(/\s+/).filter(Boolean);
+            } else if (Array.isArray(topicName)) {
+                topicNames = topicName;
+            }
+            const topicIdList = topicNames.map(x => this.getAndPossiblyIntroduceTopicId(x));
+
             const subMsg = {
                 message_type: 'Subscribe',
                 value: {
@@ -636,9 +649,9 @@
                     snapshot_size_limit: snapshotSizeLimit,
                     nagle_interval: 0,
                     name,
-                    key_id: keyId,
-                    topic_id: topicId,
-                    _class: classFilter,
+                    key_id_list: keyIdList,
+                    topic_id_list: topicIdList,
+                    class_list: classList,
                     key_filter: keyFilter,
                     topic_filter: topicFilter,
                     subscription_group: subscriptionGroup
@@ -650,21 +663,31 @@
         /**
          * Introduce a new key if not already known and return local key ID.
          * @param {string} name - Key name
-         * @param {string|null} [className=null] - Class name
+         * @param {string|Array<string>|null} [className=null] - Class name(s)
          * @returns {number} Local key ID
          */
         getAndPossiblyIntroduceKeyId(name, className = null) {
             if (!this.localKeyMap.has(name)) {
                 const keyId = this.localKeyCounter++;
                 this.localKeyMap.set(name, keyId);
+                let classList = null;
+                if (className) {
+                    if (typeof className === 'string') {
+                        classList = className.split(/\s+/).filter(Boolean);
+                    } else if (Array.isArray(className)) {
+                        classList = className;
+                    }
+                }
                 const msg = {
                     message_type: 'KeyIntroduction',
                     value: {
                         key_id: keyId,
-                        name,
-                        _class: className
+                        name
                     }
                 };
+                if (classList) {
+                    msg.value.class_list = classList;
+                }
                 this.sendMessage(msg);
             }
             return this.localKeyMap.get(name);

package/package.json

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