pushwork 1.0.0 → 1.0.3

package/src/utils/network-sync.ts

@@ -10,6 +10,8 @@ export async function waitForSync(
   syncServerStorageId?: StorageId,
   timeoutMs: number = 60000 // 60 second timeout for debugging
 ): Promise<void> {
+  const startTime = Date.now();
+
   if (!syncServerStorageId) {
     console.warn(
       "No sync server storage ID provided. Skipping network sync wait."
@@ -47,7 +49,10 @@ export async function waitForSync(
   const promises = handlesToWaitOn.map(
     (handle, index) =>
       new Promise<void>((resolve, reject) => {
+        let pollInterval: NodeJS.Timeout;
+
         const timeout = setTimeout(() => {
+          clearInterval(pollInterval);
           const localHeads = handle.heads();
           const syncInfo = handle.getSyncInfo(syncServerStorageId);
           const remoteHeads = syncInfo?.lastHeads;
@@ -79,6 +84,7 @@ export async function waitForSync(
               console.log(`✅ Document ${index + 1} synced: ${handle.url}`);
             }
             clearTimeout(timeout);
+            clearInterval(pollInterval);
             resolve();
             return true;
           }
@@ -90,7 +96,14 @@ export async function waitForSync(
           return;
         }
 
-        // Otherwise, wait for remote-heads event
+        // Periodically re-check if heads have converged (polling fallback)
+        pollInterval = setInterval(() => {
+          if (checkSync()) {
+            clearInterval(pollInterval);
+          }
+        }, 100); // Check every 100ms for faster response
+
+        // Also wait for remote-heads event (faster when events work)
         const onRemoteHeads = ({
           storageId,
           heads,
@@ -118,6 +131,7 @@ export async function waitForSync(
               );
             }
             clearTimeout(timeout);
+            clearInterval(pollInterval);
             handle.off("remote-heads", onRemoteHeads);
             resolve();
           } else if (verbose) {
@@ -134,11 +148,13 @@ export async function waitForSync(
 
   try {
     await Promise.all(promises);
+    const elapsed = Date.now() - startTime;
     if (verbose) {
-      console.log("✅ All documents synced to network");
+      console.log(`✅ All documents synced to network (took ${elapsed}ms)`);
     }
   } catch (error) {
-    console.error(`❌ Sync wait failed: ${error}`);
+    const elapsed = Date.now() - startTime;
+    console.error(`❌ Sync wait failed after ${elapsed}ms: ${error}`);
     throw error;
   }
 }

package/test/integration/debug-both-nested.sh

@@ -0,0 +1,74 @@
+#!/bin/bash
+set -e
+
+# Get absolute path to pushwork CLI
+PUSHWORK_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
+PUSHWORK_CLI="$PUSHWORK_ROOT/dist/cli.js"
+
+echo "=== Creating test repos ==="
+TESTDIR=$(mktemp -d)
+REPO_A="$TESTDIR/repo-a"
+REPO_B="$TESTDIR/repo-b"
+mkdir -p "$REPO_A" "$REPO_B"
+
+echo "=== Initializing repo A with a file ==="
+echo "initial" > "$REPO_A/initial.txt"
+cd "$REPO_A"
+node "$PUSHWORK_CLI" init .
+
+echo ""
+echo "=== Cloning to repo B ==="
+ROOT_URL=$(node "$PUSHWORK_CLI" url)
+echo "Root URL: $ROOT_URL"
+cd "$TESTDIR"
+node "$PUSHWORK_CLI" clone "$ROOT_URL" "$REPO_B"
+
+echo ""
+echo "=== On A: Try to editAndRename non-existent file ==="
+# This should be a no-op since tmjaz/namelye.txt doesn't exist
+echo "(This is a no-op since source doesn't exist)"
+
+echo ""
+echo "=== On B: Create file in 2-level nested subdirectory ==="
+mkdir -p "$REPO_B/rlpjug/ewsv"
+echo "" > "$REPO_B/rlpjug/ewsv/sneked.txt"
+
+echo ""
+echo "=== Sync round 1: A ==="
+cd "$REPO_A"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Sync round 1: B ==="
+cd "$REPO_B"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Sync round 2: A ==="
+cd "$REPO_A"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Sync round 2: B ==="
+cd "$REPO_B"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Verification ==="
+echo "Files in A:"
+find "$REPO_A" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_A/||" | sort
+
+echo ""
+echo "Files in B:"
+find "$REPO_B" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_B/||" | sort
+
+echo ""
+if [ -f "$REPO_A/rlpjug/ewsv/sneked.txt" ]; then
+  echo "✅ SUCCESS: B's nested file synced to A"
+else
+  echo "❌ FAILURE: B's nested file did NOT sync to A"
+fi
+
+echo ""
+echo "Test directory: $TESTDIR"
+

package/test/integration/debug-concurrent-nested.sh

@@ -0,0 +1,87 @@
+#!/bin/bash
+set -e
+
+# Get absolute path to pushwork CLI
+PUSHWORK_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
+PUSHWORK_CLI="$PUSHWORK_ROOT/dist/cli.js"
+
+echo "=== Creating test repos ==="
+TESTDIR=$(mktemp -d)
+REPO_A="$TESTDIR/repo-a"
+REPO_B="$TESTDIR/repo-b"
+mkdir -p "$REPO_A" "$REPO_B"
+
+echo "=== Initializing repo A with a file ==="
+echo "initial" > "$REPO_A/initial.txt"
+cd "$REPO_A"
+node "$PUSHWORK_CLI" init .
+
+echo ""
+echo "=== Cloning to repo B ==="
+ROOT_URL=$(node "$PUSHWORK_CLI" url)
+echo "Root URL: $ROOT_URL"
+cd "$TESTDIR"
+node "$PUSHWORK_CLI" clone "$ROOT_URL" "$REPO_B"
+
+echo ""
+echo "=== On A: Create file in nested directory dirA/subA ==="
+mkdir -p "$REPO_A/dirA/subA"
+echo "from A" > "$REPO_A/dirA/subA/fileA.txt"
+
+echo ""
+echo "=== On B: Create file in different nested directory dirB/subB ==="
+mkdir -p "$REPO_B/dirB/subB"
+echo "from B" > "$REPO_B/dirB/subB/fileB.txt"
+
+echo ""
+echo "=== Sync round 1: A (push A's nested file) ==="
+cd "$REPO_A"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Sync round 1: B (push B's nested file, pull A's) ==="
+cd "$REPO_B"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Sync round 2: A (pull B's nested file) ==="
+cd "$REPO_A"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Sync round 2: B (confirm) ==="
+cd "$REPO_B"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Verification ==="
+echo "Files in A:"
+find "$REPO_A" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_A/||" | sort
+
+echo ""
+echo "Files in B:"
+find "$REPO_B" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_B/||" | sort
+
+echo ""
+echo "Checking convergence:"
+A_HAS_A=$([ -f "$REPO_A/dirA/subA/fileA.txt" ] && echo YES || echo NO)
+A_HAS_B=$([ -f "$REPO_A/dirB/subB/fileB.txt" ] && echo YES || echo NO)
+B_HAS_A=$([ -f "$REPO_B/dirA/subA/fileA.txt" ] && echo YES || echo NO)
+B_HAS_B=$([ -f "$REPO_B/dirB/subB/fileB.txt" ] && echo YES || echo NO)
+
+echo "  A has its own file (dirA/subA/fileA.txt): $A_HAS_A"
+echo "  A has B's file (dirB/subB/fileB.txt): $A_HAS_B"
+echo "  B has A's file (dirA/subA/fileA.txt): $B_HAS_A"
+echo "  B has its own file (dirB/subB/fileB.txt): $B_HAS_B"
+
+if [ "$A_HAS_A" = "YES" ] && [ "$A_HAS_B" = "YES" ] && [ "$B_HAS_A" = "YES" ] && [ "$B_HAS_B" = "YES" ]; then
+  echo ""
+  echo "✅ SUCCESS: Both nested files synced correctly!"
+else
+  echo ""
+  echo "❌ FAILURE: Not all files synced"
+fi
+
+echo ""
+echo "Test directory: $TESTDIR"
+

package/test/integration/debug-nested.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+set -e
+
+# Get absolute path to pushwork CLI
+PUSHWORK_ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
+PUSHWORK_CLI="$PUSHWORK_ROOT/dist/cli.js"
+
+echo "=== Creating test repos ==="
+TESTDIR=$(mktemp -d)
+REPO_A="$TESTDIR/repo-a"
+REPO_B="$TESTDIR/repo-b"
+mkdir -p "$REPO_A" "$REPO_B"
+
+echo "=== Initializing repo A with a file ==="
+echo "initial" > "$REPO_A/initial.txt"
+cd "$REPO_A"
+node "$PUSHWORK_CLI" init .
+
+echo ""
+echo "=== Cloning to repo B ==="
+ROOT_URL=$(node "$PUSHWORK_CLI" url)
+echo "Root URL: $ROOT_URL"
+cd "$TESTDIR"
+node "$PUSHWORK_CLI" clone "$ROOT_URL" "$REPO_B"
+
+echo ""
+echo "=== On B: Create file in 2-level nested subdirectory ==="
+mkdir -p "$REPO_B/rlpjug/ewsv"
+echo "" > "$REPO_B/rlpjug/ewsv/sneked.txt"
+
+echo ""
+echo "=== Sync round 1: A (no changes) ==="
+cd "$REPO_A"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Sync round 1: B (push new nested file) ==="
+cd "$REPO_B"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Sync round 2: A (pull B's changes) ==="
+cd "$REPO_A"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Sync round 2: B (confirm) ==="
+cd "$REPO_B"
+node "$PUSHWORK_CLI" sync
+
+echo ""
+echo "=== Verification ==="
+echo "Files in A:"
+find "$REPO_A" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_A/||" | sort
+
+echo ""
+echo "Files in B:"
+find "$REPO_B" -type f \( -name "*.txt" -o -name "*.md" \) | grep -v "\.pushwork" | sed "s|$REPO_B/||" | sort
+
+echo ""
+if [ -f "$REPO_A/rlpjug/ewsv/sneked.txt" ]; then
+  echo "✅ SUCCESS: Nested file synced to A"
+else
+  echo "❌ FAILURE: Nested file did NOT sync to A"
+  echo ""
+  echo "Let's check if directories exist:"
+  echo "A has rlpjug dir: $([ -d "$REPO_A/rlpjug" ] && echo YES || echo NO)"
+  echo "A has rlpjug/ewsv dir: $([ -d "$REPO_A/rlpjug/ewsv" ] && echo YES || echo NO)"
+fi
+
+echo ""
+echo "Test directory: $TESTDIR"
+