@olane/o-node 0.7.55 → 0.7.57

package/dist/src/lib/o-node-request-manager.js

@@ -0,0 +1,173 @@
+import { CoreUtils, oError, oErrorCodes, oRequestManager, ResponseBuilder, } from '@olane/o-core';
+import { oNodeAddress } from '../router/o-node.address.js';
+import { oNodeMessageEvent, } from '../connection/enums/o-node-message-event.js';
+import { EventEmitter } from 'events';
+import { v4 } from 'uuid';
+export class oNodeRequestManager extends oRequestManager {
+    constructor(config) {
+        super();
+        this.config = config;
+        this.eventEmitter = new EventEmitter();
+        this.router = config.router;
+        this.connectionManager = config.connectionManager;
+    }
+    async translateAddress(address, options, nodeRef) {
+        if (!nodeRef) {
+            throw new Error('Failed to translate address due to invalid node reference');
+        }
+        const { nextHopAddress, targetAddress } = options?.noRouting
+            ? { nextHopAddress: address, targetAddress: address }
+            : await this.router.translate(address, nodeRef);
+        return {
+            nextHopAddress: nextHopAddress,
+            targetAddress: targetAddress,
+        };
+    }
+    async connectToNode(nextHopAddress, options) {
+        if (!this.connectionManager) {
+            this.logger.error('Connection manager not initialized');
+            throw new Error('Node is not ready to connect to other nodes');
+        }
+        const connection = await this.connectionManager
+            .connect({
+            nextHopAddress: nextHopAddress,
+            ...options,
+        })
+            .catch((error) => {
+            // TODO: we need to handle this better and document
+            if (error.message === 'Can not dial self') {
+                this.logger.error('Make sure you are entering the network not directly through the leader node.');
+            }
+            throw error;
+        });
+        if (!connection) {
+            throw new Error('Connection failed');
+        }
+        return connection;
+    }
+    async send(address, data, options, nodeRef) {
+        if (!address.validate()) {
+            throw new Error('Invalid address');
+        }
+        this.logger.debug('Using address: ', address.toString());
+        // check for static match
+        // TODO
+        // if (address.toStaticAddress().equals(this.config.callerAddress.toStaticAddress())) {
+        //   return this.useSelf(data);
+        // }
+        // if no routing is requested, use the address as is
+        if (options?.noRouting) {
+            this.logger.debug('No routing requested, using address as is', address.toString());
+        }
+        const { nextHopAddress, targetAddress } = await this.translateAddress(address, options, nodeRef);
+        const connection = await this.connectToNode(nextHopAddress, {
+            targetAddress: targetAddress,
+            callerAddress: this.config.callerAddress,
+            readTimeoutMs: options?.readTimeoutMs,
+            drainTimeoutMs: options?.drainTimeoutMs,
+            isStream: options?.isStream,
+            abortSignal: options?.abortSignal,
+        });
+        if (options?.isStream) {
+            connection.onChunk((response) => {
+                options.onChunk?.(response);
+            });
+        }
+        // communicate the payload to the target node
+        const requestId = data?.id || v4();
+        const stream = await connection.send({
+            address: targetAddress?.toString() || '',
+            payload: data || {},
+            id: requestId,
+        }, options);
+        const response = await stream.waitForResponse(requestId);
+        stream.close();
+        // we handle streaming response differently
+        if (options?.isStream) {
+            return response;
+        }
+        // if there is an error, throw it to continue to bubble up
+        this.handleResponseError(response);
+        return response;
+    }
+    async receiveStream({ connection, stream, }) {
+        const streamAddress = oNodeAddress.fromProtocol('o://reuse');
+        const oConnection = await this.connectionManager.answer({
+            nextHopAddress: streamAddress,
+            targetAddress: streamAddress,
+            callerAddress: streamAddress,
+            p2pConnection: connection,
+        }, stream);
+        // Get the oNodeConnection for this libp2p connection
+        if (!oConnection) {
+            this.logger.error('Failed to process inbound connection');
+            throw new Error('Failed to process inbound connection');
+        }
+        // listen for requests
+        this.listenForMessages(oConnection, {});
+    }
+    async sendResponse(request, result) {
+        const responseBuilder = ResponseBuilder.create();
+        const responseStream = request.stream;
+        try {
+            // Emit InboundRequest event and wait for handler to process
+            const response = await responseBuilder.build(request, result, null);
+            await CoreUtils.sendResponse(response, request.stream);
+            this.logger.debug(`Successfully processed request: method=${request.method}, id=${request.id}`);
+        }
+        catch (error) {
+            this.logger.error(`Error processing request: method=${request.method}, id=${request.id}`, error);
+            const errorResponse = await responseBuilder.buildError(request, error);
+            await CoreUtils.sendResponse(errorResponse, responseStream);
+        }
+    }
+    // bubble up the messages to the request handler
+    async listenForMessages(connection, options) {
+        if (connection.eventEmitter.listenerCount(oNodeMessageEvent.request) > 0) {
+            this.logger.warn('Already listening for this event on connection id:', connection.id);
+            return;
+        }
+        connection.on(oNodeMessageEvent.request, async (data) => {
+            try {
+                const result = await this.emitAsync(oNodeMessageEvent.request, data);
+                this.sendResponse(data, result);
+            }
+            catch (err) {
+                this.logger.error('Error with request:', err);
+                const responseBuilder = ResponseBuilder.create();
+                const errorResponse = await responseBuilder.buildError(data, err);
+                await CoreUtils.sendResponse(errorResponse, data.stream);
+            }
+        });
+    }
+    /**
+     * Add event listener
+     */
+    on(event, listener) {
+        this.eventEmitter.on(event, listener);
+    }
+    /**
+     * Remove event listener
+     */
+    off(event, listener) {
+        this.eventEmitter.off(event, listener);
+    }
+    /**
+     * Emit event
+     */
+    // private emit<K extends oNodeMessageEvent>(
+    //   event: K,
+    //   data?: oNodeMessageEventData[K],
+    // ): void {
+    //   this.eventEmitter.emit(event, data);
+    // }
+    async emitAsync(event, data) {
+        const listeners = this.eventEmitter.listeners(event);
+        if (listeners.length === 0) {
+            throw new oError(oErrorCodes.INTERNAL_ERROR, `No listener registered for event: ${event}`);
+        }
+        // Call the first listener and await its response
+        const listener = listeners[0];
+        return await listener(data);
+    }
+}

