@livestore/common 0.3.0-dev.10 → 0.3.0-dev.11
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/adapter-types.d.ts +22 -13
- package/dist/adapter-types.d.ts.map +1 -1
- package/dist/adapter-types.js.map +1 -1
- package/dist/devtools/devtool-message-leader.d.ts +2 -0
- package/dist/devtools/devtool-message-leader.d.ts.map +1 -0
- package/dist/devtools/devtool-message-leader.js +2 -0
- package/dist/devtools/devtool-message-leader.js.map +1 -0
- package/dist/devtools/devtools-messages-client-session.d.ts +297 -0
- package/dist/devtools/devtools-messages-client-session.d.ts.map +1 -0
- package/dist/devtools/devtools-messages-client-session.js +61 -0
- package/dist/devtools/devtools-messages-client-session.js.map +1 -0
- package/dist/devtools/devtools-messages-common.d.ts +65 -0
- package/dist/devtools/devtools-messages-common.d.ts.map +1 -0
- package/dist/devtools/devtools-messages-common.js +35 -0
- package/dist/devtools/devtools-messages-common.js.map +1 -0
- package/dist/devtools/devtools-messages-leader.d.ts +261 -0
- package/dist/devtools/devtools-messages-leader.d.ts.map +1 -0
- package/dist/devtools/devtools-messages-leader.js +85 -0
- package/dist/devtools/devtools-messages-leader.js.map +1 -0
- package/dist/devtools/devtools-messages.d.ts +3 -580
- package/dist/devtools/devtools-messages.d.ts.map +1 -1
- package/dist/devtools/devtools-messages.js +3 -174
- package/dist/devtools/devtools-messages.js.map +1 -1
- package/dist/init-singleton-tables.d.ts +2 -2
- package/dist/init-singleton-tables.d.ts.map +1 -1
- package/dist/init-singleton-tables.js.map +1 -1
- package/dist/leader-thread/LeaderSyncProcessor.d.ts +4 -4
- 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 +4 -4
- package/dist/leader-thread/apply-mutation.js.map +1 -1
- package/dist/leader-thread/connection.d.ts +4 -4
- package/dist/leader-thread/connection.d.ts.map +1 -1
- package/dist/leader-thread/connection.js +5 -5
- package/dist/leader-thread/connection.js.map +1 -1
- package/dist/leader-thread/leader-worker-devtools.js +17 -17
- package/dist/leader-thread/leader-worker-devtools.js.map +1 -1
- package/dist/leader-thread/make-leader-thread-layer.d.ts +6 -6
- package/dist/leader-thread/make-leader-thread-layer.d.ts.map +1 -1
- package/dist/leader-thread/make-leader-thread-layer.js +23 -10
- package/dist/leader-thread/make-leader-thread-layer.js.map +1 -1
- package/dist/leader-thread/mutationlog.d.ts +4 -4
- package/dist/leader-thread/mutationlog.d.ts.map +1 -1
- package/dist/leader-thread/mutationlog.js +6 -6
- 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.js +19 -19
- package/dist/leader-thread/recreate-db.js.map +1 -1
- package/dist/leader-thread/types.d.ts +20 -8
- package/dist/leader-thread/types.d.ts.map +1 -1
- package/dist/leader-thread/types.js.map +1 -1
- package/dist/rehydrate-from-mutationlog.d.ts +3 -3
- package/dist/rehydrate-from-mutationlog.d.ts.map +1 -1
- package/dist/rehydrate-from-mutationlog.js.map +1 -1
- package/dist/schema-management/common.d.ts +3 -3
- package/dist/schema-management/common.d.ts.map +1 -1
- package/dist/schema-management/common.js.map +1 -1
- package/dist/schema-management/migrations.d.ts +4 -4
- package/dist/schema-management/migrations.d.ts.map +1 -1
- package/dist/schema-management/migrations.js.map +1 -1
- package/dist/sync/ClientSessionSyncProcessor.d.ts +5 -7
- package/dist/sync/ClientSessionSyncProcessor.d.ts.map +1 -1
- package/dist/sync/ClientSessionSyncProcessor.js +13 -6
- package/dist/sync/ClientSessionSyncProcessor.js.map +1 -1
- package/dist/sync/next/test/mutation-fixtures.d.ts +7 -7
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +3 -3
- package/src/adapter-types.ts +18 -17
- package/src/devtools/devtools-messages-client-session.ts +109 -0
- package/src/devtools/devtools-messages-common.ts +52 -0
- package/src/devtools/devtools-messages-leader.ts +115 -0
- package/src/devtools/devtools-messages.ts +3 -246
- package/src/init-singleton-tables.ts +2 -2
- package/src/leader-thread/LeaderSyncProcessor.ts +78 -45
- package/src/leader-thread/apply-mutation.ts +5 -5
- package/src/leader-thread/connection.ts +7 -7
- package/src/leader-thread/leader-worker-devtools.ts +25 -18
- package/src/leader-thread/make-leader-thread-layer.ts +38 -17
- package/src/leader-thread/mutationlog.ts +9 -9
- package/src/leader-thread/recreate-db.ts +19 -19
- package/src/leader-thread/types.ts +24 -10
- package/src/rehydrate-from-mutationlog.ts +3 -3
- package/src/schema-management/common.ts +3 -3
- package/src/schema-management/migrations.ts +4 -4
- package/src/sync/ClientSessionSyncProcessor.ts +18 -13
- package/src/version.ts +1 -1
@@ -14,7 +14,7 @@ export const makeApplyMutation = Effect.gen(function* () {
|
|
14
14
|
// Also see https://github.com/Effect-TS/effect/issues/2719
|
15
15
|
[...leaderThreadCtx.schema.mutations.entries()].map(([k, v]) => [k, Schema.hash(v.schema)]));
|
16
16
|
return (mutationEventEncoded, options) => Effect.gen(function* () {
|
17
|
-
const { schema, db,
|
17
|
+
const { schema, dbReadModel: db, dbMutationLog } = leaderThreadCtx;
|
18
18
|
const skipMutationLog = options?.skipMutationLog ?? false;
|
19
19
|
const mutationName = mutationEventEncoded.mutation;
|
20
20
|
const mutationDef = schema.mutations.get(mutationName) ?? shouldNeverHappen(`Unknown mutation: ${mutationName}`);
|
@@ -55,7 +55,7 @@ export const makeApplyMutation = Effect.gen(function* () {
|
|
55
55
|
// write to mutation_log
|
56
56
|
const excludeFromMutationLog = shouldExcludeMutationFromLog(mutationName, mutationEventEncoded);
|
57
57
|
if (skipMutationLog === false && excludeFromMutationLog === false) {
|
58
|
-
yield* insertIntoMutationLog(mutationEventEncoded,
|
58
|
+
yield* insertIntoMutationLog(mutationEventEncoded, dbMutationLog, mutationDefSchemaHashMap);
|
59
59
|
}
|
60
60
|
else {
|
61
61
|
// console.debug('[@livestore/common:leader-thread] skipping mutation log write', mutation, statementSql, bindValues)
|
@@ -68,11 +68,11 @@ export const makeApplyMutation = Effect.gen(function* () {
|
|
68
68
|
},
|
69
69
|
}));
|
70
70
|
});
|
71
|
-
const insertIntoMutationLog = (mutationEventEncoded,
|
71
|
+
const insertIntoMutationLog = (mutationEventEncoded, dbMutationLog, mutationDefSchemaHashMap) => Effect.gen(function* () {
|
72
72
|
const mutationName = mutationEventEncoded.mutation;
|
73
73
|
const mutationDefSchemaHash = mutationDefSchemaHashMap.get(mutationName) ?? shouldNeverHappen(`Unknown mutation: ${mutationName}`);
|
74
74
|
// TODO use prepared statements
|
75
|
-
yield* execSql(
|
75
|
+
yield* execSql(dbMutationLog, ...insertRow({
|
76
76
|
tableName: MUTATION_LOG_META_TABLE,
|
77
77
|
columns: mutationLogMetaTable.sqliteDef.columns,
|
78
78
|
values: {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"apply-mutation.js","sourceRoot":"","sources":["../../src/leader-thread/apply-mutation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAElE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhE,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAEL,uBAAuB,EAEvB,oBAAoB,EACpB,4BAA4B,EAC5B,yBAAyB,GAC1B,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAU5C,MAAM,CAAC,MAAM,iBAAiB,GAAuE,MAAM,CAAC,GAAG,CAC7G,QAAQ,CAAC;IACP,MAAM,eAAe,GAAG,KAAK,CAAC,CAAC,eAAe,CAAA;IAC9C,MAAM,4BAA4B,GAAG,gCAAgC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IAE7F,MAAM,wBAAwB,GAAG,IAAI,GAAG;IACtC,yGAAyG;IACzG,6DAA6D;IAC7D,2DAA2D;IAC3D,CAAC,GAAG,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAU,CAAC,CACrG,CAAA;IAED,OAAO,CAAC,oBAAoB,EAAE,OAAO,EAAE,EAAE,CACvC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,
|
1
|
+
{"version":3,"file":"apply-mutation.js","sourceRoot":"","sources":["../../src/leader-thread/apply-mutation.ts"],"names":[],"mappings":"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"}
|
@@ -1,11 +1,11 @@
|
|
1
1
|
import { Effect } from '@livestore/utils/effect';
|
2
|
-
import type {
|
2
|
+
import type { SqliteDb } from '../adapter-types.js';
|
3
3
|
import { SqliteError } from '../adapter-types.js';
|
4
4
|
import type { BindValues } from '../sql-queries/index.js';
|
5
5
|
import type { PreparedBindValues } from '../util.js';
|
6
|
-
export declare const configureConnection: (
|
6
|
+
export declare const configureConnection: (sqliteDb: SqliteDb, { fkEnabled }: {
|
7
7
|
fkEnabled: boolean;
|
8
8
|
}) => Effect.Effect<void, SqliteError, never>;
|
9
|
-
export declare const execSql: (
|
10
|
-
export declare const execSqlPrepared: (
|
9
|
+
export declare const execSql: (sqliteDb: SqliteDb, sql: string, bind: BindValues) => Effect.Effect<void, SqliteError, never>;
|
10
|
+
export declare const execSqlPrepared: (sqliteDb: SqliteDb, sql: string, bindValues: PreparedBindValues) => Effect.Effect<void, SqliteError, never>;
|
11
11
|
//# sourceMappingURL=connection.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/leader-thread/connection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,EAAE,
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/leader-thread/connection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAQpD,eAAO,MAAM,mBAAmB,aAAc,QAAQ,iBAAiB;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,4CAS1F,CAAA;AAEH,eAAO,MAAM,OAAO,aAAc,QAAQ,OAAO,MAAM,QAAQ,UAAU,4CAaxE,CAAA;AAYD,eAAO,MAAM,eAAe,aAAc,QAAQ,OAAO,MAAM,cAAc,kBAAkB,4CAgB9F,CAAA"}
|
@@ -2,15 +2,15 @@
|
|
2
2
|
import { Effect } from '@livestore/utils/effect';
|
3
3
|
import { SqliteError } from '../adapter-types.js';
|
4
4
|
import { prepareBindValues, sql } from '../util.js';
|
5
|
-
export const configureConnection = (
|
5
|
+
export const configureConnection = (sqliteDb, { fkEnabled }) => execSql(sqliteDb, sql `
|
6
6
|
PRAGMA page_size=8192;
|
7
7
|
PRAGMA journal_mode=MEMORY;
|
8
8
|
${fkEnabled ? sql `PRAGMA foreign_keys='ON';` : sql `PRAGMA foreign_keys='OFF';`}
|
9
9
|
`, {});
|
10
|
-
export const execSql = (
|
10
|
+
export const execSql = (sqliteDb, sql, bind) => {
|
11
11
|
const bindValues = prepareBindValues(bind, sql);
|
12
12
|
return Effect.try({
|
13
|
-
try: () =>
|
13
|
+
try: () => sqliteDb.execute(sql, bindValues),
|
14
14
|
catch: (cause) => new SqliteError({ cause, query: { bindValues, sql }, code: cause.code }),
|
15
15
|
}).pipe(Effect.asVoid,
|
16
16
|
// Effect.logDuration(`@livestore/common:execSql:${sql}`),
|
@@ -27,9 +27,9 @@ export const execSql = (syncDb, sql, bind) => {
|
|
27
27
|
// })
|
28
28
|
// }
|
29
29
|
// TODO actually use prepared statements
|
30
|
-
export const execSqlPrepared = (
|
30
|
+
export const execSqlPrepared = (sqliteDb, sql, bindValues) => {
|
31
31
|
return Effect.try({
|
32
|
-
try: () =>
|
32
|
+
try: () => sqliteDb.execute(sql, bindValues),
|
33
33
|
catch: (cause) => new SqliteError({ cause, query: { bindValues, sql }, code: cause.code }),
|
34
34
|
}).pipe(Effect.asVoid,
|
35
35
|
// Effect.logDuration(`@livestore/common:execSqlPrepared:${sql}`),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/leader-thread/connection.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAGjD,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAOnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/leader-thread/connection.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAGjD,OAAO,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAOnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,QAAkB,EAAE,EAAE,SAAS,EAA0B,EAAE,EAAE,CAC/F,OAAO,CACL,QAAQ,EACR,GAAG,CAAA;;;MAGD,SAAS,CAAC,CAAC,CAAC,GAAG,CAAA,2BAA2B,CAAC,CAAC,CAAC,GAAG,CAAA,4BAA4B;GAC/E,EACC,EAAE,CACH,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,QAAkB,EAAE,GAAW,EAAE,IAAgB,EAAE,EAAE;IAC3E,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;IAC/C,OAAO,MAAM,CAAC,GAAG,CAAC;QAChB,GAAG,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC;QAC5C,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,IAAI,EAAG,KAA8B,CAAC,IAAI,EAAE,CAAC;KACrG,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,MAAM;IACb,0DAA0D;IAC1D,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE;QAC3C,UAAU,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;KAC/E,CAAC,CACH,CAAA;AACH,CAAC,CAAA;AAED,gFAAgF;AAChF,yDAAyD;AACzD,wBAAwB;AACxB,6CAA6C;AAC7C,wBAAwB;AACxB,sHAAsH;AACtH,OAAO;AACP,IAAI;AAEJ,wCAAwC;AACxC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAkB,EAAE,GAAW,EAAE,UAA8B,EAAE,EAAE;IACjG,OAAO,MAAM,CAAC,GAAG,CAAC;QAChB,GAAG,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC;QAC5C,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CACf,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,IAAI,EAAG,KAA8B,CAAC,IAAI,EAAE,CAAC;KACrG,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,MAAM;IACb,kEAAkE;IAClE,MAAM,CAAC,QAAQ,CAAC,mCAAmC,EAAE;QACnD,UAAU,EAAE;YACV,YAAY,EAAE,GAAG;YACjB,GAAG;YACH,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;SACvC;KACF,CAAC,CACH,CAAA;AACH,CAAC,CAAA"}
|
@@ -12,7 +12,7 @@ export const bootDevtools = (options) => Effect.gen(function* () {
|
|
12
12
|
incomingMessages: Stream.fromQueue(extraIncomingMessagesQueue),
|
13
13
|
sendMessage: () => Effect.void,
|
14
14
|
}).pipe(Effect.tapCauseLogPretty, Effect.forkScoped);
|
15
|
-
const { persistenceInfo, devtoolsWebChannel } = yield* options.
|
15
|
+
const { persistenceInfo, devtoolsWebChannel } = yield* options.makeBootContext;
|
16
16
|
const sendMessage = (message) => devtoolsWebChannel
|
17
17
|
.send(message)
|
18
18
|
.pipe(Effect.withSpan('@livestore/common:leader-thread:devtools:sendToDevtools'), Effect.interruptible, Effect.ignoreLogged);
|
@@ -37,7 +37,7 @@ export const bootDevtools = (options) => Effect.gen(function* () {
|
|
37
37
|
}).pipe(Effect.tapCauseLogPretty, Effect.forkScoped);
|
38
38
|
}).pipe(Effect.withSpan('@livestore/common:leader-thread:devtools:boot'));
|
39
39
|
const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) => Effect.gen(function* () {
|
40
|
-
const { syncBackend,
|
40
|
+
const { syncBackend, makeSqliteDb, dbReadModel, dbMutationLog, shutdownStateSubRef, shutdownChannel, syncProcessor, } = yield* LeaderThreadCtx;
|
41
41
|
const subscriptionFiberMap = yield* FiberMap.make();
|
42
42
|
yield* incomingMessages.pipe(Stream.tap((decodedEvent) => Effect.gen(function* () {
|
43
43
|
// yield* Effect.logDebug('[@livestore/common:leader-thread:devtools] incomingMessage', decodedEvent)
|
@@ -52,7 +52,7 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
52
52
|
return;
|
53
53
|
}
|
54
54
|
case 'LSD.Leader.SnapshotReq': {
|
55
|
-
const snapshot =
|
55
|
+
const snapshot = dbReadModel.export();
|
56
56
|
yield* sendMessage(Devtools.SnapshotRes.make({ snapshot, ...reqPayload }));
|
57
57
|
return;
|
58
58
|
}
|
@@ -60,11 +60,11 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
60
60
|
const { data } = decodedEvent;
|
61
61
|
let tableNames;
|
62
62
|
try {
|
63
|
-
const
|
64
|
-
|
65
|
-
const tableNameResults =
|
63
|
+
const tmpDb = yield* makeSqliteDb({ _tag: 'in-memory' });
|
64
|
+
tmpDb.import(data);
|
65
|
+
const tableNameResults = tmpDb.select(`select name from sqlite_master where type = 'table'`);
|
66
66
|
tableNames = new Set(tableNameResults.map((_) => _.name));
|
67
|
-
|
67
|
+
tmpDb.close();
|
68
68
|
}
|
69
69
|
catch (e) {
|
70
70
|
yield* Effect.logError(`Error importing database file`, e);
|
@@ -73,13 +73,13 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
73
73
|
}
|
74
74
|
if (tableNames.has(MUTATION_LOG_META_TABLE)) {
|
75
75
|
yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
|
76
|
-
|
77
|
-
|
76
|
+
dbMutationLog.import(data);
|
77
|
+
dbReadModel.destroy();
|
78
78
|
}
|
79
79
|
else if (tableNames.has(SCHEMA_META_TABLE) && tableNames.has(SCHEMA_MUTATIONS_META_TABLE)) {
|
80
80
|
yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
|
81
|
-
|
82
|
-
|
81
|
+
dbReadModel.import(data);
|
82
|
+
dbMutationLog.destroy();
|
83
83
|
}
|
84
84
|
else {
|
85
85
|
yield* sendMessage(Devtools.LoadDatabaseFileRes.make({ ...reqPayload, status: 'unsupported-database' }));
|
@@ -92,9 +92,9 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
92
92
|
case 'LSD.Leader.ResetAllDataReq': {
|
93
93
|
const { mode } = decodedEvent;
|
94
94
|
yield* SubscriptionRef.set(shutdownStateSubRef, 'shutting-down');
|
95
|
-
|
95
|
+
dbReadModel.destroy();
|
96
96
|
if (mode === 'all-data') {
|
97
|
-
|
97
|
+
dbMutationLog.destroy();
|
98
98
|
}
|
99
99
|
yield* sendMessage(Devtools.ResetAllDataRes.make({ ...reqPayload }));
|
100
100
|
yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'devtools-reset' })) ?? Effect.void;
|
@@ -106,17 +106,17 @@ const listenToDevtools = ({ incomingMessages, sendMessage, persistenceInfo, }) =
|
|
106
106
|
return;
|
107
107
|
}
|
108
108
|
const dbSizeQuery = `SELECT page_count * page_size as size FROM pragma_page_count(), pragma_page_size();`;
|
109
|
-
const dbFileSize =
|
110
|
-
const mutationLogFileSize =
|
109
|
+
const dbFileSize = dbReadModel.select(dbSizeQuery, undefined)[0].size;
|
110
|
+
const mutationLogFileSize = dbMutationLog.select(dbSizeQuery, undefined)[0].size;
|
111
111
|
yield* sendMessage(Devtools.DatabaseFileInfoRes.make({
|
112
|
-
|
112
|
+
readModel: { fileSize: dbFileSize, persistenceInfo: persistenceInfo.readModel },
|
113
113
|
mutationLog: { fileSize: mutationLogFileSize, persistenceInfo: persistenceInfo.mutationLog },
|
114
114
|
...reqPayload,
|
115
115
|
}));
|
116
116
|
return;
|
117
117
|
}
|
118
118
|
case 'LSD.Leader.MutationLogReq': {
|
119
|
-
const mutationLog =
|
119
|
+
const mutationLog = dbMutationLog.export();
|
120
120
|
yield* sendMessage(Devtools.MutationLogRes.make({ mutationLog, ...reqPayload }));
|
121
121
|
return;
|
122
122
|
}
|
@@ -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,
|
1
|
+
{"version":3,"file":"leader-worker-devtools.js","sourceRoot":"","sources":["../../src/leader-thread/leader-worker-devtools.ts"],"names":[],"mappings":"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"}
|
@@ -1,20 +1,20 @@
|
|
1
1
|
import type { HttpClient, Scope } from '@livestore/utils/effect';
|
2
2
|
import { Layer } from '@livestore/utils/effect';
|
3
|
-
import type {
|
3
|
+
import type { MakeSqliteDb } from '../adapter-types.js';
|
4
4
|
import { UnexpectedError } from '../adapter-types.js';
|
5
5
|
import type { LiveStoreSchema } from '../schema/mod.js';
|
6
6
|
import type { SyncOptions } from '../sync/sync.js';
|
7
7
|
import type { ShutdownChannel } from './shutdown-channel.js';
|
8
|
-
import type { DevtoolsOptions } from './types.js';
|
8
|
+
import type { DevtoolsOptions, LeaderSqliteDb } from './types.js';
|
9
9
|
import { LeaderThreadCtx } from './types.js';
|
10
|
-
export declare const makeLeaderThreadLayer: ({ schema, storeId, clientId,
|
10
|
+
export declare const makeLeaderThreadLayer: ({ schema, storeId, clientId, makeSqliteDb, syncOptions, dbReadModel, dbMutationLog, devtoolsOptions, shutdownChannel, }: {
|
11
11
|
storeId: string;
|
12
12
|
clientId: string;
|
13
13
|
schema: LiveStoreSchema;
|
14
|
-
|
14
|
+
makeSqliteDb: MakeSqliteDb;
|
15
15
|
syncOptions: SyncOptions | undefined;
|
16
|
-
|
17
|
-
|
16
|
+
dbReadModel: LeaderSqliteDb;
|
17
|
+
dbMutationLog: LeaderSqliteDb;
|
18
18
|
devtoolsOptions: DevtoolsOptions;
|
19
19
|
shutdownChannel: ShutdownChannel;
|
20
20
|
}) => Layer.Layer<LeaderThreadCtx, UnexpectedError, Scope.Scope | HttpClient.HttpClient>;
|
@@ -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,
|
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,EAAe,MAAM,qBAAqB,CAAA;AAChF,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,CAkElF,CAAA"}
|
@@ -9,26 +9,38 @@ import { makeLeaderSyncProcessor } from './LeaderSyncProcessor.js';
|
|
9
9
|
import { makePullQueueSet } from './pull-queue-set.js';
|
10
10
|
import { recreateDb } from './recreate-db.js';
|
11
11
|
import { LeaderThreadCtx } from './types.js';
|
12
|
-
export const makeLeaderThreadLayer = ({ schema, storeId, clientId,
|
12
|
+
export const makeLeaderThreadLayer = ({ schema, storeId, clientId, makeSqliteDb, syncOptions, dbReadModel, dbMutationLog, devtoolsOptions, shutdownChannel, }) => Effect.gen(function* () {
|
13
13
|
const bootStatusQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
|
14
14
|
// TODO do more validation here than just checking the count of tables
|
15
15
|
// Either happens on initial boot or if schema changes
|
16
|
-
const dbMissing =
|
16
|
+
const dbMissing = dbReadModel.select(sql `select count(*) as count from sqlite_master`)[0].count === 0;
|
17
17
|
const syncBackend = syncOptions === undefined ? undefined : yield* syncOptions.makeBackend({ storeId, clientId });
|
18
18
|
const initialBlockingSyncContext = yield* makeInitialBlockingSyncContext({
|
19
19
|
initialSyncOptions: syncOptions?.initialSyncOptions ?? { _tag: 'Skip' },
|
20
20
|
bootStatusQueue,
|
21
21
|
});
|
22
|
-
const syncProcessor = yield* makeLeaderSyncProcessor({
|
22
|
+
const syncProcessor = yield* makeLeaderSyncProcessor({
|
23
|
+
schema,
|
24
|
+
dbMissing,
|
25
|
+
dbMutationLog,
|
26
|
+
initialBlockingSyncContext,
|
27
|
+
});
|
23
28
|
const extraIncomingMessagesQueue = yield* Queue.unbounded().pipe(Effect.acquireRelease(Queue.shutdown));
|
29
|
+
const devtoolsContext = devtoolsOptions.enabled
|
30
|
+
? {
|
31
|
+
enabled: true,
|
32
|
+
syncBackendPullLatch: yield* Effect.makeLatch(true),
|
33
|
+
syncBackendPushLatch: yield* Effect.makeLatch(true),
|
34
|
+
}
|
35
|
+
: { enabled: false };
|
24
36
|
const ctx = {
|
25
37
|
schema,
|
26
38
|
bootStatusQueue,
|
27
39
|
storeId,
|
28
40
|
clientId,
|
29
|
-
|
30
|
-
|
31
|
-
|
41
|
+
dbReadModel,
|
42
|
+
dbMutationLog,
|
43
|
+
makeSqliteDb,
|
32
44
|
mutationEventSchema: MutationEvent.makeMutationEventSchema(schema),
|
33
45
|
shutdownStateSubRef: yield* SubscriptionRef.make('running'),
|
34
46
|
shutdownChannel,
|
@@ -36,6 +48,7 @@ export const makeLeaderThreadLayer = ({ schema, storeId, clientId, makeSyncDb, s
|
|
36
48
|
syncProcessor,
|
37
49
|
connectedClientSessionPullQueues: yield* makePullQueueSet,
|
38
50
|
extraIncomingMessagesQueue,
|
51
|
+
devtools: devtoolsContext,
|
39
52
|
};
|
40
53
|
// @ts-expect-error For debugging purposes
|
41
54
|
globalThis.__leaderThreadCtx = ctx;
|
@@ -78,21 +91,21 @@ const makeInitialBlockingSyncContext = ({ initialSyncOptions, bootStatusQueue, }
|
|
78
91
|
* It also starts various background processes (e.g. syncing)
|
79
92
|
*/
|
80
93
|
const bootLeaderThread = ({ dbMissing, initialBlockingSyncContext, devtoolsOptions, }) => Effect.gen(function* () {
|
81
|
-
const {
|
94
|
+
const { dbMutationLog, bootStatusQueue, syncProcessor } = yield* LeaderThreadCtx;
|
82
95
|
yield* migrateTable({
|
83
|
-
db:
|
96
|
+
db: dbMutationLog,
|
84
97
|
behaviour: 'create-if-not-exists',
|
85
98
|
tableAst: mutationLogMetaTable.sqliteDef.ast,
|
86
99
|
skipMetaTable: true,
|
87
100
|
});
|
88
101
|
yield* migrateTable({
|
89
|
-
db:
|
102
|
+
db: dbMutationLog,
|
90
103
|
behaviour: 'create-if-not-exists',
|
91
104
|
tableAst: syncStatusTable.sqliteDef.ast,
|
92
105
|
skipMetaTable: true,
|
93
106
|
});
|
94
107
|
// Create sync status row if it doesn't exist
|
95
|
-
yield* execSql(
|
108
|
+
yield* execSql(dbMutationLog, sql `INSERT INTO ${SYNC_STATUS_TABLE} (head)
|
96
109
|
SELECT ${EventId.ROOT.global}
|
97
110
|
WHERE NOT EXISTS (SELECT 1 FROM ${SYNC_STATUS_TABLE})`, {});
|
98
111
|
const dbReady = yield* Deferred.make();
|
@@ -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;
|
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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"}
|
@@ -1,10 +1,10 @@
|
|
1
1
|
import { Effect } from '@livestore/utils/effect';
|
2
|
-
import type {
|
2
|
+
import type { SqliteDb } from '../adapter-types.js';
|
3
3
|
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 getLocalHeadFromDb: (
|
8
|
-
export declare const getBackendHeadFromDb: (
|
9
|
-
export declare const updateBackendHead: (
|
7
|
+
export declare const getLocalHeadFromDb: (dbMutationLog: SqliteDb) => EventId.EventId;
|
8
|
+
export declare const getBackendHeadFromDb: (dbMutationLog: SqliteDb) => EventId.GlobalEventId;
|
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,
|
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,CAkB5E,CAAA;AAEJ,eAAO,MAAM,kBAAkB,kBAAmB,QAAQ,KAAG,OAAO,CAAC,OAMpE,CAAA;AAED,eAAO,MAAM,oBAAoB,kBAAmB,QAAQ,KAAG,OAAO,CAAC,aAElD,CAAA;AAGrB,eAAO,MAAM,iBAAiB,kBAAmB,QAAQ,QAAQ,OAAO,CAAC,OAAO,SACG,CAAA"}
|
@@ -4,9 +4,9 @@ import { MUTATION_LOG_META_TABLE, mutationLogMetaTable, SYNC_STATUS_TABLE } from
|
|
4
4
|
import { prepareBindValues, sql } from '../util.js';
|
5
5
|
import { LeaderThreadCtx } from './types.js';
|
6
6
|
export const getMutationEventsSince = (since) => Effect.gen(function* () {
|
7
|
-
const {
|
7
|
+
const { dbMutationLog } = yield* LeaderThreadCtx;
|
8
8
|
const query = mutationLogMetaTable.query.where('idGlobal', '>=', since.global).asSql();
|
9
|
-
const pendingMutationEventsRaw =
|
9
|
+
const pendingMutationEventsRaw = dbMutationLog.select(query.query, prepareBindValues(query.bindValues, query.query));
|
10
10
|
const pendingMutationEvents = Schema.decodeUnknownSync(mutationLogMetaTable.schema.pipe(Schema.Array))(pendingMutationEventsRaw);
|
11
11
|
return pendingMutationEvents
|
12
12
|
.map((_) => ({
|
@@ -17,12 +17,12 @@ export const getMutationEventsSince = (since) => Effect.gen(function* () {
|
|
17
17
|
}))
|
18
18
|
.filter((_) => EventId.compare(_.id, since) > 0);
|
19
19
|
});
|
20
|
-
export const getLocalHeadFromDb = (
|
21
|
-
const res =
|
20
|
+
export const getLocalHeadFromDb = (dbMutationLog) => {
|
21
|
+
const res = dbMutationLog.select(sql `select idGlobal, idLocal from ${MUTATION_LOG_META_TABLE} order by idGlobal DESC, idLocal DESC limit 1`)[0];
|
22
22
|
return res ? { global: res.idGlobal, local: res.idLocal } : EventId.ROOT;
|
23
23
|
};
|
24
|
-
export const getBackendHeadFromDb = (
|
24
|
+
export const getBackendHeadFromDb = (dbMutationLog) => dbMutationLog.select(sql `select head from ${SYNC_STATUS_TABLE}`)[0]?.head ??
|
25
25
|
EventId.ROOT.global;
|
26
26
|
// TODO use prepared statements
|
27
|
-
export const updateBackendHead = (
|
27
|
+
export const updateBackendHead = (dbMutationLog, head) => dbMutationLog.execute(sql `UPDATE ${SYNC_STATUS_TABLE} SET head = ${head.global}`);
|
28
28
|
//# sourceMappingURL=mutationlog.js.map
|
@@ -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,
|
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,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE;QAC5C,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC,aAAa,EAAE;KAC/D,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,kBAAkB,GAAG,CAAC,aAAuB,EAAmB,EAAE;IAC7E,MAAM,GAAG,GAAG,aAAa,CAAC,MAAM,CAC9B,GAAG,CAAA,iCAAiC,uBAAuB,+CAA+C,CAC3G,CAAC,CAAC,CAAC,CAAA;IAEJ,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAA;AAC1E,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;kEAoD+uF,OAAQ,MAAM,CAAC,MAAM,KAAK;oCAAkG,OAAQ,MAAM;uCADp5F,CAAA"}
|
@@ -4,41 +4,41 @@ import { initializeSingletonTables, migrateDb, rehydrateFromMutationLog, Unexpec
|
|
4
4
|
import { configureConnection } from './connection.js';
|
5
5
|
import { LeaderThreadCtx } from './types.js';
|
6
6
|
export const recreateDb = Effect.gen(function* () {
|
7
|
-
const {
|
7
|
+
const { dbReadModel, dbMutationLog, schema, bootStatusQueue } = yield* LeaderThreadCtx;
|
8
8
|
const migrationOptions = schema.migrationOptions;
|
9
9
|
yield* Effect.addFinalizer(Effect.fn('recreateDb:finalizer')(function* (ex) {
|
10
10
|
if (ex._tag === 'Failure')
|
11
|
-
|
11
|
+
dbReadModel.destroy();
|
12
12
|
}));
|
13
13
|
// NOTE to speed up the operations below, we're creating a temporary in-memory database
|
14
14
|
// and later we'll overwrite the persisted database with the new data
|
15
15
|
// TODO bring back this optimization
|
16
|
-
// const
|
17
|
-
const
|
18
|
-
yield* configureConnection(
|
16
|
+
// const tmpDb = yield* makeSqliteDb({ _tag: 'in-memory' })
|
17
|
+
const tmpDb = dbReadModel;
|
18
|
+
yield* configureConnection(tmpDb, { fkEnabled: true });
|
19
19
|
const initDb = (hooks) => Effect.gen(function* () {
|
20
|
-
yield* Effect.tryAll(() => hooks?.init?.(
|
20
|
+
yield* Effect.tryAll(() => hooks?.init?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
21
21
|
yield* migrateDb({
|
22
|
-
db:
|
22
|
+
db: tmpDb,
|
23
23
|
schema,
|
24
24
|
onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'migrating', progress: { done, total } }),
|
25
25
|
});
|
26
|
-
initializeSingletonTables(schema,
|
27
|
-
yield* Effect.tryAll(() => hooks?.pre?.(
|
28
|
-
return
|
26
|
+
initializeSingletonTables(schema, tmpDb);
|
27
|
+
yield* Effect.tryAll(() => hooks?.pre?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
28
|
+
return tmpDb;
|
29
29
|
});
|
30
30
|
switch (migrationOptions.strategy) {
|
31
31
|
case 'from-mutation-log': {
|
32
32
|
const hooks = migrationOptions.hooks;
|
33
|
-
const
|
33
|
+
const tmpDb = yield* initDb(hooks);
|
34
34
|
yield* rehydrateFromMutationLog({
|
35
|
-
db:
|
36
|
-
logDb:
|
35
|
+
db: tmpDb,
|
36
|
+
logDb: dbMutationLog,
|
37
37
|
schema,
|
38
38
|
migrationOptions,
|
39
39
|
onProgress: ({ done, total }) => Queue.offer(bootStatusQueue, { stage: 'rehydrating', progress: { done, total } }),
|
40
40
|
});
|
41
|
-
yield* Effect.tryAll(() => hooks?.post?.(
|
41
|
+
yield* Effect.tryAll(() => hooks?.post?.(tmpDb)).pipe(UnexpectedError.mapToUnexpectedError);
|
42
42
|
break;
|
43
43
|
}
|
44
44
|
case 'hard-reset': {
|
@@ -49,9 +49,9 @@ export const recreateDb = Effect.gen(function* () {
|
|
49
49
|
break;
|
50
50
|
}
|
51
51
|
case 'manual': {
|
52
|
-
const oldDbData =
|
52
|
+
const oldDbData = dbReadModel.export();
|
53
53
|
const newDbData = yield* Effect.tryAll(() => migrationOptions.migrate(oldDbData)).pipe(UnexpectedError.mapToUnexpectedError);
|
54
|
-
|
54
|
+
tmpDb.import(newDbData);
|
55
55
|
// TODO validate schema
|
56
56
|
break;
|
57
57
|
}
|
@@ -61,15 +61,15 @@ export const recreateDb = Effect.gen(function* () {
|
|
61
61
|
}
|
62
62
|
// TODO bring back
|
63
63
|
// Import the temporary in-memory database into the persistent database
|
64
|
-
// yield* Effect.sync(() => db.import(
|
64
|
+
// yield* Effect.sync(() => db.import(tmpDb)).pipe(
|
65
65
|
// Effect.withSpan('@livestore/common:leader-thread:recreateDb:import'),
|
66
66
|
// )
|
67
67
|
// TODO maybe bring back re-using this initial snapshot to avoid calling `.export()` again
|
68
68
|
// We've disabled this for now as it made the code too complex, as we often run syncing right after
|
69
69
|
// so the snapshot is no longer up to date
|
70
|
-
// const snapshotFromTmpDb =
|
70
|
+
// const snapshotFromTmpDb = tmpDb.export()
|
71
71
|
// TODO bring back
|
72
|
-
//
|
72
|
+
// tmpDb.close()
|
73
73
|
}).pipe(Effect.scoped, // NOTE we're closing the scope here so finalizers are called when the effect is done
|
74
74
|
Effect.withSpan('@livestore/common:leader-thread:recreateDb'), Effect.withPerformanceMeasure('@livestore/common:leader-thread:recreateDb'));
|
75
75
|
//# 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,
|
1
|
+
{"version":3,"file":"recreate-db.js","sourceRoot":"","sources":["../../src/leader-thread/recreate-db.ts"],"names":[],"mappings":"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"}
|