@olane/o-node 0.7.51 → 0.7.53

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

@@ -2,10 +2,11 @@ export * from './o-node-connection.js';
 export * from './o-node-connection.manager.js';
 export * from './interfaces/o-node-connection.config.js';
 export * from './interfaces/o-node-connection-manager.config.js';
-export * from './interfaces/o-node-connection-stream.config.js';
-export * from './interfaces/stream-pool-manager.config.js';
-export * from './o-node-connection-stream.js';
+export * from './interfaces/o-node-stream.config.js';
+export * from './interfaces/stream-manager.config.js';
+export * from './interfaces/stream-init-message.js';
+export * from './o-node-stream.js';
 export * from './stream-handler.config.js';
-export * from './stream-pool-manager.js';
-export * from './stream-pool-manager.events.js';
+export * from './o-node-stream.manager.js';
+export * from './stream-manager.events.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connection/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0CAA0C,CAAC;AACzD,cAAc,kDAAkD,CAAC;AACjE,cAAc,iDAAiD,CAAC;AAChE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/connection/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0CAA0C,CAAC;AACzD,cAAc,kDAAkD,CAAC;AACjE,cAAc,sCAAsC,CAAC;AACrD,cAAc,uCAAuC,CAAC;AACtD,cAAc,qCAAqC,CAAC;AACpD,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC"}

package/dist/src/connection/index.js

@@ -2,9 +2,10 @@ export * from './o-node-connection.js';
 export * from './o-node-connection.manager.js';
 export * from './interfaces/o-node-connection.config.js';
 export * from './interfaces/o-node-connection-manager.config.js';
-export * from './interfaces/o-node-connection-stream.config.js';
-export * from './interfaces/stream-pool-manager.config.js';
-export * from './o-node-connection-stream.js';
+export * from './interfaces/o-node-stream.config.js';
+export * from './interfaces/stream-manager.config.js';
+export * from './interfaces/stream-init-message.js';
+export * from './o-node-stream.js';
 export * from './stream-handler.config.js';
-export * from './stream-pool-manager.js';
-export * from './stream-pool-manager.events.js';
+export * from './o-node-stream.manager.js';
+export * from './stream-manager.events.js';

package/dist/src/connection/interfaces/{o-node-connection-stream.config.d.ts → o-node-stream.config.d.ts}

@@ -7,10 +7,10 @@ import { StreamReusePolicy } from '../stream-handler.config';
  * - 'general': Stream with no specific role (default, backward compatible)
  */
 export type StreamType = 'dedicated-reader' | 'request-response' | 'general';
