querysub 0.484.0 → 0.486.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.484.0",
+  "version": "0.486.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

@@ -182,7 +182,9 @@ class ValidStateComputer {
         }
 
         authorityStorage.ingestValues(notOurValues, { doNotArchive });
-        authorityStorage.ingestValues(ourValues, { 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 });
 
 
         let loopCount = 0;
@@ -384,6 +386,11 @@ class ValidStateComputer {
                 // Don't decide; leave pathValue.valid and storage alone. Schedule retry at outer level.
                 for (let pathValue of valueGroup) {
                     deferred.push(pathValue);
+                    console.info(`Deferring value valid changing`, {
+                        path: pathValue.path,
+                        timeId: pathValue.time.time,
+                        timeIdFull: pathValue.time,
+                    });
                 }
                 continue;
             }
@@ -414,11 +421,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,