@powersync/service-module-mongodb-storage 0.17.0 → 0.18.1

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 (185) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/dist/storage/MongoBucketStorage.d.ts +34 -16
  3. package/dist/storage/MongoBucketStorage.js +219 -70
  4. package/dist/storage/MongoBucketStorage.js.map +1 -1
  5. package/dist/storage/implementation/MongoBucketBatch.d.ts +42 -23
  6. package/dist/storage/implementation/MongoBucketBatch.js +61 -44
  7. package/dist/storage/implementation/MongoBucketBatch.js.map +1 -1
  8. package/dist/storage/implementation/MongoChecksums.d.ts +10 -9
  9. package/dist/storage/implementation/MongoChecksums.js +3 -111
  10. package/dist/storage/implementation/MongoChecksums.js.map +1 -1
  11. package/dist/storage/implementation/MongoCompactor.d.ts +2 -0
  12. package/dist/storage/implementation/MongoCompactor.js +18 -9
  13. package/dist/storage/implementation/MongoCompactor.js.map +1 -1
  14. package/dist/storage/implementation/MongoHydrationState.d.ts +11 -0
  15. package/dist/storage/implementation/MongoHydrationState.js +49 -0
  16. package/dist/storage/implementation/MongoHydrationState.js.map +1 -0
  17. package/dist/storage/implementation/MongoParameterCompactor.d.ts +6 -5
  18. package/dist/storage/implementation/MongoParameterCompactor.js +24 -1
  19. package/dist/storage/implementation/MongoParameterCompactor.js.map +1 -1
  20. package/dist/storage/implementation/MongoParsedSyncConfigSet.d.ts +13 -0
  21. package/dist/storage/implementation/MongoParsedSyncConfigSet.js +64 -0
  22. package/dist/storage/implementation/MongoParsedSyncConfigSet.js.map +1 -0
  23. package/dist/storage/implementation/MongoPersistedReplicationStream.d.ts +36 -0
  24. package/dist/storage/implementation/MongoPersistedReplicationStream.js +90 -0
  25. package/dist/storage/implementation/MongoPersistedReplicationStream.js.map +1 -0
  26. package/dist/storage/implementation/MongoPersistedSyncConfigContent.d.ts +25 -0
  27. package/dist/storage/implementation/MongoPersistedSyncConfigContent.js +123 -0
  28. package/dist/storage/implementation/MongoPersistedSyncConfigContent.js.map +1 -0
  29. package/dist/storage/implementation/MongoStorageProvider.js +5 -2
  30. package/dist/storage/implementation/MongoStorageProvider.js.map +1 -1
  31. package/dist/storage/implementation/MongoSyncBucketStorage.d.ts +41 -23
  32. package/dist/storage/implementation/MongoSyncBucketStorage.js +51 -43
  33. package/dist/storage/implementation/MongoSyncBucketStorage.js.map +1 -1
  34. package/dist/storage/implementation/MongoSyncRulesLock.d.ts +1 -1
  35. package/dist/storage/implementation/MongoSyncRulesLock.js +3 -3
  36. package/dist/storage/implementation/MongoSyncRulesLock.js.map +1 -1
  37. package/dist/storage/implementation/common/MongoSyncBucketStorageCheckpoint.d.ts +6 -0
  38. package/dist/storage/implementation/common/MongoSyncBucketStorageCheckpoint.js +2 -0
  39. package/dist/storage/implementation/common/MongoSyncBucketStorageCheckpoint.js.map +1 -0
  40. package/dist/storage/implementation/common/PersistedBatch.d.ts +1 -2
  41. package/dist/storage/implementation/common/PersistedBatch.js +5 -0
  42. package/dist/storage/implementation/common/PersistedBatch.js.map +1 -1
  43. package/dist/storage/implementation/common/VersionedPowerSyncMongoBase.js +1 -1
  44. package/dist/storage/implementation/common/VersionedPowerSyncMongoBase.js.map +1 -1
  45. package/dist/storage/implementation/createMongoSyncBucketStorage.d.ts +2 -2
  46. package/dist/storage/implementation/createMongoSyncBucketStorage.js +4 -4
  47. package/dist/storage/implementation/createMongoSyncBucketStorage.js.map +1 -1
  48. package/dist/storage/implementation/db.js +9 -14
  49. package/dist/storage/implementation/db.js.map +1 -1
  50. package/dist/storage/implementation/models.d.ts +4 -13
  51. package/dist/storage/implementation/models.js.map +1 -1
  52. package/dist/storage/implementation/v1/MongoBucketBatchV1.d.ts +9 -1
  53. package/dist/storage/implementation/v1/MongoBucketBatchV1.js +42 -26
  54. package/dist/storage/implementation/v1/MongoBucketBatchV1.js.map +1 -1
  55. package/dist/storage/implementation/v1/MongoChecksumsV1.js +114 -3
  56. package/dist/storage/implementation/v1/MongoChecksumsV1.js.map +1 -1
  57. package/dist/storage/implementation/v1/MongoSyncBucketStorageV1.d.ts +15 -17
  58. package/dist/storage/implementation/v1/MongoSyncBucketStorageV1.js +47 -45
  59. package/dist/storage/implementation/v1/MongoSyncBucketStorageV1.js.map +1 -1
  60. package/dist/storage/implementation/v1/VersionedPowerSyncMongoV1.d.ts +2 -1
  61. package/dist/storage/implementation/v1/VersionedPowerSyncMongoV1.js +3 -0
  62. package/dist/storage/implementation/v1/VersionedPowerSyncMongoV1.js.map +1 -1
  63. package/dist/storage/implementation/v1/models.d.ts +10 -1
  64. package/dist/storage/implementation/v3/MongoBucketBatchV3.d.ts +8 -4
  65. package/dist/storage/implementation/v3/MongoBucketBatchV3.js +286 -259
  66. package/dist/storage/implementation/v3/MongoBucketBatchV3.js.map +1 -1
  67. package/dist/storage/implementation/v3/MongoChecksumsV3.d.ts +27 -7
  68. package/dist/storage/implementation/v3/MongoChecksumsV3.js +202 -18
  69. package/dist/storage/implementation/v3/MongoChecksumsV3.js.map +1 -1
  70. package/dist/storage/implementation/v3/MongoCompactorV3.d.ts +19 -2
  71. package/dist/storage/implementation/v3/MongoCompactorV3.js +511 -22
  72. package/dist/storage/implementation/v3/MongoCompactorV3.js.map +1 -1
  73. package/dist/storage/implementation/v3/MongoStoppedSyncConfigCleanup.d.ts +62 -0
  74. package/dist/storage/implementation/v3/MongoStoppedSyncConfigCleanup.js +350 -0
  75. package/dist/storage/implementation/v3/MongoStoppedSyncConfigCleanup.js.map +1 -0
  76. package/dist/storage/implementation/v3/MongoSyncBucketStorageV3.d.ts +40 -28
  77. package/dist/storage/implementation/v3/MongoSyncBucketStorageV3.js +232 -116
  78. package/dist/storage/implementation/v3/MongoSyncBucketStorageV3.js.map +1 -1
  79. package/dist/storage/implementation/v3/PersistedBatchV3.d.ts +1 -1
  80. package/dist/storage/implementation/v3/PersistedBatchV3.js +43 -20
  81. package/dist/storage/implementation/v3/PersistedBatchV3.js.map +1 -1
  82. package/dist/storage/implementation/v3/SingleBucketStoreV3.js +52 -16
  83. package/dist/storage/implementation/v3/SingleBucketStoreV3.js.map +1 -1
  84. package/dist/storage/implementation/v3/SourceRecordStoreV3.d.ts +3 -3
  85. package/dist/storage/implementation/v3/SourceRecordStoreV3.js +13 -11
  86. package/dist/storage/implementation/v3/SourceRecordStoreV3.js.map +1 -1
  87. package/dist/storage/implementation/v3/VersionedPowerSyncMongoV3.d.ts +13 -12
  88. package/dist/storage/implementation/v3/VersionedPowerSyncMongoV3.js +29 -27
  89. package/dist/storage/implementation/v3/VersionedPowerSyncMongoV3.js.map +1 -1
  90. package/dist/storage/implementation/v3/bucket-format.d.ts +4 -0
  91. package/dist/storage/implementation/v3/bucket-format.js +58 -0
  92. package/dist/storage/implementation/v3/bucket-format.js.map +1 -0
  93. package/dist/storage/implementation/v3/chunking.d.ts +10 -0
  94. package/dist/storage/implementation/v3/chunking.js +28 -0
  95. package/dist/storage/implementation/v3/chunking.js.map +1 -0
  96. package/dist/storage/implementation/v3/models.d.ts +64 -21
  97. package/dist/storage/implementation/v3/models.js +11 -28
  98. package/dist/storage/implementation/v3/models.js.map +1 -1
  99. package/dist/storage/implementation/v3/source-table-utils.d.ts +55 -0
  100. package/dist/storage/implementation/v3/source-table-utils.js +214 -0
  101. package/dist/storage/implementation/v3/source-table-utils.js.map +1 -0
  102. package/dist/storage/storage-index.d.ts +4 -4
  103. package/dist/storage/storage-index.js +4 -4
  104. package/dist/storage/storage-index.js.map +1 -1
  105. package/dist/types/types.d.ts +2 -2
  106. package/dist/utils/test-utils.d.ts +1 -2
  107. package/dist/utils/test-utils.js +5 -1
  108. package/dist/utils/test-utils.js.map +1 -1
  109. package/dist/utils/util.d.ts +1 -1
  110. package/dist/utils/util.js +3 -2
  111. package/dist/utils/util.js.map +1 -1
  112. package/package.json +9 -19
  113. package/src/storage/MongoBucketStorage.ts +334 -87
  114. package/src/storage/implementation/MongoBucketBatch.ts +86 -58
  115. package/src/storage/implementation/MongoChecksums.ts +6 -138
  116. package/src/storage/implementation/MongoCompactor.ts +19 -9
  117. package/src/storage/implementation/MongoHydrationState.ts +61 -0
  118. package/src/storage/implementation/MongoParameterCompactor.ts +24 -5
  119. package/src/storage/implementation/MongoParsedSyncConfigSet.ts +88 -0
  120. package/src/storage/implementation/MongoPersistedReplicationStream.ts +118 -0
  121. package/src/storage/implementation/MongoPersistedSyncConfigContent.ts +154 -0
  122. package/src/storage/implementation/MongoStorageProvider.ts +5 -2
  123. package/src/storage/implementation/MongoSyncBucketStorage.ts +70 -56
  124. package/src/storage/implementation/MongoSyncRulesLock.ts +7 -4
  125. package/src/storage/implementation/common/MongoSyncBucketStorageCheckpoint.ts +7 -0
  126. package/src/storage/implementation/common/PersistedBatch.ts +7 -3
  127. package/src/storage/implementation/common/VersionedPowerSyncMongoBase.ts +1 -1
  128. package/src/storage/implementation/createMongoSyncBucketStorage.ts +21 -7
  129. package/src/storage/implementation/db.ts +11 -19
  130. package/src/storage/implementation/models.ts +4 -14
  131. package/src/storage/implementation/v1/MongoBucketBatchV1.ts +55 -34
  132. package/src/storage/implementation/v1/MongoChecksumsV1.ts +137 -4
  133. package/src/storage/implementation/v1/MongoSyncBucketStorageV1.ts +70 -64
  134. package/src/storage/implementation/v1/VersionedPowerSyncMongoV1.ts +11 -1
  135. package/src/storage/implementation/v1/models.ts +11 -1
  136. package/src/storage/implementation/v3/MongoBucketBatchV3.ts +358 -314
  137. package/src/storage/implementation/v3/MongoChecksumsV3.ts +262 -26
  138. package/src/storage/implementation/v3/MongoCompactorV3.ts +646 -29
  139. package/src/storage/implementation/v3/MongoStoppedSyncConfigCleanup.ts +480 -0
  140. package/src/storage/implementation/v3/MongoSyncBucketStorageV3.ts +315 -157
  141. package/src/storage/implementation/v3/PersistedBatchV3.ts +62 -36
  142. package/src/storage/implementation/v3/SingleBucketStoreV3.ts +59 -19
  143. package/src/storage/implementation/v3/SourceRecordStoreV3.ts +12 -12
  144. package/src/storage/implementation/v3/VersionedPowerSyncMongoV3.ts +41 -36
  145. package/src/storage/implementation/v3/bucket-format.ts +70 -0
  146. package/src/storage/implementation/v3/chunking.ts +38 -0
  147. package/src/storage/implementation/v3/models.ts +93 -55
  148. package/src/storage/implementation/v3/source-table-utils.ts +392 -0
  149. package/src/storage/storage-index.ts +12 -4
  150. package/src/utils/test-utils.ts +6 -3
  151. package/src/utils/util.ts +3 -2
  152. package/test/src/__snapshots__/storage.test.ts.snap +0 -75
  153. package/test/src/__snapshots__/storage_sync.test.ts.snap +48 -48
  154. package/test/src/cleanup-stopped-sync-configs.test.ts +648 -0
  155. package/test/src/storage.test.ts +11 -11
  156. package/test/src/storage_compacting.test.ts +1956 -6
  157. package/test/src/storage_sync.test.ts +1077 -68
  158. package/test/src/storeCurrentData.test.ts +17 -7
  159. package/test/src/util.ts +2 -1
  160. package/tsconfig.json +1 -4
  161. package/tsconfig.tsbuildinfo +1 -1
  162. package/dist/storage/implementation/BucketDefinitionMapping.d.ts +0 -15
  163. package/dist/storage/implementation/BucketDefinitionMapping.js +0 -58
  164. package/dist/storage/implementation/BucketDefinitionMapping.js.map +0 -1
  165. package/dist/storage/implementation/MongoPersistedSyncRules.d.ts +0 -14
  166. package/dist/storage/implementation/MongoPersistedSyncRules.js +0 -67
  167. package/dist/storage/implementation/MongoPersistedSyncRules.js.map +0 -1
  168. package/dist/storage/implementation/MongoPersistedSyncRulesContent.d.ts +0 -29
  169. package/dist/storage/implementation/MongoPersistedSyncRulesContent.js +0 -76
  170. package/dist/storage/implementation/MongoPersistedSyncRulesContent.js.map +0 -1
  171. package/dist/storage/implementation/common/MongoSyncBucketStorageContext.d.ts +0 -13
  172. package/dist/storage/implementation/common/MongoSyncBucketStorageContext.js +0 -2
  173. package/dist/storage/implementation/common/MongoSyncBucketStorageContext.js.map +0 -1
  174. package/dist/storage/implementation/v3/MongoParameterCompactorV3.d.ts +0 -9
  175. package/dist/storage/implementation/v3/MongoParameterCompactorV3.js +0 -18
  176. package/dist/storage/implementation/v3/MongoParameterCompactorV3.js.map +0 -1
  177. package/dist/storage/implementation/v3/MongoParameterLookupV3.d.ts +0 -4
  178. package/dist/storage/implementation/v3/MongoParameterLookupV3.js +0 -9
  179. package/dist/storage/implementation/v3/MongoParameterLookupV3.js.map +0 -1
  180. package/src/storage/implementation/BucketDefinitionMapping.ts +0 -75
  181. package/src/storage/implementation/MongoPersistedSyncRules.ts +0 -82
  182. package/src/storage/implementation/MongoPersistedSyncRulesContent.ts +0 -101
  183. package/src/storage/implementation/common/MongoSyncBucketStorageContext.ts +0 -15
  184. package/src/storage/implementation/v3/MongoParameterCompactorV3.ts +0 -24
  185. package/src/storage/implementation/v3/MongoParameterLookupV3.ts +0 -11
