jsgar 1.5.1 → 1.5.3

package/dist/gar.umd.js

@@ -60,8 +60,10 @@
                 this.application = 'unknown-js';
             }
 
-            this.serverTopicMap = new Map();
-            this.serverKeyMap = new Map();
+            this.serverTopicIdToName = new Map();
+            this.serverTopicNameToId = new Map();
+            this.serverKeyIdToName = new Map();
+            this.serverKeyNameToId = new Map();
             this.localTopicCounter = 1;
             this.localKeyCounter = 1;
             this.localTopicMap = new Map();
@@ -199,12 +201,14 @@
          */
         _receiveMessages() {
             this.websocket.onmessage = (event) => {
+                let message = null;
                 try {
-                    const message = JSON.parse(event.data);
-                    this._processMessage(message);
+                    message = JSON.parse(event.data);
                 } catch (e) {
                     this.log('ERROR', `Invalid JSON received: ${e.message}`);
                 }
+
+                this._processMessage(message);
             };
         }
 
@@ -403,12 +407,12 @@
             this.registerKeyIntroductionHandler((keyId, name, _class) =>
                 this.log('DEBUG', `New server key: ${name} (Server ID: ${keyId})`));
             this.registerDeleteKeyHandler((keyId) =>
-                this.log('DEBUG', `Delete key: ${this.serverKeyMap.get(keyId) || 'unknown'} (Server ID: ${keyId})`));
+                this.log('DEBUG', `Delete key: ${this.serverKeyIdToName.get(keyId) || 'unknown'} (Server ID: ${keyId})`));
             this.registerSubscriptionStatusHandler(this._defaultSubscriptionStatusHandler.bind(this));
             this.registerDeleteRecordHandler((keyId, topicId) =>
-                this.log('DEBUG', `Delete record: ${this.serverKeyMap.get(keyId) || 'unknown'} - ${this.serverTopicMap.get(topicId) || 'unknown'}`));
+                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.serverKeyMap.get(keyId) || 'unknown'} - ${this.serverTopicMap.get(topicId) || 'unknown'} = ${JSON.stringify(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'));
         }
 
@@ -555,11 +559,14 @@
         _processMessage(message) {
             const msgType = message.message_type;
             if (msgType === 'TopicIntroduction') {
-                this.serverTopicMap.set(message.value.topic_id, message.value.name);
+                this.serverTopicIdToName.set(message.value.topic_id, message.value.name);
+                this.serverTopicNameToId.set(message.value.name, message.value.topic_id);
             } else if (msgType === 'KeyIntroduction') {
-                this.serverKeyMap.set(message.value.key_id, message.value.name);
+                this.serverKeyIdToName.set(message.value.key_id, message.value.name);
+                this.serverKeyNameToId.set(message.value.name, message.value.key_id);
             } else if (msgType === 'DeleteKey') {
-                this.serverKeyMap.delete(message.value.key_id);
+                this.serverKeyNameToId.delete(this.serverKeyIdToName.get(message.value.key_id) || "");
+                this.serverKeyIdToName.delete(message.value.key_id);
             } else if (msgType === 'Heartbeat') {
                 this.lastHeartbeatTime = Date.now() / 1000;
                 if (this._initialGracePeriod) {
@@ -567,8 +574,10 @@
                 }
             } else if (msgType === 'Introduction') {
                 const value = message.value;
-                this.serverTopicMap.clear();
-                this.serverKeyMap.clear();
+                this.serverTopicIdToName.clear();
+                this.serverTopicNameToId.clear();
+                this.serverKeyIdToName.clear();
+                this.serverKeyNameToId.clear();
                 this.recordMap.clear();
                 this.heartbeatTimeout = Math.max(this.heartbeatTimeout, value.heartbeat_timeout_interval / 1000);
                 this.lastHeartbeatTime = Date.now() / 1000;

package/package.json

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