@memrosetta/sync-client 0.1.4 → 0.1.6

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) {
@@ -247,6 +262,7 @@ function applyInboxOps(db, ops) {
 }
 
 // src/sync-client.ts
+var MAX_OPS_PER_PUSH = 400;
 var SyncClient = class {
   db;
   config;
@@ -273,7 +289,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")
@@ -288,41 +304,52 @@ 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 };
     }
-    const baseCursor = this.getCursor();
-    const wireOps = pending.map((op) => ({
-      ...op,
-      payload: typeof op.payload === "string" ? JSON.parse(op.payload) : op.payload
-    }));
     const url = `${this.config.serverUrl}/sync/push`;
-    const response = await fetch(url, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${this.config.apiKey}`
-      },
-      body: JSON.stringify({
-        deviceId: this.config.deviceId,
-        baseCursor,
-        ops: wireOps
-      })
-    });
-    if (!response.ok) {
-      throw new Error(`Push failed: ${response.status} ${response.statusText}`);
+    const aggregatedResults = [];
+    let totalPushed = 0;
+    let highWatermark = 0;
+    for (let start = 0; start < pending.length; start += MAX_OPS_PER_PUSH) {
+      const chunk = pending.slice(start, start + MAX_OPS_PER_PUSH);
+      const baseCursor = this.getCursor();
+      const wireOps = chunk.map((op) => ({
+        ...op,
+        payload: typeof op.payload === "string" ? JSON.parse(op.payload) : op.payload
+      }));
+      const response = await fetch(url, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${this.config.apiKey}`
+        },
+        body: JSON.stringify({
+          deviceId: this.config.deviceId,
+          baseCursor,
+          ops: wireOps
+        })
+      });
+      if (!response.ok) {
+        throw new Error(
+          `Push failed: ${response.status} ${response.statusText}`
+        );
+      }
+      const body = await response.json();
+      const { results, highWatermark: batchHigh } = body.data;
+      const pushedIds = results.filter((r) => r.status === "accepted" || r.status === "duplicate").map((r) => r.opId);
+      this.outbox.markPushed(pushedIds);
+      this.setCursor(batchHigh);
+      aggregatedResults.push(...results);
+      totalPushed += pushedIds.length;
+      highWatermark = batchHigh;
     }
-    const body = await response.json();
-    const { results, highWatermark } = body.data;
-    const pushedIds = results.filter((r) => r.status === "accepted" || r.status === "duplicate").map((r) => r.opId);
-    this.outbox.markPushed(pushedIds);
-    this.setCursor(highWatermark);
     this.setState("last_push_success_at", (/* @__PURE__ */ new Date()).toISOString());
     return {
-      pushed: pushedIds.length,
-      results,
+      pushed: totalPushed,
+      results: aggregatedResults,
       highWatermark
     };
   }

package/package.json

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