@olane/o-node 0.7.12-alpha.5 → 0.7.12-alpha.50

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

@@ -0,0 +1,188 @@
+import { oNotificationManager, NodeConnectedEvent, NodeDisconnectedEvent, NodeDiscoveredEvent, ChildJoinedEvent, ChildLeftEvent, ParentConnectedEvent, ParentDisconnectedEvent, } from '@olane/o-core';
+/**
+ * libp2p-specific implementation of oNotificationManager
+ * Wraps libp2p events and enriches them with Olane context
+ */
+export class oNodeNotificationManager extends oNotificationManager {
+    constructor(p2pNode, hierarchyManager, address) {
+        super();
+        this.p2pNode = p2pNode;
+        this.hierarchyManager = hierarchyManager;
+        this.address = address;
+    }
+    /**
+     * Wire up libp2p event listeners
+     */
+    setupListeners() {
+        this.logger.debug('Setting up libp2p event listeners...');
+        // Peer connection events
+        this.p2pNode.addEventListener('peer:connect', this.handlePeerConnect.bind(this));
+        // this.p2pNode.addEventListener(
+        //   'peer:disconnect',
+        //   this.handlePeerDisconnect.bind(this),
+        // );
+        // Peer discovery events
+        this.p2pNode.addEventListener('peer:discovery', this.handlePeerDiscovery.bind(this));
+        // Connection events
+        this.p2pNode.addEventListener('connection:open', this.handleConnectionOpen.bind(this));
+        this.p2pNode.addEventListener('connection:close', this.handleConnectionClose.bind(this));
+        this.logger.debug('libp2p event listeners configured');
+    }
+    /**
+     * Handle peer connect event from libp2p
+     */
+    handlePeerConnect(evt) {
+        const peerId = evt.detail;
+        // this.logger.debug(`Peer connected: ${peerId.toString()}`);
+        // Try to resolve peer ID to Olane address
+        const nodeAddress = this.peerIdToAddress(peerId.toString());
+        if (!nodeAddress) {
+            // this.logger.debug(
+            //   `Could not resolve peer ID ${peerId.toString()} to address`,
+            // );
+            return;
+        }
+        // Emit generic node connected event
+        this.emit(new NodeConnectedEvent({
+            source: this.address,
+            nodeAddress,
+            connectionMetadata: {
+                peerId: peerId.toString(),
+                transport: 'libp2p',
+            },
+        }));
+        // Check if this is a child node
+        if (this.isChild(nodeAddress)) {
+            // this.logger.debug(`Child node connected: ${nodeAddress.toString()}`);
+            this.emit(new ChildJoinedEvent({
+                source: this.address,
+                childAddress: nodeAddress,
+                parentAddress: this.address,
+            }));
+        }
+        // Check if this is a parent node
+        if (this.isParent(nodeAddress)) {
+            // this.logger.debug(`Parent node connected: ${nodeAddress.toString()}`);
+            this.emit(new ParentConnectedEvent({
+                source: this.address,
+                parentAddress: nodeAddress,
+            }));
+        }
+    }
+    /**
+     * Handle peer disconnect event from libp2p
+     */
+    handlePeerDisconnect(evt) {
+        const peerId = evt.detail;
+        // this.logger.debug(`Peer disconnected: ${peerId.toString()}`);
+        // Try to resolve peer ID to Olane address
+        const nodeAddress = this.peerIdToAddress(peerId.toString());
+        if (!nodeAddress) {
+            // this.logger.debug(
+            //   `Could not resolve peer ID ${peerId.toString()} to address`,
+            // );
+            return;
+        }
+        // Emit generic node disconnected event
+        this.emit(new NodeDisconnectedEvent({
+            source: this.address,
+            nodeAddress,
+            reason: 'peer_disconnected',
+        }));
+        // Check if this is a child node
+        if (this.isChild(nodeAddress)) {
+            this.logger.debug(`Child node disconnected: ${nodeAddress.toString()}`);
+            this.emit(new ChildLeftEvent({
+                source: this.address,
+                childAddress: nodeAddress,
+                parentAddress: this.address,
+                reason: 'peer_disconnected',
+            }));
+            // Optionally remove from hierarchy (auto-cleanup)
+            // this.hierarchyManager.removeChild(nodeAddress);
+        }
+        // Check if this is a parent node
+        if (this.isParent(nodeAddress)) {
+            this.logger.debug(`Parent node disconnected: ${nodeAddress.toString()}`);
+            this.emit(new ParentDisconnectedEvent({
+                source: this.address,
+                parentAddress: nodeAddress,
+                reason: 'peer_disconnected',
+            }));
+        }
+    }
+    /**
+     * Handle peer discovery event from libp2p
+     */
+    handlePeerDiscovery(evt) {
+        const peerInfo = evt.detail;
+        // this.logger.debug(`Peer discovered: ${peerInfo.id.toString()}`);
+        // Try to resolve peer ID to Olane address
+        const nodeAddress = this.peerIdToAddress(peerInfo.id.toString());
+        if (!nodeAddress) {
+            return;
+        }
+        this.emit(new NodeDiscoveredEvent({
+            source: this.address,
+            nodeAddress,
+        }));
+    }
+    /**
+     * Handle connection open event from libp2p
+     */
+    handleConnectionOpen(evt) {
+        // do nothing for now
+    }
+    /**
+     * Handle connection close event from libp2p
+     */
+    handleConnectionClose(evt) {
+        // do nothing for now
+    }
+    /**
+     * Try to resolve a libp2p peer ID to an Olane address
+     * Checks hierarchy manager for known peers
+     */
+    peerIdToAddress(peerId) {
+        // Check children
+        for (const child of this.hierarchyManager.children) {
+            const childTransports = child.transports;
+            for (const transport of childTransports) {
+                if (transport.toString().includes(peerId)) {
+                    return child;
+                }
+            }
+        }
+        // Check parents
+        for (const parent of this.hierarchyManager.parents) {
+            const parentTransports = parent.transports;
+            for (const transport of parentTransports) {
+                if (transport.toString().includes(peerId)) {
+                    return parent;
+                }
+            }
+        }
+        // Check leaders
+        for (const leader of this.hierarchyManager.leaders) {
+            const leaderTransports = leader.transports;
+            for (const transport of leaderTransports) {
+                if (transport.toString().includes(peerId)) {
+                    return leader;
+                }
+            }
+        }
+        return null;
+    }
+    /**
+     * Check if an address is a direct child
+     */
+    isChild(address) {
+        return this.hierarchyManager.children.some((child) => child.toString() === address.toString());
+    }
+    /**
+     * Check if an address is a parent
+     */
+    isParent(address) {
+        return this.hierarchyManager.parents.some((parent) => parent.toString() === address.toString());
+    }
+}

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,EAEL,QAAQ,EAGR,QAAQ,EAET,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAGrD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACzC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAQhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDnE,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CAa5D"}
+{"version":3,"file":"o-node.tool.d.ts","sourceRoot":"","sources":["../../src/o-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,QAAQ,EAIT,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAIrD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACzC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAUhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAwCnE,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CA2B5D"}

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

@@ -1,7 +1,8 @@
-import { CoreUtils, oAddress, oError, oErrorCodes, oRequest, } from '@olane/o-core';
+import { CoreUtils, oRequest, ResponseBuilder, ChildJoinedEvent, } from '@olane/o-core';
 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';
 /**
  * oTool is a mixin that extends the base class and implements the oTool interface
  * @param Base - The base class to extend
@@ -11,8 +12,10 @@ export class oNodeTool extends oTool(oServerNode) {
     async handleProtocol(address) {
         this.logger.debug('Handling protocol: ' + address.protocol);
         await this.p2pNode.handle(address.protocol, this.handleStream.bind(this), {
-            maxInboundStreams: Infinity,
-            maxOutboundStreams: Infinity,
+            maxInboundStreams: 10000,
+            maxOutboundStreams: process.env.MAX_OUTBOUND_STREAMS
+                ? parseInt(process.env.MAX_OUTBOUND_STREAMS)
+                : 1000,
         });
     }
     async initialize() {
@@ -24,6 +27,7 @@ export class oNodeTool extends oTool(oServerNode) {
         }
     }
     async handleStream(stream, connection) {
+        this.logger.debug('Handling connection: ', connection.id);
         // CRITICAL: Attach message listener immediately to prevent buffer overflow (libp2p v3)
         // Per libp2p migration guide: "If no message event handler is added, streams will
         // buffer incoming data until a pre-configured limit is reached, after which the stream will be reset."
@@ -34,26 +38,18 @@ export class oNodeTool extends oTool(oServerNode) {
             }
             const requestConfig = await CoreUtils.processStream(event);
             const request = new oRequest(requestConfig);
-            let success = true;
-            const result = await this.execute(request, stream).catch((error) => {
-                this.logger.error('Error executing tool: ', request.toString(), error, typeof error);
-                success = false;
-                const responseError = error instanceof oError
-                    ? error
-                    : new oError(oErrorCodes.UNKNOWN, error.message);
-                return {
-                    error: responseError.toJSON(),
-                };
-            });
-            if (success) {
-                this.metrics.successCount++;
+            // Use ResponseBuilder with automatic error handling and metrics tracking
+            const responseBuilder = ResponseBuilder.create().withMetrics(this.metrics);
+            let response;
+            try {
+                const result = await this.execute(request, stream);
+                response = await responseBuilder.build(request, result, null);
             }
-            else {
-                this.metrics.errorCount++;
+            catch (error) {
+                this.logger.error('Error executing tool: ', request.toString(), error, typeof error);
+                response = await responseBuilder.buildError(request, error);
             }
-            // compose the response & add the expected connection + request fields
-            const response = CoreUtils.buildResponse(request, result, result?.error);
-            // add the request method to the response
+            // Send the response
             await CoreUtils.sendResponse(response, stream);
         };
         // Attach listener synchronously before any async operations
@@ -69,8 +65,17 @@ export class oNodeTool extends oTool(oServerNode) {
     async _tool_child_register(request) {
         this.logger.debug('Child register: ', request.params);
         const { address, transports } = request.params;
-        const childAddress = new oAddress(address, transports.map((t) => new oNodeTransport(t)));
+        const childAddress = new oNodeAddress(address, transports.map((t) => new oNodeTransport(t)));
+        // Add child to hierarchy
         this.hierarchyManager.addChild(childAddress);
+        // Emit child joined event
+        if (this.notificationManager) {
+            this.notificationManager.emit(new ChildJoinedEvent({
+                source: this.address,
+                childAddress,
+                parentAddress: this.address,
+            }));
+        }
         return {
             message: `Child node registered with parent! ${childAddress.toString()}`,
             parentTransports: this.parentTransports.map((t) => t.toString()),

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

@@ -17,6 +17,7 @@ export declare class oNodeRouter extends oToolRouter {
     protected forward(address: oNodeAddress, request: oRouterRequest, node: oNode): Promise<any>;
     /**
      * Executes a request locally when routing to self.
+     * Now uses ResponseBuilder for consistency with useSelf() behavior.
      */
     private executeSelfRouting;
     /**

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,EACd,aAAa,EACd,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAK5C,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;IA0Bf;;OAEG;YACW,kBAAkB;IAgBhC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAUhC;;OAEG;YACW,eAAe;IA2B7B;;;OAGG;IACG,SAAS,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAyB3E;;;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;IAsC7B;;;OAGG;IACG,SAAS,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAyB3E;;;OAGG;IACH,UAAU,CAAC,qBAAqB,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAGtE"}

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

@@ -1,7 +1,7 @@
-import { oAddress, oError, oErrorCodes, oRequest, } from '@olane/o-core';
+import { CoreUtils, oAddress, oError, oErrorCodes, oRequest, ResponseBuilder, } from '@olane/o-core';
 import { oToolRouter } from '@olane/o-tool';
-import { oNodeConnection } from '../connection/o-node-connection.js';
 import { oNodeRoutingPolicy } from './o-node.routing-policy.js';
+import { oStreamRequest } from '../connection/o-stream.request.js';
 export class oNodeRouter extends oToolRouter {
     constructor() {
         super();
@@ -25,6 +25,9 @@ export class oNodeRouter extends oToolRouter {
             params: request.params,
             id: request.id,
         });
+        if (request.stream) {
+            nextHopRequest.stream = request.stream;
+        }
         // Handle self-routing: execute locally instead of dialing
         if (this.routingPolicy.isSelfAddress(address, node)) {
             return this.executeSelfRouting(request, node);
@@ -39,17 +42,55 @@ export class oNodeRouter extends oToolRouter {
     }
     /**
      * Executes a request locally when routing to self.
+     * Now uses ResponseBuilder for consistency with useSelf() behavior.
      */
     async executeSelfRouting(request, node) {
         const { payload } = request.params;
         const params = payload.params;
         const localRequest = new oRequest({
             method: payload.method,
-            params: { ...params },
+            params: {
+                ...params,
+                _connectionId: request.params._connectionId,
+                _requestMethod: payload.method,
+            },
             id: request.id,
         });
-        const result = await node.execute(localRequest);
-        return result;
+        // Create ResponseBuilder with metrics tracking
+        const responseBuilder = ResponseBuilder.create().withMetrics(node.metrics);
+        // Handle streaming requests
+        const isStream = request.params._isStreaming;
+        if (isStream && request.stream) {
+            // For streaming, we need to handle the stream chunks
+            try {
+                const result = await node.execute(localRequest, request.stream);
+                const response = await responseBuilder.build(localRequest, result, null, {
+                    isStream: true,
+                });
+                // Return unwrapped data for consistency with dialAndTransmit
+                return response.result.data;
+            }
+            catch (error) {
+                const errorResponse = await responseBuilder.buildError(localRequest, error, {
+                    isStream: true,
+                });
+                // For errors, throw to match remote behavior
+                throw responseBuilder.normalizeError(error);
+            }
+        }
+        // Handle non-streaming requests with error handling
+        try {
+            const result = await node.execute(localRequest);
+            const response = await responseBuilder.build(localRequest, result, null);
+            // Return unwrapped data to match dialAndTransmit behavior
+            return response.result.data;
+        }
+        catch (error) {
+            // Build error response for metrics tracking
+            await responseBuilder.buildError(localRequest, error);
+            // Then throw the normalized error
+            throw responseBuilder.normalizeError(error);
+        }
     }
     /**
      * Checks if the next hop is the final destination address.
@@ -65,10 +106,11 @@ export class oNodeRouter extends oToolRouter {
     unwrapDestinationRequest(request) {
         const { payload } = request.params;
         const params = payload.params;
-        return new oRequest({
+        return new oStreamRequest({
             method: payload.method,
             params: { ...params },
             id: request.id,
+            stream: request.stream,
         });
     }
     /**
@@ -76,13 +118,24 @@ export class oNodeRouter extends oToolRouter {
      */
     async dialAndTransmit(address, request, node) {
         try {
-            const connection = await node.p2pNode.dial(address.libp2pTransports.map((t) => t.toMultiaddr()));
-            const nodeConnection = new oNodeConnection({
-                p2pConnection: connection,
+            const isStream = request.params._isStreaming ||
+                request.params.payload?.params?._isStreaming;
+            const nodeConnection = await node.connectionManager.connect({
                 nextHopAddress: address,
                 address: node.address,
                 callerAddress: node.address,
+                isStream: isStream,
             });
+            if (isStream) {
+                const routeRequest = request;
+                if (!routeRequest.stream) {
+                    throw new oError(oErrorCodes.INVALID_REQUEST, 'Stream is required');
+                }
+                nodeConnection.onChunk(async (response) => {
+                    CoreUtils.sendStreamResponse(response, routeRequest.stream);
+                });
+                // 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);
             return response.result.data;
         }

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

@@ -1 +1 @@
-{"version":3,"file":"o-node.routing-policy.d.ts","sourceRoot":"","sources":["../../../src/router/o-node.routing-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAG1C;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,cAAc;IACpD;;;;;;;;;OASG;IACH,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;IAkB1D;;;;;;;;OAQG;IACH,0BAA0B,CACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,aAAa,GAAG,IAAI;CAuBxB"}
+{"version":3,"file":"o-node.routing-policy.d.ts","sourceRoot":"","sources":["../../../src/router/o-node.routing-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAG1C;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,cAAc;IACpD;;;;;;;;;OASG;IACH,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;IAuB1D;;;;;;;;OAQG;IACH,0BAA0B,CACxB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,aAAa,GAAG,IAAI;CAmBxB"}

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

@@ -17,11 +17,16 @@ export class oNodeRoutingPolicy extends oRoutingPolicy {
      */
     isInternalAddress(address, node) {
         const nodeAddress = address;
+        // if we are trying to connect to a parent, it's internal
+        if (node.hierarchyManager.parents.some((p) => p.equals(address))) {
+            return true;
+        }
         if (nodeAddress.paths.indexOf(oAddress.leader().paths) !== -1 && // if the address has a leader
             nodeAddress.libp2pTransports?.length > 0) {
             // transports are provided, let's see if they match our known leaders
             const isLeaderRef = nodeAddress.toString() === oAddress.leader().toString();
-            const isOurLeaderRef = node.hierarchyManager.leaders.some((l) => l.equals(nodeAddress));
+            const isOurLeaderRef = node.address.equals(nodeAddress) ||
+                node.hierarchyManager.leaders.some((l) => l.equals(nodeAddress));
             return isLeaderRef || isOurLeaderRef;
         }
         return true;
@@ -40,7 +45,7 @@ export class oNodeRoutingPolicy extends oRoutingPolicy {
         const isInternal = this.isInternalAddress(address, node);
         if (!isInternal) {
             // external address, so we need to route
-            this.logger.debug('Address is external, routing...', nodeAddress.toString(), nodeAddress.libp2pTransports.map((t) => t.toString()));
+            this.logger.debug('Address is external, routing...', nodeAddress);
             // route to leader of external OS
             return {
                 nextHopAddress: new oNodeAddress(oAddress.leader().toString(), nodeAddress.libp2pTransports),

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

@@ -1 +1 @@
-{"version":3,"file":"o-node.resolver.d.ts","sourceRoot":"","sources":["../../../../src/router/resolvers/o-node.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,aAAa,EAEd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,qBAAa,aAAc,SAAQ,gBAAgB;IACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY;gBAArB,OAAO,EAAE,YAAY;IAIpD,IAAI,mBAAmB,IAAI,aAAa,EAAE,CAEzC;IAEK,OAAO,CAAC,YAAY,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAsC1E"}
+{"version":3,"file":"o-node.resolver.d.ts","sourceRoot":"","sources":["../../../../src/router/resolvers/o-node.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEhB,aAAa,EAId,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,qBAAa,aAAc,SAAQ,gBAAgB;IACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY;gBAArB,OAAO,EAAE,YAAY;IAIpD,IAAI,mBAAmB,IAAI,aAAa,EAAE,CAEzC;IAEK,OAAO,CAAC,YAAY,EAAE,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC;CA8C1E"}

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

@@ -1,4 +1,4 @@
-import { oAddressResolver, TransportType, } from '@olane/o-core';
+import { oAddressResolver, oAddress, TransportType, oError, oErrorCodes, } from '@olane/o-core';
 import { oNodeAddress } from '../o-node.address.js';
 export class oNodeResolver extends oAddressResolver {
     constructor(address) {
@@ -32,6 +32,10 @@ export class oNodeResolver extends oAddressResolver {
                 requestOverride: request,
             };
         }
+        // no child address, and we have already been to the leader, fail
+        if (address.toString().indexOf(oAddress.leader().toString()) > -1) {
+            throw new oError(oErrorCodes.NOT_FOUND, targetAddress.toString() + ' node not found.');
+        }
         return {
             nextHopAddress: address,
             targetAddress: targetAddress,

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

@@ -1 +1 @@
-{"version":3,"file":"o-node.search-resolver.d.ts","sourceRoot":"","sources":["../../../../src/router/resolvers/o-node.search-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EAEL,UAAU,EACV,cAAc,EAEd,aAAa,EAEd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+DG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB;IACvC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ;gBAAjB,OAAO,EAAE,QAAQ;IAIhD,IAAI,gBAAgB,IAAI,UAAU,EAAE,CAEnC;IAED;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,IAAI,QAAQ;IAIxC;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,MAAM;IAInC;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,GAAG,GAAG;IAOnD;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,GAAG,GAAG,EAAE;IASjE;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI;IAIlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,GAAG,cAAc,EAAE;IAOtD;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,wBAAwB,CAChC,OAAO,EAAE,QAAQ,EACjB,gBAAgB,EAAE,cAAc,EAAE,EAClC,IAAI,EAAE,KAAK,GACV,cAAc,EAAE;IAgBnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyCG;IACH,SAAS,CAAC,gBAAgB,CACxB,IAAI,EAAE,KAAK,EACX,qBAAqB,EAAE,QAAQ,EAC/B,YAAY,EAAE,GAAG,GAChB,QAAQ;IAsBL,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CAoE/D"}
+{"version":3,"file":"o-node.search-resolver.d.ts","sourceRoot":"","sources":["../../../../src/router/resolvers/o-node.search-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,gBAAgB,EAChB,KAAK,EAEL,UAAU,EACV,cAAc,EAEd,aAAa,EAEd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+DG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB;IACvC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ;gBAAjB,OAAO,EAAE,QAAQ;IAIhD,IAAI,gBAAgB,IAAI,UAAU,EAAE,CAEnC;IAED;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,IAAI,QAAQ;IAIxC;;;;OAIG;IACH,SAAS,CAAC,eAAe,IAAI,MAAM;IAInC;;;;;OAKG;IACH,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,GAAG,GAAG;IAOnD;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,GAAG,GAAG,EAAE;IASjE;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI;IAIlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,GAAG,cAAc,EAAE;IAOtD;;;;;;;;;;;OAWG;IACH,SAAS,CAAC,wBAAwB,CAChC,OAAO,EAAE,QAAQ,EACjB,gBAAgB,EAAE,cAAc,EAAE,EAClC,IAAI,EAAE,KAAK,GACV,cAAc,EAAE;IAgBnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyCG;IACH,SAAS,CAAC,gBAAgB,CACxB,IAAI,EAAE,KAAK,EACX,qBAAqB,EAAE,QAAQ,EAC/B,YAAY,EAAE,GAAG,GAChB,QAAQ;IAeL,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;CAsG/D"}

package/dist/src/router/resolvers/o-node.search-resolver.js

@@ -1,4 +1,4 @@
-import { oAddress, oAddressResolver, oCustomTransport, RestrictedAddresses, } from '@olane/o-core';
+import { NodeState, oAddress, oAddressResolver, oCustomTransport, RestrictedAddresses, } from '@olane/o-core';
 import { oNodeTransport } from '../o-node.transport.js';
 /**
  * Address resolver that searches a registry to find transports for addresses.
@@ -78,7 +78,7 @@ export class oSearchResolver extends oAddressResolver {
      * @returns The registry address to query
      */
     getRegistryAddress() {
-        return new oAddress(RestrictedAddresses.REGISTRY);
+        return new oAddress('o://leader/registry');
     }
     /**
      * Returns the method name to call on the registry.
@@ -201,7 +201,6 @@ export class oSearchResolver extends oAddressResolver {
     determineNextHop(node, resolvedTargetAddress, searchResult) {
         // Determine next hop using standard hierarchy logic
         const nextHopAddress = oAddress.next(node.address, resolvedTargetAddress);
-        this.logger.debug('determineNextHop with params', 'node.address: ' + node.address.toString(), 'resolvedTargetAddress: ' + resolvedTargetAddress.toString(), 'searchResult.address: ' + searchResult.address, 'next hop: ' + nextHopAddress.toString());
         // Map transports from search result
         const targetTransports = this.mapTransports(searchResult);
         // Set transports on the next hop based on routing logic
@@ -218,13 +217,40 @@ export class oSearchResolver extends oAddressResolver {
                 requestOverride: resolveRequest,
             };
         }
-        // Perform registry search
+        if (node.state !== NodeState.RUNNING) {
+            return {
+                nextHopAddress: address,
+                targetAddress: targetAddress,
+                requestOverride: resolveRequest,
+            };
+        }
+        // Perform registry search with error handling
         const searchParams = this.buildSearchParams(address);
         const registryAddress = this.getRegistryAddress();
-        const searchResponse = await node.use(registryAddress, {
-            method: this.getSearchMethod(),
-            params: searchParams,
-        });
+        let searchResponse;
+        try {
+            searchResponse = await node.use(registryAddress, {
+                method: this.getSearchMethod(),
+                params: searchParams,
+            });
+        }
+        catch (error) {
+            // Log the error but don't throw - allow fallback resolvers to handle it
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            // Check if this is a circuit breaker error (fast-fail scenario)
+            if (errorMessage.includes('Circuit breaker is OPEN')) {
+                this.logger.warn(`Registry search blocked by circuit breaker for ${address.toString()}: ${errorMessage}`);
+            }
+            else {
+                this.logger.error(`Registry search failed for ${address.toString()}: ${errorMessage}`);
+            }
+            // Return original address without transports, letting next resolver in chain handle it
+            return {
+                nextHopAddress: address,
+                targetAddress: targetAddress,
+                requestOverride: resolveRequest,
+            };
+        }
         // Filter and select result
         const filteredResults = this.filterSearchResults(searchResponse.result.data, node);
         const selectedResult = this.selectResult(filteredResults);
@@ -240,7 +266,6 @@ export class oSearchResolver extends oAddressResolver {
         const extraParams = address
             .toString() // o://embeddings-text replace o://embeddings-text = ''
             .replace(address.toRootAddress().toString(), '');
-        this.logger.debug('Extra params:', extraParams);
         // Check if selectedResult.address already contains the complete path
         // This happens when registry finds via staticAddress - the returned address
         // is the canonical hierarchical location, so we shouldn't append extraParams

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

@@ -0,0 +1,3 @@
+export * from './stream.utils.js';
+export * from './network.utils.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC"}

package/dist/src/utils/index.js

@@ -0,0 +1,2 @@
+export * from './stream.utils.js';
+export * from './network.utils.js';

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

@@ -0,0 +1,6 @@
+import { Stream } from '@olane/o-config';
+import { oObject, oRequest } from '@olane/o-core';
+export declare class StreamUtils extends oObject {
+    static processGenerator(request: oRequest, generator: AsyncGenerator<any>, stream: Stream): Promise<any>;
+}
+//# sourceMappingURL=stream.utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"stream.utils.d.ts","sourceRoot":"","sources":["../../../src/utils/stream.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAEL,OAAO,EACP,QAAQ,EAGT,MAAM,eAAe,CAAC;AAEvB,qBAAa,WAAY,SAAQ,OAAO;WAClB,gBAAgB,CAClC,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,cAAc,CAAC,GAAG,CAAC,EAC9B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,CAAC;CA6BhB"}

package/dist/src/utils/stream.utils.js

@@ -0,0 +1,31 @@
+import { CoreUtils, oObject, ResponseBuilder, } from '@olane/o-core';
+export class StreamUtils extends oObject {
+    static async processGenerator(request, generator, stream) {
+        const utils = new StreamUtils();
+        const responseBuilder = ResponseBuilder.create();
+        let aggregatedResult = '';
+        try {
+            // Send each chunk from the generator
+            // result should not be an oResponse, but rather a key value pair dict
+            for await (const result of generator) {
+                if (result.delta) {
+                    aggregatedResult += result.delta;
+                }
+                const chunkResponse = await responseBuilder.buildChunk(request, result);
+                await CoreUtils.sendStreamResponse(chunkResponse, stream);
+            }
+            return {
+                message: aggregatedResult,
+            };
+        }
+        catch (error) {
+            // If error occurs during streaming, send error response
+            const errorResponse = await responseBuilder.buildError(request, error, {
+                isStream: true,
+                isLast: true,
+            });
+            await CoreUtils.sendStreamResponse(errorResponse, stream);
+            throw error;
+        }
+    }
+}

package/dist/test/helpers/test-node.tool.d.ts

@@ -0,0 +1,15 @@
+import { oNodeTool } from '../../src/o-node.tool.js';
+/**
+ * Test-only extension of oNodeTool that adds streaming test methods.
+ * This class should only be used in test files and is not part of the production code.
+ */
+export declare class TestNodeTool extends oNodeTool {
+    /**
+     * Test method that emits chunks for 10 seconds at 100ms intervals.
+     * Used for testing streaming functionality across hierarchical networks.
+     *
+     * @returns AsyncGenerator that yields 100 chunks over 10 seconds
+     */
+    _tool_test_stream(): AsyncGenerator<any>;
+}
+//# sourceMappingURL=test-node.tool.d.ts.map

package/dist/test/helpers/test-node.tool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-node.tool.d.ts","sourceRoot":"","sources":["../../../test/helpers/test-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD;;;GAGG;AACH,qBAAa,YAAa,SAAQ,SAAS;IACzC;;;;;OAKG;IACI,iBAAiB,IAAI,cAAc,CAAC,GAAG,CAAC;CAehD"}