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

package/dist/replication/trystero/P2PReplicatorCore.js

@@ -1,110 +1,34 @@
-import { AutoAccepting, REMOTE_P2P } from "../../common/types.js";
-import { reactiveSource } from "octagonal-wheels/dataobject/reactive";
+import { REMOTE_P2P } from "../../common/types.js";
+import { reactiveSource } from "octagonal-wheels/dataobject/reactive_v2";
 import { EVENT_REQUEST_OPEN_P2P } from "../../events/coreEvents.js";
-import { LiveSyncTrysteroReplicator } from "./LiveSyncTrysteroReplicator.js";
-import { Logger, LOG_LEVEL_NOTICE, LOG_LEVEL_VERBOSE } from "../../common/logger.js";
 import { P2PLogCollector } from "./P2PLogCollector.js";
-import { addP2PEventHandlers } from "./addP2PEventHandlers.js";
-import { compatGlobal } from "../../common/coreEnvFunctions.js";
+import { useP2PReplicatorCommands } from "./useP2PReplicatorCommands.js";
+import { useP2PReplicatorFeature } from "./useP2PReplicatorFeature.js";
 function useP2PReplicator(host, viewTypeAndFactory) {
-  const env = { services: host.services };
-  let replicator = new LiveSyncTrysteroReplicator(env);
-  const activeReplicator = {
-    get instance() {
-      return replicator;
-    }
-  };
+  const activeReplicator = useP2PReplicatorFeature(host);
   const events = host.services.context.events;
-  addP2PEventHandlers(activeReplicator.instance, events);
   const p2pLogCollector = new P2PLogCollector(events);
   const storeP2PStatusLine = reactiveSource("");
   p2pLogCollector.p2pReplicationLine.onChanged((line) => {
     storeP2PStatusLine.value = line.value;
   });
-  host.services.appLifecycle.onResumed.addHandler(() => {
-    const settings = host.services.setting.currentSettings();
-    if (settings.P2P_Enabled && settings.P2P_AutoStart) {
-      compatGlobal.setTimeout(() => void replicator.open(), 100);
-    }
-    return Promise.resolve(true);
-  });
-  host.services.appLifecycle.onUnload.addHandler(async () => {
-    await replicator.close();
-    return true;
-  });
-  host.services.appLifecycle.onSuspending.addHandler(async () => {
-    await replicator.close();
-    return true;
-  });
-  host.services.databaseEvents.onDatabaseInitialisation.addHandler(async () => {
-    await replicator.close();
-    return true;
-  });
-  host.services.setting.suspendExtraSync.addHandler(() => {
-    const s = host.services.setting.currentSettings();
-    if (s.remoteType !== REMOTE_P2P) {
-      s.P2P_Enabled = false;
-    }
-    s.P2P_AutoAccepting = AutoAccepting.NONE;
-    s.P2P_AutoBroadcast = false;
-    s.P2P_AutoStart = false;
-    s.P2P_AutoSyncPeers = "";
-    s.P2P_AutoWatchPeers = "";
-    return Promise.resolve(true);
-  });
-  host.services.replicator.getNewReplicator.addHandler(
-    async (settingOverride = {}) => {
-      const settings = { ...host.services.setting.currentSettings(), ...settingOverride };
-      if (settings.remoteType == REMOTE_P2P) {
-        try {
-          await replicator.close();
-        } catch (e) {
-          Logger(`Error closing existing p2p replicator`);
-          Logger(e, LOG_LEVEL_VERBOSE);
-        }
-        const newReplicator = new LiveSyncTrysteroReplicator({ services: host.services });
-        replicator = newReplicator;
-        return Promise.resolve(replicator);
-      }
-      return void 0;
-    }
-  );
   if (viewTypeAndFactory) {
     const [viewType, factory] = viewTypeAndFactory;
     const openPane = () => host.services.API.showWindow(viewType);
+    useP2PReplicatorCommands(host, activeReplicator);
     host.services.appLifecycle.onInitialise.addHandler(() => {
       host.services.API.registerWindow(viewType, factory);
-      events.onEvent(EVENT_REQUEST_OPEN_P2P, () => {
-        void openPane();
-      });
+      events.onEvent(EVENT_REQUEST_OPEN_P2P, () => void openPane());
       host.services.API.addCommand({
         id: "open-p2p-replicator",
         name: "P2P Sync : Open P2P Replicator",
-        callback: () => {
-          void openPane();
-        }
-      });
-      host.services.API.addCommand({
-        id: "p2p-establish-connection",
-        name: "P2P Sync : Connect to the Signalling Server",
-        checkCallback: (isChecking) => {
-          if (isChecking) return !(replicator.server?.isServing ?? false);
-          void replicator.open();
-        }
-      });
-      host.services.API.addCommand({
-        id: "p2p-close-connection",
-        name: "P2P Sync : Disconnect from the Signalling Server",
-        checkCallback: (isChecking) => {
-          if (isChecking) return replicator.server?.isServing ?? false;
-          Logger("Closing P2P Connection", LOG_LEVEL_NOTICE);
-          void replicator.close();
-        }
+        callback: () => void openPane()
       });
       host.services.API.addCommand({
         id: "replicate-now-by-p2p",
         name: "Replicate now by P2P",
         checkCallback: (isChecking) => {
+          const replicator = activeReplicator.replicator;
           const settings = host.services.setting.currentSettings();
           if (isChecking) {
             if (settings.remoteType == REMOTE_P2P) return false;
@@ -119,7 +43,13 @@ function useP2PReplicator(host, viewTypeAndFactory) {
       return Promise.resolve(true);
     });
   }
-  return { replicator, p2pLogCollector, storeP2PStatusLine };
+  return {
+    get replicator() {
+      return activeReplicator.replicator;
+    },
+    p2pLogCollector,
+    storeP2PStatusLine
+  };
 }
 export {
   useP2PReplicator

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

@@ -64,6 +64,7 @@ export declare class TrysteroReplicator {
     get confirm(): Confirm;
     get translate(): import("../../context.js").MessageTranslator;
     private runFiniteReplicationActivity;
+    private canStartOrdinaryReplication;
     constructor(env: ReplicatorHostEnv, server?: P2PHost);
     close(): Promise<void>;
     open(): Promise<void>;
@@ -123,7 +124,7 @@ export declare class TrysteroReplicator {
     onReplicationProgress(peerId: string, info?: ProgressInfo): boolean;
     onProgressAcknowledged(peerId: string, info?: ProgressInfo): boolean;
     acknowledgeProgress(remotePeerId: string, info?: ProgressInfo): void;
-    replicateFrom(remotePeer: string, showNotice?: boolean, fromStart?: boolean): Promise<{
+    replicateFrom(remotePeer: string, showNotice?: boolean, fromStart?: boolean, skipOrdinaryReplicationPolicy?: boolean): Promise<{
         error: any;
         ok?: undefined;
     } | {

package/dist/replication/trystero/TrysteroReplicator.js

@@ -51,6 +51,9 @@ class TrysteroReplicator {
     }
     return await task();
   }
+  async canStartOrdinaryReplication(showMessage = false) {
+    return this._env.canStartOrdinaryReplication ? await this._env.canStartOrdinaryReplication(showMessage) : true;
+  }
   constructor(env, server) {
     this._env = env;
     if (server) {
@@ -265,6 +268,9 @@ class TrysteroReplicator {
   // }
   lastSeq = "";
   async requestSynchroniseToPeer(peerId) {
+    if (!await this.canStartOrdinaryReplication(false)) {
+      return { error: new Error("Replication is not ready") };
+    }
     await delay(25);
     if (!this.server) throw new Error("Server is not available");
     const conn = this.server.getConnection(peerId);
@@ -440,7 +446,10 @@ class TrysteroReplicator {
       Logger(ex, LOG_LEVEL_VERBOSE);
     });
   }
-  async replicateFrom(remotePeer, showNotice = false, fromStart = false) {
+  async replicateFrom(remotePeer, showNotice = false, fromStart = false, skipOrdinaryReplicationPolicy = false) {
+    if (!skipOrdinaryReplicationPolicy && !await this.canStartOrdinaryReplication(showNotice)) {
+      return { error: new Error("Replication is not ready") };
+    }
     const logLevel = showNotice ? LOG_LEVEL_NOTICE : LOG_LEVEL_INFO;
     Logger(`P2P Requesting Authentication to ${remotePeer}`, logLevel, "p2p-replicator");
     if (await this.requestAuthenticate(remotePeer) !== true) {
@@ -664,9 +673,6 @@ ${info.lastSeq} / ${info.maxSeqInBatch})`,
     pauseRelayReconnection();
     sockets.forEach(([, s]) => {
       s.close();
-      s.onclose = () => {
-        void this.server?.dispatchConnectionStatus();
-      };
     });
     void this.pauseServe();
   }

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

@@ -1,4 +1,4 @@
-import { type ActionSender, type Room } from "@trystero-p2p/nostr";
+import { type Room } from "@trystero-p2p/nostr";
 import { type P2PSyncSetting } from "../../common/types.js";
 import { type ReplicatorHostEnv, type FullFilledDeviceInfo, type Request, type Response, type Payload, type Advertisement, type BindableObject, type BindableFunction } from "./types.js";
 import { StoredMapLike } from "../../dataobject/StoredMap.js";
@@ -56,7 +56,7 @@ export declare class TrysteroReplicatorP2PServer {
     _room?: Room;
     _serverPeerId: string;
     _activeRoomId: string;
-    ___send?: ActionSender<Payload>;
+    ___send?: (data: Payload, peerId?: string) => Promise<void>;
     assignedFunctions: Map<string, BindableFunction>;
     clients: Map<string, TrysteroReplicatorP2PClient>;
     _bindingObjects: BindableObject[];
@@ -81,7 +81,7 @@ export declare class TrysteroReplicatorP2PServer {
     get settings(): P2PSyncSetting;
     get isEnabled(): boolean;
     get deviceInfo(): FullFilledDeviceInfo;
-    _sendAdvertisement?: ActionSender<Advertisement>;
+    _sendAdvertisement?: (data: Advertisement, peerId?: string) => Promise<void>;
     sendAdvertisement(peerId?: string): void;
     _knownAdvertisements: Map<string, Advertisement>;
     get knownAdvertisements(): Advertisement[];
@@ -93,11 +93,10 @@ export declare class TrysteroReplicatorP2PServer {
     _acceptablePeers: Computed<[settings: P2PSyncSetting], RegExp[]>;
     _shouldDenyPeers: Computed<[settings: P2PSyncSetting], RegExp[]>;
     isAcceptablePeer(peerId: string): Promise<boolean>;
-    __send(data: Payload, peerId: string): Promise<void[]>;
+    __send(data: Payload, peerId: string): Promise<void>;
     processArrivedRPC(data: Payload, peerId: string): Promise<void>;
     private _onPeerJoin;
     private _onPeerLeave;
-    activePeer: Map<string, RTCPeerConnection>;
     onAfterJoinRoom(): void;
     startService(bindings?: BindableObject[]): Promise<void>;
     start(bindings?: BindableObject[]): Promise<void>;

package/dist/replication/trystero/TrysteroReplicatorP2PServer.js

@@ -14,6 +14,7 @@ import { shareRunningResult } from "octagonal-wheels/concurrency/lock_v2";
 import { Computed } from "octagonal-wheels/dataobject/Computed";
 import { RpcRoom } from "../../rpc/index.js";
 import { TRYSTERO_RPC_DEFAULTS } from "../../rpc/transports/TrysteroTransport.js";
+import { subscribeTrysteroPeerEvents } from "../../rpc/transports/trysteroRoomEvents.js";
 import { toRpcMethodName } from "./rpcCompat.js";
 import { generateJoinRoomOptions } from "../../rpc/transports/trysteroUtils.js";
 import { subscribeConnectionStatus, subscribeFailureDiagnosis } from "../../rpc/transports/DiagRTCPeerConnections.js";
@@ -333,52 +334,47 @@ You can chose as follows:
       Logger(`Received peer join event from ${peerId}, but no active room. Ignoring.`, LOG_LEVEL_VERBOSE);
       return;
     }
-    const peers = this._room.getPeers();
-    const peer = peers[peerId];
     Logger(`Peer joined: ${peerId}`, LOG_LEVEL_VERBOSE);
-    this.activePeer.set(peerId, peer);
     this.sendAdvertisement(peerId);
   }
   _onPeerLeave(peerId) {
     Logger(`Peer left: ${peerId}`, LOG_LEVEL_VERBOSE);
     this._knownAdvertisements.delete(peerId);
-    const peerConn = this.activePeer.get(peerId);
-    if (peerConn) {
-      peerConn.close();
-      this.activePeer.delete(peerId);
-    }
     void this._env.events.emitEvent(EVENT_DEVICE_LEAVED, peerId);
     void this.dispatchConnectionStatus();
   }
-  activePeer = /* @__PURE__ */ new Map();
   onAfterJoinRoom() {
     Logger(`Initializing...`, LOG_LEVEL_VERBOSE);
     const room = this.room;
     if (!room) throw new Error("This server has been already disconnected");
-    const [sendRpc, arrivedRpc] = room.makeAction("rpc2");
+    const rpcAction = room.makeAction("rpc2");
     const transport = {
       send: (message, peerId) => {
-        return sendRpc(message, peerId).then(() => void 0);
+        return rpcAction.send(message, { target: peerId });
       },
       onMessage: (handler) => {
-        arrivedRpc((data, peerId) => {
+        rpcAction.onMessage = (data, { peerId }) => {
           handler(data, peerId);
-        });
-        return () => void 0;
+        };
+        return () => {
+          rpcAction.onMessage = null;
+        };
       },
       onPeerJoin: (handler) => {
-        room.onPeerJoin((peerId) => {
-          this._onPeerJoin(peerId);
-          handler(peerId);
+        return subscribeTrysteroPeerEvents(room, {
+          onJoin: (peerId) => {
+            this._onPeerJoin(peerId);
+            handler(peerId);
+          }
         });
-        return () => void 0;
       },
       onPeerLeave: (handler) => {
-        room.onPeerLeave((peerId) => {
-          this._onPeerLeave(peerId);
-          handler(peerId);
+        return subscribeTrysteroPeerEvents(room, {
+          onLeave: (peerId) => {
+            this._onPeerLeave(peerId);
+            handler(peerId);
+          }
         });
-        return () => void 0;
       }
     };
     this._rpcRoom?.close();
@@ -393,11 +389,11 @@ You can chose as follows:
         Logger(`RPC Protocol warning${peerId ? ` from ${peerId}` : ""}: ${message}`, LOG_LEVEL_VERBOSE);
       }
     });
-    const [adSend, adArrived] = room.makeAction("ad");
-    this._sendAdvertisement = adSend;
-    adArrived((data, peerId) => {
+    const advertisementAction = room.makeAction("ad");
+    this._sendAdvertisement = (data, peerId) => advertisementAction.send(data, peerId ? { target: peerId } : void 0);
+    advertisementAction.onMessage = (data, { peerId }) => {
       void this.onAdvertisement(data, peerId);
-    });
+    };
     this._env.events.emitEvent(EVENT_P2P_CONNECTED);
     void this.dispatchConnectionStatus();
   }
@@ -494,14 +490,10 @@ You can chose as follows:
   }
   async close() {
     this.assignedFunctions.clear();
-    const peers = this.room?.getPeers() ?? {};
     this.clients.forEach((client) => client.close());
     this.clients.clear();
     this._rpcRoom?.close();
     this._rpcRoom = void 0;
-    for (const [, peer] of Object.entries(peers)) {
-      peer.close();
-    }
     await this.ensureLeaved();
     this._activeRoomId = "";
     this._knownAdvertisements.clear();

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

@@ -2,10 +2,18 @@ import type { ReactiveSource } from "octagonal-wheels/dataobject/reactive_v2";
 import type { LiveSyncTrysteroReplicator } from "./LiveSyncTrysteroReplicator.js";
 import type { P2PLogCollector } from "./P2PLogCollector.js";
 export type UseP2PReplicatorResult = {
-    replicator: LiveSyncTrysteroReplicator;
+    /**
+     * The current replicator selected by the host lifecycle.
+     *
+     * Read this property at the point of use. Retaining a destructured value
+     * across settings or database lifecycle events can target a closed,
+     * replaced instance.
+     */
+    readonly replicator: LiveSyncTrysteroReplicator;
 };
 export type P2PPaneParams = {
-    replicator: LiveSyncTrysteroReplicator;
+    /** Current replicator; preserve the result object so its getter remains live. */
+    readonly replicator: LiveSyncTrysteroReplicator;
     p2pLogCollector: P2PLogCollector;
     storeP2PStatusLine: ReactiveSource<string>;
 };

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

@@ -17,11 +17,13 @@ export interface P2PReplicatorLike {
         isServing?: boolean;
     };
 }
+/** Resolves the replicator which currently owns P2P state. */
+export type P2PReplicatorProvider = () => P2PReplicatorLike;
 /**
  * Add event handlers for P2P replication related events.
- * @param instance P2PReplicatorLike instance
+ * @param source A fixed compatibility instance or a provider for a replaceable replicator.
  */
-export declare function addP2PEventHandlers(instance: P2PReplicatorLike, events: LiveSyncEventHub): void;
+export declare function addP2PEventHandlers(source: P2PReplicatorLike | P2PReplicatorProvider, events: LiveSyncEventHub): void;
 /**
  * open P2P replicator if not opened yet.
  * @param instance

package/dist/replication/trystero/addP2PEventHandlers.js

@@ -1,22 +1,24 @@
 import { EVENT_DATABASE_REBUILT, EVENT_PLATFORM_UNLOADED, EVENT_SETTING_SAVED } from "../../events/coreEvents.js";
 import { EVENT_ADVERTISEMENT_RECEIVED, EVENT_DEVICE_LEAVED, EVENT_REQUEST_STATUS } from "./TrysteroReplicatorP2PServer.js";
-function addP2PEventHandlers(instance, events) {
+function addP2PEventHandlers(source, events) {
+  const current = () => typeof source === "function" ? source() : source;
   events.onEvent(EVENT_ADVERTISEMENT_RECEIVED, (peer) => {
-    void instance.onNewPeer(peer);
+    void current().onNewPeer(peer);
   });
   events.onEvent(EVENT_DEVICE_LEAVED, (peerId) => {
-    instance.onPeerLeaved(peerId);
+    current().onPeerLeaved(peerId);
   });
   events.onEvent(EVENT_REQUEST_STATUS, () => {
-    instance.requestStatus();
+    current().requestStatus();
   });
   events.onEvent(EVENT_DATABASE_REBUILT, async () => {
-    await instance.open();
+    await current().open();
   });
   events.onEvent(EVENT_PLATFORM_UNLOADED, () => {
-    void instance.close();
+    void current().close();
   });
   events.onEvent(EVENT_SETTING_SAVED, async (settings) => {
+    const instance = current();
     const isOpen = instance.isServing ?? instance.server?.isServing ?? false;
     if (settings.P2P_Enabled && settings.P2P_AutoStart) {
       await instance.open();

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

@@ -85,6 +85,8 @@ export interface ReplicatorHostEnv extends ReplicatorHost {
     db: PouchDB.Database<EntryDoc>;
     simpleStore: SimpleStore<unknown>;
     runFiniteReplicationActivity?: AsyncActivityRunner["run"];
+    /** Lightweight, repeatable host policy checked before ordinary P2P replication starts. */
+    canStartOrdinaryReplication?(showMessage?: boolean): Promise<boolean>;
     processReplicatedDocs(docs: Array<PouchDB.Core.ExistingDocument<EntryDoc>>): void | Promise<void>;
 }
 export type Advertisement = {

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

@@ -4,4 +4,4 @@ import type { UseP2PReplicatorResult } from "./UseP2PReplicatorResult.js";
  * ServiceFeature: Registers event handlers for P2P replication and manages the lifecycle of a LiveSyncTrysteroReplicator instance.
  * @param host
  */
-export declare function useP2PReplicatorCommands(host: NecessaryServices<"API" | "setting", never>, { replicator }: UseP2PReplicatorResult): void;
+export declare function useP2PReplicatorCommands(host: NecessaryServices<"API" | "setting", never>, result: UseP2PReplicatorResult): void;

package/dist/replication/trystero/useP2PReplicatorCommands.js

@@ -1,9 +1,10 @@
 import { Logger, LOG_LEVEL_NOTICE } from "octagonal-wheels/common/logger";
-function useP2PReplicatorCommands(host, { replicator }) {
+function useP2PReplicatorCommands(host, result) {
   host.services.API.addCommand({
     id: "p2p-establish-connection",
     name: "P2P Sync : Connect to the Signalling Server",
     checkCallback: (isChecking) => {
+      const replicator = result.replicator;
       if (!replicator) return false;
       if (isChecking) return !(replicator.server?.isServing ?? false);
       void replicator.open();
@@ -13,6 +14,7 @@ function useP2PReplicatorCommands(host, { replicator }) {
     id: "p2p-close-connection",
     name: "P2P Sync : Disconnect from the Signalling Server",
     checkCallback: (isChecking) => {
+      const replicator = result.replicator;
       if (!replicator) return false;
       if (isChecking) return replicator.server?.isServing ?? false;
       Logger("Closing P2P Connection", LOG_LEVEL_NOTICE);

package/dist/replication/trystero/useP2PReplicatorFeature.js

@@ -19,7 +19,7 @@ function useP2PReplicatorFeature(host, openReplicationUIFactory, openRebuildUIFa
       return replicator;
     }
   };
-  addP2PEventHandlers(activeReplicator.replicator, host.services.context.events);
+  addP2PEventHandlers(() => activeReplicator.replicator, host.services.context.events);
   host.services.replicator.getNewReplicator.addHandler(
     async (settingOverride = {}) => {
       const settings = { ...host.services.setting.currentSettings(), ...settingOverride };

package/dist/rpc/RpcRoom.d.ts

@@ -10,7 +10,7 @@ export declare class RpcRoom {
     private incomingChunkMap;
     private incomingChunkTimers;
     private peerVersion;
-    private disposer;
+    private disposers;
     constructor(options: RpcRoomOptions);
     close(): void;
     session(peerId: string): RpcSession;

package/dist/rpc/RpcRoom.js

@@ -23,34 +23,40 @@ class RpcRoom {
   incomingChunkMap = /* @__PURE__ */ new Map();
   incomingChunkTimers = /* @__PURE__ */ new Map();
   peerVersion = /* @__PURE__ */ new Map();
-  disposer;
+  disposers = [];
   constructor(options) {
     this.options = {
       maxWirePayloadBytes: options.maxWirePayloadBytes ?? 32 * 1024,
       chunkMissingRetryMs: options.chunkMissingRetryMs ?? 350,
       ...options
     };
-    this.disposer = this.options.transport.onMessage((msg, peerId) => {
-      void this.onWireMessage(msg, peerId);
-    });
+    this.disposers.push(
+      this.options.transport.onMessage((msg, peerId) => {
+        void this.onWireMessage(msg, peerId);
+      })
+    );
     if (this.options.transport.onPeerJoin) {
-      this.options.transport.onPeerJoin((peerId) => {
-        void this.sendEnvelope(peerId, {
-          kind: "handshake",
-          versionMajor: RPC_VERSION_MAJOR,
-          versionMinor: RPC_VERSION_MINOR
-        });
-      });
+      this.disposers.push(
+        this.options.transport.onPeerJoin((peerId) => {
+          void this.sendEnvelope(peerId, {
+            kind: "handshake",
+            versionMajor: RPC_VERSION_MAJOR,
+            versionMinor: RPC_VERSION_MINOR
+          });
+        })
+      );
     }
     if (this.options.transport.onPeerLeave) {
-      this.options.transport.onPeerLeave((peerId) => {
-        this.sessions.delete(peerId);
-        this.peerVersion.delete(peerId);
-      });
+      this.disposers.push(
+        this.options.transport.onPeerLeave((peerId) => {
+          this.sessions.delete(peerId);
+          this.peerVersion.delete(peerId);
+        })
+      );
     }
   }
   close() {
-    this.disposer?.();
+    this.disposers.splice(0).forEach((dispose) => dispose());
     this.pending.forEach((pending) => pending.reject(new RpcError("NOT_CONNECTED", "Room closed")));
     this.pending.clear();
     this.inboundCalls.clear();

package/dist/rpc/transports/TrysteroTransport.d.ts

@@ -96,6 +96,8 @@ export type TrysteroRoomHandle = {
     /**
      * Returns the current WebRTC peer connections keyed by peer ID.
      * Equivalent to the Trystero `room.getPeers()` call.
+     * Treat these as diagnostic handles. Their lifecycle belongs to Trystero;
+     * call {@link TrysteroRoomHandle.leave} instead of closing them directly.
      */
     getPeers: () => Record<string, RTCPeerConnection>;
     /**

package/dist/rpc/transports/TrysteroTransport.js

@@ -5,30 +5,37 @@ import { RpcPouchDBProxy } from "../pouchdb/RpcPouchDBProxy.js";
 import { ConnectionStringParser } from "../../common/ConnectionString.js";
 import { compatGlobal } from "../../common/coreEnvFunctions.js";
 import { generateJoinRoomOptions } from "./trysteroUtils.js";
+import { subscribeTrysteroPeerEvents } from "./trysteroRoomEvents.js";
 const RPC_ACTION_NAME = "rpc2";
 const AD_ACTION_NAME = "ad";
 function attachAdvertisement(room, localPeerId, name, platform = "unknown") {
   const peerMap = /* @__PURE__ */ new Map();
   const localAd = { peerId: localPeerId, name, platform };
-  const [sendAd, arrivedAd] = room.makeAction(AD_ACTION_NAME);
-  const sendAdvertisement = (toPeerId) => sendAd(localAd, toPeerId).then(() => void 0);
-  room.onPeerJoin((peerId) => {
-    void sendAdvertisement(peerId);
-  });
-  room.onPeerLeave((peerId) => {
-    peerMap.delete(peerId);
+  const advertisementAction = room.makeAction(AD_ACTION_NAME);
+  const sendAdvertisement = (toPeerId) => advertisementAction.send(localAd, toPeerId ? { target: toPeerId } : void 0);
+  const disposePeerEvents = subscribeTrysteroPeerEvents(room, {
+    // When a new peer joins, introduce ourselves to them specifically.
+    onJoin: (peerId) => {
+      void sendAdvertisement(peerId);
+    },
+    // Remove stale entries when a peer disconnects.
+    onLeave: (peerId) => {
+      peerMap.delete(peerId);
+    }
   });
-  arrivedAd((data, peerId) => {
+  advertisementAction.onMessage = (data, { peerId }) => {
     if (data.peerId === localPeerId) return;
     if (data.peerId !== peerId) return;
     peerMap.set(peerId, data);
-  });
+  };
   return {
     get peers() {
       return peerMap;
     },
     sendAdvertisement,
     stop() {
+      disposePeerEvents();
+      advertisementAction.onMessage = null;
       peerMap.clear();
     }
   };
@@ -40,22 +47,22 @@ const TRYSTERO_RPC_DEFAULTS = {
   chunkMissingRetryMs: 150
 };
 function wrapTrysteroRoom(room) {
-  const [sendRpc, arrivedRpc] = room.makeAction(RPC_ACTION_NAME);
+  const rpcAction = room.makeAction(RPC_ACTION_NAME);
   return {
     send(message, peerId) {
-      return sendRpc(message, peerId).then(() => void 0);
+      return rpcAction.send(message, { target: peerId });
     },
     onMessage(handler) {
-      arrivedRpc((data, peerId) => handler(data, peerId));
-      return () => void 0;
+      rpcAction.onMessage = (data, { peerId }) => handler(data, peerId);
+      return () => {
+        rpcAction.onMessage = null;
+      };
     },
     onPeerJoin(handler) {
-      room.onPeerJoin((peerId) => handler(peerId));
-      return () => void 0;
+      return subscribeTrysteroPeerEvents(room, { onJoin: handler });
     },
     onPeerLeave(handler) {
-      room.onPeerLeave((peerId) => handler(peerId));
-      return () => void 0;
+      return subscribeTrysteroPeerEvents(room, { onLeave: handler });
     }
   };
 }

package/dist/rpc/transports/trysteroRoomEvents.d.ts

@@ -0,0 +1,14 @@
+import type { Room } from "@trystero-p2p/nostr";
+type PeerHandler = (peerId: string) => void;
+/**
+ * Subscribe multiple consumers to Trystero's single peer-event callback slots.
+ *
+ * Trystero 0.25 exposes `onPeerJoin` and `onPeerLeave` as nullable callback
+ * properties. This adapter preserves the library's multi-subscriber transport
+ * contract and returns a disposer for each subscription.
+ */
+export declare function subscribeTrysteroPeerEvents(room: Room, handlers: {
+    onJoin?: PeerHandler;
+    onLeave?: PeerHandler;
+}): () => void;
+export {};