@livestore/adapter-web 0.4.0 → 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 (63) hide show
  1. package/dist/.tsbuildinfo +1 -1
  2. package/dist/in-memory/in-memory-adapter.d.ts +6 -8
  3. package/dist/in-memory/in-memory-adapter.d.ts.map +1 -1
  4. package/dist/in-memory/in-memory-adapter.js +30 -26
  5. package/dist/in-memory/in-memory-adapter.js.map +1 -1
  6. package/dist/single-tab/single-tab-adapter.d.ts.map +1 -1
  7. package/dist/single-tab/single-tab-adapter.js +47 -66
  8. package/dist/single-tab/single-tab-adapter.js.map +1 -1
  9. package/dist/web-worker/client-session/client-session-devtools.d.ts +3 -4
  10. package/dist/web-worker/client-session/client-session-devtools.d.ts.map +1 -1
  11. package/dist/web-worker/client-session/client-session-devtools.js +7 -5
  12. package/dist/web-worker/client-session/client-session-devtools.js.map +1 -1
  13. package/dist/web-worker/client-session/devtools-web-channel.d.ts +20 -0
  14. package/dist/web-worker/client-session/devtools-web-channel.d.ts.map +1 -0
  15. package/dist/web-worker/client-session/devtools-web-channel.js +34 -0
  16. package/dist/web-worker/client-session/devtools-web-channel.js.map +1 -0
  17. package/dist/web-worker/client-session/persisted-adapter.d.ts.map +1 -1
  18. package/dist/web-worker/client-session/persisted-adapter.js +57 -64
  19. package/dist/web-worker/client-session/persisted-adapter.js.map +1 -1
  20. package/dist/web-worker/common/persisted-sqlite.d.ts +8 -10
  21. package/dist/web-worker/common/persisted-sqlite.d.ts.map +1 -1
  22. package/dist/web-worker/common/persisted-sqlite.js +15 -24
  23. package/dist/web-worker/common/persisted-sqlite.js.map +1 -1
  24. package/dist/web-worker/common/rpc-worker.d.ts +14 -0
  25. package/dist/web-worker/common/rpc-worker.d.ts.map +1 -0
  26. package/dist/web-worker/common/rpc-worker.js +8 -0
  27. package/dist/web-worker/common/rpc-worker.js.map +1 -0
  28. package/dist/web-worker/common/webmesh-node-names.d.ts +4 -0
  29. package/dist/web-worker/common/webmesh-node-names.d.ts.map +1 -0
  30. package/dist/web-worker/common/webmesh-node-names.js +2 -0
  31. package/dist/web-worker/common/webmesh-node-names.js.map +1 -0
  32. package/dist/web-worker/common/worker-disconnect-channel.d.ts +1 -4
  33. package/dist/web-worker/common/worker-disconnect-channel.d.ts.map +1 -1
  34. package/dist/web-worker/common/worker-disconnect-channel.js +1 -2
  35. package/dist/web-worker/common/worker-disconnect-channel.js.map +1 -1
  36. package/dist/web-worker/common/worker-schema.d.ts +264 -209
  37. package/dist/web-worker/common/worker-schema.d.ts.map +1 -1
  38. package/dist/web-worker/common/worker-schema.js +68 -51
  39. package/dist/web-worker/common/worker-schema.js.map +1 -1
  40. package/dist/web-worker/leader-worker/make-leader-worker.d.ts +6 -8
  41. package/dist/web-worker/leader-worker/make-leader-worker.d.ts.map +1 -1
  42. package/dist/web-worker/leader-worker/make-leader-worker.js +142 -91
  43. package/dist/web-worker/leader-worker/make-leader-worker.js.map +1 -1
  44. package/dist/web-worker/shared-worker/make-shared-worker.d.ts +2 -2
  45. package/dist/web-worker/shared-worker/make-shared-worker.d.ts.map +1 -1
  46. package/dist/web-worker/shared-worker/make-shared-worker.js +50 -63
  47. package/dist/web-worker/shared-worker/make-shared-worker.js.map +1 -1
  48. package/dist/web-worker/vite-dev-polyfill.js +1 -2
  49. package/dist/web-worker/vite-dev-polyfill.js.map +1 -1
  50. package/package.json +14 -24
  51. package/src/in-memory/in-memory-adapter.ts +66 -58
  52. package/src/single-tab/single-tab-adapter.ts +95 -95
  53. package/src/web-worker/client-session/client-session-devtools.ts +16 -8
  54. package/src/web-worker/client-session/devtools-web-channel.ts +57 -0
  55. package/src/web-worker/client-session/persisted-adapter.ts +105 -105
  56. package/src/web-worker/common/persisted-sqlite.ts +41 -48
  57. package/src/web-worker/common/rpc-worker.ts +39 -0
  58. package/src/web-worker/common/webmesh-node-names.ts +1 -0
  59. package/src/web-worker/common/worker-disconnect-channel.ts +1 -1
  60. package/src/web-worker/common/worker-schema.ts +128 -161
  61. package/src/web-worker/leader-worker/make-leader-worker.ts +344 -219
  62. package/src/web-worker/shared-worker/make-shared-worker.ts +93 -84
  63. package/src/web-worker/vite-dev-polyfill.ts +1 -2
@@ -1,8 +1,8 @@
1
- import { BootStatus, Devtools, RejectedPushError, liveStoreVersion, MigrationsReport, SyncBackend, SyncState, UnknownError, } from '@livestore/common';
1
+ import { BootStatus, Devtools, liveStoreVersion, MigrationsReport, RejectedPushError, SyncBackend, SyncState, UnknownError, } from '@livestore/common';
2
2
  import { StreamEventsOptionsFields } from '@livestore/common/leader-thread';
3
3
  import { EventSequenceNumber, LiveStoreEvent } from '@livestore/common/schema';
