@livestore/adapter-node 0.0.0-snapshot-f6ec49b1a18859aad769f0a0d8edf8bae231ed07 → 0.0.0-snapshot-2ef046b02334f52613d31dbe06af53487685edc0

package/src/make-leader-worker.ts

@@ -8,14 +8,14 @@ if (process.execArgv.includes('--inspect')) {
   inspector.waitForDebugger()
 }
 
-import type { NetworkStatus, SyncOptions } from '@livestore/common'
+import type { SyncOptions } from '@livestore/common'
 import { Devtools, liveStoreStorageFormatVersion, UnexpectedError } from '@livestore/common'
 import type { DevtoolsOptions, LeaderSqliteDb } from '@livestore/common/leader-thread'
 import {
   configureConnection,
-  getClientHeadFromDb,
   LeaderThreadCtx,
   makeLeaderThreadLayer,
+  Mutationlog,
 } from '@livestore/common/leader-thread'
 import type { LiveStoreSchema } from '@livestore/common/schema'
 import { MutationEvent } from '@livestore/common/schema'
@@ -78,9 +78,8 @@ export const makeWorkerEffect = (options: WorkerOptions) => {
       Effect.andThen(LeaderThreadCtx, (_) => Stream.fromQueue(_.bootStatusQueue)).pipe(Stream.unwrap),
     PullStream: ({ cursor }) =>
       Effect.gen(function* () {
-        const { connectedClientSessionPullQueues } = yield* LeaderThreadCtx
-        const pullQueue = yield* connectedClientSessionPullQueues.makeQueue(cursor)
-        return Stream.fromQueue(pullQueue)
+        const { syncProcessor } = yield* LeaderThreadCtx
+        return syncProcessor.pull({ cursor })
       }).pipe(Stream.unwrapScoped),
     Export: () =>
       Effect.andThen(LeaderThreadCtx, (_) => _.dbReadModel.export()).pipe(
@@ -95,20 +94,8 @@ export const makeWorkerEffect = (options: WorkerOptions) => {
     GetLeaderHead: () =>
       Effect.gen(function* () {
         const workerCtx = yield* LeaderThreadCtx
-        return getClientHeadFromDb(workerCtx.dbMutationLog)
+        return Mutationlog.getClientHeadFromDb(workerCtx.dbMutationLog)
       }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('@livestore/adapter-node:worker:GetLeaderHead')),
-    NetworkStatusStream: () =>
-      Effect.gen(function* (_) {
-        const ctx = yield* LeaderThreadCtx
-
-        if (ctx.syncBackend === undefined) {
-          return Stream.make<[NetworkStatus]>({ isConnected: false, timestampMs: Date.now(), latchClosed: false })
-        }
-
-        return ctx.syncBackend.isConnected.changes.pipe(
-          Stream.map((isConnected) => ({ isConnected, timestampMs: Date.now(), latchClosed: false })),
-        )
-      }).pipe(Stream.unwrap),
     GetLeaderSyncState: () =>
       Effect.gen(function* () {
         const workerCtx = yield* LeaderThreadCtx

package/src/worker-schema.ts

@@ -84,11 +84,11 @@ export namespace LeaderWorkerInner {
 
   export class PullStream extends Schema.TaggedRequest<PullStream>()('PullStream', {
     payload: {
-      cursor: EventId.EventId,
+      cursor: Schema.Number,
     },
     success: Schema.Struct({
       payload: SyncState.PayloadUpstream,
-      remaining: Schema.Number,
+      mergeCounter: Schema.Number,
     }),
     failure: UnexpectedError,
   }) {}
@@ -134,15 +134,6 @@ export namespace LeaderWorkerInner {
     failure: UnexpectedError,
   }) {}
 
-  export class NetworkStatusStream extends Schema.TaggedRequest<NetworkStatusStream>()('NetworkStatusStream', {
-    payload: {},
-    success: Schema.Struct({
-      isConnected: Schema.Boolean,
-      timestampMs: Schema.Number,
-    }),
-    failure: UnexpectedError,
-  }) {}
-
   export class Shutdown extends Schema.TaggedRequest<Shutdown>()('Shutdown', {
     payload: {},
     success: Schema.Void,
@@ -167,7 +158,6 @@ export namespace LeaderWorkerInner {
     ExportMutationlog,
     GetLeaderHead,
     GetLeaderSyncState,
-    NetworkStatusStream,
     Shutdown,
     ExtraDevtoolsMessage,
   )