mirror of
https://github.com/streetwriters/notesnook.git
synced 2025-12-23 06:59:31 +01:00
Since HTML is a tree-like language it is futile to compare it character for character. `html1 === html2` is almost always false. This commit introduces a simple diffing algorithm that only checks the text inside the html + a few other attributes to decide whether the 2 HTMLs are actually different or not. This is obviously not foolproof and it will ignore everything aesthetic (b, em, strong tags etc.). This is actually desireable because in our case only the text difference should warrant a conflict. Everything else can easily be brought back. Similarly, this also ignores whitespace differences surrouding the tags. All in all it'll provide a more reliable alternative to MD5 hashing the 2 HTMLs.
233 lines
7.5 KiB
JavaScript
233 lines
7.5 KiB
JavaScript
/*
|
|
This file is part of the Notesnook project (https://notesnook.com/)
|
|
|
|
Copyright (C) 2022 Streetwriters (Private) Limited
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
import { migrateItem } from "../../migrations";
|
|
import setManipulator from "../../utils/set";
|
|
import { logger } from "../../logger";
|
|
import { isHTMLEqual } from "../../utils/html-diff";
|
|
|
|
class Merger {
|
|
/**
|
|
*
|
|
* @param {import("../index").default} db
|
|
*/
|
|
constructor(db) {
|
|
this._db = db;
|
|
this.logger = logger.scope("Merger");
|
|
|
|
this._mergeDefinition = {
|
|
settings: {
|
|
threshold: 1000,
|
|
get: () => this._db.settings.raw,
|
|
set: (item) => this._db.settings.merge(item),
|
|
conflict: (_local, remote) => this._db.settings.merge(remote)
|
|
},
|
|
note: {
|
|
get: (id) => this._db.notes.note(id),
|
|
set: (item) => this._db.notes.merge(item)
|
|
},
|
|
shortcut: {
|
|
get: (id) => this._db.shortcuts.shortcut(id),
|
|
set: (item) => this._db.shortcuts.merge(item)
|
|
},
|
|
notebook: {
|
|
threshold: 1000,
|
|
get: (id) => this._db.notebooks.notebook(id),
|
|
set: (item) => this._db.notebooks.merge(item),
|
|
conflict: (_local, remote) => this._db.notebooks.merge(remote)
|
|
},
|
|
content: {
|
|
threshold: process.env.NODE_ENV === "test" ? 6 * 1000 : 60 * 1000,
|
|
get: (id) => this._db.content.raw(id),
|
|
set: (item) => this._db.content.add(item),
|
|
conflict: async (local, remote) => {
|
|
let note = this._db.notes.note(local.noteId);
|
|
if (!note || !note.data) return;
|
|
note = note.data;
|
|
|
|
// if hashes are equal do nothing
|
|
if (
|
|
!note.locked &&
|
|
(!remote ||
|
|
!local ||
|
|
!local.data ||
|
|
!remote.data ||
|
|
remote.data === "undefined" || //TODO not sure about this
|
|
isHTMLEqual(local.data, remote.data))
|
|
)
|
|
return;
|
|
|
|
if (remote.deleted || local.deleted || note.locked) {
|
|
// if note is locked or content is deleted we keep the most recent version.
|
|
if (remote.dateModified > local.dateModified)
|
|
await this._db.content.add({ id: local.id, ...remote });
|
|
} else {
|
|
// otherwise we trigger the conflicts
|
|
await this._db.content.add({ ...local, conflicted: remote });
|
|
await this._db.notes.add({ id: local.noteId, conflicted: true });
|
|
await this._db.storage.write("hasConflicts", true);
|
|
}
|
|
}
|
|
},
|
|
attachment: {
|
|
set: async (item) => {
|
|
const remoteAttachment = await this._deserialize(item);
|
|
if (remoteAttachment.deleted) {
|
|
await this._db.attachments.merge(remoteAttachment);
|
|
return;
|
|
}
|
|
|
|
const localAttachment = this._db.attachments.attachment(
|
|
remoteAttachment.metadata.hash
|
|
);
|
|
if (
|
|
localAttachment &&
|
|
localAttachment.dateUploaded !== remoteAttachment.dateUploaded
|
|
) {
|
|
const noteIds = localAttachment.noteIds.slice();
|
|
const isRemoved = await this._db.attachments.remove(
|
|
localAttachment.metadata.hash,
|
|
true
|
|
);
|
|
if (!isRemoved)
|
|
throw new Error(
|
|
"Conflict could not be resolved in one of the attachments."
|
|
);
|
|
remoteAttachment.noteIds = setManipulator.union(
|
|
remoteAttachment.noteIds,
|
|
noteIds
|
|
);
|
|
}
|
|
await this._db.attachments.merge(remoteAttachment);
|
|
}
|
|
},
|
|
vaultKey: {
|
|
set: async (vaultKey) =>
|
|
this._db.vault._setKey(await this._deserialize(vaultKey, false))
|
|
}
|
|
};
|
|
}
|
|
|
|
async _migrate(deserialized, version) {
|
|
// it is a locked note, bail out.
|
|
if (deserialized.alg && deserialized.cipher) return deserialized;
|
|
|
|
return migrateItem(deserialized, version, deserialized.type, this._db);
|
|
}
|
|
|
|
async _deserialize(item, migrate = true) {
|
|
const decrypted = await this._db.storage.decrypt(this.key, item);
|
|
if (!decrypted) {
|
|
throw new Error("Decrypted item cannot be undefined.");
|
|
}
|
|
|
|
const deserialized = JSON.parse(decrypted);
|
|
deserialized.remote = true;
|
|
deserialized.synced = true;
|
|
if (!migrate) return deserialized;
|
|
return await this._migrate(deserialized, item.v);
|
|
}
|
|
|
|
async _mergeItem(remoteItem, get, add) {
|
|
remoteItem = await this._deserialize(remoteItem);
|
|
let localItem = await get(remoteItem.id);
|
|
if (!localItem || remoteItem.dateModified > localItem.dateModified) {
|
|
await add(remoteItem);
|
|
return remoteItem;
|
|
}
|
|
}
|
|
|
|
async _mergeItemWithConflicts(
|
|
remoteItem,
|
|
get,
|
|
add,
|
|
markAsConflicted,
|
|
threshold
|
|
) {
|
|
remoteItem = await this._deserialize(remoteItem);
|
|
let localItem = await get(remoteItem.id);
|
|
|
|
if (!localItem) {
|
|
await add(remoteItem);
|
|
return remoteItem;
|
|
} else {
|
|
const isResolved = localItem.dateResolved === remoteItem.dateModified;
|
|
const isModified = localItem.dateModified > this._lastSynced;
|
|
if (isModified && !isResolved) {
|
|
// If time difference between local item's edits & remote item's edits
|
|
// is less than threshold, we shouldn't trigger a merge conflict; instead
|
|
// we will keep the most recently changed item.
|
|
const timeDiff =
|
|
Math.max(remoteItem.dateModified, localItem.dateModified) -
|
|
Math.min(remoteItem.dateModified, localItem.dateModified);
|
|
|
|
if (timeDiff < threshold) {
|
|
if (remoteItem.dateModified > localItem.dateModified) {
|
|
await add(remoteItem);
|
|
return remoteItem;
|
|
}
|
|
return;
|
|
}
|
|
|
|
this.logger.info("Conflict detected", {
|
|
itemId: remoteItem.id,
|
|
isResolved,
|
|
isModified,
|
|
timeDiff,
|
|
remote: remoteItem.dateModified,
|
|
local: localItem.dateModified
|
|
});
|
|
|
|
await markAsConflicted(localItem, remoteItem);
|
|
} else if (!isResolved) {
|
|
await add(remoteItem);
|
|
return remoteItem;
|
|
}
|
|
}
|
|
}
|
|
|
|
async mergeItem(type, item) {
|
|
this._lastSynced = await this._db.lastSynced();
|
|
|
|
const definition = this._mergeDefinition[type];
|
|
if (!type || !item || !definition) return;
|
|
|
|
if (!this.key) this.key = await this._db.user.getEncryptionKey();
|
|
if (!this.key.key || !this.key.salt) {
|
|
await this._db.user.logout(true, "User encryption key not generated.");
|
|
throw new Error("User encryption key not generated. Please relogin.");
|
|
}
|
|
|
|
if (definition.conflict) {
|
|
return await this._mergeItemWithConflicts(
|
|
item,
|
|
definition.get,
|
|
definition.set,
|
|
definition.conflict,
|
|
definition.threshold
|
|
);
|
|
} else if (definition.get && definition.set) {
|
|
return await this._mergeItem(item, definition.get, definition.set);
|
|
} else if (!definition.get && definition.set) {
|
|
await definition.set(item);
|
|
}
|
|
}
|
|
}
|
|
export default Merger;
|