Compare commits

...

2 Commits

Author SHA1 Message Date
vorotamoroz
71a80cacc3 bump again 2023-01-19 19:05:16 +09:00
vorotamoroz
38daeca89f fixed leaked logging 2023-01-19 19:03:57 +09:00
5 changed files with 17 additions and 18 deletions

View File

@@ -1,7 +1,7 @@
{
"id": "obsidian-livesync",
"name": "Self-hosted LiveSync",
"version": "0.17.14",
"version": "0.17.15",
"minAppVersion": "0.9.12",
"description": "Community implementation of self-hosted livesync. Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
"author": "vorotamoroz",

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "obsidian-livesync",
"version": "0.17.14",
"version": "0.17.15",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "obsidian-livesync",
"version": "0.17.14",
"version": "0.17.15",
"license": "MIT",
"dependencies": {
"diff-match-patch": "^1.0.5",

View File

@@ -1,6 +1,6 @@
{
"name": "obsidian-livesync",
"version": "0.17.14",
"version": "0.17.15",
"description": "Reflect your vault changes to some other devices immediately. Please make sure to disable other synchronize solutions to avoid content corruption or duplication.",
"main": "main.js",
"type": "module",

View File

@@ -740,10 +740,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
async decryptConfigurationItem(encrypted: string, passphrase: string) {
const dec = await tryDecrypt(encrypted, passphrase + SALT_OF_PASSPHRASE, false);
if (dec) {
this.usedPassphrase = passphrase;
return dec;
}
if (dec) {
this.usedPassphrase = passphrase;
return dec;
}
return false;
}
tryDecodeJson(encoded: string | false): object | false {
@@ -766,10 +766,10 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
return "";
}
const dec = await encrypt(src, passphrase + SALT_OF_PASSPHRASE, false);
if (dec) {
this.usedPassphrase = passphrase;
return dec;
}
if (dec) {
this.usedPassphrase = passphrase;
return dec;
}
return "";
}
@@ -799,9 +799,9 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
if (settings.encrypt && settings.encryptedPassphrase) {
const encrypted = settings.encryptedPassphrase;
const decrypted = await this.decryptConfigurationItem(encrypted, passphrase);
if (decrypted) {
settings.passphrase = decrypted;
} else {
if (decrypted) {
settings.passphrase = decrypted;
} else {
Logger("Could not decrypt passphrase for reading data.json! DO NOT synchronize with the remote before making sure your configuration is!", LOG_LEVEL.URGENT);
settings.passphrase = "";
}
@@ -1000,7 +1000,6 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
})
}
this.queuedFilesStore.set({ queuedItems: this.queuedFiles, fileEventItems: this.watchedFileEventQueue });
console.dir([...this.watchedFileEventQueue]);
if (this.isReady) {
await this.procFileEvent(forcePerform);
}
@@ -1029,7 +1028,6 @@ export default class ObsidianLiveSyncPlugin extends Plugin {
do {
const queue = procs.shift();
if (queue === undefined) break L1;
console.warn([queue.type, { ...queue.args, cache: undefined }]);
const file = queue.args.file;
const key = `file-last-proc-${queue.type}-${file.path}`;

View File

@@ -55,7 +55,8 @@
- 0.17.13
- Fixed: Document history is now displayed again.
- Reorganised: Many files have been refactored.
- 0.17.14
- 0.17.14: Skipped.
- 0.17.15
- Improved:
- Confidential information has no longer stored in data.json as is.
- Synchronising progress has been shown in the notification.