@olane/o-node 0.7.12-alpha.39 → 0.7.12-alpha.40

package/dist/o-core/src/utils/object.utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"object.utils.d.ts","sourceRoot":"","sources":["../../../../../o-core/src/utils/object.utils.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW;IACtB,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;WAIrB,YAAY,CACvB,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,GAClD,OAAO,CAAC,GAAG,CAAC;CAkBhB"}

package/dist/o-core/src/utils/object.utils.js

@@ -0,0 +1,23 @@
+export class ObjectUtils {
+    static isObject(obj) {
+        return obj !== null && typeof obj === 'object';
+    }
+    static async allKeyValues(obj, callback) {
+        if (!ObjectUtils.isObject(obj)) {
+            return obj;
+        }
+        for (const key in obj) {
+            let value = obj[key];
+            // iterate over the object if not a primitive
+            if (ObjectUtils.isObject(value)) {
+                value = await ObjectUtils.allKeyValues(value, callback);
+            }
+            else {
+                value = await callback(key, value);
+            }
+            // update the object
+            obj[key] = value;
+        }
+        return obj;
+    }
+}

package/dist/o-core/src/utils/regex.utils.d.ts

@@ -0,0 +1,4 @@
+export declare class RegexUtils {
+    static extractResultFromAI(message: string): any;
+}
+//# sourceMappingURL=regex.utils.d.ts.map

package/dist/o-core/src/utils/regex.utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"regex.utils.d.ts","sourceRoot":"","sources":["../../../../../o-core/src/utils/regex.utils.ts"],"names":[],"mappings":"AAAA,qBAAa,UAAU;IACrB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG;CAajD"}

package/dist/o-core/src/utils/regex.utils.js

@@ -0,0 +1,13 @@
+export class RegexUtils {
+    static extractResultFromAI(message) {
+        // handle 4 levels of nested JSON
+        const match = message.match(/\{.+\}/s);
+        const json = match ? match[0] : null;
+        if (!json) {
+            throw new Error('AI failed to return a valid JSON object');
+        }
+        // process the result and react
+        const planResult = JSON.parse(json);
+        return planResult;
+    }
+}

package/dist/o-core/src/utils/remote.utils.d.ts

@@ -0,0 +1,4 @@
+export declare class RemoteUtils {
+    static getRemoteAddress(): string;
+}
+//# sourceMappingURL=remote.utils.d.ts.map

package/dist/o-core/src/utils/remote.utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote.utils.d.ts","sourceRoot":"","sources":["../../../../../o-core/src/utils/remote.utils.ts"],"names":[],"mappings":"AAAA,qBAAa,WAAW;IACtB,MAAM,CAAC,gBAAgB,IAAI,MAAM;CAKlC"}

package/dist/o-core/src/utils/remote.utils.js

@@ -0,0 +1,5 @@
+export class RemoteUtils {
+    static getRemoteAddress() {
+        return (process.env.OLANE_ADDRESS || '/dns4/leader.olane.com/tcp/4000/tls/ws');
+    }
+}

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

@@ -1,13 +1,13 @@
-import { Connection, Stream } from '@olane/o-config';
+import { Connection } from '@olane/o-config';
 import { oConnection, oRequest, oResponse } from '@olane/o-core';
 import { oNodeConnectionConfig } from './interfaces/o-node-connection.config.js';
 export declare class oNodeConnection extends oConnection {
     protected readonly config: oNodeConnectionConfig;
     p2pConnection: Connection;
     constructor(config: oNodeConnectionConfig);
-    read(source: Stream): Promise<any>;
     validate(): void;
     transmit(request: oRequest): Promise<oResponse>;
+    abort(error: Error): Promise<void>;
     close(): Promise<void>;
 }
 //# sourceMappingURL=o-node-connection.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"o-node-connection.d.ts","sourceRoot":"","sources":["../../../../src/connection/o-node-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAIV,MAAM,EAEP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,WAAW,EAGX,QAAQ,EACR,SAAS,EACV,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,qBAAa,eAAgB,SAAQ,WAAW;IAGlC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB;IAFrD,aAAa,EAAE,UAAU,CAAC;gBAEF,MAAM,EAAE,qBAAqB;IAKtD,IAAI,CAAC,MAAM,EAAE,MAAM;IAWzB,QAAQ;IAOF,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IA0E/C,KAAK;CAKZ"}
