@livestore/adapter-web 0.0.0-snapshot-2b8a9de3ec1a701aca891ebc2c98eb328274ae9e → 0.0.0-snapshot-2ef046b02334f52613d31dbe06af53487685edc0

package/src/web-worker/client-session/persisted-adapter.ts

@@ -1,4 +1,4 @@
-import type { Adapter, ClientSession, LockStatus, NetworkStatus } from '@livestore/common'
+import type { Adapter, ClientSession, LockStatus } from '@livestore/common'
 import { Devtools, IntentionalShutdownCause, StoreInterrupted, UnexpectedError } from '@livestore/common'
 // 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
@@ -91,6 +91,15 @@ export type WebAdapterOptions = {
    * store it in `sessionStorage` and restore it for subsequent client sessions in the same tab/window.
    */
   sessionId?: string
+  experimental?: {
+    /**
+     * When set to `true`, the adapter will always start with a snapshot from the leader
+     * instead of trying to load a snapshot from storage.
+     *
+     * @default false
+     */
+    disableFastPath?: boolean
+  }
 }
 
 export const makePersistedAdapter =
@@ -130,7 +139,10 @@ export const makePersistedAdapter =
       // we usually speeds up the boot process by a lot.
       // We need to be extra careful though to not run into any race conditions or inconsistencies.
       // TODO also verify persisted data
-      const dataFromFile = yield* readPersistedAppDbFromClientSession({ storageOptions, storeId, schema })
+      const dataFromFile =
+        options.experimental?.disableFastPath === true
+          ? undefined
+          : yield* readPersistedAppDbFromClientSession({ storageOptions, storeId, schema })
 
       // The same across all client sessions (i.e. tabs, windows)
       const clientId = options.clientId ?? getPersistedId(`clientId:${storeId}`, 'local')
@@ -193,7 +205,7 @@ export const makePersistedAdapter =
 
       const runLocked = Effect.gen(function* () {
         yield* Effect.logDebug(
-          `[@livestore/adapter-web:client-session] ✅ Got lock '${LIVESTORE_TAB_LOCK}' (clientId: ${clientId}, sessionId: ${sessionId})`,
+          `[@livestore/adapter-web:client-session] ✅ Got lock '${LIVESTORE_TAB_LOCK}' (clientId: ${clientId}, sessionId: ${sessionId}).`,
         )
 
         yield* Effect.addFinalizer(() =>
@@ -230,29 +242,6 @@ export const makePersistedAdapter =
 
         yield* Deferred.succeed(waitForSharedWorkerInitialized, undefined)
 
-        yield* Effect.addFinalizer(() =>
-          Effect.gen(function* () {
-            // console.log('[@livestore/adapter-web:client-session] Shutting down leader worker')
-            // We first try to gracefully shutdown the leader worker and then forcefully terminate it
-            // yield* Effect.raceFirst(
-            //   sharedWorker
-            //     .executeEffect(new WorkerSchema.LeaderWorkerInner.Shutdown({}))
-            //     .pipe(Effect.andThen(() => worker.terminate())),
-            //   Effect.sync(() => {
-            //     console.warn(
-            //       '[@livestore/adapter-web:client-session] Worker did not gracefully shutdown in time, terminating it',
-            //     )
-            //     worker.terminate()
-            //   }).pipe(
-            //     // Seems like we still need to wait a bit for the worker to terminate
-            //     // TODO improve this implementation (possibly via another weblock?)
-            //     Effect.delay(1000),
-            //   ),
-            // )
-            // yield* Effect.logDebug('[@livestore/adapter-web:client-session] client-session shutdown. worker terminated')
-          }).pipe(Effect.withSpan('@livestore/adapter-web:client-session:lock:shutdown'), Effect.ignoreLogged),
-        )
-
         yield* Effect.never
       }).pipe(Effect.withSpan('@livestore/adapter-web:client-session:lock'))
 
@@ -322,22 +311,6 @@ export const makePersistedAdapter =
           )
         }).pipe(Stream.unwrap) as any
 
-      const networkStatus = yield* SubscriptionRef.make<NetworkStatus>({
-        isConnected: false,
-        timestampMs: Date.now(),
-        latchClosed: false,
-      })
-
-      yield* runInWorkerStream(new WorkerSchema.LeaderWorkerInner.NetworkStatusStream()).pipe(
-        Stream.tap((_) => SubscriptionRef.set(networkStatus, _)),
-        Stream.runDrain,
-        Effect.forever, // NOTE Whenever the leader changes, we need to re-start the stream
-        Effect.tapErrorCause((cause) => Effect.sync(() => shutdown(cause))),
-        Effect.interruptible,
-        Effect.tapCauseLogPretty,
-        Effect.forkScoped,
-      )
-
       const bootStatusFiber = yield* runInWorkerStream(new WorkerSchema.LeaderWorkerInner.BootStatusStream()).pipe(
         Stream.tap((_) => Queue.offer(bootStatusQueue, _)),
         Stream.runDrain,
@@ -461,8 +434,6 @@ export const makePersistedAdapter =
             Effect.withSpan('@livestore/adapter-web:client-session:getLeaderSyncState'),
           ),
 
