@livestore/adapter-node 0.3.0-dev.33 → 0.3.0-dev.36

package/src/client-session/{persisted-adapter.ts → adapter.ts}

@@ -8,8 +8,13 @@ import type {
   ClientSessionLeaderThreadProxy,
   IntentionalShutdownCause,
   LockStatus,
+  MakeSqliteDb,
+  SyncOptions,
 } from '@livestore/common'
 import { Devtools, UnexpectedError } from '@livestore/common'
+import { Eventlog, LeaderThreadCtx } from '@livestore/common/leader-thread'
+import type { LiveStoreSchema } from '@livestore/common/schema'
+import { LiveStoreEvent } from '@livestore/common/schema'
 import * as DevtoolsNode from '@livestore/devtools-node-common/web-channel'
 import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm'
 import { sqliteDbFactory } from '@livestore/sqlite-wasm/node'
@@ -29,49 +34,82 @@ import {
 } from '@livestore/utils/effect'
 import { PlatformNode } from '@livestore/utils/node'
 
+import type { TestingOverrides } from '../leader-thread-shared.js'
+import { makeLeaderThread } from '../leader-thread-shared.js'
 import { makeShutdownChannel } from '../shutdown-channel.js'
 import * as WorkerSchema from '../worker-schema.js'
 
 export interface NodeAdapterOptions {
-  /**
-   * Example: `new URL('./livestore.worker.js', import.meta.url)`
-   */
-  workerUrl: URL
-  /** Needed for the worker and the devtools */
-  schemaPath: string
-  /** Where to store the database files */
-  baseDirectory?: string
+  storage: WorkerSchema.StorageType
   /** The default is the hostname of the current machine */
   clientId?: string
-  /** @default 'static' */
+  /**
+   * Warning: This adapter doesn't currently support multiple client sessions for the same client (i.e. same storeId + clientId)
+   * @default 'static'
+   */
   sessionId?: string
+
   devtools?: {
+    schemaPath: string
     /**
      * Where to run the devtools server (via Vite)
      *
      * @default 4242
      */
-    port: number
+    port?: number
     /**
      * @default 'localhost'
      */
-    host: string
+    host?: string
+  }
+
+  /** Only used internally for testing */
+  testing?: {
+    overrides?: TestingOverrides
   }
 }
 
+/** Runs everything in the same thread. Use `makeWorkerAdapter` for multi-threaded implementation. */
+export const makeAdapter = ({
+  sync,
+  ...options
+}: NodeAdapterOptions & {
+  sync?: SyncOptions
+}): Adapter => makeAdapterImpl({ ...options, leaderThread: { _tag: 'single-threaded', sync } })
+
 /**
- * Warning: This adapter doesn't currently support multiple client sessions for the same client (i.e. same storeId + clientId)
+ * Runs persistence and syncing in a worker thread.
  */
