@livestore/adapter-web 0.3.0-dev.16 → 0.3.0-dev.17

package/src/web-worker/client-session/index.ts

@@ -3,8 +3,6 @@ import { Devtools, IntentionalShutdownCause, UnexpectedError } from '@livestore/
 // TODO bring back - this currently doesn't work due to https://github.com/vitejs/vite/issues/8427
 // NOTE We're using a non-relative import here for Vite to properly resolve the import during app builds
 // import LiveStoreSharedWorker from '@livestore/adapter-web/internal-shared-worker?sharedworker'
-import { ShutdownChannel } from '@livestore/common/leader-thread'
-import type { MutationEvent } from '@livestore/common/schema'
 import { EventId, SESSION_CHANGESET_META_TABLE } from '@livestore/common/schema'
 import { makeWebDevtoolsChannel } from '@livestore/devtools-web-common/web-channel'
 import { sqliteDbFactory } from '@livestore/sqlite-wasm/browser'
@@ -12,7 +10,6 @@ import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm'
 import { isDevEnv, shouldNeverHappen, tryAsFunctionAndNew } from '@livestore/utils'
 import {
   BrowserWorker,
-  BucketQueue,
   Cause,
   Deferred,
   Effect,
@@ -32,9 +29,9 @@ import { nanoid } from '@livestore/utils/nanoid'
 import * as OpfsUtils from '../../opfs-utils.js'
 import { readPersistedAppDbFromClientSession, resetPersistedDataFromClientSession } from '../common/persisted-sqlite.js'
 import { makeShutdownChannel } from '../common/shutdown-channel.js'
+import { DedicatedWorkerDisconnectBroadcast, makeWorkerDisconnectChannel } from '../common/worker-disconnect-channel.js'
 import * as WorkerSchema from '../common/worker-schema.js'
 import { bootDevtools } from './client-session-devtools.js'
-import { trimPushBatch } from './trim-batch.js'
 
 // NOTE we're starting to initialize the sqlite wasm binary here to speed things up
 const sqlite3Promise = loadSqlite3Wasm()
@@ -111,11 +108,11 @@ export const makeAdapter =
       const sessionId = getPersistedId(`sessionId:${storeId}`, 'session')
 
       const shutdownChannel = yield* makeShutdownChannel(storeId)
+      const workerDisconnectChannel = yield* makeWorkerDisconnectChannel(storeId)
 
       yield* shutdownChannel.listen.pipe(
         Stream.flatten(),
-        Stream.filter(Schema.is(IntentionalShutdownCause)),
-        Stream.tap((msg) => shutdown(Cause.fail(msg))),
+        Stream.tap((error) => Effect.sync(() => shutdown(Cause.fail(error)))),
         Stream.runDrain,
         Effect.interruptible,
         Effect.tapCauseLogPretty,
@@ -144,7 +141,7 @@ export const makeAdapter =
         Effect.provide(BrowserWorker.layer(() => sharedWebWorker)),
         Effect.tapCauseLogPretty,
         UnexpectedError.mapToUnexpectedError,
-        Effect.tapErrorCause(shutdown),
+        Effect.tapErrorCause((cause) => Effect.sync(() => shutdown(cause))),
         Effect.withSpan('@livestore/adapter-web:client-session:setupSharedWorker'),
         Effect.forkScoped,
       )
@@ -187,18 +184,19 @@ export const makeAdapter =
         }).pipe(
           Effect.provide(BrowserWorker.layer(() => worker)),
           UnexpectedError.mapToUnexpectedError,
-          Effect.tapErrorCause(shutdown),
+          Effect.tapErrorCause((cause) => Effect.sync(() => shutdown(cause))),
           Effect.withSpan('@livestore/adapter-web:client-session:setupDedicatedWorker'),
           Effect.tapCauseLogPretty,
           Effect.forkScoped,
         )
 
-        yield* shutdownChannel.send(ShutdownChannel.DedicatedWorkerDisconnectBroadcast.make({}))
+        yield* workerDisconnectChannel.send(DedicatedWorkerDisconnectBroadcast.make({}))
 
         const sharedWorker = yield* Fiber.join(sharedWorkerFiber)
