@livestore/adapter-node 0.3.0-dev.16 → 0.3.0-dev.18

package/src/devtools/devtools-server.ts

@@ -28,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) => {
@@ -46,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))
         })
       })
@@ -54,7 +67,7 @@ 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({

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', {