@olane/o-node 0.7.54 → 0.7.56

package/dist/src/connection/enums/o-node-message-event.d.ts

@@ -0,0 +1,14 @@
+import { oResponse } from '@olane/o-core';
+import { oStreamRequest } from '../o-stream.request.js';
+export declare enum oNodeMessageEvent {
+    request = "request",
+    response = "response"
+}
+/**
+ * Mapped type for type-safe event listeners
+ */
+export type oNodeMessageEventData = {
+    [oNodeMessageEvent.request]: oStreamRequest;
+    [oNodeMessageEvent.response]: oResponse;
+};
+//# sourceMappingURL=o-node-message-event.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"o-node-message-event.d.ts","sourceRoot":"","sources":["../../../../src/connection/enums/o-node-message-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,SAAS,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,QAAQ,aAAa;CACtB;AAED;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;IAC5C,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC;CACzC,CAAC"}

package/dist/src/connection/enums/o-node-message-event.js

@@ -0,0 +1,5 @@
+export var oNodeMessageEvent;
+(function (oNodeMessageEvent) {
+    oNodeMessageEvent["request"] = "request";
+    oNodeMessageEvent["response"] = "response";
+})(oNodeMessageEvent || (oNodeMessageEvent = {}));

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

@@ -3,10 +3,7 @@ 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-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 './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,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"}
+{"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,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC"}

package/dist/src/connection/index.js

@@ -3,9 +3,6 @@ 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-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 './o-node-stream.manager.js';
 export * from './stream-manager.events.js';

package/dist/src/connection/interfaces/abort-signal.config.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+export interface AbortSignalConfig {
+    abortSignal?: AbortSignal;
+}
+//# sourceMappingURL=abort-signal.config.d.ts.map

package/dist/src/connection/interfaces/abort-signal.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"abort-signal.config.d.ts","sourceRoot":"","sources":["../../../../src/connection/interfaces/abort-signal.config.ts"],"names":[],"mappings":";AAAA,MAAM,WAAW,iBAAiB;IAChC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B"}

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

@@ -3,6 +3,18 @@ import { Libp2p } from '@olane/o-config';
 export interface oNodeConnectionManagerConfig extends oConnectionManagerConfig {
     p2pNode: Libp2p;
     runOnLimitedConnection?: boolean;
-    originAddress?: string;
+    callerAddress?: string;
+    /**
+     * Default timeout in milliseconds for reading response data from a stream.
+     * Can be overridden per connection.
+     * Default: 120000 (2 minutes)
+     */
+    defaultReadTimeoutMs?: number;
+    /**
+     * Default timeout in milliseconds for waiting for stream buffer to drain when backpressure occurs.
+     * Can be overridden per connection.
+     * Default: 30000 (30 seconds)
+     */
+    defaultDrainTimeoutMs?: number;
 }
 //# sourceMappingURL=o-node-connection-manager.config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"o-node-connection-manager.config.d.ts","sourceRoot":"","sources":["../../../../src/connection/interfaces/o-node-connection-manager.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,WAAW,4BAA6B,SAAQ,wBAAwB;IAC5E,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB"}
