@rljson/fs-agent 0.0.26 → 0.0.27

package/dist/fs-agent.d.ts

@@ -274,6 +274,17 @@ export declare class FsAgent {
      * must never be worth failing a sync over.
      * @param ref - The ref the folder is now at.
      */
+    /**
+     * Starts the watcher unless it is already running.
+     *
+     * Both `syncToDb` and `syncFromDb` need a live watcher and either may be
+     * started first. `syncToDb` used to call `watch()` unconditionally, so
+     * starting them in the order `syncFromDb` then `syncToDb` threw "Already
+     * watching" — which quietly forced every caller into push-first, the order
+     * that lets a reconnecting client overwrite the network with a stale tree.
+     * A crash is a poor reason to choose an unsafe order.
+     */
+    private _ensureWatching;
     private _persistCurrentRef;
     /**
      * The ref this folder was last recorded at, from a previous run.

package/dist/fs-agent.js

@@ -458,6 +458,10 @@ class FsScanner {
   get tree() {
     return this._tree;
   }
+  /** Whether a watcher is currently installed. */
+  get isWatching() {
+    return this._watcher !== null;
+  }
   get rootPath() {
     return this._rootPath;
   }
@@ -1161,6 +1165,21 @@ class FsAgent {
    * must never be worth failing a sync over.
    * @param ref - The ref the folder is now at.
    */
+  /**
+   * Starts the watcher unless it is already running.
+   *
+   * Both `syncToDb` and `syncFromDb` need a live watcher and either may be
+   * started first. `syncToDb` used to call `watch()` unconditionally, so
+   * starting them in the order `syncFromDb` then `syncToDb` threw "Already
+   * watching" — which quietly forced every caller into push-first, the order
+   * that lets a reconnecting client overwrite the network with a stale tree.
+   * A crash is a poor reason to choose an unsafe order.
+   */
+  async _ensureWatching() {
+    if (!this._scanner.isWatching) {
+      await this._scanner.watch();
+    }
+  }
   _persistCurrentRef(ref) {
     try {
       writeFileSync(
@@ -1927,7 +1946,7 @@ ${err.stack}` : String(err);
       }, this._timeouts.debounceMs);
     };
     this._scanner.onChange(debouncedSync);
-    await this._scanner.watch();
+    await this._ensureWatching();
     return () => {
       if (debounceTimer) clearTimeout(debounceTimer);
       this._scanner.offChange(debouncedSync);
@@ -2170,9 +2189,7 @@ ${err.stack}` : String(err);
    * @returns Function to stop watching
    */
   async syncFromDb(db, connector, treeKey, restoreOptions) {
-    if (!this._scanner["_watcher"]) {
-      await this._scanner.watch();
-    }
+    await this._ensureWatching();
     let pendingRef = null;
     let fromDbTimer = null;
     let pendingRecoveryAttempt = 0;

package/dist/fs-scanner.d.ts

@@ -121,6 +121,8 @@ export declare class FsScanner {
     private _vanishedDuringScan;
     constructor(rootPath: string, options?: FsScanOptions);
     get tree(): FsTree | null;
+    /** Whether a watcher is currently installed. */
+    get isWatching(): boolean;
     get rootPath(): string;
     get bs(): Bs;
     scan(): Promise<FsTree>;

package/package.json

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