jsgar 4.5.0 → 4.5.1

package/dist/gar.umd.js

@@ -72,8 +72,8 @@
             this.serverKeyNameToId = new Map();
             this.localTopicMap = new Map();
             this.localKeyMap = new Map();
+            this.invalidatedKeyIds = new Set();
             this.recordMap = new Map();
-            this._activeOwnership = { msg_ref: 0, ownership_action: 'None', skip_ownership_checks: false, client_key_id: 0 };
 
             this.running = false;
             this.heartbeatIntervalId = null;
@@ -138,9 +138,7 @@
             this.localKeyCounter = 1;
             this.localTopicMap.clear();
             this.localKeyMap.clear();
-
-            // Active ownership state
-            this._activeOwnership = { msg_ref: 0, ownership_action: 'None', skip_ownership_checks: false, client_key_id: 0 };
+            this.invalidatedKeyIds.clear();
 
             // Heartbeat grace period flags
             this._initialGracePeriod = false;
@@ -757,6 +755,8 @@
                     if (!('name' in message.value)) message.value.name = null;
                 }
                 this.serverKeyIdToName.delete(keyId);
+            } else if (msgType === 'ClientIntroducedKeyInvalidated') {
+                this.invalidatedKeyIds.add(message.value.client_introduced_key_id);
             } else if (msgType === 'Heartbeat') {
                 this.lastHeartbeatTime = Date.now() / 1000;
                 if (this._initialGracePeriod) {
@@ -1135,30 +1135,18 @@
             );
         }
 
-        /**
-         * Send an ActiveOwnership message if the parameters differ from the last sent values.
-         * @param {Object} [options]
-         * @param {number} [options.msgRef=0] - Message reference for correlating recoverable error responses.
-         * @param {string} [options.ownershipAction='None'] - 'None' (check only), 'Acquire', or 'Release'.
-         * @param {boolean} [options.skipOwnershipChecks=false] - Bypass ownership validation.
-         * @param {number} [options.clientKeyId=0] - The g::Client key ID for ownership. 0 uses the connection key.
-         */
-        updateActiveOwnership({ msgRef = 0, ownershipAction = 'None', skipOwnershipChecks = false, clientKeyId = 0 } = {}) {
-            const newOwnership = { msg_ref: msgRef, ownership_action: ownershipAction, skip_ownership_checks: skipOwnershipChecks, client_key_id: clientKeyId };
-            const cur = this._activeOwnership;
-            if (newOwnership.msg_ref !== cur.msg_ref || newOwnership.ownership_action !== cur.ownership_action || newOwnership.skip_ownership_checks !== cur.skip_ownership_checks || newOwnership.client_key_id !== cur.client_key_id) {
-                this._activeOwnership = newOwnership;
-                this.sendMessage({ message_type: 'ActiveOwnership', value: newOwnership });
-            }
-        }
-
         /**
          * Introduce a new key if not already known and return local key ID.
          * @param {string} name - Key name
          * @param {string|Array<string>|null} [className=null] - Class name(s)
          * @returns {number} Local key ID
          */
-        getAndPossiblyIntroduceKeyId(name, className = null) {
+        getAndPossiblyIntroduceKeyId(name, className = null, { forceWrite = false, noAcquire = false } = {}) {
+            const existingId = this.localKeyMap.get(name);
+            if (existingId !== undefined && this.invalidatedKeyIds.has(existingId)) {
+                this.invalidatedKeyIds.delete(existingId);
+                this.localKeyMap.delete(name);
+            }
             if (!this.localKeyMap.has(name)) {
                 const keyId = this.localKeyCounter++;
                 this.localKeyMap.set(name, keyId);
@@ -1170,6 +1158,8 @@
                         value.class_list = className;
                     }
                 }
+                if (forceWrite) value.force_write = true;
+                if (noAcquire) value.no_acquire = true;
                 this.sendMessage({ message_type: 'KeyIntroduction', value });
             }
             return this.localKeyMap.get(name);

package/gar.js

