@livestore/livestore 0.3.0-dev.4 → 0.3.0-dev.5

package/src/row-query-utils.ts

@@ -61,6 +61,5 @@ export const makeExecBeforeFirstRun =
 
       // NOTE It's important that we only mutate and don't refresh here, as this function is called during a render
       store.mutate({ otelContext, skipRefresh: true }, table.insert({ id, ...insertValues }))
-      // store.mutateWithoutRefresh(table.insert({ id, ...insertValues }), { otelContext, coordinatorMode: 'default' })
     }
   }

package/src/store/create-store.ts

@@ -140,9 +140,13 @@ export const createStore = <
 
       const shutdown = (cause: Cause.Cause<UnexpectedError | IntentionalShutdownCause>) =>
         Scope.close(lifetimeScope, Exit.failCause(cause)).pipe(
+          Effect.logWarnIfTakesLongerThan({ label: '@livestore/livestore:shutdown', duration: 500 }),
+          Effect.timeout(1000),
+          Effect.catchTag('TimeoutException', () =>
+            Effect.logError('@livestore/livestore:shutdown: Timed out after 1 second'),
+          ),
           Effect.tap(() => (shutdownDeferred ? Deferred.failCause(shutdownDeferred, cause) : Effect.void)),
           Effect.tap(() => Effect.logDebug('LiveStore shutdown complete')),
-          Effect.logWarnIfTakesLongerThan({ label: '@livestore/livestore:shutdown', duration: 500 }),
           Effect.withSpan('livestore:shutdown'),
         )
 

package/src/store/devtools.ts

