jsgar 4.13.6 → 4.14.0

package/dist/gar.umd.js

@@ -212,7 +212,10 @@
             }
             this.unique_key_and_record_updates = uniqueKeyAndRecordUpdates;
             this.logEveryMessage = logEveryMessage;
-            this.version = 650710;
+            this.version = 650711;
+            // Monotonic correlation id stamped inline on each compare-exchange (required protocol field); the
+            // result echoes it. Correlation no longer rides the active_ownership marker — see compare_exchange.md.
+            this._casMessageReference = 0;
             this.uuid = GARClient._generateUUID();
 
             if (typeof window !== 'undefined' && window.location) {
@@ -229,6 +232,10 @@
             this.serverKeyNameToId = new Map();
             this.localTopicMap = new Map();
             this.localKeyMap = new Map();
+            // Classes each locally-introduced key has been introduced under, so a later
+            // getAndPossiblyIntroduceKeyId with a NEW class sends an additive KeyIntroduction (the server's
+            // class_list is additive) rather than silently no-op'ing. Keyed by key name -> Set<className>.
+            this.localKeyClasses = new Map();
             this.invalidatedKeyIds = new Set();
             this.recordMap = new Map();
             this._activeOwnership = { msg_ref: 0, ownership_action: 'None', skip_ownership_checks: false, require_existing: false, client_key_id: 0 };
@@ -296,6 +303,7 @@
             this.localKeyCounter = 1;
             this.localTopicMap.clear();
             this.localKeyMap.clear();
+            this.localKeyClasses.clear();
             this.invalidatedKeyIds.clear();
 
             // Active ownership state
@@ -1504,15 +1512,30 @@
             if (existingId !== undefined && this.invalidatedKeyIds.has(existingId)) {
                 this.invalidatedKeyIds.delete(existingId);
                 this.localKeyMap.delete(name);
+                this.localKeyClasses.delete(name);
             }
+            const newClasses = typeof className === 'string'
+                ? className.split(/\s+/).filter(Boolean)
+                : (Array.isArray(className) ? className.filter(Boolean) : []);
             if (!this.localKeyMap.has(name)) {
-                if (!className) throw new Error(`getAndPossiblyIntroduceKeyId: className required to introduce key "${name}"`);
+                if (!newClasses.length) throw new Error(`getAndPossiblyIntroduceKeyId: className required to introduce key "${name}"`);
                 const keyId = this.localKeyCounter++;
                 this.localKeyMap.set(name, keyId);
-                const value = { key_id: keyId, name };
-                if (typeof className === 'string') value.class_list = className.split(/\s+/).filter(Boolean);
-                else if (Array.isArray(className)) value.class_list = className;
-                this.sendMessage({ message_type: 'KeyIntroduction', value });
+                this.localKeyClasses.set(name, new Set(newClasses));
+                this.sendMessage({ message_type: 'KeyIntroduction', value: { key_id: keyId, name, class_list: newClasses } });
+            } else {
+                // Already introduced: add any classes the key isn't yet a member of via an additive
+                // KeyIntroduction (same key_id, only the new classes — the server's class_list adds to the
+                // existing membership). Without this, a key first introduced under one class never gains a
+                // second class on a later call, and a write/CAS on a topic of the new class is rejected
+                // server-side ("topic X does not apply to key of class ...").
+                let known = this.localKeyClasses.get(name);
+                if (!known) { known = new Set(); this.localKeyClasses.set(name, known); }
+                const added = newClasses.filter(c => !known.has(c));
+                if (added.length) {
+                    added.forEach(c => known.add(c));
+                    this.sendMessage({ message_type: 'KeyIntroduction', value: { key_id: this.localKeyMap.get(name), name, class_list: added } });
+                }
             }
             return this.localKeyMap.get(name);
         }
@@ -1566,10 +1589,14 @@
             const keyId = this.localKeyMap.get(keyName);
             if (keyId === undefined) return;
             const value = { key_id: keyId, name: keyName, deleted_class: className };
+            const known = this.localKeyClasses.get(keyName);
+            if (known) known.delete(className);
             if (downgradeToClassList) {
-                value.class_list = typeof downgradeToClassList === 'string'
+                const downgrade = typeof downgradeToClassList === 'string'
                     ? downgradeToClassList.split(/\s+/).filter(Boolean)
-                    : downgradeToClassList;
+                    : downgradeToClassList.filter(Boolean);
+                value.class_list = downgrade;
+                if (known) downgrade.forEach(c => known.add(c));
             }
             this.sendMessage({ message_type: 'KeyIntroduction', value });
         }
@@ -1591,8 +1618,9 @@
             const keyId = this.localKeyMap.get(keyName);
             if (keyId === undefined) return;
             this.publishDeleteKey(keyId);
-            // Forget the local id so future re-introduction allocates a new one.
+            // Forget the local id (and its class set) so future re-introduction allocates a new one.
             this.localKeyMap.delete(keyName);
+            this.localKeyClasses.delete(keyName);
         }
 
         /**
@@ -1674,9 +1702,10 @@
          * @param {any} value - New value to set on match
          */
         compareExchangeRecordWithIds(keyId, topicId, test, value) {
+            const msgRef = ++this._casMessageReference;
             this.sendMessage({
                 message_type: 'JSONCompareExchange',
-                value: { record_id: { key_id: keyId, topic_id: topicId }, test, value }
+                value: { record_id: { key_id: keyId, topic_id: topicId }, msg_ref: msgRef, test, value }
             });
         }
 

package/gar.js

