@olane/o-node 0.7.54 → 0.7.55

package/dist/src/connection/interfaces/o-node-connection.config.d.ts

@@ -1,8 +1,9 @@
-import { Connection } from '@olane/o-config';
+import { Connection, Libp2p } from '@olane/o-config';
 import { oConnectionConfig } from '@olane/o-core';
 import type { StreamReusePolicy } from '../stream-handler.config.js';
 export interface oNodeConnectionConfig extends oConnectionConfig {
     p2pConnection: Connection;
+    p2pNode?: Libp2p;
     runOnLimitedConnection?: boolean;
     reusePolicy?: StreamReusePolicy;
 }

package/dist/src/connection/interfaces/o-node-connection.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-node-connection.config.d.ts","sourceRoot":"","sources":["../../../../src/connection/interfaces/o-node-connection.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB;IAC9D,aAAa,EAAE,UAAU,CAAC;IAC1B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,WAAW,CAAC,EAAE,iBAAiB,CAAC;CACjC"}
+{"version":3,"file":"o-node-connection.config.d.ts","sourceRoot":"","sources":["../../../../src/connection/interfaces/o-node-connection.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB;IAC9D,aAAa,EAAE,UAAU,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,WAAW,CAAC,EAAE,iBAAiB,CAAC;CACjC"}

package/dist/src/connection/o-node-connection.d.ts

@@ -1,27 +1,73 @@
-import { Connection } from '@olane/o-config';
-import { oConnection, oRequest, oResponse } from '@olane/o-core';
+import { Connection, Libp2p, Multiaddr } from '@olane/o-config';
+import { oAddress, oConnection, oRequest, oResponse } from '@olane/o-core';
 import { oNodeConnectionConfig } from './interfaces/o-node-connection.config.js';
 import type { StreamReusePolicy } from './stream-handler.config.js';
 import { oNodeAddress } from '../router/o-node.address.js';
 import { oNodeStream } from './o-node-stream.js';
 import { oNodeStreamManager } from './o-node-stream.manager.js';
+interface CachedIdentifyData {
+    protocols: string[];
+    agentVersion?: string;
+    protocolVersion?: string;
+    listenAddrs: Multiaddr[];
+    observedAddr?: Multiaddr;
+    timestamp: number;
+}
 export declare class oNodeConnection extends oConnection {
     protected readonly config: oNodeConnectionConfig;
     p2pConnection: Connection;
     protected reusePolicy: StreamReusePolicy;
     streamManager: oNodeStreamManager;
+    protected p2pNode?: Libp2p;
+    protected identifyData?: CachedIdentifyData;
+    protected identifyListener?: (evt: any) => void;
     constructor(config: oNodeConnectionConfig);
     get remotePeerId(): import("@olane/o-config").PeerId;
-    get remoteAddr(): import("@olane/o-config").Multiaddr;
+    get remoteAddr(): Multiaddr;
     /**
      * Get the connection configuration for compatibility checking.
      */
     get connectionConfig(): oNodeConnectionConfig;
     supportsAddress(address: oNodeAddress): boolean;
     get streams(): oNodeStream[];
+    /**
+     * Get cached identify data for the remote peer.
+     * Returns undefined if identify event hasn't been received yet.
+     */
+    get cachedIdentifyData(): CachedIdentifyData | undefined;
+    /**
+     * Get protocols supported by the remote peer from cached identify data.
+     * Returns empty array if identify data not available yet.
+     */
+    get remoteProtocols(): string[];
+    /**
+     * Get agent version of the remote peer from cached identify data.
+     */
+    get remoteAgentVersion(): string | undefined;
+    /**
+     * Get protocol version of the remote peer from cached identify data.
+     */
+    get remoteProtocolVersion(): string | undefined;
+    /**
+     * Get listen addresses advertised by the remote peer.
+     * Returns empty array if identify data not available yet.
+     */
+    get remoteListenAddrs(): Multiaddr[];
+    /**
+     * Get our observed address as seen by the remote peer.
+     */
+    get observedAddress(): Multiaddr | undefined;
+    get address(): oAddress;
+    get nextHopAddress(): oAddress;
+    get callerAddress(): oAddress | undefined;
     transmit(request: oRequest): Promise<oResponse>;
     postTransmit(stream: oNodeStream): Promise<void>;
+    /**
+     * Set up persistent listener for identify events from the remote peer
+     */
+    protected setupIdentifyListener(): void;
     abort(error: Error): Promise<void>;
     close(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=o-node-connection.d.ts.map

package/dist/src/connection/o-node-connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-node-connection.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAU,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAEL,WAAW,EAGX,QAAQ,EACR,SAAS,EACV,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,qBAAa,eAAgB,SAAQ,WAAW;IAKlC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB;IAJrD,aAAa,EAAE,UAAU,CAAC;IACjC,SAAS,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAClC,aAAa,EAAE,kBAAkB,CAAC;gBAEV,MAAM,EAAE,qBAAqB;IAW5D,IAAI,YAAY,qCAEf;IAED,IAAI,UAAU,wCAEb;IAED;;OAEG;IACH,IAAI,gBAAgB,IAAI,qBAAqB,CAE5C;IAED,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAM/C,IAAI,OAAO,IAAI,WAAW,EAAE,CAE3B;IAEK,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAkF/C,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,KAAK,CAAC,KAAK,EAAE,KAAK;IAMlB,KAAK;CASZ"}
+{"version":3,"file":"o-node-connection.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAU,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAEL,QAAQ,EACR,WAAW,EAGX,QAAQ,EACR,SAAS,EACV,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,UAAU,kBAAkB;IAC1B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,SAAS,EAAE,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,eAAgB,SAAQ,WAAW;IAQlC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB;IAPrD,aAAa,EAAE,UAAU,CAAC;IACjC,SAAS,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAClC,aAAa,EAAE,kBAAkB,CAAC;IACzC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAC5C,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;gBAEjB,MAAM,EAAE,qBAAqB;IAe5D,IAAI,YAAY,qCAEf;IAED,IAAI,UAAU,cAEb;IAED;;OAEG;IACH,IAAI,gBAAgB,IAAI,qBAAqB,CAE5C;IAED,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAM/C,IAAI,OAAO,IAAI,WAAW,EAAE,CAE3B;IAED;;;OAGG;IACH,IAAI,kBAAkB,IAAI,kBAAkB,GAAG,SAAS,CAEvD;IAED;;;OAGG;IACH,IAAI,eAAe,IAAI,MAAM,EAAE,CAE9B;IAED;;OAEG;IACH,IAAI,kBAAkB,IAAI,MAAM,GAAG,SAAS,CAE3C;IAED;;OAEG;IACH,IAAI,qBAAqB,IAAI,MAAM,GAAG,SAAS,CAE9C;IAED;;;OAGG;IACH,IAAI,iBAAiB,IAAI,SAAS,EAAE,CAEnC;IAED;;OAEG;IACH,IAAI,eAAe,IAAI,SAAS,GAAG,SAAS,CAE3C;IAED,IAAI,OAAO,IAAI,QAAQ,CActB;IAED,IAAI,cAAc,IAAI,QAAQ,CAK7B;IAED,IAAI,aAAa,IAAI,QAAQ,GAAG,SAAS,CAMxC;IAEK,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAkF/C,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtD;;OAEG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAsCjC,KAAK,CAAC,KAAK,EAAE,KAAK;IAMlB,KAAK;CAcZ"}

package/dist/src/connection/o-node-connection.js

@@ -1,4 +1,5 @@
 import { oConnection, oError, oErrorCodes, } from '@olane/o-core';
+import { oNodeAddress } from '../router/o-node.address.js';
 import { oNodeStreamManager } from './o-node-stream.manager.js';
 export class oNodeConnection extends oConnection {
     constructor(config) {
@@ -6,10 +7,13 @@ export class oNodeConnection extends oConnection {
         this.config = config;
         this.p2pConnection = config.p2pConnection;
         this.reusePolicy = config.reusePolicy ?? 'none';
+        this.p2pNode = config.p2pNode;
         // Initialize oNodeStreamManager (stream lifecycle and protocol management)
         this.streamManager = new oNodeStreamManager({
             p2pConnection: this.p2pConnection,
         });
+        // Set up persistent identify event listener
+        this.setupIdentifyListener();
     }
     get remotePeerId() {
         return this.p2pConnection.remotePeer;
@@ -31,6 +35,68 @@ export class oNodeConnection extends oConnection {
     get streams() {
         return this.streamManager.getAllStreams();
     }
+    /**
+     * Get cached identify data for the remote peer.
+     * Returns undefined if identify event hasn't been received yet.
+     */
+    get cachedIdentifyData() {
+        return this.identifyData;
+    }
+    /**
+     * Get protocols supported by the remote peer from cached identify data.
+     * Returns empty array if identify data not available yet.
+     */
+    get remoteProtocols() {
+        return this.identifyData?.protocols || [];
+    }
+    /**
+     * Get agent version of the remote peer from cached identify data.
+     */
+    get remoteAgentVersion() {
+        return this.identifyData?.agentVersion;
+    }
+    /**
+     * Get protocol version of the remote peer from cached identify data.
+     */
+    get remoteProtocolVersion() {
+        return this.identifyData?.protocolVersion;
+    }
+    /**
+     * Get listen addresses advertised by the remote peer.
+     * Returns empty array if identify data not available yet.
+     */
+    get remoteListenAddrs() {
+        return this.identifyData?.listenAddrs || [];
+    }
+    /**
+     * Get our observed address as seen by the remote peer.
+     */
+    get observedAddress() {
+        return this.identifyData?.observedAddr;
+    }
+    get address() {
+        if (this.identifyData?.protocols &&
+            this.identifyData.protocols.length > 0) {
+            const filtered = this.identifyData.protocols.filter((p) => p.startsWith('/o/'));
+            if (filtered.length > 0) {
+                const remoteAddress = oNodeAddress.fromProtocol(filtered[0]);
+                return remoteAddress;
+            }
+        }
+        return this.config.address;
+    }
+    get nextHopAddress() {
+        if (this.config.nextHopAddress.value === 'o://unknown') {
+            return this.address;
+        }
+        return this.config.nextHopAddress;
+    }
+    get callerAddress() {
+        if (this.p2pConnection.direction === 'inbound') {
+            return this.address;
+        }
+        return this.config.callerAddress;
+    }
     async transmit(request) {
         try {
             // Build protocol string
@@ -90,6 +156,35 @@ export class oNodeConnection extends oConnection {
         // Always cleanup streams (no reuse at base layer)
         await this.streamManager.releaseStream(stream.p2pStream.id);
     }
+    /**
+     * Set up persistent listener for identify events from the remote peer
+     */
+    setupIdentifyListener() {
+        if (!this.p2pNode) {
+            return;
+        }
+        this.identifyListener = (evt) => {
+            const { peerId, protocols, agentVersion, protocolVersion, listenAddrs, observedAddr, } = evt.detail;
+            // Only cache if this event is for our remote peer
+            if (peerId?.toString() === this.remotePeerId.toString()) {
+                this.identifyData = {
+                    protocols: protocols || [],
+                    agentVersion,
+                    protocolVersion,
+                    listenAddrs: listenAddrs || [],
+                    observedAddr,
+                    timestamp: Date.now(),
+                };
+                this.logger.debug('Cached identify data for peer', {
+                    peerId: peerId.toString(),
+                    protocols: this.identifyData.protocols,
+                    agentVersion: this.identifyData.agentVersion,
+                });
+            }
+        };
+        this.p2pNode.addEventListener('peer:identify', this.identifyListener);
+        this.logger.debug('Identify listener set up for connection');
+    }
     async abort(error) {
         this.logger.debug('Aborting connection');
         await this.p2pConnection.abort(error);
@@ -97,6 +192,10 @@ export class oNodeConnection extends oConnection {
     }
     async close() {
         this.logger.debug('Closing connection');
+        // Remove identify listener
+        if (this.p2pNode && this.identifyListener) {
+            this.p2pNode.removeEventListener('peer:identify', this.identifyListener);
+        }
         // Close stream manager (handles all stream cleanup)
         await this.streamManager.close();
         await this.p2pConnection.close();

package/dist/src/connection/o-node-connection.manager.d.ts

@@ -2,53 +2,34 @@ import { oAddress, oConnectionConfig, oConnectionManager } from '@olane/o-core';
 import { Libp2p, Connection } from '@olane/o-config';
 import { oNodeConnectionManagerConfig } from './interfaces/o-node-connection-manager.config.js';
 import { oNodeConnection } from './o-node-connection.js';
+/**
+ * Manages oNodeConnection instances, reusing connections when possible.
+ */
 export declare class oNodeConnectionManager extends oConnectionManager {
     readonly config: oNodeConnectionManagerConfig;
     protected p2pNode: Libp2p;
     protected defaultReadTimeoutMs?: number;
     protected defaultDrainTimeoutMs?: number;
     /** Single cache of oNodeConnection instances keyed by address */
-    protected cachedConnections: Map<string, oNodeConnection[]>;
+    protected cachedConnections: Map<string, oNodeConnection>;
     protected pendingDialsByAddress: Map<string, Promise<Connection>>;
     constructor(config: oNodeConnectionManagerConfig);
     /**
      * Set up listeners to maintain connection cache state
      */
     protected setupConnectionListeners(): void;
-    /**
-     * Build a stable cache key from an address.
-     *
-     * We key the cache by address value (e.g., "o://my-tool") to maintain
-     * a simple one-to-one mapping between addresses and connections.
-     */
-    protected getAddressKey(address: oAddress): string | null;
     /**
      * Extract peer ID string from an address
      * @param address - The address to extract peer ID from
      * @returns The peer ID string or null if not found
      */
     protected getPeerIdFromAddress(address: oAddress): string | null;
-    /**
-     * Get the first valid (open) connection for the given address key.
-     * Cleans up stale connections from the cache automatically.
-     *
-     * @param addressKey - The address key to look up
-     * @returns A valid oNodeConnection or null if none found
-     */
-    protected getValidConnection(addressKey: string): oNodeConnection | null;
     /**
      * Cache an oNodeConnection by its address key.
      * @param conn - The oNodeConnection to cache
      * @param addressKey - The address key to cache under
      */
-    protected cacheConnection(conn: oNodeConnection, addressKey: string): void;
-    /**
-     * Get oNodeConnection by libp2p Connection reference
-     * Used to find the correct oNodeConnection for incoming streams
-     * @param p2pConnection - The libp2p connection to search for
-     * @returns The oNodeConnection or undefined if not found
-     */
-    getConnectionByP2pConnection(p2pConnection: Connection): oNodeConnection | undefined;
+    protected cacheConnection(conn: oNodeConnection): void;
     /**
      * Get or create a raw p2p connection to the given address.
      * Subclasses can override connect() and use this method to get the underlying p2p connection.
@@ -59,42 +40,12 @@ export declare class oNodeConnectionManager extends oConnectionManager {
         p2pConnection: Connection;
         reuse?: boolean;
     }): Promise<oNodeConnection>;
+    getConnectionFromAddress(address: oAddress): oNodeConnection | null;
     /**
      * Connect to a given address, reusing oNodeConnection when possible
      * @param config - Connection configuration
      * @returns The connection object
      */
     connect(config: oConnectionConfig): Promise<oNodeConnection>;
-    /**
-     * Check if we have an active connection to the target peer
-     * @param address - The address to check
-     * @returns true if an active connection exists
-     */
-    isCached(address: oAddress): boolean;
-    /**
-     * Get an existing cached oNodeConnection for the target address
-     * @param address - The address to get a connection for
-     * @returns The oNodeConnection or null if not found
-     */
-    getCachedConnection(address: oAddress): oNodeConnection | null;
-    /**
-     * Get cache statistics for monitoring and debugging
-     * @returns Object containing cache statistics
-     */
-    getCacheStats(): {
-        cachedAddresses: number;
-        totalCachedConnections: number;
-        pendingDials: number;
-        connectionsByPeer: Array<{
-            peerId: string;
-            status: string;
-            addressKey: string;
-        }>;
-    };
-    /**
-     * Clean up all stale (non-open) connections from cache
-     * @returns Number of connections removed
-     */
-    cleanupStaleConnections(): number;
 }
 //# sourceMappingURL=o-node-connection.manager.d.ts.map

package/dist/src/connection/o-node-connection.manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-node-connection.manager.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-connection.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,sBAAuB,SAAQ,kBAAkB;IAQhD,QAAQ,CAAC,MAAM,EAAE,4BAA4B;IAPzD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IACxC,SAAS,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IACzC,iEAAiE;IACjE,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAa;IACxE,SAAS,CAAC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAa;gBAEzD,MAAM,EAAE,4BAA4B;IAWzD;;OAEG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IA+B1C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI;IASzD;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI;IAahE;;;;;;OAMG;IACH,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI;IAkBxE;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAY1E;;;;;OAKG;IACH,4BAA4B,CAC1B,aAAa,EAAE,UAAU,GACxB,eAAe,GAAG,SAAS;IAa9B;;;OAGG;cACa,wBAAwB,CACtC,cAAc,EAAE,QAAQ,EACxB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,UAAU,CAAC;cAoCN,WAAW,CACzB,cAAc,EAAE,QAAQ,EACxB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,UAAU,CAAC;IAqBhB,MAAM,CACV,MAAM,EAAE,iBAAiB,GAAG;QAAE,aAAa,EAAE,UAAU,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GACzE,OAAO,CAAC,eAAe,CAAC;IA4D3B;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAwDlE;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAcpC;;;;OAIG;IACH,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,eAAe,GAAG,IAAI;IAc9D;;;OAGG;IACH,aAAa,IAAI;QACf,eAAe,EAAE,MAAM,CAAC;QACxB,sBAAsB,EAAE,MAAM,CAAC;QAC/B,YAAY,EAAE,MAAM,CAAC;QACrB,iBAAiB,EAAE,KAAK,CAAC;YACvB,MAAM,EAAE,MAAM,CAAC;YACf,MAAM,EAAE,MAAM,CAAC;YACf,UAAU,EAAE,MAAM,CAAC;SACpB,CAAC,CAAC;KACJ;IAyBD;;;OAGG;IACH,uBAAuB,IAAI,MAAM;CAuBlC"}
+{"version":3,"file":"o-node-connection.manager.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-connection.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,kBAAkB;IAQhD,QAAQ,CAAC,MAAM,EAAE,4BAA4B;IAPzD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IACxC,SAAS,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IACzC,iEAAiE;IACjE,SAAS,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAa;IACtE,SAAS,CAAC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAa;gBAEzD,MAAM,EAAE,4BAA4B;IAWzD;;OAEG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAY1C;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI;IAahE;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI;IAWtD;;;OAGG;cACa,wBAAwB,CACtC,cAAc,EAAE,QAAQ,EACxB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,UAAU,CAAC;cAoBN,WAAW,CACzB,cAAc,EAAE,QAAQ,EACxB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,UAAU,CAAC;IAqBhB,MAAM,CACV,MAAM,EAAE,iBAAiB,GAAG;QAAE,aAAa,EAAE,UAAU,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GACzE,OAAO,CAAC,eAAe,CAAC;IAgD3B,wBAAwB,CAAC,OAAO,EAAE,QAAQ,GAAG,eAAe,GAAG,IAAI;IAkBnE;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;CAqDnE"}

package/dist/src/connection/o-node-connection.manager.js

@@ -1,5 +1,8 @@
 import { oConnectionManager } from '@olane/o-core';
 import { oNodeConnection } from './o-node-connection.js';
+/**
+ * Manages oNodeConnection instances, reusing connections when possible.
+ */
 export class oNodeConnectionManager extends oConnectionManager {
     constructor(config) {
         super(config);
@@ -24,35 +27,9 @@ export class oNodeConnectionManager extends oConnectionManager {
                 return;
             }
             const connectionId = connection.id;
-            // Clean up cached connections by filtering out the closed connection
-            for (const [key, conns] of this.cachedConnections.entries()) {
-                const filtered = conns.filter((c) => c.p2pConnection.id !== connectionId);
-                if (filtered.length === 0) {
-                    this.logger.debug('Connection closed, removing all cached connections for address:', key);
-                    this.cachedConnections.delete(key);
-                }
-                else if (filtered.length !== conns.length) {
-                    this.logger.debug('Connection closed, updating cached connections for address:', key);
-                    this.cachedConnections.set(key, filtered);
-                }
-            }
+            this.cachedConnections.delete(connectionId);
         });
     }
-    /**
-     * Build a stable cache key from an address.
-     *
-     * We key the cache by address value (e.g., "o://my-tool") to maintain
-     * a simple one-to-one mapping between addresses and connections.
-     */
-    getAddressKey(address) {
-        try {
-            return address.value || null;
-        }
-        catch (error) {
-            this.logger.debug('Error extracting address key from address:', error);
-            return null;
-        }
-    }
     /**
      * Extract peer ID string from an address
      * @param address - The address to extract peer ID from
@@ -71,71 +48,22 @@ export class oNodeConnectionManager extends oConnectionManager {
             return null;
         }
     }
-    /**
-     * Get the first valid (open) connection for the given address key.
-     * Cleans up stale connections from the cache automatically.
-     *
-     * @param addressKey - The address key to look up
-     * @returns A valid oNodeConnection or null if none found
-     */
-    getValidConnection(addressKey) {
-        const connections = this.cachedConnections.get(addressKey) || [];
-        // Filter to open connections
-        const valid = connections.filter((c) => c.p2pConnection?.status === 'open');
-        // Update cache if we cleaned any stale connections
-        if (valid.length !== connections.length) {
-            if (valid.length === 0) {
-                this.cachedConnections.delete(addressKey);
-            }
-            else {
-                this.cachedConnections.set(addressKey, valid);
-            }
-        }
-        return valid[0] ?? null;
-    }
     /**
      * Cache an oNodeConnection by its address key.
      * @param conn - The oNodeConnection to cache
      * @param addressKey - The address key to cache under
      */
-    cacheConnection(conn, addressKey) {
-        this.logger.debug('Caching connection for address:', addressKey, conn.p2pConnection.id, conn.p2pConnection.direction);
-        const existing = this.cachedConnections.get(addressKey) || [];
-        existing.push(conn);
-        this.cachedConnections.set(addressKey, existing);
-    }
-    /**
-     * Get oNodeConnection by libp2p Connection reference
-     * Used to find the correct oNodeConnection for incoming streams
-     * @param p2pConnection - The libp2p connection to search for
-     * @returns The oNodeConnection or undefined if not found
-     */
-    getConnectionByP2pConnection(p2pConnection) {
-        // Search through all cached connections
-        for (const connections of this.cachedConnections.values()) {
-            const found = connections.find((conn) => conn.p2pConnection.id === p2pConnection.id);
-            if (found) {
-                return found;
-            }
-        }
-        return undefined;
+    cacheConnection(conn) {
+        this.logger.debug('Caching connection for address:', conn.p2pConnection.id, conn.p2pConnection.direction, conn.nextHopAddress.value, conn.p2pConnection.streams.map((s) => s.protocol).join(', '));
+        this.cachedConnections.set(conn.p2pConnection.id, conn);
     }
     /**
      * Get or create a raw p2p connection to the given address.
      * Subclasses can override connect() and use this method to get the underlying p2p connection.
      */
     async getOrCreateP2pConnection(nextHopAddress, addressKey) {
-        // Check if libp2p already has an active connection for this peer
-        const peerId = this.getPeerIdFromAddress(nextHopAddress);
-        if (peerId) {
-            const connections = this.p2pNode.getConnections();
-            const existingConnection = connections.find((conn) => conn.remotePeer?.toString() === peerId && conn.status === 'open');
-            if (existingConnection) {
-                this.logger.debug('Found existing libp2p connection for address:', addressKey);
-                return existingConnection;
-            }
-        }
         // Check if dial is already in progress for this address key
+        this.logger.debug('Checking for pending dial for address:', addressKey);
         const pendingDial = this.pendingDialsByAddress.get(addressKey);
         if (pendingDial) {
             this.logger.debug('Awaiting existing dial for address:', addressKey);
@@ -166,25 +94,23 @@ export class oNodeConnectionManager extends oConnectionManager {
     }
     async answer(config) {
         const { address, nextHopAddress, callerAddress, readTimeoutMs, drainTimeoutMs, p2pConnection, reuse, } = config;
-        const addressKey = this.getAddressKey(nextHopAddress);
-        if (!addressKey) {
-            this.logger.error('Failed to generate an address key for address:', nextHopAddress);
-            throw new Error(`Unable to extract address key from address: ${nextHopAddress.toString()}`);
-        }
+        this.logger.debug('Answering connection for address:', {
+            address: nextHopAddress?.value,
+            connectionId: p2pConnection.id,
+            direction: p2pConnection.direction,
+            reuse,
+        });
         // Check if we already have a cached connection for this address with the same connection id
-        const connections = this.cachedConnections.get(addressKey) || [];
-        // Filter to open connections
-        const validConnections = connections.filter((c) => c.p2pConnection?.id === p2pConnection.id &&
-            c.p2pConnection?.status === 'open');
-        if (validConnections.length > 0) {
-            const existingConnection = validConnections[0];
-            this.logger.debug('Reusing cached connection for answer:', addressKey, existingConnection.p2pConnection.id);
+        const existingConnection = this.cachedConnections.get(p2pConnection.id);
+        if (existingConnection) {
+            this.logger.debug('Reusing cached connection for answer:', existingConnection.p2pConnection.id);
             return existingConnection;
         }
         const connection = new oNodeConnection({
             nextHopAddress: nextHopAddress,
             address: address,
             p2pConnection: p2pConnection,
+            p2pNode: this.p2pNode,
             callerAddress: callerAddress,
             readTimeoutMs: readTimeoutMs ?? this.defaultReadTimeoutMs,
             drainTimeoutMs: drainTimeoutMs ?? this.defaultDrainTimeoutMs,
@@ -194,9 +120,26 @@ export class oNodeConnectionManager extends oConnectionManager {
             reusePolicy: reuse ? 'reuse' : 'none',
         });
         // Cache the new connection
-        this.cacheConnection(connection, addressKey);
+        this.cacheConnection(connection);
         return connection;
     }
+    getConnectionFromAddress(address) {
+        const protocol = address.protocol;
+        this.logger.debug('Searching cached connections for protocol:', protocol);
+        for (const conn of this.cachedConnections.values()) {
+            // if nextHopAddress protocol matches, return conn
+            if (conn.nextHopAddress.protocol === protocol) {
+                this.logger.debug('local reuse cache found:', protocol);
+                return conn;
+            }
+            // if remote protocols include protocol, return conn
+            if (conn.remoteProtocols.includes(protocol)) {
+                this.logger.debug('remote reuse cache found', protocol);
+                return conn;
+            }
+        }
+        return null;
+    }
     /**
      * Connect to a given address, reusing oNodeConnection when possible
      * @param config - Connection configuration
@@ -207,22 +150,24 @@ export class oNodeConnectionManager extends oConnectionManager {
         if (!nextHopAddress) {
             throw new Error('Invalid address passed');
         }
-        const addressKey = this.getAddressKey(nextHopAddress);
-        if (!addressKey) {
-            throw new Error(`Unable to extract address key from address: ${nextHopAddress.toString()}`);
-        }
         // Check for existing valid cached connection
-        const existingConnection = this.getValidConnection(addressKey);
+        const existingConnection = this.getConnectionFromAddress(nextHopAddress);
         if (existingConnection) {
-            this.logger.debug('Reusing cached connection for address:', addressKey, existingConnection.p2pConnection.id);
+            this.logger.debug('Reusing cached connection for address:', existingConnection.p2pConnection.id);
             return existingConnection;
         }
+        else {
+            this.logger.debug('No cached connection found for address:', {
+                address: nextHopAddress.value,
+            });
+        }
         // Get or create the underlying p2p connection
-        const p2pConnection = await this.getOrCreateP2pConnection(nextHopAddress, addressKey);
+        const p2pConnection = await this.getOrCreateP2pConnection(nextHopAddress, nextHopAddress.value);
         // Create new oNodeConnection
         const connection = new oNodeConnection({
             nextHopAddress: nextHopAddress,
             address: address,
+            p2pNode: this.p2pNode,
             p2pConnection: p2pConnection,
             callerAddress: callerAddress,
             readTimeoutMs: readTimeoutMs ?? this.defaultReadTimeoutMs,
@@ -230,91 +175,10 @@ export class oNodeConnectionManager extends oConnectionManager {
             isStream: config.isStream ?? false,
             abortSignal: config.abortSignal,
             runOnLimitedConnection: this.config.runOnLimitedConnection ?? false,
+            requestHandler: config.requestHandler,
         });
         // Cache the new connection
-        this.cacheConnection(connection, addressKey);
+        this.cacheConnection(connection);
         return connection;
     }
-    /**
-     * Check if we have an active connection to the target peer
-     * @param address - The address to check
-     * @returns true if an active connection exists
-     */
-    isCached(address) {
-        try {
-            const addressKey = this.getAddressKey(address);
-            if (!addressKey) {
-                return false;
-            }
-            return this.getValidConnection(addressKey) !== null;
-        }
-        catch (error) {
-            this.logger.debug('Error checking cached connection:', error);
-            return false;
-        }
-    }
-    /**
-     * Get an existing cached oNodeConnection for the target address
-     * @param address - The address to get a connection for
-     * @returns The oNodeConnection or null if not found
-     */
-    getCachedConnection(address) {
-        try {
-            const addressKey = this.getAddressKey(address);
-            if (!addressKey) {
-                return null;
-            }
-            return this.getValidConnection(addressKey);
-        }
-        catch (error) {
-            this.logger.debug('Error getting cached connection:', error);
-            return null;
-        }
-    }
-    /**
-     * Get cache statistics for monitoring and debugging
-     * @returns Object containing cache statistics
-     */
-    getCacheStats() {
-        const allConnections = [];
-        for (const [addressKey, connections] of this.cachedConnections.entries()) {
-            for (const conn of connections) {
-                allConnections.push({
-                    peerId: conn.p2pConnection?.remotePeer?.toString() ?? 'unknown',
-                    status: conn.p2pConnection?.status ?? 'unknown',
-                    addressKey,
-                });
-            }
-        }
-        return {
-            cachedAddresses: this.cachedConnections.size,
-            totalCachedConnections: allConnections.length,
-            pendingDials: this.pendingDialsByAddress.size,
-            connectionsByPeer: allConnections,
-        };
-    }
-    /**
-     * Clean up all stale (non-open) connections from cache
-     * @returns Number of connections removed
-     */
-    cleanupStaleConnections() {
-        let removed = 0;
-        for (const [addressKey, connections] of this.cachedConnections.entries()) {
-            const openConnections = connections.filter((conn) => conn.p2pConnection?.status === 'open');
-            const staleCount = connections.length - openConnections.length;
-            if (staleCount > 0) {
-                removed += staleCount;
-                if (openConnections.length === 0) {
-                    this.cachedConnections.delete(addressKey);
-                }
-                else {
-                    this.cachedConnections.set(addressKey, openConnections);
-                }
-            }
-        }
-        if (removed > 0) {
-            this.logger.debug(`Cleaned up ${removed} stale connections`);
-        }
-        return removed;
-    }
 }

package/dist/src/connection/o-node-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-node-stream.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAuB,OAAO,EAAiB,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,OAAO;aAIpB,SAAS,EAAE,MAAM;aACjB,MAAM,EAAE,iBAAiB;IAJ3C,SAAgB,SAAS,EAAE,MAAM,CAAC;gBAGhB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB;IAO3C,QAAQ;IA6BR;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,OAAO,CAMrB;IAED;;OAEG;IACH,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,OAAO,CAE/B;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,OAAO,CAE/B;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAgB7B"}
+{"version":3,"file":"o-node-stream.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAuB,OAAO,EAAiB,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAEzE;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,OAAO;aAIpB,SAAS,EAAE,MAAM;aACjB,MAAM,EAAE,iBAAiB;IAJ3C,SAAgB,SAAS,EAAE,MAAM,CAAC;gBAGhB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,iBAAiB;IAO3C,QAAQ;IA6BR;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,OAAO,CAMrB;IAED;;OAEG;IACH,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED;;OAEG;IACH,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,OAAO,CAE/B;IAED;;OAEG;IACH,IAAI,iBAAiB,IAAI,OAAO,CAE/B;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAiB7B"}

package/dist/src/connection/o-node-stream.js

@@ -76,6 +76,7 @@ export class oNodeStream extends oObject {
         if (this.p2pStream.status === 'open') {
             try {
                 // force the close for now until we can implement a proper close
+                this.logger.debug('Closing p2p stream');
                 await this.p2pStream.abort(new Error('Stream closed'));
             }
             catch (error) {

package/dist/src/connection/o-node-stream.manager.d.ts

@@ -26,6 +26,8 @@ export declare class oNodeStreamManager extends oObject {
     private activeStreamHandlers;
     protected callerReaderStream?: Stream;
     protected callerWriterStream?: Stream;
+    private streamMonitoringIntervals;
+    private id;
     constructor(config: StreamManagerConfig);
     /**
      * Initialize the stream manager
@@ -74,6 +76,14 @@ export declare class oNodeStreamManager extends oObject {
      * @returns The libp2p Stream or undefined if not found
      */
     getStreamById(streamId: string): Stream | undefined;
+    /**
+     * Sets up monitoring for stream closure and emits events when detected
+     * Periodically checks stream status and cleans up when stream closes
+     *
+     * @param stream - The stream to monitor
+     * @param role - The role of the stream ('reader' or 'writer')
+     */
+    private setupStreamCloseMonitoring;
     /**
      * Emits an async event and waits for the first listener to return a result
      * This enables event-based request handling with async responses

package/dist/src/connection/o-node-stream.manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-node-stream.manager.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-stream.manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"o-node-stream.manager.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-stream.manager.ts"],"names":[],"mappings":"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"}

package/dist/src/connection/o-node-stream.manager.js

@@ -5,6 +5,7 @@ import { StreamManagerEvent, } from './stream-manager.events.js';
 import { isStreamInitMessage, } from './interfaces/stream-init-message.js';
 import { lpStream } from '@olane/o-config';
 import JSON5 from 'json5';
+import { v4 as uuidv4 } from 'uuid';
 /**
  * oNodeStreamManager handles the lifecycle and tracking of streams for a single connection.
  * Features:
@@ -16,12 +17,15 @@ import JSON5 from 'json5';
  */
 export class oNodeStreamManager extends oObject {
     constructor(config) {
-        super();
+        const id = uuidv4();
+        super('id:' + id);
         this.config = config;
         this.streams = new Map();
         this.eventEmitter = new EventEmitter();
         this.isInitialized = false;
         this.activeStreamHandlers = new Map();
+        this.streamMonitoringIntervals = new Map(); // Track monitoring intervals
+        this.id = id;
         this.p2pConnection = config.p2pConnection;
     }
     /**
@@ -59,17 +63,20 @@ export class oNodeStreamManager extends oObject {
      * @returns Wrapped stream
      */
     async getOrCreateStream(protocol, remoteAddress, config = {}) {
-        this.logger.debug('Getting or creating stream', this.callerReaderStream?.protocol, 'and status', this.callerReaderStream?.status);
+        this.logger.debug('Getting or creating stream', this.callerReaderStream?.protocol, 'and status', this.callerReaderStream?.status, 'json:', JSON.stringify(this.callerReaderStream));
         // If we have a caller's reader stream (from limited connection), use it for sending requests
         if (this.callerReaderStream && this.callerReaderStream.status === 'open') {
             this.logger.debug('Using caller reader stream for limited connection', {
                 streamId: this.callerReaderStream.id,
             });
+            // TODO: figure out why this would cause the node stream to be closed?
             // Wrap the reader stream for use (if not already wrapped)
-            const existingWrapped = Array.from(this.streams.values()).find((s) => s.p2pStream.id === this.callerReaderStream.id);
-            if (existingWrapped) {
-                return existingWrapped;
-            }
+            // const existingWrapped = Array.from(this.streams.values()).find(
+            //   (s) => s.p2pStream.id === this.callerReaderStream!.id,
+            // );
+            // if (existingWrapped) {
+            //   return existingWrapped;
+            // }
             // Wrap the reader stream
             const wrappedStream = new oNodeStream(this.callerReaderStream, {
                 direction: 'inbound', // It's inbound to us, we write to it
@@ -77,7 +84,7 @@ export class oNodeStreamManager extends oObject {
                 remoteAddress: remoteAddress,
                 streamType: 'request-response',
             });
-            this.streams.set(this.callerReaderStream.id, wrappedStream);
+            // this.streams.set(this.callerReaderStream.id, wrappedStream);
             return wrappedStream;
         }
         // Always create new stream (no reuse at base layer)
@@ -177,6 +184,52 @@ export class oNodeStreamManager extends oObject {
         const wrappedStream = this.streams.get(streamId);
         return wrappedStream?.p2pStream;
     }
+    /**
+     * Sets up monitoring for stream closure and emits events when detected
+     * Periodically checks stream status and cleans up when stream closes
+     *
+     * @param stream - The stream to monitor
+     * @param role - The role of the stream ('reader' or 'writer')
+     */
+    setupStreamCloseMonitoring(stream, role) {
+        const streamId = stream.id;
+        // Clear any existing monitoring for this stream
+        const existingInterval = this.streamMonitoringIntervals.get(streamId);
+        if (existingInterval) {
+            clearInterval(existingInterval);
+        }
+        // Check stream status every 5 seconds
+        const interval = setInterval(() => {
+            if (stream.status !== 'open') {
+                this.logger.info(`Caller ${role} stream closed`, {
+                    streamId,
+                    status: stream.status,
+                    role,
+                });
+                // Emit stream closed event
+                this.emit(StreamManagerEvent.StreamClosed, {
+                    streamId,
+                    role,
+                    status: stream.status,
+                });
+                // Clear the stream reference
+                if (role === 'reader') {
+                    this.callerReaderStream = undefined;
+                    this.logger.info('Limited connection reader stream closed, will create new streams for requests');
+                }
+                else if (role === 'writer') {
+                    this.callerWriterStream = undefined;
+                    this.logger.info('Limited connection writer stream closed, responses may be affected');
+                }
+                // Stop monitoring this stream
+                clearInterval(interval);
+                this.streamMonitoringIntervals.delete(streamId);
+            }
+        }, 5000);
+        // Track the interval for cleanup
+        this.streamMonitoringIntervals.set(streamId, interval);
+        this.logger.debug(`Started monitoring ${role} stream`, { streamId });
+    }
     /**
      * Emits an async event and waits for the first listener to return a result
      * This enables event-based request handling with async responses
@@ -232,6 +285,8 @@ export class oNodeStreamManager extends oObject {
                     role: message.role,
                     connectionId: message.connectionId,
                 });
+                // Set up monitoring for reader stream closure
+                this.setupStreamCloseMonitoring(stream, 'reader');
             }
             else if (message.role === 'writer') {
                 this.callerWriterStream = stream;
@@ -244,6 +299,8 @@ export class oNodeStreamManager extends oObject {
                     role: message.role,
                     connectionId: message.connectionId,
                 });
+                // Set up monitoring for writer stream closure
+                this.setupStreamCloseMonitoring(stream, 'writer');
             }
             // Send acknowledgment back to caller
             const ackMessage = {
@@ -387,7 +444,6 @@ export class oNodeStreamManager extends oObject {
         catch (error) {
             // Stream closed or error occurred
             if (stream.status === 'open') {
-                this.logger.error('Error in length-prefixed stream handler:', error);
                 this.emit(StreamManagerEvent.StreamError, {
                     streamId: stream.id,
                     error,
@@ -585,7 +641,14 @@ export class oNodeStreamManager extends oObject {
         this.logger.info('Closing stream manager', {
             activeStreams: this.streams.size,
             activeHandlers: this.activeStreamHandlers.size,
+            monitoringIntervals: this.streamMonitoringIntervals.size,
         });
+        // Clear all stream monitoring intervals
+        for (const [streamId, interval,] of this.streamMonitoringIntervals.entries()) {
+            clearInterval(interval);
+            this.logger.debug('Cleared monitoring interval', { streamId });
+        }
+        this.streamMonitoringIntervals.clear();
         // Abort all active stream handlers
         for (const [streamId, { abortController },] of this.activeStreamHandlers.entries()) {
             abortController.abort();

package/dist/src/connection/stream-manager.events.d.ts

@@ -12,6 +12,7 @@ export declare enum StreamManagerEvent {
     StreamReplaced = "stream-replaced",
     StreamFailed = "stream-failed",
     StreamIdentified = "stream-identified",
+    StreamClosed = "stream-closed",
     InboundRequest = "inbound-request",
     InboundResponse = "inbound-response",
     StreamError = "stream-error"
@@ -53,6 +54,11 @@ export interface StreamIdentifiedData {
     role: 'reader' | 'writer' | 'standard';
     connectionId?: string;
 }
+export interface StreamClosedData {
+    streamId: string;
+    role: 'reader' | 'writer';
+    status: string;
+}
 export interface InboundRequestData {
     request: any;
     stream: any;
@@ -81,6 +87,7 @@ export type StreamManagerEventData = {
     [StreamManagerEvent.StreamReplaced]: StreamReplacedData;
     [StreamManagerEvent.StreamFailed]: StreamFailedData;
     [StreamManagerEvent.StreamIdentified]: StreamIdentifiedData;
+    [StreamManagerEvent.StreamClosed]: StreamClosedData;
     [StreamManagerEvent.InboundRequest]: InboundRequestData;
     [StreamManagerEvent.InboundResponse]: InboundResponseData;
     [StreamManagerEvent.StreamError]: StreamErrorData;

package/dist/src/connection/stream-manager.events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-manager.events.d.ts","sourceRoot":"","sources":["../../../src/connection/stream-manager.events.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,kBAAkB;IAC5B,kBAAkB,wBAAwB;IAC1C,aAAa,mBAAmB;IAChC,aAAa,mBAAmB;IAChC,aAAa,mBAAmB;IAChC,YAAY,kBAAkB;IAC9B,eAAe,qBAAqB;IACpC,cAAc,oBAAoB;IAClC,cAAc,oBAAoB;IAClC,YAAY,kBAAkB;IAC9B,gBAAgB,sBAAsB;IACtC,cAAc,oBAAoB;IAClC,eAAe,qBAAqB;IACpC,WAAW,iBAAiB;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;CAAG;AAEnC,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,mBAAmB;IAClC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,UAAU,CAAC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,EAAE,GAAG,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,GAAG,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;CAC9C;AAED;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,EAAE,eAAe,CAAC;IACzD,CAAC,kBAAkB,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;IACzC,CAAC,kBAAkB,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAC;IACtD,CAAC,kBAAkB,CAAC,aAAa,CAAC,EAAE,iBAAiB,CAAC;IACtD,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,gBAAgB,CAAC;IACpD,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE,mBAAmB,CAAC;IAC1D,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACxD,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACxD,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,gBAAgB,CAAC;IACpD,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;IAC5D,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE,kBAAkB,CAAC;IACxD,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE,mBAAmB,CAAC;IAC1D,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,eAAe,CAAC;CACnD,CAAC"}
+{"version":3,"file":"stream-manager.events.d.ts","sourceRoot":"","sources":["../../../src/connection/stream-manager.events.ts"],"names":[],"mappings":"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"}

package/dist/src/connection/stream-manager.events.js

@@ -13,6 +13,7 @@ export var StreamManagerEvent;
     StreamManagerEvent["StreamReplaced"] = "stream-replaced";
     StreamManagerEvent["StreamFailed"] = "stream-failed";
     StreamManagerEvent["StreamIdentified"] = "stream-identified";
+    StreamManagerEvent["StreamClosed"] = "stream-closed";
     StreamManagerEvent["InboundRequest"] = "inbound-request";
     StreamManagerEvent["InboundResponse"] = "inbound-response";
     StreamManagerEvent["StreamError"] = "stream-error";

package/dist/src/o-node.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-node.tool.d.ts","sourceRoot":"","sources":["../../src/o-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAoB,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAOrD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACzC,mBAAmB,CAAC,OAAO,EAAE,QAAQ;IAuBrC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAsBhC,mBAAmB;IAWnB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,iBAAiB,CACrB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC;IAIV,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,KAAK,CAAC,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC;IAwDV,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CAiC5D"}
+{"version":3,"file":"o-node.tool.d.ts","sourceRoot":"","sources":["../../src/o-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAoB,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAOrD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACzC,mBAAmB,CAAC,OAAO,EAAE,QAAQ;IAuBrC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAyBhC,mBAAmB;IAWnB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,iBAAiB,CACrB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC;IAIV,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,KAAK,CAAC,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC;IA+CV,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CAiC5D"}

package/dist/src/o-node.tool.js

@@ -3,7 +3,6 @@ import { oTool } from '@olane/o-tool';
 import { oServerNode } from './nodes/server.node.js';
 import { oNodeTransport } from './router/o-node.transport.js';
 import { oNodeAddress } from './router/o-node.address.js';
-import { ConnectionUtils } from './utils/connection.utils.js';
 import { StreamManagerEvent } from './connection/stream-manager.events.js';
 /**
  * oTool is a mixin that extends the base class and implements the oTool interface
@@ -30,8 +29,11 @@ export class oNodeTool extends oTool(oServerNode) {
         this.logger.debug('Handled protocol reuse: ' + reuseProtocol);
     }
     async handleProtocol(address) {
+        if (!address || !address.protocol) {
+            throw new Error('Invalid address passed: ' + address);
+        }
         const protocols = this.p2pNode.getProtocols();
-        if (protocols.find((p) => p === address.protocol)) {
+        if (protocols.find((p) => p === address?.protocol)) {
             // already handling
             return;
         }
@@ -66,29 +68,22 @@ export class oNodeTool extends oTool(oServerNode) {
         return this.handleStream(stream, connection, true);
     }
     async handleStream(stream, connection, reuse) {
-        if (reuse) {
-            this.logger.debug('Handle stream with reuse = true');
-            // record inbound connection to manager
-        }
-        const remoteAddress = await ConnectionUtils.addressFromConnection({
-            currentNode: this,
-            connection: connection,
+        this.logger.debug('Handling incoming stream on connection:', {
+            connectionId: connection.id,
+            direction: connection.direction,
         });
-        await this.connectionManager.answer({
-            nextHopAddress: remoteAddress,
-            address: remoteAddress,
+        const unknown = new oNodeAddress('o://unknown', []);
+        const oConnection = await this.connectionManager.answer({
+            nextHopAddress: unknown,
+            address: unknown,
             callerAddress: this.address,
             p2pConnection: connection,
             reuse,
         });
         // Get the oNodeConnection for this libp2p connection
-        const oConnection = this.connectionManager.getConnectionByP2pConnection(connection);
         if (!oConnection) {
-            this.logger.error('No oNodeConnection found for incoming stream', {
-                remotePeer: connection.remotePeer.toString(),
-                connectionId: connection.id,
-            });
-            return;
+            this.logger.error('Failed to process inbound connection');
+            throw new Error('Failed to process inbound connection');
         }
         // Subscribe to InboundRequest events from the stream manager
         // This follows an event-driven pattern for handling incoming requests

package/dist/src/utils/connection.utils.d.ts

@@ -2,10 +2,10 @@ import { Connection } from '@olane/o-config';
 import { oObject } from '@olane/o-core';
 export declare class ConnectionUtils extends oObject {
     /**
-     * Waits for a peer to appear in the peer store with sufficient protocol information.
-     * Implements retry logic to handle race conditions where peer store is not immediately populated.
+     * Waits for a peer to be identified via the identify protocol.
+     * Uses event-driven approach listening to peer store protocol updates.
      */
-    private static waitForPeerInStore;
+    private static waitForPeerIdentify;
     static addressFromConnection(options: {
         currentNode: any;
         connection: Connection;

package/dist/src/utils/connection.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.utils.d.ts","sourceRoot":"","sources":["../../../src/utils/connection.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA2B,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAuB,OAAO,EAAE,MAAM,eAAe,CAAC;AAI7D,qBAAa,eAAgB,SAAQ,OAAO;IAC1C;;;OAGG;mBACkB,kBAAkB;WAgCnB,qBAAqB,CAAC,OAAO,EAAE;QACjD,WAAW,EAAE,GAAG,CAAC;QACjB,UAAU,EAAE,UAAU,CAAC;KACxB;CA0DF"}
+{"version":3,"file":"connection.utils.d.ts","sourceRoot":"","sources":["../../../src/utils/connection.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAuB,OAAO,EAAE,MAAM,eAAe,CAAC;AAI7D,qBAAa,eAAgB,SAAQ,OAAO;IAC1C;;;OAGG;mBACkB,mBAAmB;WA0EpB,qBAAqB,CAAC,OAAO,EAAE;QACjD,WAAW,EAAE,GAAG,CAAC;QACjB,UAAU,EAAE,UAAU,CAAC;KACxB;CA4DF"}

package/dist/src/utils/connection.utils.js

@@ -3,38 +3,64 @@ import { oNodeAddress } from '../router/o-node.address.js';
 import { oNodeTransport } from '../router/o-node.transport.js';
 export class ConnectionUtils extends oObject {
     /**
-     * Waits for a peer to appear in the peer store with sufficient protocol information.
-     * Implements retry logic to handle race conditions where peer store is not immediately populated.
+     * Waits for a peer to be identified via the identify protocol.
+     * Uses event-driven approach listening to peer store protocol updates.
      */
-    static async waitForPeerInStore(p2pNode, remotePeerId) {
-        const MAX_RETRIES = 100; // 5 seconds total (100 * 50ms)
-        const RETRY_DELAY_MS = 50;
-        const MIN_PROTOCOLS = 2;
-        for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
+    static async waitForPeerIdentify(p2pNode, remotePeerId, nodeProtocol) {
+        const TIMEOUT_MS = 5000; // 5 seconds timeout
+        // Helper to check if peer has sufficient protocols
+        const checkPeerProtocols = async () => {
             const peers = await p2pNode.peerStore.all();
             const remotePeer = peers.find((peer) => {
                 return peer.id.toString() === remotePeerId.toString();
             });
-            // Check if peer exists and has sufficient protocol information
-            if (remotePeer && remotePeer.protocols.length > MIN_PROTOCOLS) {
-                return remotePeer;
-            }
-            // Wait before next retry
-            if (attempt < MAX_RETRIES - 1) {
-                await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY_MS));
+            if (remotePeer) {
+                const oProtocols = remotePeer.protocols.filter((p) => p.startsWith('/o/') && p.startsWith(nodeProtocol) === false) || [];
+                console.log('Found o-protocols for peer:', oProtocols, 'with node address:', nodeProtocol);
+                if (oProtocols.length > 0) {
+                    return remotePeer;
+                }
             }
+            return null;
+        };
+        // Check if peer already has sufficient protocols
+        const existingPeer = await checkPeerProtocols();
+        if (existingPeer) {
+            return existingPeer;
         }
-        // Timeout exceeded
-        throw new Error(`Timeout waiting for peer ${remotePeerId.toString()} to appear in peer store with sufficient protocols (waited ${MAX_RETRIES * RETRY_DELAY_MS}ms)`);
+        // Wait for peer store protocol update event
+        return new Promise((resolve, reject) => {
+            const timeoutId = setTimeout(() => {
+                // TypeScript doesn't have types for peerStore events, but they exist at runtime
+                p2pNode.removeEventListener('peer:identify', protocolChangeHandler);
+                reject(new Error(`Timeout waiting for peer ${remotePeerId.toString()} to be identified (waited ${TIMEOUT_MS}ms)`));
+            }, TIMEOUT_MS);
+            const protocolChangeHandler = async (evt) => {
+                const { peerId } = evt.detail;
+                console.log('evt.detail:', evt.detail);
+                // Check if this is the peer we're waiting for
+                if (peerId?.toString() === remotePeerId.toString()) {
+                    const peer = await checkPeerProtocols();
+                    if (peer) {
+                        clearTimeout(timeoutId);
+                        // TypeScript doesn't have types for peerStore events, but they exist at runtime
+                        p2pNode.removeEventListener('peer:identify', protocolChangeHandler);
+                        resolve(peer);
+                    }
+                }
+            };
+            // TypeScript doesn't have types for peerStore events, but they exist at runtime
+            p2pNode.addEventListener('peer:identify', protocolChangeHandler);
+        });
     }
     // TODO: improve this logic (poor implementation for now)
     static async addressFromConnection(options) {
         try {
             const { currentNode, connection } = options;
             const p2pNode = currentNode.p2pNode;
-            // Wait for peer to appear in peer store with sufficient protocol information
-            // This handles race conditions where peer store is not immediately populated
-            const remotePeer = await this.waitForPeerInStore(p2pNode, connection.remotePeer);
+            // Wait for peer to be identified via the identify protocol
+            // This uses an event-driven approach to detect when the peer store is updated
+            const remotePeer = await this.waitForPeerIdentify(p2pNode, connection.remotePeer, currentNode.address.protocol);
             // Get origin address for comparison
             const originAddress = currentNode.address?.value;
             if (!originAddress) {
@@ -43,6 +69,7 @@ export class ConnectionUtils extends oObject {
             const oProtocol = remotePeer.protocols.find((p) => p.startsWith('/o/') &&
                 p.includes(currentNode?.address?.protocol) === false);
             if (!oProtocol) {
+                console.log('Remote peer protocols:', remotePeer.protocols);
                 throw new Error('Failed to extract remote address, could not find o-protocol in peer protocols.');
             }
             const address = oNodeAddress.fromProtocol(oProtocol);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.54",
+  "version": "0.7.55",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.29.0",
-    "@olane/o-test": "0.7.54",
+    "@olane/o-test": "0.7.55",
     "@tsconfig/node20": "^20.1.6",
     "@types/jest": "^30.0.0",
     "@types/json5": "^2.2.0",
@@ -60,13 +60,13 @@
     "typescript": "5.4.5"
   },
   "dependencies": {
-    "@olane/o-config": "0.7.54",
-    "@olane/o-core": "0.7.54",
-    "@olane/o-protocol": "0.7.54",
-    "@olane/o-tool": "0.7.54",
+    "@olane/o-config": "0.7.55",
+    "@olane/o-core": "0.7.55",
+    "@olane/o-protocol": "0.7.55",
+    "@olane/o-tool": "0.7.55",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0",
     "json5": "^2.2.3"
   },
-  "gitHead": "8e527a1481c6aeaf0840ea30198500a9baef1e98"
+  "gitHead": "f7d02a1ecfb0d28b7b1009a7c3eb6d0d4863adc2"
 }