@livestore/adapter-node 0.0.0-snapshot-abe9ae4963ab9d3948906a6642c39bc33295e9f6 → 0.0.0-snapshot-1e670bae5105bde781e82aa2a8ee4f2dfc2446f0

package/dist/worker-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-schema.d.ts","sourceRoot":"","sources":["../src/worker-schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-schema.d.ts","sourceRoot":"","sources":["../src/worker-schema.ts"],"names":[],"mappings":"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"}

package/dist/worker-schema.js

@@ -1,4 +1,4 @@
-import { BootStatus, Devtools, InvalidPushError, MigrationsReport, SyncState, UnexpectedError } from '@livestore/common';
+import { BootStatus, Devtools, LeaderAheadError, MigrationsReport, SyncState, UnexpectedError } from '@livestore/common';
 import { EventId, MutationEvent } from '@livestore/common/schema';
 import { Schema, Transferable } from '@livestore/utils/effect';
 export const WorkerArgv = Schema.parseJson(Schema.Struct({
@@ -74,8 +74,6 @@ export var LeaderWorkerInner;
             cursor: EventId.EventId,
         },
         success: Schema.Struct({
-            // mutationEvents: Schema.Array(EncodedAny),
-            // backendHead: Schema.Number,
             payload: SyncState.PayloadUpstream,
             remaining: Schema.Number,
         }),
@@ -88,7 +86,7 @@ export var LeaderWorkerInner;
             batch: Schema.Array(MutationEvent.AnyEncoded),
         },
         success: Schema.Void,
-        failure: Schema.Union(UnexpectedError, InvalidPushError),
+        failure: Schema.Union(UnexpectedError, LeaderAheadError),
     }) {
     }
     LeaderWorkerInner.PushToLeader = PushToLeader;

