@syncular/relay 0.0.6-56 → 0.0.6-66
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/pull-engine.d.ts +4 -2
- package/dist/client-role/pull-engine.d.ts.map +1 -1
- package/dist/client-role/pull-engine.js +1 -1
- package/dist/client-role/pull-engine.js.map +1 -1
- package/dist/relay.d.ts +3 -2
- package/dist/relay.d.ts.map +1 -1
- package/dist/relay.js.map +1 -1
- package/dist/server-role/index.d.ts +4 -2
- package/dist/server-role/index.d.ts.map +1 -1
- package/dist/server-role/index.js +2 -2
- package/dist/server-role/index.js.map +1 -1
- package/dist/server-role/pull.d.ts +5 -3
- package/dist/server-role/pull.d.ts.map +1 -1
- package/dist/server-role/pull.js +1 -1
- package/dist/server-role/pull.js.map +1 -1
- package/dist/server-role/push.d.ts +5 -3
- package/dist/server-role/push.d.ts.map +1 -1
- package/dist/server-role/push.js +1 -1
- package/dist/server-role/push.js.map +1 -1
- package/package.json +4 -4
- package/src/__tests__/relay.test.ts +48 -46
- package/src/client-role/pull-engine.ts +10 -4
- package/src/relay.ts +9 -3
- package/src/server-role/index.ts +10 -4
- package/src/server-role/pull.ts +10 -4
- package/src/server-role/push.ts +10 -4
|
@@ -5,11 +5,12 @@
|
|
|
5
5
|
* on the relay for local clients to access.
|
|
6
6
|
*/
|
|
7
7
|
import type { ScopeValues, SyncTransport } from '@syncular/core';
|
|
8
|
-
import type { ServerSyncDialect,
|
|
8
|
+
import type { ServerHandlerCollection, ServerSyncDialect, SyncServerAuth } from '@syncular/server';
|
|
9
9
|
import { type Kysely } from 'kysely';
|
|
10
10
|
import type { RelayRealtime } from '../realtime';
|
|
11
11
|
import type { RelayDatabase } from '../schema';
|
|
12
12
|
import type { SequenceMapper } from './sequence-mapper';
|
|
13
|
+
type RelayAuth = SyncServerAuth;
|
|
13
14
|
/**
|
|
14
15
|
* Pull engine options.
|
|
15
16
|
*/
|
|
@@ -22,7 +23,7 @@ export interface PullEngineOptions<DB extends RelayDatabase = RelayDatabase> {
|
|
|
22
23
|
tables: string[];
|
|
23
24
|
/** Scope values for subscriptions */
|
|
24
25
|
scopes: ScopeValues;
|
|
25
|
-
handlers:
|
|
26
|
+
handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
26
27
|
sequenceMapper: SequenceMapper<DB>;
|
|
27
28
|
realtime: RelayRealtime;
|
|
28
29
|
intervalMs?: number;
|
|
@@ -67,4 +68,5 @@ export declare class PullEngine<DB extends RelayDatabase = RelayDatabase> {
|
|
|
67
68
|
private processOne;
|
|
68
69
|
private applyCommitLocally;
|
|
69
70
|
}
|
|
71
|
+
export {};
|
|
70
72
|
//# sourceMappingURL=pull-engine.d.ts.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,
|
|
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,EACV,uBAAuB,EACvB,iBAAiB,EACjB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAE1B,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,KAAK,SAAS,GAAG,cAAc,CAAC;AAEhC;;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,QAAQ,EAAE,uBAAuB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACjD,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,QAAQ,CAAyC;IAClE,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"}
|
|
@@ -217,7 +217,7 @@ export class PullEngine {
|
|
|
217
217
|
db: this.db,
|
|
218
218
|
dialect: this.dialect,
|
|
219
219
|
handlers: this.handlers,
|
|
220
|
-
actorId: commit.actorId,
|
|
220
|
+
auth: { actorId: commit.actorId },
|
|
221
221
|
request: {
|
|
222
222
|
clientId: `relay:${this.clientId}`,
|
|
223
223
|
clientCommitId: relayCommitId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull-engine.js","sourceRoot":"","sources":["../../src/client-role/pull-engine.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"pull-engine.js","sourceRoot":"","sources":["../../src/client-role/pull-engine.ts"],"names":[],"mappings":"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"}
|
package/dist/relay.d.ts
CHANGED
|
@@ -8,12 +8,13 @@
|
|
|
8
8
|
* continue syncing when internet is lost.
|
|
9
9
|
*/
|
|
10
10
|
import type { ScopeValues, SyncTransport } from '@syncular/core';
|
|
11
|
-
import type { ServerSyncDialect,
|
|
11
|
+
import type { ServerHandlerCollection, ServerSyncDialect, SyncServerAuth } from '@syncular/server';
|
|
12
12
|
import type { Hono } from 'hono';
|
|
13
13
|
import type { Kysely } from 'kysely';
|
|
14
14
|
import { type RelayMode } from './mode-manager';
|
|
15
15
|
import { RelayRealtime } from './realtime';
|
|
16
16
|
import type { ForwardConflictEntry, RelayDatabase } from './schema';
|
|
17
|
+
type RelayAuth = SyncServerAuth;
|
|
17
18
|
/**
|
|
18
19
|
* Events emitted by the relay server.
|
|
19
20
|
*/
|
|
@@ -41,7 +42,7 @@ export interface RelayServerOptions<DB extends RelayDatabase = RelayDatabase> {
|
|
|
41
42
|
/** Scope values for subscriptions to the main server */
|
|
42
43
|
scopes: ScopeValues;
|
|
43
44
|
/** Handler registry for handling operations */
|
|
44
|
-
handlers:
|
|
45
|
+
handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
45
46
|
/** Optional: WebSocket heartbeat interval in milliseconds (default: 30000) */
|
|
46
47
|
heartbeatIntervalMs?: number;
|
|
47
48
|
/** Optional: Forward engine retry interval in milliseconds (default: 5000) */
|
package/dist/relay.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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,
|
|
1
|
+
{"version":3,"file":"relay.d.ts","sourceRoot":"","sources":["../src/relay.ts"],"names":[],"mappings":"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"}
|
package/dist/relay.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relay.js","sourceRoot":"","sources":["../src/relay.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;
|
|
1
|
+
{"version":3,"file":"relay.js","sourceRoot":"","sources":["../src/relay.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,19 +3,20 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Hono routes for serving local clients.
|
|
5
5
|
*/
|
|
6
|
-
import type { ServerSyncDialect,
|
|
6
|
+
import type { ServerHandlerCollection, ServerSyncDialect, SyncServerAuth } from '@syncular/server';
|
|
7
7
|
import type { Context } from 'hono';
|
|
8
8
|
import { Hono } from 'hono';
|
|
9
9
|
import type { Kysely } from 'kysely';
|
|
10
10
|
import type { RelayRealtime } from '../realtime';
|
|
11
11
|
import type { RelayDatabase } from '../schema';
|
|
12
|
+
type RelayAuth = SyncServerAuth;
|
|
12
13
|
/**
|
|
13
14
|
* Options for creating relay routes.
|
|
14
15
|
*/
|
|
15
16
|
export interface CreateRelayRoutesOptions<DB extends RelayDatabase = RelayDatabase> {
|
|
16
17
|
db: Kysely<DB>;
|
|
17
18
|
dialect: ServerSyncDialect;
|
|
18
|
-
handlers:
|
|
19
|
+
handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
19
20
|
realtime: RelayRealtime;
|
|
20
21
|
/**
|
|
21
22
|
* Called after a commit is successfully applied locally.
|
|
@@ -51,4 +52,5 @@ export interface CreateRelayRoutesOptions<DB extends RelayDatabase = RelayDataba
|
|
|
51
52
|
* - GET /realtime (WebSocket wake-up notifications)
|
|
52
53
|
*/
|
|
53
54
|
export declare function createRelayRoutes<DB extends RelayDatabase = RelayDatabase>(options: CreateRelayRoutesOptions<DB>): Hono;
|
|
55
|
+
export {};
|
|
54
56
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server-role/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAYH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server-role/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAYH,OAAO,KAAK,EACV,uBAAuB,EACvB,iBAAiB,EACjB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAE1B,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,KAAK,SAAS,GAAG,cAAc,CAAC;AAEhC;;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,QAAQ,EAAE,uBAAuB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACjD,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"}
|
|
@@ -127,7 +127,7 @@ export function createRelayRoutes(options) {
|
|
|
127
127
|
db: options.db,
|
|
128
128
|
dialect: options.dialect,
|
|
129
129
|
handlers: options.handlers,
|
|
130
|
-
|
|
130
|
+
auth,
|
|
131
131
|
request: validatedRequest.data,
|
|
132
132
|
});
|
|
133
133
|
await recordClientCursor(options.db, options.dialect, {
|
|
@@ -170,7 +170,7 @@ export function createRelayRoutes(options) {
|
|
|
170
170
|
db: options.db,
|
|
171
171
|
dialect: options.dialect,
|
|
172
172
|
handlers: options.handlers,
|
|
173
|
-
|
|
173
|
+
auth,
|
|
174
174
|
request: body,
|
|
175
175
|
});
|
|
176
176
|
logSyncEvent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server-role/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,eAAe,EACf,QAAQ,EACR,YAAY,EACZ,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server-role/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,11 @@
|
|
|
5
5
|
* on the relay.
|
|
6
6
|
*/
|
|
7
7
|
import type { SyncPullRequest } from '@syncular/core';
|
|
8
|
-
import type { ServerSyncDialect,
|
|
8
|
+
import type { ServerHandlerCollection, ServerSyncDialect, SyncServerAuth } from '@syncular/server';
|
|
9
9
|
import { type PullResult } from '@syncular/server';
|
|
10
10
|
import type { Kysely } from 'kysely';
|
|
11
11
|
import type { RelayDatabase } from '../schema';
|
|
12
|
+
type RelayAuth = SyncServerAuth;
|
|
12
13
|
/**
|
|
13
14
|
* Pull commits for a local client from the relay.
|
|
14
15
|
*
|
|
@@ -18,8 +19,9 @@ import type { RelayDatabase } from '../schema';
|
|
|
18
19
|
export declare function relayPull<DB extends RelayDatabase = RelayDatabase>(args: {
|
|
19
20
|
db: Kysely<DB>;
|
|
20
21
|
dialect: ServerSyncDialect;
|
|
21
|
-
handlers:
|
|
22
|
-
|
|
22
|
+
handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
23
|
+
auth: RelayAuth;
|
|
23
24
|
request: SyncPullRequest;
|
|
24
25
|
}): Promise<PullResult>;
|
|
26
|
+
export {};
|
|
25
27
|
//# sourceMappingURL=pull.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/server-role/pull.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/server-role/pull.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,KAAK,EACV,uBAAuB,EACvB,iBAAiB,EACjB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,UAAU,EAAQ,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C,KAAK,SAAS,GAAG,cAAc,CAAC;AAEhC;;;;;GAKG;AACH,wBAAsB,SAAS,CAC7B,EAAE,SAAS,aAAa,GAAG,aAAa,EACxC,IAAI,EAAE;IACN,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,EAAE,uBAAuB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,UAAU,CAAC,CAStB"}
|
package/dist/server-role/pull.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/server-role/pull.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/server-role/pull.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,OAAO,EAAmB,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAMzD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAE7B,IAMD,EAAuB;IACtB,qEAAqE;IACrE,OAAO,IAAI,CAAC;QACV,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;AAAA,CACJ"}
|
|
@@ -5,10 +5,11 @@
|
|
|
5
5
|
* queueing them for forwarding to the main server.
|
|
6
6
|
*/
|
|
7
7
|
import type { SyncPushRequest } from '@syncular/core';
|
|
8
|
-
import type { ServerSyncDialect,
|
|
8
|
+
import type { ServerHandlerCollection, ServerSyncDialect, SyncServerAuth } from '@syncular/server';
|
|
9
9
|
import { type PushCommitResult } from '@syncular/server';
|
|
10
10
|
import { type Kysely } from 'kysely';
|
|
11
11
|
import type { RelayDatabase } from '../schema';
|
|
12
|
+
type RelayAuth = SyncServerAuth;
|
|
12
13
|
/**
|
|
13
14
|
* Push a commit from a local client to the relay.
|
|
14
15
|
*
|
|
@@ -20,8 +21,9 @@ import type { RelayDatabase } from '../schema';
|
|
|
20
21
|
export declare function relayPushCommit<DB extends RelayDatabase = RelayDatabase>(args: {
|
|
21
22
|
db: Kysely<DB>;
|
|
22
23
|
dialect: ServerSyncDialect;
|
|
23
|
-
handlers:
|
|
24
|
-
|
|
24
|
+
handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
25
|
+
auth: RelayAuth;
|
|
25
26
|
request: SyncPushRequest;
|
|
26
27
|
}): Promise<PushCommitResult>;
|
|
28
|
+
export {};
|
|
27
29
|
//# sourceMappingURL=push.d.ts.map
|
|
@@ -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;AAEtD,OAAO,KAAK,
|
|
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,EACV,uBAAuB,EACvB,iBAAiB,EACjB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,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,KAAK,SAAS,GAAG,cAAc,CAAC;AAEhC;;;;;;;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,QAAQ,EAAE,uBAAuB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACjD,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,eAAe,CAAC;CAC1B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAmC5B"}
|
package/dist/server-role/push.js
CHANGED
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAM1C,OAAO,EAAyB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAe,GAAG,EAAE,MAAM,QAAQ,CAAC;AAK1C;;;;;;;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,2EAA2E;QAC3E,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;YAC9B,EAAE,EAAE,GAAG;YACP,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,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,IAAI,CAAC;gBACH,MAAM,oBAAoB,CAAC,GAAG,EAAE;oBAC9B,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS;oBACzC,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,cAAc,EAAE,OAAO,CAAC,cAAc;oBACtC,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,aAAa,EAAE,OAAO,CAAC,aAAa;iBACrC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAC1D,MAAM,KAAK,CAAC;YACd,CAAC;QACH,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;AAED,KAAK,UAAU,mBAAmB,CAChC,EAAc,EACd,SAAiB,EACF;IACf,MAAM,GAAG,CAAA;kBACO,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC;YACrC,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,MAAM,SAAS;GACnD,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEd,MAAM,GAAG,CAAA;kBACO,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC;YACvC,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,MAAM,SAAS;GACnD,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEd,MAAM,GAAG,CAAA;kBACO,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC;YACrC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,SAAS;GAC7C,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEd,MAAM,GAAG,CAAA;kBACO,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC;YAC/B,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,SAAS;GAC7C,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAEd,MAAM,GAAG,CAAA;kBACO,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC;YAC/B,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,SAAS;GAC7C,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAAA,CACf"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@syncular/relay",
|
|
3
|
-
"version": "0.0.6-
|
|
3
|
+
"version": "0.0.6-66",
|
|
4
4
|
"description": "Edge relay for Syncular distributed sync",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Benjamin Kniffler",
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"release": "bunx syncular-publish"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@syncular/core": "0.0.6-
|
|
46
|
-
"@syncular/server": "0.0.6-
|
|
45
|
+
"@syncular/core": "0.0.6-66",
|
|
46
|
+
"@syncular/server": "0.0.6-66"
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|
|
49
49
|
"hono": "^4.0.0",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@syncular/config": "0.0.0",
|
|
54
|
-
"@syncular/server-dialect-sqlite": "0.0.6-
|
|
54
|
+
"@syncular/server-dialect-sqlite": "0.0.6-66",
|
|
55
55
|
"kysely": "*"
|
|
56
56
|
},
|
|
57
57
|
"files": [
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
import Database from 'bun:sqlite';
|
|
6
6
|
import { afterEach, beforeEach, describe, expect, it } from 'bun:test';
|
|
7
7
|
import type { SyncCombinedRequest, SyncCombinedResponse } from '@syncular/core';
|
|
8
|
-
import {
|
|
8
|
+
import { createServerHandlerCollection } from '@syncular/server';
|
|
9
9
|
import { createSqliteServerDialect } from '@syncular/server-dialect-sqlite';
|
|
10
10
|
import type { Dialect, QueryResult } from 'kysely';
|
|
11
11
|
import {
|
|
@@ -189,7 +189,7 @@ describe('RelayServer health check', () => {
|
|
|
189
189
|
mainServerActorId: 'relay-main-actor',
|
|
190
190
|
tables: [],
|
|
191
191
|
scopes: {},
|
|
192
|
-
handlers:
|
|
192
|
+
handlers: createServerHandlerCollection<RelayDatabase>([]),
|
|
193
193
|
healthCheckIntervalMs: 50,
|
|
194
194
|
pullIntervalMs: 10_000,
|
|
195
195
|
forwardRetryIntervalMs: 10_000,
|
|
@@ -261,32 +261,33 @@ describe('relayPushCommit atomic enqueue', () => {
|
|
|
261
261
|
)
|
|
262
262
|
`.execute(db);
|
|
263
263
|
|
|
264
|
-
const handlers =
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
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' },
|
|
264
|
+
const handlers = createServerHandlerCollection<RelayDatabase>([
|
|
265
|
+
{
|
|
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',
|
|
285
276
|
},
|
|
286
|
-
|
|
287
|
-
|
|
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
|
+
},
|
|
288
289
|
},
|
|
289
|
-
|
|
290
|
+
]);
|
|
290
291
|
|
|
291
292
|
const originalRandomUUID = crypto.randomUUID;
|
|
292
293
|
crypto.randomUUID = () => 'fixed-outbox-id';
|
|
@@ -296,7 +297,7 @@ describe('relayPushCommit atomic enqueue', () => {
|
|
|
296
297
|
db,
|
|
297
298
|
dialect: createSqliteServerDialect(),
|
|
298
299
|
handlers,
|
|
299
|
-
actorId: 'u1',
|
|
300
|
+
auth: { actorId: 'u1' },
|
|
300
301
|
request: {
|
|
301
302
|
clientId: 'relay-client-1',
|
|
302
303
|
clientCommitId: 'relay-commit-1',
|
|
@@ -385,26 +386,27 @@ describe('PullEngine cursor safety', () => {
|
|
|
385
386
|
},
|
|
386
387
|
};
|
|
387
388
|
|
|
388
|
-
const handlers =
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
389
|
+
const handlers = createServerHandlerCollection<RelayDatabase>([
|
|
390
|
+
{
|
|
391
|
+
table: 'tasks',
|
|
392
|
+
scopePatterns: ['user:{user_id}'],
|
|
393
|
+
resolveScopes: async () => ({}),
|
|
394
|
+
extractScopes: () => ({}),
|
|
395
|
+
snapshot: async () => ({ rows: [], nextCursor: null }),
|
|
396
|
+
async applyOperation(_ctx, _op, opIndex) {
|
|
397
|
+
return {
|
|
398
|
+
result: {
|
|
399
|
+
opIndex,
|
|
400
|
+
status: 'conflict',
|
|
401
|
+
message: 'reject locally',
|
|
402
|
+
server_version: 1,
|
|
403
|
+
server_row: {},
|
|
404
|
+
},
|
|
405
|
+
emittedChanges: [],
|
|
406
|
+
};
|
|
407
|
+
},
|
|
406
408
|
},
|
|
407
|
-
|
|
409
|
+
]);
|
|
408
410
|
|
|
409
411
|
const pullErrors: Error[] = [];
|
|
410
412
|
const pullEngine = new PullEngine({
|
|
@@ -12,13 +12,19 @@ import type {
|
|
|
12
12
|
SyncSubscriptionRequest,
|
|
13
13
|
SyncTransport,
|
|
14
14
|
} from '@syncular/core';
|
|
15
|
-
import type {
|
|
15
|
+
import type {
|
|
16
|
+
ServerHandlerCollection,
|
|
17
|
+
ServerSyncDialect,
|
|
18
|
+
SyncServerAuth,
|
|
19
|
+
} from '@syncular/server';
|
|
16
20
|
import { pushCommit } from '@syncular/server';
|
|
17
21
|
import { type Kysely, sql } from 'kysely';
|
|
18
22
|
import type { RelayRealtime } from '../realtime';
|
|
19
23
|
import type { RelayDatabase } from '../schema';
|
|
20
24
|
import type { SequenceMapper } from './sequence-mapper';
|
|
21
25
|
|
|
26
|
+
type RelayAuth = SyncServerAuth;
|
|
27
|
+
|
|
22
28
|
/**
|
|
23
29
|
* Pull engine options.
|
|
24
30
|
*/
|
|
@@ -31,7 +37,7 @@ export interface PullEngineOptions<DB extends RelayDatabase = RelayDatabase> {
|
|
|
31
37
|
tables: string[];
|
|
32
38
|
/** Scope values for subscriptions */
|
|
33
39
|
scopes: ScopeValues;
|
|
34
|
-
handlers:
|
|
40
|
+
handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
35
41
|
sequenceMapper: SequenceMapper<DB>;
|
|
36
42
|
realtime: RelayRealtime;
|
|
37
43
|
intervalMs?: number;
|
|
@@ -49,7 +55,7 @@ export class PullEngine<DB extends RelayDatabase = RelayDatabase> {
|
|
|
49
55
|
private readonly clientId: string;
|
|
50
56
|
private readonly tables: string[];
|
|
51
57
|
private readonly scopes: ScopeValues;
|
|
52
|
-
private readonly handlers:
|
|
58
|
+
private readonly handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
53
59
|
private readonly sequenceMapper: SequenceMapper<DB>;
|
|
54
60
|
private readonly realtime: RelayRealtime;
|
|
55
61
|
private readonly intervalMs: number;
|
|
@@ -279,7 +285,7 @@ export class PullEngine<DB extends RelayDatabase = RelayDatabase> {
|
|
|
279
285
|
db: this.db,
|
|
280
286
|
dialect: this.dialect,
|
|
281
287
|
handlers: this.handlers,
|
|
282
|
-
actorId: commit.actorId,
|
|
288
|
+
auth: { actorId: commit.actorId },
|
|
283
289
|
request: {
|
|
284
290
|
clientId: `relay:${this.clientId}`,
|
|
285
291
|
clientCommitId: relayCommitId,
|
package/src/relay.ts
CHANGED
|
@@ -9,7 +9,11 @@
|
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
11
|
import type { ScopeValues, SyncTransport } from '@syncular/core';
|
|
12
|
-
import type {
|
|
12
|
+
import type {
|
|
13
|
+
ServerHandlerCollection,
|
|
14
|
+
ServerSyncDialect,
|
|
15
|
+
SyncServerAuth,
|
|
16
|
+
} from '@syncular/server';
|
|
13
17
|
import type { Hono } from 'hono';
|
|
14
18
|
import type { Kysely } from 'kysely';
|
|
15
19
|
import { sql } from 'kysely';
|
|
@@ -21,6 +25,8 @@ import { ModeManager, type RelayMode } from './mode-manager';
|
|
|
21
25
|
import { RelayRealtime } from './realtime';
|
|
22
26
|
import type { ForwardConflictEntry, RelayDatabase } from './schema';
|
|
23
27
|
|
|
28
|
+
type RelayAuth = SyncServerAuth;
|
|
29
|
+
|
|
24
30
|
/**
|
|
25
31
|
* Events emitted by the relay server.
|
|
26
32
|
*/
|
|
@@ -49,7 +55,7 @@ export interface RelayServerOptions<DB extends RelayDatabase = RelayDatabase> {
|
|
|
49
55
|
/** Scope values for subscriptions to the main server */
|
|
50
56
|
scopes: ScopeValues;
|
|
51
57
|
/** Handler registry for handling operations */
|
|
52
|
-
handlers:
|
|
58
|
+
handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
53
59
|
/** Optional: WebSocket heartbeat interval in milliseconds (default: 30000) */
|
|
54
60
|
heartbeatIntervalMs?: number;
|
|
55
61
|
/** Optional: Forward engine retry interval in milliseconds (default: 5000) */
|
|
@@ -113,7 +119,7 @@ export class RelayServer<DB extends RelayDatabase = RelayDatabase> {
|
|
|
113
119
|
private readonly mainServerActorId: string;
|
|
114
120
|
private readonly tables: string[];
|
|
115
121
|
private readonly scopes: ScopeValues;
|
|
116
|
-
private readonly handlers:
|
|
122
|
+
private readonly handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
117
123
|
|
|
118
124
|
private readonly modeManager: ModeManager;
|
|
119
125
|
private readonly sequenceMapper: SequenceMapper<DB>;
|
package/src/server-role/index.ts
CHANGED
|
@@ -14,7 +14,11 @@ import {
|
|
|
14
14
|
SyncPullRequestSchema,
|
|
15
15
|
SyncPushRequestSchema,
|
|
16
16
|
} from '@syncular/core';
|
|
17
|
-
import type {
|
|
17
|
+
import type {
|
|
18
|
+
ServerHandlerCollection,
|
|
19
|
+
ServerSyncDialect,
|
|
20
|
+
SyncServerAuth,
|
|
21
|
+
} from '@syncular/server';
|
|
18
22
|
import { recordClientCursor } from '@syncular/server';
|
|
19
23
|
import type { Context } from 'hono';
|
|
20
24
|
import { Hono } from 'hono';
|
|
@@ -24,6 +28,8 @@ import type { RelayDatabase } from '../schema';
|
|
|
24
28
|
import { relayPull } from './pull';
|
|
25
29
|
import { relayPushCommit } from './push';
|
|
26
30
|
|
|
31
|
+
type RelayAuth = SyncServerAuth;
|
|
32
|
+
|
|
27
33
|
/**
|
|
28
34
|
* Options for creating relay routes.
|
|
29
35
|
*/
|
|
@@ -32,7 +38,7 @@ export interface CreateRelayRoutesOptions<
|
|
|
32
38
|
> {
|
|
33
39
|
db: Kysely<DB>;
|
|
34
40
|
dialect: ServerSyncDialect;
|
|
35
|
-
handlers:
|
|
41
|
+
handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
36
42
|
realtime: RelayRealtime;
|
|
37
43
|
/**
|
|
38
44
|
* Called after a commit is successfully applied locally.
|
|
@@ -248,7 +254,7 @@ export function createRelayRoutes<DB extends RelayDatabase = RelayDatabase>(
|
|
|
248
254
|
db: options.db,
|
|
249
255
|
dialect: options.dialect,
|
|
250
256
|
handlers: options.handlers,
|
|
251
|
-
|
|
257
|
+
auth,
|
|
252
258
|
request: validatedRequest.data,
|
|
253
259
|
});
|
|
254
260
|
|
|
@@ -306,7 +312,7 @@ export function createRelayRoutes<DB extends RelayDatabase = RelayDatabase>(
|
|
|
306
312
|
db: options.db,
|
|
307
313
|
dialect: options.dialect,
|
|
308
314
|
handlers: options.handlers,
|
|
309
|
-
|
|
315
|
+
auth,
|
|
310
316
|
request: body,
|
|
311
317
|
});
|
|
312
318
|
|
package/src/server-role/pull.ts
CHANGED
|
@@ -6,11 +6,17 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import type { SyncPullRequest } from '@syncular/core';
|
|
9
|
-
import type {
|
|
9
|
+
import type {
|
|
10
|
+
ServerHandlerCollection,
|
|
11
|
+
ServerSyncDialect,
|
|
12
|
+
SyncServerAuth,
|
|
13
|
+
} from '@syncular/server';
|
|
10
14
|
import { type PullResult, pull } from '@syncular/server';
|
|
11
15
|
import type { Kysely } from 'kysely';
|
|
12
16
|
import type { RelayDatabase } from '../schema';
|
|
13
17
|
|
|
18
|
+
type RelayAuth = SyncServerAuth;
|
|
19
|
+
|
|
14
20
|
/**
|
|
15
21
|
* Pull commits for a local client from the relay.
|
|
16
22
|
*
|
|
@@ -22,8 +28,8 @@ export async function relayPull<
|
|
|
22
28
|
>(args: {
|
|
23
29
|
db: Kysely<DB>;
|
|
24
30
|
dialect: ServerSyncDialect;
|
|
25
|
-
handlers:
|
|
26
|
-
|
|
31
|
+
handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
32
|
+
auth: RelayAuth;
|
|
27
33
|
request: SyncPullRequest;
|
|
28
34
|
}): Promise<PullResult> {
|
|
29
35
|
// Use the standard pull - scope authorization is handled by handlers
|
|
@@ -31,7 +37,7 @@ export async function relayPull<
|
|
|
31
37
|
db: args.db,
|
|
32
38
|
dialect: args.dialect,
|
|
33
39
|
handlers: args.handlers,
|
|
34
|
-
|
|
40
|
+
auth: args.auth,
|
|
35
41
|
request: args.request,
|
|
36
42
|
});
|
|
37
43
|
}
|
package/src/server-role/push.ts
CHANGED
|
@@ -7,11 +7,17 @@
|
|
|
7
7
|
|
|
8
8
|
import type { SyncPushRequest } from '@syncular/core';
|
|
9
9
|
import { randomId } from '@syncular/core';
|
|
10
|
-
import type {
|
|
10
|
+
import type {
|
|
11
|
+
ServerHandlerCollection,
|
|
12
|
+
ServerSyncDialect,
|
|
13
|
+
SyncServerAuth,
|
|
14
|
+
} from '@syncular/server';
|
|
11
15
|
import { type PushCommitResult, pushCommit } from '@syncular/server';
|
|
12
16
|
import { type Kysely, sql } from 'kysely';
|
|
13
17
|
import type { RelayDatabase } from '../schema';
|
|
14
18
|
|
|
19
|
+
type RelayAuth = SyncServerAuth;
|
|
20
|
+
|
|
15
21
|
/**
|
|
16
22
|
* Push a commit from a local client to the relay.
|
|
17
23
|
*
|
|
@@ -25,8 +31,8 @@ export async function relayPushCommit<
|
|
|
25
31
|
>(args: {
|
|
26
32
|
db: Kysely<DB>;
|
|
27
33
|
dialect: ServerSyncDialect;
|
|
28
|
-
handlers:
|
|
29
|
-
|
|
34
|
+
handlers: ServerHandlerCollection<DB, RelayAuth>;
|
|
35
|
+
auth: RelayAuth;
|
|
30
36
|
request: SyncPushRequest;
|
|
31
37
|
}): Promise<PushCommitResult> {
|
|
32
38
|
const { request } = args;
|
|
@@ -37,7 +43,7 @@ export async function relayPushCommit<
|
|
|
37
43
|
db: trx,
|
|
38
44
|
dialect: args.dialect,
|
|
39
45
|
handlers: args.handlers,
|
|
40
|
-
|
|
46
|
+
auth: args.auth,
|
|
41
47
|
request,
|
|
42
48
|
});
|
|
43
49
|
|