@livestore/adapter-web 0.4.0-dev.9 → 0.5.0-dev.0

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.
Files changed (92) hide show
  1. package/README.md +5 -5
  2. package/dist/.tsbuildinfo +1 -1
  3. package/dist/in-memory/in-memory-adapter.d.ts +50 -8
  4. package/dist/in-memory/in-memory-adapter.d.ts.map +1 -1
  5. package/dist/in-memory/in-memory-adapter.js +100 -39
  6. package/dist/in-memory/in-memory-adapter.js.map +1 -1
  7. package/dist/index.d.ts +11 -1
  8. package/dist/index.d.ts.map +1 -1
  9. package/dist/index.js +11 -1
  10. package/dist/index.js.map +1 -1
  11. package/dist/single-tab/mod.d.ts +15 -0
  12. package/dist/single-tab/mod.d.ts.map +1 -0
  13. package/dist/single-tab/mod.js +15 -0
  14. package/dist/single-tab/mod.js.map +1 -0
  15. package/dist/single-tab/single-tab-adapter.d.ts +108 -0
  16. package/dist/single-tab/single-tab-adapter.d.ts.map +1 -0
  17. package/dist/single-tab/single-tab-adapter.js +252 -0
  18. package/dist/single-tab/single-tab-adapter.js.map +1 -0
  19. package/dist/web-worker/client-session/client-session-devtools.d.ts +4 -5
  20. package/dist/web-worker/client-session/client-session-devtools.d.ts.map +1 -1
  21. package/dist/web-worker/client-session/client-session-devtools.js +27 -14
  22. package/dist/web-worker/client-session/client-session-devtools.js.map +1 -1
  23. package/dist/web-worker/client-session/devtools-web-channel.d.ts +20 -0
  24. package/dist/web-worker/client-session/devtools-web-channel.d.ts.map +1 -0
  25. package/dist/web-worker/client-session/devtools-web-channel.js +34 -0
  26. package/dist/web-worker/client-session/devtools-web-channel.js.map +1 -0
  27. package/dist/web-worker/client-session/persisted-adapter.d.ts +18 -0
  28. package/dist/web-worker/client-session/persisted-adapter.d.ts.map +1 -1
  29. package/dist/web-worker/client-session/persisted-adapter.js +170 -103
  30. package/dist/web-worker/client-session/persisted-adapter.js.map +1 -1
  31. package/dist/web-worker/client-session/sqlite-loader.d.ts +2 -0
  32. package/dist/web-worker/client-session/sqlite-loader.d.ts.map +1 -0
  33. package/dist/web-worker/client-session/sqlite-loader.js +16 -0
  34. package/dist/web-worker/client-session/sqlite-loader.js.map +1 -0
  35. package/dist/web-worker/common/persisted-sqlite.d.ts +15 -35
  36. package/dist/web-worker/common/persisted-sqlite.d.ts.map +1 -1
  37. package/dist/web-worker/common/persisted-sqlite.js +91 -201
  38. package/dist/web-worker/common/persisted-sqlite.js.map +1 -1
  39. package/dist/web-worker/common/rpc-worker.d.ts +14 -0
  40. package/dist/web-worker/common/rpc-worker.d.ts.map +1 -0
  41. package/dist/web-worker/common/rpc-worker.js +8 -0
  42. package/dist/web-worker/common/rpc-worker.js.map +1 -0
  43. package/dist/web-worker/common/shutdown-channel.d.ts +3 -2
  44. package/dist/web-worker/common/shutdown-channel.d.ts.map +1 -1
  45. package/dist/web-worker/common/shutdown-channel.js +2 -2
  46. package/dist/web-worker/common/shutdown-channel.js.map +1 -1
  47. package/dist/web-worker/common/webmesh-node-names.d.ts +4 -0
  48. package/dist/web-worker/common/webmesh-node-names.d.ts.map +1 -0
  49. package/dist/web-worker/common/webmesh-node-names.js +2 -0
  50. package/dist/web-worker/common/webmesh-node-names.js.map +1 -0
  51. package/dist/web-worker/common/worker-disconnect-channel.d.ts +3 -10
  52. package/dist/web-worker/common/worker-disconnect-channel.d.ts.map +1 -1
  53. package/dist/web-worker/common/worker-disconnect-channel.js +4 -4
  54. package/dist/web-worker/common/worker-disconnect-channel.js.map +1 -1
  55. package/dist/web-worker/common/worker-schema.d.ts +295 -146
  56. package/dist/web-worker/common/worker-schema.d.ts.map +1 -1
  57. package/dist/web-worker/common/worker-schema.js +89 -54
  58. package/dist/web-worker/common/worker-schema.js.map +1 -1
  59. package/dist/web-worker/leader-worker/make-leader-worker.d.ts +6 -6
  60. package/dist/web-worker/leader-worker/make-leader-worker.d.ts.map +1 -1
  61. package/dist/web-worker/leader-worker/make-leader-worker.js +191 -80
  62. package/dist/web-worker/leader-worker/make-leader-worker.js.map +1 -1
  63. package/dist/web-worker/shared-worker/make-shared-worker.d.ts +2 -1
  64. package/dist/web-worker/shared-worker/make-shared-worker.d.ts.map +1 -1
  65. package/dist/web-worker/shared-worker/make-shared-worker.js +91 -94
  66. package/dist/web-worker/shared-worker/make-shared-worker.js.map +1 -1
  67. package/dist/web-worker/vite-dev-polyfill.js +1 -2
  68. package/dist/web-worker/vite-dev-polyfill.js.map +1 -1
  69. package/package.json +47 -19
  70. package/src/in-memory/in-memory-adapter.ts +147 -73
  71. package/src/index.ts +15 -1
  72. package/src/single-tab/mod.ts +15 -0
  73. package/src/single-tab/single-tab-adapter.ts +499 -0
  74. package/src/web-worker/ambient.d.ts +7 -24
  75. package/src/web-worker/client-session/client-session-devtools.ts +47 -25
  76. package/src/web-worker/client-session/devtools-web-channel.ts +57 -0
  77. package/src/web-worker/client-session/persisted-adapter.ts +259 -163
  78. package/src/web-worker/client-session/sqlite-loader.ts +19 -0
  79. package/src/web-worker/common/persisted-sqlite.ts +204 -309
  80. package/src/web-worker/common/rpc-worker.ts +39 -0
  81. package/src/web-worker/common/shutdown-channel.ts +10 -3
  82. package/src/web-worker/common/webmesh-node-names.ts +1 -0
  83. package/src/web-worker/common/worker-disconnect-channel.ts +11 -4
  84. package/src/web-worker/common/worker-schema.ts +138 -131
  85. package/src/web-worker/leader-worker/make-leader-worker.ts +396 -194
  86. package/src/web-worker/shared-worker/make-shared-worker.ts +143 -146
  87. package/src/web-worker/vite-dev-polyfill.ts +1 -2
  88. package/dist/opfs-utils.d.ts +0 -7
  89. package/dist/opfs-utils.d.ts.map +0 -1
  90. package/dist/opfs-utils.js +0 -43
  91. package/dist/opfs-utils.js.map +0 -1
  92. package/src/opfs-utils.ts +0 -61
