@syncular/server 0.0.6-89 → 0.0.6-92
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/pull.d.ts +7 -0
- package/dist/pull.d.ts.map +1 -1
- package/dist/pull.js +3 -0
- package/dist/pull.js.map +1 -1
- package/dist/subscriptions/cache.d.ts +55 -0
- package/dist/subscriptions/cache.d.ts.map +1 -0
- package/dist/subscriptions/cache.js +206 -0
- package/dist/subscriptions/cache.js.map +1 -0
- package/dist/subscriptions/index.d.ts +1 -0
- package/dist/subscriptions/index.d.ts.map +1 -1
- package/dist/subscriptions/index.js +1 -0
- package/dist/subscriptions/index.js.map +1 -1
- package/dist/subscriptions/resolve.d.ts +2 -0
- package/dist/subscriptions/resolve.d.ts.map +1 -1
- package/dist/subscriptions/resolve.js +72 -11
- package/dist/subscriptions/resolve.js.map +1 -1
- package/package.json +2 -2
- package/src/pull.ts +13 -0
- package/src/subscriptions/cache.ts +318 -0
- package/src/subscriptions/index.ts +1 -0
- package/src/subscriptions/resolve.test.ts +180 -0
- package/src/subscriptions/resolve.ts +85 -15
package/dist/pull.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { type ServerHandlerCollection } from './handlers/collection';
|
|
|
5
5
|
import type { SyncServerAuth } from './handlers/types';
|
|
6
6
|
import type { SyncCoreDb } from './schema';
|
|
7
7
|
import type { SnapshotChunkStorage } from './snapshot-chunks/types';
|
|
8
|
+
import { type ScopeCacheBackend } from './subscriptions/cache';
|
|
8
9
|
export interface PullResult {
|
|
9
10
|
response: SyncPullResponse;
|
|
10
11
|
/**
|
|
@@ -27,5 +28,11 @@ export declare function pull<DB extends SyncCoreDb, Auth extends SyncServerAuth>
|
|
|
27
28
|
* instead of inline in the database.
|
|
28
29
|
*/
|
|
29
30
|
chunkStorage?: SnapshotChunkStorage;
|
|
31
|
+
/**
|
|
32
|
+
* Optional shared scope cache backend.
|
|
33
|
+
* Request-local memoization is always applied, even with custom backends.
|
|
34
|
+
* Defaults to process-local memory cache.
|
|
35
|
+
*/
|
|
36
|
+
scopeCache?: ScopeCacheBackend;
|
|
30
37
|
}): Promise<PullResult>;
|
|
31
38
|
//# sourceMappingURL=pull.d.ts.map
|
package/dist/pull.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../src/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,WAAW,EAMhB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EAKtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAc,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAsB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAK3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../src/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,WAAW,EAMhB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EAKtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAc,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAsB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAK3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAwB/B,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;;OAGG;IACH,eAAe,EAAE,WAAW,CAAC;IAC7B,oFAAoF;IACpF,YAAY,EAAE,MAAM,CAAC;CACtB;AAqLD,wBAAsB,IAAI,CACxB,EAAE,SAAS,UAAU,EACrB,IAAI,SAAS,cAAc,EAC3B,IAAI,EAAE;IACN,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,OAAO,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,EAAE,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC5C,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,eAAe,CAAC;IACzB;;;;OAIG;IACH,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC;;;;OAIG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC,GAAG,OAAO,CAAC,UAAU,CAAC,CA2mBtB"}
|
package/dist/pull.js
CHANGED
|
@@ -2,7 +2,9 @@ import { captureSyncException, countSyncMetric, distributionSyncMetric, encodeSn
|
|
|
2
2
|
import { getServerBootstrapOrderFor, getServerHandlerOrThrow, } from './handlers/collection.js';
|
|
3
3
|
import { EXTERNAL_CLIENT_ID } from './notify.js';
|
|
4
4
|
import { insertSnapshotChunk, readSnapshotChunkRefByPageKey, } from './snapshot-chunks.js';
|
|
5
|
+
import { createMemoryScopeCache, } from './subscriptions/cache.js';
|
|
5
6
|
import { resolveEffectiveScopesForSubscriptions } from './subscriptions/resolve.js';
|
|
7
|
+
const defaultScopeCache = createMemoryScopeCache();
|
|
6
8
|
function concatByteChunks(chunks) {
|
|
7
9
|
if (chunks.length === 1) {
|
|
8
10
|
return chunks[0] ?? new Uint8Array();
|
|
@@ -171,6 +173,7 @@ export async function pull(args) {
|
|
|
171
173
|
auth: args.auth,
|
|
172
174
|
subscriptions: request.subscriptions ?? [],
|
|
173
175
|
handlers: args.handlers,
|
|
176
|
+
scopeCache: args.scopeCache ?? defaultScopeCache,
|
|
174
177
|
});
|
|
175
178
|
const result = await dialect.executeInTransaction(db, async (trx) => {
|
|
176
179
|
await dialect.setRepeatableRead(trx);
|
package/dist/pull.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../src/pull.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../src/pull.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import type { ScopeValues } from '@syncular/core';
|
|
2
|
+
import { type Kysely } from 'kysely';
|
|
3
|
+
import type { SyncServerAuth } from '../handlers/types';
|
|
4
|
+
import type { SyncCoreDb } from '../schema';
|
|
5
|
+
export interface ScopeCacheContext<DB extends SyncCoreDb = SyncCoreDb, Auth extends SyncServerAuth = SyncServerAuth> {
|
|
6
|
+
db: Kysely<DB>;
|
|
7
|
+
auth: Auth;
|
|
8
|
+
table: string;
|
|
9
|
+
cacheKey: string;
|
|
10
|
+
}
|
|
11
|
+
export interface ScopeCacheSetContext<DB extends SyncCoreDb = SyncCoreDb, Auth extends SyncServerAuth = SyncServerAuth> extends ScopeCacheContext<DB, Auth> {
|
|
12
|
+
scopes: ScopeValues;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Shared cache contract for scope resolution results.
|
|
16
|
+
*
|
|
17
|
+
* Pull requests always apply request-local memoization first.
|
|
18
|
+
* This cache is used to share results across pulls.
|
|
19
|
+
*/
|
|
20
|
+
export interface ScopeCacheBackend {
|
|
21
|
+
name: string;
|
|
22
|
+
get<DB extends SyncCoreDb, Auth extends SyncServerAuth>(args: ScopeCacheContext<DB, Auth>): Promise<ScopeValues | null>;
|
|
23
|
+
set<DB extends SyncCoreDb, Auth extends SyncServerAuth>(args: ScopeCacheSetContext<DB, Auth>): Promise<void>;
|
|
24
|
+
delete?<DB extends SyncCoreDb, Auth extends SyncServerAuth>(args: ScopeCacheContext<DB, Auth>): Promise<void>;
|
|
25
|
+
}
|
|
26
|
+
export declare function createDefaultScopeCacheKey(args: {
|
|
27
|
+
table: string;
|
|
28
|
+
auth: SyncServerAuth;
|
|
29
|
+
}): string;
|
|
30
|
+
export interface MemoryScopeCacheOptions {
|
|
31
|
+
ttlMs?: number;
|
|
32
|
+
maxEntries?: number;
|
|
33
|
+
now?: () => number;
|
|
34
|
+
}
|
|
35
|
+
export declare function createMemoryScopeCache(options?: MemoryScopeCacheOptions): ScopeCacheBackend;
|
|
36
|
+
export interface DatabaseScopeCacheOptions {
|
|
37
|
+
/**
|
|
38
|
+
* Scope cache table name.
|
|
39
|
+
* Default: `sync_scope_cache`
|
|
40
|
+
*/
|
|
41
|
+
tableName?: string;
|
|
42
|
+
/**
|
|
43
|
+
* TTL for cache entries (milliseconds).
|
|
44
|
+
* Default: 60000
|
|
45
|
+
*/
|
|
46
|
+
ttlMs?: number;
|
|
47
|
+
/**
|
|
48
|
+
* Automatically creates the cache table.
|
|
49
|
+
* Default: true
|
|
50
|
+
*/
|
|
51
|
+
autoCreateTable?: boolean;
|
|
52
|
+
now?: () => Date;
|
|
53
|
+
}
|
|
54
|
+
export declare function createDatabaseScopeCache(options?: DatabaseScopeCacheOptions): ScopeCacheBackend;
|
|
55
|
+
//# sourceMappingURL=cache.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/subscriptions/cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,KAAK,MAAM,EAAO,MAAM,QAAQ,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAQ5C,MAAM,WAAW,iBAAiB,CAChC,EAAE,SAAS,UAAU,GAAG,UAAU,EAClC,IAAI,SAAS,cAAc,GAAG,cAAc;IAE5C,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB,CACnC,EAAE,SAAS,UAAU,GAAG,UAAU,EAClC,IAAI,SAAS,cAAc,GAAG,cAAc,CAC5C,SAAQ,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC;IACnC,MAAM,EAAE,WAAW,CAAC;CACrB;AAED;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,SAAS,UAAU,EAAE,IAAI,SAAS,cAAc,EACpD,IAAI,EAAE,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,GAChC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC/B,GAAG,CAAC,EAAE,SAAS,UAAU,EAAE,IAAI,SAAS,cAAc,EACpD,IAAI,EAAE,oBAAoB,CAAC,EAAE,EAAE,IAAI,CAAC,GACnC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,MAAM,CAAC,CAAC,EAAE,SAAS,UAAU,EAAE,IAAI,SAAS,cAAc,EACxD,IAAI,EAAE,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAC/C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,cAAc,CAAC;CACtB,GAAG,MAAM,CAGT;AAoDD,MAAM,WAAW,uBAAuB;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,wBAAgB,sBAAsB,CACpC,OAAO,CAAC,EAAE,uBAAuB,GAChC,iBAAiB,CAiEnB;AAED,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,wBAAgB,wBAAwB,CACtC,OAAO,CAAC,EAAE,yBAAyB,GAClC,iBAAiB,CAoHnB"}
|
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
import { sql } from 'kysely';
|
|
2
|
+
const DEFAULT_SCOPE_CACHE_PARTITION_ID = 'default';
|
|
3
|
+
const DEFAULT_MEMORY_SCOPE_CACHE_TTL_MS = 30_000;
|
|
4
|
+
const DEFAULT_MEMORY_SCOPE_CACHE_MAX_ENTRIES = 5_000;
|
|
5
|
+
const DEFAULT_DATABASE_SCOPE_CACHE_TTL_MS = 60_000;
|
|
6
|
+
const DEFAULT_DATABASE_SCOPE_CACHE_TABLE = 'sync_scope_cache';
|
|
7
|
+
export function createDefaultScopeCacheKey(args) {
|
|
8
|
+
const partitionId = args.auth.partitionId ?? DEFAULT_SCOPE_CACHE_PARTITION_ID;
|
|
9
|
+
return `${partitionId}\u0000${args.auth.actorId}\u0000${args.table}`;
|
|
10
|
+
}
|
|
11
|
+
function cloneScopeValues(scopes) {
|
|
12
|
+
const cloned = {};
|
|
13
|
+
for (const [key, value] of Object.entries(scopes)) {
|
|
14
|
+
if (typeof value === 'string') {
|
|
15
|
+
cloned[key] = value;
|
|
16
|
+
continue;
|
|
17
|
+
}
|
|
18
|
+
cloned[key] = [...value];
|
|
19
|
+
}
|
|
20
|
+
return cloned;
|
|
21
|
+
}
|
|
22
|
+
function parseScopeValues(value) {
|
|
23
|
+
let parsed;
|
|
24
|
+
try {
|
|
25
|
+
parsed = JSON.parse(value);
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
const out = {};
|
|
34
|
+
for (const [scopeKey, scopeValue] of Object.entries(parsed)) {
|
|
35
|
+
if (typeof scopeValue === 'string') {
|
|
36
|
+
out[scopeKey] = scopeValue;
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
39
|
+
if (Array.isArray(scopeValue) &&
|
|
40
|
+
scopeValue.every((item) => typeof item === 'string')) {
|
|
41
|
+
out[scopeKey] = [...scopeValue];
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
return out;
|
|
47
|
+
}
|
|
48
|
+
export function createMemoryScopeCache(options) {
|
|
49
|
+
const ttlMs = options?.ttlMs ?? DEFAULT_MEMORY_SCOPE_CACHE_TTL_MS;
|
|
50
|
+
const maxEntries = options?.maxEntries ?? DEFAULT_MEMORY_SCOPE_CACHE_MAX_ENTRIES;
|
|
51
|
+
const now = options?.now ?? Date.now;
|
|
52
|
+
const buckets = new WeakMap();
|
|
53
|
+
function getBucket(db) {
|
|
54
|
+
const existing = buckets.get(db);
|
|
55
|
+
if (existing) {
|
|
56
|
+
return existing;
|
|
57
|
+
}
|
|
58
|
+
const created = new Map();
|
|
59
|
+
buckets.set(db, created);
|
|
60
|
+
return created;
|
|
61
|
+
}
|
|
62
|
+
function evictOldest(bucket) {
|
|
63
|
+
while (bucket.size > maxEntries) {
|
|
64
|
+
const oldestKey = bucket.keys().next().value;
|
|
65
|
+
if (!oldestKey) {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
bucket.delete(oldestKey);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
return {
|
|
72
|
+
name: 'memory',
|
|
73
|
+
async get(args) {
|
|
74
|
+
const bucket = getBucket(args.db);
|
|
75
|
+
const entry = bucket.get(args.cacheKey);
|
|
76
|
+
if (!entry) {
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
79
|
+
const nowMs = now();
|
|
80
|
+
if (entry.expiresAt <= nowMs) {
|
|
81
|
+
bucket.delete(args.cacheKey);
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
return cloneScopeValues(entry.scopes);
|
|
85
|
+
},
|
|
86
|
+
async set(args) {
|
|
87
|
+
const bucket = getBucket(args.db);
|
|
88
|
+
if (ttlMs <= 0) {
|
|
89
|
+
bucket.delete(args.cacheKey);
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
if (bucket.has(args.cacheKey)) {
|
|
93
|
+
bucket.delete(args.cacheKey);
|
|
94
|
+
}
|
|
95
|
+
bucket.set(args.cacheKey, {
|
|
96
|
+
scopes: cloneScopeValues(args.scopes),
|
|
97
|
+
expiresAt: now() + ttlMs,
|
|
98
|
+
});
|
|
99
|
+
evictOldest(bucket);
|
|
100
|
+
},
|
|
101
|
+
async delete(args) {
|
|
102
|
+
const bucket = getBucket(args.db);
|
|
103
|
+
bucket.delete(args.cacheKey);
|
|
104
|
+
},
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
export function createDatabaseScopeCache(options) {
|
|
108
|
+
const tableName = options?.tableName ?? DEFAULT_DATABASE_SCOPE_CACHE_TABLE;
|
|
109
|
+
const ttlMs = options?.ttlMs ?? DEFAULT_DATABASE_SCOPE_CACHE_TTL_MS;
|
|
110
|
+
const autoCreateTable = options?.autoCreateTable ?? true;
|
|
111
|
+
const now = options?.now ?? (() => new Date());
|
|
112
|
+
const schemaReady = new WeakMap();
|
|
113
|
+
async function ensureTable(db) {
|
|
114
|
+
if (!autoCreateTable) {
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
const existing = schemaReady.get(db);
|
|
118
|
+
if (existing) {
|
|
119
|
+
await existing;
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
const pending = sql `
|
|
123
|
+
CREATE TABLE IF NOT EXISTS ${sql.table(tableName)} (
|
|
124
|
+
cache_key TEXT PRIMARY KEY,
|
|
125
|
+
scope_values TEXT NOT NULL,
|
|
126
|
+
expires_at TEXT NOT NULL,
|
|
127
|
+
created_at TEXT NOT NULL
|
|
128
|
+
)
|
|
129
|
+
`
|
|
130
|
+
.execute(db)
|
|
131
|
+
.then(() => undefined);
|
|
132
|
+
schemaReady.set(db, pending);
|
|
133
|
+
try {
|
|
134
|
+
await pending;
|
|
135
|
+
}
|
|
136
|
+
catch (error) {
|
|
137
|
+
schemaReady.delete(db);
|
|
138
|
+
throw error;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
async function removeCacheRow(args) {
|
|
142
|
+
await sql `
|
|
143
|
+
DELETE FROM ${sql.table(tableName)}
|
|
144
|
+
WHERE cache_key = ${args.cacheKey}
|
|
145
|
+
`.execute(args.db);
|
|
146
|
+
}
|
|
147
|
+
return {
|
|
148
|
+
name: 'database',
|
|
149
|
+
async get(args) {
|
|
150
|
+
await ensureTable(args.db);
|
|
151
|
+
const rows = await sql `
|
|
152
|
+
SELECT scope_values, expires_at
|
|
153
|
+
FROM ${sql.table(tableName)}
|
|
154
|
+
WHERE cache_key = ${args.cacheKey}
|
|
155
|
+
LIMIT 1
|
|
156
|
+
`.execute(args.db);
|
|
157
|
+
const row = rows.rows[0];
|
|
158
|
+
if (!row) {
|
|
159
|
+
return null;
|
|
160
|
+
}
|
|
161
|
+
const nowIso = now().toISOString();
|
|
162
|
+
if (row.expires_at <= nowIso) {
|
|
163
|
+
await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
|
|
164
|
+
return null;
|
|
165
|
+
}
|
|
166
|
+
const parsed = parseScopeValues(row.scope_values);
|
|
167
|
+
if (!parsed) {
|
|
168
|
+
await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
|
|
169
|
+
return null;
|
|
170
|
+
}
|
|
171
|
+
return parsed;
|
|
172
|
+
},
|
|
173
|
+
async set(args) {
|
|
174
|
+
await ensureTable(args.db);
|
|
175
|
+
if (ttlMs <= 0) {
|
|
176
|
+
await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
const createdAt = now();
|
|
180
|
+
const expiresAt = new Date(createdAt.getTime() + ttlMs);
|
|
181
|
+
await sql `
|
|
182
|
+
INSERT INTO ${sql.table(tableName)} (
|
|
183
|
+
cache_key,
|
|
184
|
+
scope_values,
|
|
185
|
+
expires_at,
|
|
186
|
+
created_at
|
|
187
|
+
)
|
|
188
|
+
VALUES (
|
|
189
|
+
${args.cacheKey},
|
|
190
|
+
${JSON.stringify(cloneScopeValues(args.scopes))},
|
|
191
|
+
${expiresAt.toISOString()},
|
|
192
|
+
${createdAt.toISOString()}
|
|
193
|
+
)
|
|
194
|
+
ON CONFLICT (cache_key) DO UPDATE SET
|
|
195
|
+
scope_values = EXCLUDED.scope_values,
|
|
196
|
+
expires_at = EXCLUDED.expires_at,
|
|
197
|
+
created_at = EXCLUDED.created_at
|
|
198
|
+
`.execute(args.db);
|
|
199
|
+
},
|
|
200
|
+
async delete(args) {
|
|
201
|
+
await ensureTable(args.db);
|
|
202
|
+
await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
|
|
203
|
+
},
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
//# sourceMappingURL=cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/subscriptions/cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/subscriptions/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/subscriptions/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/subscriptions/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/subscriptions/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}
|
|
@@ -3,6 +3,7 @@ import type { Kysely } from 'kysely';
|
|
|
3
3
|
import { type ServerHandlerCollection } from '../handlers/collection';
|
|
4
4
|
import type { SyncServerAuth } from '../handlers/types';
|
|
5
5
|
import type { SyncCoreDb } from '../schema';
|
|
6
|
+
import { type ScopeCacheBackend } from './cache';
|
|
6
7
|
export declare class InvalidSubscriptionScopeError extends Error {
|
|
7
8
|
constructor(message: string);
|
|
8
9
|
}
|
|
@@ -32,5 +33,6 @@ export declare function resolveEffectiveScopesForSubscriptions<DB extends SyncCo
|
|
|
32
33
|
auth: Auth;
|
|
33
34
|
subscriptions: SyncSubscriptionRequest[];
|
|
34
35
|
handlers: ServerHandlerCollection<DB, Auth>;
|
|
36
|
+
scopeCache?: ScopeCacheBackend;
|
|
35
37
|
}): Promise<ResolvedSubscription[]>;
|
|
36
38
|
//# sourceMappingURL=resolve.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/subscriptions/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC7B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/subscriptions/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC7B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAA8B,KAAK,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE7E,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAC3D,MAAM,EAAE,QAAQ,GAAG,SAAS,CAAC;CAC9B;AAgGD;;;;;;;;GAQG;AACH,wBAAsB,sCAAsC,CAC1D,EAAE,SAAS,UAAU,EACrB,IAAI,SAAS,cAAc,EAC3B,IAAI,EAAE;IACN,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IACf,IAAI,EAAE,IAAI,CAAC;IACX,aAAa,EAAE,uBAAuB,EAAE,CAAC;IACzC,QAAQ,EAAE,uBAAuB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC5C,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAyKlC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { extractScopeVars, } from '@syncular/core';
|
|
2
2
|
import { getServerHandler, } from '../handlers/collection.js';
|
|
3
|
+
import { createDefaultScopeCacheKey } from './cache.js';
|
|
3
4
|
export class InvalidSubscriptionScopeError extends Error {
|
|
4
5
|
constructor(message) {
|
|
5
6
|
super(message);
|
|
@@ -91,6 +92,7 @@ function validateScopeKeys(args) {
|
|
|
91
92
|
export async function resolveEffectiveScopesForSubscriptions(args) {
|
|
92
93
|
const out = [];
|
|
93
94
|
const seenIds = new Set();
|
|
95
|
+
const requestScopeCache = new Map();
|
|
94
96
|
for (const sub of args.subscriptions) {
|
|
95
97
|
if (!sub.id || typeof sub.id !== 'string') {
|
|
96
98
|
throw new InvalidSubscriptionScopeError('Subscription id is required');
|
|
@@ -115,19 +117,78 @@ export async function resolveEffectiveScopesForSubscriptions(args) {
|
|
|
115
117
|
subscriptionId: sub.id,
|
|
116
118
|
table: sub.table,
|
|
117
119
|
});
|
|
118
|
-
//
|
|
120
|
+
// Resolve allowed scopes with request-local memoization first, then
|
|
121
|
+
// optional shared cache backend, then table handler.
|
|
122
|
+
const scopeCacheKey = createDefaultScopeCacheKey({
|
|
123
|
+
auth: args.auth,
|
|
124
|
+
table: sub.table,
|
|
125
|
+
});
|
|
119
126
|
let allowed;
|
|
120
|
-
|
|
121
|
-
allowed =
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
127
|
+
if (requestScopeCache.has(scopeCacheKey)) {
|
|
128
|
+
allowed = requestScopeCache.get(scopeCacheKey) ?? null;
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
allowed = null;
|
|
132
|
+
let sharedCacheHit = false;
|
|
133
|
+
if (args.scopeCache) {
|
|
134
|
+
try {
|
|
135
|
+
const cachedAllowed = await args.scopeCache.get({
|
|
136
|
+
db: args.db,
|
|
137
|
+
auth: args.auth,
|
|
138
|
+
table: sub.table,
|
|
139
|
+
cacheKey: scopeCacheKey,
|
|
140
|
+
});
|
|
141
|
+
if (cachedAllowed !== null) {
|
|
142
|
+
allowed = cachedAllowed;
|
|
143
|
+
sharedCacheHit = true;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
catch (cacheErr) {
|
|
147
|
+
console.error(`[scopeCache.get] Failed for table ${sub.table}, subscription ${sub.id}:`, cacheErr);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
if (!sharedCacheHit) {
|
|
151
|
+
try {
|
|
152
|
+
allowed = await handler.resolveScopes({
|
|
153
|
+
db: args.db,
|
|
154
|
+
actorId: args.auth.actorId,
|
|
155
|
+
auth: args.auth,
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
catch (resolveErr) {
|
|
159
|
+
// Scope resolution failed - mark subscription as revoked
|
|
160
|
+
// rather than failing the entire pull
|
|
161
|
+
console.error(`[resolveScopes] Failed for table ${sub.table}, subscription ${sub.id}:`, resolveErr);
|
|
162
|
+
requestScopeCache.set(scopeCacheKey, null);
|
|
163
|
+
out.push({
|
|
164
|
+
id: sub.id,
|
|
165
|
+
table: sub.table,
|
|
166
|
+
scopes: {},
|
|
167
|
+
params: sub.params,
|
|
168
|
+
cursor: sub.cursor,
|
|
169
|
+
bootstrapState: sub.bootstrapState ?? null,
|
|
170
|
+
status: 'revoked',
|
|
171
|
+
});
|
|
172
|
+
continue;
|
|
173
|
+
}
|
|
174
|
+
if (args.scopeCache && allowed !== null) {
|
|
175
|
+
try {
|
|
176
|
+
await args.scopeCache.set({
|
|
177
|
+
db: args.db,
|
|
178
|
+
auth: args.auth,
|
|
179
|
+
table: sub.table,
|
|
180
|
+
cacheKey: scopeCacheKey,
|
|
181
|
+
scopes: allowed,
|
|
182
|
+
});
|
|
183
|
+
}
|
|
184
|
+
catch (cacheErr) {
|
|
185
|
+
console.error(`[scopeCache.set] Failed for table ${sub.table}, subscription ${sub.id}:`, cacheErr);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
requestScopeCache.set(scopeCacheKey, allowed);
|
|
126
190
|
}
|
|
127
|
-
|
|
128
|
-
// Scope resolution failed - mark subscription as revoked
|
|
129
|
-
// rather than failing the entire pull
|
|
130
|
-
console.error(`[resolveScopes] Failed for table ${sub.table}, subscription ${sub.id}:`, resolveErr);
|
|
191
|
+
if (!allowed) {
|
|
131
192
|
out.push({
|
|
132
193
|
id: sub.id,
|
|
133
194
|
table: sub.table,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/subscriptions/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,GAGjB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EACL,gBAAgB,GAEjB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/subscriptions/resolve.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@syncular/server",
|
|
3
|
-
"version": "0.0.6-
|
|
3
|
+
"version": "0.0.6-92",
|
|
4
4
|
"description": "Server-side sync engine with push/pull, pruning, and snapshot support",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"author": "Benjamin Kniffler",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"release": "bunx syncular-publish"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@syncular/core": "0.0.6-
|
|
65
|
+
"@syncular/core": "0.0.6-92"
|
|
66
66
|
},
|
|
67
67
|
"peerDependencies": {
|
|
68
68
|
"kysely": "^0.28.0",
|
package/src/pull.ts
CHANGED
|
@@ -35,8 +35,14 @@ import {
|
|
|
35
35
|
readSnapshotChunkRefByPageKey,
|
|
36
36
|
} from './snapshot-chunks';
|
|
37
37
|
import type { SnapshotChunkStorage } from './snapshot-chunks/types';
|
|
38
|
+
import {
|
|
39
|
+
createMemoryScopeCache,
|
|
40
|
+
type ScopeCacheBackend,
|
|
41
|
+
} from './subscriptions/cache';
|
|
38
42
|
import { resolveEffectiveScopesForSubscriptions } from './subscriptions/resolve';
|
|
39
43
|
|
|
44
|
+
const defaultScopeCache = createMemoryScopeCache();
|
|
45
|
+
|
|
40
46
|
function concatByteChunks(chunks: readonly Uint8Array[]): Uint8Array {
|
|
41
47
|
if (chunks.length === 1) {
|
|
42
48
|
return chunks[0] ?? new Uint8Array();
|
|
@@ -261,6 +267,12 @@ export async function pull<
|
|
|
261
267
|
* instead of inline in the database.
|
|
262
268
|
*/
|
|
263
269
|
chunkStorage?: SnapshotChunkStorage;
|
|
270
|
+
/**
|
|
271
|
+
* Optional shared scope cache backend.
|
|
272
|
+
* Request-local memoization is always applied, even with custom backends.
|
|
273
|
+
* Defaults to process-local memory cache.
|
|
274
|
+
*/
|
|
275
|
+
scopeCache?: ScopeCacheBackend;
|
|
264
276
|
}): Promise<PullResult> {
|
|
265
277
|
const { request, dialect } = args;
|
|
266
278
|
const db = args.db;
|
|
@@ -303,6 +315,7 @@ export async function pull<
|
|
|
303
315
|
auth: args.auth,
|
|
304
316
|
subscriptions: request.subscriptions ?? [],
|
|
305
317
|
handlers: args.handlers,
|
|
318
|
+
scopeCache: args.scopeCache ?? defaultScopeCache,
|
|
306
319
|
});
|
|
307
320
|
|
|
308
321
|
const result = await dialect.executeInTransaction(db, async (trx) => {
|
|
@@ -0,0 +1,318 @@
|
|
|
1
|
+
import type { ScopeValues } from '@syncular/core';
|
|
2
|
+
import { type Kysely, sql } from 'kysely';
|
|
3
|
+
import type { SyncServerAuth } from '../handlers/types';
|
|
4
|
+
import type { SyncCoreDb } from '../schema';
|
|
5
|
+
|
|
6
|
+
const DEFAULT_SCOPE_CACHE_PARTITION_ID = 'default';
|
|
7
|
+
const DEFAULT_MEMORY_SCOPE_CACHE_TTL_MS = 30_000;
|
|
8
|
+
const DEFAULT_MEMORY_SCOPE_CACHE_MAX_ENTRIES = 5_000;
|
|
9
|
+
const DEFAULT_DATABASE_SCOPE_CACHE_TTL_MS = 60_000;
|
|
10
|
+
const DEFAULT_DATABASE_SCOPE_CACHE_TABLE = 'sync_scope_cache';
|
|
11
|
+
|
|
12
|
+
export interface ScopeCacheContext<
|
|
13
|
+
DB extends SyncCoreDb = SyncCoreDb,
|
|
14
|
+
Auth extends SyncServerAuth = SyncServerAuth,
|
|
15
|
+
> {
|
|
16
|
+
db: Kysely<DB>;
|
|
17
|
+
auth: Auth;
|
|
18
|
+
table: string;
|
|
19
|
+
cacheKey: string;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export interface ScopeCacheSetContext<
|
|
23
|
+
DB extends SyncCoreDb = SyncCoreDb,
|
|
24
|
+
Auth extends SyncServerAuth = SyncServerAuth,
|
|
25
|
+
> extends ScopeCacheContext<DB, Auth> {
|
|
26
|
+
scopes: ScopeValues;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Shared cache contract for scope resolution results.
|
|
31
|
+
*
|
|
32
|
+
* Pull requests always apply request-local memoization first.
|
|
33
|
+
* This cache is used to share results across pulls.
|
|
34
|
+
*/
|
|
35
|
+
export interface ScopeCacheBackend {
|
|
36
|
+
name: string;
|
|
37
|
+
get<DB extends SyncCoreDb, Auth extends SyncServerAuth>(
|
|
38
|
+
args: ScopeCacheContext<DB, Auth>
|
|
39
|
+
): Promise<ScopeValues | null>;
|
|
40
|
+
set<DB extends SyncCoreDb, Auth extends SyncServerAuth>(
|
|
41
|
+
args: ScopeCacheSetContext<DB, Auth>
|
|
42
|
+
): Promise<void>;
|
|
43
|
+
delete?<DB extends SyncCoreDb, Auth extends SyncServerAuth>(
|
|
44
|
+
args: ScopeCacheContext<DB, Auth>
|
|
45
|
+
): Promise<void>;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export function createDefaultScopeCacheKey(args: {
|
|
49
|
+
table: string;
|
|
50
|
+
auth: SyncServerAuth;
|
|
51
|
+
}): string {
|
|
52
|
+
const partitionId = args.auth.partitionId ?? DEFAULT_SCOPE_CACHE_PARTITION_ID;
|
|
53
|
+
return `${partitionId}\u0000${args.auth.actorId}\u0000${args.table}`;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
function cloneScopeValues(scopes: ScopeValues): ScopeValues {
|
|
57
|
+
const cloned: ScopeValues = {};
|
|
58
|
+
for (const [key, value] of Object.entries(scopes)) {
|
|
59
|
+
if (typeof value === 'string') {
|
|
60
|
+
cloned[key] = value;
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
cloned[key] = [...value];
|
|
64
|
+
}
|
|
65
|
+
return cloned;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
function parseScopeValues(value: string): ScopeValues | null {
|
|
69
|
+
let parsed: unknown;
|
|
70
|
+
try {
|
|
71
|
+
parsed = JSON.parse(value);
|
|
72
|
+
} catch {
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
const out: ScopeValues = {};
|
|
81
|
+
for (const [scopeKey, scopeValue] of Object.entries(parsed)) {
|
|
82
|
+
if (typeof scopeValue === 'string') {
|
|
83
|
+
out[scopeKey] = scopeValue;
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if (
|
|
88
|
+
Array.isArray(scopeValue) &&
|
|
89
|
+
scopeValue.every((item) => typeof item === 'string')
|
|
90
|
+
) {
|
|
91
|
+
out[scopeKey] = [...scopeValue];
|
|
92
|
+
continue;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
return null;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
return out;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
interface MemoryScopeCacheEntry {
|
|
102
|
+
scopes: ScopeValues;
|
|
103
|
+
expiresAt: number;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
export interface MemoryScopeCacheOptions {
|
|
107
|
+
ttlMs?: number;
|
|
108
|
+
maxEntries?: number;
|
|
109
|
+
now?: () => number;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
export function createMemoryScopeCache(
|
|
113
|
+
options?: MemoryScopeCacheOptions
|
|
114
|
+
): ScopeCacheBackend {
|
|
115
|
+
const ttlMs = options?.ttlMs ?? DEFAULT_MEMORY_SCOPE_CACHE_TTL_MS;
|
|
116
|
+
const maxEntries =
|
|
117
|
+
options?.maxEntries ?? DEFAULT_MEMORY_SCOPE_CACHE_MAX_ENTRIES;
|
|
118
|
+
const now = options?.now ?? Date.now;
|
|
119
|
+
const buckets = new WeakMap<object, Map<string, MemoryScopeCacheEntry>>();
|
|
120
|
+
|
|
121
|
+
function getBucket(db: object): Map<string, MemoryScopeCacheEntry> {
|
|
122
|
+
const existing = buckets.get(db);
|
|
123
|
+
if (existing) {
|
|
124
|
+
return existing;
|
|
125
|
+
}
|
|
126
|
+
const created = new Map<string, MemoryScopeCacheEntry>();
|
|
127
|
+
buckets.set(db, created);
|
|
128
|
+
return created;
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
function evictOldest(bucket: Map<string, MemoryScopeCacheEntry>): void {
|
|
132
|
+
while (bucket.size > maxEntries) {
|
|
133
|
+
const oldestKey = bucket.keys().next().value;
|
|
134
|
+
if (!oldestKey) {
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
bucket.delete(oldestKey);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
return {
|
|
142
|
+
name: 'memory',
|
|
143
|
+
async get(args) {
|
|
144
|
+
const bucket = getBucket(args.db);
|
|
145
|
+
const entry = bucket.get(args.cacheKey);
|
|
146
|
+
if (!entry) {
|
|
147
|
+
return null;
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
const nowMs = now();
|
|
151
|
+
if (entry.expiresAt <= nowMs) {
|
|
152
|
+
bucket.delete(args.cacheKey);
|
|
153
|
+
return null;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
return cloneScopeValues(entry.scopes);
|
|
157
|
+
},
|
|
158
|
+
async set(args) {
|
|
159
|
+
const bucket = getBucket(args.db);
|
|
160
|
+
if (ttlMs <= 0) {
|
|
161
|
+
bucket.delete(args.cacheKey);
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
if (bucket.has(args.cacheKey)) {
|
|
166
|
+
bucket.delete(args.cacheKey);
|
|
167
|
+
}
|
|
168
|
+
bucket.set(args.cacheKey, {
|
|
169
|
+
scopes: cloneScopeValues(args.scopes),
|
|
170
|
+
expiresAt: now() + ttlMs,
|
|
171
|
+
});
|
|
172
|
+
evictOldest(bucket);
|
|
173
|
+
},
|
|
174
|
+
async delete(args) {
|
|
175
|
+
const bucket = getBucket(args.db);
|
|
176
|
+
bucket.delete(args.cacheKey);
|
|
177
|
+
},
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
export interface DatabaseScopeCacheOptions {
|
|
182
|
+
/**
|
|
183
|
+
* Scope cache table name.
|
|
184
|
+
* Default: `sync_scope_cache`
|
|
185
|
+
*/
|
|
186
|
+
tableName?: string;
|
|
187
|
+
/**
|
|
188
|
+
* TTL for cache entries (milliseconds).
|
|
189
|
+
* Default: 60000
|
|
190
|
+
*/
|
|
191
|
+
ttlMs?: number;
|
|
192
|
+
/**
|
|
193
|
+
* Automatically creates the cache table.
|
|
194
|
+
* Default: true
|
|
195
|
+
*/
|
|
196
|
+
autoCreateTable?: boolean;
|
|
197
|
+
now?: () => Date;
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
export function createDatabaseScopeCache(
|
|
201
|
+
options?: DatabaseScopeCacheOptions
|
|
202
|
+
): ScopeCacheBackend {
|
|
203
|
+
const tableName = options?.tableName ?? DEFAULT_DATABASE_SCOPE_CACHE_TABLE;
|
|
204
|
+
const ttlMs = options?.ttlMs ?? DEFAULT_DATABASE_SCOPE_CACHE_TTL_MS;
|
|
205
|
+
const autoCreateTable = options?.autoCreateTable ?? true;
|
|
206
|
+
const now = options?.now ?? (() => new Date());
|
|
207
|
+
const schemaReady = new WeakMap<object, Promise<void>>();
|
|
208
|
+
|
|
209
|
+
async function ensureTable<DB extends SyncCoreDb>(db: Kysely<DB>) {
|
|
210
|
+
if (!autoCreateTable) {
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
const existing = schemaReady.get(db);
|
|
215
|
+
if (existing) {
|
|
216
|
+
await existing;
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
const pending = sql`
|
|
221
|
+
CREATE TABLE IF NOT EXISTS ${sql.table(tableName)} (
|
|
222
|
+
cache_key TEXT PRIMARY KEY,
|
|
223
|
+
scope_values TEXT NOT NULL,
|
|
224
|
+
expires_at TEXT NOT NULL,
|
|
225
|
+
created_at TEXT NOT NULL
|
|
226
|
+
)
|
|
227
|
+
`
|
|
228
|
+
.execute(db)
|
|
229
|
+
.then(() => undefined);
|
|
230
|
+
schemaReady.set(db, pending);
|
|
231
|
+
|
|
232
|
+
try {
|
|
233
|
+
await pending;
|
|
234
|
+
} catch (error) {
|
|
235
|
+
schemaReady.delete(db);
|
|
236
|
+
throw error;
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
async function removeCacheRow<DB extends SyncCoreDb>(args: {
|
|
241
|
+
db: Kysely<DB>;
|
|
242
|
+
cacheKey: string;
|
|
243
|
+
}): Promise<void> {
|
|
244
|
+
await sql`
|
|
245
|
+
DELETE FROM ${sql.table(tableName)}
|
|
246
|
+
WHERE cache_key = ${args.cacheKey}
|
|
247
|
+
`.execute(args.db);
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
return {
|
|
251
|
+
name: 'database',
|
|
252
|
+
async get(args) {
|
|
253
|
+
await ensureTable(args.db);
|
|
254
|
+
|
|
255
|
+
const rows = await sql<{
|
|
256
|
+
scope_values: string;
|
|
257
|
+
expires_at: string;
|
|
258
|
+
}>`
|
|
259
|
+
SELECT scope_values, expires_at
|
|
260
|
+
FROM ${sql.table(tableName)}
|
|
261
|
+
WHERE cache_key = ${args.cacheKey}
|
|
262
|
+
LIMIT 1
|
|
263
|
+
`.execute(args.db);
|
|
264
|
+
|
|
265
|
+
const row = rows.rows[0];
|
|
266
|
+
if (!row) {
|
|
267
|
+
return null;
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
const nowIso = now().toISOString();
|
|
271
|
+
if (row.expires_at <= nowIso) {
|
|
272
|
+
await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
|
|
273
|
+
return null;
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
const parsed = parseScopeValues(row.scope_values);
|
|
277
|
+
if (!parsed) {
|
|
278
|
+
await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
|
|
279
|
+
return null;
|
|
280
|
+
}
|
|
281
|
+
|
|
282
|
+
return parsed;
|
|
283
|
+
},
|
|
284
|
+
async set(args) {
|
|
285
|
+
await ensureTable(args.db);
|
|
286
|
+
|
|
287
|
+
if (ttlMs <= 0) {
|
|
288
|
+
await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
|
|
289
|
+
return;
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
const createdAt = now();
|
|
293
|
+
const expiresAt = new Date(createdAt.getTime() + ttlMs);
|
|
294
|
+
await sql`
|
|
295
|
+
INSERT INTO ${sql.table(tableName)} (
|
|
296
|
+
cache_key,
|
|
297
|
+
scope_values,
|
|
298
|
+
expires_at,
|
|
299
|
+
created_at
|
|
300
|
+
)
|
|
301
|
+
VALUES (
|
|
302
|
+
${args.cacheKey},
|
|
303
|
+
${JSON.stringify(cloneScopeValues(args.scopes))},
|
|
304
|
+
${expiresAt.toISOString()},
|
|
305
|
+
${createdAt.toISOString()}
|
|
306
|
+
)
|
|
307
|
+
ON CONFLICT (cache_key) DO UPDATE SET
|
|
308
|
+
scope_values = EXCLUDED.scope_values,
|
|
309
|
+
expires_at = EXCLUDED.expires_at,
|
|
310
|
+
created_at = EXCLUDED.created_at
|
|
311
|
+
`.execute(args.db);
|
|
312
|
+
},
|
|
313
|
+
async delete(args) {
|
|
314
|
+
await ensureTable(args.db);
|
|
315
|
+
await removeCacheRow({ db: args.db, cacheKey: args.cacheKey });
|
|
316
|
+
},
|
|
317
|
+
};
|
|
318
|
+
}
|
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it } from 'bun:test';
|
|
2
|
+
import { createDatabase } from '@syncular/core';
|
|
3
|
+
import type { Kysely } from 'kysely';
|
|
4
|
+
import { createBunSqliteDialect } from '../../../dialect-bun-sqlite/src';
|
|
5
|
+
import {
|
|
6
|
+
createServerHandler,
|
|
7
|
+
createServerHandlerCollection,
|
|
8
|
+
} from '../handlers';
|
|
9
|
+
import type { SyncCoreDb } from '../schema';
|
|
10
|
+
import { createDatabaseScopeCache, createDefaultScopeCacheKey } from './cache';
|
|
11
|
+
import { resolveEffectiveScopesForSubscriptions } from './resolve';
|
|
12
|
+
|
|
13
|
+
interface TasksTable {
|
|
14
|
+
id: string;
|
|
15
|
+
user_id: string;
|
|
16
|
+
server_version: number;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
interface TestDb extends SyncCoreDb {
|
|
20
|
+
tasks: TasksTable;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
interface ClientDb {
|
|
24
|
+
tasks: TasksTable;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
describe('resolveEffectiveScopesForSubscriptions cache behavior', () => {
|
|
28
|
+
let db: Kysely<TestDb>;
|
|
29
|
+
|
|
30
|
+
beforeEach(() => {
|
|
31
|
+
db = createDatabase<TestDb>({
|
|
32
|
+
dialect: createBunSqliteDialect({ path: ':memory:' }),
|
|
33
|
+
family: 'sqlite',
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
afterEach(async () => {
|
|
38
|
+
await db.destroy();
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
it('memoizes resolveScopes calls inside a single request', async () => {
|
|
42
|
+
let resolveCalls = 0;
|
|
43
|
+
const handler = createServerHandler<TestDb, ClientDb, 'tasks'>({
|
|
44
|
+
table: 'tasks',
|
|
45
|
+
scopes: ['user:{user_id}'],
|
|
46
|
+
resolveScopes: async (ctx) => {
|
|
47
|
+
resolveCalls += 1;
|
|
48
|
+
return { user_id: [ctx.actorId] };
|
|
49
|
+
},
|
|
50
|
+
});
|
|
51
|
+
const handlers = createServerHandlerCollection<TestDb>([handler]);
|
|
52
|
+
|
|
53
|
+
const resolved = await resolveEffectiveScopesForSubscriptions({
|
|
54
|
+
db,
|
|
55
|
+
auth: { actorId: 'u1' },
|
|
56
|
+
handlers,
|
|
57
|
+
subscriptions: [
|
|
58
|
+
{ id: 'sub-1', table: 'tasks', scopes: { user_id: 'u1' }, cursor: -1 },
|
|
59
|
+
{ id: 'sub-2', table: 'tasks', scopes: { user_id: 'u1' }, cursor: -1 },
|
|
60
|
+
],
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
expect(resolveCalls).toBe(1);
|
|
64
|
+
expect(resolved).toHaveLength(2);
|
|
65
|
+
expect(resolved.every((entry) => entry.status === 'active')).toBe(true);
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
it('uses shared cache hit and skips resolveScopes', async () => {
|
|
69
|
+
let resolveCalls = 0;
|
|
70
|
+
let cacheGetCalls = 0;
|
|
71
|
+
let cacheSetCalls = 0;
|
|
72
|
+
const handler = createServerHandler<TestDb, ClientDb, 'tasks'>({
|
|
73
|
+
table: 'tasks',
|
|
74
|
+
scopes: ['user:{user_id}'],
|
|
75
|
+
resolveScopes: async (ctx) => {
|
|
76
|
+
resolveCalls += 1;
|
|
77
|
+
return { user_id: [ctx.actorId] };
|
|
78
|
+
},
|
|
79
|
+
});
|
|
80
|
+
const handlers = createServerHandlerCollection<TestDb>([handler]);
|
|
81
|
+
|
|
82
|
+
const resolved = await resolveEffectiveScopesForSubscriptions({
|
|
83
|
+
db,
|
|
84
|
+
auth: { actorId: 'u1' },
|
|
85
|
+
handlers,
|
|
86
|
+
scopeCache: {
|
|
87
|
+
name: 'test-cache',
|
|
88
|
+
async get() {
|
|
89
|
+
cacheGetCalls += 1;
|
|
90
|
+
return { user_id: ['u1'] };
|
|
91
|
+
},
|
|
92
|
+
async set() {
|
|
93
|
+
cacheSetCalls += 1;
|
|
94
|
+
},
|
|
95
|
+
},
|
|
96
|
+
subscriptions: [
|
|
97
|
+
{ id: 'sub-1', table: 'tasks', scopes: { user_id: 'u1' }, cursor: -1 },
|
|
98
|
+
],
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
expect(resolveCalls).toBe(0);
|
|
102
|
+
expect(cacheGetCalls).toBe(1);
|
|
103
|
+
expect(cacheSetCalls).toBe(0);
|
|
104
|
+
expect(resolved[0]?.status).toBe('active');
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
it('uses request-local memoization even with shared cache misses', async () => {
|
|
108
|
+
let resolveCalls = 0;
|
|
109
|
+
let cacheGetCalls = 0;
|
|
110
|
+
let cacheSetCalls = 0;
|
|
111
|
+
const handler = createServerHandler<TestDb, ClientDb, 'tasks'>({
|
|
112
|
+
table: 'tasks',
|
|
113
|
+
scopes: ['user:{user_id}'],
|
|
114
|
+
resolveScopes: async (ctx) => {
|
|
115
|
+
resolveCalls += 1;
|
|
116
|
+
return { user_id: [ctx.actorId] };
|
|
117
|
+
},
|
|
118
|
+
});
|
|
119
|
+
const handlers = createServerHandlerCollection<TestDb>([handler]);
|
|
120
|
+
|
|
121
|
+
const resolved = await resolveEffectiveScopesForSubscriptions({
|
|
122
|
+
db,
|
|
123
|
+
auth: { actorId: 'u1' },
|
|
124
|
+
handlers,
|
|
125
|
+
scopeCache: {
|
|
126
|
+
name: 'test-cache',
|
|
127
|
+
async get() {
|
|
128
|
+
cacheGetCalls += 1;
|
|
129
|
+
return null;
|
|
130
|
+
},
|
|
131
|
+
async set() {
|
|
132
|
+
cacheSetCalls += 1;
|
|
133
|
+
},
|
|
134
|
+
},
|
|
135
|
+
subscriptions: [
|
|
136
|
+
{ id: 'sub-1', table: 'tasks', scopes: { user_id: 'u1' }, cursor: -1 },
|
|
137
|
+
{ id: 'sub-2', table: 'tasks', scopes: { user_id: 'u1' }, cursor: -1 },
|
|
138
|
+
],
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
expect(resolveCalls).toBe(1);
|
|
142
|
+
expect(cacheGetCalls).toBe(1);
|
|
143
|
+
expect(cacheSetCalls).toBe(1);
|
|
144
|
+
expect(resolved).toHaveLength(2);
|
|
145
|
+
expect(resolved.every((entry) => entry.status === 'active')).toBe(true);
|
|
146
|
+
});
|
|
147
|
+
|
|
148
|
+
it('roundtrips values through database scope cache', async () => {
|
|
149
|
+
const scopeCache = createDatabaseScopeCache();
|
|
150
|
+
const auth = { actorId: 'u1', partitionId: 'tenant-1' };
|
|
151
|
+
const cacheKey = createDefaultScopeCacheKey({ auth, table: 'tasks' });
|
|
152
|
+
const context = { db, auth, table: 'tasks', cacheKey };
|
|
153
|
+
const scopes = { user_id: ['u1', 'u2'] };
|
|
154
|
+
|
|
155
|
+
await scopeCache.set({ ...context, scopes });
|
|
156
|
+
const cachedScopes = await scopeCache.get(context);
|
|
157
|
+
|
|
158
|
+
expect(cachedScopes).toEqual(scopes);
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
it('expires entries in database scope cache', async () => {
|
|
162
|
+
let nowMs = Date.now();
|
|
163
|
+
const scopeCache = createDatabaseScopeCache({
|
|
164
|
+
ttlMs: 25,
|
|
165
|
+
now: () => new Date(nowMs),
|
|
166
|
+
});
|
|
167
|
+
const auth = { actorId: 'u1', partitionId: 'tenant-1' };
|
|
168
|
+
const cacheKey = createDefaultScopeCacheKey({ auth, table: 'tasks' });
|
|
169
|
+
const context = { db, auth, table: 'tasks', cacheKey };
|
|
170
|
+
|
|
171
|
+
await scopeCache.set({
|
|
172
|
+
...context,
|
|
173
|
+
scopes: { user_id: ['u1'] },
|
|
174
|
+
});
|
|
175
|
+
|
|
176
|
+
nowMs += 26;
|
|
177
|
+
const cachedScopes = await scopeCache.get(context);
|
|
178
|
+
expect(cachedScopes).toBeNull();
|
|
179
|
+
});
|
|
180
|
+
});
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
} from '../handlers/collection';
|
|
11
11
|
import type { SyncServerAuth } from '../handlers/types';
|
|
12
12
|
import type { SyncCoreDb } from '../schema';
|
|
13
|
+
import { createDefaultScopeCacheKey, type ScopeCacheBackend } from './cache';
|
|
13
14
|
|
|
14
15
|
export class InvalidSubscriptionScopeError extends Error {
|
|
15
16
|
constructor(message: string) {
|
|
@@ -142,9 +143,11 @@ export async function resolveEffectiveScopesForSubscriptions<
|
|
|
142
143
|
auth: Auth;
|
|
143
144
|
subscriptions: SyncSubscriptionRequest[];
|
|
144
145
|
handlers: ServerHandlerCollection<DB, Auth>;
|
|
146
|
+
scopeCache?: ScopeCacheBackend;
|
|
145
147
|
}): Promise<ResolvedSubscription[]> {
|
|
146
148
|
const out: ResolvedSubscription[] = [];
|
|
147
149
|
const seenIds = new Set<string>();
|
|
150
|
+
const requestScopeCache = new Map<string, ScopeValues | null>();
|
|
148
151
|
|
|
149
152
|
for (const sub of args.subscriptions) {
|
|
150
153
|
if (!sub.id || typeof sub.id !== 'string') {
|
|
@@ -180,21 +183,88 @@ export async function resolveEffectiveScopesForSubscriptions<
|
|
|
180
183
|
table: sub.table,
|
|
181
184
|
});
|
|
182
185
|
|
|
183
|
-
//
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
186
|
+
// Resolve allowed scopes with request-local memoization first, then
|
|
187
|
+
// optional shared cache backend, then table handler.
|
|
188
|
+
const scopeCacheKey = createDefaultScopeCacheKey({
|
|
189
|
+
auth: args.auth,
|
|
190
|
+
table: sub.table,
|
|
191
|
+
});
|
|
192
|
+
let allowed: ScopeValues | null;
|
|
193
|
+
if (requestScopeCache.has(scopeCacheKey)) {
|
|
194
|
+
allowed = requestScopeCache.get(scopeCacheKey) ?? null;
|
|
195
|
+
} else {
|
|
196
|
+
allowed = null;
|
|
197
|
+
let sharedCacheHit = false;
|
|
198
|
+
|
|
199
|
+
if (args.scopeCache) {
|
|
200
|
+
try {
|
|
201
|
+
const cachedAllowed = await args.scopeCache.get({
|
|
202
|
+
db: args.db,
|
|
203
|
+
auth: args.auth,
|
|
204
|
+
table: sub.table,
|
|
205
|
+
cacheKey: scopeCacheKey,
|
|
206
|
+
});
|
|
207
|
+
if (cachedAllowed !== null) {
|
|
208
|
+
allowed = cachedAllowed;
|
|
209
|
+
sharedCacheHit = true;
|
|
210
|
+
}
|
|
211
|
+
} catch (cacheErr) {
|
|
212
|
+
console.error(
|
|
213
|
+
`[scopeCache.get] Failed for table ${sub.table}, subscription ${sub.id}:`,
|
|
214
|
+
cacheErr
|
|
215
|
+
);
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
if (!sharedCacheHit) {
|
|
220
|
+
try {
|
|
221
|
+
allowed = await handler.resolveScopes({
|
|
222
|
+
db: args.db,
|
|
223
|
+
actorId: args.auth.actorId,
|
|
224
|
+
auth: args.auth,
|
|
225
|
+
});
|
|
226
|
+
} catch (resolveErr) {
|
|
227
|
+
// Scope resolution failed - mark subscription as revoked
|
|
228
|
+
// rather than failing the entire pull
|
|
229
|
+
console.error(
|
|
230
|
+
`[resolveScopes] Failed for table ${sub.table}, subscription ${sub.id}:`,
|
|
231
|
+
resolveErr
|
|
232
|
+
);
|
|
233
|
+
requestScopeCache.set(scopeCacheKey, null);
|
|
234
|
+
out.push({
|
|
235
|
+
id: sub.id,
|
|
236
|
+
table: sub.table,
|
|
237
|
+
scopes: {},
|
|
238
|
+
params: sub.params,
|
|
239
|
+
cursor: sub.cursor,
|
|
240
|
+
bootstrapState: sub.bootstrapState ?? null,
|
|
241
|
+
status: 'revoked',
|
|
242
|
+
});
|
|
243
|
+
continue;
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
if (args.scopeCache && allowed !== null) {
|
|
247
|
+
try {
|
|
248
|
+
await args.scopeCache.set({
|
|
249
|
+
db: args.db,
|
|
250
|
+
auth: args.auth,
|
|
251
|
+
table: sub.table,
|
|
252
|
+
cacheKey: scopeCacheKey,
|
|
253
|
+
scopes: allowed,
|
|
254
|
+
});
|
|
255
|
+
} catch (cacheErr) {
|
|
256
|
+
console.error(
|
|
257
|
+
`[scopeCache.set] Failed for table ${sub.table}, subscription ${sub.id}:`,
|
|
258
|
+
cacheErr
|
|
259
|
+
);
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
requestScopeCache.set(scopeCacheKey, allowed);
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
if (!allowed) {
|
|
198
268
|
out.push({
|
|
199
269
|
id: sub.id,
|
|
200
270
|
table: sub.table,
|