4
- import * as WebmeshWorker from '@livestore/devtools-web-common/worker';
5
- import { Schema, Transferable } from '@livestore/utils/effect';
4
+ import { Rpc, RpcGroup, Schema, Transferable } from '@livestore/utils/effect';
5
+ import * as WebmeshWorker from '@livestore/webmesh/worker';
6
6
  export const StorageTypeOpfs = Schema.Struct({
7
7
  type: Schema.Literal('opfs'),
8
8
  /**
@@ -16,132 +16,148 @@ export const StorageTypeOpfs = Schema.Struct({
16
16
  // export const StorageTypeIndexeddb = Schema.Struct({
17
17
  // type: Schema.Literal('indexeddb'),
18
18
  // /** @default "livestore" */
19
- // databaseName: Schema.optionalWith(Schema.String, { default: () => 'livestore' }),
19
+ // databaseName: Schema.String.pipe(Schema.withDecodingDefaultType(Effect.succeed('livestore'))),
20
20
  // /** @default "livestore-" */
21
- // storeNamePrefix: Schema.optionalWith(Schema.String, { default: () => 'livestore-' }),
21
+ // storeNamePrefix: Schema.String.pipe(Schema.withDecodingDefaultType(Effect.succeed('livestore-'))),
22
22
  // })
23
- export const StorageType = Schema.Union(StorageTypeOpfs);
24
- // export const SyncBackendOptions = Schema.Union(SyncBackendOptionsWebsocket)
25
- export const SyncBackendOptions = Schema.Record({ key: Schema.String, value: Schema.JsonValue });
26
- export class LeaderWorkerOuterInitialMessage extends Schema.TaggedRequest()('InitialMessage', {
23
+ export const StorageType = Schema.Union([
24
+ StorageTypeOpfs,
25
+ // StorageTypeIndexeddb
26
+ ]);
27
+ // export const SyncBackendOptions = Schema.Union([SyncBackendOptionsWebsocket])
28
+ export const SyncBackendOptions = Schema.Record(Schema.String, Schema.Json);
29
+ export class LeaderWorkerOuterInitialMessage extends Rpc.make('InitialMessage', {
27
30
  payload: { port: Transferable.MessagePort, storeId: Schema.String, clientId: Schema.String },
28
31
  success: Schema.Void,
29
- failure: Schema.Never,
32
+ error: Schema.Never,
30
33
  }) {
31
34
  }
32
- export class LeaderWorkerOuterRequest extends Schema.Union(LeaderWorkerOuterInitialMessage) {
35
+ export class LeaderWorkerOuterRpcs extends RpcGroup.make(LeaderWorkerOuterInitialMessage) {
33
36
  }
34
37
  // TODO unify this code with schema from node adapter
35
- export class LeaderWorkerInnerInitialMessage extends Schema.TaggedRequest()('InitialMessage', {
38
+ export class LeaderWorkerInnerInitialMessage extends Rpc.make('InitialMessage', {
36
39
  payload: {
37
40
  storageOptions: StorageType,
38
41
  devtoolsEnabled: Schema.Boolean,
39
42
  storeId: Schema.String,
40
43
  clientId: Schema.String,
41
44
  debugInstanceId: Schema.String,
42
- syncPayloadEncoded: Schema.UndefinedOr(Schema.JsonValue),
45
+ syncPayloadEncoded: Schema.UndefinedOr(Schema.Json),
43
46
  },
44
47
  success: Schema.Void,
45
- failure: UnknownError,
48
+ error: UnknownError,
46
49
  }) {
47
50
  }
48
- export class LeaderWorkerInnerBootStatusStream extends Schema.TaggedRequest()('BootStatusStream', {
51
+ export class LeaderWorkerInnerBootStatusStream extends Rpc.make('BootStatusStream', {
49
52
  payload: {},
50
53
  success: BootStatus,
51
- failure: Schema.Never,
54
+ error: Schema.Never,
55
+ stream: true,
52
56
  }) {
53
57
  }
54
- export class LeaderWorkerInnerPushToLeader extends Schema.TaggedRequest()('PushToLeader', {
58
+ export class LeaderWorkerInnerPushToLeader extends Rpc.make('PushToLeader', {
55
59
  payload: {
56
- batch: Schema.Array(Schema.typeSchema(LiveStoreEvent.Client.Encoded)),
60
+ batch: Schema.Array(Schema.toType(LiveStoreEvent.Client.Encoded)),
57
61
  },
58
62
  success: Schema.Void,
59
- failure: RejectedPushError,
63
+ error: RejectedPushError,
60
64
  }) {
61
65
  }
62
- export class LeaderWorkerInnerPullStream extends Schema.TaggedRequest()('PullStream', {
66
+ export class LeaderWorkerInnerPullStream extends Rpc.make('PullStream', {
63
67
  payload: {
64
- cursor: Schema.typeSchema(EventSequenceNumber.Client.Composite),
68
+ cursor: Schema.toType(EventSequenceNumber.Client.Composite),
65
69
  },
66
70
  success: Schema.Struct({
67
71
  payload: SyncState.PayloadUpstream,
68
72
  }),
69
- failure: Schema.Never,
73
+ error: Schema.Never,
74
+ stream: true,
70
75
  }) {
71
76
  }
72
- export class LeaderWorkerInnerStreamEvents extends Schema.TaggedRequest()('StreamEvents', {
77
+ export class LeaderWorkerInnerStreamEvents extends Rpc.make('StreamEvents', {
73
78
  payload: StreamEventsOptionsFields,
74
79
  success: LiveStoreEvent.Client.Encoded,
75
- failure: Schema.Never,
80
+ error: Schema.Never,
81
+ stream: true,
76
82
  }) {
77
83
  }
78
- export class LeaderWorkerInnerExport extends Schema.TaggedRequest()('Export', {
84
+ export class LeaderWorkerInnerExport extends Rpc.make('Export', {
79
85
  payload: {},
80
86
  success: Transferable.Uint8Array,
81
- failure: Schema.Never,
87
+ error: Schema.Never,
82
88
  }) {
83
89
  }
84
- export class LeaderWorkerInnerExportEventlog extends Schema.TaggedRequest()('ExportEventlog', {
90
+ export class LeaderWorkerInnerExportEventlog extends Rpc.make('ExportEventlog', {
85
91
  payload: {},
86
92
  success: Transferable.Uint8Array,
87
- failure: Schema.Never,
93
+ error: Schema.Never,
88
94
  }) {
89
95
  }
90
- export class LeaderWorkerInnerGetRecreateSnapshot extends Schema.TaggedRequest()('GetRecreateSnapshot', {
96
+ export class LeaderWorkerInnerGetRecreateSnapshot extends Rpc.make('GetRecreateSnapshot', {
91
97
  payload: {},
92
98
  success: Schema.Struct({
93
99
  snapshot: Transferable.Uint8Array,
94
100
  migrationsReport: MigrationsReport,
95
101
  }),
96
- failure: Schema.Never,
102
+ error: Schema.Never,
97
103
  }) {
98
104
  }
99
- export class LeaderWorkerInnerGetLeaderHead extends Schema.TaggedRequest()('GetLeaderHead', {
105
+ export class LeaderWorkerInnerGetLeaderHead extends Rpc.make('GetLeaderHead', {
100
106
  payload: {},
101
- success: Schema.typeSchema(EventSequenceNumber.Client.Composite),
102
- failure: Schema.Never,
107
+ success: Schema.toType(EventSequenceNumber.Client.Composite),
108
+ error: Schema.Never,
103
109
  }) {
104
110
  }
105
- export class LeaderWorkerInnerGetLeaderSyncState extends Schema.TaggedRequest()('GetLeaderSyncState', {
111
+ export class LeaderWorkerInnerGetLeaderSyncState extends Rpc.make('GetLeaderSyncState', {
106
112
  payload: {},
107
113
  success: SyncState.SyncState,
108
- failure: Schema.Never,
114
+ error: Schema.Never,
109
115
  }) {
110
116
  }
111
- export class LeaderWorkerInnerSyncStateStream extends Schema.TaggedRequest()('SyncStateStream', {
117
+ export class LeaderWorkerInnerSyncStateStream extends Rpc.make('SyncStateStream', {
112
118
  payload: {},
113
119
  success: SyncState.SyncState,
114
- failure: Schema.Never,
120
+ error: Schema.Never,
121
+ stream: true,
115
122
  }) {
116
123
  }
117
- export class LeaderWorkerInnerGetNetworkStatus extends Schema.TaggedRequest()('GetNetworkStatus', {
124
+ export class LeaderWorkerInnerGetNetworkStatus extends Rpc.make('GetNetworkStatus', {
118
125
  payload: {},
119
126
  success: SyncBackend.NetworkStatus,
120
- failure: Schema.Never,
127
+ error: Schema.Never,
121
128
  }) {
122
129
  }
123
- export class LeaderWorkerInnerNetworkStatusStream extends Schema.TaggedRequest()('NetworkStatusStream', {
130
+ export class LeaderWorkerInnerNetworkStatusStream extends Rpc.make('NetworkStatusStream', {
124
131
  payload: {},
125
132
  success: SyncBackend.NetworkStatus,
126
- failure: Schema.Never,
133
+ error: Schema.Never,
134
+ stream: true,
127
135
  }) {
128
136
  }
129
- export class LeaderWorkerInnerShutdown extends Schema.TaggedRequest()('Shutdown', {
137
+ export class LeaderWorkerInnerShutdown extends Rpc.make('Shutdown', {
130
138
  payload: {},
131
139
  success: Schema.Void,
132
- failure: Schema.Never,
140
+ error: Schema.Never,
133
141
  }) {
134
142
  }
135
- export class LeaderWorkerInnerExtraDevtoolsMessage extends Schema.TaggedRequest()('ExtraDevtoolsMessage', {
143
+ export class LeaderWorkerInnerExtraDevtoolsMessage extends Rpc.make('ExtraDevtoolsMessage', {
136
144
  payload: {
137
145
  message: Devtools.Leader.MessageToApp,
138
146
  },
139
147
  success: Schema.Void,
140
- failure: Schema.Never,
148
+ error: Schema.Never,
141
149
  }) {
142
150
  }
143
- export const LeaderWorkerInnerRequest = Schema.Union(LeaderWorkerInnerInitialMessage, LeaderWorkerInnerBootStatusStream, LeaderWorkerInnerPushToLeader, LeaderWorkerInnerPullStream, LeaderWorkerInnerStreamEvents, LeaderWorkerInnerExport, LeaderWorkerInnerExportEventlog, LeaderWorkerInnerGetRecreateSnapshot, LeaderWorkerInnerGetLeaderHead, LeaderWorkerInnerGetLeaderSyncState, LeaderWorkerInnerSyncStateStream, LeaderWorkerInnerGetNetworkStatus, LeaderWorkerInnerNetworkStatusStream, LeaderWorkerInnerShutdown, LeaderWorkerInnerExtraDevtoolsMessage, WebmeshWorker.Schema.CreateConnection);
144
- export class SharedWorkerUpdateMessagePort extends Schema.TaggedRequest()('UpdateMessagePort', {
151
+ export class WebmeshWorkerCreateConnection extends Rpc.make('WebmeshWorker.CreateConnection', {
152
+ payload: WebmeshWorker.Schema.CreateConnection,
153
+ success: Schema.Struct({}),
154
+ error: Schema.Never,
155
+ stream: true,
156
+ }) {
157
+ }
158
+ export class LeaderWorkerInnerRpcs extends RpcGroup.make(LeaderWorkerInnerBootStatusStream, LeaderWorkerInnerPushToLeader, LeaderWorkerInnerPullStream, LeaderWorkerInnerStreamEvents, LeaderWorkerInnerExport, LeaderWorkerInnerExportEventlog, LeaderWorkerInnerGetRecreateSnapshot, LeaderWorkerInnerGetLeaderHead, LeaderWorkerInnerGetLeaderSyncState, LeaderWorkerInnerSyncStateStream, LeaderWorkerInnerGetNetworkStatus, LeaderWorkerInnerNetworkStatusStream, LeaderWorkerInnerShutdown, LeaderWorkerInnerExtraDevtoolsMessage, WebmeshWorkerCreateConnection) {
159
+ }
160
+ export class SharedWorkerUpdateMessagePort extends Rpc.make('UpdateMessagePort', {
145
161
  payload: {
146
162
  port: Transferable.MessagePort,
147
163
  // Version gate to prevent mixed LiveStore builds talking to the same SharedWorker
@@ -152,13 +168,14 @@ export class SharedWorkerUpdateMessagePort extends Schema.TaggedRequest()('Updat
152
168
  * elected leader. Subsequent calls can omit changes and will simply rebind
153
169
  * the port (join) without reinitializing the store.
154
170
  */
155
- initial: LeaderWorkerInnerInitialMessage,
171
+ initial: LeaderWorkerInnerInitialMessage.payloadSchema,
156
172
  },
157
173
  success: Schema.Void,
158
- failure: UnknownError,
174
+ error: UnknownError,
159
175
  }) {
160
176
  }
161
- export const SharedWorkerRequest = Schema.Union(SharedWorkerUpdateMessagePort,
177
+ export class SharedWorkerRpcs extends RpcGroup.make(SharedWorkerUpdateMessagePort,
162
178
  // Proxied requests
163
- LeaderWorkerInnerBootStatusStream, LeaderWorkerInnerPushToLeader, LeaderWorkerInnerPullStream, LeaderWorkerInnerStreamEvents, LeaderWorkerInnerExport, LeaderWorkerInnerGetRecreateSnapshot, LeaderWorkerInnerExportEventlog, LeaderWorkerInnerGetLeaderHead, LeaderWorkerInnerGetLeaderSyncState, LeaderWorkerInnerSyncStateStream, LeaderWorkerInnerGetNetworkStatus, LeaderWorkerInnerNetworkStatusStream, LeaderWorkerInnerShutdown, LeaderWorkerInnerExtraDevtoolsMessage, WebmeshWorker.Schema.CreateConnection);
179
+ LeaderWorkerInnerBootStatusStream, LeaderWorkerInnerPushToLeader, LeaderWorkerInnerPullStream, LeaderWorkerInnerStreamEvents, LeaderWorkerInnerExport, LeaderWorkerInnerGetRecreateSnapshot, LeaderWorkerInnerExportEventlog, LeaderWorkerInnerGetLeaderHead, LeaderWorkerInnerGetLeaderSyncState, LeaderWorkerInnerSyncStateStream, LeaderWorkerInnerGetNetworkStatus, LeaderWorkerInnerNetworkStatusStream, LeaderWorkerInnerShutdown, LeaderWorkerInnerExtraDevtoolsMessage, WebmeshWorkerCreateConnection) {
180
+ }
164
181
  //# sourceMappingURL=worker-schema.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker-schema.js","sourceRoot":"","sources":["../../../src/web-worker/common/worker-schema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worker-schema.js","sourceRoot":"","sources":["../../../src/web-worker/common/worker-schema.ts"],"names":[],"mappings":"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"}
@@ -1,17 +1,15 @@
1
1
  import type * as otel from '@opentelemetry/api';
2
- import type { SyncOptions } from '@livestore/common';
3
- import { LogConfig } from '@livestore/common';
4
- import type { LiveStoreSchema } from '@livestore/common/schema';
5
- import type { WorkerError } from '@livestore/utils/effect';
6
- import { Effect, Schema } from '@livestore/utils/effect';
2
+ import type { LogConfig, SyncOptions } from '@livestore/common';
3
+ import { type LiveStoreSchema } from '@livestore/common/schema';
4
+ import { Cause, Effect, Schema } from '@livestore/utils/effect';
7
5
  export type WorkerOptions = {
8
6
  schema: LiveStoreSchema;
9
7
  sync?: SyncOptions;
10
- syncPayloadSchema?: Schema.Schema<any>;
8
+ syncPayloadSchema?: Schema.Top;
11
9
  otelOptions?: {
12
10
  tracer?: otel.Tracer;
13
11
  };
14
- } & LogConfig.WithLoggerOptions;
12
+ } & LogConfig.LoggerOptions;
15
13
  export declare const makeWorker: (options: WorkerOptions) => void;
16
- export declare const makeWorkerEffect: (options: WorkerOptions) => Effect.Effect<void, WorkerError.WorkerError, never>;
14
+ export declare const makeWorkerEffect: (options: WorkerOptions) => Effect.Effect<never, Schema.SchemaError | Cause.NoSuchElementError | import("effect/unstable/workers/WorkerError").WorkerError, never>;
17
15
  //# sourceMappingURL=make-leader-worker.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"make-leader-worker.d.ts","sourceRoot":"","sources":["../../../src/web-worker/leader-worker/make-leader-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAA2C,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC7F,OAAO,EAAY,SAAS,EAAgB,MAAM,mBAAmB,CAAA;AASrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAM/D,OAAO,KAAK,EAAqB,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAC7E,OAAO,EACL,MAAM,EAMN,MAAM,EAIP,MAAM,yBAAyB,CAAA;AAOhC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACtC,WAAW,CAAC,EAAE;QACZ,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAA;KACrB,CAAA;CACF,GAAG,SAAS,CAAC,iBAAiB,CAAA;AAY/B,eAAO,MAAM,UAAU,GAAI,SAAS,aAAa,SAEhD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,SAAS,aAAa,wDAyBtD,CAAA"}
1
+ {"version":3,"file":"make-leader-worker.d.ts","sourceRoot":"","sources":["../../../src/web-worker/leader-worker/make-leader-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,OAAO,KAAK,EAAiC,SAAS,EAAY,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAUxG,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAI/E,OAAO,EACL,KAAK,EAEL,MAAM,EASN,MAAM,EAIP,MAAM,yBAAyB,CAAA;AAQhC,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC,GAAG,CAAA;IAC9B,WAAW,CAAC,EAAE;QACZ,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAA;KACrB,CAAA;CACF,GAAG,SAAS,CAAC,aAAa,CAAA;AAY3B,eAAO,MAAM,UAAU,GAAI,SAAS,aAAa,SAEhD,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,SAAS,aAAa,2IA4BtD,CAAA"}
@@ -1,12 +1,12 @@
1
- import { Devtools, LogConfig, UnknownError } from '@livestore/common';
1
+ import { Devtools, StateHead, UnknownError } from '@livestore/common';
2
2
  import { configureConnection, Eventlog, LeaderThreadCtx, makeLeaderThreadLayer, streamEventsWithSyncState, } from '@livestore/common/leader-thread';
3
3
  import { LiveStoreEvent } from '@livestore/common/schema';
4
- import * as WebmeshWorker from '@livestore/devtools-web-common/worker';
5
4
  import { sqliteDbFactory } from '@livestore/sqlite-wasm/browser';
6
5
  import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm';
7
6
  import { isDevEnv, LS_DEV } from '@livestore/utils';
8
- import { Effect, FetchHttpClient, identity, Layer, OtelTracer, Scheduler, Schema, Stream, TaskTracing, WorkerRunner, } from '@livestore/utils/effect';
7
+ import { Cause, Deferred, Effect, FetchHttpClient, identity, Layer, OtelTracer, Queue, References, RpcServer, RpcWorker, Schema, Scope, Stream, TaskTracing, } from '@livestore/utils/effect';
9
8
  import { BrowserWorkerRunner, Opfs, WebError } from '@livestore/utils/effect/browser';
9
+ import * as WebmeshWorker from '@livestore/webmesh/worker';
10
10
  import { cleanupOldStateDbFiles, getStateDbFileName, sanitizeOpfsDir } from "../common/persisted-sqlite.js";
11
11
  import { makeShutdownChannel } from "../common/shutdown-channel.js";
12
12
  import * as WorkerSchema from "../common/worker-schema.js";
@@ -19,35 +19,76 @@ if (isDevEnv() === true) {
19
19
  };
20
20
  }
21
21
  export const makeWorker = (options) => {
22
- makeWorkerEffect(options).pipe(Effect.runFork);
22
+ Effect.runFork(makeWorkerEffect(options));
23
23
  };
24
24
  export const makeWorkerEffect = (options) => {
25
25
  const TracingLive = options.otelOptions?.tracer !== undefined
26
- ? Layer.unwrapEffect(Effect.map(OtelTracer.make, Layer.setTracer)).pipe(Layer.provideMerge(Layer.succeed(OtelTracer.OtelTracer, options.otelOptions.tracer)))
27
- : undefined;
28
- const runtimeLayer = Layer.mergeAll(FetchHttpClient.layer, TracingLive ?? Layer.empty);
29
- return makeWorkerRunnerOuter(options).pipe(Layer.provide(BrowserWorkerRunner.layer), WorkerRunner.launch, Effect.scoped, Effect.tapCauseLogPretty, Effect.annotateLogs({ thread: self.name }), Effect.provide(runtimeLayer), LS_DEV === true ? TaskTracing.withAsyncTaggingTracing((name) => console.createTask(name)) : identity,
30
- // We're using this custom scheduler to improve op batching behaviour and reduce the overhead
31
- // of the Effect fiber runtime given we have different tradeoffs on a worker thread.
32
- // Despite the "message channel" name, is has nothing to do with the `incomingRequestsPort` above.
33
- Effect.withScheduler(Scheduler.messageChannel()),
34
- // We're increasing the Effect ops limit here to allow for larger chunks of operations at a time
35
- Effect.withMaxOpsBeforeYield(4096), LogConfig.withLoggerConfig({ logger: options.logger, logLevel: options.logLevel }, { threadName: self.name }));
26
+ ? OtelTracer.layerWithoutOtelTracer.pipe(Layer.provideMerge(Layer.succeed(OtelTracer.OtelTracer, options.otelOptions.tracer)))
27
+ : Layer.empty;
28
+ const runtimeLayer = Layer.mergeAll(FetchHttpClient.layer, TracingLive, Layer.succeed(References.MaxOpsBeforeYield, 4096));
29
+ return makeWorkerRunnerOuter(options).pipe(Effect.provide(Layer.provideMerge(RpcServer.layerProtocolWorkerRunner, BrowserWorkerRunner.layer)), Effect.scoped, Effect.tapCauseLogPretty, Effect.annotateLogs({ thread: self.name }), Effect.provide(runtimeLayer), LS_DEV === true ? TaskTracing.withAsyncTaggingTracing((name) => console.createTask(name)) : identity, Effect.provide(Layer.mergeAll(options.logger ?? Layer.empty, Layer.succeed(References.MinimumLogLevel, options.logLevel ?? (isDevEnv() === true ? 'Debug' : 'Info')))));
36
30
  };
37
- const makeWorkerRunnerOuter = (workerOptions) => WorkerRunner.layerSerialized(WorkerSchema.LeaderWorkerOuterInitialMessage, {
38
- // Port coming from client session and forwarded via the shared worker
39
- InitialMessage: ({ port: incomingRequestsPort, storeId, clientId }) => Effect.gen(function* () {
40
- yield* makeWorkerRunnerInner(workerOptions).pipe(Layer.provide(BrowserWorkerRunner.layerMessagePort(incomingRequestsPort)), WorkerRunner.launch, Effect.scoped, Effect.withSpan('@livestore/adapter-web:worker:wrapper:InitialMessage:innerFiber'), Effect.tapCauseLogPretty, Effect.provide(Layer.mergeAll(Opfs.Opfs.Default, WebmeshWorker.CacheService.layer({
41
- nodeName: Devtools.makeNodeName.client.leader({ storeId, clientId }),
42
- }))), Effect.forkScoped);
43
- return Layer.empty;
44
- }).pipe(Effect.withSpan('@livestore/adapter-web:worker:wrapper:InitialMessage'), Layer.unwrapScoped),
31
+ const makeWorkerRunnerOuter = Effect.fn('@livestore/adapter-web:worker:wrapper:InitialMessage')(function* (workerOptions) {
32
+ // Port coming from client session and forwarded via the shared worker.
33
+ const { port: incomingRequestsPort, storeId, clientId, } = yield* RpcWorker.initialMessage(WorkerSchema.LeaderWorkerOuterInitialMessage.payloadSchema);
34
+ return yield* RpcServer.make(WorkerSchema.LeaderWorkerInnerRpcs).pipe(Effect.provide(Layer.provideMerge(makeWorkerRunnerInner(workerOptions), makeMessagePortRpcServerProtocol(incomingRequestsPort))), Effect.withSpan('@livestore/adapter-web:worker:wrapper:InitialMessage:innerFiber'), Effect.tapCauseLogPretty, Effect.provide(Layer.mergeAll(Opfs.layer, WebmeshWorker.CacheService.layer({
35
+ nodeName: Devtools.makeNodeName.client.leader({ storeId, clientId }),
36
+ }))));
45
37
  });
46
- const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema }) => WorkerRunner.layerSerialized(WorkerSchema.LeaderWorkerInnerRequest, {
47
- InitialMessage: ({ storageOptions, storeId, clientId, devtoolsEnabled, debugInstanceId, syncPayloadEncoded }) => Effect.gen(function* () {
38
+ const makeMessagePortRpcServerProtocol = (port) => Layer.effect(RpcServer.Protocol, Effect.gen(function* () {
39
+ const disconnects = yield* Queue.unbounded();
40
+ const initialMessage = yield* Deferred.make();
41
+ const closed = yield* Deferred.make();
42
+ const clientIds = new Set();
43
+ return RpcServer.Protocol.of({
44
+ disconnects,
45
+ send: (_clientId, response, transferables) => Effect.sync(() => port.postMessage([1, response], { transfer: (transferables ?? []) })),
46
+ end: () => Effect.void,
47
+ clientIds: Effect.sync(() => clientIds),
48
+ initialMessage: Effect.asSome(Deferred.await(initialMessage)),
49
+ supportsAck: true,
50
+ supportsTransferables: true,
51
+ supportsSpanPropagation: true,
52
+ supportsNotifications: true,
53
+ run: (writeRequest) => Effect.gen(function* () {
54
+ const context = yield* Effect.context();
55
+ const runFork = Effect.runForkWith(context);
56
+ const onMessage = (event) => {
57
+ const message = event.data;
58
+ if (message[0] === 1) {
59
+ runFork(Effect.gen(function* () {
60
+ yield* Queue.offer(disconnects, 0);
61
+ yield* Deferred.succeed(closed, undefined);
62
+ }));
63
+ return;
64
+ }
65
+ const request = message[1];
66
+ clientIds.add(0);
67
+ if (request._tag === 'InitialMessage') {
68
+ runFork(Deferred.succeed(initialMessage, request.value));
69
+ }
70
+ else {
71
+ runFork(writeRequest(0, request));
72
+ }
73
+ };
74
+ port.addEventListener('message', onMessage);
75
+ port.start();
76
+ port.postMessage([0]);
77
+ return yield* Deferred.await(closed).pipe(Effect.andThen(Effect.interrupt), Effect.ensuring(Effect.sync(() => {
78
+ port.removeEventListener('message', onMessage);
79
+ port.close();
80
+ })));
81
+ }),
82
+ });
83
+ }));
84
+ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema }) => WorkerSchema.LeaderWorkerInnerRpcs.toLayer(Effect.gen(function* () {
85
+ const leaderThreadScope = yield* Scope.make();
86
+ yield* Effect.addFinalizer((exit) => Scope.close(leaderThreadScope, exit));
87
+ const leaderThreadContextOnce = yield* Effect.cached(Effect.gen(function* () {
88
+ const { storageOptions, storeId, clientId, devtoolsEnabled, debugInstanceId, syncPayloadEncoded } = yield* RpcWorker.initialMessage(WorkerSchema.LeaderWorkerInnerInitialMessage.payloadSchema);
48
89
  const sqlite3 = yield* Effect.promise(() => loadSqlite3Wasm());
49
90
  const makeSqliteDb = sqliteDbFactory({ sqlite3 });
50
- const runtime = yield* Effect.runtime();
91
+ const services = yield* Effect.context();
51
92
  // Check OPFS availability and determine storage mode
52
93
  const opfsCheck = yield* checkOpfsAvailability;
53
94
  const useOpfs = opfsCheck === undefined;
@@ -58,7 +99,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema })
58
99
  bootWarning = { stage: 'warning', ...opfsCheck };
59
100
  }
60
101
  const opfsDirectory = useOpfs === true ? yield* sanitizeOpfsDir(storageOptions.directory, storeId) : undefined;
61
- const makeOpfsDb = (kind) => makeSqliteDb({
102
+ const makeOpfsDb = (kind) => Effect.acquireRelease(makeSqliteDb({
62
103
  _tag: 'opfs',
63
104
  opfsDirectory: opfsDirectory,
64
105
  fileName: kind === 'state' ? getStateDbFileName(schema) : 'eventlog.db',
@@ -69,12 +110,18 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema })
69
110
  // TODO bring back exclusive locking mode when `WAL` is working properly
70
111
  // lockingMode: 'EXCLUSIVE',
71
112
  foreignKeys: true,
72
- }).pipe(Effect.provide(runtime), Effect.runSync),
73
- }).pipe(Effect.acquireRelease((db) => Effect.try(() => db.close()).pipe(Effect.ignoreLogged)));
74
- const makeInMemoryDb = () => makeSqliteDb({
113
+ }).pipe(Effect.runSyncWith(services)),
114
+ }), (db) => Effect.try({
115
+ try: () => db.close(),
116
+ catch: (cause) => new Cause.UnknownError(cause),
117
+ }).pipe(Effect.ignore));
118
+ const makeInMemoryDb = () => Effect.acquireRelease(makeSqliteDb({
75
119
  _tag: 'in-memory',
76
- configureDb: (db) => configureConnection(db, { foreignKeys: true }).pipe(Effect.provide(runtime), Effect.runSync),
77
- }).pipe(Effect.acquireRelease((db) => Effect.try(() => db.close()).pipe(Effect.ignoreLogged)));
120
+ configureDb: (db) => configureConnection(db, { foreignKeys: true }).pipe(Effect.runSyncWith(services)),
121
+ }), (db) => Effect.try({
122
+ try: () => db.close(),
123
+ catch: (cause) => new Cause.UnknownError(cause),
124
+ }).pipe(Effect.ignore));
78
125
  // Use OPFS if available, otherwise fall back to in-memory
79
126
  const [dbState, dbEventlog] = useOpfs === true
80
127
  ? yield* Effect.all([makeOpfsDb('state'), makeOpfsDb('eventlog')], { concurrency: 2 })
@@ -90,7 +137,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema })
90
137
  }
91
138
  const devtoolsOptions = yield* makeDevtoolsOptions({ devtoolsEnabled, dbState, dbEventlog });
92
139
  const shutdownChannel = yield* makeShutdownChannel(storeId);
93
- return makeLeaderThreadLayer({
140
+ return yield* Layer.buildWithScope(makeLeaderThreadLayer({
94
141
  schema,
95
142
  storeId,
96
143
  clientId,
@@ -101,67 +148,71 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema })
101
148
  devtoolsOptions,
102
149
  shutdownChannel,
103
150
  syncPayloadEncoded,
104
- syncPayloadSchema,
151
+ syncPayloadSchema: syncPayloadSchema,
105
152
  ...(bootWarning !== undefined ? { bootWarning } : {}),
106
- });
107
- }).pipe(Effect.tapCauseLogPretty, UnknownError.mapToUnknownError, Effect.withPerformanceMeasure('@livestore/adapter-web:worker:InitialMessage'), Effect.withSpan('@livestore/adapter-web:worker:InitialMessage'), Effect.annotateSpans({ debugInstanceId }), Layer.unwrapScoped),
108
- GetRecreateSnapshot: Effect.fn('@livestore/adapter-web:worker:GetRecreateSnapshot')(function* () {
109
- const workerCtx = yield* LeaderThreadCtx;
110
- // NOTE we can only return the cached snapshot once as it's transferred (i.e. disposed), so we need to set it to undefined
111
- // const cachedSnapshot =
112
- // result._tag === 'Recreate' ? yield* Ref.getAndSet(result.snapshotRef, undefined) : undefined
113
- // return cachedSnapshot ?? workerCtx.db.export()
114
- const snapshot = workerCtx.dbState.export();
115
- return { snapshot, migrationsReport: workerCtx.initialState.migrationsReport };
116
- }),
117
- PullStream: ({ cursor }) => Effect.gen(function* () {
118
- const { syncProcessor } = yield* LeaderThreadCtx; // <- syncState comes from here
119
- return syncProcessor.pull({ cursor });
120
- }).pipe(Stream.unwrapScoped),
121
- PushToLeader: ({ batch }) => Effect.andThen(LeaderThreadCtx, ({ syncProcessor }) => syncProcessor.push(batch.map((event) => new LiveStoreEvent.Client.EncodedWithMeta(event)),
122
- // We'll wait in order to keep back pressure on the client session
123
- { waitForProcessing: true })).pipe(Effect.uninterruptible, Effect.withSpan('@livestore/adapter-web:worker:PushToLeader')),
124
- StreamEvents: (options) => LeaderThreadCtx.pipe(Effect.map(({ dbEventlog, syncProcessor }) => {
125
- const { _tag: _ignored, ...payload } = options;
126
- const streamOptions = payload;
127
- return streamEventsWithSyncState({
153
+ }).pipe(Layer.provide(StateHead.layer({ dbState }))), leaderThreadScope);
154
+ }).pipe(Scope.provide(leaderThreadScope), Effect.tapCauseLogPretty, UnknownError.mapToUnknownError, Effect.withPerformanceMeasure('@livestore/adapter-web:worker:InitialMessage'), Effect.withSpan('@livestore/adapter-web:worker:InitialMessage'), Effect.orDie));
155
+ const provideLeaderThread = (effect) => Effect.gen(function* () {
156
+ const leaderThreadContext = yield* leaderThreadContextOnce;
157
+ return yield* effect.pipe(Effect.provide(leaderThreadContext));
158
+ });
159
+ const provideLeaderThreadStream = (stream) => Stream.unwrap(Effect.gen(function* () {
160
+ const leaderThreadContext = yield* leaderThreadContextOnce;
161
+ return stream.pipe(Stream.provide(leaderThreadContext));
162
+ }));
163
+ return WorkerSchema.LeaderWorkerInnerRpcs.of({
164
+ GetRecreateSnapshot: () => Effect.gen(function* () {
165
+ const workerCtx = yield* LeaderThreadCtx;
166
+ // NOTE we can only return the cached snapshot once as it's transferred (i.e. disposed), so we need to set it to undefined
167
+ // const cachedSnapshot =
168
+ // result._tag === 'Recreate' ? yield* Ref.getAndSet(result.snapshotRef, undefined) : undefined
169
+ // return cachedSnapshot ?? workerCtx.db.export()
170
+ const snapshot = workerCtx.dbState.export();
171
+ return { snapshot, migrationsReport: workerCtx.initialState.migrationsReport };
172
+ }).pipe(provideLeaderThread),
173
+ PullStream: ({ cursor }) => Effect.gen(function* () {
174
+ const { syncProcessor } = yield* LeaderThreadCtx; // <- syncState comes from here
175
+ return syncProcessor.pull({ cursor });
176
+ }).pipe(provideLeaderThread, Stream.unwrap),
177
+ PushToLeader: ({ batch }) => Effect.andThen(LeaderThreadCtx, ({ syncProcessor }) => syncProcessor.push(batch.map((event) => new LiveStoreEvent.Client.EncodedWithMeta(event)))).pipe(provideLeaderThread, Effect.uninterruptible, Effect.withSpan('@livestore/adapter-web:worker:PushToLeader')),
178
+ StreamEvents: (options) => LeaderThreadCtx.pipe(Effect.map(({ dbEventlog, syncProcessor }) => streamEventsWithSyncState({
128
179
  dbEventlog,
129
180
  syncState: syncProcessor.syncState,
130
- options: streamOptions,
131
- });
132
- }), Stream.unwrapScoped, Stream.withSpan('@livestore/adapter-web:worker:StreamEvents')),
133
- Export: () => Effect.andThen(LeaderThreadCtx, (_) => _.dbState.export()).pipe(Effect.withSpan('@livestore/adapter-web:worker:Export')),
134
- ExportEventlog: () => Effect.andThen(LeaderThreadCtx, (_) => _.dbEventlog.export()).pipe(Effect.withSpan('@livestore/adapter-web:worker:ExportEventlog')),
135
- BootStatusStream: () => Effect.andThen(LeaderThreadCtx, (_) => Stream.fromQueue(_.bootStatusQueue)).pipe(Stream.unwrap),
136
- GetLeaderHead: Effect.fn('@livestore/adapter-web:worker:GetLeaderHead')(function* () {
137
- const workerCtx = yield* LeaderThreadCtx;
138
- return Eventlog.getClientHeadFromDb(workerCtx.dbEventlog);
139
- }),
140
- GetLeaderSyncState: Effect.fn('@livestore/adapter-web:worker:GetLeaderSyncState')(function* () {
141
- const workerCtx = yield* LeaderThreadCtx;
142
- return yield* workerCtx.syncProcessor.syncState;
143
- }),
144
- SyncStateStream: () => Effect.gen(function* () {
145
- const workerCtx = yield* LeaderThreadCtx;
146
- return workerCtx.syncProcessor.syncState.changes;
147
- }).pipe(Stream.unwrapScoped),
148
- GetNetworkStatus: Effect.fn('@livestore/adapter-web:worker:GetNetworkStatus')(function* () {
149
- const workerCtx = yield* LeaderThreadCtx;
150
- return yield* workerCtx.networkStatus;
151
- }),
152
- NetworkStatusStream: () => Effect.gen(function* () {
153
- const workerCtx = yield* LeaderThreadCtx;
154
- return workerCtx.networkStatus.changes;
155
- }).pipe(Stream.unwrapScoped),
156
- Shutdown: Effect.fn('@livestore/adapter-web:worker:Shutdown')(function* () {
157
- yield* Effect.logDebug('[@livestore/adapter-web:worker] Shutdown');
158
- // Buy some time for Otel to flush
159
- // TODO find a cleaner way to do this
160
- yield* Effect.sleep(300);
161
- }),
162
- ExtraDevtoolsMessage: ({ message }) => Effect.andThen(LeaderThreadCtx, (_) => _.extraIncomingMessagesQueue.offer(message)).pipe(Effect.withSpan('@livestore/adapter-web:worker:ExtraDevtoolsMessage')),
163
- 'DevtoolsWebCommon.CreateConnection': WebmeshWorker.CreateConnection,
164
- });
181
+ options: options,
182
+ })), provideLeaderThread, Stream.unwrap, Stream.withSpan('@livestore/adapter-web:worker:StreamEvents')),
183
+ Export: () => LeaderThreadCtx.pipe(Effect.flatMap((_) => Effect.sync(() => _.dbState.export())), provideLeaderThread, Effect.withSpan('@livestore/adapter-web:worker:Export')),
184
+ ExportEventlog: () => LeaderThreadCtx.pipe(Effect.flatMap((_) => Effect.sync(() => _.dbEventlog.export())), provideLeaderThread, Effect.withSpan('@livestore/adapter-web:worker:ExportEventlog')),
185
+ BootStatusStream: () => LeaderThreadCtx.pipe(Effect.map((_) => Stream.fromQueue(_.bootStatusQueue)), provideLeaderThread, Stream.unwrap),
186
+ GetLeaderHead: () => Effect.gen(function* () {
187
+ const workerCtx = yield* LeaderThreadCtx;
188
+ return Eventlog.getClientHeadFromDb(workerCtx.dbEventlog);
189
+ }).pipe(provideLeaderThread),
190
+ GetLeaderSyncState: () => Effect.gen(function* () {
191
+ const workerCtx = yield* LeaderThreadCtx;
192
+ return yield* workerCtx.syncProcessor.syncState;
193
+ }).pipe(provideLeaderThread),
194
+ SyncStateStream: () => Effect.gen(function* () {
195
+ const workerCtx = yield* LeaderThreadCtx;
196
+ return workerCtx.syncProcessor.syncState.changes;
197
+ }).pipe(provideLeaderThread, Stream.unwrap),
198
+ GetNetworkStatus: () => Effect.gen(function* () {
199
+ const workerCtx = yield* LeaderThreadCtx;
200
+ return yield* workerCtx.networkStatus;
201
+ }).pipe(provideLeaderThread),
202
+ NetworkStatusStream: () => Effect.gen(function* () {
203
+ const workerCtx = yield* LeaderThreadCtx;
204
+ return workerCtx.networkStatus.changes;
205
+ }).pipe(provideLeaderThread, Stream.unwrap),
206
+ Shutdown: Effect.fn('@livestore/adapter-web:worker:Shutdown')(function* () {
207
+ yield* Effect.logDebug('[@livestore/adapter-web:worker] Shutdown');
208
+ // Buy some time for Otel to flush
209
+ // TODO find a cleaner way to do this
210
+ yield* Effect.sleep(300);
211
+ }),
212
+ ExtraDevtoolsMessage: ({ message }) => Effect.andThen(LeaderThreadCtx, (_) => Queue.offer(_.extraIncomingMessagesQueue, message)).pipe(provideLeaderThread, Effect.asVoid, Effect.withSpan('@livestore/adapter-web:worker:ExtraDevtoolsMessage')),
213
+ 'WebmeshWorker.CreateConnection': (payload) => WebmeshWorker.CreateConnection(payload).pipe(provideLeaderThreadStream),
214
+ });
215
+ }));
165
216
  const makeDevtoolsOptions = ({ devtoolsEnabled, dbState, dbEventlog, }) => Effect.gen(function* () {
166
217
  if (devtoolsEnabled === false) {
167
218
  return { enabled: false };
@@ -189,7 +240,7 @@ const makeDevtoolsOptions = ({ devtoolsEnabled, dbState, dbEventlog, }) => Effec
189
240
  */
190
241
  const checkOpfsAvailability = Effect.gen(function* () {
191
242
  const opfs = yield* Opfs.Opfs;
192
- return yield* opfs.getRootDirectoryHandle.pipe(Effect.as(undefined), Effect.catchAll((error) => {
243
+ return yield* opfs.getRootDirectoryHandle.pipe(Effect.as(undefined), Effect.catch((error) => {
193
244
  const reason = Schema.is(WebError.SecurityError)(error) === true || Schema.is(WebError.NotAllowedError)(error) === true
194
245
  ? 'private-browsing'
195
246
  : 'storage-unavailable';