+{"version":3,"file":"o-node-connection-manager.config.d.ts","sourceRoot":"","sources":["../../../../src/connection/interfaces/o-node-connection-manager.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,WAAW,4BAA6B,SAAQ,wBAAwB;IAC5E,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC"}

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

@@ -1,9 +1,23 @@
+/// <reference types="node" />
 import { Connection } from '@olane/o-config';
 import { oConnectionConfig } from '@olane/o-core';
-import type { StreamReusePolicy } from '../stream-handler.config.js';
+import { oNodeAddress } from '../../router';
 export interface oNodeConnectionConfig extends oConnectionConfig {
-    p2pConnection: Connection;
+    nextHopAddress: oNodeAddress;
+    callerAddress?: oNodeAddress;
+    targetAddress: oNodeAddress;
+    p2pConnection?: Connection;
     runOnLimitedConnection?: boolean;
-    reusePolicy?: StreamReusePolicy;
+    /**
+     * Timeout in milliseconds for waiting for stream buffer to drain when backpressure occurs.
+     * Default: 30000 (30 seconds)
+     */
+    drainTimeoutMs?: number;
+    abortSignal?: AbortSignal;
+    /**
+     * Timeout in milliseconds for reading response data from a stream.
+     * Default: 120000 (2 minutes)
+     */
+    readTimeoutMs?: number;
 }
 //# sourceMappingURL=o-node-connection.config.d.ts.map

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,EAAU,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,WAAW,qBAAsB,SAAQ,iBAAiB;IAC9D,cAAc,EAAE,YAAY,CAAC;IAC7B,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B,aAAa,EAAE,YAAY,CAAC;IAC5B,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB"}

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

@@ -1,16 +1,8 @@
+/// <reference types="node" />
 import { oAddress } from '@olane/o-core';
-import { StreamReusePolicy } from '../stream-handler.config';
-/**
- * Stream type defines the role and usage pattern of a stream:
- * - 'dedicated-reader': Stream exclusively used for reading incoming requests (background reader)
- * - 'request-response': Stream used for outgoing request-response cycles
- * - 'general': Stream with no specific role (default, backward compatible)
- */
-export type StreamType = 'dedicated-reader' | 'request-response' | 'general';
 export interface oNodeStreamConfig {
-    direction: 'inbound' | 'outbound';
-    reusePolicy: StreamReusePolicy;
     remoteAddress: oAddress;
-    streamType?: StreamType;
+    abortSignal?: AbortSignal;
+    limited?: boolean;
 }
 //# sourceMappingURL=o-node-stream.config.d.ts.map

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

@@ -1 +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"}
+{"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,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,QAAQ,CAAC;IACxB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}

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

@@ -1,27 +1,49 @@
-import { Connection } from '@olane/o-config';
-import { oConnection, oRequest, oResponse } from '@olane/o-core';
+/// <reference types="node" />
+import { Connection, Multiaddr } from '@olane/o-config';
+import { oAddress, oConnection, oRequest } 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';
+import { oNodeStreamConfig } from './interfaces/o-node-stream.config.js';
+import { AbortSignalConfig } from './interfaces/abort-signal.config.js';
+import { EventEmitter } from 'events';
+import { oNodeMessageEvent, oNodeMessageEventData } from './enums/o-node-message-event.js';
 export declare class oNodeConnection extends oConnection {
     protected readonly config: oNodeConnectionConfig;
     p2pConnection: Connection;
-    protected reusePolicy: StreamReusePolicy;
-    streamManager: oNodeStreamManager;
+    protected streams: Map<string, oNodeStream>;
+    protected runOnLimitedConnection: boolean;
+    eventEmitter: EventEmitter;
     constructor(config: oNodeConnectionConfig);
+    listenForClose(): void;
+    get isOpen(): boolean;
     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[];
-    transmit(request: oRequest): Promise<oResponse>;
+    get address(): oAddress;
+    get nextHopAddress(): oAddress;
+    get callerAddress(): oAddress | undefined;
+    newStream(config: oNodeStreamConfig): Promise<oNodeStream>;
+    listenForMessages(stream: oNodeStream, options: AbortSignalConfig): Promise<void>;
+    trackStream(stream: oNodeStream, options: AbortSignalConfig): void;
+    protected doSend(request: oRequest, options: AbortSignalConfig): Promise<oNodeStream>;
+    transmit(request: oRequest, options: AbortSignalConfig): Promise<oNodeStream>;
     postTransmit(stream: oNodeStream): Promise<void>;
     abort(error: Error): Promise<void>;
     close(): Promise<void>;
+    /**
+     * Add event listener
+     */
+    on<K extends oNodeMessageEvent>(event: K | string, listener: (data: oNodeMessageEventData[K]) => void): void;
+    /**
+     * Remove event listener
+     */
+    off<K extends oNodeMessageEvent>(event: K | string, listener: (data: oNodeMessageEventData[K]) => void): void;
+    /**
+     * Emit event
+     */
+    private emit;
 }
 //# 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,EAAU,SAAS,EAAU,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAEL,QAAQ,EACR,WAAW,EAGX,QAAQ,EAET,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAGjF,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AAYzC,qBAAa,eAAgB,SAAQ,WAAW;IAMlC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB;IALrD,aAAa,EAAE,UAAU,CAAC;IACjC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAkC;IAC7E,SAAS,CAAC,sBAAsB,EAAE,OAAO,CAAC;IAC1C,YAAY,EAAE,YAAY,CAAsB;gBAEjB,MAAM,EAAE,qBAAqB;IAQ5D,cAAc;IAMd,IAAI,MAAM,YAET;IAED,IAAI,YAAY,qCAEf;IAED,IAAI,UAAU,cAEb;IAED;;OAEG;IACH,IAAI,gBAAgB,IAAI,qBAAqB,CAE5C;IAED,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED,IAAI,cAAc,IAAI,QAAQ,CAK7B;IAED,IAAI,aAAa,IAAI,QAAQ,GAAG,SAAS,CAMxC;IAEK,SAAS,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,WAAW,CAAC;IA2B1D,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB;IAyBvE,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB;cAO3C,MAAM,CACpB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,WAAW,CAAC;IAsBjB,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,WAAW,CAAC;IAoBjB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhD,KAAK,CAAC,KAAK,EAAE,KAAK;IAMlB,KAAK;IAOX;;OAEG;IACH,EAAE,CAAC,CAAC,SAAS,iBAAiB,EAC5B,KAAK,EAAE,CAAC,GAAG,MAAM,EACjB,QAAQ,EAAE,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC,CAAC,KAAK,IAAI,GACjD,IAAI;IAIP;;OAEG;IACH,GAAG,CAAC,CAAC,SAAS,iBAAiB,EAC7B,KAAK,EAAE,CAAC,GAAG,MAAM,EACjB,QAAQ,EAAE,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC,CAAC,KAAK,IAAI,GACjD,IAAI;IAIP;;OAEG;IACH,OAAO,CAAC,IAAI;CAMb"}

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

@@ -1,16 +1,25 @@
 import { oConnection, oError, oErrorCodes, } from '@olane/o-core';
-import { oNodeStreamManager } from './o-node-stream.manager.js';
+import { oNodeStream } from './o-node-stream.js';
+import { EventEmitter } from 'events';
+import { oNodeMessageEvent, } from './enums/o-node-message-event.js';
 export class oNodeConnection extends oConnection {
     constructor(config) {
         super(config);
         this.config = config;
+        this.streams = new Map();
+        this.eventEmitter = new EventEmitter();
         this.p2pConnection = config.p2pConnection;
-        this.reusePolicy = config.reusePolicy ?? 'none';
-        // Initialize oNodeStreamManager (stream lifecycle and protocol management)
-        this.streamManager = new oNodeStreamManager({
-            p2pConnection: this.p2pConnection,
+        this.runOnLimitedConnection = config.runOnLimitedConnection ?? false;
+        this.listenForClose();
+    }
+    listenForClose() {
+        this.p2pConnection.addEventListener('close', () => {
+            this.close();
         });
     }
+    get isOpen() {
+        return this.p2pConnection.status === 'open';
+    }
     get remotePeerId() {
         return this.p2pConnection.remotePeer;
     }
@@ -23,61 +32,92 @@ export class oNodeConnection extends oConnection {
     get connectionConfig() {
         return this.config;
     }
-    supportsAddress(address) {
-        return address.libp2pTransports.some((transport) => {
-            return transport.toString() === this.remoteAddr.toString();
+    get address() {
+        return this.config.targetAddress;
+    }
+    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 newStream(config) {
+        const protocol = config.remoteAddress.protocol;
+        this.logger.debug('Creating new stream', {
+            protocol,
+            currentStreamCount: this.streams.size,
+        });
+        // Create stream from libp2p connection
+        const stream = await this.p2pConnection.newStream(protocol, {
+            signal: config.abortSignal,
+            maxOutboundStreams: 1000,
+            runOnLimitedConnection: this.runOnLimitedConnection,
         });
+        // Wrap in oNodeStream with metadata
+        const wrappedStream = new oNodeStream(stream, config);
+        this.logger.debug('Stream created', {
+            streamId: stream.id,
+            protocol,
+            totalStreams: this.streams.size,
+        });
+        return wrappedStream;
+    }
+    // bubble up the messages to the request handler
+    async listenForMessages(stream, options) {
+        try {
+            stream.on(oNodeMessageEvent.request, (data) => {
+                this.emit(oNodeMessageEvent.request, data);
+            });
+            stream.on(oNodeMessageEvent.response, (data) => {
+                this.emit(oNodeMessageEvent.response, data);
+            });
+            stream.p2pStream.addEventListener('close', () => {
+                if (this.streams.has(stream.id)) {
+                    this.streams.delete(stream.id);
+                }
+            });
+            await stream.listen(options);
+        }
+        catch (err) {
+            this.logger.warn('Stream errored out when listening for key messages:', err?.message);
+        }
+    }
+    trackStream(stream, options) {
+        this.streams.set(stream.id, stream);
+        this.logger.debug('Stream count: ' + this.streams.size);
+        // persistent listener
+        this.listenForMessages(stream, options);
     }
-    get streams() {
-        return this.streamManager.getAllStreams();
+    async doSend(request, options) {
+        try {
+            // create a new stream and send the payload
+            const wrappedStream = await this.newStream({
+                remoteAddress: this.nextHopAddress,
+                limited: this.runOnLimitedConnection,
+                ...options,
+            });
+            this.trackStream(wrappedStream, options);
+            await wrappedStream.send(request, options);
+            return wrappedStream;
+        }
+        catch (err) {
+            this.logger.error('Failed to send request over stream.', err);
+            throw new oError(oErrorCodes.SEND_FAILED, 'Failed to send request over stream.', { request: request.toJSON() });
+        }
     }
-    async transmit(request) {
+    async transmit(request, options) {
         try {
-            // Build protocol string
-            const protocol = this.nextHopAddress.protocol +
-                (this.reusePolicy === 'reuse' ? '/reuse' : '');
             this.logger.debug('Transmitting request on limited connection?', this.config.runOnLimitedConnection);
-            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 ?? false,
-            };
-            // 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.streamManager.sendLengthPrefixed(stream, data, streamConfig);
-            // Determine which stream to wait for response on
-            // If _streamId is specified, use that stream (for limited connections with persistent writer stream)
-            let responseStream = stream;
-            if (request.params._streamId) {
-                const specifiedStream = this.streamManager.getStreamById(request.params._streamId);
-                if (specifiedStream) {
-                    responseStream = specifiedStream;
-                    this.logger.debug('Using specified stream for response', {
-                        requestStreamId: stream.id,
-                        responseStreamId: specifiedStream.id,
-                    });
-                }
-                else {
-                    this.logger.warn('Specified response stream not found, using request stream', {
-                        streamId: request.params._streamId,
-                    });
-                }
-            }
-            // Handle response using StreamManager
-            // Pass request ID to enable proper response correlation on shared streams
-            const response = await this.streamManager.handleOutgoingStream(responseStream, this.emitter, streamConfig, request.id);
+            const stream = await this.doSend(request, options);
             // Handle cleanup of the stream
-            await this.postTransmit(wrappedStream);
-            return response;
+            await this.postTransmit(stream);
+            return stream;
         }
         catch (error) {
             if (error?.name === 'UnsupportedProtocolError') {
@@ -87,8 +127,7 @@ export class oNodeConnection extends oConnection {
         }
     }
     async postTransmit(stream) {
-        // Always cleanup streams (no reuse at base layer)
-        await this.streamManager.releaseStream(stream.p2pStream.id);
+        // after transmit, let's just leave this connection open for now
     }
     async abort(error) {
         this.logger.debug('Aborting connection');
@@ -97,9 +136,25 @@ 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');
     }
+    /**
+     * Add event listener
+     */
+    on(event, listener) {
+        this.eventEmitter.on(event, listener);
+    }
+    /**
+     * Remove event listener
+     */
+    off(event, listener) {
+        this.eventEmitter.off(event, listener);
+    }
+    /**
+     * Emit event
+     */
+    emit(event, data) {
+        this.eventEmitter.emit(event, data);
+    }
 }

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

@@ -1,100 +1,55 @@
-import { oAddress, oConnectionConfig, oConnectionManager } from '@olane/o-core';
-import { Libp2p, Connection } from '@olane/o-config';
+/// <reference types="node" />
+import { oAddress, oConnectionManager } from '@olane/o-core';
+import { Libp2p, Connection, Stream } from '@olane/o-config';
 import { oNodeConnectionManagerConfig } from './interfaces/o-node-connection-manager.config.js';
+import { oNodeAddress } from '../router/o-node.address.js';
 import { oNodeConnection } from './o-node-connection.js';
+import { EventEmitter } from 'events';
+import { oNodeConnectionConfig } from './interfaces/o-node-connection.config.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>>;
+    protected eventEmitter: EventEmitter;
     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.
      */
     protected getOrCreateP2pConnection(nextHopAddress: oAddress, addressKey: string): Promise<Connection>;
     protected performDial(nextHopAddress: oAddress, addressKey: string): Promise<Connection>;
-    answer(config: oConnectionConfig & {
-        p2pConnection: Connection;
-        reuse?: boolean;
-    }): Promise<oNodeConnection>;
+    createConnection(config: oNodeConnectionConfig): Promise<oNodeConnection>;
+    answer(config: oNodeConnectionConfig, stream: Stream): Promise<oNodeConnection>;
     /**
      * 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;
+    connect(config: oNodeConnectionConfig): Promise<oNodeConnection>;
+    getCachedConnectionFromAddress(address: oNodeAddress): oNodeConnection | null;
+    get connectionCount(): 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,EAAqB,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAGjF;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,kBAAkB;IAShD,QAAQ,CAAC,MAAM,EAAE,4BAA4B;IARzD,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;IAC9E,SAAS,CAAC,YAAY,EAAE,YAAY,CAAsB;gBAErC,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,gBAAgB,CACpB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,eAAe,CAAC;IAIrB,MAAM,CACV,MAAM,EAAE,qBAAqB,EAC7B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,CAAC;IAgE3B;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;IAyDtE,8BAA8B,CAC5B,OAAO,EAAE,YAAY,GACpB,eAAe,GAAG,IAAI;IAezB,IAAI,eAAe,WAElB;CACF"}