@livestore/adapter-cloudflare 0.5.0-dev.0 → 0.5.0-dev.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/WebSocket.d.ts.map +1 -1
- package/dist/create-store-do.d.ts +20 -5
- package/dist/create-store-do.d.ts.map +1 -1
- package/dist/create-store-do.js +12 -7
- package/dist/create-store-do.js.map +1 -1
- package/dist/make-adapter.d.ts.map +1 -1
- package/dist/make-adapter.js +11 -4
- package/dist/make-adapter.js.map +1 -1
- package/dist/make-sqlite-db.d.ts.map +1 -1
- package/dist/mod.js +3 -3
- package/dist/state-files.d.ts +7 -0
- package/dist/state-files.d.ts.map +1 -0
- package/dist/state-files.js +14 -0
- package/dist/state-files.js.map +1 -0
- package/package.json +42 -42
- package/src/create-store-do.ts +29 -8
- package/src/make-adapter.ts +14 -2
- package/src/state-files.ts +23 -0
package/dist/WebSocket.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocket.d.ts","sourceRoot":"","sources":["../src/WebSocket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAkB,KAAK,QAAQ,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC3F,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAO3D;;;GAGG;AACH,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"WebSocket.d.ts","sourceRoot":"","sources":["../src/WebSocket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAkB,KAAK,QAAQ,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC3F,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAA;AAO3D;;;GAGG;AACH,eAAO,MAAM,aAAa,uCAKvB;IACD,+CAA+C;IAC/C,aAAa,EAAE,OAAO,CAAC,iBAAiB,CAAA;IACxC,GAAG,EAAE,GAAG,CAAA;IACR,SAAS,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,KAAK,CAAA;CAC/C,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,cAAc,EAAE,KAAK,CAAC,KAAK,CAkDtE,CAAA"}
|
|
@@ -15,6 +15,18 @@ export type CreateStoreDoOptions<TSchema extends LiveStoreSchema, TEnv, TState>
|
|
|
15
15
|
clientId: string;
|
|
16
16
|
/** Identifier for the LiveStore session running inside the Durable Object. */
|
|
17
17
|
sessionId: string;
|
|
18
|
+
/** Advanced per-client runtime tuning parameters. */
|
|
19
|
+
params?: {
|
|
20
|
+
/**
|
|
21
|
+
* Number of events read and committed per batch when rebuilding SQLite state from the event log.
|
|
22
|
+
* Lower values reduce per-batch resource usage but perform more queries and savepoints.
|
|
23
|
+
* This setting applies to future rebuilds and does not change schema identity.
|
|
24
|
+
*
|
|
25
|
+
* @default 100
|
|
26
|
+
* @minimum 1
|
|
27
|
+
*/
|
|
28
|
+
stateRebuildBatchSize?: number;
|
|
29
|
+
};
|
|
18
30
|
/** Runtime details about the Durable Object this store runs inside. Needed for sync backend to call back to this instance. */
|
|
19
31
|
durableObject: {
|
|
20
32
|
/** Durable Object state handle (e.g. `this.ctx`). */
|
|
@@ -24,8 +36,11 @@ export type CreateStoreDoOptions<TSchema extends LiveStoreSchema, TEnv, TState>
|
|
|
24
36
|
/** Binding name Cloudflare uses to reach this Durable Object from other workers. */
|
|
25
37
|
bindingName: HelperTypes.ExtractDurableObjectKeys<NoInfer<TEnv>>;
|
|
26
38
|
};
|
|
27
|
-
/**
|
|
28
|
-
|
|
39
|
+
/**
|
|
40
|
+
* Returns an RPC stub pointing at the sync backend Durable Object used for replication. Called for every sync
|
|
41
|
+
* call, because Cloudflare leaves a stub broken after many exceptions, so a retry needs a fresh one.
|
|
42
|
+
*/
|
|
43
|
+
getSyncBackendStub: () => CfTypes.DurableObjectStub<CfSyncBackend.SyncBackendRpcInterface>;
|
|
29
44
|
/**
|
|
30
45
|
* Enables live pull mode to receive sync updates via Durable Object RPC callbacks.
|
|
31
46
|
*
|
|
@@ -75,7 +90,7 @@ export type CreateStoreDoOptions<TSchema extends LiveStoreSchema, TEnv, TState>
|
|
|
75
90
|
* env: this.env,
|
|
76
91
|
* bindingName: 'MY_DO',
|
|
77
92
|
* },
|
|
78
|
-
*
|
|
93
|
+
* getSyncBackendStub: () => this.env.SYNC_BACKEND_DO.get(syncBackendId),
|
|
79
94
|
* }).pipe(Effect.runPromise)
|
|
80
95
|
* }
|
|
81
96
|
* // Use this.store...
|
|
@@ -85,7 +100,7 @@ export type CreateStoreDoOptions<TSchema extends LiveStoreSchema, TEnv, TState>
|
|
|
85
100
|
*
|
|
86
101
|
* @see https://livestore.dev/docs/reference/adapters/cloudflare for setup guide
|
|
87
102
|
*/
|
|
88
|
-
export declare const createStoreDo: <TSchema extends LiveStoreSchema, TEnv, TState extends CfTypes.DurableObjectState = CfTypes.DurableObjectState>({ schema, storeId, clientId, sessionId, durableObject,
|
|
103
|
+
export declare const createStoreDo: <TSchema extends LiveStoreSchema, TEnv, TState extends CfTypes.DurableObjectState = CfTypes.DurableObjectState>({ schema, storeId, clientId, sessionId, durableObject, getSyncBackendStub, livePull, resetPersistence, initialSyncOptions, params, }: CreateStoreDoOptions<TSchema, TEnv, TState>) => Effect.Effect<import("@livestore/livestore").Store<TSchema, {}>, import("@livestore/common").UnknownError, never>;
|
|
89
104
|
/**
|
|
90
105
|
* Promise-based wrapper around `createStoreDo` for simpler async/await usage.
|
|
91
106
|
*
|
|
@@ -104,7 +119,7 @@ export declare const createStoreDo: <TSchema extends LiveStoreSchema, TEnv, TSta
|
|
|
104
119
|
* clientId: this.ctx.id.toString(),
|
|
105
120
|
* sessionId: 'do-session',
|
|
106
121
|
* durableObject: { ctx: this.ctx, env: this.env, bindingName: 'MY_DO' },
|
|
107
|
-
*
|
|
122
|
+
* getSyncBackendStub: () => this.env.SYNC_BACKEND_DO.get(syncBackendId),
|
|
108
123
|
* })
|
|
109
124
|
* // Use store...
|
|
110
125
|
* }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-store-do.d.ts","sourceRoot":"","sources":["../src/create-store-do.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAe,KAAK,eAAe,EAAe,MAAM,sBAAsB,CAAA;AACrF,OAAO,KAAK,KAAK,aAAa,MAAM,8BAA8B,CAAA;AAGlE,OAAO,EAAE,MAAM,EAA4B,MAAM,yBAAyB,CAAA;AAI1E,MAAM,MAAM,GAAG,GAAG;IAChB,eAAe,EAAE,OAAO,CAAC,sBAAsB,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAA;CACvF,CAAA;AAED,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,eAAe,EAAE,IAAI,EAAE,MAAM,IAAI;IAChF,uEAAuE;IACvE,MAAM,EAAE,OAAO,CAAA;IACf,qFAAqF;IACrF,OAAO,EAAE,MAAM,CAAA;IACf,8EAA8E;IAC9E,QAAQ,EAAE,MAAM,CAAA;IAChB,8EAA8E;IAC9E,SAAS,EAAE,MAAM,CAAA;IACjB,8HAA8H;IAC9H,aAAa,EAAE;QACb,qDAAqD;QACrD,GAAG,EAAE,MAAM,CAAA;QACX,+DAA+D;QAC/D,GAAG,EAAE,IAAI,CAAA;QACT,oFAAoF;QACpF,WAAW,EAAE,WAAW,CAAC,wBAAwB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;KACjE,CAAA;IACD
|
|
1
|
+
{"version":3,"file":"create-store-do.d.ts","sourceRoot":"","sources":["../src/create-store-do.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAe,KAAK,eAAe,EAAe,MAAM,sBAAsB,CAAA;AACrF,OAAO,KAAK,KAAK,aAAa,MAAM,8BAA8B,CAAA;AAGlE,OAAO,EAAE,MAAM,EAA4B,MAAM,yBAAyB,CAAA;AAI1E,MAAM,MAAM,GAAG,GAAG;IAChB,eAAe,EAAE,OAAO,CAAC,sBAAsB,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAA;CACvF,CAAA;AAED,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,eAAe,EAAE,IAAI,EAAE,MAAM,IAAI;IAChF,uEAAuE;IACvE,MAAM,EAAE,OAAO,CAAA;IACf,qFAAqF;IACrF,OAAO,EAAE,MAAM,CAAA;IACf,8EAA8E;IAC9E,QAAQ,EAAE,MAAM,CAAA;IAChB,8EAA8E;IAC9E,SAAS,EAAE,MAAM,CAAA;IACjB,qDAAqD;IACrD,MAAM,CAAC,EAAE;QACP;;;;;;;WAOG;QACH,qBAAqB,CAAC,EAAE,MAAM,CAAA;KAC/B,CAAA;IACD,8HAA8H;IAC9H,aAAa,EAAE;QACb,qDAAqD;QACrD,GAAG,EAAE,MAAM,CAAA;QACX,+DAA+D;QAC/D,GAAG,EAAE,IAAI,CAAA;QACT,oFAAoF;QACpF,WAAW,EAAE,WAAW,CAAC,wBAAwB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;KACjE,CAAA;IACD;;;OAGG;IACH,kBAAkB,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAA;IAC1F;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,WAAW,CAAC,oBAAoB,CAAC,CAAA;CACvD,GAAG,SAAS,CAAC,aAAa,CAAA;AAE3B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AAEH,eAAO,MAAM,aAAa,GACxB,OAAO,SAAS,eAAe,EAC/B,IAAI,EACJ,MAAM,SAAS,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,wIAYrE,oBAAoB,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,sHA6B1C,CAAA;AAEJ;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,oBAAoB,GAC/B,OAAO,SAAS,eAAe,EAC/B,IAAI,EACJ,MAAM,SAAS,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,WAE7D,oBAAoB,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,+DAWnD,CAAA"}
|
package/dist/create-store-do.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { createStore, provideOtel } from '@livestore/livestore';
|
|
2
2
|
import { makeDoRpcSync } from '@livestore/sync-cf/client';
|
|
3
|
-
import { isDevEnv } from '@livestore/utils';
|
|
3
|
+
import { isDevEnv, omitUndefineds } from '@livestore/utils';
|
|
4
4
|
import { Effect, Layer, References, Scope } from '@livestore/utils/effect';
|
|
5
|
-
import { makeAdapter } from
|
|
5
|
+
import { makeAdapter } from './make-adapter.js';
|
|
6
6
|
/**
|
|
7
7
|
* Creates a LiveStore instance inside a Cloudflare Durable Object.
|
|
8
8
|
*
|
|
@@ -33,7 +33,7 @@ import { makeAdapter } from "./make-adapter.js";
|
|
|
33
33
|
* env: this.env,
|
|
34
34
|
* bindingName: 'MY_DO',
|
|
35
35
|
* },
|
|
36
|
-
*
|
|
36
|
+
* getSyncBackendStub: () => this.env.SYNC_BACKEND_DO.get(syncBackendId),
|
|
37
37
|
* }).pipe(Effect.runPromise)
|
|
38
38
|
* }
|
|
39
39
|
* // Use this.store...
|
|
@@ -44,7 +44,7 @@ import { makeAdapter } from "./make-adapter.js";
|
|
|
44
44
|
* @see https://livestore.dev/docs/reference/adapters/cloudflare for setup guide
|
|
45
45
|
*/
|
|
46
46
|
// TODO Also support in Cloudflare workers outside of a durable object context.
|
|
47
|
-
export const createStoreDo = ({ schema, storeId, clientId, sessionId, durableObject,
|
|
47
|
+
export const createStoreDo = ({ schema, storeId, clientId, sessionId, durableObject, getSyncBackendStub, livePull = false, resetPersistence = false, initialSyncOptions = { _tag: 'Blocking', timeout: 500 }, params, }) => Effect.gen(function* () {
|
|
48
48
|
const { ctx, bindingName } = durableObject;
|
|
49
49
|
const storage = ctx.storage;
|
|
50
50
|
const durableObjectId = ctx.id.toString();
|
|
@@ -56,7 +56,7 @@ export const createStoreDo = ({ schema, storeId, clientId, sessionId, durableObj
|
|
|
56
56
|
resetPersistence,
|
|
57
57
|
syncOptions: {
|
|
58
58
|
backend: makeDoRpcSync({
|
|
59
|
-
|
|
59
|
+
getSyncBackendStub,
|
|
60
60
|
durableObjectState: ctx,
|
|
61
61
|
durableObjectContext: { bindingName, durableObjectId },
|
|
62
62
|
}),
|
|
@@ -64,7 +64,12 @@ export const createStoreDo = ({ schema, storeId, clientId, sessionId, durableObj
|
|
|
64
64
|
initialSyncOptions,
|
|
65
65
|
},
|
|
66
66
|
});
|
|
67
|
-
return yield* createStore({
|
|
67
|
+
return yield* createStore({
|
|
68
|
+
schema,
|
|
69
|
+
adapter,
|
|
70
|
+
storeId,
|
|
71
|
+
...omitUndefineds({ params }),
|
|
72
|
+
}).pipe(Scope.provide(scope), provideOtel({}));
|
|
68
73
|
});
|
|
69
74
|
/**
|
|
70
75
|
* Promise-based wrapper around `createStoreDo` for simpler async/await usage.
|
|
@@ -84,7 +89,7 @@ export const createStoreDo = ({ schema, storeId, clientId, sessionId, durableObj
|
|
|
84
89
|
* clientId: this.ctx.id.toString(),
|
|
85
90
|
* sessionId: 'do-session',
|
|
86
91
|
* durableObject: { ctx: this.ctx, env: this.env, bindingName: 'MY_DO' },
|
|
87
|
-
*
|
|
92
|
+
* getSyncBackendStub: () => this.env.SYNC_BACKEND_DO.get(syncBackendId),
|
|
88
93
|
* })
|
|
89
94
|
* // Use store...
|
|
90
95
|
* }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-store-do.js","sourceRoot":"","sources":["../src/create-store-do.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAwB,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAErF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"create-store-do.js","sourceRoot":"","sources":["../src/create-store-do.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAwB,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAErF,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAC3D,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AA6D/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,+EAA+E;AAC/E,MAAM,CAAC,MAAM,aAAa,GAAG,CAI3B,EACA,MAAM,EACN,OAAO,EACP,QAAQ,EACR,SAAS,EACT,aAAa,EACb,kBAAkB,EAClB,QAAQ,GAAG,KAAK,EAChB,gBAAgB,GAAG,KAAK,EACxB,kBAAkB,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE,EACvD,MAAM,GACsC,EAAE,EAAE,CAChD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,aAAa,CAAA;IAC1C,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,MAAM,eAAe,GAAG,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAA;IACzC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;IAEjC,MAAM,OAAO,GAAG,WAAW,CAAC;QAC1B,QAAQ;QACR,SAAS;QACT,OAAO;QACP,gBAAgB;QAChB,WAAW,EAAE;YACX,OAAO,EAAE,aAAa,CAAC;gBACrB,kBAAkB;gBAClB,kBAAkB,EAAE,GAAG;gBACvB,oBAAoB,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE;aACvD,CAAC;YACF,QAAQ,EAAE,0CAA0C;YACpD,kBAAkB;SACnB;KACF,CAAC,CAAA;IAEF,OAAO,KAAK,CAAC,CAAC,WAAW,CAAC;QACxB,MAAM;QACN,OAAO;QACP,OAAO;QACP,GAAG,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;KAC9B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,CAAA;AAChD,CAAC,CAAC,CAAA;AAEJ;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAKlC,OAAoD,EACpD,EAAE,CACF,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,CACzB,MAAM,CAAC,OAAO,CACZ,KAAK,CAAC,QAAQ,CACZ,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,EAC7B,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,EAAE,OAAO,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CACxG,CACF,EACD,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,UAAU,CAClB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-adapter.d.ts","sourceRoot":"","sources":["../src/make-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAKZ,KAAK,WAAW,EAGjB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"make-adapter.d.ts","sourceRoot":"","sources":["../src/make-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EAKZ,KAAK,WAAW,EAGjB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAiBnD,eAAO,MAAM,WAAW,qEAOnB;IACD,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAA;IACrC,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,WAAW,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,KAAG,OA6ID,CAAA"}
|
package/dist/make-adapter.js
CHANGED
|
@@ -5,11 +5,12 @@ import { LiveStoreEvent } from '@livestore/livestore';
|
|
|
5
5
|
import { CF_SQL_VFS_REQUIRED_PRAGMAS, sqliteDbFactory } from '@livestore/sqlite-wasm/cf';
|
|
6
6
|
import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm';
|
|
7
7
|
import { Effect, FetchHttpClient, Layer, Queue, Schedule, SubscriptionRef, WebChannel } from '@livestore/utils/effect';
|
|
8
|
-
import { makeSqliteDb as makeDoSqliteDb } from
|
|
8
|
+
import { makeSqliteDb as makeDoSqliteDb } from './make-sqlite-db.js';
|
|
9
|
+
import * as StateFiles from './state-files.js';
|
|
9
10
|
export const makeAdapter = ({ storage, clientId, syncOptions, sessionId, resetPersistence = false, }) => (adapterArgs) => Effect.gen(function* () {
|
|
10
11
|
const { storeId,
|
|
11
12
|
/* devtoolsEnabled, shutdown, bootStatusQueue, */
|
|
12
|
-
syncPayloadEncoded, syncPayloadSchema, schema, } = adapterArgs;
|
|
13
|
+
syncPayloadEncoded, syncPayloadSchema, schema, params, } = adapterArgs;
|
|
13
14
|
const devtoolsOptions = { enabled: false };
|
|
14
15
|
const sqlite3 = yield* Effect.promise(() => loadSqlite3Wasm());
|
|
15
16
|
const makeSqliteDb = sqliteDbFactory({ sqlite3 });
|
|
@@ -17,10 +18,12 @@ export const makeAdapter = ({ storage, clientId, syncOptions, sessionId, resetPe
|
|
|
17
18
|
if (resetPersistence === true) {
|
|
18
19
|
yield* resetDurableObjectPersistence({ storage, storeId });
|
|
19
20
|
}
|
|
21
|
+
const stateFileName = `${getStateDbBaseName(schema)}@${liveStoreStorageFormatVersion}.db`;
|
|
22
|
+
yield* StateFiles.register(storage, stateFileName).pipe(UnknownError.mapToUnknownError);
|
|
20
23
|
const dbState = yield* makeSqliteDb({
|
|
21
24
|
_tag: 'storage',
|
|
22
25
|
storage,
|
|
23
|
-
fileName:
|
|
26
|
+
fileName: stateFileName,
|
|
24
27
|
configureDb: (db) => db.execute([...CF_SQL_VFS_REQUIRED_PRAGMAS, 'cache_size=-8000'].map((p) => `PRAGMA ${p}`).join(';\n')),
|
|
25
28
|
}).pipe(UnknownError.mapToUnknownError);
|
|
26
29
|
// dbEventlog runs on DO SQLite directly (not through the VFS). SQL-level transaction
|
|
@@ -44,6 +47,7 @@ export const makeAdapter = ({ storage, clientId, syncOptions, sessionId, resetPe
|
|
|
44
47
|
shutdownChannel,
|
|
45
48
|
syncPayloadEncoded,
|
|
46
49
|
syncPayloadSchema,
|
|
50
|
+
params,
|
|
47
51
|
}).pipe(Layer.provide(StateHead.layer({ dbState }))));
|
|
48
52
|
const { leaderThread, initialSnapshot } = yield* Effect.gen(function* () {
|
|
49
53
|
const { dbState, dbEventlog, syncProcessor, extraIncomingMessagesQueue, initialState, networkStatus } = yield* LeaderThreadCtx;
|
|
@@ -100,16 +104,19 @@ export const makeAdapter = ({ storage, clientId, syncOptions, sessionId, resetPe
|
|
|
100
104
|
registerBeforeUnload: (_onBeforeUnload) => () => { },
|
|
101
105
|
origin: undefined,
|
|
102
106
|
});
|
|
107
|
+
yield* StateFiles.cleanup(storage, stateFileName).pipe(Effect.catch((cause) => Effect.logWarning('Failed to clean up obsolete state databases', cause)));
|
|
103
108
|
return clientSession;
|
|
104
109
|
}).pipe(Effect.withSpan('@livestore/adapter-cloudflare:makeAdapter', { attributes: { clientId, sessionId } }), Effect.provide(FetchHttpClient.layer));
|
|
105
110
|
const resetDurableObjectPersistence = ({ storage, storeId, }) => Effect.try({
|
|
106
111
|
try: () =>
|
|
107
|
-
// All
|
|
112
|
+
// All four tables live in the DO's single storage.sql database but are
|
|
108
113
|
// owned by different layers during normal operation:
|
|
109
114
|
// - vfs_pages: written by the wa-sqlite VFS layer (backs dbState)
|
|
110
115
|
// - eventlog, __livestore_sync_status: written directly by dbEventlog via storage.sql
|
|
116
|
+
// - __livestore_state_files: adapter-owned state file registry
|
|
111
117
|
storage.transactionSync(() => {
|
|
112
118
|
safeSqlExec(storage, 'DELETE FROM vfs_pages');
|
|
119
|
+
safeSqlExec(storage, 'DELETE FROM __livestore_state_files');
|
|
113
120
|
safeSqlExec(storage, 'DELETE FROM eventlog');
|
|
114
121
|
safeSqlExec(storage, 'DELETE FROM __livestore_sync_status');
|
|
115
122
|
}),
|
package/dist/make-adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-adapter.js","sourceRoot":"","sources":["../src/make-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,8BAA8B,EAE9B,6BAA6B,EAC7B,iBAAiB,EAEjB,YAAY,EACZ,SAAS,GACV,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAEL,QAAQ,EACR,eAAe,EACf,qBAAqB,EACrB,yBAAyB,GAC1B,MAAM,iCAAiC,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,2BAA2B,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEtH,OAAO,EAAE,YAAY,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"make-adapter.js","sourceRoot":"","sources":["../src/make-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-sqlite-db.d.ts","sourceRoot":"","sources":["../src/make-sqlite-db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EAGf,QAAQ,EAGT,MAAM,mBAAmB,CAAA;AAE1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAiEnD,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,KAAK,EAAE,uBAAuB,CAAA;IAC9B,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACpC,CAAA;AAED,KAAK,uBAAuB,GACxB;IACE,IAAI,EAAE,MAAM,CAAA;IAGZ,EAAE,EAAE,OAAO,CAAC,UAAU,CAAA;IACtB,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACpC,GACD;IACE,IAAI,EAAE,WAAW,CAAA;IACjB,EAAE,EAAE,OAAO,CAAC,UAAU,CAAA;IACtB,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACpC,CAAA;AAEL,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAAC,QAAQ,EAAE,uBAAuB,EAAE;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GAAG,QAAQ,CAAC,CAAA;AAEvH,eAAO,MAAM,YAAY,EAAE,sBA2BvB,CAAA;AAEJ,eAAO,MAAM,aAAa,GACxB,SAAS,SAAS;IAChB,eAAe,EAAE,eAAe,CAAA;IAChC,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC,KAAK,IAAI,CAAA;CAC/C,
|
|
1
|
+
{"version":3,"file":"make-sqlite-db.d.ts","sourceRoot":"","sources":["../src/make-sqlite-db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EAGf,QAAQ,EAGT,MAAM,mBAAmB,CAAA;AAE1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAiEnD,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,eAAe,CAAA;IAChC,KAAK,EAAE,uBAAuB,CAAA;IAC9B,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACpC,CAAA;AAED,KAAK,uBAAuB,GACxB;IACE,IAAI,EAAE,MAAM,CAAA;IAGZ,EAAE,EAAE,OAAO,CAAC,UAAU,CAAA;IACtB,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACpC,GACD;IACE,IAAI,EAAE,WAAW,CAAA;IACjB,EAAE,EAAE,OAAO,CAAC,UAAU,CAAA;IACtB,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAA;CACpC,CAAA;AAEL,MAAM,MAAM,sBAAsB,GAAG,YAAY,CAAC,QAAQ,EAAE,uBAAuB,EAAE;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GAAG,QAAQ,CAAC,CAAA;AAEvH,eAAO,MAAM,YAAY,EAAE,sBA2BvB,CAAA;AAEJ,eAAO,MAAM,aAAa,GACxB,SAAS,SAAS;IAChB,eAAe,EAAE,eAAe,CAAA;IAChC,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC,KAAK,IAAI,CAAA;CAC/C,6BAIA;IACD,UAAU,EAAE,OAAO,CAAC,UAAU,CAAA;IAC9B,QAAQ,EAAE,SAAS,CAAA;CACpB,KAAG,QAAQ,CAAC,SAAS,CAkHrB,CAAA"}
|
package/dist/mod.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
2
|
-
export { createStoreDo, createStoreDoPromise } from
|
|
3
|
-
export { makeAdapter } from
|
|
1
|
+
import './polyfill.js';
|
|
2
|
+
export { createStoreDo, createStoreDoPromise } from './create-store-do.js';
|
|
3
|
+
export { makeAdapter } from './make-adapter.js';
|
|
4
4
|
//# sourceMappingURL=mod.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { CfTypes } from '@livestore/common-cf';
|
|
2
|
+
import { Effect } from '@livestore/utils/effect';
|
|
3
|
+
/** Record ownership before opening state so interrupted rebuilds remain eligible for cleanup. */
|
|
4
|
+
export declare const register: (storage: CfTypes.DurableObjectStorage, fileName: string) => Effect.Effect<void, import("effect/Cause").UnknownError, never>;
|
|
5
|
+
/** Keep ownership records until their pages are deleted, so failed cleanup can be retried. */
|
|
6
|
+
export declare const cleanup: (storage: CfTypes.DurableObjectStorage, fileName: string) => Effect.Effect<void, import("effect/Cause").UnknownError, never>;
|
|
7
|
+
//# sourceMappingURL=state-files.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"state-files.d.ts","sourceRoot":"","sources":["../src/state-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,iGAAiG;AACjG,eAAO,MAAM,QAAQ,YAAa,OAAO,CAAC,oBAAoB,YAAY,MAAM,oEAI5E,CAAA;AAEJ,8FAA8F;AAC9F,eAAO,MAAM,OAAO,YAAa,OAAO,CAAC,oBAAoB,YAAY,MAAM,oEAW5E,CAAA"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Effect } from '@livestore/utils/effect';
|
|
2
|
+
/** Record ownership before opening state so interrupted rebuilds remain eligible for cleanup. */
|
|
3
|
+
export const register = (storage, fileName) => Effect.try(() => {
|
|
4
|
+
storage.sql.exec(`CREATE TABLE IF NOT EXISTS __livestore_state_files (file_path TEXT PRIMARY KEY) WITHOUT ROWID`);
|
|
5
|
+
storage.sql.exec('INSERT OR IGNORE INTO __livestore_state_files (file_path) VALUES (?)', `/${fileName}`);
|
|
6
|
+
});
|
|
7
|
+
/** Keep ownership records until their pages are deleted, so failed cleanup can be retried. */
|
|
8
|
+
export const cleanup = (storage, fileName) => Effect.try(() => storage.transactionSync(() => {
|
|
9
|
+
storage.sql.exec(`DELETE FROM vfs_pages WHERE file_path IN (
|
|
10
|
+
SELECT file_path FROM __livestore_state_files WHERE file_path != ?
|
|
11
|
+
)`, `/${fileName}`);
|
|
12
|
+
storage.sql.exec('DELETE FROM __livestore_state_files WHERE file_path != ?', `/${fileName}`);
|
|
13
|
+
}));
|
|
14
|
+
//# sourceMappingURL=state-files.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"state-files.js","sourceRoot":"","sources":["../src/state-files.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,iGAAiG;AACjG,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,OAAqC,EAAE,QAAgB,EAAE,EAAE,CAClF,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE;IACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,+FAA+F,CAAC,CAAA;IACjH,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,sEAAsE,EAAE,IAAI,QAAQ,EAAE,CAAC,CAAA;AAC1G,CAAC,CAAC,CAAA;AAEJ,8FAA8F;AAC9F,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,OAAqC,EAAE,QAAgB,EAAE,EAAE,CACjF,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CACd,OAAO,CAAC,eAAe,CAAC,GAAG,EAAE;IAC3B,OAAO,CAAC,GAAG,CAAC,IAAI,CACd;;UAEE,EACF,IAAI,QAAQ,EAAE,CACf,CAAA;IACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,0DAA0D,EAAE,IAAI,QAAQ,EAAE,CAAC,CAAA;AAC9F,CAAC,CAAC,CACH,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,68 +1,68 @@
|
|
|
1
1
|
{
|
|
2
|
+
"$genie": {
|
|
3
|
+
"source": "package.json.genie.ts",
|
|
4
|
+
"warning": "DO NOT EDIT - changes will be overwritten",
|
|
5
|
+
"workspaceClosureDirs": [
|
|
6
|
+
"packages/@livestore/adapter-cloudflare",
|
|
7
|
+
"packages/@livestore/adapter-web",
|
|
8
|
+
"packages/@livestore/common",
|
|
9
|
+
"packages/@livestore/common-cf",
|
|
10
|
+
"packages/@livestore/livestore",
|
|
11
|
+
"packages/@livestore/sqlite-wasm",
|
|
12
|
+
"packages/@livestore/sync-cf",
|
|
13
|
+
"packages/@livestore/utils",
|
|
14
|
+
"packages/@livestore/utils-dev",
|
|
15
|
+
"packages/@livestore/wa-sqlite",
|
|
16
|
+
"packages/@livestore/webmesh"
|
|
17
|
+
]
|
|
18
|
+
},
|
|
2
19
|
"name": "@livestore/adapter-cloudflare",
|
|
3
|
-
"version": "0.5.0-dev.
|
|
20
|
+
"version": "0.5.0-dev.1",
|
|
21
|
+
"type": "module",
|
|
22
|
+
"sideEffects": [
|
|
23
|
+
"./src/polyfill.ts",
|
|
24
|
+
"./dist/polyfill.js"
|
|
25
|
+
],
|
|
4
26
|
"license": "Apache-2.0",
|
|
5
27
|
"repository": {
|
|
6
28
|
"type": "git",
|
|
7
29
|
"url": "git+https://github.com/livestorejs/livestore.git"
|
|
8
30
|
},
|
|
31
|
+
"exports": {
|
|
32
|
+
".": "./dist/mod.js",
|
|
33
|
+
"./polyfill": "./dist/polyfill.js"
|
|
34
|
+
},
|
|
9
35
|
"files": [
|
|
10
36
|
"dist",
|
|
11
37
|
"package.json",
|
|
12
38
|
"src"
|
|
13
39
|
],
|
|
14
|
-
"type": "module",
|
|
15
|
-
"sideEffects": [
|
|
16
|
-
"./src/polyfill.ts",
|
|
17
|
-
"./dist/polyfill.js"
|
|
18
|
-
],
|
|
19
|
-
"exports": {
|
|
20
|
-
".": "./dist/mod.js",
|
|
21
|
-
"./polyfill": "./dist/polyfill.js"
|
|
22
|
-
},
|
|
23
|
-
"publishConfig": {
|
|
24
|
-
"access": "public"
|
|
25
|
-
},
|
|
26
40
|
"dependencies": {
|
|
27
41
|
"@cloudflare/workers-types": "4.20251118.0",
|
|
28
|
-
"@livestore/common": "^0.5.0-dev.
|
|
29
|
-
"@livestore/
|
|
30
|
-
"@livestore/
|
|
31
|
-
"@livestore/sqlite-wasm": "^0.5.0-dev.
|
|
32
|
-
"@livestore/sync-cf": "^0.5.0-dev.
|
|
33
|
-
"@livestore/utils": "^0.5.0-dev.
|
|
42
|
+
"@livestore/common": "^0.5.0-dev.1",
|
|
43
|
+
"@livestore/common-cf": "^0.5.0-dev.1",
|
|
44
|
+
"@livestore/livestore": "^0.5.0-dev.1",
|
|
45
|
+
"@livestore/sqlite-wasm": "^0.5.0-dev.1",
|
|
46
|
+
"@livestore/sync-cf": "^0.5.0-dev.1",
|
|
47
|
+
"@livestore/utils": "^0.5.0-dev.1"
|
|
34
48
|
},
|
|
35
49
|
"devDependencies": {
|
|
36
50
|
"wrangler": "4.42.2"
|
|
37
51
|
},
|
|
38
52
|
"peerDependencies": {
|
|
39
|
-
"@effect/opentelemetry": "^4.0.
|
|
40
|
-
"@effect/platform-browser": "^4.0.
|
|
41
|
-
"@effect/platform-bun": "^4.0.
|
|
42
|
-
"@effect/platform-node": "^4.0.
|
|
43
|
-
"@effect/platform-node-shared": "^4.0.
|
|
44
|
-
"@effect/vitest": "^4.0.
|
|
53
|
+
"@effect/opentelemetry": "^4.0.3",
|
|
54
|
+
"@effect/platform-browser": "^4.0.3",
|
|
55
|
+
"@effect/platform-bun": "^4.0.3",
|
|
56
|
+
"@effect/platform-node": "^4.0.3",
|
|
57
|
+
"@effect/platform-node-shared": "^4.0.3",
|
|
58
|
+
"@effect/vitest": "^4.0.3",
|
|
45
59
|
"@opentelemetry/api": "^1.9.0",
|
|
46
60
|
"@opentelemetry/resources": "^2.2.0",
|
|
47
61
|
"@standard-schema/spec": "^1.1.0",
|
|
48
|
-
"effect": "^4.0.
|
|
62
|
+
"effect": "^4.0.3"
|
|
49
63
|
},
|
|
50
|
-
"
|
|
51
|
-
"
|
|
52
|
-
"warning": "DO NOT EDIT - changes will be overwritten",
|
|
53
|
-
"workspaceClosureDirs": [
|
|
54
|
-
"packages/@livestore/adapter-cloudflare",
|
|
55
|
-
"packages/@livestore/adapter-web",
|
|
56
|
-
"packages/@livestore/common",
|
|
57
|
-
"packages/@livestore/common-cf",
|
|
58
|
-
"packages/@livestore/livestore",
|
|
59
|
-
"packages/@livestore/sqlite-wasm",
|
|
60
|
-
"packages/@livestore/sync-cf",
|
|
61
|
-
"packages/@livestore/utils",
|
|
62
|
-
"packages/@livestore/utils-dev",
|
|
63
|
-
"packages/@livestore/wa-sqlite",
|
|
64
|
-
"packages/@livestore/webmesh"
|
|
65
|
-
]
|
|
64
|
+
"publishConfig": {
|
|
65
|
+
"access": "public"
|
|
66
66
|
},
|
|
67
67
|
"scripts": {
|
|
68
68
|
"test": "echo No tests yet"
|
package/src/create-store-do.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { CfTypes, HelperTypes } from '@livestore/common-cf'
|
|
|
3
3
|
import { createStore, type LiveStoreSchema, provideOtel } from '@livestore/livestore'
|
|
4
4
|
import type * as CfSyncBackend from '@livestore/sync-cf/cf-worker'
|
|
5
5
|
import { makeDoRpcSync } from '@livestore/sync-cf/client'
|
|
6
|
-
import { isDevEnv } from '@livestore/utils'
|
|
6
|
+
import { isDevEnv, omitUndefineds } from '@livestore/utils'
|
|
7
7
|
import { Effect, Layer, References, Scope } from '@livestore/utils/effect'
|
|
8
8
|
|
|
9
9
|
import { makeAdapter } from './make-adapter.ts'
|
|
@@ -21,6 +21,18 @@ export type CreateStoreDoOptions<TSchema extends LiveStoreSchema, TEnv, TState>
|
|
|
21
21
|
clientId: string
|
|
22
22
|
/** Identifier for the LiveStore session running inside the Durable Object. */
|
|
23
23
|
sessionId: string
|
|
24
|
+
/** Advanced per-client runtime tuning parameters. */
|
|
25
|
+
params?: {
|
|
26
|
+
/**
|
|
27
|
+
* Number of events read and committed per batch when rebuilding SQLite state from the event log.
|
|
28
|
+
* Lower values reduce per-batch resource usage but perform more queries and savepoints.
|
|
29
|
+
* This setting applies to future rebuilds and does not change schema identity.
|
|
30
|
+
*
|
|
31
|
+
* @default 100
|
|
32
|
+
* @minimum 1
|
|
33
|
+
*/
|
|
34
|
+
stateRebuildBatchSize?: number
|
|
35
|
+
}
|
|
24
36
|
/** Runtime details about the Durable Object this store runs inside. Needed for sync backend to call back to this instance. */
|
|
25
37
|
durableObject: {
|
|
26
38
|
/** Durable Object state handle (e.g. `this.ctx`). */
|
|
@@ -30,8 +42,11 @@ export type CreateStoreDoOptions<TSchema extends LiveStoreSchema, TEnv, TState>
|
|
|
30
42
|
/** Binding name Cloudflare uses to reach this Durable Object from other workers. */
|
|
31
43
|
bindingName: HelperTypes.ExtractDurableObjectKeys<NoInfer<TEnv>>
|
|
32
44
|
}
|
|
33
|
-
/**
|
|
34
|
-
|
|
45
|
+
/**
|
|
46
|
+
* Returns an RPC stub pointing at the sync backend Durable Object used for replication. Called for every sync
|
|
47
|
+
* call, because Cloudflare leaves a stub broken after many exceptions, so a retry needs a fresh one.
|
|
48
|
+
*/
|
|
49
|
+
getSyncBackendStub: () => CfTypes.DurableObjectStub<CfSyncBackend.SyncBackendRpcInterface>
|
|
35
50
|
/**
|
|
36
51
|
* Enables live pull mode to receive sync updates via Durable Object RPC callbacks.
|
|
37
52
|
*
|
|
@@ -82,7 +97,7 @@ export type CreateStoreDoOptions<TSchema extends LiveStoreSchema, TEnv, TState>
|
|
|
82
97
|
* env: this.env,
|
|
83
98
|
* bindingName: 'MY_DO',
|
|
84
99
|
* },
|
|
85
|
-
*
|
|
100
|
+
* getSyncBackendStub: () => this.env.SYNC_BACKEND_DO.get(syncBackendId),
|
|
86
101
|
* }).pipe(Effect.runPromise)
|
|
87
102
|
* }
|
|
88
103
|
* // Use this.store...
|
|
@@ -103,10 +118,11 @@ export const createStoreDo = <
|
|
|
103
118
|
clientId,
|
|
104
119
|
sessionId,
|
|
105
120
|
durableObject,
|
|
106
|
-
|
|
121
|
+
getSyncBackendStub,
|
|
107
122
|
livePull = false,
|
|
108
123
|
resetPersistence = false,
|
|
109
124
|
initialSyncOptions = { _tag: 'Blocking', timeout: 500 },
|
|
125
|
+
params,
|
|
110
126
|
}: CreateStoreDoOptions<TSchema, TEnv, TState>) =>
|
|
111
127
|
Effect.gen(function* () {
|
|
112
128
|
const { ctx, bindingName } = durableObject
|
|
@@ -121,7 +137,7 @@ export const createStoreDo = <
|
|
|
121
137
|
resetPersistence,
|
|
122
138
|
syncOptions: {
|
|
123
139
|
backend: makeDoRpcSync({
|
|
124
|
-
|
|
140
|
+
getSyncBackendStub,
|
|
125
141
|
durableObjectState: ctx,
|
|
126
142
|
durableObjectContext: { bindingName, durableObjectId },
|
|
127
143
|
}),
|
|
@@ -130,7 +146,12 @@ export const createStoreDo = <
|
|
|
130
146
|
},
|
|
131
147
|
})
|
|
132
148
|
|
|
133
|
-
return yield* createStore({
|
|
149
|
+
return yield* createStore({
|
|
150
|
+
schema,
|
|
151
|
+
adapter,
|
|
152
|
+
storeId,
|
|
153
|
+
...omitUndefineds({ params }),
|
|
154
|
+
}).pipe(Scope.provide(scope), provideOtel({}))
|
|
134
155
|
})
|
|
135
156
|
|
|
136
157
|
/**
|
|
@@ -151,7 +172,7 @@ export const createStoreDo = <
|
|
|
151
172
|
* clientId: this.ctx.id.toString(),
|
|
152
173
|
* sessionId: 'do-session',
|
|
153
174
|
* durableObject: { ctx: this.ctx, env: this.env, bindingName: 'MY_DO' },
|
|
154
|
-
*
|
|
175
|
+
* getSyncBackendStub: () => this.env.SYNC_BACKEND_DO.get(syncBackendId),
|
|
155
176
|
* })
|
|
156
177
|
* // Use store...
|
|
157
178
|
* }
|
package/src/make-adapter.ts
CHANGED
|
@@ -23,6 +23,7 @@ import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm'
|
|
|
23
23
|
import { Effect, FetchHttpClient, Layer, Queue, Schedule, SubscriptionRef, WebChannel } from '@livestore/utils/effect'
|
|
24
24
|
|
|
25
25
|
import { makeSqliteDb as makeDoSqliteDb } from './make-sqlite-db.ts'
|
|
26
|
+
import * as StateFiles from './state-files.ts'
|
|
26
27
|
|
|
27
28
|
export const makeAdapter =
|
|
28
29
|
({
|
|
@@ -46,6 +47,7 @@ export const makeAdapter =
|
|
|
46
47
|
syncPayloadEncoded,
|
|
47
48
|
syncPayloadSchema,
|
|
48
49
|
schema,
|
|
50
|
+
params,
|
|
49
51
|
} = adapterArgs
|
|
50
52
|
|
|
51
53
|
const devtoolsOptions = { enabled: false } as DevtoolsOptions
|
|
@@ -62,10 +64,13 @@ export const makeAdapter =
|
|
|
62
64
|
yield* resetDurableObjectPersistence({ storage, storeId })
|
|
63
65
|
}
|
|
64
66
|
|
|
67
|
+
const stateFileName = `${getStateDbBaseName(schema)}@${liveStoreStorageFormatVersion}.db`
|
|
68
|
+
yield* StateFiles.register(storage, stateFileName).pipe(UnknownError.mapToUnknownError)
|
|
69
|
+
|
|
65
70
|
const dbState = yield* makeSqliteDb({
|
|
66
71
|
_tag: 'storage',
|
|
67
72
|
storage,
|
|
68
|
-
fileName:
|
|
73
|
+
fileName: stateFileName,
|
|
69
74
|
configureDb: (db) =>
|
|
70
75
|
db.execute([...CF_SQL_VFS_REQUIRED_PRAGMAS, 'cache_size=-8000'].map((p) => `PRAGMA ${p}`).join(';\n')),
|
|
71
76
|
}).pipe(UnknownError.mapToUnknownError)
|
|
@@ -94,6 +99,7 @@ export const makeAdapter =
|
|
|
94
99
|
shutdownChannel,
|
|
95
100
|
syncPayloadEncoded,
|
|
96
101
|
syncPayloadSchema,
|
|
102
|
+
params,
|
|
97
103
|
}).pipe(Layer.provide(StateHead.layer({ dbState }))),
|
|
98
104
|
)
|
|
99
105
|
|
|
@@ -165,6 +171,10 @@ export const makeAdapter =
|
|
|
165
171
|
origin: undefined,
|
|
166
172
|
})
|
|
167
173
|
|
|
174
|
+
yield* StateFiles.cleanup(storage, stateFileName).pipe(
|
|
175
|
+
Effect.catch((cause) => Effect.logWarning('Failed to clean up obsolete state databases', cause)),
|
|
176
|
+
)
|
|
177
|
+
|
|
168
178
|
return clientSession
|
|
169
179
|
}).pipe(
|
|
170
180
|
Effect.withSpan('@livestore/adapter-cloudflare:makeAdapter', { attributes: { clientId, sessionId } }),
|
|
@@ -180,12 +190,14 @@ const resetDurableObjectPersistence = ({
|
|
|
180
190
|
}) =>
|
|
181
191
|
Effect.try({
|
|
182
192
|
try: () =>
|
|
183
|
-
// All
|
|
193
|
+
// All four tables live in the DO's single storage.sql database but are
|
|
184
194
|
// owned by different layers during normal operation:
|
|
185
195
|
// - vfs_pages: written by the wa-sqlite VFS layer (backs dbState)
|
|
186
196
|
// - eventlog, __livestore_sync_status: written directly by dbEventlog via storage.sql
|
|
197
|
+
// - __livestore_state_files: adapter-owned state file registry
|
|
187
198
|
storage.transactionSync(() => {
|
|
188
199
|
safeSqlExec(storage, 'DELETE FROM vfs_pages')
|
|
200
|
+
safeSqlExec(storage, 'DELETE FROM __livestore_state_files')
|
|
189
201
|
safeSqlExec(storage, 'DELETE FROM eventlog')
|
|
190
202
|
safeSqlExec(storage, 'DELETE FROM __livestore_sync_status')
|
|
191
203
|
}),
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { CfTypes } from '@livestore/common-cf'
|
|
2
|
+
import { Effect } from '@livestore/utils/effect'
|
|
3
|
+
|
|
4
|
+
/** Record ownership before opening state so interrupted rebuilds remain eligible for cleanup. */
|
|
5
|
+
export const register = (storage: CfTypes.DurableObjectStorage, fileName: string) =>
|
|
6
|
+
Effect.try(() => {
|
|
7
|
+
storage.sql.exec(`CREATE TABLE IF NOT EXISTS __livestore_state_files (file_path TEXT PRIMARY KEY) WITHOUT ROWID`)
|
|
8
|
+
storage.sql.exec('INSERT OR IGNORE INTO __livestore_state_files (file_path) VALUES (?)', `/${fileName}`)
|
|
9
|
+
})
|
|
10
|
+
|
|
11
|
+
/** Keep ownership records until their pages are deleted, so failed cleanup can be retried. */
|
|
12
|
+
export const cleanup = (storage: CfTypes.DurableObjectStorage, fileName: string) =>
|
|
13
|
+
Effect.try(() =>
|
|
14
|
+
storage.transactionSync(() => {
|
|
15
|
+
storage.sql.exec(
|
|
16
|
+
`DELETE FROM vfs_pages WHERE file_path IN (
|
|
17
|
+
SELECT file_path FROM __livestore_state_files WHERE file_path != ?
|
|
18
|
+
)`,
|
|
19
|
+
`/${fileName}`,
|
|
20
|
+
)
|
|
21
|
+
storage.sql.exec('DELETE FROM __livestore_state_files WHERE file_path != ?', `/${fileName}`)
|
|
22
|
+
}),
|
|
23
|
+
)
|