@livestore/common 0.0.0-snapshot-2b8a9de3ec1a701aca891ebc2c98eb328274ae9e → 0.0.0-snapshot-2ef046b02334f52613d31dbe06af53487685edc0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/common",
-  "version": "0.0.0-snapshot-2b8a9de3ec1a701aca891ebc2c98eb328274ae9e",
+  "version": "0.0.0-snapshot-2ef046b02334f52613d31dbe06af53487685edc0",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -54,7 +54,7 @@
     "graphology": "0.26.0-alpha1",
     "graphology-dag": "0.4.1",
     "graphology-types": "0.24.8",
-    "@livestore/utils": "0.0.0-snapshot-2b8a9de3ec1a701aca891ebc2c98eb328274ae9e"
+    "@livestore/utils": "0.0.0-snapshot-2ef046b02334f52613d31dbe06af53487685edc0"
   },
   "devDependencies": {
     "vitest": "^3.0.8"

package/src/adapter-types.ts

@@ -41,8 +41,9 @@ export interface ClientSession {
 export interface ClientSessionLeaderThreadProxy {
   mutations: {
     pull: (args: {
-      cursor: EventId.EventId
-    }) => Stream.Stream<{ payload: PayloadUpstream; remaining: number }, UnexpectedError>
+      /** The merge counter of the leader thread */
+      cursor: number
+    }) => Stream.Stream<{ payload: typeof PayloadUpstream.Type; mergeCounter: number }, UnexpectedError>
     /** It's important that a client session doesn't call `push` concurrently. */
     push(batch: ReadonlyArray<MutationEvent.AnyEncoded>): Effect.Effect<void, UnexpectedError | LeaderAheadError>
   }
@@ -56,7 +57,6 @@ export interface ClientSessionLeaderThreadProxy {
   export: Effect.Effect<Uint8Array, UnexpectedError>
   getMutationLogData: Effect.Effect<Uint8Array, UnexpectedError>
   getSyncState: Effect.Effect<SyncState, UnexpectedError>
-  networkStatus: SubscriptionRef.SubscriptionRef<NetworkStatus>
   /** For debugging purposes it can be useful to manually trigger devtools messages (e.g. to reset the database) */
   sendDevtoolsMessage: (message: Devtools.Leader.MessageToApp) => Effect.Effect<void, UnexpectedError>
 }
@@ -108,15 +108,6 @@ export type PersistenceInfo<With extends {} = {}> = typeof PersistenceInfo.Type
 
 export type ResetMode = 'all-data' | 'only-app-db'
 
-export const NetworkStatus = Schema.Struct({
-  isConnected: Schema.Boolean,
-  timestampMs: Schema.Number,
-  /** Whether the network status devtools latch is closed. Used to simulate network disconnection. */
-  latchClosed: Schema.Boolean,
-})
-
-export type NetworkStatus = typeof NetworkStatus.Type
-
 export const BootStateProgress = Schema.Struct({
   done: Schema.Number,
   total: Schema.Number,

package/src/devtools/devtools-messages-common.ts

@@ -2,6 +2,15 @@ import { Schema } from '@livestore/utils/effect'
 
 import { liveStoreVersion as pkgVersion } from '../version.js'
 
+export const NetworkStatus = Schema.Struct({
+  isConnected: Schema.Boolean,
+  timestampMs: Schema.Number,
+  /** Whether the network status devtools latch is closed. Used to simulate network disconnection. */
+  latchClosed: Schema.Boolean,
+})
+
+export type NetworkStatus = typeof NetworkStatus.Type
+
 export const requestId = Schema.String
 export const clientId = Schema.String
 export const sessionId = Schema.String

package/src/devtools/devtools-messages-leader.ts

@@ -1,10 +1,9 @@
 import { Schema, Transferable } from '@livestore/utils/effect'
 
-import { NetworkStatus } from '../adapter-types.js'
 import { EventId } from '../schema/mod.js'
 import * as MutationEvent from '../schema/MutationEvent.js'
 import * as SyncState from '../sync/syncstate.js'
-import { LeaderReqResMessage, LSDMessage, LSDReqResMessage } from './devtools-messages-common.js'
+import { LeaderReqResMessage, LSDMessage, LSDReqResMessage, NetworkStatus } from './devtools-messages-common.js'
 
 export class ResetAllDataReq extends LSDReqResMessage('LSD.Leader.ResetAllDataReq', {
   mode: Schema.Literal('all-data', 'only-app-db'),