@syncular/server 0.0.2-2 → 0.0.3-12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/pull.d.ts.map +1 -1
  2. package/dist/pull.js +13 -2
  3. package/dist/pull.js.map +1 -1
  4. package/package.json +2 -2
  5. package/src/pull.ts +15 -4
package/dist/pull.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../src/pull.ts"],"names":[],"mappings":"AAGA,OAAO,EAML,KAAK,WAAW,EAMhB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EAItB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAc,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAK3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAiFpE,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;;OAGG;IACH,eAAe,EAAE,WAAW,CAAC;IAC7B,oFAAoF;IACpF,YAAY,EAAE,MAAM,CAAC;CACtB;AAqLD,wBAAsB,IAAI,CAAC,EAAE,SAAS,UAAU,EAAE,IAAI,EAAE;IACtD,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,eAAe,CAAC;IACzB;;;;OAIG;IACH,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC,GAAG,OAAO,CAAC,UAAU,CAAC,CAqlBtB"}
1
+ {"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../src/pull.ts"],"names":[],"mappings":"AAGA,OAAO,EAML,KAAK,WAAW,EAMhB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EAItB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAc,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAK3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAiFpE,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;;OAGG;IACH,eAAe,EAAE,WAAW,CAAC;IAC7B,oFAAoF;IACpF,YAAY,EAAE,MAAM,CAAC;CACtB;AAqLD,wBAAsB,IAAI,CAAC,EAAE,SAAS,UAAU,EAAE,IAAI,EAAE;IACtD,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,eAAe,CAAC;IACzB;;;;OAIG;IACH,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC,GAAG,OAAO,CAAC,UAAU,CAAC,CAgmBtB"}
package/dist/pull.js CHANGED
@@ -207,7 +207,7 @@ export async function pull(args) {
207
207
  // Validate and sanitize request limits
208
208
  const limitCommits = sanitizeLimit(request.limitCommits, 50, 1, 500);
209
209
  const limitSnapshotRows = sanitizeLimit(request.limitSnapshotRows, 1000, 1, 5000);
210
- const maxSnapshotPages = sanitizeLimit(request.maxSnapshotPages, 1, 1, 50);
210
+ const maxSnapshotPages = sanitizeLimit(request.maxSnapshotPages, 4, 1, 50);
211
211
  const dedupeRows = request.dedupeRows === true;
212
212
  // Resolve effective scopes for each subscription
213
213
  const resolved = await resolveEffectiveScopesForSubscriptions({
@@ -245,6 +245,15 @@ export async function pull(args) {
245
245
  afterCursor: minSubCursor,
246
246
  })
247
247
  : [];
248
+ const maxExternalCommitByTable = new Map();
249
+ for (const change of externalDataChanges) {
250
+ for (const table of change.tables) {
251
+ const previous = maxExternalCommitByTable.get(table) ?? -1;
252
+ if (change.commitSeq > previous) {
253
+ maxExternalCommitByTable.set(table, change.commitSeq);
254
+ }
255
+ }
256
+ }
248
257
  for (const sub of resolved) {
249
258
  const cursor = Math.max(-1, sub.cursor ?? -1);
250
259
  // Validate table handler exists (throws if not registered)
@@ -263,11 +272,13 @@ export async function pull(args) {
263
272
  }
264
273
  const effectiveScopes = sub.scopes;
265
274
  activeSubscriptions.push({ scopes: effectiveScopes });
275
+ const latestExternalCommitForTable = maxExternalCommitByTable.get(sub.table);
266
276
  const needsBootstrap = sub.bootstrapState != null ||
267
277
  cursor < 0 ||
268
278
  cursor > maxCommitSeq ||
269
279
  (minCommitSeq > 0 && cursor < minCommitSeq - 1) ||
270
- externalDataChanges.some((c) => c.commitSeq > cursor && c.tables.includes(sub.table));
280
+ (latestExternalCommitForTable !== undefined &&
281
+ latestExternalCommitForTable > cursor);
271
282
  if (needsBootstrap) {
272
283
  const tables = args.handlers
273
284
  .getBootstrapOrderFor(sub.table)
package/dist/pull.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pull.js","sourceRoot":"","sources":["../src/pull.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pull.js","sourceRoot":"","sources":["../src/pull.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@syncular/server",
3
- "version": "0.0.2-2",
3
+ "version": "0.0.3-12",
4
4
  "description": "Server-side sync engine with push/pull, pruning, and snapshot support",
5
5
  "license": "MIT",
6
6
  "author": "Benjamin Kniffler",
@@ -62,7 +62,7 @@
62
62
  "release": "bunx syncular-publish"
63
63
  },
64
64
  "dependencies": {
65
- "@syncular/core": "0.0.2-2"
65
+ "@syncular/core": "0.0.3-12"
66
66
  },
67
67
  "peerDependencies": {
68
68
  "kysely": "^0.28.0",
package/src/pull.ts CHANGED
@@ -342,7 +342,7 @@ export async function pull<DB extends SyncCoreDb>(args: {
342
342
  );
343
343
  const maxSnapshotPages = sanitizeLimit(
344
344
  request.maxSnapshotPages,
345
- 1,
345
+ 4,
346
346
  1,
347
347
  50
348
348
  );
@@ -392,6 +392,15 @@ export async function pull<DB extends SyncCoreDb>(args: {
392
392
  afterCursor: minSubCursor,
393
393
  })
394
394
  : [];
395
+ const maxExternalCommitByTable = new Map<string, number>();
396
+ for (const change of externalDataChanges) {
397
+ for (const table of change.tables) {
398
+ const previous = maxExternalCommitByTable.get(table) ?? -1;
399
+ if (change.commitSeq > previous) {
400
+ maxExternalCommitByTable.set(table, change.commitSeq);
401
+ }
402
+ }
403
+ }
395
404
 
396
405
  for (const sub of resolved) {
397
406
  const cursor = Math.max(-1, sub.cursor ?? -1);
@@ -415,15 +424,17 @@ export async function pull<DB extends SyncCoreDb>(args: {
415
424
 
416
425
  const effectiveScopes = sub.scopes;
417
426
  activeSubscriptions.push({ scopes: effectiveScopes });
427
+ const latestExternalCommitForTable = maxExternalCommitByTable.get(
428
+ sub.table
429
+ );
418
430
 
419
431
  const needsBootstrap =
420
432
  sub.bootstrapState != null ||
421
433
  cursor < 0 ||
422
434
  cursor > maxCommitSeq ||
423
435
  (minCommitSeq > 0 && cursor < minCommitSeq - 1) ||
424
- externalDataChanges.some(
425
- (c) => c.commitSeq > cursor && c.tables.includes(sub.table)
426
- );
436
+ (latestExternalCommitForTable !== undefined &&
437
+ latestExternalCommitForTable > cursor);
427
438
 
428
439
  if (needsBootstrap) {
429
440
  const tables = args.handlers