@@ -38,12 +38,12 @@ export const connectDevtoolsToStore = ({
   store: IStore
 }) =>
   Effect.gen(function* () {
-    const appHostId = store.clientSession.coordinator.devtools.appHostId
-
     const reactivityGraphSubcriptions: SubMap = new Map()
     const liveQueriesSubscriptions: SubMap = new Map()
     const debugInfoHistorySubscriptions: SubMap = new Map()
 
+    const { clientId, sessionId } = store.clientSession
+
     yield* Effect.addFinalizer(() =>
       Effect.sync(() => {
         reactivityGraphSubcriptions.forEach((unsub) => unsub())
@@ -58,13 +58,13 @@ export const connectDevtoolsToStore = ({
     const onMessage = (decodedMessage: typeof Devtools.MessageToAppClientSession.Type) => {
       // console.debug('@livestore/livestore:store:devtools:onMessage', decodedMessage)
 
-      if (decodedMessage.appHostId !== store.clientSession.coordinator.devtools.appHostId) {
+      if (decodedMessage.clientId !== clientId || decodedMessage.sessionId !== sessionId) {
         // console.log(`Unknown message`, event)
         return
       }
 
       if (decodedMessage._tag === 'LSD.Disconnect') {
-        console.error('TODO handle disconnect properly in store')
+        // console.error('TODO handle disconnect properly in store')
         return
       }
 
@@ -85,7 +85,8 @@ export const connectDevtoolsToStore = ({
                   Devtools.ReactivityGraphRes.make({
                     reactivityGraph: store.reactivityGraph.getSnapshot({ includeResults }),
                     requestId,
-                    appHostId,
+                    clientId,
+                    sessionId,
                     liveStoreVersion,
                   }),
                 ),
@@ -108,7 +109,8 @@ export const connectDevtoolsToStore = ({
             Devtools.DebugInfoRes.make({
               debugInfo: store.syncDbWrapper.debugInfo,
               requestId,
-              appHostId,
+              clientId,
+              sessionId,
               liveStoreVersion,
             }),
           )
@@ -133,7 +135,8 @@ export const connectDevtoolsToStore = ({
                 Devtools.DebugInfoHistoryRes.make({
                   debugInfoHistory: buffer,
                   requestId,
-                  appHostId,
+                  clientId,
+                  sessionId,
                   liveStoreVersion,
                 }),
               )
@@ -168,13 +171,13 @@ export const connectDevtoolsToStore = ({
         }
         case 'LSD.DebugInfoResetReq': {
           store.syncDbWrapper.debugInfo.slowQueries.clear()
-          sendToDevtools(Devtools.DebugInfoResetRes.make({ requestId, appHostId, liveStoreVersion }))
+          sendToDevtools(Devtools.DebugInfoResetRes.make({ requestId, clientId, sessionId, liveStoreVersion }))
           break
         }
         case 'LSD.DebugInfoRerunQueryReq': {
           const { queryStr, bindValues, queriedTables } = decodedMessage
           store.syncDbWrapper.select(queryStr, { bindValues, queriedTables, skipCache: true })
-          sendToDevtools(Devtools.DebugInfoRerunQueryRes.make({ requestId, appHostId, liveStoreVersion }))
+          sendToDevtools(Devtools.DebugInfoRerunQueryRes.make({ requestId, clientId, sessionId, liveStoreVersion }))
           break
         }
         case 'LSD.ReactivityGraphUnsubscribe': {
@@ -203,7 +206,8 @@ export const connectDevtoolsToStore = ({
                     })),
                     requestId,
                     liveStoreVersion,
-                    appHostId,
+                    clientId,
+                    sessionId,
                   }),
                 ),
               { timeout: 500 },

package/src/store/store-types.ts

@@ -75,7 +75,7 @@ export type RefreshReason =
   | {
       _tag: 'mutate'
       /** The mutations that were applied */
-      mutations: ReadonlyArray<MutationEvent.Any | MutationEvent.PartialAny>
+      mutations: ReadonlyArray<MutationEvent.AnyDecoded | MutationEvent.PartialAny>
 
       /** The tables that were written to by the event */
       writeTables: ReadonlyArray<string>

package/src/store/store.ts

@@ -7,10 +7,12 @@ import type {
   UnexpectedError,
 } from '@livestore/common'
 import {
+  Devtools,
   getExecArgsFromMutation,
   getResultSchema,
   IntentionalShutdownCause,
   isQueryBuilder,
+  liveStoreVersion,
   makeClientSessionSyncProcessor,
   prepareBindValues,
   QueryBuilderAstSymbol,
@@ -26,6 +28,7 @@ import {
 import { assertNever, isDevEnv } from '@livestore/utils'
 import type { Scope } from '@livestore/utils/effect'
 import { Cause, Data, Effect, Inspectable, MutableHashMap, Runtime, Schema } from '@livestore/utils/effect'
+import { nanoid } from '@livestore/utils/nanoid'
 import * as otel from '@opentelemetry/api'
 import { type GraphQLSchema } from 'graphql'
 
@@ -101,15 +104,15 @@ export class Store<
 
     this.syncProcessor = makeClientSessionSyncProcessor({
       schema,
-      initialLeaderHead: clientSession.coordinator.mutations.initialMutationEventId,
+      initialLeaderHead: clientSession.leaderThread.mutations.initialMutationEventId,
       // rebaseBehaviour: 'auto-rebase',
       pushToLeader: (batch) =>
-        clientSession.coordinator.mutations.push(batch).pipe(
+        clientSession.leaderThread.mutations.push(batch).pipe(
           // NOTE we don't want to shutdown in case of an invalid push error, since it will be retried
           Effect.catchTag('InvalidPushError', Effect.ignoreLogged),
           this.runEffectFork,
         ),
-      pullFromLeader: clientSession.coordinator.mutations.pull,
+      pullFromLeader: clientSession.leaderThread.mutations.pull,
       applyMutation: (mutationEventDecoded, { otelContext, withChangeset }) => {
         const mutationDef = schema.mutations.get(mutationEventDecoded.mutation)!
         const execArgsArr = getExecArgsFromMutation({ mutationDef, mutationEventDecoded })
@@ -204,11 +207,7 @@ export class Store<
 
     if (graphQLOptions) {
       this.graphQLSchema = graphQLOptions.schema
-      this.graphQLContext = graphQLOptions.makeContext(
-        this.syncDbWrapper,
-        this.otel.tracer,
-        clientSession.coordinator.sessionId,
-      )
+      this.graphQLContext = graphQLOptions.makeContext(this.syncDbWrapper, this.otel.tracer, clientSession.sessionId)
     }
 
     Effect.gen(this, function* () {
@@ -248,7 +247,7 @@ export class Store<
   }
 
   get sessionId(): string {
-    return this.clientSession.coordinator.sessionId
+    return this.clientSession.sessionId
   }
 
   /**
@@ -363,7 +362,7 @@ export class Store<
     const { mutationsEvents, options } = this.getMutateArgs(firstMutationOrTxnFnOrOptions, restMutations)
 
     for (const mutationEvent of mutationsEvents) {
-      replaceSessionIdSymbol(mutationEvent.args, this.clientSession.coordinator.sessionId)
+      replaceSessionIdSymbol(mutationEvent.args, this.clientSession.sessionId)
     }
 
     if (mutationsEvents.length === 0) return
@@ -400,7 +399,7 @@ export class Store<
                 const applyMutations = () => this.syncProcessor.push(mutationsEvents, { otelContext })
 
                 if (mutationsEvents.length > 1) {
-                  // TODO: what to do about coordinator transaction here?
+                  // TODO: what to do about leader transaction here?
                   return this.syncDbWrapper.txn(applyMutations)
                 } else {
                   return applyMutations()
@@ -464,79 +463,6 @@ export class Store<
     )
   }
 
-  // #region mutateWithoutRefresh
-  /**
-   * Apply a mutation to the store.
-   * Returns the tables that were affected by the event.
-   * This is an internal method that doesn't trigger a refresh;
-   * the caller must refresh queries after calling this method.
-   */
-  // private mutateWithoutRefresh = (
-  //   mutationEventDecoded: MutationEvent.ForSchema<TSchema> | MutationEvent.PartialForSchema<TSchema>,
-  //   options: {
-  //     otelContext: otel.Context
-  //   },
-  // ): { writeTables: ReadonlySet<string>; durationMs: number } => {
-  //   // const mutationDef =
-  //   //   this.schema.mutations.get(mutationEventDecoded.mutation) ??
-  //   //   shouldNeverHappen(`Unknown mutation type: ${mutationEventDecoded.mutation}`)
-
-  //   // // const mutationEventDecoded: MutationEvent.ForSchema<TSchema> = isPartialMutationEvent(mutationEventDecoded_)
-  //   // //   ? { ...mutationEventDecoded_, ...nextMutationEventId() }
-  //   // //   : mutationEventDecoded_
-
-  //   // // NOTE we also need this temporary workaround here since some code-paths use `mutateWithoutRefresh` directly
-  //   // // e.g. the row-query functionality
-  //   // if (Predicate.hasProperty(mutationEventDecoded, 'id')) {
-  //   //   if (MutableHashMap.has(this.unsyncedMutationEvents, Data.struct(mutationEventDecoded.id))) {
-  //   //     // NOTE this data should never be used
-  //   //     return { writeTables: new Set(), durationMs: 0 }
-  //   //   } else {
-  //   //     MutableHashMap.set(this.unsyncedMutationEvents, Data.struct(mutationEventDecoded.id), mutationEventDecoded)
-  //   //   }
-  //   // }
-
-  //   const { otelContext } = options
-
-  //   return this.otel.tracer.startActiveSpan(
-  //     'LiveStore:mutateWithoutRefresh',
-  //     {
-  //       attributes: {
-  //         'livestore.mutation': mutationEventDecoded.mutation,
-  //         // TODO(performance) add flag to disable this
-  //         'livestore.args': JSON.stringify(mutationEventDecoded.args, null, 2),
-  //       },
-  //     },
-  //     otelContext,
-  //     (span) => {
-  //       const otelContext = otel.trace.setSpan(otel.context.active(), span)
-
-  //       const allWriteTables = new Set<string>()
-  //       let durationMsTotal = 0
-
-  //       replaceSessionIdSymbol(mutationEventDecoded.args, this.clientSession.coordinator.sessionId)
-
-  //       const execArgsArr = getExecArgsFromMutation({ mutationDef, mutationEventDecoded })
-
-  //       for (const {
-  //         statementSql,
-  //         bindValues,
-  //         writeTables = this.syncDbWrapper.getTablesUsed(statementSql),
-  //       } of execArgsArr) {
-  //         const { durationMs } = this.syncDbWrapper.execute(statementSql, bindValues, writeTables, { otelContext })
-
-  //         durationMsTotal += durationMs
-  //         writeTables.forEach((table) => allWriteTables.add(table))
-  //       }
-
-  //       span.end()
-
-  //       return { writeTables: allWriteTables, durationMs: durationMsTotal }
-  //     },
-  //   )
-  // }
-  // #endregion mutateWithoutRefresh
-
   private makeTableRef = (tableName: string) =>
     this.reactivityGraph.makeRef(null, {
       equal: () => false,
@@ -546,21 +472,23 @@ export class Store<
 
   __devDownloadDb = (source: 'local' | 'leader' = 'local') => {
     Effect.gen(this, function* () {
-      const data = source === 'local' ? this.syncDbWrapper.export() : yield* this.clientSession.coordinator.export
+      const data = source === 'local' ? this.syncDbWrapper.export() : yield* this.clientSession.leaderThread.export
       downloadBlob(data, `livestore-${Date.now()}.db`)
     }).pipe(this.runEffectFork)
   }
 
   __devDownloadMutationLogDb = () => {
     Effect.gen(this, function* () {
-      const data = yield* this.clientSession.coordinator.getMutationLogData
+      const data = yield* this.clientSession.leaderThread.getMutationLogData
       downloadBlob(data, `livestore-mutationlog-${Date.now()}.db`)
     }).pipe(this.runEffectFork)
   }
 
-  __devHardReset = () => {
+  __devHardReset = (mode: 'all-data' | 'only-app-db' = 'all-data') => {
     Effect.gen(this, function* () {
-      console.warn(`Not yet implemented`)
+      yield* this.clientSession.leaderThread.sendDevtoolsMessage(
+        Devtools.ResetAllDataReq.make({ liveStoreVersion, mode, requestId: nanoid() }),
+      )
     }).pipe(this.runEffectFork)
   }
 
@@ -568,13 +496,13 @@ export class Store<
     Effect.gen(this, function* () {
       const session = this.syncProcessor.syncStateRef.current
       console.log('Session sync state:', session)
-      const leader = yield* this.clientSession.coordinator.getLeaderSyncState
+      const leader = yield* this.clientSession.leaderThread.getSyncState
       console.log('Leader sync state:', leader)
     }).pipe(this.runEffectFork)
   }
 
   __devShutdown = (cause?: Cause.Cause<UnexpectedError>) => {
-    this.clientSession.coordinator
+    this.clientSession
       .shutdown(cause ?? Cause.fail(IntentionalShutdownCause.make({ reason: 'manual' })))
       .pipe(Effect.tapCauseLogPretty, Effect.provide(this.runtime), Effect.runFork)
   }