@livestore/common 0.3.0-dev.11 → 0.3.0-dev.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/__tests__/fixture.d.ts +21 -21
- package/dist/adapter-types.d.ts +41 -18
- package/dist/adapter-types.d.ts.map +1 -1
- package/dist/adapter-types.js +12 -0
- package/dist/adapter-types.js.map +1 -1
- package/dist/db-schema/ast/sqlite.d.ts +69 -0
- package/dist/db-schema/ast/sqlite.d.ts.map +1 -0
- package/dist/db-schema/ast/sqlite.js +71 -0
- package/dist/db-schema/ast/sqlite.js.map +1 -0
- package/dist/db-schema/ast/validate.d.ts +3 -0
- package/dist/db-schema/ast/validate.d.ts.map +1 -0
- package/dist/db-schema/ast/validate.js +12 -0
- package/dist/db-schema/ast/validate.js.map +1 -0
- package/dist/db-schema/dsl/field-defs.d.ts +90 -0
- package/dist/db-schema/dsl/field-defs.d.ts.map +1 -0
- package/dist/db-schema/dsl/field-defs.js +87 -0
- package/dist/db-schema/dsl/field-defs.js.map +1 -0
- package/dist/db-schema/dsl/field-defs.test.d.ts +2 -0
- package/dist/db-schema/dsl/field-defs.test.d.ts.map +1 -0
- package/dist/db-schema/dsl/field-defs.test.js +29 -0
- package/dist/db-schema/dsl/field-defs.test.js.map +1 -0
- package/dist/db-schema/dsl/index.d.ts +88 -0
- package/dist/db-schema/dsl/index.d.ts.map +1 -0
- package/dist/db-schema/dsl/index.js +35 -0
- package/dist/db-schema/dsl/index.js.map +1 -0
- package/dist/db-schema/dsl/mod.d.ts +90 -0
- package/dist/db-schema/dsl/mod.d.ts.map +1 -0
- package/dist/db-schema/dsl/mod.js +35 -0
- package/dist/db-schema/dsl/mod.js.map +1 -0
- package/dist/db-schema/dsl/sqlite/field-defs.d.ts +90 -0
- package/dist/db-schema/dsl/sqlite/field-defs.d.ts.map +1 -0
- package/dist/db-schema/dsl/sqlite/field-defs.js +86 -0
- package/dist/db-schema/dsl/sqlite/field-defs.js.map +1 -0
- package/dist/db-schema/dsl/sqlite/field-defs.test.d.ts +2 -0
- package/dist/db-schema/dsl/sqlite/field-defs.test.d.ts.map +1 -0
- package/dist/db-schema/dsl/sqlite/field-defs.test.js +29 -0
- package/dist/db-schema/dsl/sqlite/field-defs.test.js.map +1 -0
- package/dist/db-schema/dsl/sqlite/index.d.ts +88 -0
- package/dist/db-schema/dsl/sqlite/index.d.ts.map +1 -0
- package/dist/db-schema/dsl/sqlite/index.js +35 -0
- package/dist/db-schema/dsl/sqlite/index.js.map +1 -0
- package/dist/db-schema/hash.d.ts +2 -0
- package/dist/db-schema/hash.d.ts.map +1 -0
- package/dist/db-schema/hash.js +14 -0
- package/dist/db-schema/hash.js.map +1 -0
- package/dist/db-schema/index.d.ts +4 -0
- package/dist/db-schema/index.d.ts.map +1 -0
- package/dist/db-schema/index.js +6 -0
- package/dist/db-schema/index.js.map +1 -0
- package/dist/db-schema/mod.d.ts +3 -0
- package/dist/db-schema/mod.d.ts.map +1 -0
- package/dist/db-schema/mod.js +3 -0
- package/dist/db-schema/mod.js.map +1 -0
- package/dist/derived-mutations.d.ts +1 -1
- package/dist/derived-mutations.d.ts.map +1 -1
- package/dist/derived-mutations.js +3 -3
- package/dist/derived-mutations.js.map +1 -1
- package/dist/devtools/devtools-bridge.d.ts +10 -7
- package/dist/devtools/devtools-bridge.d.ts.map +1 -1
- package/dist/devtools/devtools-messages-client-session.d.ts +101 -28
- package/dist/devtools/devtools-messages-client-session.d.ts.map +1 -1
- package/dist/devtools/devtools-messages-client-session.js +19 -3
- package/dist/devtools/devtools-messages-client-session.js.map +1 -1
- package/dist/devtools/devtools-messages-common.d.ts +24 -32
- package/dist/devtools/devtools-messages-common.d.ts.map +1 -1
- package/dist/devtools/devtools-messages-common.js +19 -10
- package/dist/devtools/devtools-messages-common.js.map +1 -1
- package/dist/devtools/devtools-messages-leader.d.ts +220 -56
- package/dist/devtools/devtools-messages-leader.d.ts.map +1 -1
- package/dist/devtools/devtools-messages-leader.js +57 -9
- package/dist/devtools/devtools-messages-leader.js.map +1 -1
- package/dist/devtools/devtools-messages.d.ts +2 -2
- package/dist/devtools/devtools-messages.d.ts.map +1 -1
- package/dist/devtools/devtools-messages.js +2 -2
- package/dist/devtools/devtools-messages.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/leader-thread/LeaderSyncProcessor.d.ts.map +1 -1
- package/dist/leader-thread/LeaderSyncProcessor.js +50 -35
- package/dist/leader-thread/LeaderSyncProcessor.js.map +1 -1
- package/dist/leader-thread/apply-mutation.d.ts.map +1 -1
- package/dist/leader-thread/apply-mutation.js +8 -6
- package/dist/leader-thread/apply-mutation.js.map +1 -1
- package/dist/leader-thread/connection.d.ts +31 -3
- package/dist/leader-thread/connection.d.ts.map +1 -1
- package/dist/leader-thread/connection.js +18 -3
- package/dist/leader-thread/connection.js.map +1 -1
- package/dist/leader-thread/leader-worker-devtools.d.ts.map +1 -1
- package/dist/leader-thread/leader-worker-devtools.js +56 -31
- package/dist/leader-thread/leader-worker-devtools.js.map +1 -1
- package/dist/leader-thread/make-leader-thread-layer.d.ts.map +1 -1
- package/dist/leader-thread/make-leader-thread-layer.js +23 -6
- package/dist/leader-thread/make-leader-thread-layer.js.map +1 -1
- package/dist/leader-thread/mutationlog.d.ts +1 -1
- package/dist/leader-thread/mutationlog.d.ts.map +1 -1
- package/dist/leader-thread/mutationlog.js +7 -5
- package/dist/leader-thread/mutationlog.js.map +1 -1
- package/dist/leader-thread/pull-queue-set.d.ts.map +1 -1
- package/dist/leader-thread/recreate-db.d.ts +4 -2
- package/dist/leader-thread/recreate-db.d.ts.map +1 -1
- package/dist/leader-thread/recreate-db.js +13 -8
- package/dist/leader-thread/recreate-db.js.map +1 -1
- package/dist/leader-thread/types.d.ts +22 -15
- package/dist/leader-thread/types.d.ts.map +1 -1
- package/dist/leader-thread/types.js +1 -3
- package/dist/leader-thread/types.js.map +1 -1
- package/dist/query-builder/api.d.ts +3 -3
- package/dist/query-builder/api.d.ts.map +1 -1
- package/dist/query-builder/impl.js.map +1 -1
- package/dist/query-builder/impl.test.js +16 -1
- package/dist/query-builder/impl.test.js.map +1 -1
- package/dist/query-info.d.ts +3 -3
- package/dist/query-info.d.ts.map +1 -1
- package/dist/rehydrate-from-mutationlog.d.ts.map +1 -1
- package/dist/rehydrate-from-mutationlog.js +8 -6
- package/dist/rehydrate-from-mutationlog.js.map +1 -1
- package/dist/schema/EventId.d.ts +10 -9
- package/dist/schema/EventId.d.ts.map +1 -1
- package/dist/schema/EventId.js +14 -11
- package/dist/schema/EventId.js.map +1 -1
- package/dist/schema/EventId.test.js +3 -3
- package/dist/schema/EventId.test.js.map +1 -1
- package/dist/schema/MutationEvent.d.ts +37 -12
- package/dist/schema/MutationEvent.d.ts.map +1 -1
- package/dist/schema/MutationEvent.js +20 -4
- package/dist/schema/MutationEvent.js.map +1 -1
- package/dist/schema/db-schema/ast/sqlite.d.ts +69 -0
- package/dist/schema/db-schema/ast/sqlite.d.ts.map +1 -0
- package/dist/schema/db-schema/ast/sqlite.js +71 -0
- package/dist/schema/db-schema/ast/sqlite.js.map +1 -0
- package/dist/schema/db-schema/ast/validate.d.ts +3 -0
- package/dist/schema/db-schema/ast/validate.d.ts.map +1 -0
- package/dist/schema/db-schema/ast/validate.js +12 -0
- package/dist/schema/db-schema/ast/validate.js.map +1 -0
- package/dist/schema/db-schema/dsl/field-defs.d.ts +90 -0
- package/dist/schema/db-schema/dsl/field-defs.d.ts.map +1 -0
- package/dist/schema/db-schema/dsl/field-defs.js +87 -0
- package/dist/schema/db-schema/dsl/field-defs.js.map +1 -0
- package/dist/schema/db-schema/dsl/field-defs.test.d.ts +2 -0
- package/dist/schema/db-schema/dsl/field-defs.test.d.ts.map +1 -0
- package/dist/schema/db-schema/dsl/field-defs.test.js +29 -0
- package/dist/schema/db-schema/dsl/field-defs.test.js.map +1 -0
- package/dist/schema/db-schema/dsl/mod.d.ts +88 -0
- package/dist/schema/db-schema/dsl/mod.d.ts.map +1 -0
- package/dist/schema/db-schema/dsl/mod.js +35 -0
- package/dist/schema/db-schema/dsl/mod.js.map +1 -0
- package/dist/schema/db-schema/hash.d.ts +2 -0
- package/dist/schema/db-schema/hash.d.ts.map +1 -0
- package/dist/schema/db-schema/hash.js +14 -0
- package/dist/schema/db-schema/hash.js.map +1 -0
- package/dist/schema/db-schema/mod.d.ts +3 -0
- package/dist/schema/db-schema/mod.d.ts.map +1 -0
- package/dist/schema/db-schema/mod.js +3 -0
- package/dist/schema/db-schema/mod.js.map +1 -0
- package/dist/schema/mod.d.ts +1 -0
- package/dist/schema/mod.d.ts.map +1 -1
- package/dist/schema/mod.js +1 -0
- package/dist/schema/mod.js.map +1 -1
- package/dist/schema/mutations.d.ts +4 -8
- package/dist/schema/mutations.d.ts.map +1 -1
- package/dist/schema/mutations.js +2 -2
- package/dist/schema/mutations.js.map +1 -1
- package/dist/schema/schema-helpers.js +1 -1
- package/dist/schema/schema-helpers.js.map +1 -1
- package/dist/schema/schema.d.ts +1 -1
- package/dist/schema/schema.d.ts.map +1 -1
- package/dist/schema/schema.js +1 -1
- package/dist/schema/schema.js.map +1 -1
- package/dist/schema/system-tables.d.ts +47 -29
- package/dist/schema/system-tables.d.ts.map +1 -1
- package/dist/schema/system-tables.js +10 -7
- package/dist/schema/system-tables.js.map +1 -1
- package/dist/schema/table-def.d.ts +18 -14
- package/dist/schema/table-def.d.ts.map +1 -1
- package/dist/schema/table-def.js +3 -4
- package/dist/schema/table-def.js.map +1 -1
- package/dist/schema-management/migrations.d.ts +3 -3
- package/dist/schema-management/migrations.d.ts.map +1 -1
- package/dist/schema-management/migrations.js +7 -2
- package/dist/schema-management/migrations.js.map +1 -1
- package/dist/sql-queries/sql-queries.d.ts +1 -1
- package/dist/sql-queries/sql-queries.d.ts.map +1 -1
- package/dist/sql-queries/sql-queries.js.map +1 -1
- package/dist/sql-queries/sql-query-builder.d.ts +1 -1
- package/dist/sql-queries/sql-query-builder.d.ts.map +1 -1
- package/dist/sql-queries/sql-query-builder.js.map +1 -1
- package/dist/sql-queries/types.d.ts +2 -1
- package/dist/sql-queries/types.d.ts.map +1 -1
- package/dist/sql-queries/types.js.map +1 -1
- package/dist/sync/ClientSessionSyncProcessor.d.ts +3 -5
- package/dist/sync/ClientSessionSyncProcessor.d.ts.map +1 -1
- package/dist/sync/ClientSessionSyncProcessor.js +38 -12
- package/dist/sync/ClientSessionSyncProcessor.js.map +1 -1
- package/dist/sync/next/facts.js +1 -1
- package/dist/sync/next/facts.js.map +1 -1
- package/dist/sync/next/history-dag-common.d.ts +2 -0
- package/dist/sync/next/history-dag-common.d.ts.map +1 -1
- package/dist/sync/next/history-dag-common.js +3 -1
- package/dist/sync/next/history-dag-common.js.map +1 -1
- package/dist/sync/next/history-dag.d.ts.map +1 -1
- package/dist/sync/next/history-dag.js +1 -1
- package/dist/sync/next/history-dag.js.map +1 -1
- package/dist/sync/next/rebase-events.d.ts +3 -1
- package/dist/sync/next/rebase-events.d.ts.map +1 -1
- package/dist/sync/next/rebase-events.js +5 -3
- package/dist/sync/next/rebase-events.js.map +1 -1
- package/dist/sync/next/test/compact-events.calculator.test.js +12 -12
- package/dist/sync/next/test/compact-events.calculator.test.js.map +1 -1
- package/dist/sync/next/test/compact-events.test.js +43 -43
- package/dist/sync/next/test/compact-events.test.js.map +1 -1
- package/dist/sync/next/test/mutation-fixtures.d.ts +11 -11
- package/dist/sync/next/test/mutation-fixtures.d.ts.map +1 -1
- package/dist/sync/next/test/mutation-fixtures.js +12 -10
- package/dist/sync/next/test/mutation-fixtures.js.map +1 -1
- package/dist/sync/sync.d.ts +2 -2
- package/dist/sync/syncstate.d.ts +9 -9
- package/dist/sync/syncstate.js +6 -6
- package/dist/sync/syncstate.js.map +1 -1
- package/dist/sync/syncstate.test.js +18 -16
- package/dist/sync/syncstate.test.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +2 -3
- package/src/adapter-types.ts +35 -17
- package/src/derived-mutations.ts +4 -4
- package/src/devtools/devtools-bridge.ts +10 -7
- package/src/devtools/devtools-messages-client-session.ts +26 -10
- package/src/devtools/devtools-messages-common.ts +37 -8
- package/src/devtools/devtools-messages-leader.ts +78 -16
- package/src/devtools/devtools-messages.ts +2 -2
- package/src/index.ts +1 -1
- package/src/leader-thread/LeaderSyncProcessor.ts +59 -38
- package/src/leader-thread/apply-mutation.ts +15 -5
- package/src/leader-thread/connection.ts +48 -3
- package/src/leader-thread/leader-worker-devtools.ts +85 -35
- package/src/leader-thread/make-leader-thread-layer.ts +29 -9
- package/src/leader-thread/mutationlog.ts +8 -6
- package/src/leader-thread/recreate-db.ts +19 -10
- package/src/leader-thread/types.ts +22 -15
- package/src/query-builder/api.ts +4 -4
- package/src/query-builder/impl.test.ts +22 -1
- package/src/query-builder/impl.ts +2 -2
- package/src/query-info.ts +3 -3
- package/src/rehydrate-from-mutationlog.ts +8 -6
- package/src/schema/EventId.test.ts +3 -3
- package/src/schema/EventId.ts +20 -16
- package/src/schema/MutationEvent.ts +31 -6
- package/src/schema/db-schema/ast/sqlite.ts +142 -0
- package/src/schema/db-schema/ast/validate.ts +13 -0
- package/src/schema/db-schema/dsl/__snapshots__/field-defs.test.ts.snap +206 -0
- package/src/schema/db-schema/dsl/field-defs.test.ts +35 -0
- package/src/schema/db-schema/dsl/field-defs.ts +242 -0
- package/src/schema/db-schema/dsl/mod.ts +195 -0
- package/src/schema/db-schema/hash.ts +14 -0
- package/src/schema/db-schema/mod.ts +2 -0
- package/src/schema/mod.ts +1 -0
- package/src/schema/mutations.ts +6 -19
- package/src/schema/schema-helpers.ts +1 -1
- package/src/schema/schema.ts +2 -2
- package/src/schema/system-tables.ts +10 -7
- package/src/schema/table-def.ts +17 -16
- package/src/schema-management/migrations.ts +10 -6
- package/src/sql-queries/sql-queries.ts +1 -1
- package/src/sql-queries/sql-query-builder.ts +1 -2
- package/src/sql-queries/types.ts +3 -1
- package/src/sync/ClientSessionSyncProcessor.ts +44 -14
- package/src/sync/next/facts.ts +1 -1
- package/src/sync/next/history-dag-common.ts +5 -1
- package/src/sync/next/history-dag.ts +1 -1
- package/src/sync/next/rebase-events.ts +8 -2
- package/src/sync/next/test/compact-events.calculator.test.ts +12 -12
- package/src/sync/next/test/compact-events.test.ts +43 -43
- package/src/sync/next/test/mutation-fixtures.ts +16 -12
- package/src/sync/syncstate.test.ts +19 -17
- package/src/sync/syncstate.ts +6 -6
- package/src/version.ts +1 -1
- package/tsconfig.json +1 -1
@@ -19,17 +19,7 @@ export const bootDevtools = (options) => Effect.gen(function* () {
|
|
19
19
|
const { localHead } = yield* syncProcessor.syncState;
|
20
20
|
// TODO close queue when devtools disconnects
|
21
21
|
const pullQueue = yield* connectedClientSessionPullQueues.makeQueue(localHead);
|
22
|
-
yield* Stream.fromQueue(pullQueue).pipe(Stream.tap((msg) =>
|
23
|
-
if (msg.payload._tag === 'upstream-advance') {
|
24
|
-
for (const mutationEventEncoded of msg.payload.newEvents) {
|
25
|
-
// TODO refactor with push semantics
|
26
|
-
yield* sendMessage(Devtools.MutationBroadcast.make({ mutationEventEncoded, liveStoreVersion }));
|
27
|
-
}
|
28
|
-
}
|
29
|
-
else {
|
30
|
-
yield* Effect.logWarning('TODO implement rebases in devtools');
|
31
|
-
}
|
32
|
-
})), Stream.runDrain, Effect.forkScoped);
|
22
|
+
yield* Stream.fromQueue(pullQueue).pipe(Stream.tap((msg) => sendMessage(Devtools.Leader.SyncPull.make({ payload: msg.payload, liveStoreVersion }))), Stream.runDrain, Effect.forkScoped);
|
33
23
|
yield* listenToDevtools({
|
34
24
|
incomingMessages: devtoolsWebChannel.listen.pipe(Stream.flatten(), Stream.orDie),
|
35
25
|
sendMessage,
|
@@ -37,23 +27,23 @@ export const bootDevtools = (options) => Effect.gen(function* () {
|
|
37
27
|
}).pipe(Effect.tapCauseLogPretty, Effect.forkScoped);
|
38
28
|
}).pipe(Effect.withSpan('@livestore/common:leader-thread:devtools:boot'));
|
39
29
|
const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) => Effect.gen(function* () {
|
40
|
-
const { syncBackend, makeSqliteDb, dbReadModel, dbMutationLog, shutdownStateSubRef, shutdownChannel, syncProcessor, } = yield* LeaderThreadCtx;
|
30
|
+
const { syncBackend, makeSqliteDb, dbReadModel, dbMutationLog, shutdownStateSubRef, shutdownChannel, syncProcessor, clientId, devtools, } = yield* LeaderThreadCtx;
|
41
31
|
const subscriptionFiberMap = yield* FiberMap.make();
|
42
32
|
yield* incomingMessages.pipe(Stream.tap((decodedEvent) => Effect.gen(function* () {
|
43
33
|
// yield* Effect.logDebug('[@livestore/common:leader-thread:devtools] incomingMessage', decodedEvent)
|
44
|
-
if (decodedEvent._tag === 'LSD.Disconnect') {
|
34
|
+
if (decodedEvent._tag === 'LSD.Leader.Disconnect') {
|
45
35
|
return;
|
46
36
|
}
|
47
37
|
const { requestId } = decodedEvent;
|
48
|
-
const reqPayload = { requestId, liveStoreVersion };
|
38
|
+
const reqPayload = { requestId, liveStoreVersion, clientId };
|
49
39
|
switch (decodedEvent._tag) {
|
50
|
-
case 'LSD.Ping': {
|
51
|
-
yield* sendMessage(Devtools.Pong.make({ ...reqPayload }));
|
40
|
+
case 'LSD.Leader.Ping': {
|
41
|
+
yield* sendMessage(Devtools.Leader.Pong.make({ ...reqPayload }));
|
52
42
|
return;
|
53
43
|
}
|
54
44
|
case 'LSD.Leader.SnapshotReq': {
|
55
45
|
const snapshot = dbReadModel.export();
|
56
|
-
yield* sendMessage(Devtools.SnapshotRes.make({ snapshot, ...reqPayload }));
|
46
|
+
yield* sendMessage(Devtools.Leader.SnapshotRes.make({ snapshot, ...reqPayload }));
|
57
47
|
return;
|
58
48
|
}
|
59
49
|
case 'LSD.Leader.LoadDatabaseFileReq': {
|
@@ -68,7 +58,7 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
68
58
|
}
|
69
59
|
catch (e) {
|
70
60
|
yield* Effect.logError(`Error importing database file`, e);
|
71
|
-
yield* sendMessage(Devtools.LoadDatabaseFileRes.make({ ...reqPayload, status: 'unsupported-file' }));
|
61
|
+
yield* sendMessage(Devtools.Leader.LoadDatabaseFileRes.make({ ...reqPayload, status: 'unsupported-file' }));
|
72
62
|
return;
|
73
63
|
}
|
74
64
|
if (tableNames.has(MUTATION_LOG_META_TABLE)) {
|
@@ -82,21 +72,21 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
82
72
|
dbMutationLog.destroy();
|
83
73
|
}
|
84
74
|
else {
|
85
|
-
yield* sendMessage(Devtools.LoadDatabaseFileRes.make({ ...reqPayload, status: 'unsupported-database' }));
|
75
|
+
yield* sendMessage(Devtools.Leader.LoadDatabaseFileRes.make({ ...reqPayload, status: 'unsupported-database' }));
|
86
76
|
return;
|
87
77
|
}
|
88
|
-
yield* sendMessage(Devtools.LoadDatabaseFileRes.make({ ...reqPayload, status: 'ok' }));
|
78
|
+
yield* sendMessage(Devtools.Leader.LoadDatabaseFileRes.make({ ...reqPayload, status: 'ok' }));
|
89
79
|
yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-import' })) ?? Effect.void;
|
90
80
|
return;
|
91
81
|
}
|
92
|
-
case 'LSD.Leader.
|
82
|
+
case 'LSD.Leader.ResetAllData.Request': {
|
93
83
|
const { mode } = decodedEvent;
|
94
84
|
yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
|
95
85
|
dbReadModel.destroy();
|
96
86
|
if (mode === 'all-data') {
|
97
87
|
dbMutationLog.destroy();
|
98
88
|
}
|
99
|
-
yield* sendMessage(Devtools.
|
89
|
+
yield* sendMessage(Devtools.Leader.ResetAllData.Response.make({ ...reqPayload }));
|
100
90
|
yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-reset' })) ?? Effect.void;
|
101
91
|
return;
|
102
92
|
}
|
@@ -108,7 +98,7 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
108
98
|
const dbSizeQuery = `SELECT page_count * page_size as size FROM pragma_page_count(), pragma_page_size();`;
|
109
99
|
const dbFileSize = dbReadModel.select(dbSizeQuery, undefined)[0].size;
|
110
100
|
const mutationLogFileSize = dbMutationLog.select(dbSizeQuery, undefined)[0].size;
|
111
|
-
yield* sendMessage(Devtools.DatabaseFileInfoRes.make({
|
101
|
+
yield* sendMessage(Devtools.Leader.DatabaseFileInfoRes.make({
|
112
102
|
readModel: { fileSize: dbFileSize, persistenceInfo: persistenceInfo.readModel },
|
113
103
|
mutationLog: { fileSize: mutationLogFileSize, persistenceInfo: persistenceInfo.mutationLog },
|
114
104
|
...reqPayload,
|
@@ -117,19 +107,23 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
117
107
|
}
|
118
108
|
case 'LSD.Leader.MutationLogReq': {
|
119
109
|
const mutationLog = dbMutationLog.export();
|
120
|
-
yield* sendMessage(Devtools.MutationLogRes.make({ mutationLog, ...reqPayload }));
|
110
|
+
yield* sendMessage(Devtools.Leader.MutationLogRes.make({ mutationLog, ...reqPayload }));
|
121
111
|
return;
|
122
112
|
}
|
123
113
|
case 'LSD.Leader.RunMutationReq': {
|
124
|
-
yield* syncProcessor.pushPartial(
|
125
|
-
|
114
|
+
yield* syncProcessor.pushPartial({
|
115
|
+
mutationEvent: decodedEvent.mutationEventEncoded,
|
116
|
+
clientId: `devtools-${clientId}`,
|
117
|
+
sessionId: undefined,
|
118
|
+
});
|
119
|
+
yield* sendMessage(Devtools.Leader.RunMutationRes.make({ ...reqPayload }));
|
126
120
|
return;
|
127
121
|
}
|
128
122
|
case 'LSD.Leader.SyncHistorySubscribe': {
|
129
123
|
const { requestId } = decodedEvent;
|
130
124
|
if (syncBackend !== undefined) {
|
131
125
|
// TODO consider piggybacking on the existing leader-thread sync-pulling
|
132
|
-
yield* syncBackend.pull(Option.none()).pipe(Stream.map((_) => _.batch), Stream.flattenIterables, Stream.tap(({ mutationEventEncoded, metadata }) => sendMessage(Devtools.SyncHistoryRes.make({ mutationEventEncoded, metadata, ...reqPayload }))), Stream.runDrain, Effect.acquireRelease(() => Effect.log('syncHistorySubscribe done')), Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, requestId));
|
126
|
+
yield* syncBackend.pull(Option.none()).pipe(Stream.map((_) => _.batch), Stream.flattenIterables, Stream.tap(({ mutationEventEncoded, metadata }) => sendMessage(Devtools.Leader.SyncHistoryRes.make({ mutationEventEncoded, metadata, ...reqPayload }))), Stream.runDrain, Effect.acquireRelease(() => Effect.log('syncHistorySubscribe done')), Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, requestId));
|
133
127
|
}
|
134
128
|
return;
|
135
129
|
}
|
@@ -140,11 +134,11 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
140
134
|
return;
|
141
135
|
}
|
142
136
|
case 'LSD.Leader.SyncingInfoReq': {
|
143
|
-
const syncingInfo = Devtools.SyncingInfo.make({
|
137
|
+
const syncingInfo = Devtools.Leader.SyncingInfo.make({
|
144
138
|
enabled: syncBackend !== undefined,
|
145
139
|
metadata: {},
|
146
140
|
});
|
147
|
-
yield* sendMessage(Devtools.SyncingInfoRes.make({ syncingInfo, ...reqPayload }));
|
141
|
+
yield* sendMessage(Devtools.Leader.SyncingInfoRes.make({ syncingInfo, ...reqPayload }));
|
148
142
|
return;
|
149
143
|
}
|
150
144
|
case 'LSD.Leader.NetworkStatusSubscribe': {
|
@@ -154,8 +148,8 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
154
148
|
// the devtools have connected get sometimes lost
|
155
149
|
// This is probably the same "flaky databrowser loading" bug as we're seeing in the playwright tests
|
156
150
|
yield* Effect.sleep(1000);
|
157
|
-
yield* syncBackend.isConnected.changes.pipe(Stream.tap((isConnected) => sendMessage(Devtools.NetworkStatusRes.make({
|
158
|
-
networkStatus: { isConnected, timestampMs: Date.now() },
|
151
|
+
yield* Stream.zipLatest(syncBackend.isConnected.changes, devtools.enabled ? devtools.syncBackendLatchState.changes : Stream.make({ latchClosed: false })).pipe(Stream.tap(([isConnected, { latchClosed }]) => sendMessage(Devtools.Leader.NetworkStatusRes.make({
|
152
|
+
networkStatus: { isConnected, timestampMs: Date.now(), latchClosed },
|
159
153
|
...reqPayload,
|
160
154
|
}))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, requestId));
|
161
155
|
}
|
@@ -166,6 +160,37 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
166
160
|
yield* FiberMap.remove(subscriptionFiberMap, requestId);
|
167
161
|
return;
|
168
162
|
}
|
163
|
+
case 'LSD.Leader.SyncHeadSubscribe': {
|
164
|
+
const { requestId } = decodedEvent;
|
165
|
+
yield* syncProcessor.syncState.changes.pipe(Stream.tap((syncState) => sendMessage(Devtools.Leader.SyncHeadRes.make({
|
166
|
+
local: syncState.localHead,
|
167
|
+
upstream: syncState.upstreamHead,
|
168
|
+
...reqPayload,
|
169
|
+
}))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, FiberMap.run(subscriptionFiberMap, requestId));
|
170
|
+
return;
|
171
|
+
}
|
172
|
+
case 'LSD.Leader.SyncHeadUnsubscribe': {
|
173
|
+
const { requestId } = decodedEvent;
|
174
|
+
yield* FiberMap.remove(subscriptionFiberMap, requestId);
|
175
|
+
return;
|
176
|
+
}
|
177
|
+
case 'LSD.Leader.SetSyncLatch.Request': {
|
178
|
+
const { closeLatch } = decodedEvent;
|
179
|
+
if (devtools.enabled === false)
|
180
|
+
return;
|
181
|
+
if (closeLatch === true) {
|
182
|
+
yield* devtools.syncBackendLatch.close;
|
183
|
+
}
|
184
|
+
else {
|
185
|
+
yield* devtools.syncBackendLatch.open;
|
186
|
+
}
|
187
|
+
yield* SubscriptionRef.set(devtools.syncBackendLatchState, { latchClosed: closeLatch });
|
188
|
+
yield* sendMessage(Devtools.Leader.SetSyncLatch.Response.make({ ...reqPayload }));
|
189
|
+
return;
|
190
|
+
}
|
191
|
+
default: {
|
192
|
+
yield* Effect.logWarning(`TODO implement devtools message`, decodedEvent);
|
193
|
+
}
|
169
194
|
}
|
170
195
|
}).pipe(Effect.withSpan(`@livestore/common:leader-thread:onDevtoolsMessage:${decodedEvent._tag}`))), UnexpectedError.mapToUnexpectedErrorStream, Stream.runDrain);
|
171
196
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"leader-worker-devtools.js","sourceRoot":"","sources":["../../src/leader-thread/leader-worker-devtools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE3F,OAAO,EAAE,QAAQ,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AACnG,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAA;AAE1G,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAI5C,6CAA6C;AAC7C,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAwB,EAAE,EAAE,CACvD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QAC9B,OAAM;IACR,CAAC;IAED,MAAM,EAAE,gCAAgC,EAAE,aAAa,EAAE,0BAA0B,EAAE,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAE9G,KAAK,CAAC,CAAC,gBAAgB,CAAC;QACtB,gBAAgB,EAAE,MAAM,CAAC,SAAS,CAAC,0BAA0B,CAAC;QAC9D,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;KAC/B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;IAEpD,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,eAAe,CAAA;IAE9E,MAAM,WAAW,GAA0B,CAAC,OAAO,EAAE,EAAE,CACrD,kBAAkB;SACf,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,yDAAyD,CAAC,EAC1E,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,YAAY,CACpB,CAAA;IAEL,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,SAAS,CAAA;IAEpD,6CAA6C;IAC7C,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gCAAgC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IAE9E,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CACrC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,
|
1
|
+
{"version":3,"file":"leader-worker-devtools.js","sourceRoot":"","sources":["../../src/leader-thread/leader-worker-devtools.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"make-leader-thread-layer.d.ts","sourceRoot":"","sources":["../../src/leader-thread/make-leader-thread-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAoB,KAAK,EAA0B,MAAM,yBAAyB,CAAA;AAEzF,OAAO,KAAK,EAAc,YAAY,
|
1
|
+
{"version":3,"file":"make-leader-thread-layer.d.ts","sourceRoot":"","sources":["../../src/leader-thread/make-leader-thread-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAoB,KAAK,EAA0B,MAAM,yBAAyB,CAAA;AAEzF,OAAO,KAAK,EAAc,YAAY,EAAiC,MAAM,qBAAqB,CAAA;AAClG,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAGvD,OAAO,KAAK,EAAoC,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAOpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,EACV,eAAe,EAGf,cAAc,EAEf,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,qBAAqB,4HAU/B;IACD,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,EAAE,YAAY,CAAA;IAC1B,WAAW,EAAE,WAAW,GAAG,SAAS,CAAA;IACpC,WAAW,EAAE,cAAc,CAAA;IAC3B,aAAa,EAAE,cAAc,CAAA;IAC7B,eAAe,EAAE,eAAe,CAAA;IAChC,eAAe,EAAE,eAAe,CAAA;CACjC,KAAG,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAwElF,CAAA"}
|
@@ -29,8 +29,8 @@ export const makeLeaderThreadLayer = ({ schema, storeId, clientId, makeSqliteDb,
|
|
29
29
|
const devtoolsContext = devtoolsOptions.enabled
|
30
30
|
? {
|
31
31
|
enabled: true,
|
32
|
-
|
33
|
-
|
32
|
+
syncBackendLatch: yield* Effect.makeLatch(true),
|
33
|
+
syncBackendLatchState: yield* SubscriptionRef.make({ latchClosed: false }),
|
34
34
|
}
|
35
35
|
: { enabled: false };
|
36
36
|
const ctx = {
|
@@ -49,11 +49,17 @@ export const makeLeaderThreadLayer = ({ schema, storeId, clientId, makeSqliteDb,
|
|
49
49
|
connectedClientSessionPullQueues: yield* makePullQueueSet,
|
50
50
|
extraIncomingMessagesQueue,
|
51
51
|
devtools: devtoolsContext,
|
52
|
+
// State will be set during `bootLeaderThread`
|
53
|
+
initialState: {},
|
52
54
|
};
|
53
55
|
// @ts-expect-error For debugging purposes
|
54
56
|
globalThis.__leaderThreadCtx = ctx;
|
55
57
|
const layer = Layer.succeed(LeaderThreadCtx, ctx);
|
56
|
-
yield* bootLeaderThread({
|
58
|
+
ctx.initialState = yield* bootLeaderThread({
|
59
|
+
dbMissing,
|
60
|
+
initialBlockingSyncContext,
|
61
|
+
devtoolsOptions,
|
62
|
+
}).pipe(Effect.provide(layer));
|
57
63
|
return layer;
|
58
64
|
}).pipe(Effect.withSpan('@livestore/common:leader-thread:boot'), Effect.withSpanScoped('@livestore/common:leader-thread'), UnexpectedError.mapToUnexpectedError, Layer.unwrapScoped);
|
59
65
|
const makeInitialBlockingSyncContext = ({ initialSyncOptions, bootStatusQueue, }) => Effect.gen(function* () {
|
@@ -111,15 +117,26 @@ const bootLeaderThread = ({ dbMissing, initialBlockingSyncContext, devtoolsOptio
|
|
111
117
|
const dbReady = yield* Deferred.make();
|
112
118
|
// We're already starting pulling from the sync backend concurrently but wait until the db is ready before
|
113
119
|
// processing any incoming mutations
|
114
|
-
yield* syncProcessor.boot({ dbReady });
|
120
|
+
const { initialLeaderHead } = yield* syncProcessor.boot({ dbReady });
|
121
|
+
let migrationsReport;
|
115
122
|
if (dbMissing) {
|
116
|
-
yield* recreateDb;
|
123
|
+
const recreateResult = yield* recreateDb;
|
124
|
+
migrationsReport = recreateResult.migrationsReport;
|
125
|
+
}
|
126
|
+
else {
|
127
|
+
migrationsReport = { migrations: [] };
|
117
128
|
}
|
118
129
|
yield* Deferred.succeed(dbReady, void 0);
|
119
130
|
if (initialBlockingSyncContext.blockingDeferred !== undefined) {
|
120
|
-
|
131
|
+
// Provides a syncing status right away before the first pull response comes in
|
132
|
+
yield* Queue.offer(bootStatusQueue, {
|
133
|
+
stage: 'syncing',
|
134
|
+
progress: { done: 0, total: -1 },
|
135
|
+
});
|
136
|
+
yield* initialBlockingSyncContext.blockingDeferred.pipe(Effect.withSpan('@livestore/common:leader-thread:initial-sync-blocking'));
|
121
137
|
}
|
122
138
|
yield* Queue.offer(bootStatusQueue, { stage: 'done' });
|
123
139
|
yield* bootDevtools(devtoolsOptions).pipe(Effect.tapCauseLogPretty, Effect.forkScoped);
|
140
|
+
return { migrationsReport, leaderHead: initialLeaderHead };
|
124
141
|
});
|
125
142
|
//# sourceMappingURL=make-leader-thread-layer.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"make-leader-thread-layer.js","sourceRoot":"","sources":["../../src/leader-thread/make-leader-thread-layer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAGzF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAGrD,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACnH,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AAEjE,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAS7C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,EACpC,MAAM,EACN,OAAO,EACP,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,WAAW,EACX,aAAa,EACb,eAAe,EACf,eAAe,GAWhB,EAAsF,EAAE,CACvF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,eAAe,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,EAAc,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAA;IAExG,sEAAsE;IACtE,sDAAsD;IACtD,MAAM,SAAS,GACb,WAAW,CAAC,MAAM,CAAoB,GAAG,CAAA,6CAA6C,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK,KAAK,CAAC,CAAA;IAEzG,MAAM,WAAW,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAA;IAEjH,MAAM,0BAA0B,GAAG,KAAK,CAAC,CAAC,8BAA8B,CAAC;QACvE,kBAAkB,EAAE,WAAW,EAAE,kBAAkB,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE;QACvE,eAAe;KAChB,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC;QACnD,MAAM;QACN,SAAS;QACT,aAAa;QACb,0BAA0B;KAC3B,CAAC,CAAA;IAEF,MAAM,0BAA0B,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,
|
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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"}
|
@@ -4,7 +4,7 @@ import * as EventId from '../schema/EventId.js';
|
|
4
4
|
import type * as MutationEvent from '../schema/MutationEvent.js';
|
5
5
|
import { LeaderThreadCtx } from './types.js';
|
6
6
|
export declare const getMutationEventsSince: (since: EventId.EventId) => Effect.Effect<ReadonlyArray<MutationEvent.AnyEncoded>, never, LeaderThreadCtx>;
|
7
|
-
export declare const
|
7
|
+
export declare const getClientHeadFromDb: (dbMutationLog: SqliteDb) => EventId.EventId;
|
8
8
|
export declare const getBackendHeadFromDb: (dbMutationLog: SqliteDb) => EventId.GlobalEventId;
|
9
9
|
export declare const updateBackendHead: (dbMutationLog: SqliteDb, head: EventId.EventId) => void;
|
10
10
|
//# sourceMappingURL=mutationlog.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mutationlog.d.ts","sourceRoot":"","sources":["../../src/leader-thread/mutationlog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,yBAAyB,CAAA;AAExD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,KAAK,aAAa,MAAM,4BAA4B,CAAA;AAGhE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,sBAAsB,UAC1B,OAAO,CAAC,OAAO,KACrB,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,eAAe,
|
1
|
+
{"version":3,"file":"mutationlog.d.ts","sourceRoot":"","sources":["../../src/leader-thread/mutationlog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,yBAAyB,CAAA;AAExD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,KAAK,aAAa,MAAM,4BAA4B,CAAA;AAGhE,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,eAAO,MAAM,sBAAsB,UAC1B,OAAO,CAAC,OAAO,KACrB,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,eAAe,CAoB5E,CAAA;AAEJ,eAAO,MAAM,mBAAmB,kBAAmB,QAAQ,KAAG,OAAO,CAAC,OAMrE,CAAA;AAED,eAAO,MAAM,oBAAoB,kBAAmB,QAAQ,KAAG,OAAO,CAAC,aAElD,CAAA;AAGrB,eAAO,MAAM,iBAAiB,kBAAmB,QAAQ,QAAQ,OAAO,CAAC,OAAO,SACG,CAAA"}
|
@@ -12,14 +12,16 @@ export const getMutationEventsSince = (since) => Effect.gen(function* () {
|
|
12
12
|
.map((_) => ({
|
13
13
|
mutation: _.mutation,
|
14
14
|
args: _.argsJson,
|
15
|
-
id: { global: _.idGlobal,
|
16
|
-
parentId: { global: _.parentIdGlobal,
|
15
|
+
id: { global: _.idGlobal, client: _.idClient },
|
16
|
+
parentId: { global: _.parentIdGlobal, client: _.parentIdClient },
|
17
|
+
clientId: _.clientId,
|
18
|
+
sessionId: _.sessionId ?? undefined,
|
17
19
|
}))
|
18
20
|
.filter((_) => EventId.compare(_.id, since) > 0);
|
19
21
|
});
|
20
|
-
export const
|
21
|
-
const res = dbMutationLog.select(sql `select idGlobal,
|
22
|
-
return res ? { global: res.idGlobal,
|
22
|
+
export const getClientHeadFromDb = (dbMutationLog) => {
|
23
|
+
const res = dbMutationLog.select(sql `select idGlobal, idClient from ${MUTATION_LOG_META_TABLE} order by idGlobal DESC, idClient DESC limit 1`)[0];
|
24
|
+
return res ? { global: res.idGlobal, client: res.idClient } : EventId.ROOT;
|
23
25
|
};
|
24
26
|
export const getBackendHeadFromDb = (dbMutationLog) => dbMutationLog.select(sql `select head from ${SYNC_STATUS_TABLE}`)[0]?.head ??
|
25
27
|
EventId.ROOT.global;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mutationlog.js","sourceRoot":"","sources":["../../src/leader-thread/mutationlog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC7G,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAAsB,EAC0D,EAAE,CAClF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAEhD,MAAM,KAAK,GAAG,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAA;IACtF,MAAM,wBAAwB,GAAG,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IACpH,MAAM,qBAAqB,GAAG,MAAM,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CACpG,wBAAwB,CACzB,CAAA;IAED,OAAO,qBAAqB;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,IAAI,EAAE,CAAC,CAAC,QAAQ;QAChB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,
|
1
|
+
{"version":3,"file":"mutationlog.js","sourceRoot":"","sources":["../../src/leader-thread/mutationlog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGxD,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAE/C,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC7G,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAAsB,EAC0D,EAAE,CAClF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAEhD,MAAM,KAAK,GAAG,oBAAoB,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAA;IACtF,MAAM,wBAAwB,GAAG,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAA;IACpH,MAAM,qBAAqB,GAAG,MAAM,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CACpG,wBAAwB,CACzB,CAAA;IAED,OAAO,qBAAqB;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,IAAI,EAAE,CAAC,CAAC,QAAQ;QAChB,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;QAC9C,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC,cAAc,EAAE;QAChE,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,SAAS;KACpC,CAAC,CAAC;SACF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;AACpD,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,aAAuB,EAAmB,EAAE;IAC9E,MAAM,GAAG,GAAG,aAAa,CAAC,MAAM,CAC9B,GAAG,CAAA,kCAAkC,uBAAuB,gDAAgD,CAC7G,CAAC,CAAC,CAAC,CAAA;IAEJ,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAA;AAC5E,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,aAAuB,EAAyB,EAAE,CACrF,aAAa,CAAC,MAAM,CAAkC,GAAG,CAAA,oBAAoB,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI;IAC1G,OAAO,CAAC,IAAI,CAAC,MAAM,CAAA;AAErB,+BAA+B;AAC/B,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,aAAuB,EAAE,IAAqB,EAAE,EAAE,CAClF,aAAa,CAAC,OAAO,CAAC,GAAG,CAAA,UAAU,iBAAiB,eAAe,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"pull-queue-set.d.ts","sourceRoot":"","sources":["../../src/leader-thread/pull-queue-set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAIvD,OAAO,EAAE,KAAK,aAAa,EAAqB,MAAM,YAAY,CAAA;AAElE,eAAO,MAAM,gBAAgB;
|
1
|
+
{"version":3,"file":"pull-queue-set.d.ts","sourceRoot":"","sources":["../../src/leader-thread/pull-queue-set.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAIvD,OAAO,EAAE,KAAK,aAAa,EAAqB,MAAM,YAAY,CAAA;AAElE,eAAO,MAAM,gBAAgB;kEAoDw+F,OAAQ,MAAM,CAAC,MAAM,KAAK;oCAAkG,OAAQ,MAAM;uCAD7oG,CAAA"}
|
@@ -1,7 +1,9 @@
|
|
1
1
|
import type { HttpClient } from '@livestore/utils/effect';
|
2
2
|
import { Effect } from '@livestore/utils/effect';
|
3
|
-
import type { InvalidPullError, IsOfflineError, SqliteError } from '../index.js';
|
3
|
+
import type { InvalidPullError, IsOfflineError, MigrationsReport, SqliteError } from '../index.js';
|
4
4
|
import { UnexpectedError } from '../index.js';
|
5
5
|
import { LeaderThreadCtx } from './types.js';
|
6
|
-
export declare const recreateDb: Effect.Effect<
|
6
|
+
export declare const recreateDb: Effect.Effect<{
|
7
|
+
migrationsReport: MigrationsReport;
|
8
|
+
}, UnexpectedError | SqliteError | IsOfflineError | InvalidPullError, LeaderThreadCtx | HttpClient.HttpClient>;
|
7
9
|
//# sourceMappingURL=recreate-db.d.ts.map
|
@@ -1 +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;
|
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,gBAAgB,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAClH,OAAO,EAAkE,eAAe,EAAE,MAAM,aAAa,CAAA;AAE7G,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,CA6GxC,CAAA"}
|
@@ -6,6 +6,7 @@ import { LeaderThreadCtx } from './types.js';
|
|
6
6
|
export const recreateDb = Effect.gen(function* () {
|
7
7
|
const { dbReadModel, dbMutationLog, schema, bootStatusQueue } = yield* LeaderThreadCtx;
|
8
8
|
const migrationOptions = schema.migrationOptions;
|
9
|
+
let migrationsReport;
|
9
10
|
yield* Effect.addFinalizer(Effect.fn('recreateDb:finalizer')(function* (ex) {
|
10
11
|
if (ex._tag === 'Failure')
|
11
12
|
dbReadModel.destroy();
|
@@ -15,41 +16,44 @@ export const recreateDb = Effect.gen(function* () {
|
|
15
16
|
// TODO bring back this optimization
|
16
17
|
// const tmpDb = yield* makeSqliteDb({ _tag: 'in-memory' })
|
17
18
|
const tmpDb = dbReadModel;
|
18
|
-
yield* configureConnection(tmpDb, {
|
19
|
+
yield* configureConnection(tmpDb, { foreignKeys: true });
|
19
20
|
const initDb = (hooks) => Effect.gen(function* () {
|
20
21
|
yield* Effect.tryAll(() => hooks?.init?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
21
|
-
yield* migrateDb({
|
22
|
+
const migrationsReport = yield* migrateDb({
|
22
23
|
db: tmpDb,
|
23
24
|
schema,
|
24
25
|
onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'migrating', progress: { done, total } }),
|
25
26
|
});
|
26
27
|
initializeSingletonTables(schema, tmpDb);
|
27
28
|
yield* Effect.tryAll(() => hooks?.pre?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
28
|
-
return tmpDb;
|
29
|
+
return { migrationsReport, tmpDb };
|
29
30
|
});
|
30
31
|
switch (migrationOptions.strategy) {
|
31
32
|
case 'from-mutation-log': {
|
32
33
|
const hooks = migrationOptions.hooks;
|
33
|
-
const
|
34
|
+
const initResult = yield* initDb(hooks);
|
35
|
+
migrationsReport = initResult.migrationsReport;
|
34
36
|
yield* rehydrateFromMutationLog({
|
35
|
-
db: tmpDb,
|
37
|
+
db: initResult.tmpDb,
|
36
38
|
logDb: dbMutationLog,
|
37
39
|
schema,
|
38
40
|
migrationOptions,
|
39
41
|
onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'rehydrating', progress: { done, total } }),
|
40
42
|
});
|
41
|
-
yield* Effect.tryAll(() => hooks?.post?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
43
|
+
yield* Effect.tryAll(() => hooks?.post?.(initResult.tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
42
44
|
break;
|
43
45
|
}
|
44
46
|
case 'hard-reset': {
|
45
47
|
const hooks = migrationOptions.hooks;
|
46
|
-
const
|
48
|
+
const initResult = yield* initDb(hooks);
|
49
|
+
migrationsReport = initResult.migrationsReport;
|
47
50
|
// The database is migrated but empty now, so nothing else to do
|
48
|
-
yield* Effect.tryAll(() => hooks?.post?.(
|
51
|
+
yield* Effect.tryAll(() => hooks?.post?.(initResult.tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
49
52
|
break;
|
50
53
|
}
|
51
54
|
case 'manual': {
|
52
55
|
const oldDbData = dbReadModel.export();
|
56
|
+
migrationsReport = { migrations: [] };
|
53
57
|
const newDbData = yield* Effect.tryAll(() => migrationOptions.migrate(oldDbData)).pipe(UnexpectedError.mapToUnexpectedError);
|
54
58
|
tmpDb.import(newDbData);
|
55
59
|
// TODO validate schema
|
@@ -70,6 +74,7 @@ export const recreateDb = Effect.gen(function* () {
|
|
70
74
|
// const snapshotFromTmpDb = tmpDb.export()
|
71
75
|
// TODO bring back
|
72
76
|
// tmpDb.close()
|
77
|
+
return { migrationsReport };
|
73
78
|
}).pipe(Effect.scoped, // NOTE we're closing the scope here so finalizers are called when the effect is done
|
74
79
|
Effect.withSpan('@livestore/common:leader-thread:recreateDb'), Effect.withPerformanceMeasure('@livestore/common:leader-thread:recreateDb'));
|
75
80
|
//# sourceMappingURL=recreate-db.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"recreate-db.js","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAE/C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAGvD,OAAO,EAAE,yBAAyB,EAAE,SAAS,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7G,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,CAAC,MAAM,UAAU,GAInB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACtB,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAEtF,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAA;
|
1
|
+
{"version":3,"file":"recreate-db.js","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"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"}
|
@@ -1,23 +1,18 @@
|
|
1
|
-
import type { Deferred, Effect,
|
1
|
+
import type { Deferred, Effect, HttpClient, Option, Queue, Scope, Subscribable, SubscriptionRef, WebChannel } from '@livestore/utils/effect';
|
2
2
|
import { Context, Schema } from '@livestore/utils/effect';
|
3
|
-
import type { BootStatus, Devtools, InvalidPushError, MakeSqliteDb, PersistenceInfo, SqliteDb, SyncBackend, UnexpectedError } from '../index.js';
|
3
|
+
import type { BootStatus, Devtools, InvalidPushError, MakeSqliteDb, MigrationsReport, PersistenceInfo, SqliteDb, SyncBackend, UnexpectedError } from '../index.js';
|
4
4
|
import type { EventId, LiveStoreSchema, MutationEvent } from '../schema/mod.js';
|
5
5
|
import type * as SyncState from '../sync/syncstate.js';
|
6
6
|
import type { ShutdownChannel } from './shutdown-channel.js';
|
7
7
|
export type ShutdownState = 'running' | 'shutting-down';
|
8
|
-
declare const OuterWorkerCtx_base: Context.TagClass<OuterWorkerCtx, "OuterWorkerCtx", {
|
9
|
-
innerFiber: Fiber.RuntimeFiber<any, any>;
|
10
|
-
}>;
|
11
|
-
export declare class OuterWorkerCtx extends OuterWorkerCtx_base {
|
12
|
-
}
|
13
8
|
export declare const InitialSyncOptionsSkip: Schema.TaggedStruct<"Skip", {}>;
|
14
9
|
export type InitialSyncOptionsSkip = typeof InitialSyncOptionsSkip.Type;
|
15
10
|
export declare const InitialSyncOptionsBlocking: Schema.TaggedStruct<"Blocking", {
|
16
|
-
timeout: typeof Schema.DurationFromMillis
|
11
|
+
timeout: Schema.Union<[typeof Schema.DurationFromMillis, typeof Schema.Number]>;
|
17
12
|
}>;
|
18
13
|
export type InitialSyncOptionsBlocking = typeof InitialSyncOptionsBlocking.Type;
|
19
14
|
export declare const InitialSyncOptions: Schema.Union<[Schema.TaggedStruct<"Skip", {}>, Schema.TaggedStruct<"Blocking", {
|
20
|
-
timeout: typeof Schema.DurationFromMillis
|
15
|
+
timeout: Schema.Union<[typeof Schema.DurationFromMillis, typeof Schema.Number]>;
|
21
16
|
}>]>;
|
22
17
|
export type InitialSyncOptions = typeof InitialSyncOptions.Type;
|
23
18
|
export type InitialSyncInfo = Option.Option<{
|
@@ -37,14 +32,16 @@ export type DevtoolsOptions = {
|
|
37
32
|
} | {
|
38
33
|
enabled: true;
|
39
34
|
makeBootContext: Effect.Effect<{
|
40
|
-
devtoolsWebChannel: WebChannel.WebChannel<Devtools.
|
35
|
+
devtoolsWebChannel: WebChannel.WebChannel<Devtools.Leader.MessageToApp, Devtools.Leader.MessageFromApp>;
|
41
36
|
persistenceInfo: PersistenceInfoPair;
|
42
37
|
}, UnexpectedError, Scope.Scope>;
|
43
38
|
};
|
44
39
|
export type DevtoolsContext = {
|
45
40
|
enabled: true;
|
46
|
-
|
47
|
-
|
41
|
+
syncBackendLatch: Effect.Latch;
|
42
|
+
syncBackendLatchState: SubscriptionRef.SubscriptionRef<{
|
43
|
+
latchClosed: boolean;
|
44
|
+
}>;
|
48
45
|
} | {
|
49
46
|
enabled: false;
|
50
47
|
};
|
@@ -63,12 +60,16 @@ declare const LeaderThreadCtx_base: Context.TagClass<LeaderThreadCtx, "LeaderThr
|
|
63
60
|
syncBackend: SyncBackend | undefined;
|
64
61
|
syncProcessor: LeaderSyncProcessor;
|
65
62
|
connectedClientSessionPullQueues: PullQueueSet;
|
63
|
+
initialState: {
|
64
|
+
leaderHead: EventId.EventId;
|
65
|
+
migrationsReport: MigrationsReport;
|
66
|
+
};
|
66
67
|
/**
|
67
68
|
* e.g. used for `store._dev` APIs
|
68
69
|
*
|
69
70
|
* This is currently separated from `.devtools` as it also needs to work when devtools are disabled
|
70
71
|
*/
|
71
|
-
extraIncomingMessagesQueue: Queue.Queue<Devtools.
|
72
|
+
extraIncomingMessagesQueue: Queue.Queue<Devtools.Leader.MessageToApp>;
|
72
73
|
}>;
|
73
74
|
export declare class LeaderThreadCtx extends LeaderThreadCtx_base {
|
74
75
|
}
|
@@ -93,10 +94,16 @@ export interface LeaderSyncProcessor {
|
|
93
94
|
*/
|
94
95
|
waitForProcessing?: boolean;
|
95
96
|
}) => Effect.Effect<void, InvalidPushError>;
|
96
|
-
pushPartial: (
|
97
|
+
pushPartial: (args: {
|
98
|
+
mutationEvent: MutationEvent.PartialAnyEncoded;
|
99
|
+
clientId: string;
|
100
|
+
sessionId: string | undefined;
|
101
|
+
}) => Effect.Effect<void, UnexpectedError, LeaderThreadCtx>;
|
97
102
|
boot: (args: {
|
98
103
|
dbReady: Deferred.Deferred<void>;
|
99
|
-
}) => Effect.Effect<
|
104
|
+
}) => Effect.Effect<{
|
105
|
+
initialLeaderHead: EventId.EventId;
|
106
|
+
}, UnexpectedError, LeaderThreadCtx | Scope.Scope | HttpClient.HttpClient>;
|
100
107
|
syncState: Subscribable.Subscribable<SyncState.SyncState>;
|
101
108
|
}
|
102
109
|
export interface PullQueueSet {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,MAAM,EACN,
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/leader-thread/types.ts"],"names":[],"mappings":"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"}
|
@@ -1,9 +1,7 @@
|
|
1
1
|
import { Context, Schema } from '@livestore/utils/effect';
|
2
|
-
export class OuterWorkerCtx extends Context.Tag('OuterWorkerCtx')() {
|
3
|
-
}
|
4
2
|
export const InitialSyncOptionsSkip = Schema.TaggedStruct('Skip', {});
|
5
3
|
export const InitialSyncOptionsBlocking = Schema.TaggedStruct('Blocking', {
|
6
|
-
timeout: Schema.DurationFromMillis,
|
4
|
+
timeout: Schema.Union(Schema.DurationFromMillis, Schema.Number),
|
7
5
|
});
|
8
6
|
export const InitialSyncOptions = Schema.Union(InitialSyncOptionsSkip, InitialSyncOptionsBlocking);
|
9
7
|
export class LeaderThreadCtx extends Context.Tag('LeaderThreadCtx')() {
|