A local-first personal finance app
:recycle: (crdt) use actual-app/crdt package instead of api (#218)
Matiss Janis Aboltinsdebb33a63dbb
diff --git a/package.json b/package.jsonindex e596e8263e..a0c4ab6a3a 100644--- a/package.json+++ b/package.json@@ -15,7 +15,7 @@"health-check": "node src/scripts/health-check.js"},"dependencies": {- "@actual-app/api": "6.1.0",+ "@actual-app/crdt": "1.0.0","@actual-app/web": "23.6.0","bcrypt": "^5.1.0","better-sqlite3": "^8.2.0",diff --git a/src/app-sync.js b/src/app-sync.jsindex 2f7aa34d23..b95e8262fc 100644--- a/src/app-sync.js+++ b/src/app-sync.js@@ -9,8 +9,7 @@ import { getPathForUserFile, getPathForGroupFile } from './util/paths.js';import * as simpleSync from './sync-simple.js';-import actual from '@actual-app/api';-let SyncPb = actual.internal.SyncProtoBuf;+import { SyncProtoBuf } from '@actual-app/crdt';const app = express();app.use(errorMiddleware);@@ -33,7 +32,7 @@ app.post('/sync', async (req, res) => {let requestPb;try {- requestPb = SyncPb.SyncRequest.deserializeBinary(req.body);+ requestPb = SyncProtoBuf.SyncRequest.deserializeBinary(req.body);} catch (e) {res.status(500);res.send({ status: 'error', reason: 'internal-error' });@@ -115,7 +114,7 @@ app.post('/sync', async (req, res) => {let { trie, newMessages } = simpleSync.sync(messages, since, group_id);// encode it back...- let responsePb = new SyncPb.SyncResponse();+ let responsePb = new SyncProtoBuf.SyncResponse();responsePb.setMerkle(JSON.stringify(trie));newMessages.forEach((msg) => responsePb.addMessages(msg));diff --git a/src/sync-simple.js b/src/sync-simple.jsindex 0ea86b6cf4..af0f99f93e 100644--- a/src/sync-simple.js+++ b/src/sync-simple.js@@ -5,10 +5,7 @@ import { getPathForGroupFile } from './util/paths.js';import { sqlDir } from './load-config.js';-import actual from '@actual-app/api';-let merkle = actual.internal.merkle;-let SyncPb = actual.internal.SyncProtoBuf;-let Timestamp = actual.internal.timestamp.Timestamp;+import { merkle, SyncProtoBuf, Timestamp } from '@actual-app/crdt';function getGroupDb(groupId) {let path = getPathForGroupFile(groupId);@@ -88,7 +85,7 @@ export function sync(messages, since, groupId) {return {trie,newMessages: newMessages.map((msg) => {- const envelopePb = new SyncPb.MessageEnvelope();+ const envelopePb = new SyncProtoBuf.MessageEnvelope();envelopePb.setTimestamp(msg.timestamp);envelopePb.setIsencrypted(msg.is_encrypted);envelopePb.setContent(msg.content);diff --git a/upcoming-release-notes/218.md b/upcoming-release-notes/218.mdnew file mode 100644index 0000000000..a7d6ef5f45--- /dev/null+++ b/upcoming-release-notes/218.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [MatissJanis]+---++Port from `@actual-app/api` usage to `@actual-app/crdt`diff --git a/yarn.lock b/yarn.lockindex 8d0220af2b..3bde014795 100644--- a/yarn.lock+++ b/yarn.lock@@ -5,14 +5,14 @@ __metadata:version: 6cacheKey: 8-"@actual-app/api@npm:6.1.0":- version: 6.1.0- resolution: "@actual-app/api@npm:6.1.0"+"@actual-app/crdt@npm:1.0.0":+ version: 1.0.0+ resolution: "@actual-app/crdt@npm:1.0.0"dependencies:- better-sqlite3: ^8.2.0- node-fetch: ^2.6.9+ google-protobuf: ^3.12.0-rc.1+ murmurhash: ^0.0.2uuid: 3.3.2- checksum: 75eeb5fdb2377175117bf2a229883a23224c8272d20aeaa79c2f30d609206156b9c1a0a9d65d580454b52da86a3aa38ead24d44daac69e728604467b1194e985+ checksum: a8f300c1042ec08d392314daaf723db2071b9bdcba74e3a49feee37ee9a85b043db553315773d5cf6becdae41447ba9cbd6e8ff3883745bdddc1a3e2fa48b9balanguageName: nodelinkType: hard@@ -1555,7 +1555,7 @@ __metadata:version: 0.0.0-use.localresolution: "actual-sync@workspace:."dependencies:- "@actual-app/api": 6.1.0+ "@actual-app/crdt": 1.0.0"@actual-app/web": 23.6.0"@babel/preset-typescript": ^7.20.2"@types/bcrypt": ^5.0.0@@ -3282,6 +3282,13 @@ __metadata:languageName: nodelinkType: hard+"google-protobuf@npm:^3.12.0-rc.1":+ version: 3.21.2+ resolution: "google-protobuf@npm:3.21.2"+ checksum: 3caa2e1e2654714cc1a201ac5e5faabcaa48f5fba3d8ff9b64ca66fe19e4e0506b94053f32eddc77bf3a7a47ac1660315c6744185c1e2bb27654fd76fe91b988+ languageName: node+ linkType: hard+"graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":version: 4.2.10resolution: "graceful-fs@npm:4.2.10"@@ -4573,6 +4580,13 @@ __metadata:languageName: nodelinkType: hard+"murmurhash@npm:^0.0.2":+ version: 0.0.2+ resolution: "murmurhash@npm:0.0.2"+ checksum: e06d1e7cfdc39d742584d96af30e9b26bd44c995b9ced192b62c36b52898347ac28d32a9a94f5e0b286339d45657490ae32ed42ead75ef2a15aef9cfe386e5fa+ languageName: node+ linkType: hard+"napi-build-utils@npm:^1.0.1":version: 1.0.2resolution: "napi-build-utils@npm:1.0.2"@@ -4619,7 +4633,7 @@ __metadata:languageName: nodelinkType: hard-"node-fetch@npm:^2.6.7, node-fetch@npm:^2.6.9":+"node-fetch@npm:^2.6.7":version: 2.6.9resolution: "node-fetch@npm:2.6.9"dependencies: