@livestore/common 0.3.0-dev.3 → 0.3.0-dev.30

package/dist/leader-thread/make-leader-thread-layer.js

@@ -1,46 +1,88 @@
 import { Deferred, Effect, Layer, Queue, SubscriptionRef } from '@livestore/utils/effect';
 import { UnexpectedError } from '../adapter-types.js';
-import { EventId, MutationEvent, mutationLogMetaTable, SYNC_STATUS_TABLE, syncStatusTable } from '../schema/mod.js';
-import { migrateTable } from '../schema-management/migrations.js';
+import { LiveStoreEvent } from '../schema/mod.js';
 import { sql } from '../util.js';
-import { execSql } from './connection.js';
-import { makeLeaderSyncProcessor } from './leader-sync-processor.js';
+import { makeApplyEvent } from './apply-event.js';
+import * as Eventlog from './eventlog.js';
 import { bootDevtools } from './leader-worker-devtools.js';
-import { makePullQueueSet } from './pull-queue-set.js';
+import { makeLeaderSyncProcessor } from './LeaderSyncProcessor.js';
 import { recreateDb } from './recreate-db.js';
 import { LeaderThreadCtx } from './types.js';
-export const makeLeaderThreadLayer = ({ schema, storeId, originId, makeSyncDb, makeSyncBackend, db, dbLog, devtoolsOptions, initialSyncOptions = { _tag: 'Skip' }, }) => Effect.gen(function* () {
+export const makeLeaderThreadLayer = ({ schema, storeId, clientId, syncPayload, makeSqliteDb, syncOptions, dbReadModel, dbEventlog, devtoolsOptions, shutdownChannel, params, testing, }) => Effect.gen(function* () {
     const bootStatusQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
     // TODO do more validation here than just checking the count of tables
     // Either happens on initial boot or if schema changes
-    const dbMissing = db.select(sql `select count(*) as count from sqlite_master`)[0].count === 0;
-    const syncBackend = makeSyncBackend === undefined ? undefined : yield* makeSyncBackend;
-    const initialBlockingSyncContext = yield* makeInitialBlockingSyncContext({ initialSyncOptions, bootStatusQueue });
-    const syncProcessor = yield* makeLeaderSyncProcessor({ schema, dbMissing, dbLog, initialBlockingSyncContext });
+    const dbEventlogMissing = dbEventlog.select(sql `select count(*) as count from sqlite_master`)[0].count === 0;
+    const dbReadModelMissing = dbReadModel.select(sql `select count(*) as count from sqlite_master`)[0].count === 0;
+    const syncBackend = syncOptions?.backend === undefined
+        ? undefined
+        : yield* syncOptions.backend({ storeId, clientId, payload: syncPayload });
+    if (syncBackend !== undefined) {
+        // We're already connecting to the sync backend concurrently
+        yield* syncBackend.connect.pipe(Effect.tapCauseLogPretty, Effect.forkScoped);
+    }
+    const initialBlockingSyncContext = yield* makeInitialBlockingSyncContext({
+        initialSyncOptions: syncOptions?.initialSyncOptions ?? { _tag: 'Skip' },
+        bootStatusQueue,
+    });
+    const syncProcessor = yield* makeLeaderSyncProcessor({
+        schema,
+        dbEventlogMissing,
+        dbEventlog,
+        dbReadModel,
+        dbReadModelMissing,
+        initialBlockingSyncContext,
+        onError: syncOptions?.onSyncError ?? 'ignore',
+        params: {
+            localPushBatchSize: params?.localPushBatchSize,
+            backendPushBatchSize: params?.backendPushBatchSize,
+        },
+        testing: {
+            delays: testing?.syncProcessor?.delays,
+        },
+    });
+    const extraIncomingMessagesQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
+    const devtoolsContext = devtoolsOptions.enabled
+        ? {
+            enabled: true,
+            syncBackendLatch: yield* Effect.makeLatch(true),
+            syncBackendLatchState: yield* SubscriptionRef.make({ latchClosed: false }),
+        }
+        : { enabled: false };
+    const applyEvent = yield* makeApplyEvent({ schema, dbReadModel, dbEventlog });
     const ctx = {
         schema,
         bootStatusQueue,
         storeId,
-        originId,
-        db,
-        dbLog,
-        makeSyncDb,
-        mutationEventSchema: MutationEvent.makeMutationEventSchema(schema),
+        clientId,
+        dbReadModel,
+        dbEventlog,
+        makeSqliteDb,
+        eventSchema: LiveStoreEvent.makeEventDefSchema(schema),
         shutdownStateSubRef: yield* SubscriptionRef.make('running'),
+        shutdownChannel,
         syncBackend,
         syncProcessor,
-        connectedClientSessionPullQueues: yield* makePullQueueSet,
+        applyEvent,
+        extraIncomingMessagesQueue,
+        devtools: devtoolsContext,
+        // State will be set during `bootLeaderThread`
+        initialState: {},
     };
     // @ts-expect-error For debugging purposes
     globalThis.__leaderThreadCtx = ctx;
     const layer = Layer.succeed(LeaderThreadCtx, ctx);
-    yield* bootLeaderThread({ dbMissing, initialBlockingSyncContext, devtoolsOptions }).pipe(Effect.provide(layer));
+    ctx.initialState = yield* bootLeaderThread({
+        dbReadModelMissing,
+        initialBlockingSyncContext,
+        devtoolsOptions,
+    }).pipe(Effect.provide(layer));
     return layer;
-}).pipe(Effect.withSpan('@livestore/common:leader-thread:boot'), Effect.withSpanScoped('@livestore/common:leader-thread'), UnexpectedError.mapToUnexpectedError, Layer.unwrapScoped);
+}).pipe(Effect.withSpan('@livestore/common:leader-thread:boot'), Effect.withSpanScoped('@livestore/common:leader-thread'), UnexpectedError.mapToUnexpectedError, Effect.tapCauseLogPretty, Layer.unwrapScoped);
 const makeInitialBlockingSyncContext = ({ initialSyncOptions, bootStatusQueue, }) => Effect.gen(function* () {
     const ctx = {
         isDone: false,
-        processedMutations: 0,
+        processedEvents: 0,
         total: -1,
     };
     const blockingDeferred = initialSyncOptions._tag === 'Blocking' ? yield* Deferred.make() : undefined;
@@ -55,10 +97,10 @@ const makeInitialBlockingSyncContext = ({ initialSyncOptions, bootStatusQueue, }
             if (ctx.total === -1) {
                 ctx.total = remaining + processed;
             }
-            ctx.processedMutations += processed;
+            ctx.processedEvents += processed;
             yield* Queue.offer(bootStatusQueue, {
                 stage: 'syncing',
-                progress: { done: ctx.processedMutations, total: ctx.total },
+                progress: { done: ctx.processedEvents, total: ctx.total },
             });
             if (remaining === 0 && blockingDeferred !== undefined) {
                 yield* Deferred.succeed(blockingDeferred, void 0);
@@ -71,36 +113,29 @@ const makeInitialBlockingSyncContext = ({ initialSyncOptions, bootStatusQueue, }
  * Blocks until the leader thread has finished its initial setup.
  * It also starts various background processes (e.g. syncing)
  */
-const bootLeaderThread = ({ dbMissing, initialBlockingSyncContext, devtoolsOptions, }) => Effect.gen(function* () {
-    const { dbLog, bootStatusQueue, syncProcessor } = yield* LeaderThreadCtx;
-    yield* migrateTable({
-        db: dbLog,
-        behaviour: 'create-if-not-exists',
-        tableAst: mutationLogMetaTable.sqliteDef.ast,
-        skipMetaTable: true,
-    });
-    yield* migrateTable({
-        db: dbLog,
-        behaviour: 'create-if-not-exists',
-        tableAst: syncStatusTable.sqliteDef.ast,
-        skipMetaTable: true,
-    });
-    // Create sync status row if it doesn't exist
-    yield* execSql(dbLog, sql `INSERT INTO ${SYNC_STATUS_TABLE} (head)
-          SELECT ${EventId.ROOT.global}
-          WHERE NOT EXISTS (SELECT 1 FROM ${SYNC_STATUS_TABLE})`, {});
-    const dbReady = yield* Deferred.make();
-    // We're already starting pulling from the sync backend concurrently but wait until the db is ready before
-    // processing any incoming mutations
-    yield* syncProcessor.boot({ dbReady });
-    if (dbMissing) {
-        yield* recreateDb;
+const bootLeaderThread = ({ dbReadModelMissing, initialBlockingSyncContext, devtoolsOptions, }) => Effect.gen(function* () {
+    const { dbEventlog, bootStatusQueue, syncProcessor } = yield* LeaderThreadCtx;
+    yield* Eventlog.initEventlogDb(dbEventlog);
+    let migrationsReport;
+    if (dbReadModelMissing) {
+        const recreateResult = yield* recreateDb;
+        migrationsReport = recreateResult.migrationsReport;
+    }
+    else {
+        migrationsReport = { migrations: [] };
     }
-    yield* Deferred.succeed(dbReady, void 0);
+    // NOTE the sync processor depends on the dbs being initialized properly
+    const { initialLeaderHead } = yield* syncProcessor.boot;
     if (initialBlockingSyncContext.blockingDeferred !== undefined) {
-        yield* initialBlockingSyncContext.blockingDeferred;
+        // Provides a syncing status right away before the first pull response comes in
+        yield* Queue.offer(bootStatusQueue, {
+            stage: 'syncing',
+            progress: { done: 0, total: -1 },
+        });
+        yield* initialBlockingSyncContext.blockingDeferred.pipe(Effect.withSpan('@livestore/common:leader-thread:initial-sync-blocking'));
     }
     yield* Queue.offer(bootStatusQueue, { stage: 'done' });
     yield* bootDevtools(devtoolsOptions).pipe(Effect.tapCauseLogPretty, Effect.forkScoped);
+    return { migrationsReport, leaderHead: initialLeaderHead };
 });
 //# sourceMappingURL=make-leader-thread-layer.js.map

package/dist/leader-thread/make-leader-thread-layer.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-leader-thread-layer.js","sourceRoot":"","sources":["../../src/leader-thread/make-leader-thread-layer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"make-leader-thread-layer.js","sourceRoot":"","sources":["../../src/leader-thread/make-leader-thread-layer.ts"],"names":[],"mappings":"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"}

package/dist/leader-thread/mod.d.ts

@@ -3,5 +3,5 @@ export * from './types.js';
 export * as ShutdownChannel from './shutdown-channel.js';
 export * from './leader-worker-devtools.js';
 export * from './make-leader-thread-layer.js';
-export * from './mutationlog.js';
+export * as Eventlog from './eventlog.js';
 //# sourceMappingURL=mod.d.ts.map

package/dist/leader-thread/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/leader-thread/mod.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,OAAO,KAAK,eAAe,MAAM,uBAAuB,CAAA;AACxD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/leader-thread/mod.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,OAAO,KAAK,eAAe,MAAM,uBAAuB,CAAA;AACxD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA"}

package/dist/leader-thread/mod.js

@@ -3,5 +3,5 @@ export * from './types.js';
 export * as ShutdownChannel from './shutdown-channel.js';
 export * from './leader-worker-devtools.js';
 export * from './make-leader-thread-layer.js';
-export * from './mutationlog.js';
+export * as Eventlog from './eventlog.js';
 //# sourceMappingURL=mod.js.map

package/dist/leader-thread/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/leader-thread/mod.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,OAAO,KAAK,eAAe,MAAM,uBAAuB,CAAA;AACxD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,kBAAkB,CAAA"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/leader-thread/mod.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAA;AAC/B,cAAc,YAAY,CAAA;AAC1B,OAAO,KAAK,eAAe,MAAM,uBAAuB,CAAA;AACxD,cAAc,6BAA6B,CAAA;AAC3C,cAAc,+BAA+B,CAAA;AAC7C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA"}

package/dist/leader-thread/recreate-db.d.ts

@@ -1,7 +1,9 @@
 import type { HttpClient } from '@livestore/utils/effect';
 import { Effect } from '@livestore/utils/effect';
-import type { InvalidPullError, IsOfflineError, SqliteError } from '../index.js';
+import type { InvalidPullError, IsOfflineError, MigrationsReport, SqliteError } from '../index.js';
 import { UnexpectedError } from '../index.js';
 import { LeaderThreadCtx } from './types.js';
-export declare const recreateDb: Effect.Effect<void, UnexpectedError | SqliteError | IsOfflineError | InvalidPullError, LeaderThreadCtx | HttpClient.HttpClient>;
+export declare const recreateDb: Effect.Effect<{
+    migrationsReport: MigrationsReport;
+}, UnexpectedError | SqliteError | IsOfflineError | InvalidPullError, LeaderThreadCtx | HttpClient.HttpClient>;
 //# sourceMappingURL=recreate-db.d.ts.map

package/dist/leader-thread/recreate-db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recreate-db.d.ts","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAS,MAAM,yBAAyB,CAAA;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAkB,WAAW,EAAE,MAAM,aAAa,CAAA;AAChG,OAAO,EAAkE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7G,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC,IAAI,EACJ,eAAe,GAAG,WAAW,GAAG,cAAc,GAAG,gBAAgB,EACjE,eAAe,GAAG,UAAU,CAAC,UAAU,CAgGxC,CAAA"}
+{"version":3,"file":"recreate-db.d.ts","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAS,MAAM,yBAAyB,CAAA;AAEvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAkB,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAClH,OAAO,EAAoC,eAAe,EAAE,MAAM,aAAa,CAAA;AAE/E,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,MAAM,CACpC;IAAE,gBAAgB,EAAE,gBAAgB,CAAA;CAAE,EACtC,eAAe,GAAG,WAAW,GAAG,cAAc,GAAG,gBAAgB,EACjE,eAAe,GAAG,UAAU,CAAC,UAAU,CA2GxC,CAAA"}

package/dist/leader-thread/recreate-db.js

@@ -1,55 +1,60 @@
 import { casesHandled } from '@livestore/utils';
 import { Effect, Queue } from '@livestore/utils/effect';
-import { initializeSingletonTables, migrateDb, rehydrateFromMutationLog, UnexpectedError } from '../index.js';
+import { migrateDb, rehydrateFromEventlog, UnexpectedError } from '../index.js';
 import { configureConnection } from './connection.js';
 import { LeaderThreadCtx } from './types.js';
 export const recreateDb = Effect.gen(function* () {
-    const { db, dbLog, makeSyncDb, schema, bootStatusQueue } = yield* LeaderThreadCtx;
+    const { dbReadModel, dbEventlog, schema, bootStatusQueue, applyEvent } = yield* LeaderThreadCtx;
     const migrationOptions = schema.migrationOptions;
+    let migrationsReport;
     yield* Effect.addFinalizer(Effect.fn('recreateDb:finalizer')(function* (ex) {
         if (ex._tag === 'Failure')
-            db.destroy();
+            dbReadModel.destroy();
     }));
     // NOTE to speed up the operations below, we're creating a temporary in-memory database
     // and later we'll overwrite the persisted database with the new data
-    const tmpSyncDb = yield* makeSyncDb({ _tag: 'in-memory' });
-    yield* configureConnection(tmpSyncDb, { fkEnabled: true });
+    // TODO bring back this optimization
+    // const tmpDb = yield* makeSqliteDb({ _tag: 'in-memory' })
+    const tmpDb = dbReadModel;
+    yield* configureConnection(tmpDb, { foreignKeys: true });
     const initDb = (hooks) => Effect.gen(function* () {
-        yield* Effect.tryAll(() => hooks?.init?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
-        yield* migrateDb({
-            db: tmpSyncDb,
+        yield* Effect.tryAll(() => hooks?.init?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
+        const migrationsReport = yield* migrateDb({
+            db: tmpDb,
             schema,
             onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'migrating', progress: { done, total } }),
         });
-        initializeSingletonTables(schema, tmpSyncDb);
-        yield* Effect.tryAll(() => hooks?.pre?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
-        return tmpSyncDb;
+        yield* Effect.tryAll(() => hooks?.pre?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
+        return { migrationsReport, tmpDb };
     });
     switch (migrationOptions.strategy) {
-        case 'from-mutation-log': {
+        case 'from-eventlog': {
             const hooks = migrationOptions.hooks;
-            const tmpSyncDb = yield* initDb(hooks);
-            yield* rehydrateFromMutationLog({
-                db: tmpSyncDb,
-                logDb: dbLog,
+            const initResult = yield* initDb(hooks);
+            migrationsReport = initResult.migrationsReport;
+            yield* rehydrateFromEventlog({
+                // db: initResult.tmpDb,
+                dbEventlog,
                 schema,
-                migrationOptions,
+                applyEvent,
                 onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'rehydrating', progress: { done, total } }),
             });
-            yield* Effect.tryAll(() => hooks?.post?.(tmpSyncDb)).pipe(UnexpectedError.mapToUnexpectedError);
+            yield* Effect.tryAll(() => hooks?.post?.(initResult.tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
             break;
         }
         case 'hard-reset': {
             const hooks = migrationOptions.hooks;
-            const tmpInMemoryDb = yield* initDb(hooks);
+            const initResult = yield* initDb(hooks);
+            migrationsReport = initResult.migrationsReport;
             // The database is migrated but empty now, so nothing else to do
-            yield* Effect.tryAll(() => hooks?.post?.(tmpInMemoryDb)).pipe(UnexpectedError.mapToUnexpectedError);
+            yield* Effect.tryAll(() => hooks?.post?.(initResult.tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
             break;
         }
         case 'manual': {
-            const oldDbData = db.export();
+            const oldDbData = dbReadModel.export();
+            migrationsReport = { migrations: [] };
             const newDbData = yield* Effect.tryAll(() => migrationOptions.migrate(oldDbData)).pipe(UnexpectedError.mapToUnexpectedError);
-            tmpSyncDb.import(newDbData);
+            tmpDb.import(newDbData);
             // TODO validate schema
             break;
         }
@@ -57,13 +62,18 @@ export const recreateDb = Effect.gen(function* () {
             casesHandled(migrationOptions);
         }
     }
+    // TODO bring back
     // Import the temporary in-memory database into the persistent database
-    yield* Effect.sync(() => db.import(tmpSyncDb)).pipe(Effect.withSpan('@livestore/common:leader-thread:recreateDb:import'));
+    // yield* Effect.sync(() => db.import(tmpDb)).pipe(
+    //   Effect.withSpan('@livestore/common:leader-thread:recreateDb:import'),
+    // )
     // TODO maybe bring back re-using this initial snapshot to avoid calling `.export()` again
     // We've disabled this for now as it made the code too complex, as we often run syncing right after
     // so the snapshot is no longer up to date
-    // const snapshotFromTmpDb = tmpSyncDb.export()
-    tmpSyncDb.close();
+    // const snapshotFromTmpDb = tmpDb.export()
+    // TODO bring back
+    // tmpDb.close()
+    return { migrationsReport };
 }).pipe(Effect.scoped, // NOTE we're closing the scope here so finalizers are called when the effect is done
 Effect.withSpan('@livestore/common:leader-thread:recreateDb'), Effect.withPerformanceMeasure('@livestore/common:leader-thread:recreateDb'));
 //# sourceMappingURL=recreate-db.js.map

package/dist/leader-thread/recreate-db.js.map

@@ -1 +1 @@
-{"version":3,"file":"recreate-db.js","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"recreate-db.js","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"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"}

package/dist/leader-thread/shutdown-channel.d.ts

@@ -1,10 +1,7 @@
 import type { WebChannel } from '@livestore/utils/effect';
 import { Schema } from '@livestore/utils/effect';
-import { IntentionalShutdownCause } from '../index.js';
-declare const DedicatedWorkerDisconnectBroadcast_base: Schema.TaggedStruct<"DedicatedWorkerDisconnectBroadcast", {}>;
-export declare class DedicatedWorkerDisconnectBroadcast extends DedicatedWorkerDisconnectBroadcast_base {
-}
-declare const All_base: Schema.Union<[typeof IntentionalShutdownCause, typeof DedicatedWorkerDisconnectBroadcast]>;
+import { IntentionalShutdownCause, UnexpectedError } from '../index.js';
+declare const All_base: Schema.Union<[typeof IntentionalShutdownCause, typeof UnexpectedError]>;
 export declare class All extends All_base {
 }
 /**

package/dist/leader-thread/shutdown-channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown-channel.d.ts","sourceRoot":"","sources":["../../src/leader-thread/shutdown-channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;;AAEtD,qBAAa,kCAAmC,SAAQ,uCAA6D;CAAG;;AAExH,qBAAa,GAAI,SAAQ,QAA0E;CAAG;AAEtG;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,CAAC,CAAA"}
+{"version":3,"file":"shutdown-channel.d.ts","sourceRoot":"","sources":["../../src/leader-thread/shutdown-channel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;;AAEvE,qBAAa,GAAI,SAAQ,QAAuD;CAAG;AAEnF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,GAAG,CAAC,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,CAAC,CAAA"}

package/dist/leader-thread/shutdown-channel.js

@@ -1,7 +1,5 @@
 import { Schema } from '@livestore/utils/effect';
-import { IntentionalShutdownCause } from '../index.js';
-export class DedicatedWorkerDisconnectBroadcast extends Schema.TaggedStruct('DedicatedWorkerDisconnectBroadcast', {}) {
-}
-export class All extends Schema.Union(IntentionalShutdownCause, DedicatedWorkerDisconnectBroadcast) {
+import { IntentionalShutdownCause, UnexpectedError } from '../index.js';
+export class All extends Schema.Union(IntentionalShutdownCause, UnexpectedError) {
 }
 //# sourceMappingURL=shutdown-channel.js.map

package/dist/leader-thread/shutdown-channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown-channel.js","sourceRoot":"","sources":["../../src/leader-thread/shutdown-channel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAEtD,MAAM,OAAO,kCAAmC,SAAQ,MAAM,CAAC,YAAY,CAAC,oCAAoC,EAAE,EAAE,CAAC;CAAG;AAExH,MAAM,OAAO,GAAI,SAAQ,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,kCAAkC,CAAC;CAAG"}
+{"version":3,"file":"shutdown-channel.js","sourceRoot":"","sources":["../../src/leader-thread/shutdown-channel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAEvE,MAAM,OAAO,GAAI,SAAQ,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,eAAe,CAAC;CAAG"}

package/dist/leader-thread/types.d.ts

@@ -1,63 +1,91 @@
-import type { Deferred, Effect, Fiber, HttpClient, Option, Queue, Scope, SubscriptionRef, WebChannel } from '@livestore/utils/effect';
+import type { Deferred, Effect, HttpClient, Option, Queue, Scope, Stream, Subscribable, SubscriptionRef, WebChannel } from '@livestore/utils/effect';
 import { Context, Schema } from '@livestore/utils/effect';
-import type { BootStatus, Devtools, InvalidPushError, MakeSynchronousDatabase, PersistenceInfo, SyncBackend, SynchronousDatabase, UnexpectedError } from '../index.js';
-import type { EventId, LiveStoreSchema, MutationEvent } from '../schema/mod.js';
-import type { PayloadUpstream, SyncState } from '../sync/syncstate.js';
+import type { LeaderPullCursor, SqliteError } from '../adapter-types.js';
+import type { BootStatus, Devtools, LeaderAheadError, MakeSqliteDb, MigrationsReport, PersistenceInfo, SqliteDb, SyncBackend, UnexpectedError } from '../index.js';
+import type { EventId, LiveStoreEvent, LiveStoreSchema } from '../schema/mod.js';
+import type * as SyncState from '../sync/syncstate.js';
 import type { ShutdownChannel } from './shutdown-channel.js';
 export type ShutdownState = 'running' | 'shutting-down';
-declare const OuterWorkerCtx_base: Context.TagClass<OuterWorkerCtx, "OuterWorkerCtx", {
-    innerFiber: Fiber.RuntimeFiber<any, any>;
-}>;
-export declare class OuterWorkerCtx extends OuterWorkerCtx_base {
-}
 export declare const InitialSyncOptionsSkip: Schema.TaggedStruct<"Skip", {}>;
 export type InitialSyncOptionsSkip = typeof InitialSyncOptionsSkip.Type;
 export declare const InitialSyncOptionsBlocking: Schema.TaggedStruct<"Blocking", {
-    timeout: typeof Schema.DurationFromMillis;
+    timeout: Schema.Union<[typeof Schema.DurationFromMillis, typeof Schema.Number]>;
 }>;
 export type InitialSyncOptionsBlocking = typeof InitialSyncOptionsBlocking.Type;
 export declare const InitialSyncOptions: Schema.Union<[Schema.TaggedStruct<"Skip", {}>, Schema.TaggedStruct<"Blocking", {
-    timeout: typeof Schema.DurationFromMillis;
+    timeout: Schema.Union<[typeof Schema.DurationFromMillis, typeof Schema.Number]>;
 }>]>;
 export type InitialSyncOptions = typeof InitialSyncOptions.Type;
 export type InitialSyncInfo = Option.Option<{
     cursor: EventId.EventId;
     metadata: Option.Option<Schema.JsonValue>;
 }>;
-export type LeaderDatabase = SynchronousDatabase<{
+export type LeaderSqliteDb = SqliteDb<{
     dbPointer: number;
     persistenceInfo: PersistenceInfo;
 }>;
 export type PersistenceInfoPair = {
-    db: PersistenceInfo;
-    mutationLog: PersistenceInfo;
+    readModel: PersistenceInfo;
+    eventlog: PersistenceInfo;
 };
 export type DevtoolsOptions = {
     enabled: false;
 } | {
     enabled: true;
-    makeContext: Effect.Effect<{
-        devtoolsWebChannel: WebChannel.WebChannel<Devtools.MessageToAppLeader, Devtools.MessageFromAppLeader>;
-        shutdownChannel: ShutdownChannel;
+    makeBootContext: Effect.Effect<{
+        devtoolsWebChannel: WebChannel.WebChannel<Devtools.Leader.MessageToApp, Devtools.Leader.MessageFromApp>;
         persistenceInfo: PersistenceInfoPair;
     }, UnexpectedError, Scope.Scope>;
 };
+export type DevtoolsContext = {
+    enabled: true;
+    syncBackendLatch: Effect.Latch;
+    syncBackendLatchState: SubscriptionRef.SubscriptionRef<{
+        latchClosed: boolean;
+    }>;
+} | {
+    enabled: false;
+};
 declare const LeaderThreadCtx_base: Context.TagClass<LeaderThreadCtx, "LeaderThreadCtx", {
     schema: LiveStoreSchema;
     storeId: string;
-    originId: string;
-    makeSyncDb: MakeSynchronousDatabase;
-    db: LeaderDatabase;
-    dbLog: LeaderDatabase;
+    clientId: string;
+    makeSqliteDb: MakeSqliteDb;
+    dbReadModel: LeaderSqliteDb;
+    dbEventlog: LeaderSqliteDb;
     bootStatusQueue: Queue.Queue<BootStatus>;
     shutdownStateSubRef: SubscriptionRef.SubscriptionRef<ShutdownState>;
-    mutationEventSchema: MutationEvent.ForMutationDefRecord<any>;
+    shutdownChannel: ShutdownChannel;
+    eventSchema: LiveStoreEvent.ForEventDefRecord<any>;
+    devtools: DevtoolsContext;
     syncBackend: SyncBackend | undefined;
-    syncProcessor: SyncProcessor;
-    connectedClientSessionPullQueues: PullQueueSet;
+    syncProcessor: LeaderSyncProcessor;
+    applyEvent: ApplyEvent;
+    initialState: {
+        leaderHead: EventId.EventId;
+        migrationsReport: MigrationsReport;
+    };
+    /**
+     * e.g. used for `store._dev` APIs
+     *
+     * This is currently separated from `.devtools` as it also needs to work when devtools are disabled
+     */
+    extraIncomingMessagesQueue: Queue.Queue<Devtools.Leader.MessageToApp>;
 }>;
 export declare class LeaderThreadCtx extends LeaderThreadCtx_base {
 }
+export type ApplyEvent = (eventEncoded: LiveStoreEvent.EncodedWithMeta, options?: {
+    /** Needed for rehydrateFromEventlog */
+    skipEventlog?: boolean;
+}) => Effect.Effect<{
+    sessionChangeset: {
+        _tag: 'sessionChangeset';
+        data: Uint8Array;
+        debug: any;
+    } | {
+        _tag: 'no-op';
+    };
+}, SqliteError | UnexpectedError>;
 export type InitialBlockingSyncContext = {
     blockingDeferred: Deferred.Deferred<void> | undefined;
     update: (_: {
@@ -65,23 +93,42 @@ export type InitialBlockingSyncContext = {
         processed: number;
     }) => Effect.Effect<void>;
 };
-export type PullQueueItem = {
-    payload: PayloadUpstream;
-    remaining: number;
-};
-export interface SyncProcessor {
+export interface LeaderSyncProcessor {
+    /** Used by client sessions to subscribe to upstream sync state changes */
+    pull: (args: {
+        cursor: LeaderPullCursor;
+    }) => Stream.Stream<{
+        payload: typeof SyncState.PayloadUpstream.Type;
+        mergeCounter: number;
+    }, UnexpectedError>;
+    /** The `pullQueue` API can be used instead of `pull` when more convenient */
+    pullQueue: (args: {
+        cursor: LeaderPullCursor;
+    }) => Effect.Effect<Queue.Queue<{
+        payload: typeof SyncState.PayloadUpstream.Type;
+        mergeCounter: number;
+    }>, UnexpectedError, Scope.Scope>;
+    /** Used by client sessions to push events to the leader thread */
     push: (
     /** `batch` needs to follow the same rules as `batch` in `SyncBackend.push` */
-    batch: ReadonlyArray<MutationEvent.EncodedWithMeta>) => Effect.Effect<void, UnexpectedError | InvalidPushError, HttpClient.HttpClient | LeaderThreadCtx>;
-    pushPartial: (mutationEvent: MutationEvent.PartialAnyEncoded) => Effect.Effect<void, UnexpectedError, LeaderThreadCtx>;
-    boot: (args: {
-        dbReady: Deferred.Deferred<void>;
-    }) => Effect.Effect<void, UnexpectedError, LeaderThreadCtx | Scope.Scope | HttpClient.HttpClient>;
-    syncState: Effect.Effect<SyncState, UnexpectedError>;
-}
-export interface PullQueueSet {
-    makeQueue: (since: EventId.EventId) => Effect.Effect<Queue.Queue<PullQueueItem>, UnexpectedError, Scope.Scope | LeaderThreadCtx>;
-    offer: (item: PullQueueItem) => Effect.Effect<void, UnexpectedError, LeaderThreadCtx>;
+    batch: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>, options?: {
+        /**
+         * If true, the effect will only finish when the local push has been processed (i.e. succeeded or was rejected).
+         * @default false
+         */
+        waitForProcessing?: boolean;
+    }) => Effect.Effect<void, LeaderAheadError>;
+    /** Currently only used by devtools which don't provide their own event numbers */
+    pushPartial: (args: {
+        event: LiveStoreEvent.PartialAnyEncoded;
+        clientId: string;
+        sessionId: string;
+    }) => Effect.Effect<void, UnexpectedError>;
+    boot: Effect.Effect<{
+        initialLeaderHead: EventId.EventId;
+    }, UnexpectedError, LeaderThreadCtx | Scope.Scope | HttpClient.HttpClient>;
+    syncState: Subscribable.Subscribable<SyncState.SyncState>;
+    getMergeCounter: () => number;
 }
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/leader-thread/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"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"}