querysub 0.486.0 → 0.487.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.486.0",
+  "version": "0.487.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/0-path-value-core/ValidStateComputer.ts

@@ -89,13 +89,26 @@ class ValidStateComputer {
                 }
             }
 
+            return true;
+        });
+
+        // For any value we're the authority on that we already have, swap in our own stored copy. The data
+        //  is immutable per (path, time) — only the valid state can differ, and we own that — so we must never
+        //  adopt a sibling authority's valid state. Remapping (rather than only skipping the re-ingest) keeps
+        //  everything downstream (valuesChanged, dependenciesChanged) on a single object instead of a mix of
+        //  our copy and the remote's.
+        pathValues = pathValues.map(value => {
+            if (!PathRouter.isSelfAuthority(value.path)) return value;
+            return authorityStorage.getValueExactMaybeRejected(value.path, value.time) || value;
+        });
+
+        for (let value of pathValues) {
             if (!PathRouter.isSelfAuthority(value.path)) {
                 notOurValues.push(value);
             } else {
                 ourValues.push(value);
             }
-            return true;
-        });
+        }
 
         // NOTE: Watch value locks, will internally watch remote locks if we aren't the authority on the values
         lockWatcher2.watchValueLocks(ourValues, now);
@@ -182,9 +195,7 @@ class ValidStateComputer {
         }
 
         authorityStorage.ingestValues(notOurValues, { doNotArchive });
-        let newOurValues = ourValues.filter(x => !authorityStorage.getValueExactMaybeRejected(x.path, x.time));
-        // Only ingest the values that are new to us. Otherwise, we'd be accepting the valid state from somebody else, and we're the authority, so we just shouldn't do that. 
-        authorityStorage.ingestValues(newOurValues, { doNotArchive });
+        authorityStorage.ingestValues(ourValues, { doNotArchive });
 
 
         let loopCount = 0;