rafaelcaricio/actual-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix 'Out of sync' error

Browse source
This commit is contained in:
brend 2022-05-29 22:30:06 +03:00 committed by James Long
parent 3fee9cbb42
commit b1a48f4f27
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app-sync.js
View file

@ -139,9 +139,16 @@ app.post('/sync', async (req, res) => {
for (let i = 0; i < newMessages.length; i++) { for (let i = 0; i < newMessages.length; i++) {
let msg = newMessages[i]; let msg = newMessages[i];
let envelopePb = new SyncPb.MessageEnvelope(); let envelopePb = new SyncPb.MessageEnvelope();
let messagePb = new SyncPb.Message();
messagePb.setDataset(msg.dataset);
messagePb.setRow(msg.row);
messagePb.setColumn(msg.column);
messagePb.setValue(msg.value);
envelopePb.setTimestamp(msg.timestamp); envelopePb.setTimestamp(msg.timestamp);
envelopePb.setIsencrypted(msg.is_encrypted === 1); envelopePb.setContent(messagePb.serializeBinary());
envelopePb.setContent(msg.content);
responsePb.addMessages(envelopePb); responsePb.addMessages(envelopePb);
} }

2
sync-full.js
View file

@ -27,7 +27,7 @@ const sync = sequential(async function syncAPI(messages, since, fileId) {
}; };
}); });
let newMessages = actual.internal.syncAndReceiveMessages(messages, since); let newMessages = await actual.internal.syncAndReceiveMessages(messages, since);
return { return {
trie: actual.internal.timestamp.getClock().merkle, trie: actual.internal.timestamp.getClock().merkle,