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

package/src/make-leader-worker.ts

@@ -11,14 +11,9 @@ if (process.execArgv.includes('--inspect')) {
 import type { SyncOptions } from '@livestore/common'
 import { Devtools, liveStoreStorageFormatVersion, UnexpectedError } from '@livestore/common'
 import type { DevtoolsOptions, LeaderSqliteDb } 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 { makeNodeDevtoolsChannel } from '@livestore/devtools-node-common/web-channel'
 import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm'
 import { sqliteDbFactory } from '@livestore/sqlite-wasm/node'
@@ -69,7 +64,7 @@ export const makeWorkerEffect = (options: WorkerOptions) => {
     PushToLeader: ({ batch }) =>
       Effect.andThen(LeaderThreadCtx, (_) =>
         _.syncProcessor.push(
-          batch.map((item) => new MutationEvent.EncodedWithMeta(item)),
+          batch.map((item) => new LiveStoreEvent.EncodedWithMeta(item)),
           // We'll wait in order to keep back pressure on the client session
           { waitForProcessing: true },
         ),
@@ -86,15 +81,15 @@ export const makeWorkerEffect = (options: WorkerOptions) => {
         UnexpectedError.mapToUnexpectedError,
         Effect.withSpan('@livestore/adapter-node:worker:Export'),
       ),
-    ExportMutationlog: () =>
-      Effect.andThen(LeaderThreadCtx, (_) => _.dbMutationLog.export()).pipe(
+    ExportEventlog: () =>
+      Effect.andThen(LeaderThreadCtx, (_) => _.dbEventlog.export()).pipe(
         UnexpectedError.mapToUnexpectedError,
-        Effect.withSpan('@livestore/adapter-node:worker:ExportMutationlog'),
+        Effect.withSpan('@livestore/adapter-node:worker:ExportEventlog'),
       ),
     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-node:worker:GetLeaderHead')),
     GetLeaderSyncState: () =>
       Effect.gen(function* () {
@@ -120,14 +115,14 @@ export const makeWorkerEffect = (options: WorkerOptions) => {
       ),
     Shutdown: () =>
       Effect.gen(function* () {
-        // const { db, dbMutationLog } = yield* LeaderThreadCtx
+        // const { db, dbEventlog } = yield* LeaderThreadCtx
         yield* Effect.logDebug('[@livestore/adapter-node:worker] Shutdown')
 
         // if (devtools.enabled) {
         //   yield* FiberSet.clear(devtools.connections)
         // }
         // db.close()
-        // dbMutationLog.close()
+        // dbEventlog.close()
 
         // Buy some time for Otel to flush
         // TODO find a cleaner way to do this
@@ -178,26 +173,25 @@ const makeLeaderThread = ({
 
     const schemaHashSuffix = schema.migrationOptions.strategy === 'manual' ? 'fixed' : schema.hash.toString()
 
-    const makeDb = (kind: 'app' | 'mutationlog') =>
+    const makeDb = (kind: 'app' | 'eventlog') =>
       makeSqliteDb({
         _tag: 'fs',
         directory: path.join(baseDirectory ?? '', storeId),
-        fileName:
-          kind === 'app' ? getAppDbFileName(schemaHashSuffix) : `mutationlog@${liveStoreStorageFormatVersion}.db`,
+        fileName: kind === 'app' ? getAppDbFileName(schemaHashSuffix) : `eventlog@${liveStoreStorageFormatVersion}.db`,
         // TODO enable WAL for nodejs
         configureDb: (db) =>
           configureConnection(db, { foreignKeys: true }).pipe(Effect.provide(runtime), Effect.runSync),
       }).pipe(Effect.acquireRelease((db) => Effect.sync(() => db.close())))
 
     // Might involve some async work, so we're running them concurrently
-    const [dbReadModel, dbMutationLog] = yield* Effect.all([makeDb('app'), makeDb('mutationlog')], { concurrency: 2 })
+    const [dbReadModel, dbEventlog] = yield* Effect.all([makeDb('app'), makeDb('eventlog')], { concurrency: 2 })
 
     const devtoolsOptions = yield* makeDevtoolsOptions({
       devtoolsEnabled: devtools.enabled,
       devtoolsPort: devtools.port,
       devtoolsHost: devtools.host,
       dbReadModel,
-      dbMutationLog,
+      dbEventlog,
       storeId,
       clientId,
       schemaPath,
@@ -212,7 +206,7 @@ const makeLeaderThread = ({
       makeSqliteDb,
       syncOptions,
       dbReadModel,
-      dbMutationLog,
+      dbEventlog,
       devtoolsOptions,
       shutdownChannel,
       syncPayload,
@@ -229,7 +223,7 @@ const getAppDbFileName = (suffix: string) => `app${suffix}@${liveStoreStorageFor
 const makeDevtoolsOptions = ({
   devtoolsEnabled,
   dbReadModel,
-  dbMutationLog,
+  dbEventlog,
   storeId,
   clientId,
   devtoolsPort,
@@ -238,7 +232,7 @@ const makeDevtoolsOptions = ({
 }: {
   devtoolsEnabled: boolean
   dbReadModel: LeaderSqliteDb
-  dbMutationLog: LeaderSqliteDb
+  dbEventlog: LeaderSqliteDb
   storeId: string
   clientId: string
   devtoolsPort: number
@@ -276,7 +270,7 @@ const makeDevtoolsOptions = ({
           devtoolsWebChannel,
           persistenceInfo: {
             readModel: dbReadModel.metadata.persistenceInfo,
-            mutationLog: dbMutationLog.metadata.persistenceInfo,
+            eventlog: dbEventlog.metadata.persistenceInfo,
           },
         }
       }).pipe(Effect.provide(FetchHttpClient.layer)),

package/src/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 { Schema, Transferable } from '@livestore/utils/effect'
 
 export const WorkerArgv = Schema.parseJson(
@@ -84,7 +92,7 @@ export namespace LeaderWorkerInner {
 
   export class PullStream extends Schema.TaggedRequest<PullStream>()('PullStream', {
     payload: {
-      cursor: Schema.Number,
+      cursor: LeaderPullCursor,
     },
     success: Schema.Struct({
       payload: SyncState.PayloadUpstream,
@@ -95,7 +103,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),
@@ -116,7 +124,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,
@@ -155,7 +163,7 @@ export namespace LeaderWorkerInner {
     PushToLeader,
     Export,
     GetRecreateSnapshot,
-    ExportMutationlog,
+    ExportEventlog,
     GetLeaderHead,
     GetLeaderSyncState,
     Shutdown,