querysub 0.485.0 → 0.487.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.485.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);
@@ -419,11 +432,11 @@ class ValidStateComputer {
                 }
                 */
                 // IMPORTANT! This means if it didn't previously exist and it's presently rejected, we count that as a change, as it this is going from undefined to false. This is actually very useful, as a lot of places want to know if a write is rejected, so they can display it in the UI for the developer.
-                if (valid === prevValidState) continue;
+                if (valid === prevValidState && pathValue.valid === valid) continue;
 
                 // NOTE: We might remove this logging later as it's pretty heavy, but right now we still have bugs somewhere here.
                 {
-                    console.info(`Changed valid state ${JSON.stringify(prevValidState)} to ${JSON.stringify(valid)}`, {
+                    console.info(`Changed valid state ${JSON.stringify(prevValidState)} to ${JSON.stringify(valid)} (and path is ${JSON.stringify(pathValue.valid)})`, {
                         path: pathValue.path,
                         timeId: pathValue.time.time,
                         timeIdFull: pathValue.time,