@livestore/livestore 0.0.0-snapshot-abe9ae4963ab9d3948906a6642c39bc33295e9f6 → 0.0.0-snapshot-484c9684bac8056d764aa460fd025c45f5856aa5

package/src/SqliteDbWrapper.ts

@@ -9,7 +9,7 @@ import type {
   SqliteDbChangeset,
   SqliteDbSession,
 } from '@livestore/common'
-import { BoundArray, BoundMap, sql } from '@livestore/common'
+import { BoundArray, BoundMap, sql, SqliteError } from '@livestore/common'
 import { isDevEnv } from '@livestore/utils'
 import type * as otel from '@opentelemetry/api'
 
@@ -163,39 +163,45 @@ export class SqliteDbWrapper implements SqliteDb {
       { attributes: { 'sql.query': queryStr } },
       options?.otelContext ?? this.otelRootSpanContext,
       (span) => {
-        let stmt = this.cachedStmts.get(queryStr)
-        if (stmt === undefined) {
-          stmt = this.db.prepare(queryStr)
-          this.cachedStmts.set(queryStr, stmt)
-        }
+        try {
+          let stmt = this.cachedStmts.get(queryStr)
+          if (stmt === undefined) {
+            stmt = this.db.prepare(queryStr)
+            this.cachedStmts.set(queryStr, stmt)
+          }
 
-        stmt.execute(bindValues)
+          stmt.execute(bindValues)
 
-        if (options?.hasNoEffects !== true && !this.resultCache.ignoreQuery(queryStr)) {
-          // TODO use write tables instead
-          // check what queries actually end up here.
-          this.resultCache.invalidate(options?.writeTables ?? this.getTablesUsed(queryStr))
-        }
+          if (options?.hasNoEffects !== true && !this.resultCache.ignoreQuery(queryStr)) {
+            // TODO use write tables instead
+            // check what queries actually end up here.
+            this.resultCache.invalidate(options?.writeTables ?? this.getTablesUsed(queryStr))
+          }
 
-        span.end()
+          span.end()
+
+          const durationMs = getDurationMsFromSpan(span)
 
-        const durationMs = getDurationMsFromSpan(span)
+          this.debugInfo.queryFrameDuration += durationMs
+          this.debugInfo.queryFrameCount++
 
-        this.debugInfo.queryFrameDuration += durationMs
-        this.debugInfo.queryFrameCount++
+          if (durationMs > 5 && isDevEnv()) {
+            this.debugInfo.slowQueries.push({
+              queryStr,
+              bindValues,
+              durationMs,
+              rowsCount: undefined,
+              queriedTables: new Set(),
+              startTimePerfNow: getStartTimeHighResFromSpan(span),
+            })
+          }
 
-        if (durationMs > 5 && isDevEnv()) {
-          this.debugInfo.slowQueries.push({
-            queryStr,
-            bindValues,
-            durationMs,
-            rowsCount: undefined,
-            queriedTables: new Set(),
-            startTimePerfNow: getStartTimeHighResFromSpan(span),
-          })
+          return { durationMs }
+        } catch (cause: any) {
+          span.recordException(cause)
+          span.end()
+          throw new SqliteError({ cause, query: { bindValues: bindValues ?? {}, sql: queryStr } })
         }
-
-        return { durationMs }
       },
     )
   }

package/src/live-queries/__snapshots__/db-query.test.ts.snap

@@ -20,6 +20,14 @@ exports[`otel > otel 3`] = `
     ",
       },
     },
+    {
+      "_name": "client-session-sync-processor:pull",
+      "attributes": {
+        "code.stacktrace": "<STACKTRACE>",
+        "span.label": "⚠︎ Interrupted",
+        "status.interrupted": true,
+      },
+    },
     {
       "_name": "LiveStore:sync",
     },
@@ -280,6 +288,14 @@ exports[`otel > with thunks 7`] = `
     ",
       },
     },
+    {
+      "_name": "client-session-sync-processor:pull",
+      "attributes": {
+        "code.stacktrace": "<STACKTRACE>",
+        "span.label": "⚠︎ Interrupted",
+        "status.interrupted": true,
+      },
+    },
     {
       "_name": "LiveStore:sync",
     },
@@ -374,6 +390,14 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
     ",
       },
     },