-        yield* sharedWorker
-          .executeEffect(new WorkerSchema.SharedWorker.UpdateMessagePort({ port: mc.port2 }))
-          .pipe(UnexpectedError.mapToUnexpectedError, Effect.tapErrorCause(shutdown))
+        yield* sharedWorker.executeEffect(new WorkerSchema.SharedWorker.UpdateMessagePort({ port: mc.port2 })).pipe(
+          UnexpectedError.mapToUnexpectedError,
+          Effect.tapErrorCause((cause) => Effect.sync(() => shutdown(cause))),
+        )
 
         yield* Deferred.succeed(waitForSharedWorkerInitialized, undefined)
 
@@ -304,7 +302,7 @@ export const makeAdapter =
         Stream.tap((_) => SubscriptionRef.set(networkStatus, _)),
         Stream.runDrain,
         Effect.forever, // NOTE Whenever the leader changes, we need to re-start the stream
-        Effect.tapErrorCause(shutdown),
+        Effect.tapErrorCause((cause) => Effect.sync(() => shutdown(cause))),
         Effect.interruptible,
         Effect.tapCauseLogPretty,
         Effect.forkScoped,
@@ -313,7 +311,9 @@ export const makeAdapter =
       const bootStatusFiber = yield* runInWorkerStream(new WorkerSchema.LeaderWorkerInner.BootStatusStream()).pipe(
         Stream.tap((_) => Queue.offer(bootStatusQueue, _)),
         Stream.runDrain,
-        Effect.tapErrorCause((cause) => (Cause.isInterruptedOnly(cause) ? Effect.void : shutdown(cause))),
+        Effect.tapErrorCause((cause) =>
+          Cause.isInterruptedOnly(cause) ? Effect.void : Effect.sync(() => shutdown(cause)),
+        ),
         Effect.interruptible,
         Effect.tapCauseLogPretty,
         Effect.forkScoped,
@@ -388,21 +388,6 @@ export const makeAdapter =
         }).pipe(Effect.tapCauseLogPretty, Effect.orDie),
       )
 
-      const pushQueue = yield* BucketQueue.make<MutationEvent.AnyEncoded>()
-
-      yield* Effect.gen(function* () {
-        const batch = yield* BucketQueue.takeBetween(pushQueue, 1, 100)
-        // We need to trim "old batches" which can happen during client session rebasing
-        const trimmedBatch = trimPushBatch(batch)
-        yield* runInWorker(new WorkerSchema.LeaderWorkerInner.PushToLeader({ batch: trimmedBatch })).pipe(
-          Effect.withSpan('@livestore/adapter-web:client-session:pushToLeader', {
-            attributes: { batchSize: batch.length },
-          }),
-          // We can ignore the error here because the ClientSessionSyncProcessor will retry after rebasing
-          Effect.ignoreLogged,
-        )
-      }).pipe(Effect.forever, Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped)
-
       const devtools: ClientSession['devtools'] = devtoolsEnabled
         ? { enabled: true, pullLatch: yield* Effect.makeLatch(true), pushLatch: yield* Effect.makeLatch(true) }
         : { enabled: false }
@@ -425,11 +410,12 @@ export const makeAdapter =
             pull: runInWorkerStream(new WorkerSchema.LeaderWorkerInner.PullStream({ cursor: initialLeaderHead })).pipe(
               Stream.orDie,
             ),
-
-            // NOTE instead of sending the worker message right away, we're batching the events in order to
-            // - maintain a consistent order of events
-            // - improve efficiency by reducing the number of messages
-            push: (batch) => BucketQueue.offerAll(pushQueue, batch),
+            push: (batch) =>
+              runInWorker(new WorkerSchema.LeaderWorkerInner.PushToLeader({ batch })).pipe(
+                Effect.withSpan('@livestore/adapter-web:client-session:pushToLeader', {
+                  attributes: { batchSize: batch.length },
+                }),
+              ),
           },
 
           initialState: { leaderHead: initialLeaderHead, migrationsReport },

package/src/web-worker/common/worker-disconnect-channel.ts

