@vrtmrz/livesync-commonlib 0.1.0-rc.1 → 0.1.0-rc.2

package/dist/common/messages/combinedMessages.prod.d.ts

@@ -8631,6 +8631,9 @@ export declare const allMessages: {
         readonly def: "Welcome to Self-hosted LiveSync";
         readonly zh: "欢迎使用 Self-hosted LiveSync";
     };
+    readonly "Ui.SetupWizard.Invitation.Start": {
+        readonly def: "Start setup";
+    };
     readonly "Ui.SetupWizard.OutroAskUserMode.CompatibleOption": {
         readonly def: "The remote is already set up, and the configuration is compatible (or became compatible through this operation).";
         readonly zh: "远程端已配置完成，且当前配置兼容（或已通过本次操作变为兼容）。";

package/dist/common/messages/combinedMessages.prod.js

@@ -8635,6 +8635,9 @@ Note : le QR code n'est pas chiffr\xE9, soyez prudent en l'affichant.
     def: "Welcome to Self-hosted LiveSync",
     zh: "\u6B22\u8FCE\u4F7F\u7528 Self-hosted LiveSync"
   },
+  "Ui.SetupWizard.Invitation.Start": {
+    def: "Start setup"
+  },
   "Ui.SetupWizard.OutroAskUserMode.CompatibleOption": {
     def: "The remote is already set up, and the configuration is compatible (or became compatible through this operation).",
     zh: "\u8FDC\u7A0B\u7AEF\u5DF2\u914D\u7F6E\u5B8C\u6210\uFF0C\u4E14\u5F53\u524D\u914D\u7F6E\u517C\u5BB9\uFF08\u6216\u5DF2\u901A\u8FC7\u672C\u6B21\u64CD\u4F5C\u53D8\u4E3A\u517C\u5BB9\uFF09\u3002"

package/dist/common/messages/def.d.ts

@@ -1040,6 +1040,7 @@ export declare const PartialMessages: {
         "Ui.SetupWizard.Intro.ProceedNew": string;
         "Ui.SetupWizard.Intro.Question": string;
         "Ui.SetupWizard.Intro.Title": string;
+        "Ui.SetupWizard.Invitation.Start": string;
         "Ui.SetupWizard.OutroAskUserMode.CompatibleOption": string;
         "Ui.SetupWizard.OutroAskUserMode.CompatibleOptionDesc": string;
         "Ui.SetupWizard.OutroAskUserMode.ExistingOption": string;

package/dist/common/messagesJson/en.json

@@ -1039,6 +1039,7 @@
     "Ui.SetupWizard.Intro.ProceedNew": "Yes, I want to set up a new synchronisation",
     "Ui.SetupWizard.Intro.Question": "First, please select the option that best describes your current situation.",
     "Ui.SetupWizard.Intro.Title": "Welcome to Self-hosted LiveSync",
+    "Ui.SetupWizard.Invitation.Start": "Start setup",
     "Ui.SetupWizard.OutroAskUserMode.CompatibleOption": "The remote is already set up, and the configuration is compatible (or became compatible through this operation).",
     "Ui.SetupWizard.OutroAskUserMode.CompatibleOptionDesc": "Unless you are certain, selecting this option is risky. It assumes the server configuration is compatible with this device. If that is not the case, data loss may occur. Please make sure you understand the consequences.",
     "Ui.SetupWizard.OutroAskUserMode.ExistingOption": "My remote server is already set up. I want to join this device.",

package/dist/common/models/setting.const.defaults.d.ts

@@ -1,3 +1,22 @@
 import { type ObsidianLiveSyncSettings, type P2PSyncSetting } from "./setting.type.js";
 export declare const P2P_DEFAULT_SETTINGS: P2PSyncSetting;
+/**
+ * Conservative fallback values used to complete stored settings.
+ *
+ * Keep these values compatible with existing installations. Defaults intended
+ * only for a newly created Vault belong in {@link NEW_VAULT_SETTINGS}.
+ */
+export declare const SETTINGS_SCHEMA_DEFAULTS: ObsidianLiveSyncSettings;
+/**
+ * Initial values for a Vault which has never stored Self-hosted LiveSync settings.
+ *
+ * This object is deliberately separate from schema fallbacks so that future
+ * releases can improve new-user defaults without changing existing choices.
+ */
+export declare const NEW_VAULT_SETTINGS: ObsidianLiveSyncSettings;
+/** Create an independently mutable copy of the current new-Vault settings. */
+export declare function createNewVaultSettings(): ObsidianLiveSyncSettings;
+/**
+ * Compatibility name for the conservative setting-schema fallbacks.
+ */
 export declare const DEFAULT_SETTINGS: ObsidianLiveSyncSettings;

package/dist/common/models/setting.const.defaults.js

@@ -1,4 +1,5 @@
 import { ChunkAlgorithms, CURRENT_SETTING_VERSION, E2EEAlgorithms, REMOTE_COUCHDB } from "./setting.const.js";
+import { PREFERRED_BASE } from "./setting.const.preferred.js";
 import { AutoAccepting } from "./setting.type.js";
 const P2P_DEFAULT_SETTINGS = {
   P2P_Enabled: false,
@@ -22,7 +23,7 @@ const P2P_DEFAULT_SETTINGS = {
   P2P_turnCredential: "",
   P2P_useDiagRTC: false
 };
-const DEFAULT_SETTINGS = {
+const SETTINGS_SCHEMA_DEFAULTS = {
   remoteType: REMOTE_COUCHDB,
   useCustomRequestHandler: false,
   couchDB_URI: "",
@@ -179,7 +180,24 @@ const DEFAULT_SETTINGS = {
   maxMTimeForReflectEvents: 0,
   tweakModified: void 0
 };
+const NEW_VAULT_SETTINGS = {
+  ...SETTINGS_SCHEMA_DEFAULTS,
+  ...PREFERRED_BASE,
+  remoteConfigurations: {},
+  pluginSyncExtendedSetting: {}
+};
+function createNewVaultSettings() {
+  return {
+    ...NEW_VAULT_SETTINGS,
+    remoteConfigurations: {},
+    pluginSyncExtendedSetting: {}
+  };
+}
+const DEFAULT_SETTINGS = SETTINGS_SCHEMA_DEFAULTS;
 export {
   DEFAULT_SETTINGS,
-  P2P_DEFAULT_SETTINGS
+  NEW_VAULT_SETTINGS,
+  P2P_DEFAULT_SETTINGS,
+  SETTINGS_SCHEMA_DEFAULTS,
+  createNewVaultSettings
 };

package/dist/common/models/setting.lifecycle.d.ts

@@ -0,0 +1,31 @@
+import type { ObsidianLiveSyncSettings } from "./setting.type.js";
+export declare const SettingsMigrationReviewCodes: {
+    readonly LegacyUpdatePending: "legacy-update-review-pending";
+    readonly FutureSchema: "settings-schema-newer-than-runtime";
+};
+export type SettingsMigrationReviewCode = (typeof SettingsMigrationReviewCodes)[keyof typeof SettingsMigrationReviewCodes];
+export interface SettingsMigrationReviewReason {
+    code: SettingsMigrationReviewCode;
+    fromVersion: number;
+    toVersion: number;
+}
+export interface SettingsMigrationState {
+    sourceVersion: number;
+    targetVersion: number;
+    isNewVault: boolean;
+    isFromFutureSchema: boolean;
+    changed: boolean;
+    requiresSyncReview: boolean;
+    reviewReasons: readonly SettingsMigrationReviewReason[];
+}
+export interface PreparedSettings extends SettingsMigrationState {
+    settings: ObsidianLiveSyncSettings;
+}
+/**
+ * Completes and migrates raw settings before services consume them.
+ *
+ * Stored settings use conservative schema fallbacks. A blank store uses the
+ * independently maintained new-Vault defaults. Explicit stored values always
+ * take precedence over both sets of defaults.
+ */
+export declare function prepareSettingsForLoad(storedSettings: Partial<ObsidianLiveSyncSettings> | undefined): PreparedSettings;

package/dist/common/models/setting.lifecycle.js

@@ -0,0 +1,109 @@
+import { createNewVaultSettings, SETTINGS_SCHEMA_DEFAULTS } from "./setting.const.defaults.js";
+import {
+  CURRENT_SETTING_VERSION,
+  SETTING_VERSION_INITIAL,
+  SETTING_VERSION_SUPPORT_CASE_INSENSITIVE
+} from "./setting.const.js";
+const SettingsMigrationReviewCodes = {
+  LegacyUpdatePending: "legacy-update-review-pending",
+  FutureSchema: "settings-schema-newer-than-runtime"
+};
+const SETTINGS_MIGRATIONS = [
+  {
+    toVersion: SETTING_VERSION_SUPPORT_CASE_INSENSITIVE,
+    apply: (settings) => settings,
+    reviewReason: (settings, fromVersion) => settings.versionUpFlash ? {
+      code: SettingsMigrationReviewCodes.LegacyUpdatePending,
+      fromVersion,
+      toVersion: SETTING_VERSION_SUPPORT_CASE_INSENSITIVE
+    } : void 0
+  }
+];
+function cloneSettings(source, fallbacks) {
+  return {
+    ...fallbacks,
+    ...source,
+    remoteConfigurations: Object.fromEntries(
+      Object.entries(source.remoteConfigurations ?? fallbacks.remoteConfigurations).map(([id, config]) => [
+        id,
+        { ...config }
+      ])
+    ),
+    pluginSyncExtendedSetting: {
+      ...fallbacks.pluginSyncExtendedSetting,
+      ...source.pluginSyncExtendedSetting
+    }
+  };
+}
+function storedSettingVersion(settings) {
+  const version = settings.settingVersion;
+  return typeof version === "number" && Number.isSafeInteger(version) && version >= SETTING_VERSION_INITIAL ? version : SETTING_VERSION_INITIAL;
+}
+function isBlankSettings(settings) {
+  return settings === void 0 || Object.keys(settings).length === 0;
+}
+function prepareSettingsForLoad(storedSettings) {
+  if (isBlankSettings(storedSettings)) {
+    return {
+      settings: createNewVaultSettings(),
+      sourceVersion: CURRENT_SETTING_VERSION,
+      targetVersion: CURRENT_SETTING_VERSION,
+      isNewVault: true,
+      isFromFutureSchema: false,
+      changed: false,
+      requiresSyncReview: false,
+      reviewReasons: []
+    };
+  }
+  const source = { ...storedSettings };
+  const sourceVersion = storedSettingVersion(source);
+  if (sourceVersion > CURRENT_SETTING_VERSION) {
+    const reviewReasons2 = [
+      {
+        code: SettingsMigrationReviewCodes.FutureSchema,
+        fromVersion: sourceVersion,
+        toVersion: CURRENT_SETTING_VERSION
+      }
+    ];
+    return {
+      settings: cloneSettings(source, SETTINGS_SCHEMA_DEFAULTS),
+      sourceVersion,
+      targetVersion: sourceVersion,
+      isNewVault: false,
+      isFromFutureSchema: true,
+      changed: false,
+      requiresSyncReview: true,
+      reviewReasons: reviewReasons2
+    };
+  }
+  let migrated = source;
+  let targetVersion = sourceVersion;
+  const reviewReasons = [];
+  for (const migration of SETTINGS_MIGRATIONS) {
+    if (targetVersion >= migration.toVersion) continue;
+    const reason = migration.reviewReason?.(migrated, targetVersion);
+    if (reason) reviewReasons.push(reason);
+    migrated = migration.apply(migrated);
+    targetVersion = migration.toVersion;
+    migrated.settingVersion = targetVersion;
+  }
+  if (targetVersion !== CURRENT_SETTING_VERSION) {
+    throw new Error(
+      `No setting migration reaches schema ${CURRENT_SETTING_VERSION} from schema ${sourceVersion}.`
+    );
+  }
+  return {
+    settings: cloneSettings(migrated, SETTINGS_SCHEMA_DEFAULTS),
+    sourceVersion,
+    targetVersion,
+    isNewVault: false,
+    isFromFutureSchema: false,
+    changed: sourceVersion !== targetVersion,
+    requiresSyncReview: reviewReasons.length > 0,
+    reviewReasons
+  };
+}
+export {
+  SettingsMigrationReviewCodes,
+  prepareSettingsForLoad
+};

package/dist/common/types.d.ts

@@ -10,7 +10,8 @@ import { IDPrefixes, LEAF_WAIT_ONLY_REMOTE, LEAF_WAIT_TIMEOUT, LEAF_WAIT_TIMEOUT
 import { AutoAccepting, type BucketSyncSetting, type ChunkSplitterVersion, type ConfigPassphraseStore, type CouchDBConnection, type E2EEAlgorithm, type EncryptionSettings, type HashAlgorithm, type HasSettings, type LocalDBSettings, type ObsidianLiveSyncSettings, type P2PConnectionInfo, type P2PSyncSetting, type PluginSyncSettingEntry, type RemoteDBSettings, type RemoteType, type RemoteTypeSettings, type SYNC_MODE } from "./models/setting.type.js";
 import { ChunkAlgorithmNames, ChunkAlgorithms, CURRENT_SETTING_VERSION, E2EEAlgorithmNames, E2EEAlgorithms, HashAlgorithms, REMOTE_COUCHDB, REMOTE_MINIO, REMOTE_P2P, RemoteTypes, SETTING_VERSION_INITIAL, SETTING_VERSION_SUPPORT_CASE_INSENSITIVE, MODE_AUTOMATIC, MODE_PAUSED, MODE_SELECTIVE, MODE_SHINY } from "./models/setting.const.js";
 import { PREFERRED_BASE, PREFERRED_JOURNAL_SYNC, PREFERRED_SETTING_CLOUDANT, PREFERRED_SETTING_SELF_HOSTED } from "./models/setting.const.preferred.js";
-import { P2P_DEFAULT_SETTINGS, DEFAULT_SETTINGS } from "./models/setting.const.defaults.js";
+import { P2P_DEFAULT_SETTINGS, DEFAULT_SETTINGS, NEW_VAULT_SETTINGS, SETTINGS_SCHEMA_DEFAULTS, createNewVaultSettings } from "./models/setting.const.defaults.js";
+import { prepareSettingsForLoad, SettingsMigrationReviewCodes, type PreparedSettings, type SettingsMigrationReviewCode, type SettingsMigrationReviewReason, type SettingsMigrationState } from "./models/setting.lifecycle.js";
 import { KeyIndexOfSettings } from "./models/setting.const.qr.js";
 import type { DeviceInfo, EntryBody, EntryDoc, EntryDocResponse, EntryMilestoneInfo, EntryNodeInfo, NodeData, NodeKey } from "./models/db.definition.js";
 import { isMetaEntry } from "./models/db.definition.js";
@@ -42,7 +43,8 @@ export type { EncryptionSettings };
 export { HashAlgorithms, type HashAlgorithm, ChunkAlgorithmNames, ChunkAlgorithms, type ChunkSplitterVersion };
 export type { RemoteDBSettings };
 export type { ObsidianLiveSyncSettings };
-export { DEFAULT_SETTINGS };
+export { DEFAULT_SETTINGS, NEW_VAULT_SETTINGS, SETTINGS_SCHEMA_DEFAULTS, createNewVaultSettings };
+export { prepareSettingsForLoad, SettingsMigrationReviewCodes, type PreparedSettings, type SettingsMigrationReviewCode, type SettingsMigrationReviewReason, type SettingsMigrationState, };
 export { KeyIndexOfSettings };
 export { type HasSettings };
 export { PREFERRED_BASE, PREFERRED_SETTING_CLOUDANT, PREFERRED_SETTING_SELF_HOSTED, PREFERRED_JOURNAL_SYNC };

package/dist/common/types.js

@@ -67,7 +67,17 @@ import {
   PREFERRED_SETTING_CLOUDANT,
   PREFERRED_SETTING_SELF_HOSTED
 } from "./models/setting.const.preferred.js";
-import { P2P_DEFAULT_SETTINGS, DEFAULT_SETTINGS } from "./models/setting.const.defaults.js";
+import {
+  P2P_DEFAULT_SETTINGS,
+  DEFAULT_SETTINGS,
+  NEW_VAULT_SETTINGS,
+  SETTINGS_SCHEMA_DEFAULTS,
+  createNewVaultSettings
+} from "./models/setting.const.defaults.js";
+import {
+  prepareSettingsForLoad,
+  SettingsMigrationReviewCodes
+} from "./models/setting.lifecycle.js";
 import { KeyIndexOfSettings } from "./models/setting.const.qr.js";
 import { isMetaEntry } from "./models/db.definition.js";
 import {
@@ -165,6 +175,7 @@ export {
   MODE_PAUSED,
   MODE_SELECTIVE,
   MODE_SHINY,
+  NEW_VAULT_SETTINGS,
   NODEINFO_DOCID,
   NOT_CONFLICTED,
   NoteTypes,
@@ -190,10 +201,12 @@ export {
   SALT_OF_ID,
   SALT_OF_PASSPHRASE,
   SEED_MURMURHASH,
+  SETTINGS_SCHEMA_DEFAULTS,
   SETTING_KEY_P2P_DEVICE_NAME,
   SETTING_VERSION_INITIAL,
   SETTING_VERSION_SUPPORT_CASE_INSENSITIVE,
   SYNCINFO_ID,
+  SettingsMigrationReviewCodes,
   SuffixDatabaseName,
   TIME_ARGUMENT_INFINITY,
   TweakValuesDefault,
@@ -207,6 +220,8 @@ export {
   configURIBase,
   configURIBaseQR,
   configurationNames,
+  createNewVaultSettings,
   isMetaEntry,
+  prepareSettingsForLoad,
   statusDisplay
 };

package/dist/interfaces/Confirm.d.ts

@@ -12,6 +12,13 @@ export interface Confirm {
         defaultAction: T[number];
         timeout?: number;
     }): Promise<T[number] | false>;
-    askInPopup(key: string, dialogText: string, anchorCallback: (anchor: HTMLAnchorElement) => void): void;
+    /**
+     * Shows a non-blocking message containing one host-rendered action link.
+     *
+     * Hosts which can display transient UI should keep the message visible for
+     * `durationMs`. Headless hosts may report the message without presenting an
+     * interactive action.
+     */
+    askInPopup(key: string, dialogText: string, anchorCallback: (anchor: HTMLAnchorElement) => void, durationMs?: number): void;
     confirmWithMessage(title: string, contentMd: string, buttons: string[], defaultAction: (typeof buttons)[number], timeout?: number): Promise<(typeof buttons)[number] | false>;
 }

package/dist/interfaces/DatabaseRebuilder.d.ts

@@ -4,8 +4,18 @@ export interface Rebuilder {
     $rebuildEverything(): Promise<void>;
     $fetchLocal(makeLocalChunkBeforeSync?: boolean, preventMakeLocalFilesBeforeSync?: boolean): Promise<void>;
     $fetchLocalDBFast(autoResume: boolean): Promise<void>;
-    scheduleRebuild(): Promise<void>;
-    scheduleFetch(): Promise<void>;
+    /**
+     * Writes the Rebuild flag, suspends the current runtime, optionally prepares
+     * persisted state, and requests a restart, in that order.
+     *
+     * The preparation callback runs only after the flag exists. If it fails,
+     * the flag is removed, the current runtime is resumed, and the error is
+     * rethrown. A false result means that the flag could not be written and no
+     * restart was requested.
+     */
+    scheduleRebuild(prepareBeforeRestart?: () => Promise<void>): Promise<boolean>;
+    /** See {@link scheduleRebuild}; this variant writes the Fetch flag. */
+    scheduleFetch(prepareBeforeRestart?: () => Promise<void>): Promise<boolean>;
     /**
      * Declares the finish of the rebuild process and unlock remote, resume reflecting the changes.
      */

package/dist/remoteConfigurations.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Focused public primitives for storing and selecting multiple remote connection profiles.
+ *
+ * The compatibility fields remain available to existing hosts, but new profile-management code
+ * should use this entry point instead of importing the wider service feature module.
+ */
+export { activateP2PRemoteConfiguration, activateRemoteConfiguration, createRemoteConfigurationId, suggestRemoteConfigurationName, upsertRemoteConfigurationInPlace, } from "./serviceFeatures/remoteConfig.js";
+export type { SerializableRemoteConfigurationType, UpsertRemoteConfigurationOptions, } from "./serviceFeatures/remoteConfig.js";
+export type { RemoteConfiguration } from "./common/models/setting.type.js";

package/dist/remoteConfigurations.js

@@ -0,0 +1,14 @@
+import {
+  activateP2PRemoteConfiguration,
+  activateRemoteConfiguration,
+  createRemoteConfigurationId,
+  suggestRemoteConfigurationName,
+  upsertRemoteConfigurationInPlace
+} from "./serviceFeatures/remoteConfig.js";
+export {
+  activateP2PRemoteConfiguration,
+  activateRemoteConfiguration,
+  createRemoteConfigurationId,
+  suggestRemoteConfigurationName,
+  upsertRemoteConfigurationInPlace
+};

package/dist/replication/trystero/LiveSyncTrysteroReplicator.d.ts

@@ -18,6 +18,8 @@ export interface LiveSyncTrysteroReplicatorEnv extends LiveSyncReplicatorEnv {
 export declare class LiveSyncTrysteroReplicator extends LiveSyncAbstractReplicator {
     private _p2pHost?;
     private _replicator?;
+    private _lifecycleOperation;
+    private _shouldBeOpen;
     get openReplicationUI(): (showResult: boolean) => Promise<boolean | void>;
     get rawReplicator(): TrysteroReplicator;
     get rawHost(): P2PHost;
@@ -25,6 +27,7 @@ export declare class LiveSyncTrysteroReplicator extends LiveSyncAbstractReplicat
     getReplicationPBKDF2Salt(_setting: RemoteDBSettings, _refresh?: boolean): Promise<Uint8Array<ArrayBuffer>>;
     terminateSync(): void;
     private _buildEnv;
+    private _enqueueLifecycleOperation;
     open(): Promise<void>;
     close(): Promise<void>;
     closeReplication(): void;
@@ -36,7 +39,7 @@ export declare class LiveSyncTrysteroReplicator extends LiveSyncAbstractReplicat
     onNewPeer(peer: Advertisement): Promise<void>;
     onPeerLeaved(peerId: string): void;
     replicateFromCommand(showResult?: boolean): Promise<void>;
-    replicateFrom(peerId: string, showNotice?: boolean): Promise<{
+    replicateFrom(peerId: string, showNotice?: boolean, skipOrdinaryReplicationPolicy?: boolean): Promise<{
         error: any;
         ok?: undefined;
     } | {

package/dist/replication/trystero/LiveSyncTrysteroReplicator.js

@@ -18,6 +18,8 @@ import { delay } from "octagonal-wheels/promises";
 class LiveSyncTrysteroReplicator extends LiveSyncAbstractReplicator {
   _p2pHost;
   _replicator;
+  _lifecycleOperation = Promise.resolve();
+  _shouldBeOpen = false;
   get openReplicationUI() {
     return this.env.openReplicationUI;
   }
@@ -59,6 +61,7 @@ class LiveSyncTrysteroReplicator extends LiveSyncAbstractReplicator {
         return services.API.confirm;
       },
       runFiniteReplicationActivity: (task, options) => services.replicator.runFiniteReplicationActivity(task, options),
+      canStartOrdinaryReplication: (showMessage = false) => services.replication.onCheckReplicationReady(showMessage),
       processReplicatedDocs: async (docs) => {
         const settings = services.setting.currentSettings();
         if (settings.suspendParseReplicationResult) {
@@ -75,36 +78,48 @@ class LiveSyncTrysteroReplicator extends LiveSyncAbstractReplicator {
       }
     };
   }
+  _enqueueLifecycleOperation(operation) {
+    const queued = this._lifecycleOperation.catch(() => void 0).then(operation);
+    this._lifecycleOperation = queued.catch(() => void 0);
+    return queued;
+  }
   async open() {
     if (!this.env.services.setting.currentSettings().P2P_Enabled) {
       Logger(this.translate("P2P.NotEnabled"), LOG_LEVEL_NOTICE);
       return;
     }
-    if (this._replicator && this._p2pHost?.isServing) {
-      Logger("P2P replicator is already open.");
-      return;
-    }
-    try {
-      const env = this._buildEnv();
-      const host = new P2PHost(env);
-      const replicator = new TrysteroReplicator(env, host);
-      this._p2pHost = host;
-      this._replicator = replicator;
-      await replicator.open();
-    } catch (e) {
-      Logger(e instanceof Error ? e.message : "Error while opening P2P connection", LOG_LEVEL_NOTICE);
-      Logger(e, LOG_LEVEL_VERBOSE);
-      this._p2pHost = void 0;
-      this._replicator = void 0;
-    }
+    this._shouldBeOpen = true;
+    await this._enqueueLifecycleOperation(async () => {
+      if (!this._shouldBeOpen) return;
+      if (this._replicator && this._p2pHost?.isServing) {
+        Logger("P2P replicator is already open.");
+        return;
+      }
+      try {
+        const env = this._buildEnv();
+        const host = new P2PHost(env);
+        const replicator = new TrysteroReplicator(env, host);
+        this._p2pHost = host;
+        this._replicator = replicator;
+        await replicator.open();
+      } catch (e) {
+        Logger(e instanceof Error ? e.message : "Error while opening P2P connection", LOG_LEVEL_NOTICE);
+        Logger(e, LOG_LEVEL_VERBOSE);
+        this._p2pHost = void 0;
+        this._replicator = void 0;
+      }
+    });
   }
   async close() {
-    if (this._replicator) {
-      this._replicator.disableBroadcastChanges();
-      await this._replicator.close();
-      this._replicator = void 0;
-    }
-    this._p2pHost = void 0;
+    this._shouldBeOpen = false;
+    await this._enqueueLifecycleOperation(async () => {
+      if (this._replicator) {
+        this._replicator.disableBroadcastChanges();
+        await this._replicator.close();
+        this._replicator = void 0;
+      }
+      this._p2pHost = void 0;
+    });
   }
   closeReplication() {
     this._replicator?.disconnectFromServer();
@@ -138,11 +153,11 @@ class LiveSyncTrysteroReplicator extends LiveSyncAbstractReplicator {
       { label: "replication" }
     );
   }
-  async replicateFrom(peerId, showNotice = false) {
+  async replicateFrom(peerId, showNotice = false, skipOrdinaryReplicationPolicy = false) {
     const replicator = this._replicator;
     if (!replicator) throw new Error("P2P replicator is not open");
     return await this.env.services.replicator.runFiniteReplicationActivity(
-      () => replicator.replicateFrom(peerId, showNotice),
+      () => skipOrdinaryReplicationPolicy ? replicator.replicateFrom(peerId, showNotice, false, true) : replicator.replicateFrom(peerId, showNotice),
       { label: "replication" }
     );
   }
@@ -303,7 +318,7 @@ class LiveSyncTrysteroReplicator extends LiveSyncAbstractReplicator {
       }
       this.env.services.setting.currentSettings().P2P_RebuildFrom = "";
       Logger("Fetching from peer " + peerId + ".", logLevel);
-      const rep = await r.replicateFrom(peerId, showingNotice);
+      const rep = await r.replicateFrom(peerId, showingNotice, false, true);
       if (rep.ok) {
         Logger("P2P Fetching has been succeed from " + peerId + ".", logLevel);
         return true;

package/dist/replication/trystero/P2PReplicatorCore.d.ts

@@ -2,11 +2,7 @@ import type { NecessaryServices } from "../../interfaces/ServiceModule.js";
 import type { P2PPaneParams } from "./UseP2PReplicatorResult.js";
 export type P2PViewFactory = (leaf: unknown) => unknown;
 /**
- * ServiceFeature: P2P Replicator lifecycle management.
- * Binds a LiveSyncTrysteroReplicator to the host's lifecycle events,
- * following the same middleware style as useOfflineScanner.
- *
- * @param viewTypeAndFactory  Optional [viewType, factory] pair for registering the P2P pane view.
- *                            When provided, also registers commands and ribbon icon via services.API.
+ * @deprecated Compose `useP2PReplicatorFeature` with host-specific commands
+ * and UI instead. This wrapper remains for source compatibility.
  */
 export declare function useP2PReplicator(host: NecessaryServices<"API" | "appLifecycle" | "setting" | "vault" | "database" | "databaseEvents" | "keyValueDB" | "replication" | "config" | "UI" | "replicator" | "remote", never>, viewTypeAndFactory?: [viewType: string, factory: P2PViewFactory]): P2PPaneParams;