@@ -66,8 +66,8 @@ class GARClient {
         this.serverKeyNameToId = new Map();
         this.localTopicMap = new Map();
         this.localKeyMap = new Map();
+        this.invalidatedKeyIds = new Set();
         this.recordMap = new Map();
-        this._activeOwnership = { msg_ref: 0, ownership_action: 'None', skip_ownership_checks: false, client_key_id: 0 };
 
         this.running = false;
         this.heartbeatIntervalId = null;
@@ -132,9 +132,7 @@ class GARClient {
         this.localKeyCounter = 1;
         this.localTopicMap.clear();
         this.localKeyMap.clear();
-
-        // Active ownership state
-        this._activeOwnership = { msg_ref: 0, ownership_action: 'None', skip_ownership_checks: false, client_key_id: 0 };
+        this.invalidatedKeyIds.clear();
 
         // Heartbeat grace period flags
         this._initialGracePeriod = false;
@@ -751,6 +749,8 @@ class GARClient {
                 if (!('name' in message.value)) message.value.name = null;
             }
             this.serverKeyIdToName.delete(keyId);
+        } else if (msgType === 'ClientIntroducedKeyInvalidated') {
+            this.invalidatedKeyIds.add(message.value.client_introduced_key_id);
         } else if (msgType === 'Heartbeat') {
             this.lastHeartbeatTime = Date.now() / 1000;
             if (this._initialGracePeriod) {
@@ -1129,30 +1129,18 @@ class GARClient {
         );
     }
 
-    /**
-     * Send an ActiveOwnership message if the parameters differ from the last sent values.
-     * @param {Object} [options]
-     * @param {number} [options.msgRef=0] - Message reference for correlating recoverable error responses.
-     * @param {string} [options.ownershipAction='None'] - 'None' (check only), 'Acquire', or 'Release'.
-     * @param {boolean} [options.skipOwnershipChecks=false] - Bypass ownership validation.
-     * @param {number} [options.clientKeyId=0] - The g::Client key ID for ownership. 0 uses the connection key.
-     */
-    updateActiveOwnership({ msgRef = 0, ownershipAction = 'None', skipOwnershipChecks = false, clientKeyId = 0 } = {}) {
-        const newOwnership = { msg_ref: msgRef, ownership_action: ownershipAction, skip_ownership_checks: skipOwnershipChecks, client_key_id: clientKeyId };
-        const cur = this._activeOwnership;
-        if (newOwnership.msg_ref !== cur.msg_ref || newOwnership.ownership_action !== cur.ownership_action || newOwnership.skip_ownership_checks !== cur.skip_ownership_checks || newOwnership.client_key_id !== cur.client_key_id) {
-            this._activeOwnership = newOwnership;
-            this.sendMessage({ message_type: 'ActiveOwnership', value: newOwnership });
-        }
-    }
-
     /**
      * Introduce a new key if not already known and return local key ID.
      * @param {string} name - Key name
      * @param {string|Array<string>|null} [className=null] - Class name(s)
      * @returns {number} Local key ID
      */
-    getAndPossiblyIntroduceKeyId(name, className = null) {
+    getAndPossiblyIntroduceKeyId(name, className = null, { forceWrite = false, noAcquire = false } = {}) {
+        const existingId = this.localKeyMap.get(name);
+        if (existingId !== undefined && this.invalidatedKeyIds.has(existingId)) {
+            this.invalidatedKeyIds.delete(existingId);
+            this.localKeyMap.delete(name);
+        }
         if (!this.localKeyMap.has(name)) {
             const keyId = this.localKeyCounter++;
             this.localKeyMap.set(name, keyId);
@@ -1164,6 +1152,8 @@ class GARClient {
                     value.class_list = className;
                 }
             }
+            if (forceWrite) value.force_write = true;
+            if (noAcquire) value.no_acquire = true;
             this.sendMessage({ message_type: 'KeyIntroduction', value });
         }
         return this.localKeyMap.get(name);

package/package.json

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