A local-first personal finance app
refactor: move crdt files into separate directory
Tom French6967698d325c
diff --git a/packages/loot-core/bin/get-db-schema b/packages/loot-core/bin/get-db-schemaold mode 100755new mode 100644index f419e7045a..2e17a5cec5--- a/packages/loot-core/bin/get-db-schema+++ b/packages/loot-core/bin/get-db-schema@@ -3,7 +3,6 @@ process.env.LOOT_DATA_DIR = __dirname + '/../../../../data';import * as sqlite from '../platform/server/sqlite';import * as db from '../server/db';import { getMessages } from '../server/sync';-import Timestamp from '../server/timestamp';let dbPath = process.argv[2];let tables = [diff --git a/packages/loot-core/bin/profile-sql.js b/packages/loot-core/bin/profile-sql.jsindex ac1c0839e2..4842025875 100755--- a/packages/loot-core/bin/profile-sql.js+++ b/packages/loot-core/bin/profile-sql.js@@ -4,7 +4,6 @@ import os from 'os';import * as sqlite from '../src/platform/server/sqlite';import * as db from '../src/server/db';import { batchMessages, setSyncingMode } from '../src/server/sync';-import Timestamp from '../src/server/timestamp';import { runQuery } from '../src/server/aql/schema/run-query';import asyncStorage from '../src/platform/server/asyncStorage';import { makeChild } from '../src/shared/transactions';diff --git a/packages/loot-core/src/server/api.js b/packages/loot-core/src/server/api.jsindex 6c538cad49..460fa5802c 100644--- a/packages/loot-core/src/server/api.js+++ b/packages/loot-core/src/server/api.js@@ -17,7 +17,7 @@ import * as prefs from './prefs';import * as monthUtils from '../shared/months';import * as cloudStorage from './cloud-storage';import { setSyncingMode, batchMessages } from './sync';-import { getClock } from './timestamp';+import { getClock } from './crdt';import { runMutator } from './mutators';import { integerToAmount } from '../shared/util';import { runQuery as aqlQuery } from './aql/schema/run-query';diff --git a/packages/loot-core/src/server/aql/schema/executors.test.js b/packages/loot-core/src/server/aql/schema/executors.test.jsindex ba3f0a3835..0bd4a1ab33 100644--- a/packages/loot-core/src/server/aql/schema/executors.test.js+++ b/packages/loot-core/src/server/aql/schema/executors.test.js@@ -2,7 +2,7 @@ import fc from 'fast-check';import * as db from '../../db';import query from '../../../shared/query';import { batchMessages, setSyncingMode } from '../../sync/index';-import { setClock } from '../../timestamp';+import { setClock } from '../../crdt';import { groupById } from '../../../shared/util';import arbs from '../../../mocks/arbitrary-schema';import { runQuery } from './run-query';diff --git a/packages/loot-core/src/server/crdt/index.js b/packages/loot-core/src/server/crdt/index.jsnew file mode 100644index 0000000000..a62ee7991c--- /dev/null+++ b/packages/loot-core/src/server/crdt/index.js@@ -0,0 +1,4 @@+import * as merkle from "./merkle";++export { merkle };+export { getClock, setClock, makeClock, makeClientId, serializeClock, deserializeClock, Timestamp } from "./timestamp"diff --git a/packages/loot-core/src/server/merkle.js b/packages/loot-core/src/server/crdt/merkle.jssimilarity index 100%rename from packages/loot-core/src/server/merkle.jsrename to packages/loot-core/src/server/crdt/merkle.jsdiff --git a/packages/loot-core/src/server/merkle.test.js b/packages/loot-core/src/server/crdt/merkle.test.jssimilarity index 99%rename from packages/loot-core/src/server/merkle.test.jsrename to packages/loot-core/src/server/crdt/merkle.test.jsindex 41e4b78da3..f7bef4d7d9 100644--- a/packages/loot-core/src/server/merkle.test.js+++ b/packages/loot-core/src/server/crdt/merkle.test.js@@ -1,5 +1,5 @@import * as merkle from './merkle';-import Timestamp from './timestamp';+import { Timestamp } from './timestamp';function pretty(n) {if (n < 60) {diff --git a/packages/loot-core/src/server/timestamp.js b/packages/loot-core/src/server/crdt/timestamp.jssimilarity index 98%rename from packages/loot-core/src/server/timestamp.jsrename to packages/loot-core/src/server/crdt/timestamp.jsindex 39bae07da1..b78a1610af 100644--- a/packages/loot-core/src/server/timestamp.js+++ b/packages/loot-core/src/server/crdt/timestamp.js@@ -1,5 +1,5 @@import murmurhash from 'murmurhash';-const uuid = require('../platform/uuid');+const uuid = require('../../platform/uuid');/*** Hybrid Unique Logical Clock (HULC) timestamp generator@@ -81,7 +81,7 @@ const MAX_NODE_LENGTH = 16;/*** timestamp instance class*/-export default class Timestamp {+export class Timestamp {constructor(millis, counter, node) {this._state = {millis: millis,@@ -124,7 +124,7 @@ export default class Timestamp {}}-export class MutableTimestamp extends Timestamp {+class MutableTimestamp extends Timestamp {setMillis(n) {this._state.millis = n;}diff --git a/packages/loot-core/src/server/timestamp.test.js b/packages/loot-core/src/server/crdt/timestamp.test.jssimilarity index 99%rename from packages/loot-core/src/server/timestamp.test.jsrename to packages/loot-core/src/server/crdt/timestamp.test.jsindex 0a1d99431c..a9c04fab99 100644--- a/packages/loot-core/src/server/timestamp.test.js+++ b/packages/loot-core/src/server/crdt/timestamp.test.js@@ -1,4 +1,4 @@-import Timestamp from './timestamp';+import { Timestamp } from './timestamp';describe('Timestamp', function() {let now = 0;diff --git a/packages/loot-core/src/server/db/index.js b/packages/loot-core/src/server/db/index.jsindex 1ffdf33632..249ec845b0 100644--- a/packages/loot-core/src/server/db/index.js+++ b/packages/loot-core/src/server/db/index.js@@ -11,13 +11,14 @@ import {payeeRuleModel} from '../models';import { groupById } from '../../shared/util';-import Timestamp, {+import {makeClock,setClock,serializeClock,deserializeClock,- makeClientId-} from '../timestamp';+ makeClientId,+ Timestamp+} from '../crdt';import {convertForInsert,convertForUpdate,diff --git a/packages/loot-core/src/server/main.js b/packages/loot-core/src/server/main.jsindex ada202d61a..cbda0e7fb2 100644--- a/packages/loot-core/src/server/main.js+++ b/packages/loot-core/src/server/main.js@@ -30,8 +30,7 @@ import * as bankSync from './accounts/sync';import * as link from './accounts/link';import { uniqueFileName, idFromFileName } from './util/budget-name';import { mutator, runHandler } from './mutators';-import * as timestamp from './timestamp';-import * as merkle from './merkle';+import { getClock, setClock, makeClock, makeClientId, serializeClock, deserializeClock, Timestamp, merkle } from './crdt';import {initialFullSync,fullSync,@@ -1968,10 +1967,10 @@ async function loadBudget(id, appVersion, { showUpdate } = {}) {//// TODO: The client id should be stored elsewhere. It shouldn't// work this way, but it's fine for now.- timestamp.getClock().timestamp.setNode(timestamp.makeClientId());+ getClock().timestamp.setNode(makeClientId());await db.runQuery('INSERT OR REPLACE INTO messages_clock (id, clock) VALUES (1, ?)',- [timestamp.serializeClock(timestamp.getClock())]+ [serializeClock(getClock())]);await prefs.savePrefs({ resetClock: false });@@ -2253,7 +2252,9 @@ export const lib = {// Expose CRDT mechanisms so server can use themmerkle,- timestamp,+ timestamp: {+ getClock, setClock, makeClock, makeClientId, serializeClock, deserializeClock, Timestamp+ },SyncProtoBuf: SyncPb};diff --git a/packages/loot-core/src/server/main.test.js b/packages/loot-core/src/server/main.test.jsindex a67f0bbfe3..3edc1d451d 100644--- a/packages/loot-core/src/server/main.test.js+++ b/packages/loot-core/src/server/main.test.js@@ -3,7 +3,7 @@ import * as prefs from './prefs';import * as db from './db';import * as budget from './budget/base';import * as monthUtils from '../shared/months';-import { getClock, deserializeClock } from './timestamp';+import { getClock, deserializeClock } from './crdt';import {runHandler,runMutator,diff --git a/packages/loot-core/src/server/prefs.js b/packages/loot-core/src/server/prefs.jsindex c88b336276..fb7df91653 100644--- a/packages/loot-core/src/server/prefs.js+++ b/packages/loot-core/src/server/prefs.js@@ -1,5 +1,5 @@import { sendMessages } from './sync';-import Timestamp from './timestamp';+import { Timestamp } from './crdt';const fs = require('../platform/server/fs');let prefs = null;diff --git a/packages/loot-core/src/server/sync/index.js b/packages/loot-core/src/server/sync/index.jsindex e269753107..0e91185c81 100644--- a/packages/loot-core/src/server/sync/index.js+++ b/packages/loot-core/src/server/sync/index.js@@ -11,12 +11,13 @@ import { triggerBudgetChanges, setType as setBudgetType } from '../budget/base';import * as undo from '../undo';import { runMutator } from '../mutators';import { setIn, getIn } from '../../shared/util';-import Timestamp, {+import {serializeClock,deserializeClock,- getClock-} from '../timestamp';-import * as merkle from '../merkle';+ getClock,+ Timestamp,+ merkle+} from '../crdt';import * as encoder from './encoder';import { getServer } from '../server-config';import { rebuildMerkleHash } from './repair';diff --git a/packages/loot-core/src/server/sync/migrate.js b/packages/loot-core/src/server/sync/migrate.jsindex 394a8ec33e..40fcaa3d9d 100644--- a/packages/loot-core/src/server/sync/migrate.js+++ b/packages/loot-core/src/server/sync/migrate.js@@ -1,5 +1,5 @@import { addSyncListener, applyMessages } from './index';-import Timestamp from '../timestamp';+import { Timestamp } from '../crdt';function migrateParentIds(oldValues, newValues) {newValues.forEach((items, table) => {diff --git a/packages/loot-core/src/server/sync/repair.js b/packages/loot-core/src/server/sync/repair.jsindex 50b16b71b7..9ebedd8c2f 100644--- a/packages/loot-core/src/server/sync/repair.js+++ b/packages/loot-core/src/server/sync/repair.js@@ -1,6 +1,5 @@import * as db from '../db';-import Timestamp, { serializeClock, getClock } from '../timestamp';-import * as merkle from '../merkle';+import { serializeClock, getClock, Timestamp, merkle } from '../crdt';export function rebuildMerkleHash() {let rows = db.runQuery('SELECT timestamp FROM messages_crdt', [], true);diff --git a/packages/loot-core/src/server/sync/sync.property.test.js b/packages/loot-core/src/server/sync/sync.property.test.jsindex 7239ad7b13..66a8c7d32e 100644--- a/packages/loot-core/src/server/sync/sync.property.test.js+++ b/packages/loot-core/src/server/sync/sync.property.test.js@@ -2,7 +2,7 @@ import * as prefs from '../prefs';import * as db from '../db';import * as sheet from '../sheet';import * as sync from './index';-import Timestamp, { getClock } from '../timestamp';+import { getClock, Timestamp } from '../crdt';import * as merkle from '../merkle';import * as encoder from './encoder';const jsc = require('jsverify');diff --git a/packages/loot-core/src/server/sync/sync.test.js b/packages/loot-core/src/server/sync/sync.test.jsindex f4018a82dd..575a7e8320 100644--- a/packages/loot-core/src/server/sync/sync.test.js+++ b/packages/loot-core/src/server/sync/sync.test.js@@ -1,7 +1,8 @@import * as prefs from '../prefs';import * as db from '../db';import * as sheet from '../sheet';-import Timestamp, { getClock } from '../timestamp';+import { getClock, Timestamp } from '../crdt';+import { resolveName } from '../spreadsheet/util';import { setSyncingMode, sendMessages, applyMessages, fullSync } from './index';import * as encoder from './encoder';const mockSyncServer = require('../tests/mockSyncServer');diff --git a/packages/loot-core/src/server/tests/mockSyncServer.js b/packages/loot-core/src/server/tests/mockSyncServer.jsindex 4e221a6733..ceb12d7b92 100644--- a/packages/loot-core/src/server/tests/mockSyncServer.js+++ b/packages/loot-core/src/server/tests/mockSyncServer.js@@ -1,5 +1,5 @@-import * as merkle from '../merkle';-import Timestamp, { makeClock } from '../timestamp';+import dateFns from 'date-fns';+import { makeClock, Timestamp, merkle } from '../crdt';const defaultMockData = require('./mockData').basic;const SyncPb = require('../sync/proto/sync_pb');diff --git a/packages/loot-core/src/server/undo.js b/packages/loot-core/src/server/undo.jsindex a6525b21e6..bc96741c70 100644--- a/packages/loot-core/src/server/undo.js+++ b/packages/loot-core/src/server/undo.js@@ -1,6 +1,6 @@import { sendMessages } from './sync';import { getIn } from '../shared/util';-import Timestamp from './timestamp';+import { Timestamp } from './crdt';import { withMutatorContext, getMutatorContext } from './mutators';const connection = require('../platform/server/connection');