@vrtmrz/livesync-commonlib 0.1.23 → 0.1.25

package/dist/services/base/SettingService.d.ts

@@ -63,6 +63,7 @@ export declare abstract class SettingService<T extends ServiceContext = ServiceC
      */
     saveSettingData(): Promise<void>;
     private encryptRemoteConfigurationUris;
+    private hasManagedP2PProfileURI;
     private decryptRemoteConfigurationUris;
     /**
      * Event triggered before realising the settings.

package/dist/services/base/SettingService.js

@@ -5,6 +5,7 @@ import {
   LOG_LEVEL_VERBOSE,
   SALT_OF_PASSPHRASE,
   SETTING_KEY_P2P_DEVICE_NAME,
+  omitP2PRuntimeSettings,
   prepareSettingsForLoad
 } from "../../common/types.js";
 import { handlers } from "../lib/HandlerUtils.js";
@@ -143,12 +144,7 @@ class SettingService extends ServiceBase {
   async saveSettingData() {
     this.saveDeviceAndVaultName();
     const previousSettings = this._lastPersistedSettings ?? this.cloneSettings(this.settings);
-    const settings = {
-      ...this.settings,
-      remoteConfigurations: Object.fromEntries(
-        Object.entries(this.settings.remoteConfigurations || {}).map(([id, config]) => [id, { ...config }])
-      )
-    };
+    const settings = this.cloneSettings(this.settings);
     const hookResults = await this.onBeforeSaveSettingData(settings, previousSettings);
     for (const patch of hookResults) {
       if (patch instanceof Error || !patch) continue;
@@ -161,7 +157,15 @@ class SettingService extends ServiceBase {
       this.setSmallConfig(SETTING_KEY_P2P_DEVICE_NAME, settings.P2P_DevicePeerName.trim());
       settings.P2P_DevicePeerName = "";
     }
+    delete settings.P2P_managedType;
+    delete settings.P2P_managedId;
+    delete settings.P2P_managedToken;
     if (this.usedPassphrase == "" && !await this.getPassphrase(settings)) {
+      if (Object.values(settings.remoteConfigurations).some((config) => this.hasManagedP2PProfileURI(config.uri))) {
+        const message = "Failed to retrieve a passphrase for managed P2P source data. Settings were not saved.";
+        this._log(message, LOG_LEVEL_URGENT);
+        throw new Error(message);
+      }
       this._log("Failed to retrieve passphrase. data.json contains unencrypted items!", LOG_LEVEL_NOTICE);
     } else {
       if (settings.couchDB_PASSWORD != "" || settings.couchDB_URI != "" || settings.couchDB_USER != "" || settings.couchDB_DBNAME) {
@@ -218,8 +222,24 @@ class SettingService extends ServiceBase {
       if (config.isEncrypted || config.uri.trim() === "") {
         continue;
       }
-      const encryptedURI = await this.encryptConfigurationItem(config.uri, settings);
+      const managedP2PProfile = this.hasManagedP2PProfileURI(config.uri);
+      let encryptedURI;
+      try {
+        encryptedURI = await this.encryptConfigurationItem(config.uri, settings);
+      } catch (error) {
+        if (managedP2PProfile) {
+          const message = `Failed to encrypt managed P2P remote configuration '${id}'. Settings were not saved.`;
+          this._log(message, LOG_LEVEL_URGENT);
+          throw new Error(message);
+        }
+        throw error;
+      }
       if (encryptedURI === "") {
+        if (managedP2PProfile) {
+          const message = `Failed to encrypt managed P2P remote configuration '${id}'. Settings were not saved.`;
+          this._log(message, LOG_LEVEL_URGENT);
+          throw new Error(message);
+        }
         this._log(
           `Failed to encrypt remote configuration '${id}'. This entry will be saved in plain text.`,
           LOG_LEVEL_URGENT
@@ -233,6 +253,14 @@ class SettingService extends ServiceBase {
       };
     }
   }
+  hasManagedP2PProfileURI(uri) {
+    const trimmed = uri.trim();
+    if (!trimmed.startsWith("sls+p2p://")) return false;
+    const queryStart = trimmed.indexOf("?");
+    if (queryStart < 0) return false;
+    const query = trimmed.slice(queryStart + 1).split("#", 1)[0];
+    return (new URLSearchParams(query).get("managedType") ?? "").trim().length > 0;
+  }
   async decryptRemoteConfigurationUris(settings, passphrase) {
     const configs = settings.remoteConfigurations || {};
     for (const [id, config] of Object.entries(configs)) {
@@ -321,7 +349,7 @@ class SettingService extends ServiceBase {
     try {
       this.settings = await this.adjustSettings({
         ...this.settings,
-        ...partial
+        ...omitP2PRuntimeSettings(partial)
       });
     } catch (ex) {
       this._log("Error in applying external settings: ", LOG_LEVEL_URGENT);
@@ -550,7 +578,7 @@ class SettingService extends ServiceBase {
   }
   cloneSettings(settings) {
     return {
-      ...settings,
+      ...omitP2PRuntimeSettings(settings),
       remoteConfigurations: Object.fromEntries(
         Object.entries(settings.remoteConfigurations || {}).map(([id, config]) => [id, { ...config }])
       )

package/dist/services/base/TweakValueService.d.ts

@@ -1,4 +1,4 @@
-import type { ObsidianLiveSyncSettings, RemoteDBSettings, RemotePreferredTweakResult, TweakValues } from "../../common/types.js";
+import type { ObsidianLiveSyncSettings, RemoteDBSettings, RemotePreferredTweakResult, TweakAssessment, TweakValues } from "../../common/types.js";
 import type { ITweakValueService } from "./IService.js";
 import { ServiceBase, type ServiceContext } from "./ServiceBase.js";
 /**
@@ -13,14 +13,16 @@ export declare abstract class TweakValueService<T extends ServiceContext = Servi
     /**
      * Check and ask the user to resolve any mismatched tweak values.
      * @param preferred The preferred tweak values to check against.
+     * @param assessment The exact compatibility assessment from the calling operation, when available.
      */
