@livestore/adapter-web 0.0.0-snapshot-057a9e3a18ca69a310d4eb8cf35a34e94fa1841e → 0.0.0-snapshot-8fd59846e2580d37bdd37ae607e9db2a458a8b63

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

@@ -4,13 +4,12 @@ import {
   liveStoreVersion,
   makeClientSession,
   StoreInterrupted,
-  sessionChangesetMetaTable,
   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
 // import LiveStoreSharedWorker from '@livestore/adapter-web/internal-shared-worker?sharedworker'
-import { EventSequenceNumber } from '@livestore/common/schema'
+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'
@@ -68,9 +67,7 @@ export type WebAdapterOptions = {
    */
   sharedWorker:
     | ((options: { name: string }) => globalThis.SharedWorker)
-    | (new (options: {
-        name: string
-      }) => globalThis.SharedWorker)
+    | (new (options: { name: string }) => globalThis.SharedWorker)
   /**
    * Specifies where to persist data for this adapter
    */
@@ -253,7 +250,7 @@ export const makePersistedAdapter =
 
         yield* Deferred.succeed(waitForSharedWorkerInitialized, undefined)
 
-        return yield* Effect.never
+        yield* Effect.never
       }).pipe(Effect.withSpan('@livestore/adapter-web:client-session:lock'))
 
       // TODO take/give up lock when tab becomes active/passive
@@ -361,7 +358,7 @@ export const makePersistedAdapter =
       const numberOfTables =
         sqliteDb.select<{ count: number }>(`select count(*) as count from sqlite_master`)[0]?.count ?? 0
       if (numberOfTables === 0) {
-        return yield* UnexpectedError.make({
+        yield* UnexpectedError.make({
           cause: `Encountered empty or corrupted database`,
           payload: { snapshotByteLength: initialResult.snapshot.byteLength, storageOptions: options.storage },
         })
@@ -369,15 +366,17 @@ 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(
-        sessionChangesetMetaTable.select('seqNumClient', 'seqNumGlobal', 'seqNumRebaseGeneration').first(),
-      )
+      const initialLeaderHeadRes = sqliteDb.select<{
+        seqNumGlobal: EventSequenceNumber.GlobalEventSequenceNumber
+        seqNumClient: EventSequenceNumber.ClientEventSequenceNumber
+      }>(
+        `select seqNumGlobal, seqNumClient from ${SystemTables.SESSION_CHANGESET_META_TABLE} order by seqNumGlobal desc, seqNumClient desc limit 1`,
+      )[0]
 
       const initialLeaderHead = initialLeaderHeadRes
         ? EventSequenceNumber.make({
             global: initialLeaderHeadRes.seqNumGlobal,
             client: initialLeaderHeadRes.seqNumClient,
-            rebaseGeneration: initialLeaderHeadRes.seqNumRebaseGeneration,
           })
         : EventSequenceNumber.ROOT
 
@@ -501,7 +500,7 @@ const ensureBrowserRequirements = Effect.gen(function* () {
   const validate = (condition: boolean, label: string) =>
     Effect.gen(function* () {
       if (condition) {
-        return yield* UnexpectedError.make({
+        yield* UnexpectedError.make({
           cause: `[@livestore/adapter-web] Browser not supported. The LiveStore web adapter needs '${label}' to work properly`,
         })
       }

package/src/web-worker/common/persisted-sqlite.ts

@@ -47,7 +47,7 @@ export const readPersistedAppDbFromClientSession = ({
 
     const fileResults = await Promise.all(files.map(tryGetDbFile))
 
-    const appDbFileName = `/${getStateDbFileName(schema)}`
+    const appDbFileName = '/' + getStateDbFileName(schema)
 
     const dbFileRes = fileResults.find((_) => _?.fileName === appDbFileName)
     // console.debug('fileResults', fileResults, 'dbFileRes', dbFileRes)

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

@@ -2,6 +2,7 @@ import {
   BootStatus,
   Devtools,
   LeaderAheadError,
+  LeaderPullCursor,
   liveStoreVersion,
   MigrationsReport,
   SyncState,
@@ -84,10 +85,11 @@ export namespace LeaderWorkerInner {
 
   export class PullStream extends Schema.TaggedRequest<PullStream>()('PullStream', {
     payload: {
-      cursor: EventSequenceNumber.EventSequenceNumber,
+      cursor: LeaderPullCursor,
     },
     success: Schema.Struct({
       payload: SyncState.PayloadUpstream,
+      mergeCounter: Schema.Number,
     }),
     failure: UnexpectedError,
   }) {}

package/src/web-worker/vite-dev-polyfill.ts

@@ -1,11 +1,9 @@
-/// <reference lib="dom" />
-
 // @ts-expect-error TODO remove when Vite does proper treeshaking during dev
 globalThis.$RefreshReg$ = () => {}
 // @ts-expect-error TODO remove when Vite does proper treeshaking during dev
 globalThis.$RefreshSig$ = () => (type: any) => type
 
-// @ts-ignore
+// @ts-expect-error Needed for React
 globalThis.process = globalThis.process ?? { env: {} }
 
 globalThis.document = (globalThis as any)?.document ?? {