@livestore/sync-cf 0.3.0-dev.23 → 0.3.0-dev.25
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/cf-worker/durable-object.d.ts +11 -2
- package/dist/cf-worker/durable-object.d.ts.map +1 -1
- package/dist/cf-worker/durable-object.js +8 -6
- package/dist/cf-worker/durable-object.js.map +1 -1
- package/dist/cf-worker/worker.d.ts.map +1 -1
- package/dist/cf-worker/worker.js +2 -0
- package/dist/cf-worker/worker.js.map +1 -1
- package/dist/common/ws-message-types.d.ts +105 -33
- package/dist/common/ws-message-types.d.ts.map +1 -1
- package/dist/common/ws-message-types.js +13 -13
- package/dist/common/ws-message-types.js.map +1 -1
- package/dist/sync-impl/ws-impl.d.ts +2 -8
- package/dist/sync-impl/ws-impl.d.ts.map +1 -1
- package/dist/sync-impl/ws-impl.js +9 -3
- package/dist/sync-impl/ws-impl.js.map +1 -1
- package/package.json +3 -3
- package/src/cf-worker/durable-object.ts +8 -6
- package/src/cf-worker/worker.ts +2 -0
- package/src/common/ws-message-types.ts +14 -13
- package/src/sync-impl/ws-impl.ts +119 -117
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-impl.js","sourceRoot":"","sources":["../../src/sync-impl/ws-impl.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAG3B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACvF,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"ws-impl.js","sourceRoot":"","sources":["../../src/sync-impl/ws-impl.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@livestore/sync-cf",
|
|
3
|
-
"version": "0.3.0-dev.
|
|
3
|
+
"version": "0.3.0-dev.25",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"exports": {
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
}
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@livestore/common": "0.3.0-dev.
|
|
18
|
-
"@livestore/utils": "0.3.0-dev.
|
|
17
|
+
"@livestore/common": "0.3.0-dev.25",
|
|
18
|
+
"@livestore/utils": "0.3.0-dev.25"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@cloudflare/workers-types": "^4.20250303.0"
|
|
@@ -28,6 +28,7 @@ export const mutationLogTable = DbSchema.table('mutation_log_${PERSISTENCE_FORMA
|
|
|
28
28
|
/** ISO date format. Currently only used for debugging purposes. */
|
|
29
29
|
createdAt: DbSchema.text({}),
|
|
30
30
|
clientId: DbSchema.text({}),
|
|
31
|
+
sessionId: DbSchema.text({}),
|
|
31
32
|
})
|
|
32
33
|
|
|
33
34
|
const WebSocketAttachmentSchema = Schema.parseJson(
|
|
@@ -43,7 +44,7 @@ export const PULL_CHUNK_SIZE = 100
|
|
|
43
44
|
*
|
|
44
45
|
* Changing this version number will lead to a "soft reset".
|
|
45
46
|
*/
|
|
46
|
-
export const PERSISTENCE_FORMAT_VERSION =
|
|
47
|
+
export const PERSISTENCE_FORMAT_VERSION = 4
|
|
47
48
|
|
|
48
49
|
export type MakeDurableObjectClassOptions = {
|
|
49
50
|
onPush?: (message: WSMessage.PushReq) => Effect.Effect<void> | Promise<void>
|
|
@@ -340,15 +341,15 @@ const makeStorage = (ctx: DurableObjectState, env: Env, storeId: string): SyncSt
|
|
|
340
341
|
|
|
341
342
|
// CF D1 limits:
|
|
342
343
|
// Maximum bound parameters per query 100, Maximum arguments per SQL function 32
|
|
343
|
-
// Thus we need to split the batch into chunks of max (100/
|
|
344
|
-
const CHUNK_SIZE =
|
|
344
|
+
// Thus we need to split the batch into chunks of max (100/7=)14 events each.
|
|
345
|
+
const CHUNK_SIZE = 14
|
|
345
346
|
|
|
346
347
|
for (let i = 0; i < batch.length; i += CHUNK_SIZE) {
|
|
347
348
|
const chunk = batch.slice(i, i + CHUNK_SIZE)
|
|
348
349
|
|
|
349
|
-
// Create a list of placeholders ("(?, ?, ?, ?, ?)
|
|
350
|
-
const valuesPlaceholders = chunk.map(() => '(?, ?, ?, ?, ?, ?)').join(', ')
|
|
351
|
-
const sql = `INSERT INTO ${dbName} (id, parentId, args, mutation, createdAt, clientId) VALUES ${valuesPlaceholders}`
|
|
350
|
+
// Create a list of placeholders ("(?, ?, ?, ?, ?, ?, ?)"), corresponding to each event.
|
|
351
|
+
const valuesPlaceholders = chunk.map(() => '(?, ?, ?, ?, ?, ?, ?)').join(', ')
|
|
352
|
+
const sql = `INSERT INTO ${dbName} (id, parentId, args, mutation, createdAt, clientId, sessionId) VALUES ${valuesPlaceholders}`
|
|
352
353
|
// Flatten the event properties into a parameters array.
|
|
353
354
|
const params = chunk.flatMap((event) => [
|
|
354
355
|
event.id,
|
|
@@ -357,6 +358,7 @@ const makeStorage = (ctx: DurableObjectState, env: Env, storeId: string): SyncSt
|
|
|
357
358
|
event.mutation,
|
|
358
359
|
createdAt,
|
|
359
360
|
event.clientId,
|
|
361
|
+
event.sessionId,
|
|
360
362
|
])
|
|
361
363
|
|
|
362
364
|
yield* execDb((db) =>
|
package/src/cf-worker/worker.ts
CHANGED
|
@@ -54,6 +54,7 @@ export const makeWorker = (options: MakeWorkerOptions = {}): CFWorker => {
|
|
|
54
54
|
)
|
|
55
55
|
|
|
56
56
|
if (result._tag === 'Left') {
|
|
57
|
+
console.error('Invalid payload', result.left)
|
|
57
58
|
return new Response(result.left.toString(), { status: 400, headers: corsHeaders })
|
|
58
59
|
}
|
|
59
60
|
}
|
|
@@ -70,6 +71,7 @@ export const makeWorker = (options: MakeWorkerOptions = {}): CFWorker => {
|
|
|
70
71
|
return durableObject.fetch(request)
|
|
71
72
|
}
|
|
72
73
|
|
|
74
|
+
console.error('Invalid path', url.pathname)
|
|
73
75
|
return new Response(null, {
|
|
74
76
|
status: 400,
|
|
75
77
|
statusText: 'Bad Request',
|
|
@@ -5,14 +5,14 @@ export const PullReq = Schema.TaggedStruct('WSMessage.PullReq', {
|
|
|
5
5
|
requestId: Schema.String,
|
|
6
6
|
/** Omitting the cursor will start from the beginning */
|
|
7
7
|
cursor: Schema.optional(Schema.Number),
|
|
8
|
-
})
|
|
8
|
+
}).annotations({ title: '@livestore/sync-cf:PullReq' })
|
|
9
9
|
|
|
10
10
|
export type PullReq = typeof PullReq.Type
|
|
11
11
|
|
|
12
12
|
export const SyncMetadata = Schema.Struct({
|
|
13
13
|
/** ISO date format */
|
|
14
14
|
createdAt: Schema.String,
|
|
15
|
-
})
|
|
15
|
+
}).annotations({ title: '@livestore/sync-cf:SyncMetadata' })
|
|
16
16
|
|
|
17
17
|
export type SyncMetadata = typeof SyncMetadata.Type
|
|
18
18
|
|
|
@@ -25,59 +25,59 @@ export const PullRes = Schema.TaggedStruct('WSMessage.PullRes', {
|
|
|
25
25
|
),
|
|
26
26
|
requestId: Schema.Struct({ context: Schema.Literal('pull', 'push'), requestId: Schema.String }),
|
|
27
27
|
remaining: Schema.Number,
|
|
28
|
-
})
|
|
28
|
+
}).annotations({ title: '@livestore/sync-cf:PullRes' })
|
|
29
29
|
|
|
30
30
|
export type PullRes = typeof PullRes.Type
|
|
31
31
|
|
|
32
32
|
export const PushReq = Schema.TaggedStruct('WSMessage.PushReq', {
|
|
33
33
|
requestId: Schema.String,
|
|
34
34
|
batch: Schema.Array(MutationEvent.AnyEncodedGlobal),
|
|
35
|
-
})
|
|
35
|
+
}).annotations({ title: '@livestore/sync-cf:PushReq' })
|
|
36
36
|
|
|
37
37
|
export type PushReq = typeof PushReq.Type
|
|
38
38
|
|
|
39
39
|
export const PushAck = Schema.TaggedStruct('WSMessage.PushAck', {
|
|
40
40
|
requestId: Schema.String,
|
|
41
|
-
})
|
|
41
|
+
}).annotations({ title: '@livestore/sync-cf:PushAck' })
|
|
42
42
|
|
|
43
43
|
export type PushAck = typeof PushAck.Type
|
|
44
44
|
|
|
45
45
|
export const Error = Schema.TaggedStruct('WSMessage.Error', {
|
|
46
46
|
requestId: Schema.String,
|
|
47
47
|
message: Schema.String,
|
|
48
|
-
})
|
|
48
|
+
}).annotations({ title: '@livestore/sync-cf:Error' })
|
|
49
49
|
|
|
50
50
|
export type Error = typeof Error.Type
|
|
51
51
|
|
|
52
52
|
export const Ping = Schema.TaggedStruct('WSMessage.Ping', {
|
|
53
53
|
requestId: Schema.Literal('ping'),
|
|
54
|
-
})
|
|
54
|
+
}).annotations({ title: '@livestore/sync-cf:Ping' })
|
|
55
55
|
|
|
56
56
|
export type Ping = typeof Ping.Type
|
|
57
57
|
|
|
58
58
|
export const Pong = Schema.TaggedStruct('WSMessage.Pong', {
|
|
59
59
|
requestId: Schema.Literal('ping'),
|
|
60
|
-
})
|
|
60
|
+
}).annotations({ title: '@livestore/sync-cf:Pong' })
|
|
61
61
|
|
|
62
62
|
export type Pong = typeof Pong.Type
|
|
63
63
|
|
|
64
64
|
export const AdminResetRoomReq = Schema.TaggedStruct('WSMessage.AdminResetRoomReq', {
|
|
65
65
|
requestId: Schema.String,
|
|
66
66
|
adminSecret: Schema.String,
|
|
67
|
-
})
|
|
67
|
+
}).annotations({ title: '@livestore/sync-cf:AdminResetRoomReq' })
|
|
68
68
|
|
|
69
69
|
export type AdminResetRoomReq = typeof AdminResetRoomReq.Type
|
|
70
70
|
|
|
71
71
|
export const AdminResetRoomRes = Schema.TaggedStruct('WSMessage.AdminResetRoomRes', {
|
|
72
72
|
requestId: Schema.String,
|
|
73
|
-
})
|
|
73
|
+
}).annotations({ title: '@livestore/sync-cf:AdminResetRoomRes' })
|
|
74
74
|
|
|
75
75
|
export type AdminResetRoomRes = typeof AdminResetRoomRes.Type
|
|
76
76
|
|
|
77
77
|
export const AdminInfoReq = Schema.TaggedStruct('WSMessage.AdminInfoReq', {
|
|
78
78
|
requestId: Schema.String,
|
|
79
79
|
adminSecret: Schema.String,
|
|
80
|
-
})
|
|
80
|
+
}).annotations({ title: '@livestore/sync-cf:AdminInfoReq' })
|
|
81
81
|
|
|
82
82
|
export type AdminInfoReq = typeof AdminInfoReq.Type
|
|
83
83
|
|
|
@@ -86,7 +86,7 @@ export const AdminInfoRes = Schema.TaggedStruct('WSMessage.AdminInfoRes', {
|
|
|
86
86
|
info: Schema.Struct({
|
|
87
87
|
durableObjectId: Schema.String,
|
|
88
88
|
}),
|
|
89
|
-
})
|
|
89
|
+
}).annotations({ title: '@livestore/sync-cf:AdminInfoRes' })
|
|
90
90
|
|
|
91
91
|
export type AdminInfoRes = typeof AdminInfoRes.Type
|
|
92
92
|
|
|
@@ -102,7 +102,8 @@ export const Message = Schema.Union(
|
|
|
102
102
|
AdminResetRoomRes,
|
|
103
103
|
AdminInfoReq,
|
|
104
104
|
AdminInfoRes,
|
|
105
|
-
)
|
|
105
|
+
).annotations({ title: '@livestore/sync-cf:Message' })
|
|
106
|
+
|
|
106
107
|
export type Message = typeof Message.Type
|
|
107
108
|
export type MessageEncoded = typeof Message.Encoded
|
|
108
109
|
|
package/src/sync-impl/ws-impl.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
/// <reference lib="dom" />
|
|
2
2
|
|
|
3
|
-
import type { SyncBackend } from '@livestore/common'
|
|
3
|
+
import type { SyncBackend, SyncBackendConstructor } from '@livestore/common'
|
|
4
4
|
import { InvalidPullError, InvalidPushError, UnexpectedError } from '@livestore/common'
|
|
5
5
|
import { EventId } from '@livestore/common/schema'
|
|
6
6
|
import { LS_DEV, shouldNeverHappen } from '@livestore/utils'
|
|
7
|
-
import type { HttpClient, Scope } from '@livestore/utils/effect'
|
|
8
7
|
import {
|
|
9
8
|
Deferred,
|
|
10
9
|
Effect,
|
|
@@ -25,130 +24,133 @@ import type { SyncMetadata } from '../common/ws-message-types.js'
|
|
|
25
24
|
|
|
26
25
|
export interface WsSyncOptions {
|
|
27
26
|
url: string
|
|
28
|
-
storeId: string
|
|
29
|
-
/** Payload can be used to implement custom business logic (e.g. authentication). */
|
|
30
|
-
payload?: Schema.JsonValue
|
|
31
27
|
}
|
|
32
28
|
|
|
33
|
-
export const
|
|
34
|
-
options: WsSyncOptions
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
29
|
+
export const makeCfSync =
|
|
30
|
+
(options: WsSyncOptions): SyncBackendConstructor<SyncMetadata> =>
|
|
31
|
+
({ storeId, payload }) =>
|
|
32
|
+
Effect.gen(function* () {
|
|
33
|
+
const urlParamsData = yield* Schema.encode(SearchParamsSchema)({
|
|
34
|
+
storeId,
|
|
35
|
+
payload,
|
|
36
|
+
}).pipe(UnexpectedError.mapToUnexpectedError)
|
|
37
|
+
|
|
38
|
+
const urlParams = UrlParams.fromInput(urlParamsData)
|
|
39
|
+
const wsUrl = `${options.url}/websocket?${UrlParams.toString(urlParams)}`
|
|
40
|
+
|
|
41
|
+
const { isConnected, incomingMessages, send } = yield* connect(wsUrl)
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* We need to account for the scenario where push-caused PullRes message arrive before the pull-caused PullRes message.
|
|
45
|
+
* i.e. a scenario where the WS connection is created but before the server processed the initial pull, a push from
|
|
46
|
+
* another client triggers a PullRes message sent to this client which we need to stash until our pull-caused
|
|
47
|
+
* PullRes message arrives at which point we can combine the stashed events with the pull-caused events and continue.
|
|
48
|
+
*/
|
|
49
|
+
const stashedPullBatch: WSMessage.PullRes['batch'][number][] = []
|
|
50
|
+
|
|
51
|
+
// We currently only support one pull stream for a sync backend.
|
|
52
|
+
let pullStarted = false
|
|
53
|
+
|
|
54
|
+
const api = {
|
|
55
|
+
isConnected,
|
|
56
|
+
pull: (args) =>
|
|
57
|
+
Effect.gen(function* () {
|
|
58
|
+
if (pullStarted) {
|
|
59
|
+
return shouldNeverHappen(`Pull already started for this sync backend.`)
|
|
60
|
+
}
|
|
65
61
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
62
|
+
pullStarted = true
|
|
63
|
+
|
|
64
|
+
let pullResponseReceived = false
|
|
65
|
+
|
|
66
|
+
const requestId = nanoid()
|
|
67
|
+
const cursor = Option.getOrUndefined(args)?.cursor.global
|
|
68
|
+
|
|
69
|
+
yield* send(WSMessage.PullReq.make({ cursor, requestId }))
|
|
70
|
+
|
|
71
|
+
return Stream.fromPubSub(incomingMessages).pipe(
|
|
72
|
+
Stream.tap((_) =>
|
|
73
|
+
_._tag === 'WSMessage.Error' && _.requestId === requestId
|
|
74
|
+
? new InvalidPullError({ message: _.message })
|
|
75
|
+
: Effect.void,
|
|
76
|
+
),
|
|
77
|
+
Stream.filterMap((msg) => {
|
|
78
|
+
if (msg._tag === 'WSMessage.PullRes') {
|
|
79
|
+
if (msg.requestId.context === 'pull') {
|
|
80
|
+
if (msg.requestId.requestId === requestId) {
|
|
81
|
+
pullResponseReceived = true
|
|
82
|
+
|
|
83
|
+
if (stashedPullBatch.length > 0 && msg.remaining === 0) {
|
|
84
|
+
const pullResHead = msg.batch.at(-1)?.mutationEventEncoded.id ?? EventId.ROOT.global
|
|
85
|
+
// Index where stashed events are greater than pullResHead
|
|
86
|
+
const newPartialBatchIndex = stashedPullBatch.findIndex(
|
|
87
|
+
(batchItem) => batchItem.mutationEventEncoded.id > pullResHead,
|
|
88
|
+
)
|
|
89
|
+
const batchWithNewStashedEvents =
|
|
90
|
+
newPartialBatchIndex === -1 ? [] : stashedPullBatch.slice(newPartialBatchIndex)
|
|
91
|
+
const combinedBatch = [...msg.batch, ...batchWithNewStashedEvents]
|
|
92
|
+
return Option.some({ ...msg, batch: combinedBatch, remaining: 0 })
|
|
93
|
+
} else {
|
|
94
|
+
return Option.some(msg)
|
|
95
|
+
}
|
|
97
96
|
} else {
|
|
98
|
-
|
|
97
|
+
// Ignore
|
|
98
|
+
return Option.none()
|
|
99
99
|
}
|
|
100
100
|
} else {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
} else {
|
|
108
|
-
stashedPullBatch.push(...msg.batch)
|
|
109
|
-
return Option.none()
|
|
101
|
+
if (pullResponseReceived) {
|
|
102
|
+
return Option.some(msg)
|
|
103
|
+
} else {
|
|
104
|
+
stashedPullBatch.push(...msg.batch)
|
|
105
|
+
return Option.none()
|
|
106
|
+
}
|
|
110
107
|
}
|
|
111
108
|
}
|
|
112
|
-
}
|
|
113
109
|
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
110
|
+
return Option.none()
|
|
111
|
+
}),
|
|
112
|
+
// This call is mostly here to for type narrowing
|
|
113
|
+
Stream.filter(Schema.is(WSMessage.PullRes)),
|
|
114
|
+
)
|
|
115
|
+
}).pipe(Stream.unwrap),
|
|
116
|
+
|
|
117
|
+
push: (batch) =>
|
|
118
|
+
Effect.gen(function* () {
|
|
119
|
+
const ready = yield* Deferred.make<void, InvalidPushError>()
|
|
120
|
+
const requestId = nanoid()
|
|
121
|
+
|
|
122
|
+
yield* Stream.fromPubSub(incomingMessages).pipe(
|
|
123
|
+
Stream.tap((_) =>
|
|
124
|
+
_._tag === 'WSMessage.Error' && _.requestId === requestId
|
|
125
|
+
? Deferred.fail(ready, new InvalidPushError({ reason: { _tag: 'Unexpected', message: _.message } }))
|
|
126
|
+
: Effect.void,
|
|
127
|
+
),
|
|
128
|
+
Stream.filter((_) => _._tag === 'WSMessage.PushAck' && _.requestId === requestId),
|
|
129
|
+
Stream.take(1),
|
|
130
|
+
Stream.tap(() => Deferred.succeed(ready, void 0)),
|
|
131
|
+
Stream.runDrain,
|
|
132
|
+
Effect.tapCauseLogPretty,
|
|
133
|
+
Effect.fork,
|
|
134
|
+
)
|
|
135
|
+
|
|
136
|
+
yield* send(WSMessage.PushReq.make({ batch, requestId }))
|
|
137
|
+
|
|
138
|
+
yield* ready
|
|
139
|
+
|
|
140
|
+
const createdAt = new Date().toISOString()
|
|
141
|
+
|
|
142
|
+
return { metadata: Array.from({ length: batch.length }, () => Option.some({ createdAt })) }
|
|
143
|
+
}),
|
|
144
|
+
metadata: {
|
|
145
|
+
name: '@livestore/cf-sync',
|
|
146
|
+
description: 'LiveStore sync backend implementation using Cloudflare Workers & Durable Objects',
|
|
147
|
+
protocol: 'ws',
|
|
148
|
+
url: options.url,
|
|
149
|
+
},
|
|
150
|
+
} satisfies SyncBackend<SyncMetadata>
|
|
151
|
+
|
|
152
|
+
return api
|
|
153
|
+
})
|
|
152
154
|
|
|
153
155
|
const connect = (wsUrl: string) =>
|
|
154
156
|
Effect.gen(function* () {
|