-          networkStatus,
-
           sendDevtoolsMessage: (message) =>
             runInWorker(new WorkerSchema.LeaderWorkerInner.ExtraDevtoolsMessage({ message })).pipe(
               UnexpectedError.mapToUnexpectedError,

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

@@ -1,12 +1,4 @@
-import {
-  BootStatus,
-  Devtools,
-  LeaderAheadError,
-  MigrationsReport,
-  NetworkStatus,
-  SyncState,
-  UnexpectedError,
-} from '@livestore/common'
+import { BootStatus, Devtools, LeaderAheadError, MigrationsReport, SyncState, UnexpectedError } from '@livestore/common'
 import { EventId, MutationEvent } from '@livestore/common/schema'
 import * as WebmeshWorker from '@livestore/devtools-web-common/worker'
 import { Schema, Transferable } from '@livestore/utils/effect'
@@ -84,11 +76,11 @@ export namespace LeaderWorkerInner {
 
   export class PullStream extends Schema.TaggedRequest<PullStream>()('PullStream', {
     payload: {
-      cursor: EventId.EventId,
+      cursor: Schema.Number,
     },
     success: Schema.Struct({
       payload: SyncState.PayloadUpstream,
-      remaining: Schema.Number,
+      mergeCounter: Schema.Number,
     }),
     failure: UnexpectedError,
   }) {}
@@ -126,12 +118,6 @@ export namespace LeaderWorkerInner {
     failure: UnexpectedError,
   }) {}
 
-  export class NetworkStatusStream extends Schema.TaggedRequest<NetworkStatusStream>()('NetworkStatusStream', {
-    payload: {},
-    success: NetworkStatus,
-    failure: UnexpectedError,
-  }) {}
-
   export class Shutdown extends Schema.TaggedRequest<Shutdown>()('Shutdown', {
     payload: {},
     success: Schema.Void,
@@ -156,7 +142,6 @@ export namespace LeaderWorkerInner {
     GetRecreateSnapshot,
     GetLeaderHead,
     GetLeaderSyncState,
-    NetworkStatusStream,
     Shutdown,
     ExtraDevtoolsMessage,
     WebmeshWorker.Schema.CreateConnection,
@@ -198,7 +183,6 @@ export namespace SharedWorker {
     LeaderWorkerInner.ExportMutationlog,
     LeaderWorkerInner.GetLeaderHead,
     LeaderWorkerInner.GetLeaderSyncState,
-    LeaderWorkerInner.NetworkStatusStream,
     LeaderWorkerInner.Shutdown,
     LeaderWorkerInner.ExtraDevtoolsMessage,
 

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

@@ -1,11 +1,11 @@
-import type { NetworkStatus, SqliteDb, SyncOptions } from '@livestore/common'
+import type { SqliteDb, SyncOptions } from '@livestore/common'
 import { Devtools, UnexpectedError } from '@livestore/common'
 import type { DevtoolsOptions } from '@livestore/common/leader-thread'
 import {
   configureConnection,
-  getClientHeadFromDb,
   LeaderThreadCtx,
   makeLeaderThreadLayer,
+  Mutationlog,
 } from '@livestore/common/leader-thread'
 import type { LiveStoreSchema } from '@livestore/common/schema'
 import { MutationEvent } from '@livestore/common/schema'
@@ -175,9 +175,8 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
       ),
     PullStream: ({ cursor }) =>
       Effect.gen(function* () {
-        const { connectedClientSessionPullQueues } = yield* LeaderThreadCtx
-        const pullQueue = yield* connectedClientSessionPullQueues.makeQueue(cursor)
-        return Stream.fromQueue(pullQueue)
+        const { syncProcessor } = yield* LeaderThreadCtx
+        return syncProcessor.pull({ cursor })
       }).pipe(
         Stream.unwrapScoped,
         // For debugging purposes
@@ -206,7 +205,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
     GetLeaderHead: () =>
       Effect.gen(function* () {
         const workerCtx = yield* LeaderThreadCtx
-        return getClientHeadFromDb(workerCtx.dbMutationLog)
+        return Mutationlog.getClientHeadFromDb(workerCtx.dbMutationLog)
       }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('@livestore/adapter-web:worker:GetLeaderHead')),
     GetLeaderSyncState: () =>
       Effect.gen(function* () {
@@ -216,19 +215,6 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
         UnexpectedError.mapToUnexpectedError,
         Effect.withSpan('@livestore/adapter-web:worker:GetLeaderSyncState'),
       ),
-    NetworkStatusStream: () =>
-      Effect.gen(function* (_) {
-        const ctx = yield* LeaderThreadCtx
-
-        if (ctx.syncBackend === undefined) {
-          return Stream.make<[NetworkStatus]>({ isConnected: false, timestampMs: Date.now(), latchClosed: false })
-        }
-
-        return Stream.zipLatest(
-          ctx.syncBackend.isConnected.changes,
-          ctx.devtools.enabled ? ctx.devtools.syncBackendLatchState.changes : Stream.make({ latchClosed: false }),
-        ).pipe(Stream.map(([isConnected, { latchClosed }]) => ({ isConnected, timestampMs: Date.now(), latchClosed })))
-      }).pipe(Stream.unwrap),
     Shutdown: () =>
       Effect.gen(function* () {
         yield* Effect.logDebug('[@livestore/adapter-web:worker] Shutdown')

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

@@ -230,7 +230,6 @@ const makeWorkerRunner = Effect.gen(function* () {
     Setup: forwardRequest,
     GetLeaderSyncState: forwardRequest,
     GetLeaderHead: forwardRequest,
-    NetworkStatusStream: forwardRequestStream,
     Shutdown: forwardRequest,
     ExtraDevtoolsMessage: forwardRequest,