@@ -205,7 +205,10 @@ class GARClient {
         }
         this.unique_key_and_record_updates = uniqueKeyAndRecordUpdates;
         this.logEveryMessage = logEveryMessage;
-        this.version = 650710;
+        this.version = 650711;
+        // Monotonic correlation id stamped inline on each compare-exchange (required protocol field); the
+        // result echoes it. Correlation no longer rides the active_ownership marker — see compare_exchange.md.
+        this._casMessageReference = 0;
         this.uuid = GARClient._generateUUID();
 
         if (typeof window !== 'undefined' && window.location) {
@@ -222,6 +225,10 @@ class GARClient {
         this.serverKeyNameToId = new Map();
         this.localTopicMap = new Map();
         this.localKeyMap = new Map();
+        // Classes each locally-introduced key has been introduced under, so a later
+        // getAndPossiblyIntroduceKeyId with a NEW class sends an additive KeyIntroduction (the server's
+        // class_list is additive) rather than silently no-op'ing. Keyed by key name -> Set<className>.
+        this.localKeyClasses = new Map();
         this.invalidatedKeyIds = new Set();
         this.recordMap = new Map();
         this._activeOwnership = { msg_ref: 0, ownership_action: 'None', skip_ownership_checks: false, require_existing: false, client_key_id: 0 };
@@ -289,6 +296,7 @@ class GARClient {
         this.localKeyCounter = 1;
         this.localTopicMap.clear();
         this.localKeyMap.clear();
+        this.localKeyClasses.clear();
         this.invalidatedKeyIds.clear();
 
         // Active ownership state
@@ -1497,15 +1505,30 @@ class GARClient {
         if (existingId !== undefined && this.invalidatedKeyIds.has(existingId)) {
             this.invalidatedKeyIds.delete(existingId);
             this.localKeyMap.delete(name);
+            this.localKeyClasses.delete(name);
         }
+        const newClasses = typeof className === 'string'
+            ? className.split(/\s+/).filter(Boolean)
+            : (Array.isArray(className) ? className.filter(Boolean) : []);
         if (!this.localKeyMap.has(name)) {
-            if (!className) throw new Error(`getAndPossiblyIntroduceKeyId: className required to introduce key "${name}"`);
+            if (!newClasses.length) throw new Error(`getAndPossiblyIntroduceKeyId: className required to introduce key "${name}"`);
             const keyId = this.localKeyCounter++;
             this.localKeyMap.set(name, keyId);
-            const value = { key_id: keyId, name };
-            if (typeof className === 'string') value.class_list = className.split(/\s+/).filter(Boolean);
-            else if (Array.isArray(className)) value.class_list = className;
-            this.sendMessage({ message_type: 'KeyIntroduction', value });
+            this.localKeyClasses.set(name, new Set(newClasses));
+            this.sendMessage({ message_type: 'KeyIntroduction', value: { key_id: keyId, name, class_list: newClasses } });
+        } else {
+            // Already introduced: add any classes the key isn't yet a member of via an additive
+            // KeyIntroduction (same key_id, only the new classes — the server's class_list adds to the
+            // existing membership). Without this, a key first introduced under one class never gains a
+            // second class on a later call, and a write/CAS on a topic of the new class is rejected
+            // server-side ("topic X does not apply to key of class ...").
+            let known = this.localKeyClasses.get(name);
+            if (!known) { known = new Set(); this.localKeyClasses.set(name, known); }
+            const added = newClasses.filter(c => !known.has(c));
+            if (added.length) {
+                added.forEach(c => known.add(c));
+                this.sendMessage({ message_type: 'KeyIntroduction', value: { key_id: this.localKeyMap.get(name), name, class_list: added } });
+            }
         }
         return this.localKeyMap.get(name);
     }
@@ -1559,10 +1582,14 @@ class GARClient {
         const keyId = this.localKeyMap.get(keyName);
         if (keyId === undefined) return;
         const value = { key_id: keyId, name: keyName, deleted_class: className };
+        const known = this.localKeyClasses.get(keyName);
+        if (known) known.delete(className);
         if (downgradeToClassList) {
-            value.class_list = typeof downgradeToClassList === 'string'
+            const downgrade = typeof downgradeToClassList === 'string'
                 ? downgradeToClassList.split(/\s+/).filter(Boolean)
-                : downgradeToClassList;
+                : downgradeToClassList.filter(Boolean);
+            value.class_list = downgrade;
+            if (known) downgrade.forEach(c => known.add(c));
         }
         this.sendMessage({ message_type: 'KeyIntroduction', value });
     }
@@ -1584,8 +1611,9 @@ class GARClient {
         const keyId = this.localKeyMap.get(keyName);
         if (keyId === undefined) return;
         this.publishDeleteKey(keyId);
-        // Forget the local id so future re-introduction allocates a new one.
+        // Forget the local id (and its class set) so future re-introduction allocates a new one.
         this.localKeyMap.delete(keyName);
+        this.localKeyClasses.delete(keyName);
     }
 
     /**
@@ -1667,9 +1695,10 @@ class GARClient {
      * @param {any} value - New value to set on match
      */
     compareExchangeRecordWithIds(keyId, topicId, test, value) {
+        const msgRef = ++this._casMessageReference;
         this.sendMessage({
             message_type: 'JSONCompareExchange',
-            value: { record_id: { key_id: keyId, topic_id: topicId }, test, value }
+            value: { record_id: { key_id: keyId, topic_id: topicId }, msg_ref: msgRef, test, value }
         });
     }
 

package/package.json

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