@olane/o-node 0.7.54 → 0.7.56

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

@@ -1 +1 @@
-{"version":3,"file":"stream-handler.config.d.ts","sourceRoot":"","sources":["../../../src/connection/stream-handler.config.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAEhC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;IAErB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,mBAAmB,CAAC;CAC7B"}
+{"version":3,"file":"stream-handler.config.d.ts","sourceRoot":"","sources":["../../../src/connection/stream-handler.config.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;OAGG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,CAAC;IAErB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,mBAAmB,CAAC;CAC7B"}

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

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

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

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

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

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

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

@@ -0,0 +1,9 @@
+import { oNodeAddress } from '../../router/o-node.address.js';
+import { oNodeConnectionManager } from '../../connection/o-node-connection.manager.js';
+import { oNodeRouter } from '../../router/o-node.router.js';
+export interface oNodeRequestManagerConfig {
+    callerAddress: oNodeAddress;
+    connectionManager: oNodeConnectionManager;
+    router: oNodeRouter;
+}
+//# sourceMappingURL=o-node-request-manager.config.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"o-node-request-manager.config.d.ts","sourceRoot":"","sources":["../../../../src/lib/interfaces/o-node-request-manager.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D,MAAM,WAAW,yBAAyB;IACxC,aAAa,EAAE,YAAY,CAAC;IAC5B,iBAAiB,EAAE,sBAAsB,CAAC;IAC1C,MAAM,EAAE,WAAW,CAAC;CACrB"}

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

@@ -0,0 +1 @@
+export {};

package/dist/src/lib/o-node-request-manager.d.ts

@@ -0,0 +1,46 @@
+/// <reference types="node" />
+import { oRequestManager, oResponse, UseOptions } from '@olane/o-core';
+import { oNodeRequestManagerConfig } from './interfaces/o-node-request-manager.config.js';
+import { oNodeConnection, oNodeConnectionConfig, oNodeConnectionManager } from '../connection/index.js';
+import { oNodeRouter } from '../router/o-node.router.js';
+import { oNodeAddress } from '../router/o-node.address.js';
+import { UseDataConfig } from '@olane/o-core/dist/src/core/interfaces/use-data.config.js';
+import { oNode } from '../o-node.js';
+import { Connection, Stream } from '@olane/o-config';
+import { oNodeMessageEvent, oNodeMessageEventData } from '../connection/enums/o-node-message-event.js';
+import { oStreamRequest } from '../connection/o-stream.request.js';
+import { EventEmitter } from 'events';
+import { AbortSignalConfig } from '../connection/interfaces/abort-signal.config.js';
+import { RunResult } from '@olane/o-tool';
+export declare class oNodeRequestManager extends oRequestManager {
+    readonly config: oNodeRequestManagerConfig;
+    connectionManager: oNodeConnectionManager;
+    router: oNodeRouter;
+    protected eventEmitter: EventEmitter;
+    constructor(config: oNodeRequestManagerConfig);
+    translateAddress(address: oNodeAddress, options?: UseOptions, nodeRef?: oNode): Promise<{
+        nextHopAddress: oNodeAddress;
+        targetAddress: oNodeAddress;
+    }>;
+    connectToNode(nextHopAddress: oNodeAddress, options: Omit<oNodeConnectionConfig, 'nextHopAddress'>): Promise<oNodeConnection>;
+    send(address: oNodeAddress, data: UseDataConfig, options?: UseOptions, nodeRef?: oNode): Promise<oResponse>;
+    receiveStream({ connection, stream, }: {
+        connection: Connection;
+        stream: Stream;
+    }): Promise<void>;
+    sendResponse(request: oStreamRequest, result: RunResult): Promise<void>;
+    protected listenForMessages(connection: oNodeConnection, options: AbortSignalConfig): 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 emitAsync;
+}
+//# sourceMappingURL=o-node-request-manager.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"o-node-request-manager.d.ts","sourceRoot":"","sources":["../../../src/lib/o-node-request-manager.ts"],"names":[],"mappings":";AAAA,OAAO,EAML,eAAe,EACf,SAAS,EAET,UAAU,EACX,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAC;AAC1F,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,sBAAsB,EAEvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,2DAA2D,CAAC;AAC1F,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iDAAiD,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,qBAAa,mBAAoB,SAAQ,eAAe;IAK1C,QAAQ,CAAC,MAAM,EAAE,yBAAyB;IAJtD,iBAAiB,EAAE,sBAAsB,CAAC;IAC1C,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,CAAC,YAAY,EAAE,YAAY,CAAsB;gBAErC,MAAM,EAAE,yBAAyB;IAMhD,gBAAgB,CACpB,OAAO,EAAE,YAAY,EACrB,OAAO,CAAC,EAAE,UAAU,EACpB,OAAO,CAAC,EAAE,KAAK,GACd,OAAO,CAAC;QAAE,cAAc,EAAE,YAAY,CAAC;QAAC,aAAa,EAAE,YAAY,CAAA;KAAE,CAAC;IAenE,aAAa,CACjB,cAAc,EAAE,YAAY,EAC5B,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,GACrD,OAAO,CAAC,eAAe,CAAC;IAyBrB,IAAI,CACR,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,aAAa,EACnB,OAAO,CAAC,EAAE,UAAU,EACpB,OAAO,CAAC,EAAE,KAAK,GACd,OAAO,CAAC,SAAS,CAAC;IAgEf,aAAa,CAAC,EAClB,UAAU,EACV,MAAM,GACP,EAAE;QACD,UAAU,EAAE,UAAU,CAAC;QACvB,MAAM,EAAE,MAAM,CAAC;KAChB;IAsBK,YAAY,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS;cAsB7C,iBAAiB,CAC/B,UAAU,EAAE,eAAe,EAC3B,OAAO,EAAE,iBAAiB;IAyB5B;;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;YAQW,SAAS;CAcxB"}

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 unknown = new oNodeAddress('o://unknown', []);
+        const oConnection = await this.connectionManager.answer({
+            nextHopAddress: unknown,
+            targetAddress: unknown,
+            callerAddress: unknown,
+            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;IAsBhC,mBAAmB;IAWnB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,iBAAiB,CACrB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC;IAIV,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,KAAK,CAAC,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC;IAwDV,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CAiC5D"}
+{"version":3,"file":"o-node.tool.d.ts","sourceRoot":"","sources":["../../src/o-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAoB,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;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;IAWnB,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"}