@@ -0,0 +1,10 @@
+import { Schema, WebChannel } from '@livestore/utils/effect'
+
+export class DedicatedWorkerDisconnectBroadcast extends Schema.TaggedStruct('DedicatedWorkerDisconnectBroadcast', {}) {}
+
+/** Used across workers for leader election purposes */
+export const makeWorkerDisconnectChannel = (storeId: string) =>
+  WebChannel.broadcastChannel({
+    channelName: `livestore.worker-disconnect.${storeId}`,
+    schema: DedicatedWorkerDisconnectBroadcast,
+  })

package/src/web-worker/common/worker-schema.ts

@@ -1,7 +1,7 @@
 import {
   BootStatus,
   Devtools,
-  InvalidPushError,
+  LeaderAheadError,
   MigrationsReport,
   NetworkStatus,
   SyncState,
@@ -78,7 +78,7 @@ export namespace LeaderWorkerInner {
       batch: Schema.Array(MutationEvent.AnyEncoded),
     },
     success: Schema.Void,
-    failure: Schema.Union(UnexpectedError, InvalidPushError),
+    failure: Schema.Union(UnexpectedError, LeaderAheadError),
   }) {}
 
   export class PullStream extends Schema.TaggedRequest<PullStream>()('PullStream', {

package/src/web-worker/leader-worker/make-leader-worker.ts

@@ -48,6 +48,8 @@ if (isDevEnv()) {
   globalThis.__debugLiveStoreUtils = {
     opfs: OpfsUtils,
     blobUrl: (buffer: Uint8Array) => URL.createObjectURL(new Blob([buffer], { type: 'application/octet-stream' })),
+    runSync: (effect: Effect.Effect<any, any, never>) => Effect.runSync(effect),
+    runFork: (effect: Effect.Effect<any, any, never>) => Effect.runFork(effect),
   }
 }
 
@@ -64,7 +66,7 @@ export const makeWorkerEffect = (options: WorkerOptions) => {
 
   return makeWorkerRunnerOuter(options).pipe(
     Layer.provide(BrowserWorkerRunner.layer),
-    Layer.launch,
+    WorkerRunner.launch,
     Effect.scoped,
     Effect.tapCauseLogPretty,
     Effect.annotateLogs({ thread: self.name }),
@@ -91,7 +93,7 @@ const makeWorkerRunnerOuter = (
       Effect.gen(function* () {
         yield* makeWorkerRunnerInner(workerOptions).pipe(
           Layer.provide(BrowserWorkerRunner.layerMessagePort(incomingRequestsPort)),
-          Layer.launch,
+          WorkerRunner.launch,
           Effect.scoped,
           Effect.withSpan('@livestore/adapter-web:worker:wrapper:InitialMessage:innerFiber'),
           Effect.tapCauseLogPretty,

package/src/web-worker/shared-worker/make-shared-worker.ts

@@ -1,4 +1,4 @@
-import { IntentionalShutdownCause, UnexpectedError } from '@livestore/common'
+import { UnexpectedError } from '@livestore/common'
 import { connectViaWorker } from '@livestore/devtools-web-common/web-channel'
 import * as WebMeshWorker from '@livestore/devtools-web-common/worker'
 import { isDevEnv, isNotUndefined, LS_DEV } from '@livestore/utils'
@@ -233,7 +233,6 @@ const makeWorkerRunner = Effect.gen(function* () {
 
           yield* shutdownChannel.listen.pipe(
             Stream.flatten(),
-            Stream.filter(Schema.is(IntentionalShutdownCause)),
             Stream.tap(() => reset),
             Stream.runDrain,
           )
@@ -282,6 +281,7 @@ const makeWorkerRunner = Effect.gen(function* () {
 export const makeWorker = () => {
   makeWorkerRunner.pipe(
     Layer.provide(BrowserWorkerRunner.layer),
+    // WorkerRunner.launch,
     Layer.launch,
     Effect.scoped,
     Effect.tapCauseLogPretty,

package/dist/web-worker/client-session/trim-batch.d.ts

@@ -1,4 +0,0 @@
-import type { MutationEvent } from '@livestore/common/schema';
-/** [(0,1), (0,2), (1,0), (0,1), (0,2), (1,0), (1,1)] -> [(0,1), (0,2), (1,0), (1,1)] */
-export declare const trimPushBatch: (batch: ReadonlyArray<MutationEvent.AnyEncoded>) => readonly MutationEvent.AnyEncoded[];
-//# sourceMappingURL=trim-batch.d.ts.map

package/dist/web-worker/client-session/trim-batch.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"trim-batch.d.ts","sourceRoot":"","sources":["../../../src/web-worker/client-session/trim-batch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAG7D,wFAAwF;AACxF,eAAO,MAAM,aAAa,UAAW,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,wCAU3E,CAAA"}

package/dist/web-worker/client-session/trim-batch.js

@@ -1,13 +0,0 @@
-import { EventId } from '@livestore/common/schema';
-/** [(0,1), (0,2), (1,0), (0,1), (0,2), (1,0), (1,1)] -> [(0,1), (0,2), (1,0), (1,1)] */
-export const trimPushBatch = (batch) => {
-    // Iterate over batch from the end and stop once we encounter an event with a larger id than the previous event
-    // Then return the slice of the batch up to and including that event
-    for (let i = batch.length - 2; i >= 0; i--) {
-        if (EventId.isGreaterThanOrEqual(batch[i].id, batch[i + 1].id)) {
-            return batch.slice(i + 1);
-        }
-    }
-    return batch;
-};
-//# sourceMappingURL=trim-batch.js.map

package/dist/web-worker/client-session/trim-batch.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"trim-batch.js","sourceRoot":"","sources":["../../../src/web-worker/client-session/trim-batch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAA;AAElD,wFAAwF;AACxF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAA8C,EAAE,EAAE;IAC9E,+GAA+G;IAC/G,oEAAoE;IACpE,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,IAAI,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,EAAE,CAAC,EAAE,CAAC;YACjE,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/dist/web-worker/client-session/trim-batch.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=trim-batch.test.d.ts.map

package/dist/web-worker/client-session/trim-batch.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"trim-batch.test.d.ts","sourceRoot":"","sources":["../../../src/web-worker/client-session/trim-batch.test.ts"],"names":[],"mappings":""}

package/dist/web-worker/client-session/trim-batch.test.js

@@ -1,38 +0,0 @@
-import { EventId } from '@livestore/common/schema';
-import { describe, expect, it } from 'vitest';
-import { trimPushBatch } from './trim-batch.js';
-describe('trimPushBatch', () => {
-    it('should return same batch', () => {
-        const batch = [
-            { id: EventId.make({ global: 0, client: 1 }), parentId: EventId.make({ global: 0, client: 0 }) },
-            { id: EventId.make({ global: 0, client: 2 }), parentId: EventId.make({ global: 0, client: 1 }) },
-            { id: EventId.make({ global: 1, client: 0 }), parentId: EventId.make({ global: 0, client: 0 }) },
-            { id: EventId.make({ global: 1, client: 1 }), parentId: EventId.make({ global: 1, client: 0 }) },
-        ];
-        const trimmed = trimPushBatch(batch);
-        expect(trimmed).toEqual(batch);
-    });
-    it('should trim the batch', () => {
-        const batch = [
-            { id: EventId.make({ global: 0, client: 1 }), parentId: EventId.make({ global: 0, client: 0 }) },
-            { id: EventId.make({ global: 0, client: 2 }), parentId: EventId.make({ global: 0, client: 1 }) },
-            // should trim above
-            { id: EventId.make({ global: 0, client: 1 }), parentId: EventId.make({ global: 0, client: 0 }) },
-            { id: EventId.make({ global: 0, client: 2 }), parentId: EventId.make({ global: 0, client: 1 }) },
-            { id: EventId.make({ global: 1, client: 0 }), parentId: EventId.make({ global: 0, client: 0 }) },
-            { id: EventId.make({ global: 1, client: 1 }), parentId: EventId.make({ global: 1, client: 0 }) },
-        ];
-        const trimmed = trimPushBatch(batch);
-        expect(trimmed).toEqual(batch.slice(2));
-    });
-    it('should trim the batch', () => {
-        const batch = [
-            { id: EventId.make({ global: 0, client: 1 }), parentId: EventId.make({ global: 0, client: 0 }) },
-            // should trim above
-            { id: EventId.make({ global: 0, client: 1 }), parentId: EventId.make({ global: 0, client: 0 }) },
-        ];
-        const trimmed = trimPushBatch(batch);
-        expect(trimmed).toEqual(batch.slice(1));
-    });
-});
-//# sourceMappingURL=trim-batch.test.js.map

package/dist/web-worker/client-session/trim-batch.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"trim-batch.test.js","sourceRoot":"","sources":["../../../src/web-worker/client-session/trim-batch.test.ts"],"names":[],"mappings":"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"}

package/src/web-worker/client-session/trim-batch.test.ts

@@ -1,48 +0,0 @@
-import type { MutationEvent } from '@livestore/common/schema'
-import { EventId } from '@livestore/common/schema'
-import { describe, expect, it } from 'vitest'
-
-import { trimPushBatch } from './trim-batch.js'
-
-describe('trimPushBatch', () => {
-  it('should return same batch', () => {
-    const batch = [
-      { id: EventId.make({ global: 0, client: 1 }), parentId: EventId.make({ global: 0, client: 0 }) },
-      { id: EventId.make({ global: 0, client: 2 }), parentId: EventId.make({ global: 0, client: 1 }) },
-      { id: EventId.make({ global: 1, client: 0 }), parentId: EventId.make({ global: 0, client: 0 }) },
-      { id: EventId.make({ global: 1, client: 1 }), parentId: EventId.make({ global: 1, client: 0 }) },
-    ] as MutationEvent.AnyEncoded[]
-
-    const trimmed = trimPushBatch(batch)
-
-    expect(trimmed).toEqual(batch)
-  })
-
-  it('should trim the batch', () => {
-    const batch = [
-      { id: EventId.make({ global: 0, client: 1 }), parentId: EventId.make({ global: 0, client: 0 }) },
-      { id: EventId.make({ global: 0, client: 2 }), parentId: EventId.make({ global: 0, client: 1 }) },
-      // should trim above
-      { id: EventId.make({ global: 0, client: 1 }), parentId: EventId.make({ global: 0, client: 0 }) },
-      { id: EventId.make({ global: 0, client: 2 }), parentId: EventId.make({ global: 0, client: 1 }) },
-      { id: EventId.make({ global: 1, client: 0 }), parentId: EventId.make({ global: 0, client: 0 }) },
-      { id: EventId.make({ global: 1, client: 1 }), parentId: EventId.make({ global: 1, client: 0 }) },
-    ] as MutationEvent.AnyEncoded[]
-
-    const trimmed = trimPushBatch(batch)
-
-    expect(trimmed).toEqual(batch.slice(2))
-  })
-
-  it('should trim the batch', () => {
-    const batch = [
-      { id: EventId.make({ global: 0, client: 1 }), parentId: EventId.make({ global: 0, client: 0 }) },
-      // should trim above
-      { id: EventId.make({ global: 0, client: 1 }), parentId: EventId.make({ global: 0, client: 0 }) },
-    ] as MutationEvent.AnyEncoded[]
-
-    const trimmed = trimPushBatch(batch)
-
-    expect(trimmed).toEqual(batch.slice(1))
-  })
-})

package/src/web-worker/client-session/trim-batch.ts

@@ -1,15 +0,0 @@
-import type { MutationEvent } from '@livestore/common/schema'
-import { EventId } from '@livestore/common/schema'
-
-/** [(0,1), (0,2), (1,0), (0,1), (0,2), (1,0), (1,1)] -> [(0,1), (0,2), (1,0), (1,1)] */
-export const trimPushBatch = (batch: ReadonlyArray<MutationEvent.AnyEncoded>) => {
-  // Iterate over batch from the end and stop once we encounter an event with a larger id than the previous event
-  // Then return the slice of the batch up to and including that event
-  for (let i = batch.length - 2; i >= 0; i--) {
-    if (EventId.isGreaterThanOrEqual(batch[i]!.id, batch[i + 1]!.id)) {
-      return batch.slice(i + 1)
-    }
-  }
-
-  return batch
-}