Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

small sync fixes

Browse Source
This commit is contained in:
zadam
2019-12-16 22:00:44 +01:00
parent b0a3f828fb
commit aff9ce97ee
4 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/public/javascripts/entities/branch.js
View File

@@ -6,7 +6,6 @@ class Branch {
this.branchId = row.branchId; this.branchId = row.branchId;
/** @param {string} */ /** @param {string} */
this.noteId = row.noteId; this.noteId = row.noteId;
this.note = null;
/** @param {string} */ /** @param {string} */
this.parentNoteId = row.parentNoteId; this.parentNoteId = row.parentNoteId;
/** @param {int} */ /** @param {int} */

2
src/public/javascripts/services/tree_cache.js
View File

@@ -133,7 +133,7 @@ class TreeCache {
/** @return {Promise<NoteShort[]>} */ /** @return {Promise<NoteShort[]>} */
async getNotes(noteIds, silentNotFoundError = false) { async getNotes(noteIds, silentNotFoundError = false) {
const missingNoteIds = noteIds.filter(noteId => this.notes[noteId] === undefined); const missingNoteIds = noteIds.filter(noteId => !this.notes[noteId]);
if (missingNoteIds.length > 0) { if (missingNoteIds.length > 0) {
await this.reloadNotes(missingNoteIds); await this.reloadNotes(missingNoteIds);

30
src/public/javascripts/services/ws.js
View File

@@ -64,13 +64,16 @@ async function handleMessage(event) {
await consumeQueuePromise; await consumeQueuePromise;
} }
// it's my turn so start it up try {
consumeQueuePromise = consumeSyncData(); // it's my turn so start it up
consumeQueuePromise = consumeSyncData();
await consumeQueuePromise; await consumeQueuePromise;
}
// finish and set to null to signal somebody else can pick it up finally {
consumeQueuePromise = null; // finish and set to null to signal somebody else can pick it up
consumeQueuePromise = null;
}
} }
} }
else if (message.type === 'sync-hash-check-failed') { else if (message.type === 'sync-hash-check-failed') {
@@ -113,6 +116,15 @@ function checkSyncIdListeners() {
.forEach(l => console.log(`Waiting for syncId ${l.desiredSyncId} while current is ${lastProcessedSyncId} for ${Math.floor((Date.now() - l.start) / 1000)}s`)); .forEach(l => console.log(`Waiting for syncId ${l.desiredSyncId} while current is ${lastProcessedSyncId} for ${Math.floor((Date.now() - l.start) / 1000)}s`));
} }
async function runSafely(syncHandler, syncData) {
try {
return await syncHandler(syncData);
}
catch (e) {
console.log(`Sync handler failed with ${e.message}: ${e.stack}`);
}
}
async function consumeSyncData() { async function consumeSyncData() {
if (syncDataQueue.length > 0) { if (syncDataQueue.length > 0) {
const allSyncData = syncDataQueue; const allSyncData = syncDataQueue;
@@ -126,8 +138,8 @@ async function consumeSyncData() {
// the update process should be synchronous as a whole but individual handlers can run in parallel // the update process should be synchronous as a whole but individual handlers can run in parallel
await Promise.all([ await Promise.all([
...allSyncMessageHandlers.map(syncHandler => syncHandler(allSyncData)), ...allSyncMessageHandlers.map(syncHandler => runSafely(syncHandler, allSyncData)),
...outsideSyncMessageHandlers.map(syncHandler => syncHandler(outsideSyncData)) ...outsideSyncMessageHandlers.map(syncHandler => runSafely(syncHandler, outsideSyncData))
]); ]);
lastProcessedSyncId = Math.max(lastProcessedSyncId, allSyncData[allSyncData.length - 1].id); lastProcessedSyncId = Math.max(lastProcessedSyncId, allSyncData[allSyncData.length - 1].id);
@@ -171,8 +183,6 @@ async function sendPing() {
setTimeout(() => { setTimeout(() => {
ws = connectWebSocket(); ws = connectWebSocket();
lastAcceptedSyncId = glob.maxSyncIdAtLoad;
lastProcessedSyncId = glob.maxSyncIdAtLoad;
lastPingTs = Date.now(); lastPingTs = Date.now();
setInterval(sendPing, 1000); setInterval(sendPing, 1000);

8
src/services/notes.js
View File

@@ -3,7 +3,6 @@ const sqlInit = require('./sql_init');
const optionService = require('./options'); const optionService = require('./options');
const dateUtils = require('./date_utils'); const dateUtils = require('./date_utils');
const syncTableService = require('./sync_table'); const syncTableService = require('./sync_table');
const attributeService = require('./attributes');
const eventService = require('./events'); const eventService = require('./events');
const repository = require('./repository'); const repository = require('./repository');
const cls = require('../services/cls'); const cls = require('../services/cls');
@@ -462,8 +461,11 @@ async function eraseDeletedNotes() {
return; return;
} }
// it's better to not use repository for this because it will complain about saving protected notes // it's better to not use repository for this because:
// out of protected session, also we don't want these changes to be synced (since they are done on all instances anyway) // - it would complain about saving protected notes out of protected session
// - we don't want these changes to be synced (since they are done on all instances anyway)
// - we don't want change the hash since this erasing happens on each instance separately
// and changing the hash would fire up the sync errors temporarily
// setting contentLength to zero would serve no benefit and it leaves potentially useful trail // setting contentLength to zero would serve no benefit and it leaves potentially useful trail
await sql.executeMany(` await sql.executeMany(`