@@ -1,8 +1,10 @@
1
- import { bson } from '@powersync/service-core';
2
- import { MongoChecksums } from '../MongoChecksums.js';
1
+ import * as lib_mongo from '@powersync/lib-service-mongodb';
2
+ import { addPartialChecksums, bson, isPartialChecksum } from '@powersync/service-core';
3
+ import { checksumFromAggregate, DEFAULT_OPERATION_BATCH_LIMIT, MongoChecksums } from '../MongoChecksums.js';
3
4
  export class MongoChecksumsV1 extends MongoChecksums {
4
5
  async computePartialChecksumsDirectByBucket(batch) {
5
- return this.computePartialChecksumsForCollection(batch, this.db.bucketDataV1, (request) => ({
6
+ const collection = this.db.bucketDataV1;
7
+ const createFilter = (request) => ({
6
8
  _id: {
7
9
  $gt: {
8
10
  g: this.group_id,
@@ -15,6 +17,115 @@ export class MongoChecksumsV1 extends MongoChecksums {
15
17
  o: request.end
16
18
  }
17
19
  }
20
+ });
21
+ const batchLimit = this.options?.operationBatchLimit ?? DEFAULT_OPERATION_BATCH_LIMIT;
22
+ // Map requests by bucket. We adjust this as we get partial results.
23
+ let requests = new Map();
24
+ for (let request of batch) {
25
+ requests.set(request.bucket, request);
26
+ }
27
+ const partialChecksums = new Map();
28
+ while (requests.size > 0) {
29
+ const filters = Array.from(requests.values(), createFilter);
30
+ // Historically, checksum may be stored as 'int' or 'double'.
31
+ // More recently, this should be a 'long'.
32
+ // $toLong ensures that we always sum it as a long, avoiding inaccuracies in the calculations.
33
+ const checksumLong = this.storageConfig.longChecksums ? '$checksum' : { $toLong: '$checksum' };
34
+ // Aggregate over a max of `batchLimit` operations at a time.
35
+ // Let's say we have 3 buckets (A, B, C), each with 10 operations, and our batch limit is 12.
36
+ // Then we'll do three batches:
37
+ // 1. Query: A[1-end], B[1-end], C[1-end]
38
+ // Returns: A[1-10], B[1-2]
39
+ // 2. Query: B[3-end], C[1-end]
40
+ // Returns: B[3-10], C[1-4]
41
+ // 3. Query: C[5-end]
42
+ // Returns: C[5-10]
43
+ const aggregate = await collection
44
+ .aggregate([
45
+ {
46
+ $match: {
47
+ $or: filters
48
+ }
49
+ },
50
+ // sort and limit _before_ grouping
51
+ { $sort: { _id: 1 } },
52
+ { $limit: batchLimit },
53
+ {
54
+ $group: {
55
+ _id: '$_id.b',
56
+ checksum_total: { $sum: checksumLong },
57
+ count: { $sum: 1 },
58
+ has_clear_op: {
59
+ $max: {
60
+ $cond: [{ $eq: ['$op', 'CLEAR'] }, 1, 0]
61
+ }
62
+ },
63
+ last_op: { $max: '$_id.o' }
64
+ }
65
+ },
66
+ // Sort the aggregated results (100 max, so should be fast).
67
+ // This is important to identify which buckets we have partial data for.
68
+ { $sort: { _id: 1 } }
69
+ ], {
70
+ session: undefined,
71
+ readConcern: 'snapshot',
72
+ maxTimeMS: lib_mongo.MONGO_CHECKSUM_TIMEOUT_MS
73
+ })
74
+ .toArray()
75
+ .catch((e) => {
76
+ throw lib_mongo.mapQueryError(e, 'while reading checksums');
77
+ });
78
+ let batchCount = 0;
79
+ let limitReached = false;
80
+ for (let doc of aggregate) {
81
+ const bucket = doc._id;
82
+ const checksum = checksumFromAggregate(doc);
83
+ const existing = partialChecksums.get(bucket);
84
+ if (existing != null) {
85
+ partialChecksums.set(bucket, addPartialChecksums(bucket, existing, checksum));
86
+ }
87
+ else {
88
+ partialChecksums.set(bucket, checksum);
89
+ }
90
+ batchCount += doc.count;
91
+ if (batchCount == batchLimit) {
92
+ // Limit reached. Request more in the next batch.
93
+ // Note that this only affects the _last_ bucket in a batch.
94
+ limitReached = true;
95
+ const req = requests.get(bucket);
96
+ requests.set(bucket, {
97
+ ...req,
98
+ start: doc.last_op
99
+ });
100
+ }
101
+ else {
102
+ // All done for this bucket
103
+ requests.delete(bucket);
104
+ }
105
+ }
106
+ if (!limitReached) {
107
+ break;
108
+ }
109
+ }
110
+ return new Map(batch.map((request) => {
111
+ const bucket = request.bucket;
112
+ let partialChecksum = partialChecksums.get(bucket);
113
+ // Could be null if we got no data
114
+ if (partialChecksum == null) {
115
+ partialChecksum = {
116
+ bucket,
117
+ partialCount: 0,
118
+ partialChecksum: 0
119
+ };
120
+ }
121
+ if (request.start == null && isPartialChecksum(partialChecksum)) {
122
+ partialChecksum = {
123
+ bucket,
124
+ count: partialChecksum.partialCount,
125
+ checksum: partialChecksum.partialChecksum
126
+ };
127
+ }
128
+ return [bucket, partialChecksum];
18
129
  }));
19
130
  }
20
131
  async fetchPreStates(batch) {
@@ -1 +1 @@
1
- {"version":3,"file":"MongoChecksumsV1.js","sourceRoot":"","sources":["../../../../src/storage/implementation/v1/MongoChecksumsV1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAKL,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAsC,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG1F,MAAM,OAAO,gBAAiB,SAAQ,cAAc;IAGlD,KAAK,CAAC,qCAAqC,CACzC,KAA2C;QAE3C,OAAO,IAAI,CAAC,oCAAoC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAC1F,GAAG,EAAE;gBACH,GAAG,EAAE;oBACH,CAAC,EAAE,IAAI,CAAC,QAAQ;oBAChB,CAAC,EAAE,OAAO,CAAC,MAAM;oBACjB,CAAC,EAAE,OAAO,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE;iBACtC;gBACD,IAAI,EAAE;oBACJ,CAAC,EAAE,IAAI,CAAC,QAAQ;oBAChB,CAAC,EAAE,OAAO,CAAC,MAAM;oBACjB,CAAC,EAAE,OAAO,CAAC,GAAG;iBACf;aACF;SACF,CAAC,CAAC,CAAC;IACN,CAAC;IAES,KAAK,CAAC,cAAc,CAC5B,KAAmC;QAEnC,MAAM,UAAU,GAAG,KAAK;aACrB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC;aAC1C,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACjB,GAAG,EAAE;gBACH,CAAC,EAAE,IAAI,CAAC,QAAQ;gBAChB,CAAC,EAAE,OAAO,CAAC,MAAM;aAClB;YACD,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;SAC9D,CAAC,CAAC,CAAC;QAEN,MAAM,SAAS,GAAG,IAAI,GAAG,EAA4D,CAAC;QACtF,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa;aACvC,IAAI,CAAC;YACJ,GAAG,EAAE,UAAU;SAChB,CAAC;aACD,OAAO,EAAE,CAAC;QAEb,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,cAAc,GAAG,KAAK,CAAC,eAAgB,CAAC;YAC9C,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE;gBACzB,IAAI,EAAE,cAAc,CAAC,KAAK;gBAC1B,QAAQ,EAAE;oBACR,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;oBACnB,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC;oBACzC,KAAK,EAAE,cAAc,CAAC,KAAK;iBAC5B;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAES,KAAK,CAAC,+BAA+B,CAAC,KAAmC;QACjF,OAAO,IAAI,CAAC,qCAAqC,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;CACF"}
1
+ {"version":3,"file":"MongoChecksumsV1.js","sourceRoot":"","sources":["../../../../src/storage/implementation/v1/MongoChecksumsV1.ts"],"names":[],"mappings":"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"}
@@ -2,38 +2,36 @@ import { mongo } from '@powersync/lib-service-mongodb';
2
2
  import { CheckpointChanges, GetCheckpointChangesOptions, InternalOpId, storage, utils } from '@powersync/service-core';
3
3
  import { ParameterLookupRows, ScopedParameterLookup } from '@powersync/service-sync-rules';
4
4
  import { MongoBucketStorage } from '../../MongoBucketStorage.js';
5
- import { MongoSyncBucketStorageCheckpoint, MongoSyncBucketStorageContext } from '../common/MongoSyncBucketStorageContext.js';
6
- import { MongoBucketBatchOptions } from '../MongoBucketBatch.js';
5
+ import { MongoSyncBucketStorageCheckpoint } from '../common/MongoSyncBucketStorageCheckpoint.js';
7
6
  import { MongoChecksums } from '../MongoChecksums.js';
8
7
  import { MongoCompactOptions, MongoCompactor } from '../MongoCompactor.js';
9
8
  import { MongoParameterCompactor } from '../MongoParameterCompactor.js';
10
- import { MongoPersistedSyncRulesContentV1 } from '../MongoPersistedSyncRulesContent.js';
9
+ import { MongoPersistedReplicationStream } from '../MongoPersistedReplicationStream.js';
11
10
  import { MongoSyncBucketStorage, MongoSyncBucketStorageOptions } from '../MongoSyncBucketStorage.js';
12
11
  import { MongoChecksumsV1 } from './MongoChecksumsV1.js';
13
12
  import { VersionedPowerSyncMongoV1 } from './VersionedPowerSyncMongoV1.js';
13
+ export interface MongoSyncBucketStorageContextV1 {
14
+ db: VersionedPowerSyncMongoV1;
15
+ replicationStreamId: number;
16
+ }
14
17
  export declare class MongoSyncBucketStorageV1 extends MongoSyncBucketStorage {
15
18
  readonly db: VersionedPowerSyncMongoV1;
16
19
  readonly checksums: MongoChecksumsV1;
17
- constructor(factory: MongoBucketStorage, group_id: number, sync_rules: MongoPersistedSyncRulesContentV1, slot_name: string, writeCheckpointMode: storage.WriteCheckpointMode | undefined, options: MongoSyncBucketStorageOptions);
20
+ constructor(factory: MongoBucketStorage, replicationStreamId: number, replicationStream: MongoPersistedReplicationStream, replicationStreamName: string, writeCheckpointMode: storage.WriteCheckpointMode | undefined, options: MongoSyncBucketStorageOptions);
18
21
  protected initializeVersionStorage(): Promise<void>;
19
- protected createWriterImpl(batchOptions: MongoBucketBatchOptions): storage.BucketStorageBatch;
22
+ protected fetchPersistedOpHead(): Promise<InternalOpId | null>;
23
+ protected createWriterImpl(options: storage.CreateWriterOptions): Promise<storage.BucketStorageBatch>;
20
24
  protected fetchCheckpointState(session: mongo.ClientSession): Promise<{
21
25
  checkpoint: bigint;
22
26
  lsn: string | null;
23
27
  } | null>;
24
- protected getWriterSyncState(): Promise<{
25
- lastCheckpointLsn: string | null;
26
- resumeFromLsn: string | null;
27
- keepaliveOp: bigint | null;
28
- syncConfigId: null;
29
- }>;
30
28
  protected terminateSyncRuleState(): Promise<void>;
31
- protected getStatusImpl(): Promise<storage.SyncRuleStatus>;
29
+ protected getStatusImpl(): Promise<storage.ReplicationStreamStatus>;
32
30
  protected clearSyncRuleState(): Promise<void>;
33
31
  protected createMongoChecksums(options: MongoSyncBucketStorageOptions): MongoChecksums;
34
32
  createMongoCompactor(options: MongoCompactOptions): MongoCompactor;
35
33
  protected createMongoParameterCompactor(checkpoint: InternalOpId, options: storage.CompactOptions): MongoParameterCompactor;
36
- protected get versionContext(): MongoSyncBucketStorageContext<VersionedPowerSyncMongoV1>;
34
+ protected get versionContext(): MongoSyncBucketStorageContextV1;
37
35
  protected getParameterSetsImpl(checkpoint: MongoSyncBucketStorageCheckpoint, lookups: ScopedParameterLookup[], limit: number): Promise<ParameterLookupRows[]>;
38
36
  protected getBucketDataBatchImpl(checkpoint: utils.InternalOpId, dataBuckets: storage.BucketDataRequest[], options?: storage.BucketDataBatchOptions): AsyncIterable<storage.SyncBucketDataChunk>;
39
37
  protected clearBucketData(signal?: AbortSignal): Promise<void>;
@@ -44,7 +42,7 @@ export declare class MongoSyncBucketStorageV1 extends MongoSyncBucketStorage {
44
42
  protected getDataBucketChangesImpl(options: GetCheckpointChangesOptions): Promise<Pick<CheckpointChanges, 'updatedDataBuckets' | 'invalidateDataBuckets'>>;
45
43
  protected getParameterBucketChangesImpl(options: GetCheckpointChangesOptions): Promise<Pick<CheckpointChanges, 'updatedParameterLookups' | 'invalidateParameterBuckets'>>;
46
44
  }
47
- export declare function getParameterSetsV1(ctx: MongoSyncBucketStorageContext<VersionedPowerSyncMongoV1>, checkpoint: MongoSyncBucketStorageCheckpoint, lookups: ScopedParameterLookup[], limit: number): Promise<ParameterLookupRows[]>;
48
- export declare function getBucketDataBatchV1(ctx: MongoSyncBucketStorageContext<VersionedPowerSyncMongoV1>, checkpoint: utils.InternalOpId, dataBuckets: storage.BucketDataRequest[], options?: storage.BucketDataBatchOptions): AsyncIterable<storage.SyncBucketDataChunk>;
49
- export declare function getDataBucketChangesV1(ctx: MongoSyncBucketStorageContext<VersionedPowerSyncMongoV1>, options: GetCheckpointChangesOptions): Promise<Pick<CheckpointChanges, 'updatedDataBuckets' | 'invalidateDataBuckets'>>;
50
- export declare function getParameterBucketChangesV1(ctx: MongoSyncBucketStorageContext<VersionedPowerSyncMongoV1>, options: GetCheckpointChangesOptions): Promise<Pick<CheckpointChanges, 'updatedParameterLookups' | 'invalidateParameterBuckets'>>;
45
+ export declare function getParameterSetsV1(ctx: MongoSyncBucketStorageContextV1, checkpoint: MongoSyncBucketStorageCheckpoint, lookups: ScopedParameterLookup[], limit: number): Promise<ParameterLookupRows[]>;
46
+ export declare function getBucketDataBatchV1(ctx: MongoSyncBucketStorageContextV1, checkpoint: utils.InternalOpId, dataBuckets: storage.BucketDataRequest[], options?: storage.BucketDataBatchOptions): AsyncIterable<storage.SyncBucketDataChunk>;
47
+ export declare function getDataBucketChangesV1(ctx: MongoSyncBucketStorageContextV1, options: GetCheckpointChangesOptions): Promise<Pick<CheckpointChanges, 'updatedDataBuckets' | 'invalidateDataBuckets'>>;
48
+ export declare function getParameterBucketChangesV1(ctx: MongoSyncBucketStorageContextV1, options: GetCheckpointChangesOptions): Promise<Pick<CheckpointChanges, 'updatedParameterLookups' | 'invalidateParameterBuckets'>>;
@@ -11,15 +11,34 @@ import { MongoChecksumsV1 } from './MongoChecksumsV1.js';
11
11
  import { MongoCompactorV1 } from './MongoCompactorV1.js';
12
12
  import { MongoParameterCompactorV1 } from './MongoParameterCompactorV1.js';
13
13
  export class MongoSyncBucketStorageV1 extends MongoSyncBucketStorage {
14
- constructor(factory, group_id, sync_rules, slot_name, writeCheckpointMode, options) {
15
- super(factory, group_id, sync_rules, slot_name, writeCheckpointMode, options);
14
+ constructor(factory, replicationStreamId, replicationStream, replicationStreamName, writeCheckpointMode, options) {
15
+ super(factory, replicationStreamId, replicationStream, replicationStreamName, writeCheckpointMode, options);
16
16
  }
17
17
  async initializeVersionStorage() { }
18
- createWriterImpl(batchOptions) {
19
- return new MongoBucketBatchV1(batchOptions);
18
+ async fetchPersistedOpHead() {
19
+ const doc = (await this.db.sync_rules.findOne({ _id: this.replicationStreamId }, { projection: { keepalive_op: 1, last_checkpoint: 1 } }));
20
+ // keepalive_op covers ops not yet in a checkpoint (cleared once checkpointed),
21
+ // so the head is the max of the two.
22
+ const keepaliveOp = doc?.keepalive_op == null ? null : BigInt(doc.keepalive_op);
23
+ const lastCheckpoint = doc?.last_checkpoint ?? null;
24
+ if (keepaliveOp == null && lastCheckpoint == null) {
25
+ return null;
26
+ }
27
+ return (keepaliveOp ?? 0n) > (lastCheckpoint ?? 0n) ? keepaliveOp : lastCheckpoint;
28
+ }
29
+ async createWriterImpl(options) {
30
+ const doc = (await this.db.sync_rules.findOne({
31
+ _id: this.replicationStreamId
32
+ }, { projection: { last_checkpoint_lsn: 1, keepalive_op: 1, snapshot_lsn: 1 } }));
33
+ return new MongoBucketBatchV1({
34
+ ...this.writerBatchOptions(options),
35
+ // Resume from the last consistent checkpoint, or the in-progress snapshot position if it is newer.
36
+ resumeFromLsn: maxLsn(doc?.last_checkpoint_lsn, doc?.snapshot_lsn),
37
+ keepaliveOp: doc?.keepalive_op ? BigInt(doc.keepalive_op) : null
38
+ });
20
39
  }
21
40
  async fetchCheckpointState(session) {
22
- const doc = (await this.db.sync_rules.findOne({ _id: this.group_id }, {
41
+ const doc = (await this.db.sync_rules.findOne({ _id: this.replicationStreamId }, {
23
42
  session,
24
43
  projection: { _id: 1, state: 1, last_checkpoint: 1, last_checkpoint_lsn: 1, snapshot_done: 1 }
25
44
  }));
@@ -31,21 +50,9 @@ export class MongoSyncBucketStorageV1 extends MongoSyncBucketStorage {
31
50
  lsn: doc.last_checkpoint_lsn ?? null
32
51
  };
33
52
  }
34
- async getWriterSyncState() {
35
- const doc = (await this.db.sync_rules.findOne({
36
- _id: this.group_id
37
- }, { projection: { last_checkpoint_lsn: 1, keepalive_op: 1, snapshot_lsn: 1 } }));
38
- const checkpointLsn = doc?.last_checkpoint_lsn ?? null;
39
- return {
40
- lastCheckpointLsn: checkpointLsn,
41
- resumeFromLsn: maxLsn(checkpointLsn, doc?.snapshot_lsn),
42
- keepaliveOp: doc?.keepalive_op ? BigInt(doc.keepalive_op) : null,
43
- syncConfigId: null
44
- };
45
- }
46
53
  async terminateSyncRuleState() {
47
54
  await this.db.sync_rules.updateOne({
48
- _id: this.group_id
55
+ _id: this.replicationStreamId
49
56
  }, {
50
57
  $set: {
51
58
  state: storage.SyncRuleState.TERMINATED,
@@ -56,30 +63,25 @@ export class MongoSyncBucketStorageV1 extends MongoSyncBucketStorage {
56
63
  }
57
64
  async getStatusImpl() {
58
65
  const doc = (await this.db.sync_rules.findOne({
59
- _id: this.group_id
66
+ _id: this.replicationStreamId
60
67
  }, {
61
68
  projection: {
62
69
  snapshot_done: 1,
63
70
  last_checkpoint_lsn: 1,
64
- state: 1,
65
- snapshot_lsn: 1,
66
- keepalive_op: 1
71
+ snapshot_lsn: 1
67
72
  }
68
73
  }));
69
74
  if (doc == null) {
70
75
  throw new ServiceAssertionError('Cannot find replication stream status');
71
76
  }
72
77
  return {
73
- snapshot_done: doc.snapshot_done,
74
- snapshot_lsn: doc.snapshot_lsn ?? null,
75
- active: doc.state == storage.SyncRuleState.ACTIVE,
76
- checkpoint_lsn: doc.last_checkpoint_lsn,
77
- keepalive_op: doc.keepalive_op == null ? null : BigInt(doc.keepalive_op)
78
+ snapshotDone: doc.snapshot_done && doc.last_checkpoint_lsn != null,
79
+ resumeLsn: maxLsn(doc.snapshot_lsn, doc.last_checkpoint_lsn)
78
80
  };
79
81
  }
80
82
  async clearSyncRuleState() {
81
83
  await this.db.sync_rules.updateOne({
82
- _id: this.group_id
84
+ _id: this.replicationStreamId
83
85
  }, {
84
86
  $set: {
85
87
  snapshot_done: false,
@@ -94,23 +96,21 @@ export class MongoSyncBucketStorageV1 extends MongoSyncBucketStorage {
94
96
  }, { maxTimeMS: lib_mongo.db.MONGO_CLEAR_OPERATION_TIMEOUT_MS });
95
97
  }
96
98
  createMongoChecksums(options) {
97
- return new MongoChecksumsV1(this.db, this.group_id, {
99
+ return new MongoChecksumsV1(this.db, this.replicationStreamId, {
98
100
  ...options.checksumOptions,
99
- storageConfig: options?.storageConfig,
100
- mapping: this.sync_rules.mapping
101
+ storageConfig: options?.storageConfig
101
102
  });
102
103
  }
103
104
  createMongoCompactor(options) {
104
105
  return new MongoCompactorV1(this, this.db, options);
105
106
  }
106
107
  createMongoParameterCompactor(checkpoint, options) {
107
- return new MongoParameterCompactorV1(this.db, this.group_id, checkpoint, options);
108
+ return new MongoParameterCompactorV1(this.db, this.replicationStreamId, checkpoint, options);
108
109
  }
109
110
  get versionContext() {
110
111
  return {
111
112
  db: this.db,
112
- group_id: this.group_id,
113
- mapping: this.mapping
113
+ replicationStreamId: this.replicationStreamId
114
114
  };
115
115
  }
116
116
  getParameterSetsImpl(checkpoint, lookups, limit) {
@@ -121,27 +121,27 @@ export class MongoSyncBucketStorageV1 extends MongoSyncBucketStorage {
121
121
  }
122
122
  async clearBucketData(signal) {
123
123
  await this.clearDeleteMany('bucket data', () => this.db.bucket_data.deleteMany({
124
- _id: idPrefixFilter({ g: this.group_id }, ['b', 'o'])
124
+ _id: idPrefixFilter({ g: this.replicationStreamId }, ['b', 'o'])
125
125
  }, { maxTimeMS: lib_mongo.db.MONGO_CLEAR_OPERATION_TIMEOUT_MS }), signal);
126
126
  }
127
127
  async clearParameterIndexes(signal) {
128
128
  await this.clearDeleteMany('parameter index', () => this.db.parameterIndexV1.deleteMany({
129
- 'key.g': this.group_id
129
+ 'key.g': this.replicationStreamId
130
130
  }, { maxTimeMS: lib_mongo.db.MONGO_CLEAR_OPERATION_TIMEOUT_MS }), signal);
131
131
  }
132
132
  async clearSourceRecords(signal) {
133
133
  await this.clearDeleteMany('source records', () => this.db.sourceRecordsV1.deleteMany({
134
- _id: idPrefixFilter({ g: this.group_id }, ['t', 'k'])
134
+ _id: idPrefixFilter({ g: this.replicationStreamId }, ['t', 'k'])
135
135
  }, { maxTimeMS: lib_mongo.db.MONGO_CLEAR_OPERATION_TIMEOUT_MS }), signal);
136
136
  }
137
137
  async clearBucketState(signal) {
138
138
  await this.clearDeleteMany('bucket state', () => this.db.bucketStateV1.deleteMany({
139
- _id: idPrefixFilter({ g: this.group_id }, ['b'])
139
+ _id: idPrefixFilter({ g: this.replicationStreamId }, ['b'])
140
140
  }, { maxTimeMS: lib_mongo.db.MONGO_CLEAR_OPERATION_TIMEOUT_MS }), signal);
141
141
  }
142
142
  async clearSourceTables(signal) {
143
- await this.clearDeleteMany('source tables', () => this.db.commonSourceTables(this.group_id).deleteMany({
144
- group_id: this.group_id
143
+ await this.clearDeleteMany('source tables', () => this.db.sourceTablesV1(this.replicationStreamId).deleteMany({
144
+ group_id: this.replicationStreamId
145
145
  }, { maxTimeMS: lib_mongo.db.MONGO_CLEAR_OPERATION_TIMEOUT_MS }), signal);
146
146
  }
147
147
  getDataBucketChangesImpl(options) {
@@ -161,7 +161,7 @@ export async function getParameterSetsV1(ctx, checkpoint, lookups, limit) {
161
161
  .aggregate([
162
162
  {
163
163
  $match: {
164
- 'key.g': ctx.group_id,
164
+ 'key.g': ctx.replicationStreamId,
165
165
  lookup: { $in: lookupFilter },
166
166
  _id: { $lte: checkpoint.checkpoint }
167
167
  }
@@ -227,12 +227,12 @@ export async function* getBucketDataBatchV1(ctx, checkpoint, dataBuckets, option
227
227
  filters.push({
228
228
  _id: {
229
229
  $gt: {
230
- g: ctx.group_id,
230
+ g: ctx.replicationStreamId,
231
231
  b: name,
232
232
  o: start
233
233
  },
234
234
  $lte: {
235
- g: ctx.group_id,
235
+ g: ctx.replicationStreamId,
236
236
  b: name,
237
237
  o: end
238
238
  }
@@ -241,6 +241,8 @@ export async function* getBucketDataBatchV1(ctx, checkpoint, dataBuckets, option
241
241
  }
242
242
  const batchLimit = options?.limit ?? storage.DEFAULT_DOCUMENT_BATCH_LIMIT;
243
243
  const chunkSizeLimitBytes = options?.chunkLimitBytes ?? storage.DEFAULT_DOCUMENT_CHUNK_LIMIT_BYTES;
244
+ // raw: true returns Buffers, but the driver typing doesn't reflect that
245
+ // without an explicit cast to FindCursor<Buffer>.
244
246
  const cursor = ctx.db.bucket_data.find({
245
247
  $or: filters
246
248
  }, {
@@ -310,7 +312,7 @@ export async function getDataBucketChangesV1(ctx, options) {
310
312
  const limit = 1000;
311
313
  const bucketStateUpdates = await ctx.db.bucketStateV1
312
314
  .find({
313
- '_id.g': ctx.group_id,
315
+ '_id.g': ctx.replicationStreamId,
314
316
  last_op: { $gt: options.lastCheckpoint.checkpoint }
315
317
  }, {
316
318
  projection: {
@@ -333,7 +335,7 @@ export async function getParameterBucketChangesV1(ctx, options) {
333
335
  const parameterUpdates = await ctx.db.parameterIndexV1
334
336
  .find({
335
337
  _id: { $gt: options.lastCheckpoint.checkpoint, $lte: options.nextCheckpoint.checkpoint },
336
- 'key.g': ctx.group_id
338
+ 'key.g': ctx.replicationStreamId
337
339
  }, {
338
340
  projection: {
339
341
  lookup: 1
@@ -1 +1 @@
1
- {"version":3,"file":"MongoSyncBucketStorageV1.js","sourceRoot":"","sources":["../../../../src/storage/implementation/v1/MongoSyncBucketStorageV1.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MongoSyncBucketStorageV1.js","sourceRoot":"","sources":["../../../../src/storage/implementation/v1/MongoSyncBucketStorageV1.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,12 @@
1
1
  import { mongo } from '@powersync/lib-service-mongodb';
2
2
  import { BaseVersionedPowerSyncMongo } from '../common/VersionedPowerSyncMongoBase.js';
3
3
  import { CommonSourceTableDocument } from '../models.js';
4
- import { BucketDataDocumentV1, BucketParameterDocument, BucketStateDocumentV1, CurrentDataDocument } from './models.js';
4
+ import { BucketDataDocumentV1, BucketParameterDocument, BucketStateDocumentV1, CurrentDataDocument, SourceTableDocumentV1 } from './models.js';
5
5
  export declare class VersionedPowerSyncMongoV1 extends BaseVersionedPowerSyncMongo {
6
6
  get sourceRecordsV1(): mongo.Collection<CurrentDataDocument>;
7
7
  get bucketStateV1(): mongo.Collection<BucketStateDocumentV1>;
8
8
  commonSourceTables(_replicationStreamId: number): mongo.Collection<CommonSourceTableDocument>;
9
+ sourceTablesV1(_replicationStreamId: number): mongo.Collection<SourceTableDocumentV1>;
9
10
  initializeStreamStorage(_replicationStreamId: number): Promise<void>;
10
11
  get bucketDataV1(): mongo.Collection<BucketDataDocumentV1>;
11
12
  get parameterIndexV1(): mongo.Collection<BucketParameterDocument>;
@@ -9,6 +9,9 @@ export class VersionedPowerSyncMongoV1 extends BaseVersionedPowerSyncMongo {
9
9
  commonSourceTables(_replicationStreamId) {
10
10
  return this.upstream.source_tables;
11
11
  }
12
+ sourceTablesV1(_replicationStreamId) {
13
+ return this.upstream.source_tables;
14
+ }
12
15
  async initializeStreamStorage(_replicationStreamId) { }
13
16
  get bucketDataV1() {
14
17
  return this.upstream.bucket_data;
@@ -1 +1 @@
1
- {"version":3,"file":"VersionedPowerSyncMongoV1.js","sourceRoot":"","sources":["../../../../src/storage/implementation/v1/VersionedPowerSyncMongoV1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AAIvF,MAAM,OAAO,yBAA0B,SAAQ,2BAA2B;IACxE,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,kBAAkB,CAAC,oBAA4B;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAmE,CAAC;IAC3F,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,oBAA4B,IAAkB,CAAC;IAE7E,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;IACnC,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IACzC,CAAC;CACF"}
1
+ {"version":3,"file":"VersionedPowerSyncMongoV1.js","sourceRoot":"","sources":["../../../../src/storage/implementation/v1/VersionedPowerSyncMongoV1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AAUvF,MAAM,OAAO,yBAA0B,SAAQ,2BAA2B;IACxE,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,kBAAkB,CAAC,oBAA4B;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAmE,CAAC;IAC3F,CAAC;IAED,cAAc,CAAC,oBAA4B;QACzC,OAAO,IAAI,CAAC,QAAQ,CAAC,aAA+D,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,oBAA4B,IAAkB,CAAC;IAE7E,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;IACnC,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IACzC,CAAC;CACF"}
@@ -27,7 +27,7 @@ export declare function taggedBucketParameterDocumentToV1(document: TaggedBucket
27
27
  export interface SourceTableDocumentV1 extends SourceTableDocument {
28
28
  group_id: number;
29
29
  }
30
- export interface SyncRuleDocumentV1 extends SyncRuleDocumentBase, SyncRuleCheckpointFields<string | null> {
30
+ export interface SyncRuleDocumentV1 extends SyncRuleDocumentBase, SyncRuleCheckpointFields {
31
31
  content: string;
32
32
  serialized_plan?: SerializedSyncPlan | null;
33
33
  /**
@@ -36,6 +36,15 @@ export interface SyncRuleDocumentV1 extends SyncRuleDocumentBase, SyncRuleCheckp
36
36
  * Can only be false if state == PROCESSING.
37
37
  */
38
38
  snapshot_done: boolean;
39
+ /**
40
+ * Goes together with no_checkpoint_before.
41
+ *
42
+ * If a keepalive is triggered that creates the checkpoint > no_checkpoint_before,
43
+ * then the checkpoint must be equal to this keepalive_op.
44
+ *
45
+ * string for legacy reasons - it's always a number.
46
+ */
47
+ keepalive_op: string | null;
39
48
  }
40
49
  export interface BucketStateDocumentV1 extends BucketStateDocumentBase {
41
50
  _id: BucketStateDocumentBase['_id'] & {
@@ -1,3 +1,4 @@
1
+ import * as lib_mongo from '@powersync/lib-service-mongodb';
1
2
  import { storage } from '@powersync/service-core';
2
3
  import { MongoBucketBatch, MongoBucketBatchOptions } from '../MongoBucketBatch.js';
3
4
  import { PersistedBatch } from '../common/PersistedBatch.js';
@@ -6,16 +7,19 @@ import { VersionedPowerSyncMongoV3 } from './VersionedPowerSyncMongoV3.js';
6
7
  export declare class MongoBucketBatchV3 extends MongoBucketBatch {
7
8
  readonly db: VersionedPowerSyncMongoV3;
8
9
  private readonly store;
9
- private readonly syncConfigId;
10
+ private readonly syncConfigIds;
10
11
  private needsActivationV3;
11
12
  private lastWaitingLogThrottledV3;
12
13
  constructor(options: MongoBucketBatchOptions);
13
14
  protected createPersistedBatch(writtenSize: number): PersistedBatch;
14
15
  protected get sourceRecordStore(): SourceRecordStore;
16
+ protected onReplicationTransactionFlush(session: lib_mongo.mongo.ClientSession, lastOp: bigint): Promise<void>;
17
+ private selectedSyncConfigObjectIds;
18
+ private relevantSyncConfigIds;
19
+ private relevantSyncConfigIdsForTables;
20
+ private snapshotBlockingSourceTablesFilter;
15
21
  protected cleanupDroppedSourceTables(sourceTables: storage.SourceTable[]): Promise<void>;
16
22
  resolveTables(options: storage.ResolveTablesOptions): Promise<storage.ResolveTablesResult>;
17
- private sourceTableFromDocument;
18
- private sourceTableMembershipsFromDocument;
19
23
  getSourceTableStatus(table: storage.SourceTable): Promise<storage.SourceTable | null>;
20
24
  commit(lsn: string, options?: storage.BucketBatchCommitOptions): Promise<storage.CheckpointResult>;
21
25
  keepalive(lsn: string): Promise<storage.CheckpointResult>;
@@ -25,6 +29,6 @@ export declare class MongoBucketBatchV3 extends MongoBucketBatch {
25
29
  markSnapshotDone(no_checkpoint_before_lsn: string, options?: {
26
30
  throwOnConflict?: boolean;
27
31
  }): Promise<void>;
28
- markTableSnapshotRequired(_table: storage.SourceTable): Promise<void>;
32
+ markTableSnapshotRequired(table: storage.SourceTable): Promise<void>;
29
33
  markTableSnapshotDone(tables: storage.SourceTable[], no_checkpoint_before_lsn?: string): Promise<storage.SourceTable[]>;
30
34
  }