@livestore/adapter-web 0.0.0-snapshot-04bc235dd721238cb10c060705672376b6e06dd3 → 0.0.0-snapshot-f695fd72a038f4deb7b452e82cb37999b5cc30b9

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

@@ -1,7 +1,7 @@
 import type { Adapter, ClientSession, LockStatus } from '@livestore/common'
 import {
-  Devtools,
   IntentionalShutdownCause,
+  liveStoreVersion,
   makeClientSession,
   StoreInterrupted,
   UnexpectedError,
@@ -9,8 +9,7 @@ import {
 // 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 { EventId, SystemTables } from '@livestore/common/schema'
-import * as DevtoolsWeb from '@livestore/devtools-web-common/web-channel'
+import { EventSequenceNumber, SystemTables } from '@livestore/common/schema'
 import { sqliteDbFactory } from '@livestore/sqlite-wasm/browser'
 import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm'
 import { isDevEnv, shouldNeverHappen, tryAsFunctionAndNew } from '@livestore/utils'
@@ -26,20 +25,18 @@ import {
   Schema,
   Stream,
   SubscriptionRef,
-  WebChannel,
   WebLock,
   Worker,
   WorkerError,
 } from '@livestore/utils/effect'
 import { nanoid } from '@livestore/utils/nanoid'
-import * as Webmesh from '@livestore/webmesh'
 
 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 { logDevtoolsUrl } from './client-session-devtools.js'
+import { connectWebmeshNodeClientSession } from './client-session-devtools.js'
 
 // NOTE we're starting to initialize the sqlite wasm binary here to speed things up
 const sqlite3Promise = loadSqlite3Wasm()
@@ -147,7 +144,7 @@ export const makePersistedAdapter =
 
       yield* shutdownChannel.listen.pipe(
         Stream.flatten(),
-        Stream.tap((error) => Effect.sync(() => shutdown(Cause.fail(error)))),
+        Stream.tap((error) => shutdown(Cause.fail(error))),
         Stream.runDrain,
         Effect.interruptible,
         Effect.tapCauseLogPretty,
@@ -161,6 +158,7 @@ export const makePersistedAdapter =
         concurrency: 100,
         initialMessage: () =>
           new WorkerSchema.SharedWorker.InitialMessage({
+            liveStoreVersion,
             payload: {
               _tag: 'FromClientSession',
               initialMessage: new WorkerSchema.LeaderWorkerInner.InitialMessage({
@@ -177,7 +175,7 @@ export const makePersistedAdapter =
         Effect.provide(BrowserWorker.layer(() => sharedWebWorker)),
         Effect.tapCauseLogPretty,
         UnexpectedError.mapToUnexpectedError,
-        Effect.tapErrorCause((cause) => Effect.sync(() => shutdown(cause))),
+        Effect.tapErrorCause(shutdown),
         Effect.withSpan('@livestore/adapter-web:client-session:setupSharedWorker'),
         Effect.forkScoped,
       )
@@ -220,7 +218,7 @@ export const makePersistedAdapter =
         }).pipe(
           Effect.provide(BrowserWorker.layer(() => worker)),
           UnexpectedError.mapToUnexpectedError,
-          Effect.tapErrorCause((cause) => Effect.sync(() => shutdown(cause))),
+          Effect.tapErrorCause(shutdown),
           Effect.withSpan('@livestore/adapter-web:client-session:setupDedicatedWorker'),
           Effect.tapCauseLogPretty,
           Effect.forkScoped,
@@ -229,10 +227,9 @@ export const makePersistedAdapter =
         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((cause) => Effect.sync(() => shutdown(cause))),
-        )
+        yield* sharedWorker
+          .executeEffect(new WorkerSchema.SharedWorker.UpdateMessagePort({ port: mc.port2 }))
+          .pipe(UnexpectedError.mapToUnexpectedError, Effect.tapErrorCause(shutdown))
 
         yield* Deferred.succeed(waitForSharedWorkerInitialized, undefined)
 
@@ -308,9 +305,7 @@ export const makePersistedAdapter =
       const bootStatusFiber = yield* runInWorkerStream(new WorkerSchema.LeaderWorkerInner.BootStatusStream()).pipe(
         Stream.tap((_) => Queue.offer(bootStatusQueue, _)),
         Stream.runDrain,
-        Effect.tapErrorCause((cause) =>
-          Cause.isInterruptedOnly(cause) ? Effect.void : Effect.sync(() => shutdown(cause)),
-        ),
+        Effect.tapErrorCause((cause) => (Cause.isInterruptedOnly(cause) ? Effect.void : shutdown(cause))),
         Effect.interruptible,
         Effect.tapCauseLogPretty,
         Effect.forkScoped,
@@ -355,15 +350,18 @@ export const makePersistedAdapter =
       // We're restoring the leader head from the SESSION_CHANGESET_META_TABLE, not from the eventlog db/table
       // in order to avoid exporting/transferring the eventlog db/table, which is important to speed up the fast path.
       const initialLeaderHeadRes = sqliteDb.select<{
-        idGlobal: EventId.GlobalEventId
-        idClient: EventId.ClientEventId
+        seqNumGlobal: EventSequenceNumber.GlobalEventSequenceNumber
+        seqNumClient: EventSequenceNumber.ClientEventSequenceNumber
       }>(
-        `select idGlobal, idClient from ${SystemTables.SESSION_CHANGESET_META_TABLE} order by idGlobal desc, idClient desc limit 1`,
+        `select seqNumGlobal, seqNumClient from ${SystemTables.SESSION_CHANGESET_META_TABLE} order by seqNumGlobal desc, seqNumClient desc limit 1`,
       )[0]
 
       const initialLeaderHead = initialLeaderHeadRes
-        ? EventId.make({ global: initialLeaderHeadRes.idGlobal, client: initialLeaderHeadRes.idClient })
-        : EventId.ROOT
+        ? EventSequenceNumber.make({
+            global: initialLeaderHeadRes.seqNumGlobal,
+            client: initialLeaderHeadRes.seqNumClient,
+          })
+        : EventSequenceNumber.ROOT
 
       // console.debug('[@livestore/adapter-web:client-session] initialLeaderHead', initialLeaderHead)
 
@@ -424,63 +422,28 @@ export const makePersistedAdapter =
           ),
       }
 
+      const sharedWorker = yield* Fiber.join(sharedWorkerFiber)
+
       const clientSession = yield* makeClientSession({
         ...adapterArgs,
         sqliteDb,
         lockStatus,
         clientId,
         sessionId,
+        // isLeader: gotLocky, // TODO update when leader is changing
+        isLeader: true,
         leaderThread,
         webmeshMode: 'direct',
-        connectWebmeshNode: Effect.fn(function* ({ webmeshNode, sessionInfo }) {
-          if (devtoolsEnabled) {
-            yield* logDevtoolsUrl({ clientId, sessionId, schema, storeId })
-
-            // This additional sessioninfo broadcast channel is needed since we can't use the shared worker
-            // as it's currently storeId-specific
-            yield* Devtools.SessionInfo.provideSessionInfo({
-              webChannel: yield* DevtoolsWeb.makeSessionInfoBroadcastChannel,
-              sessionInfo,
-            }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
-
-            yield* Effect.gen(function* () {
-              const clientSessionStaticChannel = yield* DevtoolsWeb.makeStaticClientSessionChannel.clientSession
-
-              yield* clientSessionStaticChannel.send(
-                DevtoolsWeb.ClientSessionContentscriptMainReq.make({ clientId, sessionId, storeId }),
-              )
-
-              const { tabId } = yield* clientSessionStaticChannel.listen.pipe(
-                Stream.flatten(),
-                Stream.runHead,
-                Effect.flatten,
-              )
-
-              const contentscriptMainNodeName = DevtoolsWeb.makeNodeName.browserExtension.contentscriptMain(tabId)
-
-              const contentscriptMainChannel = yield* WebChannel.windowChannel({
-                listenWindow: window,
-                sendWindow: window,
-                schema: Webmesh.WebmeshSchema.Packet,
-                ids: { own: webmeshNode.nodeName, other: contentscriptMainNodeName },
-              })
-
-              yield* webmeshNode.addEdge({ target: contentscriptMainNodeName, edgeChannel: contentscriptMainChannel })
-            }).pipe(
-              Effect.withSpan('@livestore/adapter-web:client-session:devtools:browser-extension'),
-              Effect.tapCauseLogPretty,
-              Effect.forkScoped,
-            )
-
-            const sharedWorker = yield* Fiber.join(sharedWorkerFiber)
-
-            yield* DevtoolsWeb.connectViaWorker({
-              node: webmeshNode,
-              target: DevtoolsWeb.makeNodeName.sharedWorker({ storeId }),
-              worker: sharedWorker,
-            })
+        connectWebmeshNode: ({ sessionInfo, webmeshNode }) =>
+          connectWebmeshNodeClientSession({ webmeshNode, sessionInfo, sharedWorker, devtoolsEnabled, schema }),
+        registerBeforeUnload: (onBeforeUnload) => {
+          if (typeof window !== 'undefined' && typeof window.addEventListener === 'function') {
+            window.addEventListener('beforeunload', onBeforeUnload)
+            return () => window.removeEventListener('beforeunload', onBeforeUnload)
           }
-        }),
+
+          return () => {}
+        },
       })
 
       return clientSession

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

@@ -3,11 +3,12 @@ import {
   Devtools,
   LeaderAheadError,
   LeaderPullCursor,
+  liveStoreVersion,
   MigrationsReport,
   SyncState,
   UnexpectedError,
 } from '@livestore/common'
-import { EventId, LiveStoreEvent } from '@livestore/common/schema'
+import { EventSequenceNumber, LiveStoreEvent } from '@livestore/common/schema'
 import * as WebmeshWorker from '@livestore/devtools-web-common/worker'
 import { Schema, Transferable } from '@livestore/utils/effect'
 
@@ -116,7 +117,7 @@ export namespace LeaderWorkerInner {
 
   export class GetLeaderHead extends Schema.TaggedRequest<GetLeaderHead>()('GetLeaderHead', {
     payload: {},
-    success: EventId.EventId,
+    success: EventSequenceNumber.EventSequenceNumber,
     failure: UnexpectedError,
   }) {}
 
@@ -165,6 +166,9 @@ export namespace SharedWorker {
   export class InitialMessage extends Schema.TaggedRequest<InitialMessage>()('InitialMessage', {
     payload: {
       payload: Schema.Union(InitialMessagePayloadFromClientSession, Schema.TaggedStruct('FromWebBridge', {})),
+      // To guard against scenarios where a client session is already running a newer version of LiveStore
+      // We should probably find a better way to handle those cases once they become more common.
+      liveStoreVersion: Schema.Literal(liveStoreVersion),
     },
     success: Schema.Void,
     failure: UnexpectedError,