@rljson/fs-agent 0.0.47 → 0.0.49

package/dist/fs-agent.d.ts

@@ -276,6 +276,14 @@ export declare class FsAgent {
     /** Files written vs left alone by the current {@link restore}. */
     private _restoreWritten;
     private _restoreSkipped;
+    /**
+     * The file set of the newest tree any peer has told this node about.
+     *
+     * Kept so the SEND path can answer the one question a receiver never can:
+     * am I about to announce a state that is merely my progress through someone
+     * else's? See the check in `syncToDb`.
+     */
+    private _lastKnownRemoteFiles?;
     /**
      * Files this restore DELETED.
      *

package/dist/fs-agent.js

@@ -1152,6 +1152,14 @@ class FsAgent {
   /** Files written vs left alone by the current {@link restore}. */
   _restoreWritten = 0;
   _restoreSkipped = 0;
+  /**
+   * The file set of the newest tree any peer has told this node about.
+   *
+   * Kept so the SEND path can answer the one question a receiver never can:
+   * am I about to announce a state that is merely my progress through someone
+   * else's? See the check in `syncToDb`.
+   */
+  _lastKnownRemoteFiles;
   /**
    * Files this restore DELETED.
    *
@@ -2021,6 +2029,25 @@ ${err.stack}` : String(err);
             if (contentKey === this._lastSentContentKey) {
               return;
             }
+            const known = this._lastKnownRemoteFiles;
+            if (known && tree.trees.size > 0) {
+              const mine = this._getFileContentMap(tree);
+              if (mine.size < known.size) {
+                let hasOwn = false;
+                for (const path of mine.keys()) {
+                  if (!known.has(path)) {
+                    hasOwn = true;
+                    break;
+                  }
+                }
+                if (!hasOwn) {
+                  console.log(
+                    `[FsAgent] not announcing ${mine.size} of ${known.size} files — this node is still catching up, and that is a gap rather than news.`
+                  );
+                  return;
+                }
+              }
+            }
             const dbAdapter = new FsDbAdapter(db, treeKey);
             const parentRef = this._currentRef;
             const previous = await this._ancestryPrevious(
@@ -2431,10 +2458,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 +2523,24 @@ ${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);
+          this._lastKnownRemoteFiles = incomingFiles;
+          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.49",
   "description": "Rljson fs-agent description",
   "homepage": "https://github.com/rljson/fs-agent",
   "bugs": "https://github.com/rljson/fs-agent/issues",