@olane/o-node 0.7.12-alpha.12 → 0.7.12-alpha.13

package/dist/src/interfaces/i-heartbeatable-node.d.ts

@@ -0,0 +1,49 @@
+import { oNotificationManager } from '@olane/o-core';
+import { Libp2p } from '@olane/o-config';
+import { oNodeAddress } from '../router/o-node.address.js';
+/**
+ * Interface for nodes that support connection heartbeat monitoring.
+ * This interface defines the contract that oConnectionHeartbeatManager needs
+ * to access live hierarchy state without holding stale references.
+ */
+export interface IHeartbeatableNode {
+    /**
+     * The node's current address
+     */
+    address: oNodeAddress;
+    /**
+     * The notification manager for emitting heartbeat events
+     */
+    notificationManager: oNotificationManager;
+    /**
+     * The underlying libp2p node for ping operations
+     */
+    p2pNode: Libp2p;
+    /**
+     * The current parent address (with live transport updates)
+     * @returns Parent address or null if no parent
+     */
+    parent: oNodeAddress | null;
+    /**
+     * Get the current list of leader addresses
+     * @returns Array of leader addresses (empty if this node is the leader)
+     */
+    getLeaders(): oNodeAddress[];
+    /**
+     * Get the current list of parent addresses
+     * @returns Array of parent addresses
+     */
+    getParents(): oNodeAddress[];
+    /**
+     * Get the current list of child addresses
+     * @returns Array of child addresses
+     */
+    getChildren(): oNodeAddress[];
+    /**
+     * Remove a child from the hierarchy
+     * @param childAddress The address of the child to remove
+     */
+    removeChild(childAddress: oNodeAddress): void;
+    use(param1: any, param2: any): Promise<any>;
+}
+//# sourceMappingURL=i-heartbeatable-node.d.ts.map

package/dist/src/interfaces/i-heartbeatable-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-heartbeatable-node.d.ts","sourceRoot":"","sources":["../../../src/interfaces/i-heartbeatable-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAE3D;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IAEtB;;OAEG;IACH,mBAAmB,EAAE,oBAAoB,CAAC;IAE1C;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;OAGG;IACH,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAE5B;;;OAGG;IACH,UAAU,IAAI,YAAY,EAAE,CAAC;IAE7B;;;OAGG;IACH,UAAU,IAAI,YAAY,EAAE,CAAC;IAE7B;;;OAGG;IACH,WAAW,IAAI,YAAY,EAAE,CAAC;IAE9B;;;OAGG;IACH,WAAW,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAE9C,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC7C"}

package/dist/src/interfaces/i-heartbeatable-node.js

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

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

@@ -1,8 +1,6 @@
-import { Libp2p } from '@olane/o-config';
 import { oObject } from '@olane/o-core';
 import { oNodeAddress } from '../router/o-node.address.js';