+{"version":3,"file":"o-node-connection.d.ts","sourceRoot":"","sources":["../../../../src/connection/o-node-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAEL,WAAW,EAGX,QAAQ,EACR,SAAS,EACV,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,qBAAa,eAAgB,SAAQ,WAAW;IAGlC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB;IAFrD,aAAa,EAAE,UAAU,CAAC;gBAEF,MAAM,EAAE,qBAAqB;IAK5D,QAAQ;IAOF,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAsF/C,KAAK,CAAC,KAAK,EAAE,KAAK;IAMlB,KAAK;CAKZ"}

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

@@ -1,4 +1,3 @@
-import { Uint8ArrayList, byteStream, } from '@olane/o-config';
 import { CoreUtils, oConnection, oError, oErrorCodes, oResponse, } from '@olane/o-core';
 export class oNodeConnection extends oConnection {
     constructor(config) {
@@ -6,15 +5,6 @@ export class oNodeConnection extends oConnection {
         this.config = config;
         this.p2pConnection = config.p2pConnection;
     }
-    async read(source) {
-        const bytes = byteStream(source);
-        const output = await bytes.read({
-            signal: AbortSignal.timeout(this.config.readTimeoutMs ?? 120000), // Default: 2 min timeout
-        });
-        const outputObj = output instanceof Uint8ArrayList ? output.subarray() : output;
-        const jsonStr = new TextDecoder().decode(outputObj);
-        return JSON.parse(jsonStr);
-    }
     validate() {
         if (this.config.p2pConnection.status !== 'open') {
             throw new Error('Connection is not valid');
@@ -24,10 +14,12 @@ export class oNodeConnection extends oConnection {
     async transmit(request) {
         try {
             const stream = await this.p2pConnection.newStream(this.nextHopAddress.protocol, {
-                maxOutboundStreams: Infinity,
+                signal: this.abortSignal,
+                maxOutboundStreams: process.env.MAX_OUTBOUND_STREAMS
+                    ? parseInt(process.env.MAX_OUTBOUND_STREAMS)
+                    : 1000,
                 runOnLimitedConnection: true, // TODO: should this be configurable?
             });
-            const isStreamRequest = request.params._isStream;
             if (!stream || (stream.status !== 'open' && stream.status !== 'reset')) {
                 throw new oError(oErrorCodes.FAILED_TO_DIAL_TARGET, 'Failed to dial target');
             }
@@ -37,16 +29,37 @@ export class oNodeConnection extends oConnection {
             // Send the data with backpressure handling (libp2p v3 best practice)
             const data = new TextEncoder().encode(request.toString());
             const sent = stream.send(data);
-            if (isStreamRequest) {
+            let lastResponse;
+            await new Promise((resolve, reject) => {
+                const abortHandler = async () => {
+                    try {
+                        await stream.abort(new Error('Request aborted'));
+                    }
+                    catch (e) {
+                        // Stream may already be closed
+                    }
+                    reject(new Error('Request aborted'));
+                };
+                // Listen for abort signal
+                if (this.abortSignal) {
+                    this.abortSignal.addEventListener('abort', abortHandler);
+                }
                 stream.addEventListener('message', async (event) => {
                     const response = await CoreUtils.processStreamResponse(event);
                     this.emitter.emit('chunk', response);
                     // marked as the last chunk let's close
-                    if (response.result._last) {
+                    if (response.result._last || !response.result._isStreaming) {
+                        // this.logger.debug('Last chunk received...');
+                        lastResponse = response;
+                        // Clean up abort listener before closing
+                        if (this.abortSignal) {
+                            this.abortSignal.removeEventListener('abort', abortHandler);
+                        }
                         await stream.close();
+                        resolve(true);
                     }
                 });
-            }
+            });
             // If send() returns false, wait for the stream to drain before continuing
             if (!sent) {
                 this.logger.debug('Stream buffer full, waiting for drain...');
@@ -54,15 +67,10 @@ export class oNodeConnection extends oConnection {
                     signal: AbortSignal.timeout(this.config.drainTimeoutMs ?? 30000),
                 }); // Default: 30 second timeout
             }
-            if (isStreamRequest) {
-                return Promise.resolve(CoreUtils.buildResponse(request, 'request is streaming, this response is not used', null));
+            if (stream.status === 'open') {
+                await stream.abort(new Error('Connection closed'));
             }
-            const res = await this.read(stream);
-            await stream.close();
-            // process the response
-            const response = new oResponse({
-                ...res.result,
-            });
+            const response = oResponse.fromJSON(lastResponse);
             return response;
         }
         catch (error) {
@@ -72,6 +80,11 @@ export class oNodeConnection extends oConnection {
             throw error;
         }
     }
+    async abort(error) {
+        this.logger.debug('Aborting connection');
+        await this.p2pConnection.abort(error);
+        this.logger.debug('Connection aborted');
+    }
     async close() {
         this.logger.debug('Closing connection');
         await this.p2pConnection.close();

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

@@ -1 +1 @@
-{"version":3,"file":"o-node-connection.manager.d.ts","sourceRoot":"","sources":["../../../../src/connection/o-node-connection.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,sBAAuB,SAAQ,kBAAkB;IAC5D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,oBAAoB,CAAC,CAAS;IACtC,OAAO,CAAC,qBAAqB,CAAC,CAAS;gBAE3B,MAAM,EAAE,4BAA4B;IAOhD;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA8FlE,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAIpC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,WAAW,GAAG,IAAI;CAe3D"}
+{"version":3,"file":"o-node-connection.manager.d.ts","sourceRoot":"","sources":["../../../../src/connection/o-node-connection.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,sBAAuB,SAAQ,kBAAkB;IAC5D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,oBAAoB,CAAC,CAAS;IACtC,OAAO,CAAC,qBAAqB,CAAC,CAAS;gBAE3B,MAAM,EAAE,4BAA4B;IAOhD;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAmDlE,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAIpC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,WAAW,GAAG,IAAI;CAe3D"}

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

@@ -29,47 +29,19 @@ export class oNodeConnectionManager extends oConnectionManager {
             }
         }
         // Retry configuration for handling transient connection failures
-        const MAX_RETRIES = 3;
-        const BASE_DELAY_MS = 1000; // Start with 1 second
-        const MAX_DELAY_MS = 10000; // Cap at 10 seconds
-        // first time setup connection with retry logic
-        let lastError;
-        for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-            try {
-                if (attempt > 0) {
-                    // Calculate exponential backoff delay: 1s, 2s, 4s, 8s (capped at MAX_DELAY_MS)
-                    const delay = Math.min(BASE_DELAY_MS * Math.pow(2, attempt - 1), MAX_DELAY_MS);
-                    this.logger.debug(`Retry attempt ${attempt}/${MAX_RETRIES} for ${nextHopAddress.toString()} after ${delay}ms delay`);
-                    await new Promise((resolve) => setTimeout(resolve, delay));
-                }
-                const p2pConnection = await this.p2pNode.dial(nextHopAddress.libp2pTransports.map((ma) => ma.toMultiaddr()));
-                const connection = new oNodeConnection({
-                    nextHopAddress: nextHopAddress,
-                    address: address,
-                    p2pConnection: p2pConnection,
-                    callerAddress: callerAddress,
-                    readTimeoutMs: readTimeoutMs ?? this.defaultReadTimeoutMs,
-                    drainTimeoutMs: drainTimeoutMs ?? this.defaultDrainTimeoutMs,
-                    isStream: config.isStream || false,
-                });
-                if (attempt > 0) {
-                    this.logger.info(`Successfully connected to ${nextHopAddress.toString()} on retry attempt ${attempt}`);
-                }
-                // this.cache.set(nextHopAddress.toString(), connection);
-                return connection;
-            }
-            catch (error) {
-                lastError = error;
-                this.logger.warn(`[${callerAddress?.toString() || 'unknown'}] Connection attempt ${attempt + 1}/${MAX_RETRIES + 1} failed for ${nextHopAddress.toString()}: ${error instanceof Error ? error.message : String(error)}`);
-                // Don't retry on the last attempt
-                if (attempt === MAX_RETRIES) {
-                    break;
-                }
-            }
-        }
-        // All retries exhausted
-        this.logger.error(`[${callerAddress?.toString() || 'unknown'}] Failed to connect after ${MAX_RETRIES + 1} attempts to address! Next hop: ${nextHopAddress} With Address: ${address.toString()}`, lastError);
-        throw lastError;
+        const p2pConnection = await this.p2pNode.dial(nextHopAddress.libp2pTransports.map((ma) => ma.toMultiaddr()));
+        const connection = new oNodeConnection({
+            nextHopAddress: nextHopAddress,
+            address: address,
+            p2pConnection: p2pConnection,
+            callerAddress: callerAddress,
+            readTimeoutMs: readTimeoutMs ?? this.defaultReadTimeoutMs,
+            drainTimeoutMs: drainTimeoutMs ?? this.defaultDrainTimeoutMs,
+            isStream: config.isStream ?? false,
+            abortSignal: config.abortSignal,
+        });
+        // this.cache.set(nextHopAddress.toString(), connection);
+        return connection;
     }
     isCached(address) {
         return this.cache.has(address.toString());

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

@@ -8,4 +8,5 @@ export * from './nodes/index.js';
 export * from './interfaces/o-node.tool-config.js';
 export * from './router/index.js';
 export * from './connection/o-stream.request.js';
+export * from './ui/index.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oCAAoC,CAAC;AACnD,cAAc,mBAAmB,CAAC;AAClC,cAAc,kCAAkC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oCAAoC,CAAC;AACnD,cAAc,mBAAmB,CAAC;AAClC,cAAc,kCAAkC,CAAC;AACjD,cAAc,eAAe,CAAC"}

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

@@ -8,3 +8,4 @@ export * from './nodes/index.js';
 export * from './interfaces/o-node.tool-config.js';
 export * from './router/index.js';
 export * from './connection/o-stream.request.js';
+export * from './ui/index.js';

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

@@ -29,23 +29,6 @@ export interface oNodeConfig extends oCoreConfig {
         parentDiscoveryIntervalMs?: number;
         parentDiscoveryMaxDelayMs?: number;
     };
-    /**
-     * Leader request retry configuration
-     * Handles temporary leader unavailability (healing, maintenance)
-     */
-    leaderRetry?: {
-        enabled?: boolean;
-        maxAttempts?: number;
-        baseDelayMs?: number;
-        maxDelayMs?: number;
-        timeoutMs?: number;
-        circuitBreaker?: {
-            enabled?: boolean;
-            failureThreshold?: number;
-            openTimeoutMs?: number;
-            halfOpenMaxAttempts?: number;
-        };
-    };
     /**
      * Connection timeout configuration
      * Controls timeouts for stream read and drain operations in connections

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

@@ -1 +1 @@
-{"version":3,"file":"o-node.config.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/o-node.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAE5B;;;OAGG;IACH,mBAAmB,CAAC,EAAE;QACpB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,WAAW,CAAC,EAAE,OAAO,CAAC;KACvB,CAAC;IAEF;;;OAGG;IACH,YAAY,CAAC,EAAE;QACb,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,yBAAyB,CAAC,EAAE,MAAM,CAAC;QACnC,yBAAyB,CAAC,EAAE,MAAM,CAAC;KACpC,CAAC;IAEF;;;OAGG;IACH,WAAW,CAAC,EAAE;QACZ,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,cAAc,CAAC,EAAE;YACf,OAAO,CAAC,EAAE,OAAO,CAAC;YAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;YAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;YACvB,mBAAmB,CAAC,EAAE,MAAM,CAAC;SAC9B,CAAC;KACH,CAAC;IAEF;;;OAGG;IACH,kBAAkB,CAAC,EAAE;QACnB;;;WAGG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB;;;WAGG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;CACH"}
+{"version":3,"file":"o-node.config.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/o-node.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC9C,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAE5B;;;OAGG;IACH,mBAAmB,CAAC,EAAE;QACpB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,WAAW,CAAC,EAAE,OAAO,CAAC;KACvB,CAAC;IAEF;;;OAGG;IACH,YAAY,CAAC,EAAE;QACb,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,yBAAyB,CAAC,EAAE,MAAM,CAAC;QACnC,yBAAyB,CAAC,EAAE,MAAM,CAAC;KACpC,CAAC;IAEF;;;OAGG;IACH,kBAAkB,CAAC,EAAE;QACnB;;;WAGG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB;;;WAGG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;CACH"}

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

@@ -37,6 +37,7 @@ export declare class oConnectionHeartbeatManager extends oObject {
     private config;
     private heartbeatInterval?;
     private healthMap;
+    private isRunning;
     constructor(node: IHeartbeatableNode, config: HeartbeatConfig);
     start(): Promise<void>;
     stop(): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"o-connection-heartbeat.manager.d.ts","sourceRoot":"","sources":["../../../../src/managers/o-connection-heartbeat.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAOR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC;CACzC;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,2BAA4B,SAAQ,OAAO;IAKpD,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;IALhB,OAAO,CAAC,iBAAiB,CAAC,CAAiB;IAC3C,OAAO,CAAC,SAAS,CAAuC;gBAG9C,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,eAAe;IAK3B,KAAK;IAqBL,IAAI;YAQI,qBAAqB;IAyCnC,OAAO,CAAC,MAAM;YASA,UAAU;IAuFxB,OAAO,CAAC,oBAAoB;IAyD5B,OAAO,CAAC,2BAA2B;IAmBnC,OAAO,CAAC,4BAA4B;IAiBpC;;OAEG;IACH,eAAe,IAAI,gBAAgB,EAAE;IAIrC;;OAEG;IACH,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,GAAG,SAAS;IAIxE;;OAEG;IACH,SAAS,IAAI,eAAe;CAG7B"}
+{"version":3,"file":"o-connection-heartbeat.manager.d.ts","sourceRoot":"","sources":["../../../../src/managers/o-connection-heartbeat.manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAOR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC;CACzC;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,2BAA4B,SAAQ,OAAO;IAMpD,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;IANhB,OAAO,CAAC,iBAAiB,CAAC,CAAiB;IAC3C,OAAO,CAAC,SAAS,CAAuC;IACxD,OAAO,CAAC,SAAS,CAAS;gBAGhB,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,eAAe;IAK3B,KAAK;IAqBL,IAAI;YAQI,qBAAqB;IAgDnC,OAAO,CAAC,MAAM;YAcA,UAAU;IAuFxB,OAAO,CAAC,oBAAoB;IAyD5B,OAAO,CAAC,2BAA2B;IAmBnC,OAAO,CAAC,4BAA4B;IAiBpC;;OAEG;IACH,eAAe,IAAI,gBAAgB,EAAE;IAIrC;;OAEG;IACH,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,GAAG,SAAS;IAIxE;;OAEG;IACH,SAAS,IAAI,eAAe;CAG7B"}

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

@@ -1,4 +1,4 @@
-import { oObject, ChildLeftEvent, ParentDisconnectedEvent, LeaderDisconnectedEvent, ConnectionDegradedEvent, ConnectionRecoveredEvent, } from '@olane/o-core';
+import { oObject, ChildLeftEvent, ParentDisconnectedEvent, LeaderDisconnectedEvent, ConnectionDegradedEvent, ConnectionRecoveredEvent, oAddress, } from '@olane/o-core';
 /**
  * Connection Heartbeat Manager
  *
@@ -19,6 +19,7 @@ export class oConnectionHeartbeatManager extends oObject {
         this.node = node;
         this.config = config;
         this.healthMap = new Map();
+        this.isRunning = false;
     }
     async start() {
         if (!this.config.enabled) {
@@ -40,6 +41,10 @@ export class oConnectionHeartbeatManager extends oObject {
         this.healthMap.clear();
     }
     async performHeartbeatCycle() {
+        if (!this.isRunning) {
+            return;
+        }
+        this.isRunning = true;
         const targets = [];
         // Check if this is a leader node (no leader in hierarchy = we are leader)
         const isLeaderNode = this.node.getLeaders().length === 0;
@@ -55,7 +60,8 @@ export class oConnectionHeartbeatManager extends oObject {
             // Use this.node.parent getter to get the current parent address with transports
             // rather than getParents() which may have a stale reference
             const parent = this.node.parent;
-            if (parent) {
+            // make sure that we don't double ping the leader
+            if (parent && parent?.toString() !== oAddress.leader().toString()) {
                 targets.push({ address: parent, role: 'parent' });
             }
         }
@@ -68,12 +74,20 @@ export class oConnectionHeartbeatManager extends oObject {
         }
         // Ping all targets in parallel
         await Promise.allSettled(targets.map((target) => this.pingTarget(target.address, target.role)));
+        this.isRunning = false;
     }
     doPing(address) {
         if (address.toString() === this.node.address.toString()) {
             return Promise.resolve();
         }
-        return this.node.p2pNode.services.ping.ping(address.libp2pTransports[0].toMultiaddr());
+        const transport = address.libp2pTransports[0].toMultiaddr();
+        if (transport.toString().indexOf('p2p-circuit') > -1) {
+            return this.node.use(address, {
+                method: 'ping',
+                params: {},
+            });
+        }
+        return this.node.p2pNode.services.ping.ping(transport);
     }
     async pingTarget(address, role) {
         if (!address.libp2pTransports.length) {

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

@@ -3,14 +3,13 @@ import { PeerId } from '@olane/o-config';
 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 { oAddress, oRequest, oNotificationManager } from '@olane/o-core';
+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 { oReconnectionManager } from './managers/o-reconnection.manager.js';
-import { LeaderRequestWrapper } from './utils/leader-request-wrapper.js';
 import { oNodeConnectionConfig } from './connection/index.js';
 export declare class oNode extends oToolBase {
     peerId: PeerId;
@@ -21,7 +20,6 @@ export declare class oNode extends oToolBase {
     hierarchyManager: oNodeHierarchyManager;
     connectionHeartbeatManager?: oConnectionHeartbeatManager;
     reconnectionManager?: oReconnectionManager;
-    leaderRequestWrapper: LeaderRequestWrapper;
     protected didRegister: boolean;
     constructor(config: oNodeConfig);
     get leader(): oNodeAddress | null;
@@ -55,19 +53,20 @@ export declare class oNode extends oToolBase {
     /**
      * Override use() to wrap leader/registry requests with retry logic
      */
-    use(address: oAddress, data?: {
-        method?: string;
-        params?: {
-            [key: string]: any;
-        };
-        id?: string;
-    }, options?: {
-        noRouting?: boolean;
-    }): Promise<any>;
     teardown(): Promise<void>;
     getLeaders(): oNodeAddress[];
     getParents(): oNodeAddress[];
     getChildren(): oNodeAddress[];
     removeChild(childAddress: oNodeAddress): void;
+    /**
+     * Get the total number of active streams across all connections
+     * @returns Total count of active streams
+     */
+    getStreamCount(): number;
+    /**
+     * Get libp2p metrics for this node
+     * Tool method that can be called remotely by monitoring systems
+     */
+    _tool_get_libp2p_metrics(request: oRequest): Promise<any>;
 }
 //# sourceMappingURL=o-node.d.ts.map

package/dist/o-node/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/o-node/src/o-node.js

@@ -12,7 +12,6 @@ import { oLeaderResolverFallback } from './router/index.js';
 import { oNodeNotificationManager } from './o-node.notification-manager.js';
 import { oConnectionHeartbeatManager } from './managers/o-connection-heartbeat.manager.js';
 import { oReconnectionManager } from './managers/o-reconnection.manager.js';
-import { LeaderRequestWrapper } from './utils/leader-request-wrapper.js';
 export class oNode extends oToolBase {
     constructor(config) {
         super(config);
@@ -103,7 +102,9 @@ export class oNode extends oToolBase {
                 peerId: this.peerId.toString(),
             },
         };
-        await this.use(address, params);
+        this.use(address, params).catch((error) => {
+            this.logger.error('Failed to unregister from network:', error);
+        });
     }
     async registerParent() {
         if (this.type === NodeType.LEADER) {
@@ -123,7 +124,7 @@ export class oNode extends oToolBase {
         // if no parent transports, register with the parent to get them
         // TODO: should we remove the transports check to make this more consistent?
         if (this.config.parent) {
-            this.logger.debug('Registering node with parent...', this.config.parent);
+            this.logger.debug('Registering node with parent...', this.config.parent?.toString());
             await this.use(this.config.parent, {
                 method: 'child_register',
                 params: {
@@ -243,6 +244,10 @@ export class oNode extends oToolBase {
                     if (this.hierarchyManager.children.some((c) => c.libp2pTransports.some((t) => t.toPeerId() === peerId.toString()))) {
                         return false;
                     }
+                    // check for standalone node
+                    if (!this.config.parent && !this.config.leader) {
+                        return false;
+                    }
                     return true;
                 },
                 // who can call us?
@@ -346,28 +351,11 @@ export class oNode extends oToolBase {
         await this.initializeRouter();
         // need to wait until our libpp2 node is initialized before calling super.initialize
         await super.initialize();
-        this.logger.debug('Node initializedddd!', this.transports.map((t) => t.toString()));
+        this.logger.debug('Node initialized!', this.transports.map((t) => t.toString()));
         this.address.setTransports(this.transports);
         this.peerId = this.p2pNode.peerId;
         // initialize connection manager
         await this.initConnectionManager();
-        // Initialize leader request wrapper with circuit breaker
-        this.leaderRequestWrapper = new LeaderRequestWrapper({
-            enabled: this.config.leaderRetry?.enabled ?? true,
-            maxAttempts: this.config.leaderRetry?.maxAttempts ?? 20,
-            baseDelayMs: this.config.leaderRetry?.baseDelayMs ?? 2000,
-            maxDelayMs: this.config.leaderRetry?.maxDelayMs ?? 30000,
-            timeoutMs: this.config.leaderRetry?.timeoutMs ?? 120000,
-            circuitBreaker: {
-                enabled: this.config.leaderRetry?.circuitBreaker?.enabled ?? true,
-                failureThreshold: this.config.leaderRetry?.circuitBreaker?.failureThreshold ?? 3,
-                openTimeoutMs: this.config.leaderRetry?.circuitBreaker?.openTimeoutMs ?? 30000,
-                halfOpenMaxAttempts: this.config.leaderRetry?.circuitBreaker?.halfOpenMaxAttempts ?? 1,
-            },
-        });
-        this.logger.info(`Leader retry config: enabled=${this.leaderRequestWrapper.getConfig().enabled}, ` +
-            `maxAttempts=${this.leaderRequestWrapper.getConfig().maxAttempts}, ` +
-            `circuitBreaker.enabled=${this.leaderRequestWrapper.getConfig().circuitBreaker?.enabled}`);
         // initialize address resolution
         this.router.addResolver(new oMethodResolver(this.address));
         this.router.addResolver(new oNodeResolver(this.address));
@@ -383,10 +371,20 @@ export class oNode extends oToolBase {
     /**
      * Override use() to wrap leader/registry requests with retry logic
      */
-    async use(address, data, options) {
-        // Wrap leader/registry requests with retry logic
-        return this.leaderRequestWrapper.execute(() => super.use(address, data, { noRouting: options?.noRouting ?? false }), address, data?.method);
-    }
+    // 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) {
@@ -411,4 +409,85 @@ export class oNode extends oToolBase {
     removeChild(childAddress) {
         this.hierarchyManager.removeChild(childAddress);
     }
+    /**
+     * Get the total number of active streams across all connections
+     * @returns Total count of active streams
+     */
+    getStreamCount() {
+        if (!this.p2pNode) {
+            return 0;
+        }
+        const connections = this.p2pNode.getConnections();
+        return connections.reduce((count, conn) => {
+            return count + (conn.streams?.length || 0);
+        }, 0);
+    }
+    /**
+     * Get libp2p metrics for this node
+     * Tool method that can be called remotely by monitoring systems
+     */
+    async _tool_get_libp2p_metrics(request) {
+        if (!this.p2pNode) {
+            return {
+                error: 'libp2p node not available',
+                available: false,
+            };
+        }
+        try {
+            // Get basic connection stats
+            const connections = this.p2pNode.getConnections();
+            const peers = await this.p2pNode.peerStore.all();
+            const inbound = connections.filter((c) => c.direction === 'inbound').length;
+            const outbound = connections.filter((c) => c.direction === 'outbound').length;
+            // Get DHT info if available
+            const services = this.p2pNode.services;
+            const dht = services?.dht;
+            const routingTable = dht?.routingTable;
+            const kBuckets = routingTable?.kb || null;
+            let routingTableSize = 0;
+            if (kBuckets) {
+                // Handle both array and object-like structures
+                if (Array.isArray(kBuckets)) {
+                    for (const bucket of kBuckets) {
+                        routingTableSize += bucket.peers?.length || 0;
+                    }
+                }
+                else if (typeof kBuckets === 'object') {
+                    // If it's an object, iterate over its values
+                    for (const bucket of Object.values(kBuckets)) {
+                        routingTableSize += bucket?.peers?.length || 0;
+                    }
+                }
+            }
+            // Calculate total stream count across all connections
+            const streamCount = connections.reduce((count, conn) => {
+                return count + (conn.streams?.length || 0);
+            }, 0);
+            return {
+                available: true,
+                timestamp: Date.now(),
+                nodeAddress: this.address.toString(),
+                peerCount: peers.length,
+                connectionCount: connections.length,
+                inboundConnections: inbound,
+                outboundConnections: outbound,
+                streamCount,
+                dhtEnabled: !!dht,
+                dhtMode: dht?.clientMode ? 'client' : 'server',
+                dhtRoutingTableSize: routingTableSize,
+                protocols: Array.from(this.p2pNode.getProtocols()),
+                selfPeerId: this.p2pNode.peerId.toString(),
+                multiaddrs: this.p2pNode
+                    .getMultiaddrs()
+                    .map((ma) => ma.toString()),
+            };
+        }
+        catch (error) {
+            return {
+                error: `Failed to collect libp2p metrics: ${error.message}`,
+                available: false,
+                nodeAddress: this.address.toString(),
+            };
+        }
+    }
 }