-export interface oNodeConnectionStreamConfig {
+export interface oNodeStreamConfig {
     direction: 'inbound' | 'outbound';
     reusePolicy: StreamReusePolicy;
     remoteAddress: oAddress;
     streamType?: StreamType;
 }
-//# sourceMappingURL=o-node-connection-stream.config.d.ts.map
+//# sourceMappingURL=o-node-stream.config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"o-node-stream.config.d.ts","sourceRoot":"","sources":["../../../../src/connection/interfaces/o-node-stream.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;;GAKG;AACH,MAAM,MAAM,UAAU,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,SAAS,CAAC;AAE7E,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,SAAS,GAAG,UAAU,CAAC;IAClC,WAAW,EAAE,iBAAiB,CAAC;IAC/B,aAAa,EAAE,QAAQ,CAAC;IACxB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB"}

package/dist/src/connection/interfaces/stream-init-message.d.ts

@@ -0,0 +1,29 @@
+/**
+ * Message sent by limited connection clients to identify their dedicated reader stream
+ * This allows the receiver to identify which stream to use for sending requests back to the caller
+ */
+export interface StreamInitMessage {
+    /**
+     * Message type identifier
+     */
+    type: 'stream-init';
+    /**
+     * Role of this stream
+     * - 'reader': Dedicated reader stream for receiving requests
+     * - 'standard': Standard request-response stream
+     */
+    role: 'reader' | 'standard';
+    /**
+     * Timestamp when the stream was created
+     */
+    timestamp: number;
+    /**
+     * Optional connection identifier for correlation
+     */
+    connectionId?: string;
+}
+/**
+ * Type guard to check if a message is a StreamInitMessage
+ */
+export declare function isStreamInitMessage(message: any): message is StreamInitMessage;
+//# sourceMappingURL=stream-init-message.d.ts.map

package/dist/src/connection/interfaces/stream-init-message.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-init-message.d.ts","sourceRoot":"","sources":["../../../../src/connection/interfaces/stream-init-message.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,IAAI,EAAE,aAAa,CAAC;IAEpB;;;;OAIG;IACH,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAC;IAE5B;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,IAAI,iBAAiB,CAM9E"}

package/dist/src/connection/interfaces/stream-init-message.js

@@ -0,0 +1,8 @@
+/**
+ * Type guard to check if a message is a StreamInitMessage
+ */
+export function isStreamInitMessage(message) {
+    return (message?.type === 'stream-init' &&
+        (message.role === 'reader' || message.role === 'standard') &&
+        typeof message.timestamp === 'number');
+}

package/dist/src/connection/interfaces/stream-manager.config.d.ts

@@ -0,0 +1,8 @@
+import type { Connection } from '@libp2p/interface';
+export interface StreamManagerConfig {
+    /**
+     * The libp2p connection this manager handles streams for
+     */
+    p2pConnection: Connection;
+}
+//# sourceMappingURL=stream-manager.config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"stream-manager.config.d.ts","sourceRoot":"","sources":["../../../../src/connection/interfaces/stream-manager.config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,aAAa,EAAE,UAAU,CAAC;CAC3B"}

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

@@ -1,15 +1,15 @@
 import { Connection } from '@olane/o-config';
 import { oConnection, oRequest, oResponse } from '@olane/o-core';
 import { oNodeConnectionConfig } from './interfaces/o-node-connection.config.js';
-import { StreamHandler } from './stream-handler.js';
 import type { StreamReusePolicy } from './stream-handler.config.js';
 import { oNodeAddress } from '../router/o-node.address.js';
-import { oNodeConnectionStream } from './o-node-connection-stream.js';
+import { oNodeStream } from './o-node-stream.js';
+import { oNodeStreamManager } from './o-node-stream.manager.js';
 export declare class oNodeConnection extends oConnection {
     protected readonly config: oNodeConnectionConfig;
     p2pConnection: Connection;
-    protected streamHandler: StreamHandler;
     protected reusePolicy: StreamReusePolicy;
+    streamManager: oNodeStreamManager;
     constructor(config: oNodeConnectionConfig);
     get remotePeerId(): import("@olane/o-config").PeerId;
     get remoteAddr(): import("@olane/o-config").Multiaddr;
@@ -18,11 +18,9 @@ export declare class oNodeConnection extends oConnection {
      */
     get connectionConfig(): oNodeConnectionConfig;
     supportsAddress(address: oNodeAddress): boolean;
-    getOrCreateStream(): Promise<oNodeConnectionStream>;
-    createStream(): Promise<oNodeConnectionStream>;
-    get streams(): oNodeConnectionStream[];
+    get streams(): oNodeStream[];
     transmit(request: oRequest): Promise<oResponse>;
-    postTransmit(stream: oNodeConnectionStream): Promise<void>;
+    postTransmit(stream: oNodeStream): Promise<void>;
     abort(error: Error): Promise<void>;
     close(): Promise<void>;
 }

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,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAEV,iBAAiB,EAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAGtE,qBAAa,eAAgB,SAAQ,WAAW;IAKlC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB;IAJrD,aAAa,EAAE,UAAU,CAAC;IACjC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,WAAW,EAAE,iBAAiB,CAAC;gBAEV,MAAM,EAAE,qBAAqB;IAO5D,IAAI,YAAY,qCAEf;IAED,IAAI,UAAU,wCAEb;IAED;;OAEG;IACH,IAAI,gBAAgB,IAAI,qBAAqB,CAE5C;IAED,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAMzC,iBAAiB,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAiBnD,YAAY,IAAI,OAAO,CAAC,qBAAqB,CAAC;IA6BpD,IAAI,OAAO,IAAI,qBAAqB,EAAE,CAcrC;IAEK,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IA6C/C,YAAY,CAAC,MAAM,EAAE,qBAAqB;IAI1C,KAAK,CAAC,KAAK,EAAE,KAAK;IAMlB,KAAK;CAKZ"}
+{"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;IA2D/C,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhD,KAAK,CAAC,KAAK,EAAE,KAAK;IAMlB,KAAK;CASZ"}

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

@@ -1,13 +1,15 @@
 import { oConnection, oError, oErrorCodes, } from '@olane/o-core';
-import { StreamHandler } from './stream-handler.js';
-import { oNodeConnectionStream } from './o-node-connection-stream.js';
+import { oNodeStreamManager } from './o-node-stream.manager.js';
 export class oNodeConnection extends oConnection {
     constructor(config) {
         super(config);
         this.config = config;
         this.p2pConnection = config.p2pConnection;
-        this.streamHandler = new StreamHandler(this.logger);
         this.reusePolicy = config.reusePolicy ?? 'none';
+        // Initialize oNodeStreamManager (stream lifecycle and protocol management)
+        this.streamManager = new oNodeStreamManager({
+            p2pConnection: this.p2pConnection,
+        });
     }
     get remotePeerId() {
         return this.p2pConnection.remotePeer;
@@ -26,71 +28,36 @@ export class oNodeConnection extends oConnection {
             return transport.toString() === this.remoteAddr.toString();
         });
     }
-    async getOrCreateStream() {
-        if (this.reusePolicy === 'reuse') {
-            this.logger.debug('Reusing stream...');
-            // search for streams that allow re-use
-            if (this.streams.length > 0) {
-                this.logger.debug('Returning reuse stream: ', this.streams[0].p2pStream.protocol);
-                // search for streams that allow re-use
-                return this.streams[0];
-            }
-        }
-        return this.createStream();
-    }
-    async createStream() {
-        const protocol = this.nextHopAddress.protocol +
-            (this.reusePolicy === 'reuse' ? '/reuse' : ''); // connect specifically to the reuse protocol version if desired
-        this.logger.debug('Creating stream for protocol:', protocol);
-        const stream = await this.p2pConnection.newStream(protocol, {
-            signal: this.abortSignal,
-            maxOutboundStreams: process.env.MAX_OUTBOUND_STREAMS
-                ? parseInt(process.env.MAX_OUTBOUND_STREAMS)
-                : 1000,
-            runOnLimitedConnection: this.config.runOnLimitedConnection ?? true,
-        });
-        const managedStream = new oNodeConnectionStream(stream, {
-            direction: stream.direction,
-            reusePolicy: this.config.reusePolicy ?? 'none', // default to no re-use stream
-            remoteAddress: this.nextHopAddress,
-        });
-        // print the num streams
-        const numStreams = this.streams.map((s) => s.isValid).length;
-        this.logger.debug(`Connection spawned new stream: ${stream.id}. Connection now has ${numStreams} total streams open`);
-        return managedStream;
-    }
     get streams() {
-        return (this.p2pConnection?.streams
-            ?.filter((s) => {
-            return s.protocol.includes('/o/');
-        })
-            .map((s) => {
-            return new oNodeConnectionStream(s, {
-                direction: s.direction,
-                reusePolicy: this.config.reusePolicy ?? 'none', // default to no re-use stream
-                remoteAddress: this.nextHopAddress,
-            });
-        }) || []);
+        return this.streamManager.getAllStreams();
     }
     async transmit(request) {
         try {
-            const stream = await this.getOrCreateStream();
-            // ensure stream is valid
-            stream.validate();
+            // Build protocol string
+            const protocol = this.nextHopAddress.protocol +
+                (this.reusePolicy === 'reuse' ? '/reuse' : '');
             const streamConfig = {
                 signal: this.abortSignal,
                 drainTimeoutMs: this.config.drainTimeoutMs,
                 reusePolicy: this.reusePolicy,
+                maxOutboundStreams: process.env.MAX_OUTBOUND_STREAMS
+                    ? parseInt(process.env.MAX_OUTBOUND_STREAMS)
+                    : 1000,
+                runOnLimitedConnection: this.config.runOnLimitedConnection ?? true,
             };
+            // Get stream from StreamManager
+            const wrappedStream = await this.streamManager.getOrCreateStream(protocol, this.nextHopAddress, streamConfig);
+            // Ensure stream is valid
+            wrappedStream.validate();
+            const stream = wrappedStream.p2pStream;
             // Send the request with backpressure handling
             const data = new TextEncoder().encode(request.toString());
-            await this.streamHandler.sendLengthPrefixed(stream.p2pStream, data, streamConfig);
-            // Handle response using StreamHandler
-            // Pass request handler if configured to enable bidirectional stream processing
+            await this.streamManager.sendLengthPrefixed(stream, data, streamConfig);
+            // Handle response using StreamManager
             // Pass request ID to enable proper response correlation on shared streams
-            const response = await this.streamHandler.handleOutgoingStream(stream.p2pStream, this.emitter, streamConfig, this.config.requestHandler, request.id);
+            const response = await this.streamManager.handleOutgoingStream(stream, this.emitter, streamConfig, request.id);
             // Handle cleanup of the stream
-            await this.postTransmit(stream);
+            await this.postTransmit(wrappedStream);
             return response;
         }
         catch (error) {
@@ -101,7 +68,8 @@ export class oNodeConnection extends oConnection {
         }
     }
     async postTransmit(stream) {
-        await stream.close();
+        // Always cleanup streams (no reuse at base layer)
+        await this.streamManager.releaseStream(stream.p2pStream.id);
     }
     async abort(error) {
         this.logger.debug('Aborting connection');
@@ -110,6 +78,8 @@ export class oNodeConnection extends oConnection {
     }
     async close() {
         this.logger.debug('Closing connection');
+        // Close stream manager (handles all stream cleanup)
+        await this.streamManager.close();
         await this.p2pConnection.close();
         this.logger.debug('Connection closed');
     }

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

@@ -42,6 +42,13 @@ export declare class oNodeConnectionManager extends oConnectionManager {
      * @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;
     /**
      * 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.

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;;;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;IAqD3B;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAyDlE;;;;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,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"}

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

@@ -104,6 +104,22 @@ export class oNodeConnectionManager extends oConnectionManager {
         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;
+    }
     /**
      * 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.
@@ -155,9 +171,13 @@ export class oNodeConnectionManager extends oConnectionManager {
             this.logger.error('Failed to generate an address key for address:', nextHopAddress);
             throw new Error(`Unable to extract address key from address: ${nextHopAddress.toString()}`);
         }
-        // Check if we already have a cached connection for this address
-        const existingConnection = this.getValidConnection(addressKey);
-        if (existingConnection) {
+        // 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);
             return existingConnection;
         }
@@ -171,7 +191,6 @@ export class oNodeConnectionManager extends oConnectionManager {
             isStream: config.isStream ?? false,
             abortSignal: config.abortSignal,
             runOnLimitedConnection: this.config.runOnLimitedConnection ?? false,
-            requestHandler: config.requestHandler ?? undefined,
             reusePolicy: reuse ? 'reuse' : 'none',
         });
         // Cache the new connection
@@ -211,7 +230,6 @@ export class oNodeConnectionManager extends oConnectionManager {
             isStream: config.isStream ?? false,
             abortSignal: config.abortSignal,
             runOnLimitedConnection: this.config.runOnLimitedConnection ?? false,
-            requestHandler: config.requestHandler ?? undefined,
         });
         // Cache the new connection
         this.cacheConnection(connection, addressKey);

package/dist/src/connection/{o-node-connection-stream.d.ts → o-node-stream.d.ts}

@@ -1,8 +1,8 @@
 import type { Stream } from '@libp2p/interface';
 import { oObject } from '@olane/o-core';
-import { oNodeConnectionStreamConfig } from './interfaces/o-node-connection-stream.config.js';
+import { oNodeStreamConfig } from './interfaces/o-node-stream.config.js';
 /**
- * oNodeConnectionStream wraps a libp2p Stream with caller/receiver address metadata
+ * oNodeStream wraps a libp2p Stream with caller/receiver address metadata
  * to enable proper stream reuse based on address pairs rather than protocol only.
  *
  * Key features:
@@ -10,11 +10,11 @@ import { oNodeConnectionStreamConfig } from './interfaces/o-node-connection-stre
  * - Automatic reusability checking
  * - Idle time tracking for cleanup
  */
-export declare class oNodeConnectionStream extends oObject {
+export declare class oNodeStream extends oObject {
     readonly p2pStream: Stream;
-    readonly config: oNodeConnectionStreamConfig;
+    readonly config: oNodeStreamConfig;
     readonly createdAt: number;
-    constructor(p2pStream: Stream, config: oNodeConnectionStreamConfig);
+    constructor(p2pStream: Stream, config: oNodeStreamConfig);
     validate(): void;
     /**
      * Checks if the stream is in a valid state:
@@ -43,4 +43,4 @@ export declare class oNodeConnectionStream extends oObject {
     get isRequestResponse(): boolean;
     close(): Promise<void>;
 }
-//# sourceMappingURL=o-node-connection-stream.d.ts.map
+//# sourceMappingURL=o-node-stream.d.ts.map

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

@@ -0,0 +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"}

package/dist/src/connection/{o-node-connection-stream.js → o-node-stream.js}

@@ -1,6 +1,6 @@
 import { oError, oErrorCodes, oObject } from '@olane/o-core';
 /**
- * oNodeConnectionStream wraps a libp2p Stream with caller/receiver address metadata
+ * oNodeStream wraps a libp2p Stream with caller/receiver address metadata
  * to enable proper stream reuse based on address pairs rather than protocol only.
  *
  * Key features:
@@ -8,7 +8,7 @@ import { oError, oErrorCodes, oObject } from '@olane/o-core';
  * - Automatic reusability checking
  * - Idle time tracking for cleanup
  */
-export class oNodeConnectionStream extends oObject {
+export class oNodeStream extends oObject {
     constructor(p2pStream, config) {
         super();
         this.p2pStream = p2pStream;

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

@@ -0,0 +1,181 @@
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+import type { Connection, Stream } from '@libp2p/interface';
+import { oObject, oResponse } from '@olane/o-core';
+import type { oRouterRequest, oConnection } from '@olane/o-core';
+import { oNodeStream } from './o-node-stream.js';
+import { StreamManagerConfig } from './interfaces/stream-manager.config.js';
+import type { StreamHandlerConfig } from './stream-handler.config.js';
+import { StreamManagerEvent, StreamManagerEventData } from './stream-manager.events.js';
+import { StreamInitMessage } from './interfaces/stream-init-message.js';
+/**
+ * oNodeStreamManager handles the lifecycle and tracking of streams for a single connection.
+ * Features:
+ * - Tracks all streams by ID
+ * - Creates new streams on demand
+ * - Manages stream lifecycle (cleanup after use)
+ * - Provides events for monitoring
+ * - No reuse at base layer (extensible in subclasses)
+ */
+export declare class oNodeStreamManager extends oObject {
+    readonly config: StreamManagerConfig;
+    private streams;
+    protected eventEmitter: EventEmitter;
+    protected isInitialized: boolean;
+    private p2pConnection;
+    private activeStreamHandlers;
+    protected callerReaderStream?: Stream;
+    constructor(config: StreamManagerConfig);
+    /**
+     * Initialize the stream manager
+     */
+    initialize(): Promise<void>;
+    /**
+     * Gets or creates a stream for the connection
+     * Always creates a new stream (no reuse at base layer)
+     *
+     * For limited connections (where caller has identified a reader stream):
+     * - If callerReaderStream exists, wrap and return it for sending requests
+     * - Otherwise, create new stream as normal
+     *
+     * @param protocol - The protocol string for the stream
+     * @param remoteAddress - The remote address for the stream
+     * @param config - Stream handler configuration
+     * @returns Wrapped stream
+     */
+    getOrCreateStream(protocol: string, remoteAddress: any, config?: StreamHandlerConfig): Promise<oNodeStream>;
+    /**
+     * Creates a new stream from the connection
+     *
+     * @param protocol - The protocol string for the stream
+     * @param remoteAddress - The remote address for the stream
+     * @param config - Stream handler configuration
+     * @returns Wrapped stream
+     */
+    createStream(protocol: string, remoteAddress: any, config?: StreamHandlerConfig): Promise<oNodeStream>;
+    /**
+     * Releases and cleans up a stream
+     *
+     * @param streamId - The ID of the stream to release
+     */
+    releaseStream(streamId: string): Promise<void>;
+    /**
+     * Gets all tracked streams
+     *
+     * @returns Array of wrapped streams
+     */
+    getAllStreams(): oNodeStream[];
+    /**
+     * Emits an async event and waits for the first listener to return a result
+     * This enables event-based request handling with async responses
+     */
+    private emitAsync;
+    /**
+     * Detects if a decoded message is a request
+     * Requests have a 'method' field and no 'result' field
+     */
+    isRequest(message: any): boolean;
+    /**
+     * Detects if a decoded message is a response
+     * Responses have a 'result' field and no 'method' field
+     */
+    isResponse(message: any): boolean;
+    /**
+     * Detects if a decoded message is a stream initialization message
+     * Uses the imported type guard from stream-init-message.ts
+     */
+    isStreamInit(message: any): message is StreamInitMessage;
+    /**
+     * Handles a stream initialization message
+     * Stores reference to caller's reader stream for bidirectional communication
+     *
+     * @param message - The decoded stream init message
+     * @param stream - The stream that sent the message
+     */
+    protected handleStreamInitMessage(message: StreamInitMessage, stream: Stream): void;
+    /**
+     * Extracts and parses JSON from various formats including:
+     * - Already parsed objects
+     * - Plain JSON
+     * - Markdown code blocks (```json ... ``` or ``` ... ```)
+     * - Mixed content with explanatory text
+     * - JSON5 format (trailing commas, comments, unquoted keys, etc.)
+     *
+     * @param decoded - The decoded string that may contain JSON, or an already parsed object
+     * @returns Parsed JSON object
+     * @throws Error if JSON parsing fails even with JSON5 fallback
+     */
+    private extractAndParseJSON;
+    /**
+     * Sends data through a stream using length-prefixed encoding (libp2p v3 best practice)
+     * Each message is automatically prefixed with a varint indicating the message length
+     * This ensures proper message boundaries and eliminates concatenation issues
+     *
+     * @param stream - The stream to send data through
+     * @param data - The data to send
+     * @param config - Configuration for timeout and other options
+     */
+    sendLengthPrefixed(stream: Stream, data: Uint8Array, config?: StreamHandlerConfig): Promise<void>;
+    /**
+     * Tracks an active stream handler
+     */
+    private trackStreamHandler;
+    /**
+     * Untracks a stream handler
+     */
+    private untrackStreamHandler;
+    /**
+     * Handles an incoming stream on the server side using length-prefixed protocol
+     * Uses async read loops instead of event listeners (libp2p v3 best practice)
+     * Processes complete messages with proper boundaries
+     *
+     * @param stream - The incoming stream
+     * @param connection - The connection the stream belongs to
+     */
+    handleIncomingStream(stream: Stream, connection: Connection): Promise<void>;
+    /**
+     * Handles a request message by emitting an event and sending response
+     *
+     * @param message - The decoded request message
+     * @param stream - The stream to send the response on
+     * @param connection - The connection the stream belongs to
+     */
+    private handleRequestMessage;
+    /**
+     * Handles an outgoing stream on the client side using length-prefixed protocol
+     * Uses async read loops to process responses with proper message boundaries
+     *
+     * @param stream - The outgoing stream
+     * @param emitter - Event emitter for chunk events
+     * @param config - Configuration including abort signal
+     * @param requestId - Optional request ID to filter responses (for stream reuse scenarios)
+     * @returns Promise that resolves with the final response
+     */
+    handleOutgoingStream(stream: Stream, emitter: EventEmitter, config?: StreamHandlerConfig, requestId?: string | number): Promise<oResponse>;
+    /**
+     * Forwards a request to the next hop and relays response chunks back
+     * This implements the middleware/proxy pattern for intermediate nodes
+     *
+     * @param request - The router request to forward
+     * @param incomingStream - The stream to send responses back on
+     * @param dialFn - Function to dial the next hop connection
+     */
+    forwardRequest(request: oRouterRequest, incomingStream: Stream, dialFn: (address: string) => Promise<oConnection>): Promise<void>;
+    /**
+     * Close the stream manager and cleanup resources
+     */
+    close(): Promise<void>;
+    /**
+     * Add event listener
+     */
+    on<K extends StreamManagerEvent>(event: K | string, listener: (data: StreamManagerEventData[K]) => void): void;
+    /**
+     * Remove event listener
+     */
+    off<K extends StreamManagerEvent>(event: K | string, listener: (data: StreamManagerEventData[K]) => void): void;
+    /**
+     * Emit event
+     */
+    private emit;
+}
+//# sourceMappingURL=o-node-stream.manager.d.ts.map

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

@@ -0,0 +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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"}