@rljson/fs-agent 0.0.47 → 0.0.48

package/dist/fs-agent.js

@@ -2431,10 +2431,10 @@ ${err.stack}` : String(err);
             `syncFromDb → extract(${this._rootPath})`
           );
           if (this._treesHaveEquivalentContent(currentTree, incomingTree)) {
-            const incomingFiles = this._getFileContentMap(incomingTree);
+            const incomingFiles2 = this._getFileContentMap(incomingTree);
             const currentFiles = this._getFileContentMap(currentTree);
             console.log(
-              `[FsAgent] syncFromDb: equivalent content, skipping restore (incoming=${incomingFiles.size} entries, current=${currentFiles.size} entries, ref=${treeRef.slice(0, 8)}…)`
+              `[FsAgent] syncFromDb: equivalent content, skipping restore (incoming=${incomingFiles2.size} entries, current=${currentFiles.size} entries, ref=${treeRef.slice(0, 8)}…)`
             );
             this._adoptAppliedRef(connector, treeRef);
             this._currentRef = treeRef;
@@ -2496,10 +2496,23 @@ ${err.stack}` : String(err);
           this._adoptAppliedRef(connector, treeRef);
           this._currentRef = postRestoreRef;
           this._persistCurrentRef(postRestoreRef);
-          const postRestoreKey = this._contentKeyFromTree(postRestoreTree);
-          if (postRestoreKey === this._contentKeyFromTree(incomingTree)) {
+          const postRestoreFiles = this._getFileContentMap(postRestoreTree);
+          const incomingFiles = this._getFileContentMap(incomingTree);
+          let hasNewsOfOurOwn = false;
+          for (const path of postRestoreFiles.keys()) {
+            if (!incomingFiles.has(path)) {
+              hasNewsOfOurOwn = true;
+              break;
+            }
+          }
+          if (!hasNewsOfOurOwn) {
             this._lastSentRef = postRestoreRef;
-            this._lastSentContentKey = postRestoreKey;
+            this._lastSentContentKey = this._contentKeyFromTree(postRestoreTree);
+            if (postRestoreFiles.size < incomingFiles.size) {
+              console.log(
+                `[FsAgent] ref=${treeRef.slice(0, 8)}… left this node behind (${postRestoreFiles.size} of ${incomingFiles.size} files) — not announcing a state that is catching up.`
+              );
+            }
           }
           return;
         } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rljson/fs-agent",
-  "version": "0.0.47",
+  "version": "0.0.48",
   "description": "Rljson fs-agent description",
   "homepage": "https://github.com/rljson/fs-agent",
   "bugs": "https://github.com/rljson/fs-agent/issues",