-export const makePersistedAdapter = ({
+export const makeWorkerAdapter = ({
   workerUrl,
-  schemaPath,
-  baseDirectory,
-  devtools: devtoolsOptions = { port: 4242, host: 'localhost' },
+  ...options
+}: NodeAdapterOptions & {
+  /**
+   * Example: `new URL('./livestore.worker.js', import.meta.url)`
+   */
+  workerUrl: URL
+}): Adapter => makeAdapterImpl({ ...options, leaderThread: { _tag: 'multi-threaded', workerUrl } })
+
+const makeAdapterImpl = ({
+  storage,
+  devtools: devtoolsOptionsInput,
   clientId = hostname(),
   // TODO make this dynamic and actually support multiple sessions
   sessionId = 'static',
-}: NodeAdapterOptions): Adapter =>
-  (({ storeId, devtoolsEnabled, shutdown, connectDevtoolsToStore, bootStatusQueue, syncPayload }) =>
+  testing,
+  leaderThread: leaderThreadInput,
+}: NodeAdapterOptions & {
+  leaderThread:
+    | {
+        _tag: 'single-threaded'
+        sync: SyncOptions | undefined
+      }
+    | {
+        _tag: 'multi-threaded'
+        workerUrl: URL
+      }
+}): Adapter =>
+  (({ storeId, devtoolsEnabled, shutdown, connectDevtoolsToStore, bootStatusQueue, syncPayload, schema }) =>
     Effect.gen(function* () {
       yield* Queue.offer(bootStatusQueue, { stage: 'loading' })
 
@@ -86,39 +124,66 @@ export const makePersistedAdapter = ({
       //   yield* Effect.logWarning('Failed to load database file', fileData.left)
       // }
 
-      const shutdownChannel = yield* makeShutdownChannel(storeId)
-
-      yield* shutdownChannel.listen.pipe(
-        Stream.flatten(),
-        Stream.tap((error) => Effect.sync(() => shutdown(Cause.fail(error)))),
-        Stream.runDrain,
-        Effect.interruptible,
-        Effect.tapCauseLogPretty,
-        Effect.forkScoped,
-      )
+      if (leaderThreadInput._tag === 'multi-threaded') {
+        // TODO make static import again once BroadcastChannel is stable in Deno
+        //
+        // const { makeShutdownChannel } = yield* Effect.promise(() => import('../shutdown-channel.js'))
+        const shutdownChannel = yield* makeShutdownChannel(storeId)
+
+        yield* shutdownChannel.listen.pipe(
+          Stream.flatten(),
+          Stream.tap((error) => Effect.sync(() => shutdown(Cause.fail(error)))),
+          Stream.runDrain,
+          Effect.interruptible,
+          Effect.tapCauseLogPretty,
+          Effect.forkScoped,
+        )
+      }
 
       const syncInMemoryDb = yield* makeSqliteDb({ _tag: 'in-memory' }).pipe(Effect.orDie)
 
       // TODO actually implement this multi-session support
       const lockStatus = yield* SubscriptionRef.make<LockStatus>('has-lock')
 
-      const { leaderThread, initialSnapshot } = yield* makeLeaderThread({
-        shutdown,
-        storeId,
-        clientId,
-        sessionId,
-        workerUrl,
-        baseDirectory,
-        devtoolsEnabled,
-        devtoolsOptions,
-        schemaPath,
-        bootStatusQueue,
-        syncPayload,
-      })
+      const devtoolsOptions: WorkerSchema.LeaderWorkerInner.InitialMessage['devtools'] =
+        devtoolsEnabled && devtoolsOptionsInput !== undefined
+          ? {
+              enabled: true,
+              schemaPath: devtoolsOptionsInput.schemaPath,
+              schemaAlias: schema.devtools.alias,
+              port: devtoolsOptionsInput.port ?? 4242,
+              host: devtoolsOptionsInput.host ?? 'localhost',
+            }
+          : { enabled: false }
+
+      const { leaderThread, initialSnapshot } =
+        leaderThreadInput._tag === 'single-threaded'
+          ? yield* makeLocalLeaderThread({
+              storeId,
+              clientId,
+              schema,
+              makeSqliteDb,
+              syncOptions: leaderThreadInput.sync,
+              syncPayload,
+              devtools: devtoolsOptions,
+              storage,
+              testing,
+            }).pipe(UnexpectedError.mapToUnexpectedError)
+          : yield* makeWorkerLeaderThread({
+              shutdown,
+              storeId,
+              clientId,
+              sessionId,
+              workerUrl: leaderThreadInput.workerUrl,
+              storage,
+              devtools: devtoolsOptions,
+              bootStatusQueue,
+              syncPayload,
+            })
 
       syncInMemoryDb.import(initialSnapshot)
 
-      if (devtoolsEnabled) {
+      if (devtoolsOptions.enabled) {
         yield* Effect.gen(function* () {
           const webmeshNode = yield* DevtoolsNode.makeNodeDevtoolsConnectedMeshNode({
             url: `ws://${devtoolsOptions.host}:${devtoolsOptions.port}`,
@@ -130,9 +195,10 @@ export const makePersistedAdapter = ({
             schema: Devtools.SessionInfo.Message,
           })
 
+          const schemaAlias = schema.devtools.alias
           yield* Devtools.SessionInfo.provideSessionInfo({
             webChannel: sessionsChannel,
-            sessionInfo: Devtools.SessionInfo.SessionInfo.make({ storeId, clientId, sessionId }),
+            sessionInfo: Devtools.SessionInfo.SessionInfo.make({ storeId, clientId, sessionId, schemaAlias }),
           }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
 
           const storeDevtoolsChannel = yield* DevtoolsNode.makeChannelForConnectedMeshNode({
@@ -142,7 +208,11 @@ export const makePersistedAdapter = ({
           })
 
           yield* connectDevtoolsToStore(storeDevtoolsChannel)
-        }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
+        }).pipe(
+          Effect.tapCauseLogPretty,
+          Effect.withSpan('@livestore/adapter-node:client-session:devtools'),
+          Effect.forkScoped,
+        )
       }
 
       const devtools: ClientSession['devtools'] = devtoolsEnabled
@@ -167,30 +237,97 @@ export const makePersistedAdapter = ({
       Effect.provide(FetchHttpClient.layer),
     )) satisfies Adapter
 
-const makeLeaderThread = ({
+const makeLocalLeaderThread = ({
+  storeId,
+  clientId,
+  schema,
+  makeSqliteDb,
+  syncOptions,
+  syncPayload,
+  storage,
+  devtools,
+  testing,
+}: {
+  storeId: string
+  clientId: string
+  schema: LiveStoreSchema
+  makeSqliteDb: MakeSqliteDb
+  syncOptions: SyncOptions | undefined
+  storage: WorkerSchema.StorageType
+  syncPayload: Schema.JsonValue | undefined
+  devtools: WorkerSchema.LeaderWorkerInner.InitialMessage['devtools']
+  testing?: {
+    overrides?: TestingOverrides
+  }
+}) =>
+  Effect.gen(function* () {
+    const layer = yield* Layer.build(
+      makeLeaderThread({
+        storeId,
+        clientId,
+        schema,
+        syncOptions,
+        storage,
+        syncPayload,
+        devtools,
+        makeSqliteDb,
+        testing: testing?.overrides,
+      }).pipe(Layer.unwrapScoped),
+    )
+
+    return yield* Effect.gen(function* () {
+      const { dbState, dbEventlog, syncProcessor, extraIncomingMessagesQueue, initialState } = yield* LeaderThreadCtx
+
+      const initialLeaderHead = Eventlog.getClientHeadFromDb(dbEventlog)
+
+      const leaderThread = {
+        events: {
+          pull:
+            testing?.overrides?.clientSession?.leaderThreadProxy?.events?.pull ??
+            (({ cursor }) => syncProcessor.pull({ cursor })),
+          push: (batch) =>
+            syncProcessor.push(
+              batch.map((item) => new LiveStoreEvent.EncodedWithMeta(item)),
+              { waitForProcessing: true },
+            ),
+        },
+        initialState: { leaderHead: initialLeaderHead, migrationsReport: initialState.migrationsReport },
+        export: Effect.sync(() => dbState.export()),
+        getEventlogData: Effect.sync(() => dbEventlog.export()),
+        getSyncState: syncProcessor.syncState,
+        sendDevtoolsMessage: (message) => extraIncomingMessagesQueue.offer(message),
+      } satisfies ClientSessionLeaderThreadProxy
+
+      const initialSnapshot = dbState.export()
+
+      return { leaderThread, initialSnapshot }
+    }).pipe(Effect.provide(layer))
+  })
+
+const makeWorkerLeaderThread = ({
   shutdown,
   storeId,
   clientId,
   sessionId,
   workerUrl,
-  baseDirectory,
-  devtoolsEnabled,
-  devtoolsOptions,
-  schemaPath,
+  storage,
+  devtools,
   bootStatusQueue,
   syncPayload,
+  testing,
 }: {
   shutdown: (cause: Cause.Cause<UnexpectedError | IntentionalShutdownCause>) => void
   storeId: string
   clientId: string
   sessionId: string
   workerUrl: URL
-  baseDirectory: string | undefined
-  devtoolsEnabled: boolean
-  devtoolsOptions: { port: number; host: string }
-  schemaPath: string
+  storage: WorkerSchema.StorageType
+  devtools: WorkerSchema.LeaderWorkerInner.InitialMessage['devtools']
   bootStatusQueue: Queue.Queue<BootStatus>
   syncPayload: Schema.JsonValue | undefined
+  testing?: {
+    overrides?: TestingOverrides
+  }
 }) =>
   Effect.gen(function* () {
     const nodeWorker = new WT.Worker(workerUrl, {
@@ -206,9 +343,8 @@ const makeLeaderThread = ({
         new WorkerSchema.LeaderWorkerInner.InitialMessage({
           storeId,
           clientId,
-          baseDirectory,
-          devtools: { enabled: devtoolsEnabled, port: devtoolsOptions.port, host: devtoolsOptions.host },
-          schemaPath,
+          storage,
+          devtools,
           syncPayload,
         }),
     }).pipe(
@@ -296,8 +432,10 @@ const makeLeaderThread = ({
 
     const leaderThread = {
       events: {
-        pull: ({ cursor }) =>
-          runInWorkerStream(new WorkerSchema.LeaderWorkerInner.PullStream({ cursor })).pipe(Stream.orDie),
+        pull:
+          testing?.overrides?.clientSession?.leaderThreadProxy?.events?.pull ??
+          (({ cursor }) =>
+            runInWorkerStream(new WorkerSchema.LeaderWorkerInner.PullStream({ cursor })).pipe(Stream.orDie)),
         push: (batch) =>
           runInWorker(new WorkerSchema.LeaderWorkerInner.PushToLeader({ batch })).pipe(
             Effect.withSpan('@livestore/adapter-node:client-session:pushToLeader', {

package/src/devtools/devtools-server.ts

@@ -25,6 +25,7 @@ import { makeViteMiddleware } from './vite-dev-server.js'
  */
 export const startDevtoolsServer = ({
   schemaPath,
+  schemaAlias,
   storeId,
   clientId,
   sessionId,
@@ -32,6 +33,7 @@ export const startDevtoolsServer = ({
   host,
 }: {
   schemaPath: string
+  schemaAlias: string
   storeId: string
   clientId: string
   sessionId: string
@@ -106,11 +108,14 @@ export const startDevtoolsServer = ({
     }).pipe(Effect.interruptible)
 
     yield* Effect.logDebug(
-      `[@livestore/adapter-node:devtools] LiveStore devtools are available at http://${host}:${port}/_livestore/node/${storeId}/${clientId}/${sessionId}`,
+      `[@livestore/adapter-node:devtools] LiveStore devtools are available at http://${host}:${port}/_livestore/node/${storeId}/${clientId}/${sessionId}/${schemaAlias}`,
     )
 
     return HttpServer.serve(handler, HttpMiddleware.logger)
   }).pipe(
+    Effect.withSpan('@livestore/adapter-node:startDevtoolsServer', {
+      attributes: { storeId, clientId, sessionId, port, host, schemaPath },
+    }),
     Layer.unwrapScoped,
     // HttpServer.withLogAddress,
     Layer.provide(PlatformNode.NodeHttpServer.layer(() => http.createServer(), { port, host })),

package/src/index.ts

@@ -1,2 +1 @@
-export { makeInMemoryAdapter } from './client-session/in-memory-adapter.js'
-export { makePersistedAdapter } from './client-session/persisted-adapter.js'
+export { makeAdapter, makeWorkerAdapter } from './client-session/adapter.js'

package/src/leader-thread-lazy.ts

@@ -1,3 +1,8 @@
+// NOTE This file isn't currently used but was part of an experiment to see whether we can improve
+// the Node startup time by lazy loading the leader thread bundle.
+// This indeed provided a nice speedup but it takes quite a bit of tooling to set up and comes with
+// other downsides (e.g. treeshaking).
+
 const run = async () => {
   const start = Date.now()
   // @ts-expect-error todo

package/src/leader-thread-shared.ts

@@ -0,0 +1,168 @@
+import inspector from 'node:inspector'
+import path from 'node:path'
+
+if (process.execArgv.includes('--inspect')) {
+  inspector.open()
+  inspector.waitForDebugger()
+}
+
+import type { ClientSessionLeaderThreadProxy, MakeSqliteDb, SqliteDb, SyncOptions } from '@livestore/common'
+import { Devtools, liveStoreStorageFormatVersion, UnexpectedError } from '@livestore/common'
+import type { DevtoolsOptions, LeaderSqliteDb, LeaderThreadCtx } from '@livestore/common/leader-thread'
+import { configureConnection, makeLeaderThreadLayer } from '@livestore/common/leader-thread'
+import type { LiveStoreSchema } from '@livestore/common/schema'
+import { makeNodeDevtoolsChannel } from '@livestore/devtools-node-common/web-channel'
+import type { MakeNodeSqliteDb } from '@livestore/sqlite-wasm/node'
+import type { FileSystem, HttpClient, Layer, Schema, Scope } from '@livestore/utils/effect'
+import { Effect, FetchHttpClient } from '@livestore/utils/effect'
+
+import { makeShutdownChannel } from './shutdown-channel.js'
+import type * as WorkerSchema from './worker-schema.js'
+
+export type TestingOverrides = {
+  clientSession?: {
+    leaderThreadProxy?: Partial<ClientSessionLeaderThreadProxy>
+  }
+  makeLeaderThread?: {
+    dbEventlog?: (makeSqliteDb: MakeSqliteDb) => Effect.Effect<SqliteDb, UnexpectedError>
+  }
+}
+
+export interface MakeLeaderThreadArgs {
+  storeId: string
+  clientId: string
+  syncOptions: SyncOptions | undefined
+  storage: WorkerSchema.StorageType
+  makeSqliteDb: MakeNodeSqliteDb
+  devtools: WorkerSchema.LeaderWorkerInner.InitialMessage['devtools']
+  schema: LiveStoreSchema
+  syncPayload: Schema.JsonValue | undefined
+  testing: TestingOverrides | undefined
+}
+
+export const makeLeaderThread = ({
+  storeId,
+  clientId,
+  syncOptions,
+  makeSqliteDb,
+  storage,
+  devtools,
+  schema,
+  syncPayload,
+  testing,
+}: MakeLeaderThreadArgs): Effect.Effect<
+  Layer.Layer<LeaderThreadCtx, UnexpectedError, Scope.Scope | HttpClient.HttpClient | FileSystem.FileSystem>,
+  UnexpectedError,
+  Scope.Scope
+> =>
+  Effect.gen(function* () {
+    const runtime = yield* Effect.runtime<never>()
+
+    const schemaHashSuffix =
+      schema.state.sqlite.migrations.strategy === 'manual' ? 'fixed' : schema.state.sqlite.hash.toString()
+
+    const makeDb = (kind: 'state' | 'eventlog') => {
+      if (testing?.makeLeaderThread?.dbEventlog && kind === 'eventlog') {
+        return testing.makeLeaderThread.dbEventlog(makeSqliteDb)
+      }
+
+      return storage.type === 'in-memory'
+        ? makeSqliteDb({
+            _tag: 'in-memory',
+            configureDb: (db) =>
+              configureConnection(db, { foreignKeys: true }).pipe(Effect.provide(runtime), Effect.runSync),
+          })
+        : makeSqliteDb({
+            _tag: 'fs',
+            directory: path.join(storage.baseDirectory ?? '', storeId),
+            fileName:
+              kind === 'state' ? getStateDbFileName(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 [dbState, dbEventlog] = yield* Effect.all([makeDb('state'), makeDb('eventlog')], { concurrency: 2 })
+
+    const devtoolsOptions = yield* makeDevtoolsOptions({ devtools, dbState, dbEventlog, storeId, clientId })
+
+    const shutdownChannel = yield* makeShutdownChannel(storeId)
+
+    return makeLeaderThreadLayer({
+      schema,
+      storeId,
+      clientId,
+      makeSqliteDb,
+      syncOptions,
+      dbState,
+      dbEventlog,
+      devtoolsOptions,
+      shutdownChannel,
+      syncPayload,
+    })
+  }).pipe(
+    Effect.tapCauseLogPretty,
+    UnexpectedError.mapToUnexpectedError,
+    Effect.withSpan('@livestore/adapter-node:makeLeaderThread', {
+      attributes: { storeId, clientId, storage, devtools, syncOptions },
+    }),
+  )
+
+const getStateDbFileName = (suffix: string) => `state${suffix}@${liveStoreStorageFormatVersion}.db`
+
+const makeDevtoolsOptions = ({
+  dbState,
+  dbEventlog,
+  storeId,
+  clientId,
+  devtools,
+}: {
+  dbState: LeaderSqliteDb
+  dbEventlog: LeaderSqliteDb
+  storeId: string
+  clientId: string
+  devtools: WorkerSchema.LeaderWorkerInner.InitialMessage['devtools']
+}): Effect.Effect<DevtoolsOptions, UnexpectedError, Scope.Scope> =>
+  Effect.gen(function* () {
+    if (devtools.enabled === false) {
+      return {
+        enabled: false,
+      }
+    }
+
+    return {
+      enabled: true,
+      makeBootContext: Effect.gen(function* () {
+        // Lazy import to improve startup time
+        const { startDevtoolsServer } = yield* Effect.promise(() => import('./devtools/devtools-server.js'))
+
+        // TODO instead of failing when the port is already in use, we should try to use that WS server instead of starting a new one
+        yield* startDevtoolsServer({
+          schemaPath: devtools.schemaPath,
+          schemaAlias: devtools.schemaAlias,
+          storeId,
+          clientId,
+          sessionId: 'static', // TODO make this dynamic
+          port: devtools.port,
+          host: devtools.host,
+        }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
+
+        const devtoolsWebChannel = yield* makeNodeDevtoolsChannel({
+          nodeName: `leader-${storeId}-${clientId}`,
+          target: `devtools-${storeId}-${clientId}-static`,
+          url: `ws://localhost:${devtools.port}`,
+          schema: { listen: Devtools.Leader.MessageToApp, send: Devtools.Leader.MessageFromApp },
+        })
+
+        return {
+          devtoolsWebChannel,
+          persistenceInfo: {
+            state: dbState.metadata.persistenceInfo,
+            eventlog: dbEventlog.metadata.persistenceInfo,
+          },
+        }
+      }).pipe(Effect.provide(FetchHttpClient.layer)),
+    }
+  })