@memrosetta/sync-client 0.1.5 → 0.1.7

package/dist/index.d.ts

@@ -6,8 +6,21 @@ declare class Outbox {
     private readonly db;
     constructor(db: Database.Database);
     addOp(op: SyncOp): void;
-    getPending(): readonly SyncOp[];
-    countPending(): number;
+    /**
+     * Return pending outbox ops in chronological order.
+     *
+     * When `userId` is supplied, only ops belonging to that user are
+     * returned. This is the v0.5.2 hardening that prevents a
+     * cross-user fragmentation: if an older client wrote ops under a
+     * legacy `user_id` and the current `SyncClient` is configured with
+     * a canonical user, the transport will no longer silently pick up
+     * the legacy ops and ship them to the hub. The legacy queue is
+     * cleared by `memrosetta migrate legacy-user-ids` before the first
+     * post-migration push so this filter is defense-in-depth, not the
+     * primary fix.
+     */
+    getPending(userId?: string): readonly SyncOp[];
+    countPending(userId?: string): number;
     markPushed(opIds: readonly string[]): void;
 }
 

package/dist/index.js

@@ -52,12 +52,27 @@ var Outbox = class {
          VALUES (?, ?, ?, ?, ?, ?, ?)`
     ).run(op.opId, op.opType, op.deviceId, op.userId, payloadStr, op.createdAt, null);
   }
-  getPending() {
-    const rows = this.db.prepare("SELECT * FROM sync_outbox WHERE pushed_at IS NULL ORDER BY created_at ASC").all();
+  /**
+   * Return pending outbox ops in chronological order.
+   *
+   * When `userId` is supplied, only ops belonging to that user are
+   * returned. This is the v0.5.2 hardening that prevents a
+   * cross-user fragmentation: if an older client wrote ops under a
+   * legacy `user_id` and the current `SyncClient` is configured with
+   * a canonical user, the transport will no longer silently pick up
+   * the legacy ops and ship them to the hub. The legacy queue is
+   * cleared by `memrosetta migrate legacy-user-ids` before the first
+   * post-migration push so this filter is defense-in-depth, not the
+   * primary fix.
+   */
+  getPending(userId) {
+    const rows = userId && userId.length > 0 ? this.db.prepare(
+      "SELECT * FROM sync_outbox WHERE pushed_at IS NULL AND user_id = ? ORDER BY created_at ASC"
+    ).all(userId) : this.db.prepare("SELECT * FROM sync_outbox WHERE pushed_at IS NULL ORDER BY created_at ASC").all();
     return rows.map(rowToSyncOp);
   }
-  countPending() {
-    const row = this.db.prepare("SELECT COUNT(*) as count FROM sync_outbox WHERE pushed_at IS NULL").get();
+  countPending(userId) {
+    const row = userId && userId.length > 0 ? this.db.prepare("SELECT COUNT(*) as count FROM sync_outbox WHERE pushed_at IS NULL AND user_id = ?").get(userId) : this.db.prepare("SELECT COUNT(*) as count FROM sync_outbox WHERE pushed_at IS NULL").get();
     return row.count;
   }
   markPushed(opIds) {
@@ -248,6 +263,7 @@ function applyInboxOps(db, ops) {
 
 // src/sync-client.ts
 var MAX_OPS_PER_PUSH = 400;
+var PULL_PAGE_SIZE = 1e3;
 var SyncClient = class {
   db;
   config;
@@ -274,7 +290,7 @@ var SyncClient = class {
       serverUrl: this.config.serverUrl,
       userId: this.config.userId,
       deviceId: this.config.deviceId,
-      pendingOps: this.outbox.countPending(),
+      pendingOps: this.outbox.countPending(this.config.userId),
       lastPush: {
         attemptAt: this.getState("last_push_attempt_at"),
         successAt: this.getState("last_push_success_at")
@@ -289,7 +305,7 @@ var SyncClient = class {
   async push() {
     const now = (/* @__PURE__ */ new Date()).toISOString();
     this.setState("last_push_attempt_at", now);
-    const pending = this.outbox.getPending();
+    const pending = this.outbox.getPending(this.config.userId);
     if (pending.length === 0) {
       this.setState("last_push_success_at", now);
       return { pushed: 0, results: [], highWatermark: 0 };
@@ -340,48 +356,55 @@ var SyncClient = class {
   }
   async pull() {
     this.setState("last_pull_attempt_at", (/* @__PURE__ */ new Date()).toISOString());
-    const since = this.getCursor();
-    const params = new URLSearchParams({
-      since: String(since),
-      userId: this.config.userId
-    });
-    const url = `${this.config.serverUrl}/sync/pull?${params.toString()}`;
-    const response = await fetch(url, {
-      method: "GET",
-      headers: {
-        Authorization: `Bearer ${this.config.apiKey}`
+    let totalPulled = 0;
+    let totalSkipped = 0;
+    let hasMore = true;
+    while (hasMore) {
+      const since = this.getCursor();
+      const params = new URLSearchParams({
+        since: String(since),
+        userId: this.config.userId,
+        limit: String(PULL_PAGE_SIZE)
+      });
+      const url = `${this.config.serverUrl}/sync/pull?${params.toString()}`;
+      const response = await fetch(url, {
+        method: "GET",
+        headers: {
+          Authorization: `Bearer ${this.config.apiKey}`
+        }
+      });
+      if (!response.ok) {
+        throw new Error(`Pull failed: ${response.status} ${response.statusText}`);
       }
-    });
-    if (!response.ok) {
-      throw new Error(`Pull failed: ${response.status} ${response.statusText}`);
-    }
-    const body = await response.json();
-    const { ops, nextCursor } = body.data;
-    if (ops.length > 0) {
-      this.inbox.addOps(ops);
-    }
-    const pending = this.inbox.getPending();
-    let skippedCount = 0;
-    if (pending.length > 0) {
-      const result = applyInboxOps(this.db, pending);
-      if (result.applied.length > 0) {
-        this.inbox.markApplied(result.applied);
+      const body = await response.json();
+      const { ops, nextCursor } = body.data;
+      hasMore = body.data.hasMore ?? false;
+      if (ops.length > 0) {
+        this.inbox.addOps(ops);
       }
-      skippedCount = result.skipped.length;
-      if (skippedCount > 0) {
-        for (const s of result.skipped) {
-          process.stderr.write(
-            `[sync] apply skipped op ${s.opId}: ${s.reason}
+      const pending = this.inbox.getPending();
+      if (pending.length > 0) {
+        const result = applyInboxOps(this.db, pending);
+        if (result.applied.length > 0) {
+          this.inbox.markApplied(result.applied);
+        }
+        totalSkipped += result.skipped.length;
+        if (result.skipped.length > 0) {
+          for (const s of result.skipped) {
+            process.stderr.write(
+              `[sync] apply skipped op ${s.opId}: ${s.reason}
 `
-          );
+            );
+          }
         }
       }
+      this.setCursor(nextCursor);
+      totalPulled += ops.length;
     }
-    this.setCursor(nextCursor);
-    if (skippedCount === 0) {
+    if (totalSkipped === 0) {
       this.setState("last_pull_success_at", (/* @__PURE__ */ new Date()).toISOString());
     }
-    return ops.length;
+    return totalPulled;
   }
   /** For tests / advanced callers: apply currently-pending inbox ops manually. */
   applyPendingInbox() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memrosetta/sync-client",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Local-first sync client for MemRosetta (outbox/inbox, push/pull)",
   "type": "module",
   "main": "./dist/index.js",