@@ -1,31 +1,30 @@
1
- import { Devtools, UnexpectedError } from '@livestore/common'
2
- import * as DevtoolsWeb from '@livestore/devtools-web-common/web-channel'
3
- import * as WebmeshWorker from '@livestore/devtools-web-common/worker'
4
- import { isDevEnv, isNotUndefined, LS_DEV } from '@livestore/utils'
1
+ import type { LogConfig } from '@livestore/common'
2
+ import { Devtools, liveStoreVersion, UnknownError } from '@livestore/common'
3
+ import { isDevEnv, LS_DEV } from '@livestore/utils'
5
4
  import {
6
- BrowserWorker,
7
- BrowserWorkerRunner,
8
5
  Deferred,
9
6
  Effect,
10
7
  Exit,
11
8
  FetchHttpClient,
12
9
  identity,
13
10
  Layer,
14
- Logger,
15
- LogLevel,
16
- ParseResult,
17
11
  Ref,
12
+ References,
13
+ RpcClient,
14
+ RpcServer,
15
+ RpcWorker,
18
16
  Schema,
19
17
  Scope,
20
18
  Stream,
21
19
  SubscriptionRef,
22
20
  TaskTracing,
23
- Worker,
24
- WorkerError,
25
- WorkerRunner,
26
21
  } from '@livestore/utils/effect'
22
+ import { BrowserWorker, BrowserWorkerRunner } from '@livestore/utils/effect/browser'
23
+ import * as WebmeshWorker from '@livestore/webmesh/worker'
27
24
 
25
+ import { dieOnRpcClientError, dieOnRpcClientErrorStream, makeWebmeshWorkerProxy } from '../common/rpc-worker.ts'
28
26
  import { makeShutdownChannel } from '../common/shutdown-channel.ts'
27
+ import { makeSharedWorkerNodeName } from '../common/webmesh-node-names.ts'
29
28
  import * as WorkerSchema from '../common/worker-schema.ts'
30
29
 
31
30
  // Extract from `livestore-shared-worker-${storeId}`
@@ -42,68 +41,52 @@ navigator.locks.request(
42
41
  async () => new Promise(() => {}),
43
42
  )
44
43
 
