refactor: consume Commonlib as a package

src/features/ConfigSync/CmdConfigSync.ts

@@ -19,7 +19,7 @@ import type {
     AnyEntry,
     SavingEntry,
     diff_result,
-} from "@lib/common/types.ts";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 import {
     CANCELLED,
     LEAVE_TO_SUBSEQUENT,
@@ -29,7 +29,7 @@ import {
     LOG_LEVEL_VERBOSE,
     MODE_SELECTIVE,
     MODE_SHINY,
-} from "@lib/common/types.ts";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { ICXHeader, PERIODIC_PLUGIN_SWEEP } from "@/common/types.ts";
 import {
     createBlob,
@@ -42,12 +42,12 @@ import {
     isDocContentSame,
     isLoadedEntry,
     isObjectDifferent,
-} from "@lib/common/utils.ts";
-import { digestHash } from "@lib/string_and_binary/hash.ts";
-import { arrayBufferToBase64, decodeBinary, readString } from "@lib/string_and_binary/convert.ts";
+} from "@vrtmrz/livesync-commonlib/compat/common/utils";
+import { digestHash } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/hash";
+import { arrayBufferToBase64, decodeBinary, readString } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/convert";
 import { serialized, shareRunningResult } from "octagonal-wheels/concurrency/lock";
 import { LiveSyncCommands } from "@/features/LiveSyncCommands.ts";
-import { stripAllPrefixes } from "@lib/string_and_binary/path.ts";
+import { stripAllPrefixes } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/path";
 import {
     EVEN,
     disposeMemoObject,
@@ -61,17 +61,17 @@ import {
 import { PeriodicProcessor } from "@/common/PeriodicProcessor.ts";
 import { JsonResolveModal } from "@/features/HiddenFileCommon/JsonResolveModal.ts";
 import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
-import { pluginScanningCount } from "@lib/mock_and_interop/stores.ts";
+import { pluginScanningCount } from "@vrtmrz/livesync-commonlib/compat/mock_and_interop/stores";
 import type ObsidianLiveSyncPlugin from "@/main.ts";
 import { base64ToArrayBuffer, base64ToString } from "octagonal-wheels/binary/base64";
 import { ConflictResolveModal } from "@/modules/features/InteractiveConflictResolving/ConflictResolveModal.ts";
 import { Semaphore } from "octagonal-wheels/concurrency/semaphore";
 import { EVENT_REQUEST_OPEN_PLUGIN_SYNC_DIALOG, eventHub } from "@/common/events.ts";
 import { PluginDialogModal } from "./PluginDialogModal.ts";
-import { $msg } from "@lib/common/i18n.ts";
-import type { InjectableServiceHub } from "@lib/services/InjectableServices.ts";
+import { $msg } from "@vrtmrz/livesync-commonlib/compat/common/i18n";
+import type { InjectableServiceHub } from "@vrtmrz/livesync-commonlib/compat/services/implements/injectable/InjectableServiceHub";
 import type { LiveSyncCore } from "@/main.ts";
-import { LiveSyncError } from "@lib/common/LSError.ts";
+import { LiveSyncError } from "@vrtmrz/livesync-commonlib/compat/common/LSError";
 
 const d = "\u200b";
 const d2 = "\n";

src/features/ConfigSync/PluginCombo.svelte

@@ -5,9 +5,9 @@
         type IPluginDataExDisplay,
         type PluginDataExFile,
     } from "./CmdConfigSync.ts";
-    import { Logger } from "@lib/common/logger";
-    import { type FilePath, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@lib/common/types";
-    import { getDocData, timeDeltaToHumanReadable, unique } from "@lib/common/utils";
+    import { Logger } from "@vrtmrz/livesync-commonlib/compat/common/logger";
+    import { type FilePath, LOG_LEVEL_INFO, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "@vrtmrz/livesync-commonlib/compat/common/types";
+    import { getDocData, timeDeltaToHumanReadable, unique } from "@vrtmrz/livesync-commonlib/compat/common/utils";
     import type ObsidianLiveSyncPlugin from "@/main";
     // import { askString } from "../../common/utils";
     import { Menu } from "@/deps.ts";

src/features/ConfigSync/PluginPane.svelte

@@ -11,14 +11,14 @@
     } from "./CmdConfigSync.ts";
     import PluginCombo from "./PluginCombo.svelte";
     import { Menu, type PluginManifest } from "@/deps.ts";
-    import { unique } from "@lib/common/utils";
+    import { unique } from "@vrtmrz/livesync-commonlib/compat/common/utils";
     import {
         MODE_SELECTIVE,
         MODE_AUTOMATIC,
         MODE_PAUSED,
         type SYNC_MODE,
         MODE_SHINY,
-    } from "@lib/common/types";
+    } from "@vrtmrz/livesync-commonlib/compat/common/types";
     import { normalizePath } from "@/deps";
     import { HiddenFileSync } from "@/features/HiddenFileSync/CmdHiddenFileSync.ts";
     import { LOG_LEVEL_NOTICE, Logger } from "octagonal-wheels/common/logger";

src/features/HiddenFileCommon/JsonResolveModal.ts

@@ -1,7 +1,7 @@
 import { App, Modal } from "@/deps.ts";
-import { type FilePath, type LoadedEntry } from "@lib/common/types.ts";
+import { type FilePath, type LoadedEntry } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import JsonResolvePane from "./JsonResolvePane.svelte";
-import { waitForSignal } from "@lib/common/utils.ts";
+import { waitForSignal } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import { mount, unmount } from "svelte";
 
 export class JsonResolveModal extends Modal {

src/features/HiddenFileCommon/JsonResolvePane.svelte

@@ -1,8 +1,8 @@
 <script lang="ts">
     import { type Diff, DIFF_DELETE, DIFF_INSERT, diff_match_patch } from "@/deps.ts";
-    import type { FilePath, LoadedEntry } from "@lib/common/types.ts";
-    import { decodeBinary, readString } from "@lib/string_and_binary/convert.ts";
-    import { getDocData, isObjectDifferent, mergeObject } from "@lib/common/utils.ts";
+    import type { FilePath, LoadedEntry } from "@vrtmrz/livesync-commonlib/compat/common/types";
+    import { decodeBinary, readString } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/convert";
+    import { getDocData, isObjectDifferent, mergeObject } from "@vrtmrz/livesync-commonlib/compat/common/utils";
 
     interface Props {
         docs?: LoadedEntry[];

src/features/HiddenFileSync/CmdHiddenFileSync.ts

@@ -15,7 +15,7 @@ import {
     LOG_LEVEL_DEBUG,
     type MetaEntry,
     type UXDataWriteOptions,
-} from "@lib/common/types.ts";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { type InternalFileInfo, ICHeader, ICHeaderEnd } from "@/common/types.ts";
 import {
     readAsBlob,
@@ -26,7 +26,7 @@ import {
     fireAndForget,
     type CustomRegExp,
     getFileRegExp,
-} from "@lib/common/utils.ts";
+} from "@vrtmrz/livesync-commonlib/compat/common/utils";
 import {
     compareMTime,
     isInternalMetadata,
@@ -44,13 +44,13 @@ import { PeriodicProcessor } from "@/common/PeriodicProcessor.ts";
 import { serialized, skipIfDuplicated } from "octagonal-wheels/concurrency/lock";
 import { JsonResolveModal } from "@/features/HiddenFileCommon/JsonResolveModal.ts";
 import { LiveSyncCommands } from "@/features/LiveSyncCommands.ts";
-import { addPrefix, stripAllPrefixes } from "@lib/string_and_binary/path.ts";
+import { addPrefix, stripAllPrefixes } from "@vrtmrz/livesync-commonlib/compat/string_and_binary/path";
 import { QueueProcessor } from "octagonal-wheels/concurrency/processor";
-import { hiddenFilesEventCount, hiddenFilesProcessingCount } from "@lib/mock_and_interop/stores.ts";
+import { hiddenFilesEventCount, hiddenFilesProcessingCount } from "@vrtmrz/livesync-commonlib/compat/mock_and_interop/stores";
 import { EVENT_SETTING_SAVED, eventHub } from "@/common/events.ts";
 import { Semaphore } from "octagonal-wheels/concurrency/semaphore";
 import type { LiveSyncCore } from "@/main.ts";
-import { tryGetFilePath } from "@lib/common/utils.doc.ts";
+import { tryGetFilePath } from "@vrtmrz/livesync-commonlib/compat/common/utils.doc";
 import { configureHiddenFileSyncMode } from "./configureHiddenFileSyncMode.ts";
 type SyncDirection = "push" | "pull" | "safe" | "pullForce" | "pushForce";
 
@@ -1990,6 +1990,8 @@ ${messageFetch}${messageOverwrite}${messageMerge}
         services.setting.suspendExtraSync.addHandler(this._allSuspendExtraSync.bind(this));
         services.setting.suggestOptionalFeatures.addHandler(this._allAskUsingOptionalSyncFeature.bind(this));
         services.setting.enableOptionalFeature.addHandler(this._allConfigureOptionalSyncFeature.bind(this));
-        services.vault.isTargetFileInExtra.addHandler(this.isTargetFile.bind(this));
+        services.vault.isTargetFileInExtra.addHandler((file) =>
+            this.isTargetFile((typeof file === "string" ? file : stripAllPrefixes(file.path)) as FilePath)
+        );
     }
 }

src/features/LiveSyncCommands.ts

@@ -7,12 +7,12 @@ import {
     type FilePath,
     type FilePathWithPrefix,
     type LOG_LEVEL,
-} from "@lib/common/types.ts";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
 import type ObsidianLiveSyncPlugin from "@/main.ts";
 import { MARK_DONE } from "@/modules/features/ModuleLog.ts";
 import type { LiveSyncCore } from "@/main.ts";
-// import { __$checkInstanceBinding } from "@lib/dev/checks.ts";
-import { createInstanceLogFunction } from "@lib/services/lib/logUtils.ts";
+// import { __$checkInstanceBinding } from "@vrtmrz/livesync-commonlib/compat/dev/checks";
+import { createInstanceLogFunction } from "@vrtmrz/livesync-commonlib/compat/services/lib/logUtils";
 
 let noticeIndex = 0;
 export abstract class LiveSyncCommands {

src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.ts

@@ -9,15 +9,15 @@ import {
     type EntryLeaf,
     type FilePathWithPrefix,
     type MetaEntry,
-} from "@lib/common/types";
-import { getNoFromRev } from "@lib/pouchdb/LiveSyncLocalDB";
+} from "@vrtmrz/livesync-commonlib/compat/common/types";
+import { getNoFromRev } from "@vrtmrz/livesync-commonlib/compat/pouchdb/LiveSyncLocalDB";
 import { LiveSyncCommands } from "@/features/LiveSyncCommands";
 import { serialized } from "octagonal-wheels/concurrency/lock_v2";
 import { arrayToChunkedArray } from "octagonal-wheels/collection";
 import { EVENT_ANALYSE_DB_USAGE, EVENT_REQUEST_PERFORM_GC_V3, eventHub } from "@/common/events";
-import type { LiveSyncCouchDBReplicator } from "@lib/replication/couchdb/LiveSyncReplicator";
-import { delay } from "@lib/common/utils";
-import { isNotFoundError } from "@lib/common/utils.doc";
+import type { LiveSyncCouchDBReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/couchdb/LiveSyncReplicator";
+import { delay } from "@vrtmrz/livesync-commonlib/compat/common/utils";
+import { isNotFoundError } from "@vrtmrz/livesync-commonlib/compat/common/utils.doc";
 import { ensureLocalDatabaseMaintenancePrerequisites } from "./maintenancePrerequisites";
 // import { _requestToCouchDB } from "@/common/utils";
 const DB_KEY_SEQ = "gc-seq";
@@ -315,7 +315,7 @@ Note: **Make sure to synchronise all devices before deletion.**
                 // If we have more revisions than we want to keep, we need to delete the extras
             }
             const keepRevID = sortedRevId.slice(0, KEEP_MAX_REVS);
-            keepRevID.forEach((e) => e[1].forEach((ee) => unusedSet.delete(ee)));
+            keepRevID.forEach((e) => e[1].forEach((ee: DocumentID) => unusedSet.delete(ee)));
         }
         return {
             chunkSet,

src/features/LocalDatabaseMainte/CmdLocalDatabaseMainte.unit.spec.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from "vitest";
-import { DEFAULT_SETTINGS } from "@lib/common/types";
+import { DEFAULT_SETTINGS } from "@vrtmrz/livesync-commonlib/compat/common/types";
 import { ensureLocalDatabaseMaintenancePrerequisites } from "./maintenancePrerequisites";
 
 function createPrerequisites(settingsOverride: Partial<typeof DEFAULT_SETTINGS> = {}) {

src/features/LocalDatabaseMainte/maintenancePrerequisites.ts

@@ -1,4 +1,4 @@
-import type { ObsidianLiveSyncSettings } from "@lib/common/types";
+import type { ObsidianLiveSyncSettings } from "@vrtmrz/livesync-commonlib/compat/common/types";
 
 type MaintenancePrerequisiteSettings = Pick<
     ObsidianLiveSyncSettings,

src/features/P2PSync/P2PReplicator/P2POpenReplicationModal.ts

@@ -1,7 +1,7 @@
 import { App, Modal } from "@/deps.ts";
 import P2POpenReplicationPane from "./P2POpenReplicationPane.svelte";
 import { mount, unmount } from "svelte";
-import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
+import type { LiveSyncTrysteroReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/LiveSyncTrysteroReplicator";
 
 export type P2POpenReplicationModalCallback = {
     onSync: (peerId: string) => Promise<void>;

src/features/P2PSync/P2PReplicator/P2POpenReplicationPane.svelte

@@ -5,11 +5,11 @@
         EVENT_SERVER_STATUS,
         EVENT_REQUEST_STATUS,
         type P2PServerInfo,
-    } from "@lib/replication/trystero/TrysteroReplicatorP2PServer";
-    // import type { TrysteroReplicator } from "@lib/replication/trystero/TrysteroReplicator";
-    import { LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "@lib/common/types";
-    import { Logger } from "@lib/common/logger";
-    import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
+    } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/TrysteroReplicatorP2PServer";
+    // import type { TrysteroReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/TrysteroReplicator";
+    import { LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "@vrtmrz/livesync-commonlib/compat/common/types";
+    import { Logger } from "@vrtmrz/livesync-commonlib/compat/common/logger";
+    import type { LiveSyncTrysteroReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/LiveSyncTrysteroReplicator";
     import { delay, fireAndForget } from "octagonal-wheels/promises";
     import P2PServerStatusCard from "./P2PServerStatusCard.svelte";
 

src/features/P2PSync/P2PReplicator/P2PReplicationUI.ts

@@ -1,7 +1,7 @@
 import type { App } from "@/deps.ts";
-import { Logger } from "@lib/common/logger";
-import { LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "@lib/common/types";
-import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
+import { Logger } from "@vrtmrz/livesync-commonlib/compat/common/logger";
+import { LOG_LEVEL_NOTICE, LOG_LEVEL_INFO } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import type { LiveSyncTrysteroReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/LiveSyncTrysteroReplicator";
 import { P2POpenReplicationModal } from "./P2POpenReplicationModal";
 
 /**

src/features/P2PSync/P2PReplicator/P2PReplicatorPane.svelte

@@ -1,12 +1,12 @@
 <script lang="ts">
     import { onMount, setContext } from "svelte";
-    import { AutoAccepting, DEFAULT_SETTINGS, type P2PSyncSetting } from "@lib/common/types";
+    import { AutoAccepting, DEFAULT_SETTINGS, type P2PSyncSetting } from "@vrtmrz/livesync-commonlib/compat/common/types";
     import {
         AcceptedStatus,
         ConnectionStatus,
         type PeerStatus,
-    } from "@lib/replication/trystero/P2PReplicatorPaneCommon";
-    import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
+    } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/P2PReplicatorPaneCommon";
+    import type { P2PReplicatorPaneController } from "./P2PReplicatorPaneController";
     import PeerStatusRow from "@/features/P2PSync/P2PReplicator/PeerStatusRow.svelte";
     import { EVENT_LAYOUT_READY, eventHub } from "@/common/events";
     import {
@@ -15,16 +15,16 @@
         EVENT_SERVER_STATUS,
         EVENT_REQUEST_STATUS,
         EVENT_P2P_REPLICATOR_STATUS,
-    } from "@lib/replication/trystero/TrysteroReplicatorP2PServer";
-    import { type P2PReplicatorStatus } from "@lib/replication/trystero/TrysteroReplicator";
-    import { $msg as _msg } from "@lib/common/i18n";
-    import { SETTING_KEY_P2P_DEVICE_NAME } from "@lib/common/types";
-    import { generateP2PRoomId } from "@lib/common/utils";
+    } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/TrysteroReplicatorP2PServer";
+    import type { P2PReplicatorStatus } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/TrysteroReplicator";
+    import { $msg as _msg } from "@vrtmrz/livesync-commonlib/compat/common/i18n";
+    import { SETTING_KEY_P2P_DEVICE_NAME } from "@vrtmrz/livesync-commonlib/compat/common/types";
+    import { generateP2PRoomId } from "@vrtmrz/livesync-commonlib/compat/common/utils";
     import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 
     interface Props {
-        cmdSync: LiveSyncTrysteroReplicator;
-        core: LiveSyncBaseCore;
+        cmdSync: P2PReplicatorPaneController;
+        core: Pick<LiveSyncBaseCore, "services">;
     }
 
     let { cmdSync, core }: Props = $props();

src/features/P2PSync/P2PReplicator/P2PReplicatorPaneController.ts

@@ -0,0 +1,17 @@
+import type {
+    AcceptanceDecision,
+    RevokeAcceptanceDecision,
+} from "@vrtmrz/livesync-commonlib/compat/replication/trystero/TrysteroReplicatorP2PServer";
+
+/** The operations used by the shared P2P pane, independent of its replicator implementation. */
+export interface P2PReplicatorPaneController {
+    open(): Promise<void>;
+    close(): Promise<void>;
+    enableBroadcastChanges(): void;
+    disableBroadcastChanges(): void;
+    makeDecision(decision: AcceptanceDecision): Promise<void>;
+    revokeDecision(decision: RevokeAcceptanceDecision): Promise<void>;
+    watchPeer(peerId: string): void;
+    unwatchPeer(peerId: string): void;
+    sync(peerId: string, showNotice?: boolean): Promise<unknown>;
+}

src/features/P2PSync/P2PReplicator/P2PReplicatorPaneView.ts

@@ -5,11 +5,11 @@ import { SvelteItemView } from "@/common/SvelteItemView.ts";
 import { eventHub } from "@/common/events.ts";
 
 import { unique } from "octagonal-wheels/collection";
-import { LOG_LEVEL_NOTICE, REMOTE_P2P } from "@lib/common/types.ts";
-import { Logger } from "@lib/common/logger.ts";
-import { EVENT_P2P_PEER_SHOW_EXTRA_MENU, type PeerStatus } from "@lib/replication/trystero/P2PReplicatorPaneCommon.ts";
+import { LOG_LEVEL_NOTICE, REMOTE_P2P } from "@vrtmrz/livesync-commonlib/compat/common/types";
+import { Logger } from "@vrtmrz/livesync-commonlib/compat/common/logger";
+import { EVENT_P2P_PEER_SHOW_EXTRA_MENU, type PeerStatus } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/P2PReplicatorPaneCommon";
 import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
-import type { P2PPaneParams } from "@lib/replication/trystero/UseP2PReplicatorResult";
+import type { P2PPaneParams } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/UseP2PReplicatorResult";
 export const VIEW_TYPE_P2P = "p2p-replicator";
 
 function addToList(item: string, list: string) {

src/features/P2PSync/P2PReplicator/P2PServerStatusCard.svelte

@@ -2,16 +2,16 @@
     import { onMount } from "svelte";
     import { eventHub } from "@/common/events";
     import { delay, fireAndForget } from "octagonal-wheels/promises";
-    import type { P2PServerInfo } from "@lib/replication/trystero/TrysteroReplicatorP2PServer";
+    import type { P2PServerInfo } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/TrysteroReplicatorP2PServer";
     import {
         EVENT_SERVER_STATUS,
         EVENT_REQUEST_STATUS,
         EVENT_P2P_REPLICATOR_STATUS,
-    } from "@lib/replication/trystero/TrysteroReplicatorP2PServer";
-    import { EVENT_SETTING_SAVED } from "@lib/events/coreEvents";
-    import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
-    import type { P2PReplicatorStatus } from "@lib/replication/trystero/TrysteroReplicator";
-    import { extractP2PRoomSuffix } from "@lib/common/utils";
+    } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/TrysteroReplicatorP2PServer";
+    import { EVENT_SETTING_SAVED } from "@vrtmrz/livesync-commonlib/compat/events/coreEvents";
+    import type { LiveSyncTrysteroReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/LiveSyncTrysteroReplicator";
+    import type { P2PReplicatorStatus } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/TrysteroReplicator";
+    import { extractP2PRoomSuffix } from "@vrtmrz/livesync-commonlib/compat/common/utils";
     import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
 
     interface Props {

src/features/P2PSync/P2PReplicator/P2PServerStatusPane.svelte

@@ -7,17 +7,17 @@
         EVENT_P2P_REPLICATOR_STATUS,
         EVENT_P2P_REPLICATOR_PROGRESS,
         type P2PServerInfo,
-    } from "@lib/replication/trystero/TrysteroReplicatorP2PServer";
-    import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
-    import type { P2PReplicatorStatus, P2PReplicationReport } from "@lib/replication/trystero/TrysteroReplicator";
+    } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/TrysteroReplicatorP2PServer";
+    import type { LiveSyncTrysteroReplicator } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/LiveSyncTrysteroReplicator";
+    import type { P2PReplicatorStatus, P2PReplicationReport } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/TrysteroReplicator";
     import { delay, fireAndForget } from "octagonal-wheels/promises";
     import P2PServerStatusCard from "./P2PServerStatusCard.svelte";
-    import { EVENT_SETTING_SAVED } from "@lib/events/coreEvents";
+    import { EVENT_SETTING_SAVED } from "@vrtmrz/livesync-commonlib/compat/events/coreEvents";
     import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore";
-    import { ConnectionStringParser } from "@lib/common/ConnectionString";
-    import type { P2PSyncSetting, RemoteConfiguration } from "@lib/common/models/setting.type";
-    import { activateP2PRemoteConfiguration, createRemoteConfigurationId } from "@lib/serviceFeatures/remoteConfig";
-    import { extractP2PRoomSuffix } from "@lib/common/utils";
+    import { ConnectionStringParser } from "@vrtmrz/livesync-commonlib/compat/common/ConnectionString";
+    import type { P2PSyncSetting, RemoteConfiguration } from "@vrtmrz/livesync-commonlib/compat/common/models/setting.type";
+    import { activateP2PRemoteConfiguration, createRemoteConfigurationId } from "@vrtmrz/livesync-commonlib/compat/serviceFeatures/remoteConfig";
+    import { extractP2PRoomSuffix } from "@vrtmrz/livesync-commonlib/compat/common/utils";
     import { SetupManager } from "@/modules/features/SetupManager";
     import SetupRemoteP2P from "@/modules/features/SetupWizard/dialogs/SetupRemoteP2P.svelte";
 

src/features/P2PSync/P2PReplicator/P2PServerStatusPaneView.ts

@@ -2,7 +2,7 @@ import { WorkspaceLeaf } from "@/deps.ts";
 import { mount } from "svelte";
 import { SvelteItemView } from "@/common/SvelteItemView.ts";
 import type { LiveSyncBaseCore } from "@/LiveSyncBaseCore.ts";
-import type { P2PPaneParams } from "@lib/replication/trystero/UseP2PReplicatorResult";
+import type { P2PPaneParams } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/UseP2PReplicatorResult";
 import P2PServerStatusPane from "./P2PServerStatusPane.svelte";
 
 export const VIEW_TYPE_P2P_SERVER_STATUS = "p2p-server-status";

src/features/P2PSync/P2PReplicator/PeerStatusRow.svelte

@@ -1,9 +1,9 @@
 <script lang="ts">
     import { getContext } from "svelte";
-    import { AcceptedStatus, type PeerStatus } from "@lib/replication/trystero/P2PReplicatorPaneCommon";
-    import type { LiveSyncTrysteroReplicator } from "@lib/replication/trystero/LiveSyncTrysteroReplicator";
+    import { AcceptedStatus, type PeerStatus } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/P2PReplicatorPaneCommon";
+    import type { P2PReplicatorPaneController } from "./P2PReplicatorPaneController";
     import { eventHub } from "@/common/events";
-    import { EVENT_P2P_PEER_SHOW_EXTRA_MENU } from "@lib/replication/trystero/P2PReplicatorPaneCommon";
+    import { EVENT_P2P_PEER_SHOW_EXTRA_MENU } from "@vrtmrz/livesync-commonlib/compat/replication/trystero/P2PReplicatorPaneCommon";
 
     interface Props {
         peerStatus: PeerStatus;
@@ -70,7 +70,7 @@
             name: peer.name,
         });
     }
-    const replicator = getContext<() => LiveSyncTrysteroReplicator>("getReplicator")();
+    const replicator = getContext<() => P2PReplicatorPaneController>("getReplicator")();
 
     const peerAttrLabels = $derived.by(() => {
         const attrs = [];