@livestore/adapter-web 0.0.0-snapshot-2ef046b02334f52613d31dbe06af53487685edc0 → 0.0.0-snapshot-8115ad48d5a57244358c943ecc92bb0a30274b87

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

@@ -75,7 +75,7 @@ export type WebAdapterOptions = {
    */
   storage: WorkerSchema.StorageTypeEncoded
   /**
-   * Warning: This will reset both the app and mutationlog database.
+   * Warning: This will reset both the app and eventlog database.
    * This should only be used during development.
    *
    * @default false
@@ -190,7 +190,7 @@ export const makePersistedAdapter =
 
       const lockDeferred = yield* Deferred.make<void>()
       // It's important that we resolve the leader election in a blocking way, so there's always a leader.
-      // Otherwise mutations could end up being dropped.
+      // Otherwise events could end up being dropped.
       //
       // Sorry for this pun ...
       let gotLocky = yield* WebLock.tryGetDeferredLock(lockDeferred, LIVESTORE_TAB_LOCK)
@@ -358,8 +358,8 @@ export const makePersistedAdapter =
         })
       }
 
-      // We're restoring the leader head from the SESSION_CHANGESET_META_TABLE, not from the mutationlog db/table
-      // in order to avoid exporting/transferring the mutationlog db/table, which is important to speed up the fast path.
+      // 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
@@ -410,7 +410,7 @@ export const makePersistedAdapter =
             Effect.withSpan('@livestore/adapter-web:client-session:export'),
           ),
 
-          mutations: {
+          events: {
             pull: ({ cursor }) =>
               runInWorkerStream(new WorkerSchema.LeaderWorkerInner.PullStream({ cursor })).pipe(Stream.orDie),
             push: (batch) =>
@@ -423,10 +423,10 @@ export const makePersistedAdapter =
 
           initialState: { leaderHead: initialLeaderHead, migrationsReport },
 
-          getMutationLogData: runInWorker(new WorkerSchema.LeaderWorkerInner.ExportMutationlog()).pipe(
+          getEventlogData: runInWorker(new WorkerSchema.LeaderWorkerInner.ExportEventlog()).pipe(
             Effect.timeout(10_000),
             UnexpectedError.mapToUnexpectedError,
-            Effect.withSpan('@livestore/adapter-web:client-session:getMutationLogData'),
+            Effect.withSpan('@livestore/adapter-web:client-session:getEventlogData'),
           ),
 
           getSyncState: runInWorker(new WorkerSchema.LeaderWorkerInner.GetLeaderSyncState()).pipe(
@@ -520,7 +520,7 @@ export const makePersistedAdapter =
       return clientSession
     }).pipe(UnexpectedError.mapToUnexpectedError)
 
-// NOTE for `local` storage we could also use the mutationlog db to store the data
+// NOTE for `local` storage we could also use the eventlog db to store the data
 const getPersistedId = (key: string, storageType: 'session' | 'local') => {
   const makeId = () => nanoid(5)
 

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

@@ -1,5 +1,13 @@
-import { BootStatus, Devtools, LeaderAheadError, MigrationsReport, SyncState, UnexpectedError } from '@livestore/common'
-import { EventId, MutationEvent } from '@livestore/common/schema'
+import {
+  BootStatus,
+  Devtools,
+  LeaderAheadError,
+  LeaderPullCursor,
+  MigrationsReport,
+  SyncState,
+  UnexpectedError,
+} from '@livestore/common'
+import { EventId, LiveStoreEvent } from '@livestore/common/schema'
 import * as WebmeshWorker from '@livestore/devtools-web-common/worker'
 import { Schema, Transferable } from '@livestore/utils/effect'
 
@@ -68,7 +76,7 @@ export namespace LeaderWorkerInner {
 
   export class PushToLeader extends Schema.TaggedRequest<PushToLeader>()('PushToLeader', {
     payload: {
-      batch: Schema.Array(MutationEvent.AnyEncoded),
+      batch: Schema.Array(LiveStoreEvent.AnyEncoded),
     },
     success: Schema.Void,
     failure: Schema.Union(UnexpectedError, LeaderAheadError),
@@ -76,7 +84,7 @@ export namespace LeaderWorkerInner {
 
   export class PullStream extends Schema.TaggedRequest<PullStream>()('PullStream', {
     payload: {
-      cursor: Schema.Number,
+      cursor: LeaderPullCursor,
     },
     success: Schema.Struct({
       payload: SyncState.PayloadUpstream,
@@ -91,7 +99,7 @@ export namespace LeaderWorkerInner {
     failure: UnexpectedError,
   }) {}
 
-  export class ExportMutationlog extends Schema.TaggedRequest<ExportMutationlog>()('ExportMutationlog', {
+  export class ExportEventlog extends Schema.TaggedRequest<ExportEventlog>()('ExportEventlog', {
     payload: {},
     success: Transferable.Uint8Array,
     failure: UnexpectedError,
@@ -138,7 +146,7 @@ export namespace LeaderWorkerInner {
     PushToLeader,
     PullStream,
     Export,
-    ExportMutationlog,
+    ExportEventlog,
     GetRecreateSnapshot,
     GetLeaderHead,
     GetLeaderSyncState,
@@ -180,7 +188,7 @@ export namespace SharedWorker {
     LeaderWorkerInner.PullStream,
     LeaderWorkerInner.Export,
     LeaderWorkerInner.GetRecreateSnapshot,
-    LeaderWorkerInner.ExportMutationlog,
+    LeaderWorkerInner.ExportEventlog,
     LeaderWorkerInner.GetLeaderHead,
     LeaderWorkerInner.GetLeaderSyncState,
     LeaderWorkerInner.Shutdown,

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

@@ -1,14 +1,9 @@
 import type { SqliteDb, SyncOptions } from '@livestore/common'
 import { Devtools, UnexpectedError } from '@livestore/common'
 import type { DevtoolsOptions } from '@livestore/common/leader-thread'
-import {
-  configureConnection,
-  LeaderThreadCtx,
-  makeLeaderThreadLayer,
-  Mutationlog,
-} from '@livestore/common/leader-thread'
+import { configureConnection, Eventlog, LeaderThreadCtx, makeLeaderThreadLayer } from '@livestore/common/leader-thread'
 import type { LiveStoreSchema } from '@livestore/common/schema'
-import { MutationEvent } from '@livestore/common/schema'
+import { LiveStoreEvent } from '@livestore/common/schema'
 import { makeChannelForConnectedMeshNode } from '@livestore/devtools-web-common/web-channel'
 import * as WebmeshWorker from '@livestore/devtools-web-common/worker'
 import { sqliteDbFactory } from '@livestore/sqlite-wasm/browser'
@@ -113,11 +108,11 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
         const makeSqliteDb = sqliteDbFactory({ sqlite3 })
         const runtime = yield* Effect.runtime<never>()
 
-        const makeDb = (kind: 'app' | 'mutationlog') =>
+        const makeDb = (kind: 'app' | 'eventlog') =>
           makeSqliteDb({
             _tag: 'opfs',
             opfsDirectory: sanitizeOpfsDir(storageOptions.directory, storeId),
-            fileName: kind === 'app' ? getAppDbFileName(schema) : 'mutationlog.db',
+            fileName: kind === 'app' ? getAppDbFileName(schema) : 'eventlog.db',
             configureDb: (db) =>
               configureConnection(db, {
                 //  The persisted databases use the AccessHandlePoolVFS which always uses a single database connection.
@@ -130,11 +125,11 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
           }).pipe(Effect.acquireRelease((db) => Effect.try(() => db.close()).pipe(Effect.ignoreLogged)))
 
         // Might involve some async work, so we're running them concurrently
-        const [dbReadModel, dbMutationLog] = yield* Effect.all([makeDb('app'), makeDb('mutationlog')], {
+        const [dbReadModel, dbEventlog] = yield* Effect.all([makeDb('app'), makeDb('eventlog')], {
           concurrency: 2,
         })
 
-        const devtoolsOptions = yield* makeDevtoolsOptions({ devtoolsEnabled, dbReadModel, dbMutationLog })
+        const devtoolsOptions = yield* makeDevtoolsOptions({ devtoolsEnabled, dbReadModel, dbEventlog })
         const shutdownChannel = yield* makeShutdownChannel(storeId)
 
         return makeLeaderThreadLayer({
@@ -144,7 +139,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
           makeSqliteDb,
           syncOptions,
           dbReadModel,
-          dbMutationLog,
+          dbEventlog,
           devtoolsOptions,
           shutdownChannel,
           syncPayload,
@@ -185,7 +180,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
     PushToLeader: ({ batch }) =>
       Effect.andThen(LeaderThreadCtx, ({ syncProcessor }) =>
         syncProcessor.push(
-          batch.map((mutationEvent) => new MutationEvent.EncodedWithMeta(mutationEvent)),
+          batch.map((event) => new LiveStoreEvent.EncodedWithMeta(event)),
           // We'll wait in order to keep back pressure on the client session
           { waitForProcessing: true },
         ),
@@ -195,17 +190,17 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
         UnexpectedError.mapToUnexpectedError,
         Effect.withSpan('@livestore/adapter-web:worker:Export'),
       ),
-    ExportMutationlog: () =>
-      Effect.andThen(LeaderThreadCtx, (_) => _.dbMutationLog.export()).pipe(
+    ExportEventlog: () =>
+      Effect.andThen(LeaderThreadCtx, (_) => _.dbEventlog.export()).pipe(
         UnexpectedError.mapToUnexpectedError,
-        Effect.withSpan('@livestore/adapter-web:worker:ExportMutationlog'),
+        Effect.withSpan('@livestore/adapter-web:worker:ExportEventlog'),
       ),
     BootStatusStream: () =>
       Effect.andThen(LeaderThreadCtx, (_) => Stream.fromQueue(_.bootStatusQueue)).pipe(Stream.unwrap),
     GetLeaderHead: () =>
       Effect.gen(function* () {
         const workerCtx = yield* LeaderThreadCtx
-        return Mutationlog.getClientHeadFromDb(workerCtx.dbMutationLog)
+        return Eventlog.getClientHeadFromDb(workerCtx.dbEventlog)
       }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('@livestore/adapter-web:worker:GetLeaderHead')),
     GetLeaderSyncState: () =>
       Effect.gen(function* () {
@@ -234,11 +229,11 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions }: WorkerOptions) =>
 const makeDevtoolsOptions = ({
   devtoolsEnabled,
   dbReadModel,
-  dbMutationLog,
+  dbEventlog,
 }: {
   devtoolsEnabled: boolean
   dbReadModel: SqliteDb
-  dbMutationLog: SqliteDb
+  dbEventlog: SqliteDb
 }): Effect.Effect<DevtoolsOptions, UnexpectedError, Scope.Scope | WebmeshWorker.CacheService> =>
   Effect.gen(function* () {
     if (devtoolsEnabled === false) {
@@ -257,7 +252,7 @@ const makeDevtoolsOptions = ({
           }),
           persistenceInfo: {
             readModel: dbReadModel.metadata.persistenceInfo,
-            mutationLog: dbMutationLog.metadata.persistenceInfo,
+            eventlog: dbEventlog.metadata.persistenceInfo,
           },
         }
       }),

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

@@ -226,7 +226,7 @@ const makeWorkerRunner = Effect.gen(function* () {
     PullStream: forwardRequestStream,
     Export: forwardRequest,
     GetRecreateSnapshot: forwardRequest,
-    ExportMutationlog: forwardRequest,
+    ExportEventlog: forwardRequest,
     Setup: forwardRequest,
     GetLeaderSyncState: forwardRequest,
     GetLeaderHead: forwardRequest,