diff --git a/package-lock.json b/package-lock.json index 2187014..97ba4cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "obsidian-livesync", - "version": "0.24.28", + "version": "0.24.29", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "obsidian-livesync", - "version": "0.24.28", + "version": "0.24.29", "license": "MIT", "dependencies": { "@aws-sdk/client-s3": "^3.808.0", @@ -20,7 +20,7 @@ "fflate": "^0.8.2", "idb": "^8.0.3", "minimatch": "^10.0.1", - "octagonal-wheels": "^0.1.30", + "octagonal-wheels": "^0.1.31", "qrcode-generator": "^1.4.4", "svelte-check": "^4.1.7", "trystero": "^0.21.5", @@ -8487,9 +8487,9 @@ } }, "node_modules/octagonal-wheels": { - "version": "0.1.30", - "resolved": "https://registry.npmjs.org/octagonal-wheels/-/octagonal-wheels-0.1.30.tgz", - "integrity": "sha512-r82hjq70QzM/BIyS4QtflkWYvNlbova6sISi98A1ikJP2VqVK0sf7tSwusdvZI7R/klNsZ/9xXT9RkrBoV1FGg==", + "version": "0.1.31", + "resolved": "https://registry.npmjs.org/octagonal-wheels/-/octagonal-wheels-0.1.31.tgz", + "integrity": "sha512-aR/QWyon6KUeW4UlJPRGKVqIiJLz4otm4F6PWOQp8aZAdqYIe/VYT5FBlaqQzCRNDrvkjVOvrHOlBGKIU++thw==", "license": "MIT", "dependencies": { "idb": "^8.0.3" @@ -17069,9 +17069,9 @@ } }, "octagonal-wheels": { - "version": "0.1.30", - "resolved": "https://registry.npmjs.org/octagonal-wheels/-/octagonal-wheels-0.1.30.tgz", - "integrity": "sha512-r82hjq70QzM/BIyS4QtflkWYvNlbova6sISi98A1ikJP2VqVK0sf7tSwusdvZI7R/klNsZ/9xXT9RkrBoV1FGg==", + "version": "0.1.31", + "resolved": "https://registry.npmjs.org/octagonal-wheels/-/octagonal-wheels-0.1.31.tgz", + "integrity": "sha512-aR/QWyon6KUeW4UlJPRGKVqIiJLz4otm4F6PWOQp8aZAdqYIe/VYT5FBlaqQzCRNDrvkjVOvrHOlBGKIU++thw==", "requires": { "idb": "^8.0.3" } diff --git a/package.json b/package.json index 3c42456..4ebe945 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "obsidian-livesync", - "version": "0.24.28", + "version": "0.24.29", "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", @@ -81,7 +81,7 @@ "fflate": "^0.8.2", "idb": "^8.0.3", "minimatch": "^10.0.1", - "octagonal-wheels": "^0.1.30", + "octagonal-wheels": "^0.1.31", "qrcode-generator": "^1.4.4", "svelte-check": "^4.1.7", "trystero": "^0.21.5", diff --git a/src/lib b/src/lib index 3f3cf7d..89d9e4e 160000 --- a/src/lib +++ b/src/lib @@ -1 +1 @@ -Subproject commit 3f3cf7d61da21372428f2b5f62bb839fad1a2928 +Subproject commit 89d9e4e3e0145973776359f25f346dcb33dde31d diff --git a/src/modules/essential/ModuleMigration.ts b/src/modules/essential/ModuleMigration.ts index 2965870..c9fc265 100644 --- a/src/modules/essential/ModuleMigration.ts +++ b/src/modules/essential/ModuleMigration.ts @@ -1,4 +1,4 @@ -import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger.js"; +import { LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "octagonal-wheels/common/logger"; import { type ObsidianLiveSyncSettings } from "../../lib/src/common/types.js"; import { EVENT_REQUEST_OPEN_P2P, diff --git a/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts b/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts index 78d21b7..1d28767 100644 --- a/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts +++ b/src/modules/features/SettingDialogue/ObsidianLiveSyncSettingTab.ts @@ -1410,6 +1410,15 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab { (paneEl) => { void addPanel(paneEl, $msg("obsidianLiveSyncSettingTab.titleRemoteServer")).then((paneEl) => { // const containerRemoteDatabaseEl = containerEl.createDiv(); + this.createEl( + paneEl, + "div", + { + text: $msg("obsidianLiveSyncSettingTab.msgSettingsUnchangeableDuringSync"), + }, + undefined, + visibleOnly(() => isAnySyncEnabled()) + ).addClass("op-warn-info"); new Setting(paneEl).autoWireDropDown("remoteType", { holdValue: true, options: { @@ -1540,16 +1549,6 @@ The pane also can be launched by \`P2P Replicator\` command from the Command Pal ).addClass("op-warn-info"); } - this.createEl( - paneEl, - "div", - { - text: $msg("obsidianLiveSyncSettingTab.msgSettingsUnchangeableDuringSync"), - }, - undefined, - visibleOnly(() => isAnySyncEnabled()) - ).addClass("sls-setting-hidden"); - new Setting(paneEl).autoWireText("couchDB_URI", { holdValue: true, onUpdate: enableOnlySyncDisabled, diff --git a/utils/flyio/generate_setupuri.ts b/utils/flyio/generate_setupuri.ts index 5b69384..390c2e1 100644 --- a/utils/flyio/generate_setupuri.ts +++ b/utils/flyio/generate_setupuri.ts @@ -1,4 +1,4 @@ -import { encrypt } from "npm:octagonal-wheels@0.1.11/encryption/encryption.js"; +import { encrypt } from "npm:octagonal-wheels@0.1.30/encryption/encryption"; const noun = [ "waterfall",