package/dist/worker-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-schema.js","sourceRoot":"","sources":["../src/worker-schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-schema.js","sourceRoot":"","sources":["../src/worker-schema.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/adapter-node",
-  "version": "0.0.0-snapshot-abe9ae4963ab9d3948906a6642c39bc33295e9f6",
+  "version": "0.0.0-snapshot-1e670bae5105bde781e82aa2a8ee4f2dfc2446f0",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -26,17 +26,17 @@
     }
   },
   "dependencies": {
-    "@livestore/devtools-vite": "0.3.0-dev.15",
+    "@livestore/devtools-vite": "0.3.0-dev.16",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/otlp-exporter-base": "0.57.2",
     "vite": "6.1.0",
     "ws": "8.18.0",
-    "@livestore/adapter-web": "0.0.0-snapshot-abe9ae4963ab9d3948906a6642c39bc33295e9f6",
-    "@livestore/common": "0.0.0-snapshot-abe9ae4963ab9d3948906a6642c39bc33295e9f6",
-    "@livestore/devtools-node-common": "0.0.0-snapshot-abe9ae4963ab9d3948906a6642c39bc33295e9f6",
-    "@livestore/sqlite-wasm": "0.0.0-snapshot-abe9ae4963ab9d3948906a6642c39bc33295e9f6",
-    "@livestore/utils": "0.0.0-snapshot-abe9ae4963ab9d3948906a6642c39bc33295e9f6",
-    "@livestore/webmesh": "0.0.0-snapshot-abe9ae4963ab9d3948906a6642c39bc33295e9f6"
+    "@livestore/adapter-web": "0.0.0-snapshot-1e670bae5105bde781e82aa2a8ee4f2dfc2446f0",
+    "@livestore/common": "0.0.0-snapshot-1e670bae5105bde781e82aa2a8ee4f2dfc2446f0",
+    "@livestore/devtools-node-common": "0.0.0-snapshot-1e670bae5105bde781e82aa2a8ee4f2dfc2446f0",
+    "@livestore/sqlite-wasm": "0.0.0-snapshot-1e670bae5105bde781e82aa2a8ee4f2dfc2446f0",
+    "@livestore/utils": "0.0.0-snapshot-1e670bae5105bde781e82aa2a8ee4f2dfc2446f0",
+    "@livestore/webmesh": "0.0.0-snapshot-1e670bae5105bde781e82aa2a8ee4f2dfc2446f0"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^28.0.1",

package/src/client-session/index.ts

@@ -10,13 +10,11 @@ import type {
   NetworkStatus,
 } from '@livestore/common'
 import { Devtools, UnexpectedError } from '@livestore/common'
-import type { MutationEvent } 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'
-import type { Cause } from '@livestore/utils/effect'
 import {
-  BucketQueue,
+  Cause,
   Effect,
   Fiber,
   ParseResult,
@@ -28,6 +26,7 @@ import {
 } from '@livestore/utils/effect'
 import { PlatformNode } from '@livestore/utils/node'
 
+import { makeShutdownChannel } from '../shutdown-channel.js'
 import * as WorkerSchema from '../worker-schema.js'
 
 export interface NodeAdapterOptions {
@@ -74,6 +73,17 @@ export const makeNodeAdapter = ({
       //   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,
+      )
+
       const syncInMemoryDb = yield* makeSqliteDb({ _tag: 'in-memory' }).pipe(Effect.orDie)
 
       // TODO actually implement this multi-session support
@@ -141,7 +151,7 @@ const makeLeaderThread = ({
   devtoolsOptions,
   schemaPath,
 }: {
-  shutdown: (cause: Cause.Cause<UnexpectedError | IntentionalShutdownCause>) => Effect.Effect<void>
+  shutdown: (cause: Cause.Cause<UnexpectedError | IntentionalShutdownCause>) => void
   storeId: string
   clientId: string
   sessionId: string
@@ -171,7 +181,7 @@ const makeLeaderThread = ({
     }).pipe(
       Effect.provide(PlatformNode.NodeWorker.layer(() => nodeWorker)),
       UnexpectedError.mapToUnexpectedError,
-      Effect.tapErrorCause(shutdown),
+      Effect.tapErrorCause((cause) => Effect.sync(() => shutdown(cause))),
       Effect.withSpan('@livestore/adapter-node:adapter:setupLeaderThread'),
       Effect.tapCauseLogPretty,
       Effect.forkScoped,
@@ -240,19 +250,6 @@ const makeLeaderThread = ({
       latchClosed: false,
     })
 
-    const pushQueue = yield* BucketQueue.make<MutationEvent.AnyEncoded>()
-
-    yield* Effect.gen(function* () {
-      const batch = yield* BucketQueue.takeBetween(pushQueue, 1, 100)
-      yield* runInWorker(new WorkerSchema.LeaderWorkerInner.PushToLeader({ batch })).pipe(
-        Effect.withSpan('@livestore/adapter-node:client-session:pushToLeader', {
-          attributes: { batchSize: batch.length },
-        }),
-        // We can ignore the error here because the ClientSessionSyncProcessor will retry after rebasing
-        Effect.ignoreLogged,
-      )
-    }).pipe(Effect.forever, Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped)
-
     const bootResult = yield* runInWorker(new WorkerSchema.LeaderWorkerInner.GetRecreateSnapshot()).pipe(
       Effect.timeout(10_000),
       UnexpectedError.mapToUnexpectedError,
@@ -265,10 +262,12 @@ const makeLeaderThread = ({
         pull: runInWorkerStream(new WorkerSchema.LeaderWorkerInner.PullStream({ cursor: initialLeaderHead })).pipe(
           Stream.orDie,
         ),
-        // NOTE instead of sending the worker message right away, we're batching the events in order to
-        // - maintain a consistent order of events
-        // - improve efficiency by reducing the number of messages
-        push: (batch) => BucketQueue.offerAll(pushQueue, batch),
+        push: (batch) =>
+          runInWorker(new WorkerSchema.LeaderWorkerInner.PushToLeader({ batch })).pipe(
+            Effect.withSpan('@livestore/adapter-node:client-session:pushToLeader', {
+              attributes: { batchSize: batch.length },
+            }),
+          ),
       },
       initialState: {
         leaderHead: initialLeaderHead,

package/src/devtools/devtools-server.ts

@@ -2,6 +2,7 @@ import http from 'node:http'
 import path from 'node:path'
 
 import { UnexpectedError } from '@livestore/common'
+import { LS_DEV } from '@livestore/utils'
 import type { Scope } from '@livestore/utils/effect'
 import { Effect } from '@livestore/utils/effect'
 import { makeWebSocketServer } from '@livestore/webmesh/websocket-server'
@@ -27,10 +28,23 @@ export const startDevtoolsServer = ({
   port: number
 }): Effect.Effect<void, UnexpectedError, Scope.Scope> =>
   Effect.gen(function* () {
-    const httpServer = http.createServer()
-    const webSocketServer = yield* makeWebSocketServer({ relayNodeName: 'ws' })
+    const httpServer = yield* Effect.sync(() => http.createServer()).pipe(
+      Effect.acquireRelease((httpServer) =>
+        Effect.async<void, UnexpectedError>((cb) => {
+          httpServer.removeAllListeners()
+          httpServer.closeAllConnections()
+          httpServer.close((err) => {
+            if (err) {
+              cb(Effect.fail(UnexpectedError.make({ cause: err })))
+            } else {
+              cb(Effect.succeed(undefined))
+            }
+          })
+        }).pipe(Effect.orDie),
+      ),
+    )
 
-    yield* Effect.addFinalizer(() => Effect.sync(() => httpServer.close()))
+    const webSocketServer = yield* makeWebSocketServer({ relayNodeName: 'ws' })
 
     // Handle upgrade manually
     httpServer.on('upgrade', (request, socket, head) => {
@@ -45,7 +59,7 @@ export const startDevtoolsServer = ({
           cb(UnexpectedError.make({ cause: err }))
         })
 
-        httpServer.listen(port, () => {
+        httpServer.listen(port, '0.0.0.0', () => {
           cb(Effect.succeed(undefined))
         })
       })
@@ -53,23 +67,21 @@ export const startDevtoolsServer = ({
     yield* startServer(port)
 
     yield* Effect.logDebug(
-      `[@livestore/adapter-node:devtools] LiveStore devtools are available at http://localhost:${port}/livestore-devtools`,
+      `[@livestore/adapter-node:devtools] LiveStore devtools are available at http://localhost:${port}/_livestore`,
     )
 
     const viteServer = yield* makeViteServer({
       mode: { _tag: 'node', storeId, clientId, sessionId, url: `ws://localhost:${port}` },
       schemaPath: path.resolve(process.cwd(), schemaPath),
       viteConfig: (viteConfig) => {
-        viteConfig.server ??= {}
-        viteConfig.server.fs ??= {}
-
-        // TODO move this into the example code
-        // Point to Overtone monorepo root
-        viteConfig.server.fs.allow ??= []
-        viteConfig.server.fs.allow.push(process.env.WORKSPACE_ROOT + '/../..')
+        if (LS_DEV) {
+          viteConfig.server ??= {}
+          viteConfig.server.fs ??= {}
+          viteConfig.server.fs.strict = true
 
-        viteConfig.optimizeDeps ??= {}
-        viteConfig.optimizeDeps.force = true
+          viteConfig.optimizeDeps ??= {}
+          viteConfig.optimizeDeps.force = true
+        }
 
         return viteConfig
       },
@@ -79,9 +91,9 @@ export const startDevtoolsServer = ({
 
     httpServer.on('request', (req, res) => {
       if (req.url === '/' || req.url === '') {
-        res.writeHead(302, { Location: '/livestore-devtools' })
+        res.writeHead(302, { Location: '/_livestore' })
         res.end()
-      } else if (req.url?.startsWith('/livestore-devtools')) {
+      } else if (req.url?.startsWith('/_livestore')) {
         return viteServer.middlewares(req, res as any)
       }
     })

package/src/devtools/mod.ts

@@ -1,2 +1,2 @@
 export { makeViteServer } from './vite-dev-server.js'
-export type { Options } from './types.js'
+export type { ViteDevtoolsOptions } from './vite-dev-server.js'

package/src/devtools/vite-dev-server.ts

@@ -2,15 +2,33 @@ import * as http from 'node:http'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
+import type { Devtools } from '@livestore/common'
 import { UnexpectedError } from '@livestore/common'
+import { livestoreDevtoolsPlugin } from '@livestore/devtools-vite'
 import { Effect } from '@livestore/utils/effect'
 import * as Vite from 'vite'
 
-import type { Options } from './types.js'
+export type ViteDevtoolsOptions = {
+  viteConfig?: (config: Vite.UserConfig) => Vite.UserConfig
+  /**
+   * Path to the file exporting the LiveStore schema as `export const schema = ...`
+   * File path must be relative to the project root and will be imported via Vite.
+   *
+   * Example: `./src/schema.ts`
+   */
+  schemaPath: string
+  /**
+   * The mode of the devtools server.
+   *
+   * @default 'node'
+   */
+  mode: Extract<Devtools.DevtoolsMode, { _tag: 'node' } | { _tag: 'expo' }>
+}
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 
-export const makeViteServer = (options: Options): Effect.Effect<Vite.ViteDevServer, UnexpectedError> =>
+// NOTE this is currently also used in @livestore/devtools-expo
+export const makeViteServer = (options: ViteDevtoolsOptions): Effect.Effect<Vite.ViteDevServer, UnexpectedError> =>
   Effect.gen(function* () {
     const hmrPort = yield* getFreePort
 
@@ -22,15 +40,8 @@ export const makeViteServer = (options: Options): Effect.Effect<Vite.ViteDevServ
         hmr: {
           port: hmrPort,
         },
-        fs: {
-          // Adds `node_modules` so we can import `@livestore/wa-sqlite` for WASM to work
-          allow: [path.resolve(__dirname, '..', '..')],
-        },
-      },
-      resolve: {
-        alias: {
-          '@schema': path.resolve(cwd, options.schemaPath),
-        },
+        // Relaxing fs access for monorepo setup
+        fs: { strict: process.env.LS_DEV ? false : true },
       },
       appType: 'spa',
       optimizeDeps: {
@@ -38,8 +49,14 @@ export const makeViteServer = (options: Options): Effect.Effect<Vite.ViteDevServ
         exclude: ['@livestore/wa-sqlite'],
       },
       root: __dirname,
-      base: '/livestore-devtools/',
-      plugins: [virtualHtmlPlugin(options.mode)],
+      base: '/_livestore/',
+      plugins: [
+        livestoreDevtoolsPlugin({
+          schemaPath: path.resolve(cwd, options.schemaPath),
+          mode: options.mode,
+          path: '/',
+        }),
+      ],
       clearScreen: false,
       logLevel: 'silent',
     })
@@ -53,53 +70,6 @@ export const makeViteServer = (options: Options): Effect.Effect<Vite.ViteDevServ
     return viteServer
   }).pipe(Effect.withSpan('@livestore/adapter-node:devtools:makeViteServer'))
 
-// TODO unify this with `@livestore/devtools-vite/plugin.ts`
-const virtualHtmlPlugin = (mode: Options['mode']): Vite.Plugin => ({
-  name: 'virtual-html',
-  configureServer: (server) => {
-    return () => {
-      server.middlewares.use(async (req, res, next) => {
-        if (req.url === '/' || req.url === '' || req.url === '/index.html') {
-          const html = `
-<!doctype html>
-<html lang="en">
-<head>
-<meta charset="UTF-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-<meta name="livestore-devtools" content="true" />
-<title>LiveStore Devtools</title>
-</head>
-<body>
-<div id="root"></div>
-<script type="module">
-import '@livestore/devtools-react/index.css'
-import { mountDevtools } from '@livestore/devtools-react'
-import sharedWorker from '@livestore/adapter-web/shared-worker?sharedworker'
-import { schema } from '@schema'
-
-mountDevtools({
-  schema,
-  rootEl: document.getElementById('root'),
-  sharedWorker,
-  mode: ${JSON.stringify(mode)},
-  license: ${JSON.stringify(process.env.LSD_LICENSE)},
-})
-</script>
-</body>
-</html>
-          `
-          const transformedHtml = await server.transformIndexHtml(req.url, html)
-          res.statusCode = 200
-          res.setHeader('Content-Type', 'text/html')
-          res.end(transformedHtml)
-        } else {
-          next()
-        }
-      })
-    }
-  },
-})
-
 export const getFreePort = Effect.async<number, UnexpectedError>((cb) => {
   const server = http.createServer()
 

package/src/in-memory/index.ts

@@ -12,9 +12,11 @@ import type { LiveStoreSchema } from '@livestore/common/schema'
 import { MutationEvent } from '@livestore/common/schema'
 import { sqliteDbFactory } from '@livestore/sqlite-wasm/browser'
 import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm'
-import { Effect, FetchHttpClient, Layer, Stream, SubscriptionRef, WebChannel } from '@livestore/utils/effect'
+import { Cause, Effect, FetchHttpClient, Layer, Stream, SubscriptionRef } from '@livestore/utils/effect'
 import { nanoid } from '@livestore/utils/nanoid'
 
+import { makeShutdownChannel } from '../shutdown-channel.js'
+
 // TODO unify in-memory adapter with other in-memory adapter implementations
 
 export interface InMemoryAdapterOptions {
@@ -31,6 +33,7 @@ export const makeInMemoryAdapter =
   ({
     schema,
     storeId,
+    shutdown,
     // devtoolsEnabled, bootStatusQueue, shutdown, connectDevtoolsToStore
   }) =>
     Effect.gen(function* () {
@@ -43,6 +46,17 @@ export const makeInMemoryAdapter =
 
       const sessionId = nanoid(6)
 
+      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 { leaderThread, initialSnapshot } = yield* makeLeaderThread({
         storeId,
         clientId,
@@ -60,7 +74,7 @@ export const makeInMemoryAdapter =
         sessionId,
         lockStatus,
         leaderThread,
-        shutdown: () => Effect.dieMessage('TODO implement shutdown'),
+        shutdown,
       } satisfies ClientSession
 
       return clientSession
@@ -88,7 +102,8 @@ const makeLeaderThread = ({
         devtoolsOptions: { enabled: false },
         makeSqliteDb,
         schema,
-        shutdownChannel: yield* WebChannel.noopChannel<any, any>(),
+        // NOTE we're creating a separate channel here since you can't listen to your own channel messages
+        shutdownChannel: yield* makeShutdownChannel(storeId),
         storeId,
         syncOptions,
       }).pipe(Layer.provideMerge(FetchHttpClient.layer)),
@@ -112,7 +127,10 @@ const makeLeaderThread = ({
           pull: Stream.fromQueue(pullQueue),
           push: (batch) =>
             syncProcessor
-              .push(batch.map((item) => new MutationEvent.EncodedWithMeta(item)))
+              .push(
+                batch.map((item) => new MutationEvent.EncodedWithMeta(item)),
+                { waitForProcessing: true },
+              )
               .pipe(Effect.provide(layer), Effect.scoped),
         },
         initialState: { leaderHead: initialLeaderHead, migrationsReport: initialState.migrationsReport },

package/src/make-leader-worker.ts

@@ -68,7 +68,11 @@ export const makeWorkerEffect = (options: WorkerOptions) => {
     InitialMessage: (args) => makeLeaderThread({ ...args, syncOptions: options.sync }),
     PushToLeader: ({ batch }) =>
       Effect.andThen(LeaderThreadCtx, (_) =>
-        _.syncProcessor.push(batch.map((item) => new MutationEvent.EncodedWithMeta(item))),
+        _.syncProcessor.push(
+          batch.map((item) => new MutationEvent.EncodedWithMeta(item)),
+          // We'll wait in order to keep back pressure on the client session
+          { waitForProcessing: true },
+        ),
       ).pipe(Effect.uninterruptible, Effect.withSpan('@livestore/adapter-node:worker:PushToLeader')),
     BootStatusStream: () =>
       Effect.andThen(LeaderThreadCtx, (_) => Stream.fromQueue(_.bootStatusQueue)).pipe(Stream.unwrap),
@@ -149,10 +153,13 @@ export const makeWorkerEffect = (options: WorkerOptions) => {
       ),
   }).pipe(
     Layer.provide(PlatformNode.NodeWorkerRunner.layer),
-    Layer.launch,
+    WorkerRunner.launch,
     Effect.scoped,
     Effect.tapCauseLogPretty,
-    Effect.annotateLogs({ thread: options.otelOptions?.serviceName ?? 'livestore-node-leader-thread' }),
+    Effect.annotateLogs({
+      thread: options.otelOptions?.serviceName ?? 'livestore-node-leader-thread',
+      processId: process.pid,
+    }),
     Effect.provide(Logger.prettyWithThread(options.otelOptions?.serviceName ?? 'livestore-node-leader-thread')),
     Effect.provide(FetchHttpClient.layer),
     Effect.provide(PlatformNode.NodeFileSystem.layer),

package/src/webchannel.ts

@@ -28,14 +28,17 @@ export const makeBroadcastChannel = <Msg, MsgEncoded>({
       // )
 
       const listen = Stream.asyncPush<Either.Either<Msg, ParseResult.ParseError>>((emit) =>
-        Effect.gen(function* () {
-          // eslint-disable-next-line unicorn/prefer-add-event-listener
-          channel.onmessage = (event: any) => {
-            return emit.single(Schema.decodeEither(schema)(event.data))
-          }
-
-          return () => channel.unref()
-        }),
+        Effect.acquireRelease(
+          Effect.gen(function* () {
+            // eslint-disable-next-line unicorn/prefer-add-event-listener
+            channel.onmessage = (event: any) => {
+              return emit.single(Schema.decodeEither(schema)(event.data))
+            }
+
+            return channel
+          }),
+          (channel) => Effect.sync(() => channel.unref()),
+        ),
       )
 
       const closedDeferred = yield* Deferred.make<void>().pipe(Effect.acquireRelease(Deferred.done(Exit.void)))

package/src/worker-schema.ts

@@ -1,4 +1,4 @@
-import { BootStatus, Devtools, InvalidPushError, MigrationsReport, SyncState, UnexpectedError } from '@livestore/common'
+import { BootStatus, Devtools, LeaderAheadError, MigrationsReport, SyncState, UnexpectedError } from '@livestore/common'
 import { EventId, MutationEvent } from '@livestore/common/schema'
 import { Schema, Transferable } from '@livestore/utils/effect'
 
@@ -85,8 +85,6 @@ export namespace LeaderWorkerInner {
       cursor: EventId.EventId,
     },
     success: Schema.Struct({
-      // mutationEvents: Schema.Array(EncodedAny),
-      // backendHead: Schema.Number,
       payload: SyncState.PayloadUpstream,
       remaining: Schema.Number,
     }),
@@ -98,7 +96,7 @@ export namespace LeaderWorkerInner {
       batch: Schema.Array(MutationEvent.AnyEncoded),
     },
     success: Schema.Void,
-    failure: Schema.Union(UnexpectedError, InvalidPushError),
+    failure: Schema.Union(UnexpectedError, LeaderAheadError),
   }) {}
 
   export class Export extends Schema.TaggedRequest<Export>()('Export', {

package/src/devtools/types.d.ts

@@ -1,33 +0,0 @@
-import type * as http from 'node:http'
-
-import type * as Vite from 'vite'
-
-export type Middleware = (req: http.IncomingMessage, res: http.ServerResponse, next: () => void) => void
-
-export type Options = {
-  viteConfig?: (config: Vite.UserConfig) => Vite.UserConfig
-  /**
-   * Path to the file exporting the LiveStore schema as `export const schema = ...`
-   * File path must be relative to the project root and will be imported via Vite.
-   *
-   * Example: `./src/schema.ts`
-   */
-  schemaPath: string
-  // TODO consolidate with `Mode` in `@livestore/devtools-react/devtools-api.ts`
-  /**
-   * The mode of the devtools server.
-   *
-   * @default 'node'
-   */
-  mode:
-    | {
-        _tag: 'node'
-        storeId: string
-        clientId: string
-        sessionId: string
-        url: string
-      }
-    | {
-        _tag: 'expo'
-      }
-}