@livestore/sync-cf 0.0.0-snapshot-2da03812fc739d068b0e57f612c11fe4c4b28b0c → 0.0.0-snapshot-433bc9e355058922ce7d54152576f635fdb679ba
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.
|
@@ -1,13 +1,7 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import { UnexpectedError } from '@livestore/common';
|
|
3
|
-
import type { HttpClient, Scope } from '@livestore/utils/effect';
|
|
4
|
-
import { Effect, Schema } from '@livestore/utils/effect';
|
|
1
|
+
import type { SyncBackendConstructor } from '@livestore/common';
|
|
5
2
|
import type { SyncMetadata } from '../common/ws-message-types.js';
|
|
6
3
|
export interface WsSyncOptions {
|
|
7
4
|
url: string;
|
|
8
|
-
storeId: string;
|
|
9
|
-
/** Payload can be used to implement custom business logic (e.g. authentication). */
|
|
10
|
-
payload?: Schema.JsonValue;
|
|
11
5
|
}
|
|
12
|
-
export declare const
|
|
6
|
+
export declare const makeCfSync: (options: WsSyncOptions) => SyncBackendConstructor<SyncMetadata>;
|
|
13
7
|
//# sourceMappingURL=ws-impl.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-impl.d.ts","sourceRoot":"","sources":["../../src/sync-impl/ws-impl.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"ws-impl.d.ts","sourceRoot":"","sources":["../../src/sync-impl/ws-impl.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAe,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAoB5E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,eAAO,MAAM,UAAU,GACpB,SAAS,aAAa,KAAG,sBAAsB,CAAC,YAAY,CAqHzD,CAAA"}
|
|
@@ -5,10 +5,10 @@ import { LS_DEV, shouldNeverHappen } from '@livestore/utils';
|
|
|
5
5
|
import { Deferred, Effect, Option, PubSub, Queue, Schedule, Schema, Stream, SubscriptionRef, UrlParams, WebSocket, } from '@livestore/utils/effect';
|
|
6
6
|
import { nanoid } from '@livestore/utils/nanoid';
|
|
7
7
|
import { SearchParamsSchema, WSMessage } from '../common/mod.js';
|
|
8
|
-
export const
|
|
8
|
+
export const makeCfSync = (options) => ({ storeId, payload }) => Effect.gen(function* () {
|
|
9
9
|
const urlParamsData = yield* Schema.encode(SearchParamsSchema)({
|
|
10
|
-
storeId
|
|
11
|
-
payload
|
|
10
|
+
storeId,
|
|
11
|
+
payload,
|
|
12
12
|
}).pipe(UnexpectedError.mapToUnexpectedError);
|
|
13
13
|
const urlParams = UrlParams.fromInput(urlParamsData);
|
|
14
14
|
const wsUrl = `${options.url}/websocket?${UrlParams.toString(urlParams)}`;
|
|
@@ -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.0.0-snapshot-
|
|
3
|
+
"version": "0.0.0-snapshot-433bc9e355058922ce7d54152576f635fdb679ba",
|
|
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.0.0-snapshot-
|
|
18
|
-
"@livestore/utils": "0.0.0-snapshot-
|
|
17
|
+
"@livestore/common": "0.0.0-snapshot-433bc9e355058922ce7d54152576f635fdb679ba",
|
|
18
|
+
"@livestore/utils": "0.0.0-snapshot-433bc9e355058922ce7d54152576f635fdb679ba"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@cloudflare/workers-types": "^4.20250303.0"
|
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,127 @@ 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
|
+
} satisfies SyncBackend<SyncMetadata>
|
|
145
|
+
|
|
146
|
+
return api
|
|
147
|
+
})
|
|
152
148
|
|
|
153
149
|
const connect = (wsUrl: string) =>
|
|
154
150
|
Effect.gen(function* () {
|