package/dist/src/managers/o-reconnection.manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-reconnection.manager.d.ts","sourceRoot":"","sources":["../../../src/managers/o-reconnection.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EASR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAI3E,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,yBAAyB,EAAE,MAAM,CAAC;IAClC,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,oBAAqB,SAAQ,OAAO;IAI7C,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;IAJhB,OAAO,CAAC,YAAY,CAAS;gBAGnB,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,kBAAkB;IAMpC,OAAO,CAAC,mBAAmB;IAyBrB,mBAAmB,CAAC,KAAK,EAAE,GAAG;YAmCtB,wBAAwB;YAaxB,wBAAwB;YAexB,wBAAwB;IAehC,mBAAmB;YAgDX,2BAA2B;YAiB3B,iBAAiB;IAkB/B;;;OAGG;YACW,yBAAyB;IAyFvC;;OAEG;IACG,yBAAyB;IAoH/B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,KAAK;CAGd"}
+{"version":3,"file":"o-reconnection.manager.d.ts","sourceRoot":"","sources":["../../../src/managers/o-reconnection.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EASR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAI3E,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,yBAAyB,EAAE,MAAM,CAAC;IAClC,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,oBAAqB,SAAQ,OAAO;IAI7C,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;IAJhB,OAAO,CAAC,YAAY,CAAS;gBAGnB,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,kBAAkB;IAMpC,OAAO,CAAC,mBAAmB;IAyBrB,mBAAmB,CAAC,KAAK,EAAE,GAAG;YAwCtB,wBAAwB;YAaxB,wBAAwB;YAexB,wBAAwB;IAehC,mBAAmB;YAgDX,2BAA2B;YAiB3B,iBAAiB;IAkB/B;;;OAGG;YACW,yBAAyB;IAyFvC;;OAEG;IACG,yBAAyB;IAoH/B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,KAAK;CAGd"}

package/dist/src/managers/o-reconnection.manager.js

@@ -33,6 +33,10 @@ export class oReconnectionManager extends oObject {
     async handleNodeConnected(event) {
         const connectedEvent = event;
         const nodeAddress = connectedEvent.nodeAddress;
+        if (this.node.state !== NodeState.RUNNING) {
+            this.logger.warn('Ignoring node connection events during startup');
+            return;
+        }
         // if leader is back online re-register
         if (nodeAddress.toString() === oAddress.leader().toString()) {
             // Check if we can register with leader (not already registering or registered)

package/dist/src/managers/o-registration.manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-registration.manager.d.ts","sourceRoot":"","sources":["../../../src/managers/o-registration.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAIR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAGvE,MAAM,MAAM,iBAAiB,GACzB,gBAAgB,GAChB,aAAa,GACb,YAAY,GACZ,QAAQ,CAAC;AAEb,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,oBAAqB,SAAQ,OAAO;IAMnC,OAAO,CAAC,IAAI;IALxB,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,WAAW,CAAC,CAAQ;gBAER,IAAI,EAAE,gBAAgB;IAI1C;;;OAGG;IACH,iBAAiB,IAAI,OAAO;IAM5B;;;OAGG;IACH,iBAAiB,IAAI,OAAO;IAM5B;;OAEG;IACH,kBAAkB,IAAI,OAAO;IAI7B;;OAEG;IACH,kBAAkB,IAAI,OAAO;IAI7B;;OAEG;IACH,iBAAiB,IAAI,OAAO;IAe5B;;OAEG;IACH,gBAAgB,IAAI,IAAI;IAMxB;;OAEG;IACH,gBAAgB,IAAI,IAAI;IAMxB;;OAEG;IACH,QAAQ,IAAI,IAAI;IAKhB;;OAEG;IACH,SAAS,IAAI,kBAAkB;IAS/B;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAsFrC;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAwDtC"}
+{"version":3,"file":"o-registration.manager.d.ts","sourceRoot":"","sources":["../../../src/managers/o-registration.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAIR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAGvE,MAAM,MAAM,iBAAiB,GACzB,gBAAgB,GAChB,aAAa,GACb,YAAY,GACZ,QAAQ,CAAC;AAEb,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,iBAAiB,CAAC;IAC1B,MAAM,EAAE,iBAAiB,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,oBAAqB,SAAQ,OAAO;IAMnC,OAAO,CAAC,IAAI;IALxB,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,WAAW,CAAC,CAAQ;gBAER,IAAI,EAAE,gBAAgB;IAI1C;;;OAGG;IACH,iBAAiB,IAAI,OAAO;IAM5B;;;OAGG;IACH,iBAAiB,IAAI,OAAO;IAM5B;;OAEG;IACH,kBAAkB,IAAI,OAAO;IAI7B;;OAEG;IACH,kBAAkB,IAAI,OAAO;IAI7B;;OAEG;IACH,iBAAiB,IAAI,OAAO;IAe5B;;OAEG;IACH,gBAAgB,IAAI,IAAI;IAMxB;;OAEG;IACH,gBAAgB,IAAI,IAAI;IAMxB;;OAEG;IACH,QAAQ,IAAI,IAAI;IAKhB;;OAEG;IACH,SAAS,IAAI,kBAAkB;IAS/B;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAgGrC;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAyDtC"}

package/dist/src/managers/o-registration.manager.js

@@ -141,8 +141,11 @@ export class oRegistrationManager extends oObject {
                     return;
                 }
             }
-            // Register with parent via child_register call
-            await this.node.use(new oNodeAddress(this.node.config.parent.value), {
+            // necessary hack to ensure that registry node and other leader->child relationships build accurately
+            const isParentLeader = this.node?.config?.parent?.value === oAddress.leader().value;
+            await this.node.use(isParentLeader
+                ? this.node.config.parent
+                : new oNodeAddress(this.node.config.parent.value), {
                 method: 'child_register',
                 params: {
                     address: this.node.address.toString(),
@@ -164,7 +167,8 @@ export class oRegistrationManager extends oObject {
         catch (error) {
             // Failure - transition to failed state
             this.parentState = 'failed';
-            this.parentError = error instanceof Error ? error : new Error(String(error));
+            this.parentError =
+                error instanceof Error ? error : new Error(String(error));
             this.logger.error('Failed to register with parent:', {
                 parent: this.node.parent?.toString(),
                 error: this.parentError.message,
@@ -215,7 +219,8 @@ export class oRegistrationManager extends oObject {
         catch (error) {
             // Failure - transition to failed state
             this.leaderState = 'failed';
-            this.leaderError = error instanceof Error ? error : new Error(String(error));
+            this.leaderError =
+                error instanceof Error ? error : new Error(String(error));
             this.logger.error('Failed to register with leader:', {
                 leader: this.node.leader?.toString(),
                 error: this.leaderError.message,

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

@@ -1,26 +1,28 @@
 import { Libp2p, Libp2pConfig } from '@olane/o-config';
 import { PeerId } from '@olane/o-config';
+import { oNodeRouter } from './router/o-node.router.js';
 import { oNodeHierarchyManager } from './o-node.hierarchy-manager.js';
 import { oNodeConfig } from './interfaces/o-node.config.js';
 import { oNodeTransport } from './router/o-node.transport.js';
 import { oRequest, oNotificationManager } from '@olane/o-core';
 import { oNodeAddress } from './router/o-node.address.js';
-import { oNodeConnection } from './connection/o-node-connection.js';
 import { oNodeConnectionManager } from './connection/o-node-connection.manager.js';
 import { oToolBase } from '@olane/o-tool';
 import { oConnectionHeartbeatManager } from './managers/o-connection-heartbeat.manager.js';
-import { oNodeConnectionConfig } from './connection/index.js';
 import { oReconnectionManager } from './managers/o-reconnection.manager.js';
 import { oRegistrationManager } from './managers/o-registration.manager.js';
 import { LockManager } from './utils/lock-manager.js';
+import { oNodeRequestManager } from './lib/o-node-request-manager.js';
 export declare class oNode extends oToolBase {
     peerId: PeerId;
     p2pNode: Libp2p;
     address: oNodeAddress;
     config: oNodeConfig;
-    connectionManager: oNodeConnectionManager;
+    router: oNodeRouter;
     hierarchyManager: oNodeHierarchyManager;
     connectionHeartbeatManager?: oConnectionHeartbeatManager;
+    connectionManager: oNodeConnectionManager;
+    requestManager: oNodeRequestManager;
     protected reconnectionManager?: oReconnectionManager;
     registrationManager: oRegistrationManager;
     protected hooksStartFinished: any[];
@@ -44,6 +46,7 @@ export declare class oNode extends oToolBase {
     register(): Promise<void>;
     extractMethod(address: oNodeAddress): string;
     start(): Promise<void>;
+    initRequestManager(): void;
     validateJoinRequest(request: oRequest): Promise<any>;
     /**
      * Configure the libp2p node
@@ -51,7 +54,6 @@ export declare class oNode extends oToolBase {
      */
     configure(): Promise<Libp2pConfig>;
     protected createNode(): Promise<Libp2p>;
-    connect(config: oNodeConnectionConfig): Promise<oNodeConnection>;
     initConnectionManager(): Promise<void>;
     protected hookInitializeFinished(): Promise<void>;
     onInitFinished(cb: Function): void;
@@ -72,9 +74,6 @@ export declare class oNode extends oToolBase {
      */
     protected validate(): Promise<void>;
     initialize(): Promise<void>;
-    /**
-     * Override use() to wrap leader/registry requests with retry logic
-     */
     teardown(): Promise<void>;
     /**
      * Reset node state to allow restart after stop

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

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

package/dist/src/o-node.js

@@ -13,6 +13,8 @@ import { oNodeNotificationManager } from './o-node.notification-manager.js';
 import { oReconnectionManager } from './managers/o-reconnection.manager.js';
 import { oRegistrationManager } from './managers/o-registration.manager.js';
 import { LockManager } from './utils/lock-manager.js';
+import { oNodeRequestManager } from './lib/o-node-request-manager.js';
+import { oNodeMessageEvent } from './connection/enums/o-node-message-event.js';
 export class oNode extends oToolBase {
     constructor(config) {
         super(config);
@@ -174,6 +176,23 @@ export class oNode extends oToolBase {
             await this.connectionHeartbeatManager.start();
         }
     }
+    initRequestManager() {
+        this.requestManager = new oNodeRequestManager({
+            callerAddress: this.address,
+            connectionManager: this.connectionManager,
+            router: this.router,
+        });
+        this.requestManager.on(oNodeMessageEvent.request, async (data) => {
+            try {
+                const result = await this.execute(data, data.stream);
+                return result;
+            }
+            catch (error) {
+                this.logger.error('Error executing tool: ', data.toString(), error, typeof error);
+                throw error; // StreamManager will handle error response building
+            }
+        });
+    }
     async validateJoinRequest(request) {
         return true;
     }
@@ -280,32 +299,13 @@ export class oNode extends oToolBase {
         this.p2pNode = await createNode(params);
         return this.p2pNode;
     }
-    async connect(config) {
-        if (!this.connectionManager) {
-            this.logger.error('Connection manager not initialized');
-            throw new Error('Node is not ready to connect to other nodes');
-        }
-        const connection = await this.connectionManager
-            .connect(config)
-            .catch((error) => {
-            // TODO: we need to handle this better and document
-            if (error.message === 'Can not dial self') {
-                this.logger.error('Make sure you are entering the network not directly through the leader node.');
-            }
-            throw error;
-        });
-        if (!connection) {
-            throw new Error('Connection failed');
-        }
-        return connection;
-    }
     async initConnectionManager() {
         this.connectionManager = new oNodeConnectionManager({
             p2pNode: this.p2pNode,
             defaultReadTimeoutMs: this.config.connectionTimeouts?.readTimeoutMs,
             defaultDrainTimeoutMs: this.config.connectionTimeouts?.drainTimeoutMs,
             runOnLimitedConnection: this.config.runOnLimitedConnection ?? false,
-            originAddress: this.address?.value,
+            callerAddress: this.address?.value,
         });
     }
     async hookInitializeFinished() {
@@ -429,6 +429,8 @@ export class oNode extends oToolBase {
         this.peerId = this.p2pNode.peerId;
         // initialize connection manager
         await this.initConnectionManager();
+        // must come after connection manager
+        await this.initRequestManager();
         // initialize address resolution
         this.router.addResolver(new oMethodResolver(this.address));
         this.router.addResolver(new oNodeResolver(this.address));
@@ -439,23 +441,6 @@ export class oNode extends oToolBase {
         }
         await this.hookInitializeFinished();
     }
-    /**
-     * Override use() to wrap leader/registry requests with retry logic
-     */
-    // async use(
-    //   address: oAddress,
-    //   data?: {
-    //     method?: string;
-    //     params?: { [key: string]: any };
-    //     id?: string;
-    //   },
-    //   options?: UseOptions,
-    // ): Promise<any> {
-    //   // Wrap leader/registry requests with retry logic
-    //   return super.use(address, data, options),
-    //     address,
-    //     data?.method,
-    // }
     async teardown() {
         // Stop heartbeat before parent teardown
         if (this.connectionHeartbeatManager) {

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

@@ -1,6 +1,7 @@
 import { oAddress, oRequest } from '@olane/o-core';
 import { oServerNode } from './nodes/server.node.js';
 import { Connection, Stream } from '@olane/o-config';
+import { oNodeRequestManager } from './lib/o-node-request-manager.js';
 declare const oNodeTool_base: typeof oServerNode;
 /**
  * oTool is a mixin that extends the base class and implements the oTool interface
@@ -8,12 +9,11 @@ declare const oNodeTool_base: typeof oServerNode;
  * @returns A new class that extends the base class and implements the oTool interface
  */
 export declare class oNodeTool extends oNodeTool_base {
-    handleProtocolReuse(address: oAddress): Promise<void>;
+    requestManager: oNodeRequestManager;
     handleProtocol(address: oAddress): Promise<void>;
     initializeProtocols(): Promise<void>;
     initialize(): Promise<void>;
-    handleStreamReuse(stream: Stream, connection: Connection): Promise<void>;
-    handleStream(stream: Stream, connection: Connection, reuse?: boolean): Promise<void>;
+    handleStream(stream: Stream, connection: Connection): Promise<void>;
     _tool_identify(): Promise<any>;
     _tool_child_register(request: oRequest): Promise<any>;
 }

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;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"}
+{"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;AAQrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;;AAEtE;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACxC,cAAc,EAAG,mBAAmB,CAAC;IAyBtC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAyBhC,mBAAmB;IAYnB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnE,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,31 +3,34 @@ 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 { StreamManagerEvent } from './connection/stream-manager.events.js';
 /**
  * oTool is a mixin that extends the base class and implements the oTool interface
  * @param Base - The base class to extend
  * @returns A new class that extends the base class and implements the oTool interface
  */
 export class oNodeTool extends oTool(oServerNode) {
-    async handleProtocolReuse(address) {
-        const reuseProtocol = address.protocol + '/reuse';
-        this.logger.debug('Handling protocol reuse: ' + reuseProtocol);
-        const protocols = this.p2pNode.getProtocols();
-        if (protocols.find((p) => p === reuseProtocol)) {
-            // already handling
-            return;
-        }
-        const maxOutboundsStreams = process.env.MAX_OUTBOUND_STREAMS
-            ? parseInt(process.env.MAX_OUTBOUND_STREAMS)
-            : 1000;
-        await this.p2pNode.handle(reuseProtocol, this.handleStreamReuse.bind(this), {
-            maxInboundStreams: 10000,
-            maxOutboundStreams: maxOutboundsStreams,
-            runOnLimitedConnection: true, // reuse is always on limited connections
-        });
-        this.logger.debug('Handled protocol reuse: ' + reuseProtocol);
-    }
+    // async handleProtocolReuse(address: oAddress) {
+    //   const reuseProtocol = address.protocol + '/reuse';
+    //   this.logger.debug('Handling protocol reuse: ' + reuseProtocol);
+    //   const protocols = this.p2pNode.getProtocols();
+    //   if (protocols.find((p) => p === reuseProtocol)) {
+    //     // already handling
+    //     return;
+    //   }
+    //   const maxOutboundsStreams = process.env.MAX_OUTBOUND_STREAMS
+    //     ? parseInt(process.env.MAX_OUTBOUND_STREAMS)
+    //     : 1000;
+    //   await this.p2pNode.handle(
+    //     reuseProtocol,
+    //     this.handleStreamReuse.bind(this),
+    //     {
+    //       maxInboundStreams: 10_000,
+    //       maxOutboundStreams: maxOutboundsStreams,
+    //       runOnLimitedConnection: true, // reuse is always on limited connections
+    //     },
+    //   );
+    //   this.logger.debug('Handled protocol reuse: ' + reuseProtocol);
+    // }
     async handleProtocol(address) {
         if (!address || !address.protocol) {
             throw new Error('Invalid address passed: ' + address);
@@ -50,7 +53,7 @@ export class oNodeTool extends oTool(oServerNode) {
             maxOutboundStreams: maxOutboundsStreams,
             runOnLimitedConnection: this.config.runOnLimitedConnection,
         });
-        await this.handleProtocolReuse(address);
+        // await this.handleProtocolReuse(address);
     }
     async initializeProtocols() {
         this.logger.info('Initializing custom protocols for node...');
@@ -59,48 +62,17 @@ export class oNodeTool extends oTool(oServerNode) {
             this.staticAddress?.toString() !== this.address.toString()) {
             await this.handleProtocol(this.staticAddress);
         }
+        await this.handleProtocol(new oNodeAddress('o://reuse'));
     }
     async initialize() {
         await super.initialize();
         await this.initializeProtocols();
     }
-    async handleStreamReuse(stream, connection) {
-        return this.handleStream(stream, connection, true);
-    }
-    async handleStream(stream, connection, reuse) {
-        this.logger.debug('Handling incoming stream on connection:', {
-            connectionId: connection.id,
-            direction: connection.direction,
-        });
-        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
-        if (!oConnection) {
-            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
-        oConnection.streamManager.on(StreamManagerEvent.InboundRequest, async (data) => {
-            try {
-                const result = await this.execute(data.request, data.stream);
-                // Return the raw result - StreamManager will build and send the response
-                return result;
-            }
-            catch (error) {
-                this.logger.error('Error executing tool: ', data.request.toString(), error, typeof error);
-                throw error; // StreamManager will handle error response building
-            }
+    async handleStream(stream, connection) {
+        return this.requestManager.receiveStream({
+            stream,
+            connection,
         });
-        // Use the connection's StreamManager for consistent stream handling
-        // This follows libp2p v3 best practices for length-prefixed streaming
-        await oConnection.streamManager.handleIncomingStream(stream, connection);
     }
     async _tool_identify() {
         return {

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

@@ -1 +1 @@
-{"version":3,"file":"o-node.router.d.ts","sourceRoot":"","sources":["../../../src/router/o-node.router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAML,cAAc,EAGd,aAAa,EACd,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C,qBAAa,WAAY,SAAQ,WAAW;IAC1C,OAAO,CAAC,aAAa,CAAqB;;IAO1C;;;;;;;;OAQG;cACa,OAAO,CACrB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,GAAG,CAAC;IA6Bf;;;OAGG;YACW,kBAAkB;IA8DhC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAWhC;;OAEG;YACW,eAAe;IA4C7B;;;OAGG;IACG,SAAS,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IA+B3E;;;OAGG;IACH,UAAU,CAAC,qBAAqB,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAGtE"}
+{"version":3,"file":"o-node.router.d.ts","sourceRoot":"","sources":["../../../src/router/o-node.router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAML,cAAc,EAGd,aAAa,EACd,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C,qBAAa,WAAY,SAAQ,WAAW;IAC1C,OAAO,CAAC,aAAa,CAAqB;;IAO1C;;;;;;;;OAQG;cACa,OAAO,CACrB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,GAAG,CAAC;IA6Bf;;;OAGG;YACW,kBAAkB;IA8DhC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAWhC;;OAEG;YACW,eAAe;IA+C7B;;;OAGG;IACG,SAAS,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IA+B3E;;;OAGG;IACH,UAAU,CAAC,qBAAqB,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAGtE"}

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

@@ -122,7 +122,7 @@ export class oNodeRouter extends oToolRouter {
                 request.params.payload?.params?._isStreaming;
             const nodeConnection = await node.connectionManager.connect({
                 nextHopAddress: address,
-                address: node.address,
+                targetAddress: node.address,
                 callerAddress: node.address,
                 isStream: isStream,
             });
@@ -136,7 +136,9 @@ export class oNodeRouter extends oToolRouter {
                 });
                 // allow this to continue as we will tell the transmitter to stream the response and we will intercept via the above listener
             }
-            const response = await nodeConnection.transmit(request);
+            const stream = await nodeConnection.transmit(request, {});
+            const response = await stream.waitForResponse(String(request.id));
+            stream.close();
             return response.result.data;
         }
         catch (error) {

package/dist/test/connection-management.spec.js

@@ -14,11 +14,14 @@ describe('Connection Management', () => {
         await env.cleanup();
     });
     describe('Connection Pooling', () => {
+        // TODO: add more concurrency tests for first connection to a node since there is a race condition issue with 2 connections being possible (discovered when reviewing the event response mechanism for parent connection detected = retry register. Bandaid workaround currently working where we simply prevent trying in the reconnection manager)
         it('should cache and reuse connections', async () => {
             builder = await NetworkTopologies.twoNode();
             console.log('Built the 2 node network, starting test');
             const leader = builder.getNode('o://leader');
             const child = builder.getNode('o://child');
+            // at most there should only be 1 connection (the parent / leader shared)
+            expect(child.requestManager.connectionManager.connectionCount).to.equal(1);
             const spy = createConnectionSpy(leader);
             spy.start();
             // Make first request (establishes connection)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.55",
+  "version": "0.7.57",
   "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.55",
+    "@olane/o-test": "0.7.57",
     "@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.55",
-    "@olane/o-core": "0.7.55",
-    "@olane/o-protocol": "0.7.55",
-    "@olane/o-tool": "0.7.55",
+    "@olane/o-config": "0.7.57",
+    "@olane/o-core": "0.7.57",
+    "@olane/o-protocol": "0.7.57",
+    "@olane/o-tool": "0.7.57",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0",
     "json5": "^2.2.3"
   },
-  "gitHead": "f7d02a1ecfb0d28b7b1009a7c3eb6d0d4863adc2"
+  "gitHead": "2528b14a811472157ca94927ef6f3b39ccd31886"
 }