velocious 1.0.513 → 1.0.514
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.
- package/README.md +1 -0
- package/build/src/sync/sync-api-client-types.d.ts +22 -0
- package/build/src/sync/sync-api-client-types.d.ts.map +1 -1
- package/build/src/sync/sync-api-client-types.js +1 -1
- package/build/src/sync/sync-api-client.d.ts +6 -11
- package/build/src/sync/sync-api-client.d.ts.map +1 -1
- package/build/src/sync/sync-api-client.js +21 -7
- package/build/src/sync/sync-client.d.ts +10 -2
- package/build/src/sync/sync-client.d.ts.map +1 -1
- package/build/src/sync/sync-client.js +22 -5
- package/build/src/sync/sync-model-change-feed-service.d.ts +34 -2
- package/build/src/sync/sync-model-change-feed-service.d.ts.map +1 -1
- package/build/src/sync/sync-model-change-feed-service.js +35 -8
- package/build/sync/sync-api-client-types.js +9 -0
- package/build/sync/sync-api-client.js +22 -6
- package/build/sync/sync-client.js +21 -4
- package/build/sync/sync-model-change-feed-service.js +37 -7
- package/package.json +1 -1
- package/src/sync/sync-api-client-types.js +9 -0
- package/src/sync/sync-api-client.js +22 -6
- package/src/sync/sync-client.js +21 -4
- package/src/sync/sync-model-change-feed-service.js +37 -7
|
@@ -28,14 +28,18 @@ export default class SyncModelChangeFeedService {
|
|
|
28
28
|
this.serializeRecord = serializeRecord || ((record) => this.defaultSerializeRecord(record));
|
|
29
29
|
}
|
|
30
30
|
/**
|
|
31
|
-
* Builds a stable change-feed page.
|
|
32
|
-
*
|
|
31
|
+
* Builds a stable change-feed page. The additive `total` is the scope's pending
|
|
32
|
+
* change count from the request cursor to the snapshot bound (a COUNT, not a
|
|
33
|
+
* materialized read), so a client can render a "synced of total" progress bar;
|
|
34
|
+
* older clients ignore it.
|
|
35
|
+
* @returns {Promise<{status: string, nextCursor: {id: string, serverSequence: number, updatedAt: string} | null, syncs: Array<Record<string, unknown>>, total: number, upToCursor: {id: string, serverSequence: number, updatedAt: string} | null}>} Change-feed page result.
|
|
33
36
|
*/
|
|
34
37
|
async changes() {
|
|
35
38
|
const limit = this.normalizedLimit(this.params.limit);
|
|
36
39
|
const upToCursor = await this.resolveUpToCursor();
|
|
37
40
|
if (!upToCursor)
|
|
38
|
-
return { status: "success", nextCursor: null, syncs: [], upToCursor: null };
|
|
41
|
+
return { status: "success", nextCursor: null, syncs: [], total: 0, upToCursor: null };
|
|
42
|
+
const total = await this.totalPendingChanges({ upToCursor });
|
|
39
43
|
const query = this.pageQuery({ limit, upToCursor });
|
|
40
44
|
const records = await query.toArray();
|
|
41
45
|
const nextCursor = records.length > 0 ? this.cursorForRecord(records[records.length - 1]) : upToCursor;
|
|
@@ -43,6 +47,7 @@ export default class SyncModelChangeFeedService {
|
|
|
43
47
|
status: "success",
|
|
44
48
|
nextCursor,
|
|
45
49
|
syncs: records.map((record) => this.serializeRecord(record)),
|
|
50
|
+
total,
|
|
46
51
|
upToCursor
|
|
47
52
|
};
|
|
48
53
|
}
|
|
@@ -106,16 +111,38 @@ export default class SyncModelChangeFeedService {
|
|
|
106
111
|
* @returns {import("../database/query/model-class-query.js").default} Page query.
|
|
107
112
|
*/
|
|
108
113
|
pageQuery({ limit, upToCursor }) {
|
|
114
|
+
const query = this.cursorFilteredQuery({ upToCursor });
|
|
115
|
+
const driver = query.driver;
|
|
116
|
+
const serverSequenceColumn = `${driver.quoteTable(this.modelClass.tableName())}.${driver.quoteColumn("server_sequence")}`;
|
|
117
|
+
return query
|
|
118
|
+
.order(`${serverSequenceColumn} ASC`)
|
|
119
|
+
.limit(limit);
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* Counts the scope's pending change rows from the request cursor to the snapshot
|
|
123
|
+
* bound without materializing them, so the client can render a stable "of Y"
|
|
124
|
+
* progress denominator.
|
|
125
|
+
* @param {{upToCursor: {id: string, serverSequence: number, updatedAt: string}}} args - Count args.
|
|
126
|
+
* @returns {Promise<number>} Pending change count from the request cursor.
|
|
127
|
+
*/
|
|
128
|
+
async totalPendingChanges({ upToCursor }) {
|
|
129
|
+
return await this.cursorFilteredQuery({ upToCursor }).count();
|
|
130
|
+
}
|
|
131
|
+
/**
|
|
132
|
+
* Builds a scoped query with the snapshot upper bound and after-cursor filters
|
|
133
|
+
* applied, but without ordering or a page limit. Shared by the page read and the
|
|
134
|
+
* total-count so both count the same set of rows.
|
|
135
|
+
* @param {{upToCursor: {id: string, serverSequence: number, updatedAt: string}}} args - Filter args.
|
|
136
|
+
* @returns {import("../database/query/model-class-query.js").default} Cursor-filtered query.
|
|
137
|
+
*/
|
|
138
|
+
cursorFilteredQuery({ upToCursor }) {
|
|
109
139
|
const query = this.scopedQuery();
|
|
110
140
|
const driver = query.driver;
|
|
111
141
|
const table = driver.quoteTable(this.modelClass.tableName());
|
|
112
142
|
const serverSequenceColumn = `${table}.${driver.quoteColumn("server_sequence")}`;
|
|
113
143
|
const updatedAtColumn = `${table}.${driver.quoteColumn("updated_at")}`;
|
|
114
144
|
const idColumn = `${table}.${driver.quoteColumn("id")}`;
|
|
115
|
-
query
|
|
116
|
-
.where(`${serverSequenceColumn} <= ${driver.quote(upToCursor.serverSequence)}`)
|
|
117
|
-
.order(`${serverSequenceColumn} ASC`)
|
|
118
|
-
.limit(limit);
|
|
145
|
+
query.where(`${serverSequenceColumn} <= ${driver.quote(upToCursor.serverSequence)}`);
|
|
119
146
|
const afterServerSequence = this.optionalPositiveIntegerParam(this.params.afterServerSequence, "afterServerSequence");
|
|
120
147
|
if (afterServerSequence !== null) {
|
|
121
148
|
query.where(`${serverSequenceColumn} > ${driver.quote(afterServerSequence)}`);
|
|
@@ -220,4 +247,4 @@ export default class SyncModelChangeFeedService {
|
|
|
220
247
|
return date.toISOString();
|
|
221
248
|
}
|
|
222
249
|
}
|
|
223
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-model-change-feed-service.js","sourceRoot":"","sources":["../../../src/sync/sync-model-change-feed-service.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\nimport VelociousError from \"../velocious-error.js\"\n\nimport {declaredSyncScopeAttributes} from \"./sync-scope-attributes.js\"\n\n/**\n * Generic cursor-paginated change feed over an app-owned sync/change model.\n *\n * Apps provide the model and optional scoping/serialization hooks. Velocious owns\n * cursor parsing, snapshot high-water resolution, stable ordering, page limits,\n * and response shape for `/velocious/sync/changes` style endpoints.\n */\nexport default class SyncModelChangeFeedService {\n  /**\n   * Creates a generic sync-model change-feed service.\n   * @param {object} args - Service arguments.\n   * @param {typeof import(\"../database/record/index.js\").default} args.modelClass - Sync/change model class.\n   * @param {Record<string, unknown>} args.params - Request params.\n   * @param {number} [args.defaultLimit] - Default page size.\n   * @param {number} [args.maxLimit] - Maximum page size.\n   * @param {(record: ?) => Record<string, unknown>} [args.serializeRecord] - Record serializer.\n   * @param {function({query: import(\"../database/query/model-class-query.js\").default}): void} [args.scopeQuery] - Applies app-owned visibility scope.\n   */\n  constructor({defaultLimit = 1000, maxLimit = 1000, modelClass, params, scopeQuery, serializeRecord}) {\n    this.defaultLimit = defaultLimit\n    this.maxLimit = maxLimit\n    this.modelClass = modelClass\n    this.params = params\n    this.scopeQuery = scopeQuery || null\n    this.serializeRecord = serializeRecord || ((record) => this.defaultSerializeRecord(record))\n  }\n\n  /**\n   * Builds a stable change-feed page.\n   * @returns {Promise<{status: string, nextCursor: {id: string, serverSequence: number, updatedAt: string} | null, syncs: Array<Record<string, unknown>>, upToCursor: {id: string, serverSequence: number, updatedAt: string} | null}>} Change-feed page result.\n   */\n  async changes() {\n    const limit = this.normalizedLimit(this.params.limit)\n    const upToCursor = await this.resolveUpToCursor()\n\n    if (!upToCursor) return {status: \"success\", nextCursor: null, syncs: [], upToCursor: null}\n\n    const query = this.pageQuery({limit, upToCursor})\n    const records = await query.toArray()\n    const nextCursor = records.length > 0 ? this.cursorForRecord(records[records.length - 1]) : upToCursor\n\n    return {\n      status: \"success\",\n      nextCursor,\n      syncs: records.map((record) => this.serializeRecord(record)),\n      upToCursor\n    }\n  }\n\n  /**\n   * Normalizes the requested page limit.\n   * @param {unknown} value - Raw limit param.\n   * @returns {number} Normalized page limit.\n   */\n  normalizedLimit(value) {\n    if (value === undefined || value === null || value === \"\") return this.defaultLimit\n\n    const limit = Number(value)\n\n    if (!Number.isSafeInteger(limit) || limit <= 0) {\n      throw VelociousError.safe(\"Sync changes limit must be a positive integer.\", {code: \"sync-invalid-changes-limit\"})\n    }\n\n    return Math.min(limit, this.maxLimit)\n  }\n\n  /**\n   * Parses an optional positive integer cursor field.\n   * @param {unknown} value - Raw integer param.\n   * @param {string} name - Param name for error messages.\n   * @returns {number | null} Positive integer value, or null when omitted.\n   */\n  optionalPositiveIntegerParam(value, name) {\n    if (value === undefined || value === null || value === \"\") return null\n\n    const integer = Number(value)\n\n    if (!Number.isSafeInteger(integer) || integer <= 0) {\n      throw VelociousError.safe(`${name} must be a positive integer.`, {code: \"sync-invalid-changes-cursor\"})\n    }\n\n    return integer\n  }\n\n  /**\n   * Resolves the high-water cursor that bounds the current feed page.\n   * @returns {Promise<{id: string, serverSequence: number, updatedAt: string} | null>} Snapshot upper-bound cursor.\n   */\n  async resolveUpToCursor() {\n    const upToServerSequence = this.optionalPositiveIntegerParam(this.params.upToServerSequence, \"upToServerSequence\")\n\n    if (upToServerSequence !== null && typeof this.params.upToUpdatedAt === \"string\" && typeof this.params.upToId === \"string\") {\n      return {id: this.params.upToId, serverSequence: upToServerSequence, updatedAt: this.params.upToUpdatedAt}\n    }\n\n    if (typeof this.params.upToUpdatedAt === \"string\" && typeof this.params.upToId === \"string\") {\n      const upToRecord = await this.modelClass.findBy({id: this.params.upToId})\n\n      if (upToRecord) return this.cursorForRecord(upToRecord)\n    }\n\n    const query = this.scopedQuery()\n    const table = query.driver.quoteTable(this.modelClass.tableName())\n    const serverSequenceColumn = query.driver.quoteColumn(\"server_sequence\")\n    const latestRecords = await query\n      .order(`${table}.${serverSequenceColumn} DESC`)\n      .limit(1)\n      .toArray()\n\n    if (latestRecords.length === 0) return null\n\n    return this.cursorForRecord(latestRecords[0])\n  }\n\n  /**\n   * Builds the ordered and cursor-filtered page query.\n   * @param {{limit: number, upToCursor: {id: string, serverSequence: number, updatedAt: string}}} args - Page query args.\n   * @returns {import(\"../database/query/model-class-query.js\").default} Page query.\n   */\n  pageQuery({limit, upToCursor}) {\n    const query = this.scopedQuery()\n    const driver = query.driver\n    const table = driver.quoteTable(this.modelClass.tableName())\n    const serverSequenceColumn = `${table}.${driver.quoteColumn(\"server_sequence\")}`\n    const updatedAtColumn = `${table}.${driver.quoteColumn(\"updated_at\")}`\n    const idColumn = `${table}.${driver.quoteColumn(\"id\")}`\n\n    query\n      .where(`${serverSequenceColumn} <= ${driver.quote(upToCursor.serverSequence)}`)\n      .order(`${serverSequenceColumn} ASC`)\n      .limit(limit)\n\n    const afterServerSequence = this.optionalPositiveIntegerParam(this.params.afterServerSequence, \"afterServerSequence\")\n\n    if (afterServerSequence !== null) {\n      query.where(`${serverSequenceColumn} > ${driver.quote(afterServerSequence)}`)\n    } else if (typeof this.params.afterUpdatedAt === \"string\" && this.params.afterUpdatedAt !== \"\") {\n      const isPagingExistingSnapshot = typeof this.params.upToUpdatedAt === \"string\" && this.params.upToUpdatedAt !== \"\" && typeof this.params.upToId === \"string\" && this.params.upToId !== \"\"\n\n      if (isPagingExistingSnapshot && typeof this.params.afterId === \"string\" && this.params.afterId !== \"\") {\n        query.where(`(${updatedAtColumn} > ${driver.quote(this.params.afterUpdatedAt)} OR (${updatedAtColumn} = ${driver.quote(this.params.afterUpdatedAt)} AND ${idColumn} > ${driver.quote(this.params.afterId)}))`)\n      } else {\n        query.where(`${updatedAtColumn} >= ${driver.quote(this.params.afterUpdatedAt)}`)\n      }\n    }\n\n    return query\n  }\n\n  /**\n   * Builds a base query with app-owned scope applied.\n   * @returns {import(\"../database/query/model-class-query.js\").default} Scoped base query.\n   */\n  scopedQuery() {\n    const query = this.modelClass.where({})\n\n    if (this.scopeQuery) this.scopeQuery({query})\n\n    return query\n  }\n\n  /**\n   * Serializes a record into a transport cursor.\n   * @param {?} record - Sync/change record.\n   * @returns {{id: string, serverSequence: number, updatedAt: string}} Cursor for row.\n   */\n  cursorForRecord(record) {\n    return {id: String(this.recordValue(record, \"id\")), serverSequence: Number(this.recordValue(record, \"serverSequence\")), updatedAt: this.isoDate(this.recordValue(record, \"updatedAt\"))}\n  }\n\n  /**\n   * Serializes a record using the standard sync envelope shape plus the sync\n   * model's declared scope-partition attributes (`static syncScopeAttributes`),\n   * each emitted under its own attribute name. Models declaring no scope\n   * attributes keep the deprecated 1.0.503 wire and emit `eventId`. Keys are\n   * sorted so a declared `[\"eventId\"]` partition stays byte-identical with the\n   * 1.0.503 wire.\n   * @param {?} record - Sync/change record.\n   * @returns {Record<string, unknown>} Default serialized row.\n   */\n  defaultSerializeRecord(record) {\n    const scopeAttributes = declaredSyncScopeAttributes(this.modelClass)\n    /** @type {Record<string, unknown>} */\n    const serialized = {\n      data: this.recordData(record),\n      id: this.recordValue(record, \"id\"),\n      resourceId: this.recordValue(record, \"resourceId\"),\n      resourceType: this.recordValue(record, \"resourceType\"),\n      serverSequence: this.recordValue(record, \"serverSequence\"),\n      syncType: this.recordValue(record, \"syncType\"),\n      updatedAt: this.isoDate(this.recordValue(record, \"updatedAt\"))\n    }\n\n    for (const scopeAttribute of scopeAttributes || [\"eventId\"]) {\n      serialized[scopeAttribute] = this.recordValue(record, scopeAttribute)\n    }\n\n    return Object.fromEntries(Object.entries(serialized).sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey)))\n  }\n\n  /**\n   * Reads and parses the record data payload.\n   * @param {?} record - Sync/change record.\n   * @returns {unknown} Parsed data value.\n   */\n  recordData(record) {\n    const data = this.recordValue(record, \"data\")\n\n    if (data === \"\" || data === null || data === undefined) return null\n    if (typeof data !== \"string\") return data\n\n    return JSON.parse(data)\n  }\n\n  /**\n   * Reads a value from either a record accessor method or plain property.\n   * @param {?} record - Sync/change record.\n   * @param {string} name - Camel-cased value/method name.\n   * @returns {unknown} Record value.\n   */\n  recordValue(record, name) {\n    if (!record || typeof record !== \"object\") {\n      throw new Error(\"Sync changes row must be an object.\")\n    }\n\n    const recordObject = /** @type {Record<string, ?>} */ (record)\n    const method = recordObject[name]\n    const value = typeof method === \"function\" ? method.call(record) : method\n\n    if (value === undefined) {\n      throw new Error(`Sync changes row is missing ${name}.`)\n    }\n\n    return value\n  }\n\n  /**\n   * Converts a date-like value to an ISO string.\n   * @param {Date | string | null | undefined | unknown} value - Date value.\n   * @returns {string} ISO date.\n   */\n  isoDate(value) {\n    const date = value instanceof Date ? value : new Date(typeof value === \"string\" || typeof value === \"number\" ? value : 0)\n\n    if (Number.isNaN(date.getTime())) {\n      throw VelociousError.safe(\"Sync changes row has an invalid updated_at value.\", {code: \"sync-invalid-changes-row\"})\n    }\n\n    return date.toISOString()\n  }\n}\n\n"]}
|
|
250
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-model-change-feed-service.js","sourceRoot":"","sources":["../../../src/sync/sync-model-change-feed-service.js"],"names":[],"mappings":"AAAA,YAAY;AAEZ,OAAO,cAAc,MAAM,uBAAuB,CAAA;AAElD,OAAO,EAAC,2BAA2B,EAAC,MAAM,4BAA4B,CAAA;AAEtE;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,OAAO,0BAA0B;IAC7C;;;;;;;;;OASG;IACH,YAAY,EAAC,YAAY,GAAG,IAAI,EAAE,QAAQ,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAC;QACjG,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,IAAI,CAAA;QACpC,IAAI,CAAC,eAAe,GAAG,eAAe,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7F,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,OAAO;QACX,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACrD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAEjD,IAAI,CAAC,UAAU;YAAE,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAC,CAAA;QAEpG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAC,UAAU,EAAC,CAAC,CAAA;QAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,KAAK,EAAE,UAAU,EAAC,CAAC,CAAA;QACjD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE,CAAA;QACrC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAA;QAEtG,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,UAAU;YACV,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAC5D,KAAK;YACL,UAAU;SACX,CAAA;IACH,CAAC;IAED;;;;OAIG;IACH,eAAe,CAAC,KAAK;QACnB,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE;YAAE,OAAO,IAAI,CAAC,YAAY,CAAA;QAEnF,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAE3B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YAC/C,MAAM,cAAc,CAAC,IAAI,CAAC,gDAAgD,EAAE,EAAC,IAAI,EAAE,4BAA4B,EAAC,CAAC,CAAA;QACnH,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;IACvC,CAAC;IAED;;;;;OAKG;IACH,4BAA4B,CAAC,KAAK,EAAE,IAAI;QACtC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE;YAAE,OAAO,IAAI,CAAA;QAEtE,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAE7B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;YACnD,MAAM,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,8BAA8B,EAAE,EAAC,IAAI,EAAE,6BAA6B,EAAC,CAAC,CAAA;QACzG,CAAC;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,iBAAiB;QACrB,MAAM,kBAAkB,GAAG,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,oBAAoB,CAAC,CAAA;QAElH,IAAI,kBAAkB,KAAK,IAAI,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC3H,OAAO,EAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,kBAAkB,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAC,CAAA;QAC3G,CAAC;QAED,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,KAAK,QAAQ,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC5F,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAC,CAAC,CAAA;YAEzE,IAAI,UAAU;gBAAE,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA;QACzD,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;QAChC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAA;QAClE,MAAM,oBAAoB,GAAG,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAA;QACxE,MAAM,aAAa,GAAG,MAAM,KAAK;aAC9B,KAAK,CAAC,GAAG,KAAK,IAAI,oBAAoB,OAAO,CAAC;aAC9C,KAAK,CAAC,CAAC,CAAC;aACR,OAAO,EAAE,CAAA;QAEZ,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;QAE3C,OAAO,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,EAAC,KAAK,EAAE,UAAU,EAAC;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,EAAC,UAAU,EAAC,CAAC,CAAA;QACpD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;QAC3B,MAAM,oBAAoB,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,CAAA;QAEzH,OAAO,KAAK;aACT,KAAK,CAAC,GAAG,oBAAoB,MAAM,CAAC;aACpC,KAAK,CAAC,KAAK,CAAC,CAAA;IACjB,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,mBAAmB,CAAC,EAAC,UAAU,EAAC;QACpC,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAC,UAAU,EAAC,CAAC,CAAC,KAAK,EAAE,CAAA;IAC7D,CAAC;IAED;;;;;;OAMG;IACH,mBAAmB,CAAC,EAAC,UAAU,EAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;QAChC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;QAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAA;QAC5D,MAAM,oBAAoB,GAAG,GAAG,KAAK,IAAI,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,CAAA;QAChF,MAAM,eAAe,GAAG,GAAG,KAAK,IAAI,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAA;QACtE,MAAM,QAAQ,GAAG,GAAG,KAAK,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAA;QAEvD,KAAK,CAAC,KAAK,CAAC,GAAG,oBAAoB,OAAO,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;QAEpF,MAAM,mBAAmB,GAAG,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,CAAA;QAErH,IAAI,mBAAmB,KAAK,IAAI,EAAE,CAAC;YACjC,KAAK,CAAC,KAAK,CAAC,GAAG,oBAAoB,MAAM,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAA;QAC/E,CAAC;aAAM,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,KAAK,EAAE,EAAE,CAAC;YAC/F,MAAM,wBAAwB,GAAG,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,KAAK,EAAE,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,EAAE,CAAA;YAEzL,IAAI,wBAAwB,IAAI,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,EAAE,EAAE,CAAC;gBACtG,KAAK,CAAC,KAAK,CAAC,IAAI,eAAe,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,eAAe,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,QAAQ,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YAChN,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,KAAK,CAAC,GAAG,eAAe,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;YAClF,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAED;;;OAGG;IACH,WAAW;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAEvC,IAAI,IAAI,CAAC,UAAU;YAAE,IAAI,CAAC,UAAU,CAAC,EAAC,KAAK,EAAC,CAAC,CAAA;QAE7C,OAAO,KAAK,CAAA;IACd,CAAC;IAED;;;;OAIG;IACH,eAAe,CAAC,MAAM;QACpB,OAAO,EAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,EAAC,CAAA;IACzL,CAAC;IAED;;;;;;;;;OASG;IACH,sBAAsB,CAAC,MAAM;QAC3B,MAAM,eAAe,GAAG,2BAA2B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACpE,sCAAsC;QACtC,MAAM,UAAU,GAAG;YACjB,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAC7B,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC;YAClC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC;YAClD,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC;YACtD,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC;YAC1D,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC;YAC9C,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;SAC/D,CAAA;QAED,KAAK,MAAM,cAAc,IAAI,eAAe,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5D,UAAU,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;QACvE,CAAC;QAED,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;IACxH,CAAC;IAED;;;;OAIG;IACH,UAAU,CAAC,MAAM;QACf,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAE7C,IAAI,IAAI,KAAK,EAAE,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,IAAI,CAAA;QACnE,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAA;QAEzC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACzB,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,MAAM,EAAE,IAAI;QACtB,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;QACxD,CAAC;QAED,MAAM,YAAY,GAAG,gCAAgC,CAAC,CAAC,MAAM,CAAC,CAAA;QAC9D,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;QACjC,MAAM,KAAK,GAAG,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;QAEzE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,GAAG,CAAC,CAAA;QACzD,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,KAAK;QACX,MAAM,IAAI,GAAG,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAEzH,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YACjC,MAAM,cAAc,CAAC,IAAI,CAAC,mDAAmD,EAAE,EAAC,IAAI,EAAE,0BAA0B,EAAC,CAAC,CAAA;QACpH,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,EAAE,CAAA;IAC3B,CAAC;CACF","sourcesContent":["// @ts-check\n\nimport VelociousError from \"../velocious-error.js\"\n\nimport {declaredSyncScopeAttributes} from \"./sync-scope-attributes.js\"\n\n/**\n * Generic cursor-paginated change feed over an app-owned sync/change model.\n *\n * Apps provide the model and optional scoping/serialization hooks. Velocious owns\n * cursor parsing, snapshot high-water resolution, stable ordering, page limits,\n * and response shape for `/velocious/sync/changes` style endpoints.\n */\nexport default class SyncModelChangeFeedService {\n  /**\n   * Creates a generic sync-model change-feed service.\n   * @param {object} args - Service arguments.\n   * @param {typeof import(\"../database/record/index.js\").default} args.modelClass - Sync/change model class.\n   * @param {Record<string, unknown>} args.params - Request params.\n   * @param {number} [args.defaultLimit] - Default page size.\n   * @param {number} [args.maxLimit] - Maximum page size.\n   * @param {(record: ?) => Record<string, unknown>} [args.serializeRecord] - Record serializer.\n   * @param {function({query: import(\"../database/query/model-class-query.js\").default}): void} [args.scopeQuery] - Applies app-owned visibility scope.\n   */\n  constructor({defaultLimit = 1000, maxLimit = 1000, modelClass, params, scopeQuery, serializeRecord}) {\n    this.defaultLimit = defaultLimit\n    this.maxLimit = maxLimit\n    this.modelClass = modelClass\n    this.params = params\n    this.scopeQuery = scopeQuery || null\n    this.serializeRecord = serializeRecord || ((record) => this.defaultSerializeRecord(record))\n  }\n\n  /**\n   * Builds a stable change-feed page. The additive `total` is the scope's pending\n   * change count from the request cursor to the snapshot bound (a COUNT, not a\n   * materialized read), so a client can render a \"synced of total\" progress bar;\n   * older clients ignore it.\n   * @returns {Promise<{status: string, nextCursor: {id: string, serverSequence: number, updatedAt: string} | null, syncs: Array<Record<string, unknown>>, total: number, upToCursor: {id: string, serverSequence: number, updatedAt: string} | null}>} Change-feed page result.\n   */\n  async changes() {\n    const limit = this.normalizedLimit(this.params.limit)\n    const upToCursor = await this.resolveUpToCursor()\n\n    if (!upToCursor) return {status: \"success\", nextCursor: null, syncs: [], total: 0, upToCursor: null}\n\n    const total = await this.totalPendingChanges({upToCursor})\n    const query = this.pageQuery({limit, upToCursor})\n    const records = await query.toArray()\n    const nextCursor = records.length > 0 ? this.cursorForRecord(records[records.length - 1]) : upToCursor\n\n    return {\n      status: \"success\",\n      nextCursor,\n      syncs: records.map((record) => this.serializeRecord(record)),\n      total,\n      upToCursor\n    }\n  }\n\n  /**\n   * Normalizes the requested page limit.\n   * @param {unknown} value - Raw limit param.\n   * @returns {number} Normalized page limit.\n   */\n  normalizedLimit(value) {\n    if (value === undefined || value === null || value === \"\") return this.defaultLimit\n\n    const limit = Number(value)\n\n    if (!Number.isSafeInteger(limit) || limit <= 0) {\n      throw VelociousError.safe(\"Sync changes limit must be a positive integer.\", {code: \"sync-invalid-changes-limit\"})\n    }\n\n    return Math.min(limit, this.maxLimit)\n  }\n\n  /**\n   * Parses an optional positive integer cursor field.\n   * @param {unknown} value - Raw integer param.\n   * @param {string} name - Param name for error messages.\n   * @returns {number | null} Positive integer value, or null when omitted.\n   */\n  optionalPositiveIntegerParam(value, name) {\n    if (value === undefined || value === null || value === \"\") return null\n\n    const integer = Number(value)\n\n    if (!Number.isSafeInteger(integer) || integer <= 0) {\n      throw VelociousError.safe(`${name} must be a positive integer.`, {code: \"sync-invalid-changes-cursor\"})\n    }\n\n    return integer\n  }\n\n  /**\n   * Resolves the high-water cursor that bounds the current feed page.\n   * @returns {Promise<{id: string, serverSequence: number, updatedAt: string} | null>} Snapshot upper-bound cursor.\n   */\n  async resolveUpToCursor() {\n    const upToServerSequence = this.optionalPositiveIntegerParam(this.params.upToServerSequence, \"upToServerSequence\")\n\n    if (upToServerSequence !== null && typeof this.params.upToUpdatedAt === \"string\" && typeof this.params.upToId === \"string\") {\n      return {id: this.params.upToId, serverSequence: upToServerSequence, updatedAt: this.params.upToUpdatedAt}\n    }\n\n    if (typeof this.params.upToUpdatedAt === \"string\" && typeof this.params.upToId === \"string\") {\n      const upToRecord = await this.modelClass.findBy({id: this.params.upToId})\n\n      if (upToRecord) return this.cursorForRecord(upToRecord)\n    }\n\n    const query = this.scopedQuery()\n    const table = query.driver.quoteTable(this.modelClass.tableName())\n    const serverSequenceColumn = query.driver.quoteColumn(\"server_sequence\")\n    const latestRecords = await query\n      .order(`${table}.${serverSequenceColumn} DESC`)\n      .limit(1)\n      .toArray()\n\n    if (latestRecords.length === 0) return null\n\n    return this.cursorForRecord(latestRecords[0])\n  }\n\n  /**\n   * Builds the ordered and cursor-filtered page query.\n   * @param {{limit: number, upToCursor: {id: string, serverSequence: number, updatedAt: string}}} args - Page query args.\n   * @returns {import(\"../database/query/model-class-query.js\").default} Page query.\n   */\n  pageQuery({limit, upToCursor}) {\n    const query = this.cursorFilteredQuery({upToCursor})\n    const driver = query.driver\n    const serverSequenceColumn = `${driver.quoteTable(this.modelClass.tableName())}.${driver.quoteColumn(\"server_sequence\")}`\n\n    return query\n      .order(`${serverSequenceColumn} ASC`)\n      .limit(limit)\n  }\n\n  /**\n   * Counts the scope's pending change rows from the request cursor to the snapshot\n   * bound without materializing them, so the client can render a stable \"of Y\"\n   * progress denominator.\n   * @param {{upToCursor: {id: string, serverSequence: number, updatedAt: string}}} args - Count args.\n   * @returns {Promise<number>} Pending change count from the request cursor.\n   */\n  async totalPendingChanges({upToCursor}) {\n    return await this.cursorFilteredQuery({upToCursor}).count()\n  }\n\n  /**\n   * Builds a scoped query with the snapshot upper bound and after-cursor filters\n   * applied, but without ordering or a page limit. Shared by the page read and the\n   * total-count so both count the same set of rows.\n   * @param {{upToCursor: {id: string, serverSequence: number, updatedAt: string}}} args - Filter args.\n   * @returns {import(\"../database/query/model-class-query.js\").default} Cursor-filtered query.\n   */\n  cursorFilteredQuery({upToCursor}) {\n    const query = this.scopedQuery()\n    const driver = query.driver\n    const table = driver.quoteTable(this.modelClass.tableName())\n    const serverSequenceColumn = `${table}.${driver.quoteColumn(\"server_sequence\")}`\n    const updatedAtColumn = `${table}.${driver.quoteColumn(\"updated_at\")}`\n    const idColumn = `${table}.${driver.quoteColumn(\"id\")}`\n\n    query.where(`${serverSequenceColumn} <= ${driver.quote(upToCursor.serverSequence)}`)\n\n    const afterServerSequence = this.optionalPositiveIntegerParam(this.params.afterServerSequence, \"afterServerSequence\")\n\n    if (afterServerSequence !== null) {\n      query.where(`${serverSequenceColumn} > ${driver.quote(afterServerSequence)}`)\n    } else if (typeof this.params.afterUpdatedAt === \"string\" && this.params.afterUpdatedAt !== \"\") {\n      const isPagingExistingSnapshot = typeof this.params.upToUpdatedAt === \"string\" && this.params.upToUpdatedAt !== \"\" && typeof this.params.upToId === \"string\" && this.params.upToId !== \"\"\n\n      if (isPagingExistingSnapshot && typeof this.params.afterId === \"string\" && this.params.afterId !== \"\") {\n        query.where(`(${updatedAtColumn} > ${driver.quote(this.params.afterUpdatedAt)} OR (${updatedAtColumn} = ${driver.quote(this.params.afterUpdatedAt)} AND ${idColumn} > ${driver.quote(this.params.afterId)}))`)\n      } else {\n        query.where(`${updatedAtColumn} >= ${driver.quote(this.params.afterUpdatedAt)}`)\n      }\n    }\n\n    return query\n  }\n\n  /**\n   * Builds a base query with app-owned scope applied.\n   * @returns {import(\"../database/query/model-class-query.js\").default} Scoped base query.\n   */\n  scopedQuery() {\n    const query = this.modelClass.where({})\n\n    if (this.scopeQuery) this.scopeQuery({query})\n\n    return query\n  }\n\n  /**\n   * Serializes a record into a transport cursor.\n   * @param {?} record - Sync/change record.\n   * @returns {{id: string, serverSequence: number, updatedAt: string}} Cursor for row.\n   */\n  cursorForRecord(record) {\n    return {id: String(this.recordValue(record, \"id\")), serverSequence: Number(this.recordValue(record, \"serverSequence\")), updatedAt: this.isoDate(this.recordValue(record, \"updatedAt\"))}\n  }\n\n  /**\n   * Serializes a record using the standard sync envelope shape plus the sync\n   * model's declared scope-partition attributes (`static syncScopeAttributes`),\n   * each emitted under its own attribute name. Models declaring no scope\n   * attributes keep the deprecated 1.0.503 wire and emit `eventId`. Keys are\n   * sorted so a declared `[\"eventId\"]` partition stays byte-identical with the\n   * 1.0.503 wire.\n   * @param {?} record - Sync/change record.\n   * @returns {Record<string, unknown>} Default serialized row.\n   */\n  defaultSerializeRecord(record) {\n    const scopeAttributes = declaredSyncScopeAttributes(this.modelClass)\n    /** @type {Record<string, unknown>} */\n    const serialized = {\n      data: this.recordData(record),\n      id: this.recordValue(record, \"id\"),\n      resourceId: this.recordValue(record, \"resourceId\"),\n      resourceType: this.recordValue(record, \"resourceType\"),\n      serverSequence: this.recordValue(record, \"serverSequence\"),\n      syncType: this.recordValue(record, \"syncType\"),\n      updatedAt: this.isoDate(this.recordValue(record, \"updatedAt\"))\n    }\n\n    for (const scopeAttribute of scopeAttributes || [\"eventId\"]) {\n      serialized[scopeAttribute] = this.recordValue(record, scopeAttribute)\n    }\n\n    return Object.fromEntries(Object.entries(serialized).sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey)))\n  }\n\n  /**\n   * Reads and parses the record data payload.\n   * @param {?} record - Sync/change record.\n   * @returns {unknown} Parsed data value.\n   */\n  recordData(record) {\n    const data = this.recordValue(record, \"data\")\n\n    if (data === \"\" || data === null || data === undefined) return null\n    if (typeof data !== \"string\") return data\n\n    return JSON.parse(data)\n  }\n\n  /**\n   * Reads a value from either a record accessor method or plain property.\n   * @param {?} record - Sync/change record.\n   * @param {string} name - Camel-cased value/method name.\n   * @returns {unknown} Record value.\n   */\n  recordValue(record, name) {\n    if (!record || typeof record !== \"object\") {\n      throw new Error(\"Sync changes row must be an object.\")\n    }\n\n    const recordObject = /** @type {Record<string, ?>} */ (record)\n    const method = recordObject[name]\n    const value = typeof method === \"function\" ? method.call(record) : method\n\n    if (value === undefined) {\n      throw new Error(`Sync changes row is missing ${name}.`)\n    }\n\n    return value\n  }\n\n  /**\n   * Converts a date-like value to an ISO string.\n   * @param {Date | string | null | undefined | unknown} value - Date value.\n   * @returns {string} ISO date.\n   */\n  isoDate(value) {\n    const date = value instanceof Date ? value : new Date(typeof value === \"string\" || typeof value === \"number\" ? value : 0)\n\n    if (Number.isNaN(date.getTime())) {\n      throw VelociousError.safe(\"Sync changes row has an invalid updated_at value.\", {code: \"sync-invalid-changes-row\"})\n    }\n\n    return date.toISOString()\n  }\n}\n\n"]}
|
|
@@ -49,9 +49,17 @@
|
|
|
49
49
|
* @property {SyncCursor | Record<string, ?>} [nextCursor] - Next cursor.
|
|
50
50
|
* @property {string} [status] - Response status.
|
|
51
51
|
* @property {Array<unknown>} [syncs] - Sync rows.
|
|
52
|
+
* @property {number} [total] - Total pending change count for the scope from the request cursor (additive; absent on older servers).
|
|
52
53
|
* @property {SyncCursor | Record<string, ?>} [upToCursor] - Snapshot upper-bound cursor.
|
|
53
54
|
*/
|
|
54
55
|
|
|
56
|
+
/**
|
|
57
|
+
* @typedef {object} SyncPullProgress
|
|
58
|
+
* @property {number} pages - Applied page count so far.
|
|
59
|
+
* @property {number} syncedCount - Applied row count so far.
|
|
60
|
+
* @property {number} total - Total pending change count for the pull, stable across pages (0 when nothing to sync, null-free once the server reports it).
|
|
61
|
+
*/
|
|
62
|
+
|
|
55
63
|
/**
|
|
56
64
|
* @typedef {object} SyncChangesResult
|
|
57
65
|
* @property {boolean} changed - Whether any local record changed.
|
|
@@ -59,6 +67,7 @@
|
|
|
59
67
|
* @property {Record<string, boolean>} resourceChanged - Changed flags by resource type.
|
|
60
68
|
* @property {Record<string, number>} resourceCounts - Applied counts by resource type.
|
|
61
69
|
* @property {number} syncedCount - Applied row count.
|
|
70
|
+
* @property {number} total - Total pending change count across the pulled scopes (the "of Y" denominator for a syncedCount-of-total progress bar).
|
|
62
71
|
*/
|
|
63
72
|
|
|
64
73
|
/**
|
|
@@ -57,7 +57,7 @@ export default class SyncApiClient {
|
|
|
57
57
|
* @param {string} args.cursorKey - Cursor option key.
|
|
58
58
|
* @param {(payload: SyncChangesRequest) => Promise<SyncChangesResponse>} args.postChanges - Posts one changes request.
|
|
59
59
|
* @param {Record<string, SyncResourceConfig>} args.resources - Resource policies.
|
|
60
|
-
* @param {(progress:
|
|
60
|
+
* @param {(progress: import("./sync-api-client-types.js").SyncPullProgress) => void} [args.onProgress] - Progress callback.
|
|
61
61
|
* @returns {Promise<SyncChangesResult>} Pull result.
|
|
62
62
|
*/
|
|
63
63
|
static async pullChangesWithCursor(args) {
|
|
@@ -108,7 +108,7 @@ export default class SyncApiClient {
|
|
|
108
108
|
* @param {(cursor: SyncCursor) => Promise<void>} args.saveCursor - Persists the final acknowledged cursor.
|
|
109
109
|
* @param {(payload: SyncChangesRequest) => Promise<SyncChangesResponse>} args.postChanges - Posts one changes request.
|
|
110
110
|
* @param {(sync: SyncChangeEnvelope) => Promise<SyncChangeApplyResult>} args.applySync - Applies one normalized sync row locally.
|
|
111
|
-
* @param {(progress:
|
|
111
|
+
* @param {(progress: import("./sync-api-client-types.js").SyncPullProgress) => void} [args.onProgress] - Progress callback invoked per applied page (and once for an empty pull) with the applied counts and the stable server total.
|
|
112
112
|
* @returns {Promise<SyncChangesResult>} Pull result.
|
|
113
113
|
*/
|
|
114
114
|
static async pullChanges(args) {
|
|
@@ -116,6 +116,7 @@ export default class SyncApiClient {
|
|
|
116
116
|
let upToCursor = null
|
|
117
117
|
let pages = 0
|
|
118
118
|
let syncedCount = 0
|
|
119
|
+
let total = 0
|
|
119
120
|
let changed = false
|
|
120
121
|
const resourceCounts = /** @type {Record<string, number>} */ ({})
|
|
121
122
|
const resourceChanged = /** @type {Record<string, boolean>} */ ({})
|
|
@@ -126,7 +127,21 @@ export default class SyncApiClient {
|
|
|
126
127
|
const syncs = changesResponse.syncs
|
|
127
128
|
|
|
128
129
|
if (!upToCursor) upToCursor = changesResponse.upToCursor
|
|
129
|
-
|
|
130
|
+
|
|
131
|
+
// The server counts pending rows from this request's cursor, so already-applied
|
|
132
|
+
// pages plus this request's count stays the same total across every page: a stable
|
|
133
|
+
// "of Y" denominator even as the cursor advances. A server that doesn't report the
|
|
134
|
+
// count at all leaves the total at 0 for every page rather than drifting upwards
|
|
135
|
+
// with the applied rows.
|
|
136
|
+
if (changesResponse.total !== null) total = syncedCount + changesResponse.total
|
|
137
|
+
|
|
138
|
+
if (syncs.length === 0) {
|
|
139
|
+
// Report the terminal progress once for an entirely empty pull so consumers observe
|
|
140
|
+
// total 0; a pull that already applied pages reported its final counts on its last page.
|
|
141
|
+
if (pages === 0 && args.onProgress) args.onProgress({pages, syncedCount, total})
|
|
142
|
+
|
|
143
|
+
break
|
|
144
|
+
}
|
|
130
145
|
|
|
131
146
|
pages += 1
|
|
132
147
|
|
|
@@ -151,13 +166,13 @@ export default class SyncApiClient {
|
|
|
151
166
|
|
|
152
167
|
afterCursor = changesResponse.nextCursor
|
|
153
168
|
|
|
154
|
-
if (args.onProgress) args.onProgress({pages, syncedCount})
|
|
169
|
+
if (args.onProgress) args.onProgress({pages, syncedCount, total})
|
|
155
170
|
if (syncs.length < batchSize) break
|
|
156
171
|
}
|
|
157
172
|
|
|
158
173
|
if (afterCursor) await args.saveCursor(afterCursor)
|
|
159
174
|
|
|
160
|
-
return {changed, pages, resourceChanged, resourceCounts, syncedCount}
|
|
175
|
+
return {changed, pages, resourceChanged, resourceCounts, syncedCount, total}
|
|
161
176
|
}
|
|
162
177
|
|
|
163
178
|
/**
|
|
@@ -168,7 +183,7 @@ export default class SyncApiClient {
|
|
|
168
183
|
* @param {number} args.batchSize - Page size.
|
|
169
184
|
* @param {(payload: SyncChangesRequest) => Promise<SyncChangesResponse>} args.postChanges - Changes poster.
|
|
170
185
|
* @param {SyncCursor} args.upToCursor - Snapshot upper-bound cursor.
|
|
171
|
-
* @returns {Promise<{nextCursor: SyncCursor, syncs: SyncChangeEnvelope[], upToCursor: SyncCursor}>} Normalized changes page.
|
|
186
|
+
* @returns {Promise<{nextCursor: SyncCursor, syncs: SyncChangeEnvelope[], total: number | null, upToCursor: SyncCursor}>} Normalized changes page.
|
|
172
187
|
*/
|
|
173
188
|
static async changesPage({afterCursor, authenticationToken, batchSize, postChanges, upToCursor}) {
|
|
174
189
|
const response = await postChanges({
|
|
@@ -185,6 +200,7 @@ export default class SyncApiClient {
|
|
|
185
200
|
return {
|
|
186
201
|
nextCursor: this.syncCursorFromPayload(response.nextCursor ?? null),
|
|
187
202
|
syncs: syncs.map((syncPayload) => this.syncEnvelopeFromPayload(syncPayload)),
|
|
203
|
+
total: optionalInteger(response.total),
|
|
188
204
|
upToCursor: this.syncCursorFromPayload(response.upToCursor ?? null)
|
|
189
205
|
}
|
|
190
206
|
}
|
|
@@ -356,9 +356,11 @@ export default class SyncClient {
|
|
|
356
356
|
/**
|
|
357
357
|
* Declares (or re-activates) a sync scope from a model query and pulls it when online.
|
|
358
358
|
* @param {import("../database/query/model-class-query.js").default<?>} query - Query declaring the sync scope.
|
|
359
|
+
* @param {object} [options] - Sync options.
|
|
360
|
+
* @param {(progress: import("./sync-api-client-types.js").SyncPullProgress) => void} [options.onProgress] - Called per applied page of the pull this declaration triggers, so the initial import of a newly declared scope can drive a "syncedCount of total" progress bar. See `pull()`.
|
|
359
361
|
* @returns {Promise<{scope: import("./sync-client-types.js").SerializedSyncScope, pulled: import("./sync-api-client-types.js").SyncChangesResult | null}>} Declared scope and pull result (null while offline).
|
|
360
362
|
*/
|
|
361
|
-
async sync(query) {
|
|
363
|
+
async sync(query, {onProgress} = {}) {
|
|
362
364
|
const scope = serializedScopeFromQuery(query)
|
|
363
365
|
const scopeStore = this.scopeStore()
|
|
364
366
|
const scopeRow = await scopeStore.findOrCreateScope(scope)
|
|
@@ -370,7 +372,7 @@ export default class SyncClient {
|
|
|
370
372
|
if (legacyCursor) await scopeStore.saveCursor(scopeRow, legacyCursor)
|
|
371
373
|
}
|
|
372
374
|
|
|
373
|
-
return {pulled: await this.pull(), scope}
|
|
375
|
+
return {pulled: await this.pull({onProgress}), scope}
|
|
374
376
|
}
|
|
375
377
|
|
|
376
378
|
/**
|
|
@@ -384,9 +386,11 @@ export default class SyncClient {
|
|
|
384
386
|
|
|
385
387
|
/**
|
|
386
388
|
* Pulls changes for every active scope with per-scope cursors (single-flighted, online-gated).
|
|
389
|
+
* @param {object} [options] - Pull options.
|
|
390
|
+
* @param {(progress: import("./sync-api-client-types.js").SyncPullProgress) => void} [options.onProgress] - Called per applied page with cumulative `{pages, syncedCount, total}` across the pulled scopes, for rendering a "syncedCount of total" progress bar (e.g. a full-import screen). Optional; omitting it keeps the existing behavior.
|
|
387
391
|
* @returns {Promise<import("./sync-api-client-types.js").SyncChangesResult | null>} Combined pull result, or null while offline.
|
|
388
392
|
*/
|
|
389
|
-
async pull() {
|
|
393
|
+
async pull({onProgress} = {}) {
|
|
390
394
|
if (!(await this.isOnline())) return null
|
|
391
395
|
|
|
392
396
|
/** @type {import("./sync-api-client-types.js").SyncChangesResult | null} */
|
|
@@ -401,15 +405,27 @@ export default class SyncClient {
|
|
|
401
405
|
pages: 0,
|
|
402
406
|
resourceChanged: /** @type {Record<string, boolean>} */ ({}),
|
|
403
407
|
resourceCounts: /** @type {Record<string, number>} */ ({}),
|
|
404
|
-
syncedCount: 0
|
|
408
|
+
syncedCount: 0,
|
|
409
|
+
total: 0
|
|
405
410
|
}
|
|
406
411
|
|
|
407
412
|
for (const scopeRow of await scopeStore.activeScopes()) {
|
|
413
|
+
// Cumulate scope progress onto the counts of the scopes already pulled so a single
|
|
414
|
+
// scope's per-page progress reads exactly its own counts (base 0), and multi-scope
|
|
415
|
+
// pulls report a running cumulative total across every scope.
|
|
416
|
+
const basePages = result.pages
|
|
417
|
+
const baseSyncedCount = result.syncedCount
|
|
418
|
+
const baseTotal = result.total
|
|
408
419
|
const scopeResult = await SyncApiClient.pullChanges({
|
|
409
420
|
applySync,
|
|
410
421
|
authenticationToken,
|
|
411
422
|
batchSize: this.config.batchSize,
|
|
412
423
|
loadCursor: async () => await scopeStore.loadCursor(scopeRow),
|
|
424
|
+
onProgress: onProgress ? (progress) => onProgress({
|
|
425
|
+
pages: basePages + progress.pages,
|
|
426
|
+
syncedCount: baseSyncedCount + progress.syncedCount,
|
|
427
|
+
total: baseTotal + progress.total
|
|
428
|
+
}) : undefined,
|
|
413
429
|
postChanges: async (payload) => await this.config.postChanges({
|
|
414
430
|
...payload,
|
|
415
431
|
scope: {conditions: scopeRow.conditions, resourceType: scopeRow.resourceType}
|
|
@@ -420,6 +436,7 @@ export default class SyncClient {
|
|
|
420
436
|
result.changed ||= scopeResult.changed
|
|
421
437
|
result.pages += scopeResult.pages
|
|
422
438
|
result.syncedCount += scopeResult.syncedCount
|
|
439
|
+
result.total += scopeResult.total
|
|
423
440
|
|
|
424
441
|
for (const [resourceType, count] of Object.entries(scopeResult.resourceCounts)) {
|
|
425
442
|
result.resourceCounts[resourceType] = (result.resourceCounts[resourceType] || 0) + count
|
|
@@ -32,15 +32,19 @@ export default class SyncModelChangeFeedService {
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
/**
|
|
35
|
-
* Builds a stable change-feed page.
|
|
36
|
-
*
|
|
35
|
+
* Builds a stable change-feed page. The additive `total` is the scope's pending
|
|
36
|
+
* change count from the request cursor to the snapshot bound (a COUNT, not a
|
|
37
|
+
* materialized read), so a client can render a "synced of total" progress bar;
|
|
38
|
+
* older clients ignore it.
|
|
39
|
+
* @returns {Promise<{status: string, nextCursor: {id: string, serverSequence: number, updatedAt: string} | null, syncs: Array<Record<string, unknown>>, total: number, upToCursor: {id: string, serverSequence: number, updatedAt: string} | null}>} Change-feed page result.
|
|
37
40
|
*/
|
|
38
41
|
async changes() {
|
|
39
42
|
const limit = this.normalizedLimit(this.params.limit)
|
|
40
43
|
const upToCursor = await this.resolveUpToCursor()
|
|
41
44
|
|
|
42
|
-
if (!upToCursor) return {status: "success", nextCursor: null, syncs: [], upToCursor: null}
|
|
45
|
+
if (!upToCursor) return {status: "success", nextCursor: null, syncs: [], total: 0, upToCursor: null}
|
|
43
46
|
|
|
47
|
+
const total = await this.totalPendingChanges({upToCursor})
|
|
44
48
|
const query = this.pageQuery({limit, upToCursor})
|
|
45
49
|
const records = await query.toArray()
|
|
46
50
|
const nextCursor = records.length > 0 ? this.cursorForRecord(records[records.length - 1]) : upToCursor
|
|
@@ -49,6 +53,7 @@ export default class SyncModelChangeFeedService {
|
|
|
49
53
|
status: "success",
|
|
50
54
|
nextCursor,
|
|
51
55
|
syncs: records.map((record) => this.serializeRecord(record)),
|
|
56
|
+
total,
|
|
52
57
|
upToCursor
|
|
53
58
|
}
|
|
54
59
|
}
|
|
@@ -124,6 +129,34 @@ export default class SyncModelChangeFeedService {
|
|
|
124
129
|
* @returns {import("../database/query/model-class-query.js").default} Page query.
|
|
125
130
|
*/
|
|
126
131
|
pageQuery({limit, upToCursor}) {
|
|
132
|
+
const query = this.cursorFilteredQuery({upToCursor})
|
|
133
|
+
const driver = query.driver
|
|
134
|
+
const serverSequenceColumn = `${driver.quoteTable(this.modelClass.tableName())}.${driver.quoteColumn("server_sequence")}`
|
|
135
|
+
|
|
136
|
+
return query
|
|
137
|
+
.order(`${serverSequenceColumn} ASC`)
|
|
138
|
+
.limit(limit)
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
/**
|
|
142
|
+
* Counts the scope's pending change rows from the request cursor to the snapshot
|
|
143
|
+
* bound without materializing them, so the client can render a stable "of Y"
|
|
144
|
+
* progress denominator.
|
|
145
|
+
* @param {{upToCursor: {id: string, serverSequence: number, updatedAt: string}}} args - Count args.
|
|
146
|
+
* @returns {Promise<number>} Pending change count from the request cursor.
|
|
147
|
+
*/
|
|
148
|
+
async totalPendingChanges({upToCursor}) {
|
|
149
|
+
return await this.cursorFilteredQuery({upToCursor}).count()
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
/**
|
|
153
|
+
* Builds a scoped query with the snapshot upper bound and after-cursor filters
|
|
154
|
+
* applied, but without ordering or a page limit. Shared by the page read and the
|
|
155
|
+
* total-count so both count the same set of rows.
|
|
156
|
+
* @param {{upToCursor: {id: string, serverSequence: number, updatedAt: string}}} args - Filter args.
|
|
157
|
+
* @returns {import("../database/query/model-class-query.js").default} Cursor-filtered query.
|
|
158
|
+
*/
|
|
159
|
+
cursorFilteredQuery({upToCursor}) {
|
|
127
160
|
const query = this.scopedQuery()
|
|
128
161
|
const driver = query.driver
|
|
129
162
|
const table = driver.quoteTable(this.modelClass.tableName())
|
|
@@ -131,10 +164,7 @@ export default class SyncModelChangeFeedService {
|
|
|
131
164
|
const updatedAtColumn = `${table}.${driver.quoteColumn("updated_at")}`
|
|
132
165
|
const idColumn = `${table}.${driver.quoteColumn("id")}`
|
|
133
166
|
|
|
134
|
-
query
|
|
135
|
-
.where(`${serverSequenceColumn} <= ${driver.quote(upToCursor.serverSequence)}`)
|
|
136
|
-
.order(`${serverSequenceColumn} ASC`)
|
|
137
|
-
.limit(limit)
|
|
167
|
+
query.where(`${serverSequenceColumn} <= ${driver.quote(upToCursor.serverSequence)}`)
|
|
138
168
|
|
|
139
169
|
const afterServerSequence = this.optionalPositiveIntegerParam(this.params.afterServerSequence, "afterServerSequence")
|
|
140
170
|
|
package/package.json
CHANGED
|
@@ -49,9 +49,17 @@
|
|
|
49
49
|
* @property {SyncCursor | Record<string, ?>} [nextCursor] - Next cursor.
|
|
50
50
|
* @property {string} [status] - Response status.
|
|
51
51
|
* @property {Array<unknown>} [syncs] - Sync rows.
|
|
52
|
+
* @property {number} [total] - Total pending change count for the scope from the request cursor (additive; absent on older servers).
|
|
52
53
|
* @property {SyncCursor | Record<string, ?>} [upToCursor] - Snapshot upper-bound cursor.
|
|
53
54
|
*/
|
|
54
55
|
|
|
56
|
+
/**
|
|
57
|
+
* @typedef {object} SyncPullProgress
|
|
58
|
+
* @property {number} pages - Applied page count so far.
|
|
59
|
+
* @property {number} syncedCount - Applied row count so far.
|
|
60
|
+
* @property {number} total - Total pending change count for the pull, stable across pages (0 when nothing to sync, null-free once the server reports it).
|
|
61
|
+
*/
|
|
62
|
+
|
|
55
63
|
/**
|
|
56
64
|
* @typedef {object} SyncChangesResult
|
|
57
65
|
* @property {boolean} changed - Whether any local record changed.
|
|
@@ -59,6 +67,7 @@
|
|
|
59
67
|
* @property {Record<string, boolean>} resourceChanged - Changed flags by resource type.
|
|
60
68
|
* @property {Record<string, number>} resourceCounts - Applied counts by resource type.
|
|
61
69
|
* @property {number} syncedCount - Applied row count.
|
|
70
|
+
* @property {number} total - Total pending change count across the pulled scopes (the "of Y" denominator for a syncedCount-of-total progress bar).
|
|
62
71
|
*/
|
|
63
72
|
|
|
64
73
|
/**
|
|
@@ -57,7 +57,7 @@ export default class SyncApiClient {
|
|
|
57
57
|
* @param {string} args.cursorKey - Cursor option key.
|
|
58
58
|
* @param {(payload: SyncChangesRequest) => Promise<SyncChangesResponse>} args.postChanges - Posts one changes request.
|
|
59
59
|
* @param {Record<string, SyncResourceConfig>} args.resources - Resource policies.
|
|
60
|
-
* @param {(progress:
|
|
60
|
+
* @param {(progress: import("./sync-api-client-types.js").SyncPullProgress) => void} [args.onProgress] - Progress callback.
|
|
61
61
|
* @returns {Promise<SyncChangesResult>} Pull result.
|
|
62
62
|
*/
|
|
63
63
|
static async pullChangesWithCursor(args) {
|
|
@@ -108,7 +108,7 @@ export default class SyncApiClient {
|
|
|
108
108
|
* @param {(cursor: SyncCursor) => Promise<void>} args.saveCursor - Persists the final acknowledged cursor.
|
|
109
109
|
* @param {(payload: SyncChangesRequest) => Promise<SyncChangesResponse>} args.postChanges - Posts one changes request.
|
|
110
110
|
* @param {(sync: SyncChangeEnvelope) => Promise<SyncChangeApplyResult>} args.applySync - Applies one normalized sync row locally.
|
|
111
|
-
* @param {(progress:
|
|
111
|
+
* @param {(progress: import("./sync-api-client-types.js").SyncPullProgress) => void} [args.onProgress] - Progress callback invoked per applied page (and once for an empty pull) with the applied counts and the stable server total.
|
|
112
112
|
* @returns {Promise<SyncChangesResult>} Pull result.
|
|
113
113
|
*/
|
|
114
114
|
static async pullChanges(args) {
|
|
@@ -116,6 +116,7 @@ export default class SyncApiClient {
|
|
|
116
116
|
let upToCursor = null
|
|
117
117
|
let pages = 0
|
|
118
118
|
let syncedCount = 0
|
|
119
|
+
let total = 0
|
|
119
120
|
let changed = false
|
|
120
121
|
const resourceCounts = /** @type {Record<string, number>} */ ({})
|
|
121
122
|
const resourceChanged = /** @type {Record<string, boolean>} */ ({})
|
|
@@ -126,7 +127,21 @@ export default class SyncApiClient {
|
|
|
126
127
|
const syncs = changesResponse.syncs
|
|
127
128
|
|
|
128
129
|
if (!upToCursor) upToCursor = changesResponse.upToCursor
|
|
129
|
-
|
|
130
|
+
|
|
131
|
+
// The server counts pending rows from this request's cursor, so already-applied
|
|
132
|
+
// pages plus this request's count stays the same total across every page: a stable
|
|
133
|
+
// "of Y" denominator even as the cursor advances. A server that doesn't report the
|
|
134
|
+
// count at all leaves the total at 0 for every page rather than drifting upwards
|
|
135
|
+
// with the applied rows.
|
|
136
|
+
if (changesResponse.total !== null) total = syncedCount + changesResponse.total
|
|
137
|
+
|
|
138
|
+
if (syncs.length === 0) {
|
|
139
|
+
// Report the terminal progress once for an entirely empty pull so consumers observe
|
|
140
|
+
// total 0; a pull that already applied pages reported its final counts on its last page.
|
|
141
|
+
if (pages === 0 && args.onProgress) args.onProgress({pages, syncedCount, total})
|
|
142
|
+
|
|
143
|
+
break
|
|
144
|
+
}
|
|
130
145
|
|
|
131
146
|
pages += 1
|
|
132
147
|
|
|
@@ -151,13 +166,13 @@ export default class SyncApiClient {
|
|
|
151
166
|
|
|
152
167
|
afterCursor = changesResponse.nextCursor
|
|
153
168
|
|
|
154
|
-
if (args.onProgress) args.onProgress({pages, syncedCount})
|
|
169
|
+
if (args.onProgress) args.onProgress({pages, syncedCount, total})
|
|
155
170
|
if (syncs.length < batchSize) break
|
|
156
171
|
}
|
|
157
172
|
|
|
158
173
|
if (afterCursor) await args.saveCursor(afterCursor)
|
|
159
174
|
|
|
160
|
-
return {changed, pages, resourceChanged, resourceCounts, syncedCount}
|
|
175
|
+
return {changed, pages, resourceChanged, resourceCounts, syncedCount, total}
|
|
161
176
|
}
|
|
162
177
|
|
|
163
178
|
/**
|
|
@@ -168,7 +183,7 @@ export default class SyncApiClient {
|
|
|
168
183
|
* @param {number} args.batchSize - Page size.
|
|
169
184
|
* @param {(payload: SyncChangesRequest) => Promise<SyncChangesResponse>} args.postChanges - Changes poster.
|
|
170
185
|
* @param {SyncCursor} args.upToCursor - Snapshot upper-bound cursor.
|
|
171
|
-
* @returns {Promise<{nextCursor: SyncCursor, syncs: SyncChangeEnvelope[], upToCursor: SyncCursor}>} Normalized changes page.
|
|
186
|
+
* @returns {Promise<{nextCursor: SyncCursor, syncs: SyncChangeEnvelope[], total: number | null, upToCursor: SyncCursor}>} Normalized changes page.
|
|
172
187
|
*/
|
|
173
188
|
static async changesPage({afterCursor, authenticationToken, batchSize, postChanges, upToCursor}) {
|
|
174
189
|
const response = await postChanges({
|
|
@@ -185,6 +200,7 @@ export default class SyncApiClient {
|
|
|
185
200
|
return {
|
|
186
201
|
nextCursor: this.syncCursorFromPayload(response.nextCursor ?? null),
|
|
187
202
|
syncs: syncs.map((syncPayload) => this.syncEnvelopeFromPayload(syncPayload)),
|
|
203
|
+
total: optionalInteger(response.total),
|
|
188
204
|
upToCursor: this.syncCursorFromPayload(response.upToCursor ?? null)
|
|
189
205
|
}
|
|
190
206
|
}
|
package/src/sync/sync-client.js
CHANGED
|
@@ -356,9 +356,11 @@ export default class SyncClient {
|
|
|
356
356
|
/**
|
|
357
357
|
* Declares (or re-activates) a sync scope from a model query and pulls it when online.
|
|
358
358
|
* @param {import("../database/query/model-class-query.js").default<?>} query - Query declaring the sync scope.
|
|
359
|
+
* @param {object} [options] - Sync options.
|
|
360
|
+
* @param {(progress: import("./sync-api-client-types.js").SyncPullProgress) => void} [options.onProgress] - Called per applied page of the pull this declaration triggers, so the initial import of a newly declared scope can drive a "syncedCount of total" progress bar. See `pull()`.
|
|
359
361
|
* @returns {Promise<{scope: import("./sync-client-types.js").SerializedSyncScope, pulled: import("./sync-api-client-types.js").SyncChangesResult | null}>} Declared scope and pull result (null while offline).
|
|
360
362
|
*/
|
|
361
|
-
async sync(query) {
|
|
363
|
+
async sync(query, {onProgress} = {}) {
|
|
362
364
|
const scope = serializedScopeFromQuery(query)
|
|
363
365
|
const scopeStore = this.scopeStore()
|
|
364
366
|
const scopeRow = await scopeStore.findOrCreateScope(scope)
|
|
@@ -370,7 +372,7 @@ export default class SyncClient {
|
|
|
370
372
|
if (legacyCursor) await scopeStore.saveCursor(scopeRow, legacyCursor)
|
|
371
373
|
}
|
|
372
374
|
|
|
373
|
-
return {pulled: await this.pull(), scope}
|
|
375
|
+
return {pulled: await this.pull({onProgress}), scope}
|
|
374
376
|
}
|
|
375
377
|
|
|
376
378
|
/**
|
|
@@ -384,9 +386,11 @@ export default class SyncClient {
|
|
|
384
386
|
|
|
385
387
|
/**
|
|
386
388
|
* Pulls changes for every active scope with per-scope cursors (single-flighted, online-gated).
|
|
389
|
+
* @param {object} [options] - Pull options.
|
|
390
|
+
* @param {(progress: import("./sync-api-client-types.js").SyncPullProgress) => void} [options.onProgress] - Called per applied page with cumulative `{pages, syncedCount, total}` across the pulled scopes, for rendering a "syncedCount of total" progress bar (e.g. a full-import screen). Optional; omitting it keeps the existing behavior.
|
|
387
391
|
* @returns {Promise<import("./sync-api-client-types.js").SyncChangesResult | null>} Combined pull result, or null while offline.
|
|
388
392
|
*/
|
|
389
|
-
async pull() {
|
|
393
|
+
async pull({onProgress} = {}) {
|
|
390
394
|
if (!(await this.isOnline())) return null
|
|
391
395
|
|
|
392
396
|
/** @type {import("./sync-api-client-types.js").SyncChangesResult | null} */
|
|
@@ -401,15 +405,27 @@ export default class SyncClient {
|
|
|
401
405
|
pages: 0,
|
|
402
406
|
resourceChanged: /** @type {Record<string, boolean>} */ ({}),
|
|
403
407
|
resourceCounts: /** @type {Record<string, number>} */ ({}),
|
|
404
|
-
syncedCount: 0
|
|
408
|
+
syncedCount: 0,
|
|
409
|
+
total: 0
|
|
405
410
|
}
|
|
406
411
|
|
|
407
412
|
for (const scopeRow of await scopeStore.activeScopes()) {
|
|
413
|
+
// Cumulate scope progress onto the counts of the scopes already pulled so a single
|
|
414
|
+
// scope's per-page progress reads exactly its own counts (base 0), and multi-scope
|
|
415
|
+
// pulls report a running cumulative total across every scope.
|
|
416
|
+
const basePages = result.pages
|
|
417
|
+
const baseSyncedCount = result.syncedCount
|
|
418
|
+
const baseTotal = result.total
|
|
408
419
|
const scopeResult = await SyncApiClient.pullChanges({
|
|
409
420
|
applySync,
|
|
410
421
|
authenticationToken,
|
|
411
422
|
batchSize: this.config.batchSize,
|
|
412
423
|
loadCursor: async () => await scopeStore.loadCursor(scopeRow),
|
|
424
|
+
onProgress: onProgress ? (progress) => onProgress({
|
|
425
|
+
pages: basePages + progress.pages,
|
|
426
|
+
syncedCount: baseSyncedCount + progress.syncedCount,
|
|
427
|
+
total: baseTotal + progress.total
|
|
428
|
+
}) : undefined,
|
|
413
429
|
postChanges: async (payload) => await this.config.postChanges({
|
|
414
430
|
...payload,
|
|
415
431
|
scope: {conditions: scopeRow.conditions, resourceType: scopeRow.resourceType}
|
|
@@ -420,6 +436,7 @@ export default class SyncClient {
|
|
|
420
436
|
result.changed ||= scopeResult.changed
|
|
421
437
|
result.pages += scopeResult.pages
|
|
422
438
|
result.syncedCount += scopeResult.syncedCount
|
|
439
|
+
result.total += scopeResult.total
|
|
423
440
|
|
|
424
441
|
for (const [resourceType, count] of Object.entries(scopeResult.resourceCounts)) {
|
|
425
442
|
result.resourceCounts[resourceType] = (result.resourceCounts[resourceType] || 0) + count
|