-import { oNodeHierarchyManager } from '../o-node.hierarchy-manager.js';
-import { oNotificationManager } from '@olane/o-core';
+import { IHeartbeatableNode } from '../interfaces/i-heartbeatable-node.js';
 export interface HeartbeatConfig {
     enabled: boolean;
     intervalMs: number;
@@ -35,17 +33,15 @@ export interface ConnectionHealth {
  * - Emits ParentDisconnectedEvent when parent dies (triggers reconnection)
  */
 export declare class oConnectionHeartbeatManager extends oObject {
-    private p2pNode;
-    private hierarchyManager;
-    private notificationManager;
-    private address;
+    private node;
     private config;
     private heartbeatInterval?;
     private healthMap;
-    constructor(p2pNode: Libp2p, hierarchyManager: oNodeHierarchyManager, notificationManager: oNotificationManager, address: oNodeAddress, config: HeartbeatConfig);
+    constructor(node: IHeartbeatableNode, config: HeartbeatConfig);
     start(): Promise<void>;
     stop(): Promise<void>;
     private performHeartbeatCycle;
+    private doPing;
     private pingTarget;
     private handleConnectionDead;
     private emitConnectionDegradedEvent;

package/dist/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,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EACL,OAAO,EAMR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,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,OAAO;IACf,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM;IARhB,OAAO,CAAC,iBAAiB,CAAC,CAAiB;IAC3C,OAAO,CAAC,SAAS,CAAuC;gBAG9C,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,qBAAqB,EACvC,mBAAmB,EAAE,oBAAoB,EACzC,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE,eAAe;IAK3B,KAAK;IAqBL,IAAI;YAQI,qBAAqB;YAuCrB,UAAU;IA2FxB,OAAO,CAAC,oBAAoB;IAyD5B,OAAO,CAAC,2BAA2B;IAmBnC,OAAO,CAAC,4BAA4B;IAiBpC,OAAO,CAAC,wBAAwB;IAahC;;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;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;IA0CnC,OAAO,CAAC,MAAM;YAOA,UAAU;IAuFxB,OAAO,CAAC,oBAAoB;IAyD5B,OAAO,CAAC,2BAA2B;IAmBnC,OAAO,CAAC,4BAA4B;IAiBpC,OAAO,CAAC,wBAAwB;IAahC;;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/src/managers/o-connection-heartbeat.manager.js

@@ -14,12 +14,9 @@ import { oObject, ChildLeftEvent, ParentDisconnectedEvent, LeaderDisconnectedEve
  * - Emits ParentDisconnectedEvent when parent dies (triggers reconnection)
  */
 export class oConnectionHeartbeatManager extends oObject {
-    constructor(p2pNode, hierarchyManager, notificationManager, address, config) {
+    constructor(node, config) {
         super();
-        this.p2pNode = p2pNode;
-        this.hierarchyManager = hierarchyManager;
-        this.notificationManager = notificationManager;
-        this.address = address;
+        this.node = node;
         this.config = config;
         this.healthMap = new Map();
     }
@@ -45,24 +42,27 @@ export class oConnectionHeartbeatManager extends oObject {
     async performHeartbeatCycle() {
         const targets = [];
         // Check if this is a leader node (no leader in hierarchy = we are leader)
-        const isLeaderNode = this.hierarchyManager.getLeaders().length === 0;
+        const isLeaderNode = this.node.getLeaders().length === 0;
         // Collect leader (if enabled and we're not the leader)
         if (!isLeaderNode) {
-            const leaders = this.hierarchyManager.getLeaders();
+            const leaders = this.node.getLeaders();
             for (const leader of leaders) {
                 targets.push({ address: leader, role: 'leader' });
             }
         }
         // Collect parent
         if (this.config.checkParent && !isLeaderNode) {
-            const parents = this.hierarchyManager.getParents();
-            for (const parent of parents) {
+            // 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;
+            this.logger.debug('Parent address:', parent);
+            if (parent) {
                 targets.push({ address: parent, role: 'parent' });
             }
         }
         // Collect children
         if (this.config.checkChildren) {
-            const children = this.hierarchyManager.getChildren();
+            const children = this.node.getChildren();
             for (const child of children) {
                 targets.push({ address: child, role: 'child' });
             }
@@ -70,12 +70,17 @@ export class oConnectionHeartbeatManager extends oObject {
         // Ping all targets in parallel
         await Promise.allSettled(targets.map((target) => this.pingTarget(target.address, target.role)));
     }
+    doPing(address) {
+        return this.node.use(address, {
+            method: 'ping',
+            params: {},
+        });
+    }
     async pingTarget(address, role) {
         if (!address.libp2pTransports.length) {
-            this.logger.warn(`No transports found for ${address}`);
+            this.logger.debug(`${role} has no transports, skipping ping`, address);
             return;
         }
-        const transports = address.libp2pTransports;
         const key = address.toString();
         let health = this.healthMap.get(key);
         if (!health) {
@@ -98,10 +103,7 @@ export class oConnectionHeartbeatManager extends oObject {
             });
             // Race between ping and timeout
             // The ping service accepts PeerId as string or object
-            await Promise.race([
-                this.p2pNode.services.ping.ping(transports[0].toMultiaddr()),
-                timeoutPromise,
-            ]);
+            await Promise.race([this.doPing(address), timeoutPromise]);
             const latency = Date.now() - startTime;
             // Success - update health
             health.lastSuccessfulPing = Date.now();
@@ -121,7 +123,7 @@ export class oConnectionHeartbeatManager extends oObject {
         }
         catch (error) {
             health.consecutiveFailures++;
-            this.logger.warn(`Ping failed: ${address} (failures: ${health.consecutiveFailures}/${this.config.failureThreshold})`);
+            this.logger.warn(`Ping failed: ${address} (failures: ${health.consecutiveFailures}/${this.config.failureThreshold})`, error);
             // Update status based on failure count
             if (health.consecutiveFailures >= this.config.failureThreshold) {
                 this.handleConnectionDead(address, role, health);
@@ -141,20 +143,20 @@ export class oConnectionHeartbeatManager extends oObject {
         // Emit events based on role
         if (role === 'child') {
             // Remove dead child from hierarchy
-            this.hierarchyManager.removeChild(address);
+            this.node.removeChild(address);
             // Emit child left event
-            this.notificationManager.emit(new ChildLeftEvent({
-                source: this.address,
+            this.node.notificationManager.emit(new ChildLeftEvent({
+                source: this.node.address,
                 childAddress: address,
-                parentAddress: this.address,
+                parentAddress: this.node.address,
                 reason: `heartbeat_failed_${health.consecutiveFailures}_times`,
             }));
             this.logger.warn(`Removed dead child: ${address}`);
         }
         else if (role === 'parent') {
             // Emit parent disconnected event
-            this.notificationManager.emit(new ParentDisconnectedEvent({
-                source: this.address,
+            this.node.notificationManager.emit(new ParentDisconnectedEvent({
+                source: this.node.address,
                 parentAddress: address,
                 reason: `heartbeat_failed_${health.consecutiveFailures}_times`,
             }));
@@ -163,8 +165,8 @@ export class oConnectionHeartbeatManager extends oObject {
         }
         else if (role === 'leader') {
             // Emit leader disconnected event
-            this.notificationManager.emit(new LeaderDisconnectedEvent({
-                source: this.address,
+            this.node.notificationManager.emit(new LeaderDisconnectedEvent({
+                source: this.node.address,
                 leaderAddress: address,
                 reason: `heartbeat_failed_${health.consecutiveFailures}_times`,
             }));
@@ -175,8 +177,8 @@ export class oConnectionHeartbeatManager extends oObject {
     emitConnectionDegradedEvent(address, role, failures) {
         // ConnectionDegradedEvent only supports parent/child, so we map leader to parent
         const eventRole = role === 'leader' ? 'parent' : role === 'child' ? 'child' : 'parent';
-        this.notificationManager.emit(new ConnectionDegradedEvent({
-            source: this.address,
+        this.node.notificationManager.emit(new ConnectionDegradedEvent({
+            source: this.node.address,
             targetAddress: address,
             role: eventRole,
             consecutiveFailures: failures,
@@ -185,8 +187,8 @@ export class oConnectionHeartbeatManager extends oObject {
     emitConnectionRecoveredEvent(address, role) {
         // ConnectionRecoveredEvent only supports parent/child, so we map leader to parent
         const eventRole = role === 'leader' ? 'parent' : role === 'child' ? 'child' : 'parent';
-        this.notificationManager.emit(new ConnectionRecoveredEvent({
-            source: this.address,
+        this.node.notificationManager.emit(new ConnectionRecoveredEvent({
+            source: this.node.address,
             targetAddress: address,
             role: eventRole,
         }));

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

@@ -41,7 +41,7 @@ export declare class oReconnectionManager extends oObject {
     /**
      * Wait for non-leader parent to appear in registry and reconnect
      */
-    private waitForParentAndReconnect;
+    waitForParentAndReconnect(): Promise<void>;
     private handleReconnectionFailure;
     private calculateNodeLevel;
     private calculateBackoffDelay;

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,EAQR,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;YAoBb,wBAAwB;YAaxB,wBAAwB;YAexB,wBAAwB;IAehC,mBAAmB;YAkDX,2BAA2B;YAiB3B,iBAAiB;IAgB/B;;;OAGG;YACW,yBAAyB;IA8EvC;;OAEG;YACW,yBAAyB;IA8FvC,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,EAQR,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;YAoBb,wBAAwB;YAaxB,wBAAwB;YAexB,wBAAwB;IAehC,mBAAmB;YAgDX,2BAA2B;YAiB3B,iBAAiB;IAkB/B;;;OAGG;YACW,yBAAyB;IAiFvC;;OAEG;IACG,yBAAyB;IAiG/B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,qBAAqB;IAK7B,OAAO,CAAC,KAAK;CAGd"}

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

@@ -45,6 +45,7 @@ export declare class oNode extends oToolBase {
     configure(): Promise<Libp2pConfig>;
     protected createNode(): Promise<Libp2p>;
     connect(nextHopAddress: oNodeAddress, targetAddress: oNodeAddress): Promise<oNodeConnection>;
+    postInitialize(): Promise<void>;
     initialize(): Promise<void>;
     /**
      * Override use() to wrap leader/registry requests with retry logic
@@ -57,5 +58,9 @@ export declare class oNode extends oToolBase {
         id?: string;
     }): Promise<any>;
     teardown(): Promise<void>;
+    getLeaders(): oNodeAddress[];
+    getParents(): oNodeAddress[];
+    getChildren(): oNodeAddress[];
+    removeChild(childAddress: oNodeAddress): void;
 }
 //# sourceMappingURL=o-node.d.ts.map

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":"AAAA,OAAO,EAGL,MAAM,EACN,YAAY,EACb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAIL,QAAQ,EACR,QAAQ,EAER,oBAAoB,EACrB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,EAAmB,SAAS,EAAE,MAAM,eAAe,CAAC;AAI3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,qBAAa,KAAM,SAAQ,SAAS;IAC3B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,MAAM,CAAC;IACjB,OAAO,EAAG,YAAY,CAAC;IACvB,MAAM,EAAE,WAAW,CAAC;IACpB,iBAAiB,EAAG,sBAAsB,CAAC;IAC3C,gBAAgB,EAAG,qBAAqB,CAAC;IACzC,0BAA0B,CAAC,EAAE,2BAA2B,CAAC;IACzD,mBAAmB,CAAC,EAAE,oBAAoB,CAAC;IAC3C,oBAAoB,EAAG,oBAAoB,CAAC;IACnD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;gBAE3B,MAAM,EAAE,WAAW;IAK/B,IAAI,MAAM,IAAI,YAAY,GAAG,IAAI,CAEhC;IAED,IAAI,aAAa,IAAI,YAAY,CAKhC;IAED,IAAI,YAAY,IAAI,MAAM,GAAG,IAAI,CAOhC;IAED,mBAAmB,IAAI,GAAG,EAAE;IAItB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC,SAAS,CAAC,yBAAyB,IAAI,oBAAoB;IAQ3D,IAAI,aAAa,IAAI,YAAY,CAEhC;IAED,IAAI,gBAAgB,IAAI,cAAc,EAAE,CAEvC;IAED,IAAI,UAAU,IAAI,cAAc,EAAE,CAIjC;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsD3B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B/B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAwC/B,aAAa,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;IAItC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAetB,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAG1D;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;cA0FxB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAMvC,OAAO,CACX,cAAc,EAAE,YAAY,EAC5B,aAAa,EAAE,YAAY,GAC1B,OAAO,CAAC,eAAe,CAAC;IA0BrB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyGjC;;OAEG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAC;QAChC,EAAE,CAAC,EAAE,MAAM,CAAC;KACb,GACA,OAAO,CAAC,GAAG,CAAC;IAST,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAYhC"}
+{"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

@@ -110,11 +110,20 @@ export class oNode extends oToolBase {
             this.logger.debug('Skipping parent registration, node is leader');
             return;
         }
+        if (!this.parent?.libp2pTransports?.length) {
+            this.logger.debug('Parent has no transports, waiting for reconnection & leader ack');
+            if (this.parent?.toString() === oAddress.leader().toString()) {
+                this.parent.setTransports(this.leader?.libp2pTransports || []);
+            }
+            else {
+                await this.reconnectionManager?.waitForParentAndReconnect();
+            }
+        }
         // 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.config.parent.transports.length === 0) {
+        if (this.config.parent) {
             this.logger.debug('Registering node with parent...', this.config.parent);
-            const parentRegistration = await this.use(this.config.parent, {
+            await this.use(this.config.parent, {
                 method: 'child_register',
                 params: {
                     address: this.address.toString(),
@@ -123,9 +132,6 @@ export class oNode extends oToolBase {
                     _token: this.config.joinToken,
                 },
             });
-            const { parentTransports } = parentRegistration.result.data;
-            // update the parent transports
-            this.config.parent.setTransports(parentTransports.map((t) => new oNodeTransport(t)));
         }
     }
     async register() {
@@ -281,6 +287,20 @@ export class oNode extends oToolBase {
         }
         return connection;
     }
+    async postInitialize() {
+        // Initialize connection heartbeat manager
+        this.connectionHeartbeatManager = new oConnectionHeartbeatManager(this, {
+            enabled: this.config.connectionHeartbeat?.enabled ?? true,
+            intervalMs: this.config.connectionHeartbeat?.intervalMs ?? 15000,
+            timeoutMs: this.config.connectionHeartbeat?.timeoutMs ?? 15000,
+            failureThreshold: this.config.connectionHeartbeat?.failureThreshold ?? 3,
+            checkChildren: this.config.connectionHeartbeat?.checkChildren ?? false,
+            checkParent: this.config.connectionHeartbeat?.checkParent ?? true,
+            checkLeader: true,
+        });
+        this.logger.info(`Connection heartbeat config: leader=${this.connectionHeartbeatManager.getConfig().checkLeader}, ` +
+            `parent=${this.connectionHeartbeatManager.getConfig().checkParent}`);
+    }
     async initialize() {
         this.logger.debug('Initializing node...');
         if (this.p2pNode && this.state !== NodeState.STOPPED) {
@@ -328,18 +348,6 @@ export class oNode extends oToolBase {
         // Read ENABLE_LEADER_HEARTBEAT environment variable
         const enableLeaderHeartbeat = this.parent?.toString() === oAddress.leader().toString();
         this.logger.debug(`Enable leader heartbeat: ${enableLeaderHeartbeat}`);
-        // Initialize connection heartbeat manager
-        this.connectionHeartbeatManager = new oConnectionHeartbeatManager(this.p2pNode, this.hierarchyManager, this.notificationManager, this.address, {
-            enabled: this.config.connectionHeartbeat?.enabled ?? true,
-            intervalMs: this.config.connectionHeartbeat?.intervalMs ?? 15000,
-            timeoutMs: this.config.connectionHeartbeat?.timeoutMs ?? 5000,
-            failureThreshold: this.config.connectionHeartbeat?.failureThreshold ?? 3,
-            checkChildren: this.config.connectionHeartbeat?.checkChildren ?? true,
-            checkParent: this.config.connectionHeartbeat?.checkParent ?? true,
-            checkLeader: enableLeaderHeartbeat,
-        });
-        this.logger.info(`Connection heartbeat config: leader=${this.connectionHeartbeatManager.getConfig().checkLeader}, ` +
-            `parent=${this.connectionHeartbeatManager.getConfig().checkParent}`);
         // Initialize reconnection manager
         if (this.config.reconnection?.enabled !== false) {
             this.reconnectionManager = new oReconnectionManager(this, {
@@ -371,4 +379,17 @@ export class oNode extends oToolBase {
             await this.p2pNode.stop();
         }
     }
+    // IHeartbeatableNode interface methods
+    getLeaders() {
+        return [this.leader];
+    }
+    getParents() {
+        return this.hierarchyManager.getParents();
+    }
+    getChildren() {
+        return this.hierarchyManager.getChildren();
+    }
+    removeChild(childAddress) {
+        this.hierarchyManager.removeChild(childAddress);
+    }
 }

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

@@ -21,7 +21,8 @@ export class oNodeRoutingPolicy extends oRoutingPolicy {
             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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.12-alpha.12",
+  "version": "0.7.12-alpha.13",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -54,12 +54,12 @@
     "typescript": "5.4.5"
   },
   "dependencies": {
-    "@olane/o-config": "0.7.12-alpha.12",
-    "@olane/o-core": "0.7.12-alpha.12",
-    "@olane/o-protocol": "0.7.12-alpha.12",
-    "@olane/o-tool": "0.7.12-alpha.12",
+    "@olane/o-config": "0.7.12-alpha.13",
+    "@olane/o-core": "0.7.12-alpha.13",
+    "@olane/o-protocol": "0.7.12-alpha.13",
+    "@olane/o-tool": "0.7.12-alpha.13",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0"
   },
-  "gitHead": "590e95c1281ce1df427ba57816cd825c9f52154e"
+  "gitHead": "dad019b117feb02f74eeec70de9ee82b76b68f6c"
 }