+    {
+      "_name": "client-session-sync-processor:pull",
+      "attributes": {
+        "code.stacktrace": "<STACKTRACE>",
+        "span.label": "⚠︎ Interrupted",
+        "status.interrupted": true,
+      },
+    },
     {
       "_name": "LiveStore:sync",
     },

package/src/live-queries/db-query.test.ts

@@ -1,4 +1,4 @@
-import { Effect, Schema } from '@livestore/utils/effect'
+import { Effect, ReadonlyRecord, Schema } from '@livestore/utils/effect'
 import { Vitest } from '@livestore/utils/node-vitest'
 import * as otel from '@opentelemetry/api'
 import { BasicTracerProvider, InMemorySpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'
@@ -19,6 +19,15 @@ TODO write tests for:
 Vitest.describe('otel', () => {
   let cachedProvider: BasicTracerProvider | undefined
 
+  const mapAttributes = (attributes: otel.Attributes) => {
+    return ReadonlyRecord.map(attributes, (val, key) => {
+      if (key === 'code.stacktrace') {
+        return '<STACKTRACE>'
+      }
+      return val
+    })
+  }
+
   const makeQuery = Effect.gen(function* () {
     const exporter = new InMemorySpanExporter()
 
@@ -74,7 +83,7 @@ Vitest.describe('otel', () => {
       return { exporter }
     }).pipe(
       Effect.scoped,
-      Effect.tap(({ exporter }) => expect(getSimplifiedRootSpan(exporter)).toMatchSnapshot()),
+      Effect.tap(({ exporter }) => expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot()),
     ),
   )
 
@@ -124,7 +133,7 @@ Vitest.describe('otel', () => {
       return { exporter }
     }).pipe(
       Effect.scoped,
-      Effect.tap(({ exporter }) => expect(getSimplifiedRootSpan(exporter)).toMatchSnapshot()),
+      Effect.tap(({ exporter }) => expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot()),
     ),
   )
 
@@ -160,7 +169,7 @@ Vitest.describe('otel', () => {
       return { exporter }
     }).pipe(
       Effect.scoped,
-      Effect.tap(({ exporter }) => expect(getSimplifiedRootSpan(exporter)).toMatchSnapshot()),
+      Effect.tap(({ exporter }) => expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot()),
     ),
   )
 })

package/src/store/create-store.ts

@@ -33,6 +33,10 @@ import { connectDevtoolsToStore } from './devtools.js'
 import { Store } from './store.js'
 import type { BaseGraphQLContext, GraphQLOptions, OtelOptions, ShutdownDeferred } from './store-types.js'
 
+export const DEFAULT_PARAMS = {
+  leaderPushBatchSize: 1,
+}
+
 export interface CreateStoreOptions<TGraphQLContext extends BaseGraphQLContext, TSchema extends LiveStoreSchema> {
   schema: TSchema
   adapter: Adapter
@@ -49,6 +53,9 @@ export interface CreateStoreOptions<TGraphQLContext extends BaseGraphQLContext,
   disableDevtools?: boolean
   onBootStatus?: (status: BootStatus) => void
   shutdownDeferred?: ShutdownDeferred
+  params?: {
+    leaderPushBatchSize?: number
+  }
   debug?: {
     instanceId?: string
   }
@@ -102,6 +109,7 @@ export const createStore = <
   disableDevtools,
   onBootStatus,
   shutdownDeferred,
+  params,
   debug,
 }: CreateStoreOptions<TGraphQLContext, TSchema>): Effect.Effect<
   Store<TGraphQLContext, TSchema>,
@@ -142,17 +150,30 @@ export const createStore = <
 
       const runtime = yield* Effect.runtime<Scope.Scope>()
 
-      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.withSpan('livestore:shutdown'),
+      const shutdown = (cause: Cause.Cause<UnexpectedError | IntentionalShutdownCause>) => {
+        Effect.gen(function* () {
+          yield* 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'),
+            ),
+          )
+
+          if (shutdownDeferred) {
+            yield* Deferred.failCause(shutdownDeferred, cause)
+          }
+
+          yield* Effect.logDebug('LiveStore shutdown complete')
+        }).pipe(
+          Effect.withSpan('@livestore/livestore:shutdown'),
+          Effect.provide(runtime),
+          Effect.tapCauseLogPretty,
+          // Given that the shutdown flow might also interrupt the effect that is calling the shutdown,
+          // we want to detach the shutdown effect so it's not interrupted by itself
+          Effect.runFork,
         )