-    abstract checkAndAskResolvingMismatched(preferred: Partial<TweakValues>): Promise<[TweakValues | boolean, boolean]>;
+    abstract checkAndAskResolvingMismatched(preferred: Partial<TweakValues>, assessment?: TweakAssessment): Promise<[TweakValues | boolean, boolean]>;
     /**
      * Ask the user to resolve any mismatched tweak values.
      * @param preferredSource The preferred tweak values to resolve against.
      * @param updatePreferredRemote Optional exact-context writer supplied by the failed operation.
+     * @param assessment The exact compatibility assessment from the failed operation, when available.
      */
-    abstract askResolvingMismatched(preferredSource: TweakValues, updatePreferredRemote?: (setting: ObsidianLiveSyncSettings) => Promise<boolean>): Promise<"OK" | "CHECKAGAIN" | "IGNORE">;
+    abstract askResolvingMismatched(preferredSource: TweakValues, updatePreferredRemote?: (setting: ObsidianLiveSyncSettings) => Promise<boolean>, assessment?: TweakAssessment): Promise<"OK" | "CHECKAGAIN" | "IGNORE">;
     /**
      * Check and ask the user to use the remote configuration.
      * @param settings The remote database settings to connect.

package/dist/services/implements/injectable/InjectableTweakValueService.d.ts

@@ -2,14 +2,14 @@ import type { ServiceContext } from "../../base/ServiceBase.js";
 import { TweakValueService } from "../../base/TweakValueService.js";
 export declare class InjectableTweakValueService<T extends ServiceContext> extends TweakValueService<T> {
     fetchRemotePreferred: import("../../lib/HandlerUtils.js").HandlerFunction<(trialSetting: import("../../../settings.js").RemoteDBSettings) => Promise<import("../../../common/types.js").RemotePreferredTweakResult>, unknown>;
-    checkAndAskResolvingMismatched: import("../../lib/HandlerUtils.js").HandlerFunction<(preferred: Partial<import("../../../common/types.js").TweakValues>) => Promise<[import("../../../common/types.js").TweakValues | boolean, boolean]>, unknown>;
-    askResolvingMismatched: import("../../lib/HandlerUtils.js").HandlerFunction<(preferredSource: import("../../../common/types.js").TweakValues, updatePreferredRemote?: (setting: import("../../../settings.js").ObsidianLiveSyncSettings) => Promise<boolean>) => Promise<"OK" | "CHECKAGAIN" | "IGNORE">, unknown>;
+    checkAndAskResolvingMismatched: import("../../lib/HandlerUtils.js").HandlerFunction<(preferred: Partial<import("../../../settings.js").TweakValues>, assessment?: import("../../../settings.js").TweakAssessment) => Promise<[import("../../../settings.js").TweakValues | boolean, boolean]>, unknown>;
+    askResolvingMismatched: import("../../lib/HandlerUtils.js").HandlerFunction<(preferredSource: import("../../../settings.js").TweakValues, updatePreferredRemote?: (setting: import("../../../settings.js").ObsidianLiveSyncSettings) => Promise<boolean>, assessment?: import("../../../settings.js").TweakAssessment) => Promise<"OK" | "CHECKAGAIN" | "IGNORE">, unknown>;
     checkAndAskUseRemoteConfiguration: import("../../lib/HandlerUtils.js").HandlerFunction<(settings: import("../../../settings.js").RemoteDBSettings) => Promise<{
-        result: false | import("../../../common/types.js").TweakValues;
+        result: false | import("../../../settings.js").TweakValues;
         requireFetch: boolean;
     }>, unknown>;
-    askUseRemoteConfiguration: import("../../lib/HandlerUtils.js").HandlerFunction<(trialSetting: import("../../../settings.js").RemoteDBSettings, preferred: import("../../../common/types.js").TweakValues) => Promise<{
-        result: false | import("../../../common/types.js").TweakValues;
+    askUseRemoteConfiguration: import("../../lib/HandlerUtils.js").HandlerFunction<(trialSetting: import("../../../settings.js").RemoteDBSettings, preferred: import("../../../settings.js").TweakValues) => Promise<{
+        result: false | import("../../../settings.js").TweakValues;
         requireFetch: boolean;
     }>, unknown>;
 }

package/dist/settings.d.ts

@@ -7,4 +7,7 @@ export { DEFAULT_SETTINGS, NEW_VAULT_SETTINGS, P2P_DEFAULT_SETTINGS, SETTINGS_SC
 export { PREFERRED_BASE, PREFERRED_JOURNAL_SYNC, PREFERRED_SETTING_CLOUDANT, PREFERRED_SETTING_SELF_HOSTED, } from "./common/models/setting.const.preferred.js";
 export { CURRENT_SETTING_VERSION } from "./common/models/setting.const.js";
 export { prepareSettingsForLoad, SettingsMigrationReviewCodes, type PreparedSettings, type SettingsMigrationReviewCode, type SettingsMigrationReviewReason, type SettingsMigrationState, } from "./common/models/setting.lifecycle.js";
+export { assessTweakCompatibility } from "./common/models/tweak.compatibility.js";
+export type { TweakAssessment, TweakAssessmentEntry, TweakAssessmentRelation, TweakAssessmentValue, TweakTransition, TweakTransitionReason, } from "./common/models/tweak.compatibility.js";
+export type { TweakReconstruction, TweakValues } from "./common/models/tweak.definition.js";
 export type { ObsidianLiveSyncSettings, RemoteDBSettings, RemoteTypeSettings, } from "./common/models/setting.type.js";

package/dist/settings.js

@@ -16,6 +16,7 @@ import {
   prepareSettingsForLoad,
   SettingsMigrationReviewCodes
 } from "./common/models/setting.lifecycle.js";
+import { assessTweakCompatibility } from "./common/models/tweak.compatibility.js";
 export {
   CURRENT_SETTING_VERSION,
   DEFAULT_SETTINGS,
@@ -27,6 +28,7 @@ export {
   PREFERRED_SETTING_SELF_HOSTED,
   SETTINGS_SCHEMA_DEFAULTS,
   SettingsMigrationReviewCodes,
+  assessTweakCompatibility,
   createNewVaultSettings,
   prepareSettingsForLoad
 };