@syncular/relay 0.0.1-73 → 0.0.1-89
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/dist/client-role/forward-engine.d.ts.map +1 -1
- package/dist/client-role/forward-engine.js +1 -7
- package/dist/client-role/forward-engine.js.map +1 -1
- package/dist/client-role/index.js +3 -3
- package/dist/client-role/pull-engine.d.ts.map +1 -1
- package/dist/client-role/pull-engine.js +24 -10
- package/dist/client-role/pull-engine.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +8 -8
- package/dist/mode-manager.js +1 -1
- package/dist/mode-manager.js.map +1 -1
- package/dist/relay.d.ts +3 -2
- package/dist/relay.d.ts.map +1 -1
- package/dist/relay.js +29 -25
- package/dist/relay.js.map +1 -1
- package/dist/server-role/index.d.ts.map +1 -1
- package/dist/server-role/index.js +3 -6
- package/dist/server-role/index.js.map +1 -1
- package/dist/server-role/push.d.ts.map +1 -1
- package/dist/server-role/push.js +23 -27
- package/dist/server-role/push.js.map +1 -1
- package/package.json +1 -1
- package/src/__tests__/relay.test.ts +317 -0
- package/src/client-role/forward-engine.ts +1 -10
- package/src/client-role/pull-engine.ts +32 -12
- package/src/index.ts +1 -1
- package/src/mode-manager.ts +1 -1
- package/src/relay.ts +25 -22
- package/src/server-role/index.ts +1 -4
- package/src/server-role/push.ts +26 -33
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forward-engine.d.ts","sourceRoot":"","sources":["../../src/client-role/forward-engine.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAGV,aAAa,EACd,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"forward-engine.d.ts","sourceRoot":"","sources":["../../src/client-role/forward-engine.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAGV,aAAa,EACd,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,KAAK,EACV,oBAAoB,EAEpB,aAAa,EAEd,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,oBAAoB,CACnC,EAAE,SAAS,aAAa,GAAG,aAAa;IAExC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,SAAS,EAAE,aAAa,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;IACnC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACtD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC;AAED;;GAEG;AACH,qBAAa,aAAa,CAAC,EAAE,SAAS,aAAa,GAAG,aAAa;IACjE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAa;IAChC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqB;IACpD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAA2C;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAyB;IAElD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAA8C;IAE3D,OAAO,CAAC,eAAe,CAAS;IAEhC,YAAY,OAAO,EAAE,oBAAoB,CAAC,EAAE,CAAC,EAQ5C;IAED;;OAEG;IACH,KAAK,IAAI,IAAI,CAIZ;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,CAMX;IAED;;OAEG;IACH,MAAM,IAAI,IAAI,CAQb;IAED;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAEpC;IAED,OAAO,CAAC,YAAY;YAoBN,UAAU;YAsDV,eAAe;YAgEf,WAAW;YAcX,WAAW;YAUX,aAAa;YAmBb,UAAU;YAkBV,cAAc;CAsC7B"}
|
|
@@ -4,14 +4,8 @@
|
|
|
4
4
|
* Forwards commits from the relay's local outbox to the main server.
|
|
5
5
|
* Preserves original client_id + client_commit_id for idempotency.
|
|
6
6
|
*/
|
|
7
|
+
import { randomId } from '@syncular/core';
|
|
7
8
|
import { sql } from 'kysely';
|
|
8
|
-
function randomId() {
|
|
9
|
-
if (typeof crypto !== 'undefined' &&
|
|
10
|
-
typeof crypto.randomUUID === 'function') {
|
|
11
|
-
return crypto.randomUUID();
|
|
12
|
-
}
|
|
13
|
-
return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
|
|
14
|
-
}
|
|
15
9
|
/**
|
|
16
10
|
* Forward engine for sending local commits to the main server.
|
|
17
11
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forward-engine.js","sourceRoot":"","sources":["../../src/client-role/forward-engine.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"forward-engine.js","sourceRoot":"","sources":["../../src/client-role/forward-engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Components for the relay's role as a client to the main server.
|
|
5
5
|
*/
|
|
6
|
-
export * from './forward-engine';
|
|
7
|
-
export * from './pull-engine';
|
|
8
|
-
export * from './sequence-mapper';
|
|
6
|
+
export * from './forward-engine.js';
|
|
7
|
+
export * from './pull-engine.js';
|
|
8
|
+
export * from './sequence-mapper.js';
|
|
9
9
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull-engine.d.ts","sourceRoot":"","sources":["../../src/client-role/pull-engine.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,WAAW,EAIX,aAAa,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,KAAK,MAAM,EAAO,MAAM,QAAQ,CAAC;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,EAAE,SAAS,aAAa,GAAG,aAAa;IACzE,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC;IAC3B,SAAS,EAAE,aAAa,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,6BAA6B;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,qCAAqC;IACrC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC1B,cAAc,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;IACnC,QAAQ,EAAE,aAAa,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAED;;GAEG;AACH,qBAAa,UAAU,CAAC,EAAE,SAAS,aAAa,GAAG,aAAa;IAC9D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAa;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqB;IACpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAsB;IAEtD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,OAAO,CAA6B;IAE5C,YAAY,OAAO,EAAE,iBAAiB,CAAC,EAAE,CAAC,EAazC;IAED;;OAEG;IACH,KAAK,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"pull-engine.d.ts","sourceRoot":"","sources":["../../src/client-role/pull-engine.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,WAAW,EAIX,aAAa,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EAAE,KAAK,MAAM,EAAO,MAAM,QAAQ,CAAC;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,EAAE,SAAS,aAAa,GAAG,aAAa;IACzE,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC;IAC3B,SAAS,EAAE,aAAa,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,6BAA6B;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,qCAAqC;IACrC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC1B,cAAc,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;IACnC,QAAQ,EAAE,aAAa,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AAED;;GAEG;AACH,qBAAa,UAAU,CAAC,EAAE,SAAS,aAAa,GAAG,aAAa;IAC9D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAa;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAC3C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqB;IACpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IACzC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAsB;IAEtD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,OAAO,CAA6B;IAE5C,YAAY,OAAO,EAAE,iBAAiB,CAAC,EAAE,CAAC,EAazC;IAED;;OAEG;IACH,KAAK,IAAI,IAAI,CAcZ;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,CAMX;IAED;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAEjC;YAEa,WAAW;YA0BX,WAAW;IAezB,OAAO,CAAC,YAAY;YAmBN,UAAU;YAqFV,kBAAkB;CA6DjC"}
|
|
@@ -46,8 +46,14 @@ export class PullEngine {
|
|
|
46
46
|
if (this.running)
|
|
47
47
|
return;
|
|
48
48
|
this.running = true;
|
|
49
|
-
this.loadCursors()
|
|
50
|
-
|
|
49
|
+
void this.loadCursors()
|
|
50
|
+
.catch((error) => {
|
|
51
|
+
this.onError?.(error instanceof Error ? error : new Error(String(error)));
|
|
52
|
+
})
|
|
53
|
+
.finally(() => {
|
|
54
|
+
if (this.running) {
|
|
55
|
+
this.scheduleNext(0);
|
|
56
|
+
}
|
|
51
57
|
});
|
|
52
58
|
}
|
|
53
59
|
/**
|
|
@@ -159,15 +165,21 @@ export class PullEngine {
|
|
|
159
165
|
continue;
|
|
160
166
|
const table = sub.id;
|
|
161
167
|
// Process commits
|
|
168
|
+
let canAdvanceCursor = true;
|
|
162
169
|
for (const commit of sub.commits) {
|
|
163
|
-
const
|
|
164
|
-
if (applied) {
|
|
170
|
+
const outcome = await this.applyCommitLocally(commit, table);
|
|
171
|
+
if (outcome === 'applied') {
|
|
165
172
|
hasChanges = true;
|
|
166
173
|
affectedTables.add(table);
|
|
167
174
|
}
|
|
175
|
+
if (outcome === 'rejected') {
|
|
176
|
+
canAdvanceCursor = false;
|
|
177
|
+
break;
|
|
178
|
+
}
|
|
168
179
|
}
|
|
169
180
|
// Update cursor
|
|
170
|
-
if (
|
|
181
|
+
if (canAdvanceCursor &&
|
|
182
|
+
sub.nextCursor > (this.cursors.get(table) ?? -1)) {
|
|
171
183
|
this.cursors.set(table, sub.nextCursor);
|
|
172
184
|
}
|
|
173
185
|
}
|
|
@@ -190,7 +202,7 @@ export class PullEngine {
|
|
|
190
202
|
*/
|
|
191
203
|
async applyCommitLocally(commit, table) {
|
|
192
204
|
if (commit.changes.length === 0)
|
|
193
|
-
return
|
|
205
|
+
return 'cached';
|
|
194
206
|
// Convert changes to operations
|
|
195
207
|
const operations = commit.changes.map((change) => ({
|
|
196
208
|
table: change.table,
|
|
@@ -218,16 +230,18 @@ export class PullEngine {
|
|
|
218
230
|
typeof result.response.commitSeq === 'number') {
|
|
219
231
|
// Record sequence mapping
|
|
220
232
|
await this.sequenceMapper.createConfirmedMapping(result.response.commitSeq, commit.commitSeq);
|
|
221
|
-
return
|
|
233
|
+
return 'applied';
|
|
222
234
|
}
|
|
223
235
|
// Already applied (cached) - that's fine
|
|
224
236
|
if (result.response.status === 'cached') {
|
|
225
|
-
return
|
|
237
|
+
return 'cached';
|
|
226
238
|
}
|
|
227
239
|
// Rejected - this shouldn't happen for pulls from main
|
|
228
|
-
//
|
|
240
|
+
// Do not advance cursor; signal error so caller can react.
|
|
241
|
+
const error = new Error(`Relay: Failed to apply commit ${commit.commitSeq} locally (status=${result.response.status})`);
|
|
229
242
|
console.warn(`Relay: Failed to apply commit ${commit.commitSeq} locally:`, result.response);
|
|
230
|
-
|
|
243
|
+
this.onError?.(error);
|
|
244
|
+
return 'rejected';
|
|
231
245
|
}
|
|
232
246
|
}
|
|
233
247
|
//# sourceMappingURL=pull-engine.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull-engine.js","sourceRoot":"","sources":["../../src/client-role/pull-engine.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAe,GAAG,EAAE,MAAM,QAAQ,CAAC;AAyB1C;;GAEG;AACH,MAAM,OAAO,UAAU;IACJ,EAAE,CAAa;IACf,OAAO,CAAoB;IAC3B,SAAS,CAAgB;IACzB,QAAQ,CAAS;IACjB,MAAM,CAAW;IACjB,MAAM,CAAc;IACpB,MAAM,CAAoB;IAC1B,cAAc,CAAqB;IACnC,QAAQ,CAAgB;IACxB,UAAU,CAAS;IACnB,OAAO,CAA0B;IACjC,cAAc,CAAuB;IAE9C,OAAO,GAAG,KAAK,CAAC;IAChB,KAAK,GAAyC,IAAI,CAAC;IACnD,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE5C,YAAY,OAA8B,EAAE;QAC1C,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,KAAK,CAAC;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;IAAA,CAC9C;IAED;;OAEG;IACH,KAAK,GAAS;QACZ,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"pull-engine.js","sourceRoot":"","sources":["../../src/client-role/pull-engine.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -21,24 +21,24 @@
|
|
|
21
21
|
* });
|
|
22
22
|
*
|
|
23
23
|
* // Mount routes for local clients
|
|
24
|
-
* app.route('/sync', relay.getRoutes());
|
|
24
|
+
* app.route('/sync', await relay.getRoutes());
|
|
25
25
|
*
|
|
26
26
|
* // Start background sync with main
|
|
27
27
|
* await relay.start();
|
|
28
28
|
* ```
|
|
29
29
|
*/
|
|
30
30
|
// Client role (syncing with main server)
|
|
31
|
-
export * from './client-role';
|
|
31
|
+
export * from './client-role/index.js';
|
|
32
32
|
// Migration
|
|
33
|
-
export * from './migrate';
|
|
33
|
+
export * from './migrate.js';
|
|
34
34
|
// Mode manager
|
|
35
|
-
export * from './mode-manager';
|
|
35
|
+
export * from './mode-manager.js';
|
|
36
36
|
// Realtime WebSocket manager
|
|
37
|
-
export * from './realtime';
|
|
37
|
+
export * from './realtime.js';
|
|
38
38
|
// Main exports
|
|
39
|
-
export * from './relay';
|
|
39
|
+
export * from './relay.js';
|
|
40
40
|
// Schema types
|
|
41
|
-
export * from './schema';
|
|
41
|
+
export * from './schema.js';
|
|
42
42
|
// Server role (serving local clients)
|
|
43
|
-
export * from './server-role';
|
|
43
|
+
export * from './server-role/index.js';
|
|
44
44
|
//# sourceMappingURL=index.js.map
|
package/dist/mode-manager.js
CHANGED
package/dist/mode-manager.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mode-manager.js","sourceRoot":"","sources":["../src/mode-manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAiBH;;;;;GAKG;AACH,MAAM,OAAO,WAAW;IACd,IAAI,GAAc,SAAS,CAAC;IAC5B,qBAAqB,CAAS;IAC9B,kBAAkB,CAAS;IAC3B,qBAAqB,CAAS;IAC9B,gBAAgB,CAAS;IACzB,YAAY,CAA6B;IAEzC,OAAO,GAAG,KAAK,CAAC;IAChB,KAAK,GAAyC,IAAI,CAAC;IACnD,aAAa,GAAoC,IAAI,CAAC;IAC9D,qGAAqG;IAC7F,mBAAmB,GAAG,CAAC,CAAC;IAEhC,YAAY,OAAO,GAAuB,EAAE,EAAE;QAC5C,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,IAAI,KAAK,CAAC;QACpE,IAAI,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,IAAI,CAAC;QAC7D,IAAI,CAAC,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,IAAI,KAAK,CAAC;QACpE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAChD,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAAA,CAC1C;IAED;;OAEG;IACH,OAAO,GAAc;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC;IAAA,CAClB;IAED;;OAEG;IACH,KAAK,CAAC,aAAqC,EAAQ;QACjD,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,oCAAoC;QACpC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAAA,CAC7B;IAED;;OAEG;IACH,IAAI,GAAS;QACX,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;IAAA,CACF;IAED;;OAEG;IACH,aAAa,GAAS;QACpB,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC3B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC;IAAA,CACjD;IAED;;OAEG;IACH,aAAa,GAAS;QACpB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAE3B,IAAI,IAAI,CAAC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"mode-manager.js","sourceRoot":"","sources":["../src/mode-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/relay.d.ts
CHANGED
|
@@ -84,7 +84,7 @@ type EventHandler<K extends keyof RelayEvents> = RelayEvents[K];
|
|
|
84
84
|
* });
|
|
85
85
|
*
|
|
86
86
|
* // Mount routes for local clients
|
|
87
|
-
* app.route('/sync', relay.getRoutes());
|
|
87
|
+
* app.route('/sync', await relay.getRoutes());
|
|
88
88
|
*
|
|
89
89
|
* // Start background sync with main
|
|
90
90
|
* await relay.start();
|
|
@@ -116,6 +116,7 @@ export declare class RelayServer<DB extends RelayDatabase = RelayDatabase> {
|
|
|
116
116
|
private started;
|
|
117
117
|
private schemaInitialized;
|
|
118
118
|
private routes;
|
|
119
|
+
private routesPromise;
|
|
119
120
|
constructor(options: RelayServerOptions<DB>);
|
|
120
121
|
/**
|
|
121
122
|
* Subscribe to relay events.
|
|
@@ -177,7 +178,7 @@ export declare class RelayServer<DB extends RelayDatabase = RelayDatabase> {
|
|
|
177
178
|
* - POST /push
|
|
178
179
|
* - GET /realtime (WebSocket)
|
|
179
180
|
*/
|
|
180
|
-
getRoutes(): Hono
|
|
181
|
+
getRoutes(): Promise<Hono>;
|
|
181
182
|
private emit;
|
|
182
183
|
}
|
|
183
184
|
/**
|
package/dist/relay.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay.d.ts","sourceRoot":"","sources":["../src/relay.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"relay.d.ts","sourceRoot":"","sources":["../src/relay.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMrC,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEpE;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,CAAC;IACtC,eAAe,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,CAAC;IAC1D,KAAK,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,EAAE,SAAS,aAAa,GAAG,aAAa;IAC1E,+BAA+B;IAC/B,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,qDAAqD;IACrD,OAAO,EAAE,iBAAiB,CAAC;IAC3B,uDAAuD;IACvD,mBAAmB,EAAE,aAAa,CAAC;IACnC,6DAA6D;IAC7D,kBAAkB,EAAE,MAAM,CAAC;IAC3B,4DAA4D;IAC5D,iBAAiB,EAAE,MAAM,CAAC;IAC1B,2DAA2D;IAC3D,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,wDAAwD;IACxD,MAAM,EAAE,WAAW,CAAC;IACpB,6CAA6C;IAC7C,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC1B,8EAA8E;IAC9E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,8EAA8E;IAC9E,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sEAAsE;IACtE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uEAAuE;IACvE,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iGAAiG;IACjG,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iGAAiG;IACjG,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,KAAK,YAAY,CAAC,CAAC,SAAS,MAAM,WAAW,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;AAEhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,WAAW,CAAC,EAAE,SAAS,aAAa,GAAG,aAAa;IAC/D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAa;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAgB;IACpD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAE3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAqB;IACpD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAoB;IAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgB;IAEzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAG1B;IAEJ,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,aAAa,CAA0C;IAE/D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,aAAa,CAA8B;IAEnD,YAAY,OAAO,EAAE,kBAAkB,CAAC,EAAE,CAAC,EAyD1C;IAED;;OAEG;IACH,EAAE,CAAC,CAAC,SAAS,MAAM,WAAW,EAC5B,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,MAAM,IAAI,CAWZ;IAED;;OAEG;IACH,OAAO,IAAI,SAAS,CAEnB;IAED;;OAEG;IACH,SAAS,IAAI,SAAS,MAAM,EAAE,CAE7B;IAED;;OAEG;IACH,SAAS,IAAI,WAAW,CAEvB;IAED;;OAEG;IACH,WAAW,IAAI,aAAa,CAE3B;IAED;;;;;;;OAOG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CA8B3B;IAED;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAQ1B;IAED;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAEpC;IAED;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC,CAEjC;IAED;;OAEG;IACG,UAAU,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAsB3E;IAED;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAuBjD;IAED;;;;;;;OAOG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAwB/B;IAED,OAAO,CAAC,IAAI;CAeb;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,CAE1E"}
|
package/dist/relay.js
CHANGED
|
@@ -8,12 +8,12 @@
|
|
|
8
8
|
* continue syncing when internet is lost.
|
|
9
9
|
*/
|
|
10
10
|
import { sql } from 'kysely';
|
|
11
|
-
import { ForwardEngine } from './client-role/forward-engine';
|
|
12
|
-
import { PullEngine } from './client-role/pull-engine';
|
|
13
|
-
import { SequenceMapper } from './client-role/sequence-mapper';
|
|
14
|
-
import { ensureRelaySchema } from './migrate';
|
|
15
|
-
import { ModeManager } from './mode-manager';
|
|
16
|
-
import { RelayRealtime } from './realtime';
|
|
11
|
+
import { ForwardEngine } from './client-role/forward-engine.js';
|
|
12
|
+
import { PullEngine } from './client-role/pull-engine.js';
|
|
13
|
+
import { SequenceMapper } from './client-role/sequence-mapper.js';
|
|
14
|
+
import { ensureRelaySchema } from './migrate.js';
|
|
15
|
+
import { ModeManager } from './mode-manager.js';
|
|
16
|
+
import { RelayRealtime } from './realtime.js';
|
|
17
17
|
/**
|
|
18
18
|
* Relay server that acts as an edge relay between local clients and a main server.
|
|
19
19
|
*
|
|
@@ -34,7 +34,7 @@ import { RelayRealtime } from './realtime';
|
|
|
34
34
|
* });
|
|
35
35
|
*
|
|
36
36
|
* // Mount routes for local clients
|
|
37
|
-
* app.route('/sync', relay.getRoutes());
|
|
37
|
+
* app.route('/sync', await relay.getRoutes());
|
|
38
38
|
*
|
|
39
39
|
* // Start background sync with main
|
|
40
40
|
* await relay.start();
|
|
@@ -66,6 +66,7 @@ export class RelayServer {
|
|
|
66
66
|
started = false;
|
|
67
67
|
schemaInitialized = false;
|
|
68
68
|
routes = null;
|
|
69
|
+
routesPromise = null;
|
|
69
70
|
constructor(options) {
|
|
70
71
|
this.db = options.db;
|
|
71
72
|
this.dialect = options.dialect;
|
|
@@ -181,7 +182,7 @@ export class RelayServer {
|
|
|
181
182
|
clientId: this.mainServerClientId,
|
|
182
183
|
pull: {
|
|
183
184
|
subscriptions: [],
|
|
184
|
-
limitCommits:
|
|
185
|
+
limitCommits: 1,
|
|
185
186
|
},
|
|
186
187
|
});
|
|
187
188
|
return true;
|
|
@@ -272,25 +273,28 @@ export class RelayServer {
|
|
|
272
273
|
* - POST /push
|
|
273
274
|
* - GET /realtime (WebSocket)
|
|
274
275
|
*/
|
|
275
|
-
getRoutes() {
|
|
276
|
+
async getRoutes() {
|
|
276
277
|
if (this.routes)
|
|
277
278
|
return this.routes;
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
279
|
+
if (this.routesPromise)
|
|
280
|
+
return this.routesPromise;
|
|
281
|
+
this.routesPromise = (async () => {
|
|
282
|
+
const { createRelayRoutes } = await import('./server-role/index.js');
|
|
283
|
+
const routes = createRelayRoutes({
|
|
284
|
+
db: this.db,
|
|
285
|
+
dialect: this.dialect,
|
|
286
|
+
shapes: this.shapes,
|
|
287
|
+
realtime: this.realtime,
|
|
288
|
+
onCommit: async (localCommitSeq, affectedTables) => {
|
|
289
|
+
this.realtime.notifyScopeKeys(affectedTables, localCommitSeq);
|
|
290
|
+
this.forwardEngine.wakeUp();
|
|
291
|
+
},
|
|
292
|
+
});
|
|
293
|
+
this.routes = routes;
|
|
294
|
+
this.routesPromise = null;
|
|
295
|
+
return routes;
|
|
296
|
+
})();
|
|
297
|
+
return this.routesPromise;
|
|
294
298
|
}
|
|
295
299
|
emit(event, ...args) {
|
|
296
300
|
const handlers = this.eventHandlers.get(event);
|
package/dist/relay.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay.js","sourceRoot":"","sources":["../src/relay.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAkB,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAyD3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,OAAO,WAAW;IACL,EAAE,CAAa;IACf,OAAO,CAAoB;IAC3B,mBAAmB,CAAgB;IACnC,kBAAkB,CAAS;IAC3B,iBAAiB,CAAS;IAC1B,MAAM,CAAW;IACjB,MAAM,CAAc;IACpB,MAAM,CAAoB;IAE1B,WAAW,CAAc;IACzB,cAAc,CAAqB;IACnC,aAAa,CAAoB;IACjC,UAAU,CAAiB;IAC3B,QAAQ,CAAgB;IAExB,aAAa,GAAG,IAAI,GAAG,EAGrC,CAAC;IAEa,eAAe,CAAS;IACxB,aAAa,CAAS;IAC/B,aAAa,GAAG,CAAC,CAAC;IAClB,aAAa,GAAqC,IAAI,CAAC;IAEvD,OAAO,GAAG,KAAK,CAAC;IAChB,iBAAiB,GAAG,KAAK,CAAC;IAC1B,MAAM,GAAgB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"relay.js","sourceRoot":"","sources":["../src/relay.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server-role/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server-role/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAYH,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAI/C;;GAEG;AACH,MAAM,WAAW,wBAAwB,CACvC,EAAE,SAAS,aAAa,GAAG,aAAa;IAExC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC;IAC3B,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC1B,QAAQ,EAAE,aAAa,CAAC;IACxB;;;OAGG;IACH,QAAQ,CAAC,EAAE,CACT,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,EAAE,KACrB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACnE;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAMD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,EAAE,SAAS,aAAa,GAAG,aAAa,EACxE,OAAO,EAAE,wBAAwB,CAAC,EAAE,CAAC,GACpC,IAAI,CAqQN"}
|
|
@@ -3,17 +3,14 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Hono routes for serving local clients.
|
|
5
5
|
*/
|
|
6
|
-
import { createSyncTimer, logSyncEvent, ScopeValuesSchema, SyncBootstrapStateSchema, SyncPullRequestSchema, SyncPushRequestSchema, } from '@syncular/core';
|
|
6
|
+
import { createSyncTimer, isRecord, logSyncEvent, ScopeValuesSchema, SyncBootstrapStateSchema, SyncPullRequestSchema, SyncPushRequestSchema, } from '@syncular/core';
|
|
7
7
|
import { recordClientCursor } from '@syncular/server';
|
|
8
8
|
import { Hono } from 'hono';
|
|
9
|
-
import { relayPull } from './pull';
|
|
10
|
-
import { relayPushCommit } from './push';
|
|
9
|
+
import { relayPull } from './pull.js';
|
|
10
|
+
import { relayPushCommit } from './push.js';
|
|
11
11
|
function clampInt(value, min, max) {
|
|
12
12
|
return Math.max(min, Math.min(max, value));
|
|
13
13
|
}
|
|
14
|
-
function isRecord(value) {
|
|
15
|
-
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
16
|
-
}
|
|
17
14
|
/**
|
|
18
15
|
* Create Hono routes for relay server-role endpoints.
|
|
19
16
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server-role/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAI5B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAuCzC,SAAS,QAAQ,CAAC,KAAa,EAAE,GAAW,EAAE,GAAW,EAAU;IACjE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;AAAA,CAC5C;AAED
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server-role/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/server-role/push.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/server-role/push.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,KAAK,MAAM,EAAO,MAAM,QAAQ,CAAC;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,EAAE,SAAS,aAAa,GAAG,aAAa,EACxC,IAAI,EAAE;IACN,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC;IAC3B,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA8B5B"}
|
package/dist/server-role/push.js
CHANGED
|
@@ -4,15 +4,9 @@
|
|
|
4
4
|
* Handles pushes from local clients, storing them locally and
|
|
5
5
|
* queueing them for forwarding to the main server.
|
|
6
6
|
*/
|
|
7
|
+
import { randomId } from '@syncular/core';
|
|
7
8
|
import { pushCommit } from '@syncular/server';
|
|
8
9
|
import { sql } from 'kysely';
|
|
9
|
-
function randomId() {
|
|
10
|
-
if (typeof crypto !== 'undefined' &&
|
|
11
|
-
typeof crypto.randomUUID === 'function') {
|
|
12
|
-
return crypto.randomUUID();
|
|
13
|
-
}
|
|
14
|
-
return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
|
|
15
|
-
}
|
|
16
10
|
/**
|
|
17
11
|
* Push a commit from a local client to the relay.
|
|
18
12
|
*
|
|
@@ -23,27 +17,29 @@ function randomId() {
|
|
|
23
17
|
*/
|
|
24
18
|
export async function relayPushCommit(args) {
|
|
25
19
|
const { request } = args;
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
// If the commit was applied, enqueue it for forwarding to main server
|
|
35
|
-
if (result.response.ok === true &&
|
|
36
|
-
result.response.status === 'applied' &&
|
|
37
|
-
typeof result.response.commitSeq === 'number') {
|
|
38
|
-
await enqueueForForwarding(args.db, {
|
|
39
|
-
localCommitSeq: result.response.commitSeq,
|
|
40
|
-
clientId: request.clientId,
|
|
41
|
-
clientCommitId: request.clientCommitId,
|
|
42
|
-
operations: request.operations,
|
|
43
|
-
schemaVersion: request.schemaVersion,
|
|
20
|
+
return args.db.transaction().execute(async (trx) => {
|
|
21
|
+
// Use the standard pushCommit - scope authorization is handled by shapes
|
|
22
|
+
const result = await pushCommit({
|
|
23
|
+
db: trx,
|
|
24
|
+
dialect: args.dialect,
|
|
25
|
+
shapes: args.shapes,
|
|
26
|
+
actorId: args.actorId,
|
|
27
|
+
request,
|
|
44
28
|
});
|
|
45
|
-
|
|
46
|
-
|
|
29
|
+
// If the commit was applied, enqueue it for forwarding to main server
|
|
30
|
+
if (result.response.ok === true &&
|
|
31
|
+
result.response.status === 'applied' &&
|
|
32
|
+
typeof result.response.commitSeq === 'number') {
|
|
33
|
+
await enqueueForForwarding(trx, {
|
|
34
|
+
localCommitSeq: result.response.commitSeq,
|
|
35
|
+
clientId: request.clientId,
|
|
36
|
+
clientCommitId: request.clientCommitId,
|
|
37
|
+
operations: request.operations,
|
|
38
|
+
schemaVersion: request.schemaVersion,
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
return result;
|
|
42
|
+
});
|
|
47
43
|
}
|
|
48
44
|
/**
|
|
49
45
|
* Enqueue a locally-committed change for forwarding to the main server.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/server-role/push.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/server-role/push.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAyB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAe,GAAG,EAAE,MAAM,QAAQ,CAAC;AAG1C;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAEnC,IAMD,EAA6B;IAC5B,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEzB,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC;QAClD,yEAAyE;QACzE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;YAC9B,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO;SACR,CAAC,CAAC;QAEH,sEAAsE;QACtE,IACE,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,IAAI;YAC3B,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,SAAS;YACpC,OAAO,MAAM,CAAC,QAAQ,CAAC,SAAS,KAAK,QAAQ,EAC7C,CAAC;YACD,MAAM,oBAAoB,CAAC,GAAG,EAAE;gBAC9B,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS;gBACzC,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,aAAa,EAAE,OAAO,CAAC,aAAa;aACrC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAAA,CACf,CAAC,CAAC;AAAA,CACJ;AAED;;GAEG;AACH,KAAK,UAAU,oBAAoB,CACjC,EAAc,EACd,IAMC,EACc;IACf,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAEvB,MAAM,GAAG,CAAA;kBACO,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC;;;;;;;;;;;;;;;;QAgB3C,QAAQ,EAAE;QACV,IAAI,CAAC,cAAc;QACnB,IAAI,CAAC,QAAQ;QACb,IAAI,CAAC,cAAc;QACnB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC;QAC/B,IAAI,CAAC,aAAa;;QAElB,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,GAAG;QACH,GAAG;QACH,CAAC;;GAEN,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEd,mDAAmD;IACnD,MAAM,GAAG,CAAA;kBACO,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC;;;;;;;cAOnC,IAAI,CAAC,cAAc,KAAK,IAAI,gBAAgB,GAAG,KAAK,GAAG;;GAElE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAAA,CACf"}
|
package/package.json
CHANGED
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
|
|
5
5
|
import Database from 'bun:sqlite';
|
|
6
6
|
import { afterEach, beforeEach, describe, expect, it } from 'bun:test';
|
|
7
|
+
import type { SyncCombinedRequest, SyncCombinedResponse } from '@syncular/core';
|
|
8
|
+
import { TableRegistry } from '@syncular/server';
|
|
7
9
|
import { createSqliteServerDialect } from '@syncular/server-dialect-sqlite';
|
|
8
10
|
import type { Dialect, QueryResult } from 'kysely';
|
|
9
11
|
import {
|
|
@@ -11,12 +13,16 @@ import {
|
|
|
11
13
|
SqliteAdapter,
|
|
12
14
|
SqliteIntrospector,
|
|
13
15
|
SqliteQueryCompiler,
|
|
16
|
+
sql,
|
|
14
17
|
} from 'kysely';
|
|
18
|
+
import { PullEngine } from '../client-role/pull-engine';
|
|
15
19
|
import { SequenceMapper } from '../client-role/sequence-mapper';
|
|
16
20
|
import { ensureRelaySchema } from '../migrate';
|
|
17
21
|
import { ModeManager, type RelayMode } from '../mode-manager';
|
|
18
22
|
import { createRelayWebSocketConnection, RelayRealtime } from '../realtime';
|
|
23
|
+
import { RelayServer } from '../relay';
|
|
19
24
|
import type { RelayDatabase } from '../schema';
|
|
25
|
+
import { relayPushCommit } from '../server-role/push';
|
|
20
26
|
|
|
21
27
|
// Helper to create in-memory SQLite database
|
|
22
28
|
function createTestDb() {
|
|
@@ -133,6 +139,317 @@ describe('ModeManager', () => {
|
|
|
133
139
|
manager.reportSuccess();
|
|
134
140
|
expect(manager.getMode()).toBe('online');
|
|
135
141
|
});
|
|
142
|
+
|
|
143
|
+
it('should transition from offline to reconnecting on initial failure', async () => {
|
|
144
|
+
const manager = new ModeManager({
|
|
145
|
+
healthCheckIntervalMs: 100,
|
|
146
|
+
reconnectBackoffMs: 50,
|
|
147
|
+
});
|
|
148
|
+
|
|
149
|
+
manager.start(async () => false);
|
|
150
|
+
await new Promise((resolve) => setTimeout(resolve, 20));
|
|
151
|
+
|
|
152
|
+
expect(manager.getMode()).toBe('reconnecting');
|
|
153
|
+
manager.stop();
|
|
154
|
+
});
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
describe('RelayServer health check', () => {
|
|
158
|
+
let db: Kysely<RelayDatabase>;
|
|
159
|
+
let sqlite: Database;
|
|
160
|
+
|
|
161
|
+
beforeEach(() => {
|
|
162
|
+
const setup = createTestDb();
|
|
163
|
+
db = setup.db;
|
|
164
|
+
sqlite = setup.sqlite;
|
|
165
|
+
});
|
|
166
|
+
|
|
167
|
+
afterEach(async () => {
|
|
168
|
+
await db.destroy();
|
|
169
|
+
sqlite.close();
|
|
170
|
+
});
|
|
171
|
+
|
|
172
|
+
it('uses a protocol-valid pull limit during startup health checks', async () => {
|
|
173
|
+
const syncCalls: SyncCombinedRequest[] = [];
|
|
174
|
+
const mainServerTransport = {
|
|
175
|
+
async sync(request: SyncCombinedRequest): Promise<SyncCombinedResponse> {
|
|
176
|
+
syncCalls.push(request);
|
|
177
|
+
return {};
|
|
178
|
+
},
|
|
179
|
+
async fetchSnapshotChunk(): Promise<Uint8Array> {
|
|
180
|
+
return new Uint8Array();
|
|
181
|
+
},
|
|
182
|
+
};
|
|
183
|
+
|
|
184
|
+
const relay = new RelayServer({
|
|
185
|
+
db,
|
|
186
|
+
dialect: createSqliteServerDialect(),
|
|
187
|
+
mainServerTransport,
|
|
188
|
+
mainServerClientId: 'relay-main-client',
|
|
189
|
+
mainServerActorId: 'relay-main-actor',
|
|
190
|
+
tables: [],
|
|
191
|
+
scopes: {},
|
|
192
|
+
shapes: new TableRegistry<RelayDatabase>(),
|
|
193
|
+
healthCheckIntervalMs: 50,
|
|
194
|
+
pullIntervalMs: 10_000,
|
|
195
|
+
forwardRetryIntervalMs: 10_000,
|
|
196
|
+
pruneIntervalMs: 0,
|
|
197
|
+
});
|
|
198
|
+
|
|
199
|
+
await relay.start();
|
|
200
|
+
await new Promise((resolve) => setTimeout(resolve, 25));
|
|
201
|
+
await relay.stop();
|
|
202
|
+
|
|
203
|
+
expect(
|
|
204
|
+
syncCalls.some(
|
|
205
|
+
(request) =>
|
|
206
|
+
request.pull?.subscriptions.length === 0 &&
|
|
207
|
+
request.pull.limitCommits === 1
|
|
208
|
+
)
|
|
209
|
+
).toBe(true);
|
|
210
|
+
});
|
|
211
|
+
});
|
|
212
|
+
|
|
213
|
+
describe('relayPushCommit atomic enqueue', () => {
|
|
214
|
+
let db: Kysely<RelayDatabase>;
|
|
215
|
+
let sqlite: Database;
|
|
216
|
+
|
|
217
|
+
beforeEach(async () => {
|
|
218
|
+
const setup = createTestDb();
|
|
219
|
+
db = setup.db;
|
|
220
|
+
sqlite = setup.sqlite;
|
|
221
|
+
await ensureRelaySchema(db, createSqliteServerDialect());
|
|
222
|
+
});
|
|
223
|
+
|
|
224
|
+
afterEach(async () => {
|
|
225
|
+
await db.destroy();
|
|
226
|
+
sqlite.close();
|
|
227
|
+
});
|
|
228
|
+
|
|
229
|
+
it('rolls back local commit when forwarding enqueue fails', async () => {
|
|
230
|
+
const now = Date.now();
|
|
231
|
+
await sql`
|
|
232
|
+
insert into ${sql.table('relay_forward_outbox')} (
|
|
233
|
+
id,
|
|
234
|
+
local_commit_seq,
|
|
235
|
+
client_id,
|
|
236
|
+
client_commit_id,
|
|
237
|
+
operations_json,
|
|
238
|
+
schema_version,
|
|
239
|
+
status,
|
|
240
|
+
main_commit_seq,
|
|
241
|
+
error,
|
|
242
|
+
last_response_json,
|
|
243
|
+
created_at,
|
|
244
|
+
updated_at,
|
|
245
|
+
attempt_count
|
|
246
|
+
)
|
|
247
|
+
values (
|
|
248
|
+
${'fixed-outbox-id'},
|
|
249
|
+
${999},
|
|
250
|
+
${'seed-client'},
|
|
251
|
+
${'seed-commit'},
|
|
252
|
+
${'[]'},
|
|
253
|
+
${1},
|
|
254
|
+
${'pending'},
|
|
255
|
+
${null},
|
|
256
|
+
${null},
|
|
257
|
+
${null},
|
|
258
|
+
${now},
|
|
259
|
+
${now},
|
|
260
|
+
${0}
|
|
261
|
+
)
|
|
262
|
+
`.execute(db);
|
|
263
|
+
|
|
264
|
+
const shapes = new TableRegistry<RelayDatabase>();
|
|
265
|
+
shapes.register({
|
|
266
|
+
table: 'tasks',
|
|
267
|
+
scopePatterns: ['user:{user_id}'],
|
|
268
|
+
resolveScopes: async () => ({ user_id: ['u1'] }),
|
|
269
|
+
extractScopes: () => ({ user_id: 'u1' }),
|
|
270
|
+
snapshot: async () => ({ rows: [], nextCursor: null }),
|
|
271
|
+
async applyOperation(_ctx, op, opIndex) {
|
|
272
|
+
return {
|
|
273
|
+
result: {
|
|
274
|
+
opIndex,
|
|
275
|
+
status: 'applied',
|
|
276
|
+
},
|
|
277
|
+
emittedChanges: [
|
|
278
|
+
{
|
|
279
|
+
table: 'tasks',
|
|
280
|
+
row_id: op.row_id,
|
|
281
|
+
op: op.op,
|
|
282
|
+
row_json: op.payload,
|
|
283
|
+
row_version: 1,
|
|
284
|
+
scopes: { user_id: 'u1' },
|
|
285
|
+
},
|
|
286
|
+
],
|
|
287
|
+
};
|
|
288
|
+
},
|
|
289
|
+
});
|
|
290
|
+
|
|
291
|
+
const originalRandomUUID = crypto.randomUUID;
|
|
292
|
+
crypto.randomUUID = () => 'fixed-outbox-id';
|
|
293
|
+
try {
|
|
294
|
+
await expect(
|
|
295
|
+
relayPushCommit({
|
|
296
|
+
db,
|
|
297
|
+
dialect: createSqliteServerDialect(),
|
|
298
|
+
shapes,
|
|
299
|
+
actorId: 'u1',
|
|
300
|
+
request: {
|
|
301
|
+
clientId: 'relay-client-1',
|
|
302
|
+
clientCommitId: 'relay-commit-1',
|
|
303
|
+
schemaVersion: 1,
|
|
304
|
+
operations: [
|
|
305
|
+
{
|
|
306
|
+
table: 'tasks',
|
|
307
|
+
row_id: 'task-1',
|
|
308
|
+
op: 'upsert',
|
|
309
|
+
payload: { id: 'task-1', title: 'hello' },
|
|
310
|
+
base_version: null,
|
|
311
|
+
},
|
|
312
|
+
],
|
|
313
|
+
},
|
|
314
|
+
})
|
|
315
|
+
).rejects.toThrow();
|
|
316
|
+
} finally {
|
|
317
|
+
crypto.randomUUID = originalRandomUUID;
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
const commitRows = await sql<{ count: number | bigint }>`
|
|
321
|
+
select count(*) as count
|
|
322
|
+
from ${sql.table('sync_commits')}
|
|
323
|
+
where ${sql.ref('client_id')} = ${'relay-client-1'}
|
|
324
|
+
and ${sql.ref('client_commit_id')} = ${'relay-commit-1'}
|
|
325
|
+
`.execute(db);
|
|
326
|
+
expect(Number(commitRows.rows[0]?.count ?? 0)).toBe(0);
|
|
327
|
+
});
|
|
328
|
+
});
|
|
329
|
+
|
|
330
|
+
describe('PullEngine cursor safety', () => {
|
|
331
|
+
let db: Kysely<RelayDatabase>;
|
|
332
|
+
let sqlite: Database;
|
|
333
|
+
|
|
334
|
+
beforeEach(async () => {
|
|
335
|
+
const setup = createTestDb();
|
|
336
|
+
db = setup.db;
|
|
337
|
+
sqlite = setup.sqlite;
|
|
338
|
+
await ensureRelaySchema(db, createSqliteServerDialect());
|
|
339
|
+
});
|
|
340
|
+
|
|
341
|
+
afterEach(async () => {
|
|
342
|
+
await db.destroy();
|
|
343
|
+
sqlite.close();
|
|
344
|
+
});
|
|
345
|
+
|
|
346
|
+
it('does not advance cursor when a pulled commit is rejected locally', async () => {
|
|
347
|
+
const syncCalls: SyncCombinedRequest[] = [];
|
|
348
|
+
const transport = {
|
|
349
|
+
async sync(request: SyncCombinedRequest): Promise<SyncCombinedResponse> {
|
|
350
|
+
syncCalls.push(request);
|
|
351
|
+
return {
|
|
352
|
+
pull: {
|
|
353
|
+
ok: true,
|
|
354
|
+
subscriptions: [
|
|
355
|
+
{
|
|
356
|
+
id: 'tasks',
|
|
357
|
+
status: 'active',
|
|
358
|
+
scopes: {},
|
|
359
|
+
bootstrap: false,
|
|
360
|
+
nextCursor: 25,
|
|
361
|
+
commits: [
|
|
362
|
+
{
|
|
363
|
+
commitSeq: 25,
|
|
364
|
+
createdAt: new Date(0).toISOString(),
|
|
365
|
+
actorId: 'main-actor',
|
|
366
|
+
changes: [
|
|
367
|
+
{
|
|
368
|
+
table: 'tasks',
|
|
369
|
+
row_id: 'task-1',
|
|
370
|
+
op: 'upsert',
|
|
371
|
+
row_json: { id: 'task-1', title: 'from-main' },
|
|
372
|
+
row_version: 1,
|
|
373
|
+
scopes: {},
|
|
374
|
+
},
|
|
375
|
+
],
|
|
376
|
+
},
|
|
377
|
+
],
|
|
378
|
+
},
|
|
379
|
+
],
|
|
380
|
+
},
|
|
381
|
+
};
|
|
382
|
+
},
|
|
383
|
+
async fetchSnapshotChunk(): Promise<Uint8Array> {
|
|
384
|
+
return new Uint8Array();
|
|
385
|
+
},
|
|
386
|
+
};
|
|
387
|
+
|
|
388
|
+
const shapes = new TableRegistry<RelayDatabase>();
|
|
389
|
+
shapes.register({
|
|
390
|
+
table: 'tasks',
|
|
391
|
+
scopePatterns: ['user:{user_id}'],
|
|
392
|
+
resolveScopes: async () => ({}),
|
|
393
|
+
extractScopes: () => ({}),
|
|
394
|
+
snapshot: async () => ({ rows: [], nextCursor: null }),
|
|
395
|
+
async applyOperation(_ctx, _op, opIndex) {
|
|
396
|
+
return {
|
|
397
|
+
result: {
|
|
398
|
+
opIndex,
|
|
399
|
+
status: 'conflict',
|
|
400
|
+
message: 'reject locally',
|
|
401
|
+
server_version: 1,
|
|
402
|
+
server_row: {},
|
|
403
|
+
},
|
|
404
|
+
emittedChanges: [],
|
|
405
|
+
};
|
|
406
|
+
},
|
|
407
|
+
});
|
|
408
|
+
|
|
409
|
+
const pullErrors: Error[] = [];
|
|
410
|
+
const pullEngine = new PullEngine({
|
|
411
|
+
db,
|
|
412
|
+
dialect: createSqliteServerDialect(),
|
|
413
|
+
transport,
|
|
414
|
+
clientId: 'relay-client',
|
|
415
|
+
tables: ['tasks'],
|
|
416
|
+
scopes: {},
|
|
417
|
+
shapes,
|
|
418
|
+
sequenceMapper: new SequenceMapper({ db }),
|
|
419
|
+
realtime: new RelayRealtime({ heartbeatIntervalMs: 0 }),
|
|
420
|
+
onError: (error) => pullErrors.push(error),
|
|
421
|
+
});
|
|
422
|
+
|
|
423
|
+
await pullEngine.pullOnce();
|
|
424
|
+
await pullEngine.pullOnce();
|
|
425
|
+
|
|
426
|
+
expect(pullErrors.length).toBe(2);
|
|
427
|
+
expect(syncCalls.length).toBe(2);
|
|
428
|
+
expect(syncCalls[0]?.pull?.subscriptions[0]?.cursor).toBe(-1);
|
|
429
|
+
expect(syncCalls[1]?.pull?.subscriptions[0]?.cursor).toBe(-1);
|
|
430
|
+
|
|
431
|
+
const rowResult = await sql<{ value_json: string }>`
|
|
432
|
+
select value_json
|
|
433
|
+
from ${sql.table('relay_config')}
|
|
434
|
+
where key = 'main_cursors'
|
|
435
|
+
limit 1
|
|
436
|
+
`.execute(db);
|
|
437
|
+
const row = rowResult.rows[0];
|
|
438
|
+
|
|
439
|
+
const cursorState: Record<string, number> = {};
|
|
440
|
+
if (row?.value_json) {
|
|
441
|
+
const parsed = JSON.parse(row.value_json);
|
|
442
|
+
if (typeof parsed === 'object' && parsed !== null) {
|
|
443
|
+
for (const [key, value] of Object.entries(parsed)) {
|
|
444
|
+
if (typeof value === 'number') {
|
|
445
|
+
cursorState[key] = value;
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
}
|
|
449
|
+
}
|
|
450
|
+
|
|
451
|
+
expect(cursorState.tasks).toBeUndefined();
|
|
452
|
+
});
|
|
136
453
|
});
|
|
137
454
|
|
|
138
455
|
describe('RelayRealtime', () => {
|
|
@@ -10,6 +10,7 @@ import type {
|
|
|
10
10
|
SyncPushResponse,
|
|
11
11
|
SyncTransport,
|
|
12
12
|
} from '@syncular/core';
|
|
13
|
+
import { randomId } from '@syncular/core';
|
|
13
14
|
import type { Kysely } from 'kysely';
|
|
14
15
|
import { sql } from 'kysely';
|
|
15
16
|
import type {
|
|
@@ -20,16 +21,6 @@ import type {
|
|
|
20
21
|
} from '../schema';
|
|
21
22
|
import type { SequenceMapper } from './sequence-mapper';
|
|
22
23
|
|
|
23
|
-
function randomId(): string {
|
|
24
|
-
if (
|
|
25
|
-
typeof crypto !== 'undefined' &&
|
|
26
|
-
typeof crypto.randomUUID === 'function'
|
|
27
|
-
) {
|
|
28
|
-
return crypto.randomUUID();
|
|
29
|
-
}
|
|
30
|
-
return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
|
|
31
|
-
}
|
|
32
|
-
|
|
33
24
|
/**
|
|
34
25
|
* Forward engine options.
|
|
35
26
|
*/
|
|
@@ -81,9 +81,17 @@ export class PullEngine<DB extends RelayDatabase = RelayDatabase> {
|
|
|
81
81
|
start(): void {
|
|
82
82
|
if (this.running) return;
|
|
83
83
|
this.running = true;
|
|
84
|
-
this.loadCursors()
|
|
85
|
-
|
|
86
|
-
|
|
84
|
+
void this.loadCursors()
|
|
85
|
+
.catch((error) => {
|
|
86
|
+
this.onError?.(
|
|
87
|
+
error instanceof Error ? error : new Error(String(error))
|
|
88
|
+
);
|
|
89
|
+
})
|
|
90
|
+
.finally(() => {
|
|
91
|
+
if (this.running) {
|
|
92
|
+
this.scheduleNext(0);
|
|
93
|
+
}
|
|
94
|
+
});
|
|
87
95
|
}
|
|
88
96
|
|
|
89
97
|
/**
|
|
@@ -206,16 +214,24 @@ export class PullEngine<DB extends RelayDatabase = RelayDatabase> {
|
|
|
206
214
|
const table = sub.id;
|
|
207
215
|
|
|
208
216
|
// Process commits
|
|
217
|
+
let canAdvanceCursor = true;
|
|
209
218
|
for (const commit of sub.commits) {
|
|
210
|
-
const
|
|
211
|
-
if (applied) {
|
|
219
|
+
const outcome = await this.applyCommitLocally(commit, table);
|
|
220
|
+
if (outcome === 'applied') {
|
|
212
221
|
hasChanges = true;
|
|
213
222
|
affectedTables.add(table);
|
|
214
223
|
}
|
|
224
|
+
if (outcome === 'rejected') {
|
|
225
|
+
canAdvanceCursor = false;
|
|
226
|
+
break;
|
|
227
|
+
}
|
|
215
228
|
}
|
|
216
229
|
|
|
217
230
|
// Update cursor
|
|
218
|
-
if (
|
|
231
|
+
if (
|
|
232
|
+
canAdvanceCursor &&
|
|
233
|
+
sub.nextCursor > (this.cursors.get(table) ?? -1)
|
|
234
|
+
) {
|
|
219
235
|
this.cursors.set(table, sub.nextCursor);
|
|
220
236
|
}
|
|
221
237
|
}
|
|
@@ -244,8 +260,8 @@ export class PullEngine<DB extends RelayDatabase = RelayDatabase> {
|
|
|
244
260
|
private async applyCommitLocally(
|
|
245
261
|
commit: SyncCommit,
|
|
246
262
|
table: string
|
|
247
|
-
): Promise<
|
|
248
|
-
if (commit.changes.length === 0) return
|
|
263
|
+
): Promise<'applied' | 'cached' | 'rejected'> {
|
|
264
|
+
if (commit.changes.length === 0) return 'cached';
|
|
249
265
|
|
|
250
266
|
// Convert changes to operations
|
|
251
267
|
const operations = commit.changes.map((change) => ({
|
|
@@ -282,20 +298,24 @@ export class PullEngine<DB extends RelayDatabase = RelayDatabase> {
|
|
|
282
298
|
result.response.commitSeq,
|
|
283
299
|
commit.commitSeq
|
|
284
300
|
);
|
|
285
|
-
return
|
|
301
|
+
return 'applied';
|
|
286
302
|
}
|
|
287
303
|
|
|
288
304
|
// Already applied (cached) - that's fine
|
|
289
305
|
if (result.response.status === 'cached') {
|
|
290
|
-
return
|
|
306
|
+
return 'cached';
|
|
291
307
|
}
|
|
292
308
|
|
|
293
309
|
// Rejected - this shouldn't happen for pulls from main
|
|
294
|
-
//
|
|
310
|
+
// Do not advance cursor; signal error so caller can react.
|
|
311
|
+
const error = new Error(
|
|
312
|
+
`Relay: Failed to apply commit ${commit.commitSeq} locally (status=${result.response.status})`
|
|
313
|
+
);
|
|
295
314
|
console.warn(
|
|
296
315
|
`Relay: Failed to apply commit ${commit.commitSeq} locally:`,
|
|
297
316
|
result.response
|
|
298
317
|
);
|
|
299
|
-
|
|
318
|
+
this.onError?.(error);
|
|
319
|
+
return 'rejected';
|
|
300
320
|
}
|
|
301
321
|
}
|
package/src/index.ts
CHANGED
package/src/mode-manager.ts
CHANGED
package/src/relay.ts
CHANGED
|
@@ -95,7 +95,7 @@ type EventHandler<K extends keyof RelayEvents> = RelayEvents[K];
|
|
|
95
95
|
* });
|
|
96
96
|
*
|
|
97
97
|
* // Mount routes for local clients
|
|
98
|
-
* app.route('/sync', relay.getRoutes());
|
|
98
|
+
* app.route('/sync', await relay.getRoutes());
|
|
99
99
|
*
|
|
100
100
|
* // Start background sync with main
|
|
101
101
|
* await relay.start();
|
|
@@ -134,6 +134,7 @@ export class RelayServer<DB extends RelayDatabase = RelayDatabase> {
|
|
|
134
134
|
private started = false;
|
|
135
135
|
private schemaInitialized = false;
|
|
136
136
|
private routes: Hono | null = null;
|
|
137
|
+
private routesPromise: Promise<Hono> | null = null;
|
|
137
138
|
|
|
138
139
|
constructor(options: RelayServerOptions<DB>) {
|
|
139
140
|
this.db = options.db;
|
|
@@ -268,7 +269,7 @@ export class RelayServer<DB extends RelayDatabase = RelayDatabase> {
|
|
|
268
269
|
clientId: this.mainServerClientId,
|
|
269
270
|
pull: {
|
|
270
271
|
subscriptions: [],
|
|
271
|
-
limitCommits:
|
|
272
|
+
limitCommits: 1,
|
|
272
273
|
},
|
|
273
274
|
});
|
|
274
275
|
return true;
|
|
@@ -372,28 +373,30 @@ export class RelayServer<DB extends RelayDatabase = RelayDatabase> {
|
|
|
372
373
|
* - POST /push
|
|
373
374
|
* - GET /realtime (WebSocket)
|
|
374
375
|
*/
|
|
375
|
-
getRoutes(): Hono {
|
|
376
|
+
async getRoutes(): Promise<Hono> {
|
|
376
377
|
if (this.routes) return this.routes;
|
|
378
|
+
if (this.routesPromise) return this.routesPromise;
|
|
379
|
+
|
|
380
|
+
this.routesPromise = (async () => {
|
|
381
|
+
const { createRelayRoutes } = await import('./server-role');
|
|
382
|
+
|
|
383
|
+
const routes = createRelayRoutes({
|
|
384
|
+
db: this.db,
|
|
385
|
+
dialect: this.dialect,
|
|
386
|
+
shapes: this.shapes,
|
|
387
|
+
realtime: this.realtime,
|
|
388
|
+
onCommit: async (localCommitSeq: number, affectedTables: string[]) => {
|
|
389
|
+
this.realtime.notifyScopeKeys(affectedTables, localCommitSeq);
|
|
390
|
+
this.forwardEngine.wakeUp();
|
|
391
|
+
},
|
|
392
|
+
});
|
|
393
|
+
|
|
394
|
+
this.routes = routes;
|
|
395
|
+
this.routesPromise = null;
|
|
396
|
+
return routes;
|
|
397
|
+
})();
|
|
377
398
|
|
|
378
|
-
|
|
379
|
-
const { createRelayRoutes } = require('./server-role');
|
|
380
|
-
|
|
381
|
-
const routes = createRelayRoutes({
|
|
382
|
-
db: this.db,
|
|
383
|
-
dialect: this.dialect,
|
|
384
|
-
shapes: this.shapes,
|
|
385
|
-
realtime: this.realtime,
|
|
386
|
-
onCommit: async (localCommitSeq: number, affectedTables: string[]) => {
|
|
387
|
-
// Notify local clients via WebSocket
|
|
388
|
-
this.realtime.notifyScopeKeys(affectedTables, localCommitSeq);
|
|
389
|
-
|
|
390
|
-
// Wake up forward engine to send to main
|
|
391
|
-
this.forwardEngine.wakeUp();
|
|
392
|
-
},
|
|
393
|
-
});
|
|
394
|
-
|
|
395
|
-
this.routes = routes;
|
|
396
|
-
return routes;
|
|
399
|
+
return this.routesPromise;
|
|
397
400
|
}
|
|
398
401
|
|
|
399
402
|
private emit<K extends keyof RelayEvents>(
|
package/src/server-role/index.ts
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
import type { SyncPullRequest, SyncPushRequest } from '@syncular/core';
|
|
8
8
|
import {
|
|
9
9
|
createSyncTimer,
|
|
10
|
+
isRecord,
|
|
10
11
|
logSyncEvent,
|
|
11
12
|
ScopeValuesSchema,
|
|
12
13
|
SyncBootstrapStateSchema,
|
|
@@ -64,10 +65,6 @@ function clampInt(value: number, min: number, max: number): number {
|
|
|
64
65
|
return Math.max(min, Math.min(max, value));
|
|
65
66
|
}
|
|
66
67
|
|
|
67
|
-
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
68
|
-
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
69
|
-
}
|
|
70
|
-
|
|
71
68
|
/**
|
|
72
69
|
* Create Hono routes for relay server-role endpoints.
|
|
73
70
|
*
|
package/src/server-role/push.ts
CHANGED
|
@@ -6,21 +6,12 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import type { SyncPushRequest } from '@syncular/core';
|
|
9
|
+
import { randomId } from '@syncular/core';
|
|
9
10
|
import type { ServerSyncDialect, TableRegistry } from '@syncular/server';
|
|
10
11
|
import { type PushCommitResult, pushCommit } from '@syncular/server';
|
|
11
12
|
import { type Kysely, sql } from 'kysely';
|
|
12
13
|
import type { RelayDatabase } from '../schema';
|
|
13
14
|
|
|
14
|
-
function randomId(): string {
|
|
15
|
-
if (
|
|
16
|
-
typeof crypto !== 'undefined' &&
|
|
17
|
-
typeof crypto.randomUUID === 'function'
|
|
18
|
-
) {
|
|
19
|
-
return crypto.randomUUID();
|
|
20
|
-
}
|
|
21
|
-
return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
|
|
22
|
-
}
|
|
23
|
-
|
|
24
15
|
/**
|
|
25
16
|
* Push a commit from a local client to the relay.
|
|
26
17
|
*
|
|
@@ -40,31 +31,33 @@ export async function relayPushCommit<
|
|
|
40
31
|
}): Promise<PushCommitResult> {
|
|
41
32
|
const { request } = args;
|
|
42
33
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
// If the commit was applied, enqueue it for forwarding to main server
|
|
53
|
-
if (
|
|
54
|
-
result.response.ok === true &&
|
|
55
|
-
result.response.status === 'applied' &&
|
|
56
|
-
typeof result.response.commitSeq === 'number'
|
|
57
|
-
) {
|
|
58
|
-
await enqueueForForwarding(args.db, {
|
|
59
|
-
localCommitSeq: result.response.commitSeq,
|
|
60
|
-
clientId: request.clientId,
|
|
61
|
-
clientCommitId: request.clientCommitId,
|
|
62
|
-
operations: request.operations,
|
|
63
|
-
schemaVersion: request.schemaVersion,
|
|
34
|
+
return args.db.transaction().execute(async (trx) => {
|
|
35
|
+
// Use the standard pushCommit - scope authorization is handled by shapes
|
|
36
|
+
const result = await pushCommit({
|
|
37
|
+
db: trx,
|
|
38
|
+
dialect: args.dialect,
|
|
39
|
+
shapes: args.shapes,
|
|
40
|
+
actorId: args.actorId,
|
|
41
|
+
request,
|
|
64
42
|
});
|
|
65
|
-
}
|
|
66
43
|
|
|
67
|
-
|
|
44
|
+
// If the commit was applied, enqueue it for forwarding to main server
|
|
45
|
+
if (
|
|
46
|
+
result.response.ok === true &&
|
|
47
|
+
result.response.status === 'applied' &&
|
|
48
|
+
typeof result.response.commitSeq === 'number'
|
|
49
|
+
) {
|
|
50
|
+
await enqueueForForwarding(trx, {
|
|
51
|
+
localCommitSeq: result.response.commitSeq,
|
|
52
|
+
clientId: request.clientId,
|
|
53
|
+
clientCommitId: request.clientCommitId,
|
|
54
|
+
operations: request.operations,
|
|
55
|
+
schemaVersion: request.schemaVersion,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
return result;
|
|
60
|
+
});
|
|
68
61
|
}
|
|
69
62
|
|
|
70
63
|
/**
|