+      }
 
       const clientSession: ClientSession = yield* adapter({
         schema,
@@ -167,9 +188,10 @@ export const createStore = <
       if (LS_DEV && clientSession.leaderThread.initialState.migrationsReport.migrations.length > 0) {
         yield* Effect.logDebug(
           '[@livestore/livestore:createStore] migrationsReport',
-          ...clientSession.leaderThread.initialState.migrationsReport.migrations.map(
-            (m) =>
-              `Schema hash mismatch for table '${m.tableName}' (DB: ${m.hashes.actual}, expected: ${m.hashes.expected}), migrating table...`,
+          ...clientSession.leaderThread.initialState.migrationsReport.migrations.map((m) =>
+            m.hashes.actual === undefined
+              ? `Table '${m.tableName}' doesn't exist yet. Creating table...`
+              : `Schema hash mismatch for table '${m.tableName}' (DB: ${m.hashes.actual}, expected: ${m.hashes.expected}), migrating table...`,
           ),
         )
       }
@@ -190,6 +212,9 @@ export const createStore = <
         // but only set the provided `batchUpdates` function after boot
         batchUpdates: (run) => run(),
         storeId,
+        params: {
+          leaderPushBatchSize: params?.leaderPushBatchSize ?? DEFAULT_PARAMS.leaderPushBatchSize,
+        },
       })
 
       // Starts background fibers (syncing, mutation processing, etc) for store

package/src/store/store-types.ts

@@ -66,6 +66,9 @@ export type StoreOptions<
   batchUpdates: (runUpdates: () => void) => void
   // TODO validate whether we still need this
   unsyncedMutationEvents: MutableHashMap.MutableHashMap<EventId.EventId, MutationEvent.ForSchema<TSchema>>
+  params: {
+    leaderPushBatchSize: number
+  }
 }
 
 export type RefreshReason =

package/src/store/store.ts

@@ -113,6 +113,7 @@ export class Store<
     storeId,
     lifetimeScope,
     runtime,
+    params,
   }: StoreOptions<TGraphQLContext, TSchema>) {
     super()
 
@@ -178,6 +179,9 @@ export class Store<
         reactivityGraph.setRefs(tablesToUpdate)
       },
       span: syncSpan,
+      params: {
+        leaderPushBatchSize: params.leaderPushBatchSize,
+      },
     })
 
     this.__mutationEventSchema = MutationEvent.makeMutationEventSchemaMemo(schema)
@@ -614,11 +618,8 @@ export class Store<
       }).pipe(this.runEffectFork)
     },
 
-    shutdown: (cause?: Cause.Cause<UnexpectedError>) => {
-      this.clientSession
-        .shutdown(cause ?? Cause.fail(IntentionalShutdownCause.make({ reason: 'manual' })))
-        .pipe(Effect.tapCauseLogPretty, Effect.provide(this.runtime), Effect.runFork)
-    },
+    shutdown: (cause?: Cause.Cause<UnexpectedError>) =>
+      this.clientSession.shutdown(cause ?? Cause.fail(IntentionalShutdownCause.make({ reason: 'manual' }))),
 
     version: liveStoreVersion,
   }

package/src/utils/dev.ts

@@ -1,4 +1,5 @@
 import { isDevEnv } from '@livestore/utils'
+import { Effect } from '@livestore/utils/effect'
 
 /* eslint-disable unicorn/prefer-global-this */
 export const downloadBlob = (
@@ -27,6 +28,10 @@ export const downloadURL = (data: string, fileName: string) => {
 
 export const exposeDebugUtils = () => {
   if (isDevEnv()) {
-    globalThis.__debugLiveStoreUtils = { downloadBlob }
+    globalThis.__debugLiveStoreUtils = {
+      downloadBlob,
+      runSync: (effect: Effect.Effect<any, any, never>) => Effect.runSync(effect),
+      runFork: (effect: Effect.Effect<any, any, never>) => Effect.runFork(effect),
+    }
   }
 }