45
- if (isDevEnv()) {
44
+ if (isDevEnv() === true) {
46
45
  globalThis.__debugLiveStoreUtils = {
47
46
  blobUrl: (buffer: Uint8Array<ArrayBuffer>) =>
48
47
  URL.createObjectURL(new Blob([buffer], { type: 'application/octet-stream' })),
49
- runSync: (effect: Effect.Effect<any, any, never>) => Effect.runSync(effect),
50
- runFork: (effect: Effect.Effect<any, any, never>) => Effect.runFork(effect),
48
+ runSync: <A, E>(effect: Effect.Effect<A, E>) => Effect.runSync(effect),
49
+ runFork: <A, E>(effect: Effect.Effect<A, E>) => Effect.runFork(effect),
51
50
  }
52
51
  }
53
52
 
54
53
  const makeWorkerRunner = Effect.gen(function* () {
55
- const leaderWorkerContextSubRef = yield* SubscriptionRef.make<
56
- | {
57
- worker: Worker.SerializedWorkerPool<WorkerSchema.LeaderWorkerInnerRequest>
58
- scope: Scope.CloseableScope
59
- }
60
- | undefined
61
- >(undefined)
54
+ type LeaderWorkerContext = {
55
+ client: RpcClient.FromGroup<typeof WorkerSchema.LeaderWorkerInnerRpcs>
56
+ scope: Scope.Closeable
57
+ }
62
58
 
63
- const initialMessagePayloadDeferredRef = yield* Deferred.make<
64
- typeof WorkerSchema.SharedWorkerInitialMessagePayloadFromClientSession.Type
65
- >().pipe(Effect.andThen(Ref.make))
59
+ const leaderWorkerContextSubRef = yield* SubscriptionRef.make<LeaderWorkerContext | undefined>(undefined)
66
60
 
67
- const waitForWorker = SubscriptionRef.waitUntil(leaderWorkerContextSubRef, isNotUndefined).pipe(
68
- Effect.map((_) => _.worker),
69
- )
61
+ const isLeaderWorkerContext = (context: LeaderWorkerContext | undefined): context is LeaderWorkerContext =>
62
+ context !== undefined
63
+
64
+ const waitForWorker = SubscriptionRef.waitUntil(leaderWorkerContextSubRef, isLeaderWorkerContext)
70
65
 
71
- const forwardRequest = <TReq extends WorkerSchema.LeaderWorkerInnerRequest>(
72
- req: TReq,
73
- ): TReq extends Schema.WithResult<infer A, infer _I, infer _E, infer _EI, infer _R>
74
- ? Effect.Effect<A, UnexpectedError, never>
75
- : never =>
66
+ const forwardRequest = <A, E, R>(
67
+ tag: string,
68
+ f: (client: RpcClient.FromGroup<typeof WorkerSchema.LeaderWorkerInnerRpcs>) => Effect.Effect<A, E, R>,
69
+ ): Effect.Effect<A, E, R> =>
70
+ // Forward the request to the active worker and convert transport errors to defects.
76
71
  waitForWorker.pipe(
77
- // Effect.logBefore(`forwardRequest: ${req._tag}`),
78
- Effect.andThen((worker) => worker.executeEffect(req) as Effect.Effect<unknown, unknown, never>),
79
- // Effect.tap((_) => Effect.log(`forwardRequest: ${req._tag}`, _)),
80
- // Effect.tapError((cause) => Effect.logError(`forwardRequest err: ${req._tag}`, cause)),
72
+ Effect.flatMap(({ client }) => f(client)),
73
+ dieOnRpcClientError,
81
74
  Effect.interruptible,
82
75
  Effect.logWarnIfTakesLongerThan({
83
- label: `@livestore/adapter-web:shared-worker:forwardRequest:${req._tag}`,
76
+ label: `@livestore/adapter-web:shared-worker:forwardRequest:${tag}`,
84
77
  duration: 500,
85
78
  }),
86
- Effect.mapError((cause) =>
87
- Schema.is(UnexpectedError)(cause)
88
- ? cause
89
- : ParseResult.isParseError(cause) || Schema.is(WorkerError.WorkerError)(cause)
90
- ? new UnexpectedError({ cause })
91
- : cause,
92
- ),
93
- Effect.catchAllDefect((cause) => new UnexpectedError({ cause })),
94
79
  Effect.tapCauseLogPretty,
95
- ) as any
80
+ )
96
81
 
97
- const forwardRequestStream = <TReq extends WorkerSchema.LeaderWorkerInnerRequest>(
98
- req: TReq,
99
- ): TReq extends Schema.WithResult<infer A, infer _I, infer _E, infer _EI, infer _R>
100
- ? Stream.Stream<A, UnexpectedError, never>
101
- : never =>
82
+ const forwardRequestStream = <A, E, R>(
83
+ tag: string,
84
+ f: (client: RpcClient.FromGroup<typeof WorkerSchema.LeaderWorkerInnerRpcs>) => Stream.Stream<A, E, R>,
85
+ ): Stream.Stream<A, E, R> =>
102
86
  Effect.gen(function* () {
103
- yield* Effect.logDebug(`forwardRequestStream: ${req._tag}`)
104
- const { worker, scope } = yield* SubscriptionRef.waitUntil(leaderWorkerContextSubRef, isNotUndefined)
105
- const stream = worker.execute(req) as Stream.Stream<unknown, unknown, never>
106
-
87
+ yield* Effect.logDebug(`forwardRequestStream: ${tag}`)
88
+ const { client, scope } = yield* SubscriptionRef.waitUntil(leaderWorkerContextSubRef, isLeaderWorkerContext)
89
+ const stream = f(client).pipe(dieOnRpcClientErrorStream)
107
90
  // It seems the request stream is not automatically interrupted when the scope shuts down
108
91
  // so we need to manually interrupt it when the scope shuts down
109
92
  const shutdownDeferred = yield* Deferred.make<void>()
@@ -111,19 +94,17 @@ const makeWorkerRunner = Effect.gen(function* () {
111
94
 
112
95
  // Here we're creating an empty stream that will finish when the scope shuts down
113
96
  const scopeShutdownStream = Effect.gen(function* () {
114
- yield* shutdownDeferred
97
+ yield* Deferred.await(shutdownDeferred)
115
98
  return Stream.empty
116
99
  }).pipe(Stream.unwrap)
117
100
 
118
101
  return Stream.merge(stream, scopeShutdownStream, { haltStrategy: 'either' })
119
102
  }).pipe(
120
103
  Effect.interruptible,
121
- UnexpectedError.mapToUnexpectedError,
122
104
  Effect.tapCauseLogPretty,
123
105
  Stream.unwrap,
124
- Stream.ensuring(Effect.logDebug(`shutting down stream for ${req._tag}`)),
125
- UnexpectedError.mapToUnexpectedErrorStream,
126
- ) as any
106
+ Stream.ensuring(Effect.logDebug(`shutting down stream for ${tag}`)),
107
+ )
127
108
 
128
109
  const resetCurrentWorkerCtx = Effect.gen(function* () {
129
110
  const prevWorker = yield* SubscriptionRef.get(leaderWorkerContextSubRef)
@@ -131,7 +112,7 @@ const makeWorkerRunner = Effect.gen(function* () {
131
112
  // NOTE we're already unsetting the current worker here, so new incoming requests are queued for the new worker
132
113
  yield* SubscriptionRef.set(leaderWorkerContextSubRef, undefined)
133
114
 
134
- yield* Effect.yieldNow()
115
+ yield* Effect.yieldNow
135
116
 
136
117
  yield* Scope.close(prevWorker.scope, Exit.void).pipe(
137
118
  Effect.logWarnIfTakesLongerThan({
@@ -142,133 +123,149 @@ const makeWorkerRunner = Effect.gen(function* () {
142
123
  }
143
124
  }).pipe(Effect.withSpan('@livestore/adapter-web:shared-worker:resetCurrentWorkerCtx'))
144
125
 
145
- // const devtoolsWebBridge = yield* makeDevtoolsWebBridge
146
-
147
126
  const reset = Effect.gen(function* () {
148
127
  yield* Effect.logDebug('reset')
149
-
150
- const initialMessagePayloadDeferred =
151
- yield* Deferred.make<typeof WorkerSchema.SharedWorkerInitialMessagePayloadFromClientSession.Type>()
152
- yield* Ref.set(initialMessagePayloadDeferredRef, initialMessagePayloadDeferred)
153
-
128
+ // Clear cached invariants so a fresh configuration can be accepted after shutdown
129
+ yield* Ref.set(invariantsRef, undefined)
130
+ // Tear down current leader worker context
154
131
  yield* resetCurrentWorkerCtx
155
- // yield* devtoolsWebBridge.reset
156
132
  })
157
133
 
158
- return WorkerRunner.layerSerialized(WorkerSchema.SharedWorkerRequest, {
159
- InitialMessage: (message) =>
160
- Effect.gen(function* () {
161
- if (message.payload._tag === 'FromWebBridge') return
162
-
163
- const initialMessagePayloadDeferred = yield* Ref.get(initialMessagePayloadDeferredRef)
164
- const deferredAlreadyDone = yield* Deferred.isDone(initialMessagePayloadDeferred)
165
- const initialMessage = message.payload.initialMessage
166
-
167
- if (deferredAlreadyDone) {
168
- const previousInitialMessage = yield* Deferred.await(initialMessagePayloadDeferred)
169
- const messageSchema = WorkerSchema.LeaderWorkerInnerInitialMessage.pipe(
170
- Schema.omit('devtoolsEnabled', 'debugInstanceId'),
171
- )
172
- const isEqual = Schema.equivalence(messageSchema)
173
- if (isEqual(initialMessage, previousInitialMessage.initialMessage) === false) {
174
- const diff = Schema.debugDiff(messageSchema)(previousInitialMessage.initialMessage, initialMessage)
134
+ // Cache first-applied invariants to enforce stability across leader transitions
135
+ const InvariantsSchema = Schema.Struct({
136
+ storeId: Schema.String,
137
+ storageOptions: WorkerSchema.StorageType,
138
+ syncPayloadEncoded: Schema.UndefinedOr(Schema.Json),
139
+ liveStoreVersion: Schema.Literal(liveStoreVersion),
140
+ devtoolsEnabled: Schema.Boolean,
141
+ })
142
+ type Invariants = typeof InvariantsSchema.Type
143
+ const invariantsRef = yield* Ref.make<Invariants | undefined>(undefined)
144
+ const sameInvariants = Schema.toEquivalence(InvariantsSchema)
175
145
 
176
- return yield* new UnexpectedError({
177
- cause: 'Initial message already sent and was different now',
178
- payload: {
179
- diff,
180
- previousInitialMessage: previousInitialMessage.initialMessage,
181
- newInitialMessage: initialMessage,
182
- },
183
- })
184
- }
185
- } else {
186
- yield* Deferred.succeed(initialMessagePayloadDeferred, message.payload)
187
- }
188
- }),
146
+ return WorkerSchema.SharedWorkerRpcs.of({
189
147
  // Whenever the client session leader changes (and thus creates a new leader thread), the new client session leader
190
148
  // sends a new MessagePort to the shared worker which proxies messages to the new leader thread.
191
- UpdateMessagePort: ({ port }) =>
149
+ UpdateMessagePort: ({ port, initial, liveStoreVersion: clientLiveStoreVersion }) =>
192
150
  Effect.gen(function* () {
193
- const initialMessagePayload = yield* initialMessagePayloadDeferredRef.get.pipe(Effect.andThen(Deferred.await))
151
+ // Enforce invariants: storeId, storageOptions, syncPayloadEncoded, liveStoreVersion must remain stable
152
+ const invariants: Invariants = {
153
+ storeId: initial.storeId,
154
+ storageOptions: initial.storageOptions,
155
+ syncPayloadEncoded: initial.syncPayloadEncoded,
156
+ liveStoreVersion: clientLiveStoreVersion,
157
+ devtoolsEnabled: initial.devtoolsEnabled,
158
+ }
159
+ const prev = yield* Ref.get(invariantsRef)
160
+ // Early return on mismatch to keep happy path linear
161
+ if (prev !== undefined && sameInvariants(prev, invariants) === false) {
162
+ const diff = Schema.debugDiff(InvariantsSchema)(prev, invariants)
163
+ return yield* new UnknownError({
164
+ cause: 'Store invariants changed across leader transitions',
165
+ payload: { diff, previous: prev, next: invariants },
166
+ })
167
+ }
168
+ // First writer records invariants
169
+ if (prev === undefined) {
170
+ yield* Ref.set(invariantsRef, invariants)
171
+ }
194
172
 
195
173
  yield* resetCurrentWorkerCtx
196
174
 
197
175
  const scope = yield* Scope.make()
198
176
 
199
177
  yield* Effect.gen(function* () {
200
- const shutdownChannel = yield* makeShutdownChannel(initialMessagePayload.initialMessage.storeId)
178
+ const shutdownChannel = yield* makeShutdownChannel(initial.storeId)
201
179
 
202
180
  yield* shutdownChannel.listen.pipe(
203
- Stream.flatten(),
181
+ Stream.mapEffect(Effect.fromResult),
204
182
  Stream.tap(() => reset),
205
183
  Stream.runDrain,
206
184
  Effect.tapCauseLogPretty,
207
185
  Effect.forkScoped,
208
186
  )
209
187
 
210
- const workerLayer = yield* Layer.build(BrowserWorker.layer(() => port))
211
-
212
- const worker = yield* Worker.makePoolSerialized<WorkerSchema.LeaderWorkerInnerRequest>({
213
- size: 1,
214
- concurrency: 100,
215
- initialMessage: () => initialMessagePayload.initialMessage,
216
- }).pipe(
217
- Effect.provide(workerLayer),
188
+ const clientContext = yield* Layer.build(
189
+ RpcClient.layerProtocolWorker({ size: 1, concurrency: 100 }).pipe(
190
+ Layer.provide(BrowserWorker.layer(() => port)),
191
+ Layer.provide(
192
+ RpcWorker.layerInitialMessage(
193
+ WorkerSchema.LeaderWorkerInnerInitialMessage.payloadSchema,
194
+ Effect.succeed(initial),
195
+ ),
196
+ ),
197
+ ),
198
+ )
199
+ const client = yield* RpcClient.make(WorkerSchema.LeaderWorkerInnerRpcs).pipe(
200
+ Effect.provide(clientContext),
218
201
  Effect.withSpan('@livestore/adapter-web:shared-worker:makeWorkerProxyFromPort'),
219
202
  )
220
203
 
221
204
  // Prepare the web mesh connection for leader worker to be able to connect to the devtools
222
205
  const { node } = yield* WebmeshWorker.CacheService
223
- const { storeId, clientId } = initialMessagePayload.initialMessage
206
+ const { storeId, clientId } = initial
224
207
 
225
- yield* DevtoolsWeb.connectViaWorker({
208
+ yield* WebmeshWorker.connectViaWorker({
226
209
  node,
227
- worker,
210
+ worker: makeWebmeshWorkerProxy(client),
228
211
  target: Devtools.makeNodeName.client.leader({ storeId, clientId }),
229
- }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
212
+ }).pipe(Effect.tapCauseLogPretty, dieOnRpcClientError, Effect.forkScoped)
230
213
 
231
- yield* SubscriptionRef.set(leaderWorkerContextSubRef, { worker, scope })
232
- }).pipe(Effect.tapCauseLogPretty, Scope.extend(scope), Effect.forkIn(scope))
233
- }).pipe(
234
- Effect.withSpan('@livestore/adapter-web:shared-worker:updateMessagePort'),
235
- UnexpectedError.mapToUnexpectedError,
236
- Effect.tapCauseLogPretty,
237
- ),
214
+ yield* SubscriptionRef.set(leaderWorkerContextSubRef, {
215
+ client: client as RpcClient.FromGroup<typeof WorkerSchema.LeaderWorkerInnerRpcs>,
216
+ scope,
217
+ })
218
+ }).pipe(Effect.tapCauseLogPretty, Scope.provide(scope), Effect.forkIn(scope))
219
+ }).pipe(Effect.withSpan('@livestore/adapter-web:shared-worker:updateMessagePort'), Effect.tapCauseLogPretty),
238
220
 
239
221
  // Proxied requests
240
- BootStatusStream: forwardRequestStream,
241
- PushToLeader: forwardRequest,
242
- PullStream: forwardRequestStream,
243
- Export: forwardRequest,
244
- GetRecreateSnapshot: forwardRequest,
245
- ExportEventlog: forwardRequest,
246
- Setup: forwardRequest,
247
- GetLeaderSyncState: forwardRequest,
248
- GetLeaderHead: forwardRequest,
249
- Shutdown: forwardRequest,
250
- ExtraDevtoolsMessage: forwardRequest,
222
+ BootStatusStream: (payload) =>
223
+ forwardRequestStream('BootStatusStream', (client) => client.BootStatusStream(payload)),
224
+ PushToLeader: (payload) => forwardRequest('PushToLeader', (client) => client.PushToLeader(payload)),
225
+ PullStream: (payload) => forwardRequestStream('PullStream', (client) => client.PullStream(payload)),
226
+ StreamEvents: (payload) => forwardRequestStream('StreamEvents', (client) => client.StreamEvents(payload)),
227
+ Export: (payload) => forwardRequest('Export', (client) => client.Export(payload)),
228
+ GetRecreateSnapshot: (payload) =>
229
+ forwardRequest('GetRecreateSnapshot', (client) => client.GetRecreateSnapshot(payload)),
230
+ ExportEventlog: (payload) => forwardRequest('ExportEventlog', (client) => client.ExportEventlog(payload)),
231
+ GetLeaderSyncState: (payload) =>
232
+ forwardRequest('GetLeaderSyncState', (client) => client.GetLeaderSyncState(payload)),
233
+ SyncStateStream: (payload) => forwardRequestStream('SyncStateStream', (client) => client.SyncStateStream(payload)),
234
+ GetLeaderHead: (payload) => forwardRequest('GetLeaderHead', (client) => client.GetLeaderHead(payload)),
235
+ GetNetworkStatus: (payload) => forwardRequest('GetNetworkStatus', (client) => client.GetNetworkStatus(payload)),
236
+ NetworkStatusStream: (payload) =>
237
+ forwardRequestStream('NetworkStatusStream', (client) => client.NetworkStatusStream(payload)),
238
+ Shutdown: (payload) => forwardRequest('Shutdown', (client) => client.Shutdown(payload)),
239
+ ExtraDevtoolsMessage: (payload) =>
240
+ forwardRequest('ExtraDevtoolsMessage', (client) => client.ExtraDevtoolsMessage(payload)),
251
241
 
252
242
  // Accept devtools connections (from leader and client sessions)
253
- 'DevtoolsWebCommon.CreateConnection': WebmeshWorker.CreateConnection,
243
+ 'WebmeshWorker.CreateConnection': WebmeshWorker.CreateConnection,
254
244
  })
255
- }).pipe(Layer.unwrapScoped)
245
+ })
256
246
 
257
- export const makeWorker = () => {
258
- makeWorkerRunner.pipe(
247
+ export const makeWorker = (options?: LogConfig.LoggerOptions): void => {
248
+ const runtimeLayer = Layer.mergeAll(
249
+ FetchHttpClient.layer,
250
+ WebmeshWorker.CacheService.layer({ nodeName: makeSharedWorkerNodeName({ storeId }) }),
251
+ )
252
+
253
+ RpcServer.layer(WorkerSchema.SharedWorkerRpcs).pipe(
254
+ Layer.provide(WorkerSchema.SharedWorkerRpcs.toLayer(makeWorkerRunner)),
255
+ Layer.provide(RpcServer.layerProtocolWorkerRunner),
259
256
  Layer.provide(BrowserWorkerRunner.layer),
260
- // WorkerRunner.launch,
261
257
  Layer.launch,
262
258
  Effect.scoped,
263
259
  Effect.tapCauseLogPretty,
264
260
  Effect.annotateLogs({ thread: self.name }),
265
- Effect.provide(Logger.prettyWithThread(self.name)),
266
- Effect.provide(FetchHttpClient.layer),
267
- Effect.provide(WebmeshWorker.CacheService.layer({ nodeName: DevtoolsWeb.makeNodeName.sharedWorker({ storeId }) })),
268
- LS_DEV ? TaskTracing.withAsyncTaggingTracing((name) => (console as any).createTask(name)) : identity,
269
- // TODO remove type-cast (currently needed to silence a tsc bug)
270
- (_) => _ as any as Effect.Effect<void, any>,
271
- Logger.withMinimumLogLevel(LogLevel.Debug),
261
+ Effect.provide(runtimeLayer),
262
+ LS_DEV === true ? TaskTracing.withAsyncTaggingTracing((name) => (console as any).createTask(name)) : identity,
263
+ Effect.provide(
264
+ Layer.mergeAll(
265
+ options?.logger ?? Layer.empty,
266
+ Layer.succeed(References.MinimumLogLevel, options?.logLevel ?? (isDevEnv() === true ? 'Debug' : 'Info')),
267
+ ),
268
+ ),
272
269
  Effect.runFork,
273
270
  )
274
271
  }
@@ -5,8 +5,7 @@ globalThis.$RefreshReg$ = () => {}
5
5
  // @ts-expect-error TODO remove when Vite does proper treeshaking during dev
6
6
  globalThis.$RefreshSig$ = () => (type: any) => type
7
7
 
8
- // biome-ignore lint/suspicious/noTsIgnore: sometimes @types/node is there, sometimes not.
9
- // @ts-ignore
8
+ // @ts-ignore sometimes @types/node is there, sometimes not.
10
9
  globalThis.process = globalThis.process ?? { env: {} }
11
10
 
12
11
  globalThis.document = (globalThis as any)?.document ?? {
@@ -1,7 +0,0 @@
1
- export declare const rootHandlePromise: Promise<FileSystemDirectoryHandle>;
2
- export declare const getDirHandle: (absDirPath: string | undefined, options?: {
3
- create?: boolean;
4
- }) => Promise<FileSystemDirectoryHandle>;
5
- export declare const printTree: (directoryHandle_?: FileSystemDirectoryHandle | Promise<FileSystemDirectoryHandle>, depth?: number, prefix?: string) => Promise<void>;
6
- export declare const deleteAll: (directoryHandle: FileSystemDirectoryHandle) => Promise<void>;
7
- //# sourceMappingURL=opfs-utils.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"opfs-utils.d.ts","sourceRoot":"","sources":["../src/opfs-utils.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB,oCAYQ,CAAA;AAEtC,eAAO,MAAM,YAAY,GAAU,YAAY,MAAM,GAAG,SAAS,EAAE,UAAS;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,uCAWpG,CAAA;AAED,eAAO,MAAM,SAAS,GACpB,mBAAkB,yBAAyB,GAAG,OAAO,CAAC,yBAAyB,CAAqB,EACpG,QAAO,MAAiC,EACxC,eAAW,KACV,OAAO,CAAC,IAAI,CAgBd,CAAA;AAED,eAAO,MAAM,SAAS,GAAU,iBAAiB,yBAAyB,kBAMzE,CAAA"}
@@ -1,43 +0,0 @@
1
- // NOTE we're already firing off this promise call here since we'll need it anyway and need it cached
2
- import { prettyBytes } from '@livestore/utils';
3
- // To improve LiveStore compatibility with e.g. Node.js we're guarding for `navigator` / `navigator.storage` to be defined.
4
- export const rootHandlePromise = typeof navigator === 'undefined' || navigator.storage === undefined
5
- ? // We're using a proxy here to make the promise reject lazy
6
- new Proxy({}, {
7
- get: () => Promise.reject(new Error(`Can't get OPFS root handle in this environment as navigator.storage is undefined`)),
8
- })
9
- : navigator.storage.getDirectory();
10
- export const getDirHandle = async (absDirPath, options = {}) => {
11
- const rootHandle = await rootHandlePromise;
12
- if (absDirPath === undefined || absDirPath === '' || absDirPath === '/')
13
- return rootHandle;
14
- let dirHandle = rootHandle;
15
- const directoryStack = absDirPath.split('/').filter(Boolean);
16
- while (directoryStack.length > 0) {
17
- dirHandle = await dirHandle.getDirectoryHandle(directoryStack.shift(), options);
18
- }
19
- return dirHandle;
20
- };
21
- export const printTree = async (directoryHandle_ = rootHandlePromise, depth = Number.POSITIVE_INFINITY, prefix = '') => {
22
- if (depth < 0)
23
- return;
24
- const directoryHandle = await directoryHandle_;
25
- const entries = directoryHandle.values();
26
- for await (const entry of entries) {
27
- const isDirectory = entry.kind === 'directory';
28
- const size = entry.kind === 'file' ? await entry.getFile().then((file) => prettyBytes(file.size)) : undefined;
29
- console.log(`${prefix}${isDirectory ? '📁' : '📄'} ${entry.name} ${size ? `(${size})` : ''}`);
30
- if (isDirectory) {
31
- const nestedDirectoryHandle = await directoryHandle.getDirectoryHandle(entry.name);
32
- await printTree(nestedDirectoryHandle, depth - 1, `${prefix} `);
33
- }
34
- }
35
- };
36
- export const deleteAll = async (directoryHandle) => {
37
- if (directoryHandle.kind !== 'directory')
38
- return;
39
- for await (const entryName of directoryHandle.keys()) {
40
- await directoryHandle.removeEntry(entryName, { recursive: true });
41
- }
42
- };
43
- //# sourceMappingURL=opfs-utils.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"opfs-utils.js","sourceRoot":"","sources":["../src/opfs-utils.ts"],"names":[],"mappings":"AAAA,qGAAqG;AAErG,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,2HAA2H;AAC3H,MAAM,CAAC,MAAM,iBAAiB,GAC5B,OAAO,SAAS,KAAK,WAAW,IAAI,SAAS,CAAC,OAAO,KAAK,SAAS;IACjE,CAAC,CAAC,2DAA2D;QAC1D,IAAI,KAAK,CACR,EAAE,EACF;YACE,GAAG,EAAE,GAAG,EAAE,CACR,OAAO,CAAC,MAAM,CACZ,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAC9F;SACJ,CACQ;IACb,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,CAAA;AAEtC,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,UAA8B,EAAE,UAAgC,EAAE,EAAE,EAAE;IACvG,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAA;IAC1C,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,EAAE,IAAI,UAAU,KAAK,GAAG;QAAE,OAAO,UAAU,CAAA;IAE1F,IAAI,SAAS,GAAG,UAAU,CAAA;IAC1B,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC5D,OAAO,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,SAAS,GAAG,MAAM,SAAS,CAAC,kBAAkB,CAAC,cAAc,CAAC,KAAK,EAAG,EAAE,OAAO,CAAC,CAAA;IAClF,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAC5B,mBAAmF,iBAAiB,EACpG,QAAgB,MAAM,CAAC,iBAAiB,EACxC,MAAM,GAAG,EAAE,EACI,EAAE;IACjB,IAAI,KAAK,GAAG,CAAC;QAAE,OAAM;IAErB,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAA;IAC9C,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,EAAE,CAAA;IAExC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAClC,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,KAAK,WAAW,CAAA;QAC9C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAC7G,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAE7F,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,qBAAqB,GAAG,MAAM,eAAe,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAClF,MAAM,SAAS,CAAC,qBAAqB,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,MAAM,IAAI,CAAC,CAAA;QAClE,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,eAA0C,EAAE,EAAE;IAC5E,IAAI,eAAe,CAAC,IAAI,KAAK,WAAW;QAAE,OAAM;IAEhD,IAAI,KAAK,EAAE,MAAM,SAAS,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC;QACrD,MAAM,eAAe,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACnE,CAAC;AACH,CAAC,CAAA"}
package/src/opfs-utils.ts DELETED
@@ -1,61 +0,0 @@
1
- // NOTE we're already firing off this promise call here since we'll need it anyway and need it cached
2
-
3
- import { prettyBytes } from '@livestore/utils'
4
-
5
- // To improve LiveStore compatibility with e.g. Node.js we're guarding for `navigator` / `navigator.storage` to be defined.
6
- export const rootHandlePromise =
7
- typeof navigator === 'undefined' || navigator.storage === undefined
8
- ? // We're using a proxy here to make the promise reject lazy
9
- (new Proxy(
10
- {},
11
- {
12
- get: () =>
13
- Promise.reject(
14
- new Error(`Can't get OPFS root handle in this environment as navigator.storage is undefined`),
15
- ),
16
- },
17
- ) as never)
18
- : navigator.storage.getDirectory()
19
-
20
- export const getDirHandle = async (absDirPath: string | undefined, options: { create?: boolean } = {}) => {
21
- const rootHandle = await rootHandlePromise
22
- if (absDirPath === undefined || absDirPath === '' || absDirPath === '/') return rootHandle
23
-
24
- let dirHandle = rootHandle
25
- const directoryStack = absDirPath.split('/').filter(Boolean)
26
- while (directoryStack.length > 0) {
27
- dirHandle = await dirHandle.getDirectoryHandle(directoryStack.shift()!, options)
28
- }
29
-
30
- return dirHandle
31
- }
32
-
33
- export const printTree = async (
34
- directoryHandle_: FileSystemDirectoryHandle | Promise<FileSystemDirectoryHandle> = rootHandlePromise,
35
- depth: number = Number.POSITIVE_INFINITY,
36
- prefix = '',
37
- ): Promise<void> => {
38
- if (depth < 0) return
39
-
40
- const directoryHandle = await directoryHandle_
41
- const entries = directoryHandle.values()
42
-
43
- for await (const entry of entries) {
44
- const isDirectory = entry.kind === 'directory'
45
- const size = entry.kind === 'file' ? await entry.getFile().then((file) => prettyBytes(file.size)) : undefined
46
- console.log(`${prefix}${isDirectory ? '📁' : '📄'} ${entry.name} ${size ? `(${size})` : ''}`)
47
-
48
- if (isDirectory) {
49
- const nestedDirectoryHandle = await directoryHandle.getDirectoryHandle(entry.name)
50
- await printTree(nestedDirectoryHandle, depth - 1, `${prefix} `)
51
- }
52
- }
53
- }
54
-
55
- export const deleteAll = async (directoryHandle: FileSystemDirectoryHandle) => {
56
- if (directoryHandle.kind !== 'directory') return
57
-
58
- for await (const entryName of directoryHandle.keys()) {
59
- await directoryHandle.removeEntry(entryName, { recursive: true })
60
- }
61
- }