@olane/o-node 0.7.13-alpha.0 → 0.7.13-alpha.1

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

@@ -3,5 +3,6 @@ import { Libp2p } from '@olane/o-config';
 export interface oNodeConnectionManagerConfig extends oConnectionManagerConfig {
     p2pNode: Libp2p;
     runOnLimitedConnection?: boolean;
+    originAddress?: string;
 }
 //# sourceMappingURL=o-node-connection-manager.config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"o-node-connection-manager.config.d.ts","sourceRoot":"","sources":["../../../../src/connection/interfaces/o-node-connection-manager.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,WAAW,4BAA6B,SAAQ,wBAAwB;IAC5E,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC"}
+{"version":3,"file":"o-node-connection-manager.config.d.ts","sourceRoot":"","sources":["../../../../src/connection/interfaces/o-node-connection-manager.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,MAAM,WAAW,4BAA6B,SAAQ,wBAAwB;IAC5E,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB"}

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

@@ -7,7 +7,6 @@ export declare class oNodeConnection extends oConnection {
     p2pConnection: Connection;
     protected streamHandler: StreamHandler;
     constructor(config: oNodeConnectionConfig);
-    setupConnectionListeners(): void;
     validate(stream?: Stream): void;
     getOrCreateStream(): Promise<Stream>;
     transmit(request: oRequest): Promise<oResponse>;

package/dist/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,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAEL,WAAW,EAGX,QAAQ,EACR,SAAS,EACV,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,qBAAa,eAAgB,SAAQ,WAAW;IAIlC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB;IAHrD,aAAa,EAAE,UAAU,CAAC;IACjC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;gBAER,MAAM,EAAE,qBAAqB;IAO5D,wBAAwB;IAYxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;IAmBlB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAkBpC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IA0C/C,YAAY,CAAC,MAAM,EAAE,MAAM;IAQ3B,KAAK,CAAC,KAAK,EAAE,KAAK;IAMlB,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,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAEL,WAAW,EAGX,QAAQ,EACR,SAAS,EACV,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,qBAAa,eAAgB,SAAQ,WAAW;IAIlC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB;IAHrD,aAAa,EAAE,UAAU,CAAC;IACjC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;gBAER,MAAM,EAAE,qBAAqB;IAM5D,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;IAmBlB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAkBpC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IA0C/C,YAAY,CAAC,MAAM,EAAE,MAAM;IAQ3B,KAAK,CAAC,KAAK,EAAE,KAAK;IAMlB,KAAK;CAKZ"}

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

@@ -6,14 +6,6 @@ export class oNodeConnection extends oConnection {
         this.config = config;
         this.p2pConnection = config.p2pConnection;
         this.streamHandler = new StreamHandler(this.logger);
-        this.setupConnectionListeners();
-    }
-    setupConnectionListeners() {
-        this.logger.debug('Setting up connection listeners for address: ' +
-            this.nextHopAddress.toString());
-        this.p2pConnection?.addEventListener('close', () => {
-            this.logger.debug('Connection closed for address: ' + this.nextHopAddress.toString());
-        });
     }
     validate(stream) {
         if (this.config.p2pConnection.status !== 'open') {

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

@@ -7,9 +7,21 @@ export declare class oNodeConnectionManager extends oConnectionManager {
     protected p2pNode: Libp2p;
     private defaultReadTimeoutMs?;
     private defaultDrainTimeoutMs?;
-    private connections;
+    private connectionsByPeerId;
+    private pendingDialsByPeerId;
     constructor(config: oNodeConnectionManagerConfig);
+    /**
+     * Set up listeners to maintain connection cache state
+     */
+    private setupConnectionListeners;
+    /**
+     * Extract peer ID string from an address
+     * @param address - The address to extract peer ID from
+     * @returns The peer ID string or null if not found
+     */
+    private getPeerIdFromAddress;
     getOrCreateConnection(nextHopAddress: oAddress, address: oAddress): Promise<Connection>;
+    private performDial;
     /**
      * Connect to a given address, reusing libp2p connections when possible
      * @param config - Connection configuration
@@ -17,16 +29,33 @@ export declare class oNodeConnectionManager extends oConnectionManager {
      */
     connect(config: oConnectionConfig): Promise<oNodeConnection>;
     /**
-     * Check if libp2p has an active connection to the target peer
+     * Check if we have an active connection to the target peer
      * @param address - The address to check
      * @returns true if an active connection exists
      */
     isCached(address: oAddress): boolean;
     /**
-     * Get an existing libp2p connection to the target peer
+     * Get an existing connection to the target peer (from cache or libp2p)
      * @param address - The address to get a connection for
-     * @returns The libp2p Connection object or null if not found
+     * @returns The Connection object or null if not found
      */
     getCachedLibp2pConnection(address: oAddress): Connection | null;
+    /**
+     * Get cache statistics for monitoring and debugging
+     * @returns Object containing cache statistics
+     */
+    getCacheStats(): {
+        cachedConnections: number;
+        pendingDials: number;
+        connectionsByPeer: Array<{
+            peerId: string;
+            status: string;
+        }>;
+    };
+    /**
+     * Clean up all stale (non-open) connections from cache
+     * @returns Number of connections removed
+     */
+    cleanupStaleConnections(): number;
 }
 //# sourceMappingURL=o-node-connection.manager.d.ts.map

package/dist/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,MAAM,EAAE,UAAU,EAAU,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD,qBAAa,sBAAuB,SAAQ,kBAAkB;IAMhD,QAAQ,CAAC,MAAM,EAAE,4BAA4B;IALzD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,oBAAoB,CAAC,CAAS;IACtC,OAAO,CAAC,qBAAqB,CAAC,CAAS;IACvC,OAAO,CAAC,WAAW,CAAsC;gBAEpC,MAAM,EAAE,4BAA4B;IAOnD,qBAAqB,CACzB,cAAc,EAAE,QAAQ,EACxB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,UAAU,CAAC;IAoCtB;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA8BlE;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IA4BpC;;;;OAIG;IACH,yBAAyB,CAAC,OAAO,EAAE,QAAQ,GAAG,UAAU,GAAG,IAAI;CAmChE"}
+{"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,MAAM,EAAE,UAAU,EAAU,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD,qBAAa,sBAAuB,SAAQ,kBAAkB;IAOhD,QAAQ,CAAC,MAAM,EAAE,4BAA4B;IANzD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,oBAAoB,CAAC,CAAS;IACtC,OAAO,CAAC,qBAAqB,CAAC,CAAS;IACvC,OAAO,CAAC,mBAAmB,CAAsC;IACjE,OAAO,CAAC,oBAAoB,CAA+C;gBAEtD,MAAM,EAAE,4BAA4B;IAWzD;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAUhC;;;;OAIG;IACH,OAAO,CAAC,oBAAoB;IAatB,qBAAqB,CACzB,cAAc,EAAE,QAAQ,EACxB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,UAAU,CAAC;YAmDR,WAAW;IAwBzB;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA8BlE;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAmCpC;;;;OAIG;IACH,yBAAyB,CAAC,OAAO,EAAE,QAAQ,GAAG,UAAU,GAAG,IAAI;IA0C/D;;;OAGG;IACH,aAAa,IAAI;QACf,iBAAiB,EAAE,MAAM,CAAC;QAC1B,YAAY,EAAE,MAAM,CAAC;QACrB,iBAAiB,EAAE,KAAK,CAAC;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;KAC9D;IAaD;;;OAGG;IACH,uBAAuB,IAAI,MAAM;CAalC"}

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

@@ -4,32 +4,100 @@ export class oNodeConnectionManager extends oConnectionManager {
     constructor(config) {
         super(config);
         this.config = config;
-        this.connections = new Map();
+        this.connectionsByPeerId = new Map();
+        this.pendingDialsByPeerId = new Map();
         this.p2pNode = config.p2pNode;
         this.defaultReadTimeoutMs = config.defaultReadTimeoutMs;
         this.defaultDrainTimeoutMs = config.defaultDrainTimeoutMs;
+        this.logger.setNamespace(`oNodeConnectionManager[${config.originAddress}]`);
+        // Set up connection lifecycle listeners for cache management
+        this.setupConnectionListeners();
+    }
+    /**
+     * Set up listeners to maintain connection cache state
+     */
+    setupConnectionListeners() {
+        this.p2pNode.addEventListener('connection:close', (event) => {
+            const peerId = event.detail?.remotePeer?.toString();
+            if (peerId && this.connectionsByPeerId.has(peerId)) {
+                this.logger.debug('Connection closed, removing from cache:', peerId);
+                this.connectionsByPeerId.delete(peerId);
+            }
+        });
+    }
+    /**
+     * Extract peer ID string from an address
+     * @param address - The address to extract peer ID from
+     * @returns The peer ID string or null if not found
+     */
+    getPeerIdFromAddress(address) {
+        try {
+            const nodeAddress = address;
+            if (!nodeAddress.libp2pTransports?.length) {
+                return null;
+            }
+            return nodeAddress.libp2pTransports[0].toPeerId() || null;
+        }
+        catch (error) {
+            this.logger.debug('Error extracting peer ID from address:', error);
+            return null;
+        }
     }
     async getOrCreateConnection(nextHopAddress, address) {
-        // Check if libp2p already has an active connection to this peer
-        const existingConnection = this.getCachedLibp2pConnection(nextHopAddress);
-        let p2pConnection;
-        if (existingConnection && existingConnection.status === 'open') {
-            this.logger.debug('Reusing existing libp2p connection for address: ' +
-                nextHopAddress.toString());
-            p2pConnection = existingConnection;
+        // Extract peer ID as the cache key
+        const peerId = this.getPeerIdFromAddress(nextHopAddress);
+        if (!peerId) {
+            throw new Error(`Unable to extract peer ID from address: ${nextHopAddress.toString()}`);
         }
-        else {
-            // No existing connection or connection is closed, dial a new one
-            this.logger.debug('Dialing new connection for address: ' + address.toString());
-            p2pConnection = await this.p2pNode.dial(nextHopAddress.libp2pTransports.map((ma) => ma.toMultiaddr()));
+        // Check if we have a cached connection by peer ID
+        const cachedConnection = this.connectionsByPeerId.get(peerId);
+        if (cachedConnection && cachedConnection.status === 'open') {
+            this.logger.debug('Reusing cached connection for peer:', peerId);
+            return cachedConnection;
         }
-        if (nextHopAddress.libp2pTransports.length) {
-            const peerIdString = nextHopAddress.libp2pTransports[0].toPeerId();
-            if (peerIdString) {
-                this.connections.set(peerIdString, p2pConnection);
-            }
+        // Clean up stale connection if it exists but is not open
+        if (cachedConnection && cachedConnection.status !== 'open') {
+            this.logger.debug('Removing stale connection for peer:', peerId);
+            this.connectionsByPeerId.delete(peerId);
+        }
+        // Check if libp2p has an active connection to this peer
+        const libp2pConnection = this.getCachedLibp2pConnection(nextHopAddress);
+        if (libp2pConnection && libp2pConnection.status === 'open') {
+            this.logger.debug('Caching existing libp2p connection for peer:', peerId);
+            this.connectionsByPeerId.set(peerId, libp2pConnection);
+            return libp2pConnection;
+        }
+        // Check if dial is already in progress for this peer
+        const pendingDial = this.pendingDialsByPeerId.get(peerId);
+        if (pendingDial) {
+            this.logger.debug('Awaiting existing dial for peer:', peerId);
+            return pendingDial;
+        }
+        // Start new dial and cache the promise by peer ID
+        const dialPromise = this.performDial(nextHopAddress, peerId);
+        this.pendingDialsByPeerId.set(peerId, dialPromise);
+        try {
+            const connection = await dialPromise;
+            // Cache the established connection by peer ID
+            this.connectionsByPeerId.set(peerId, connection);
+            return connection;
         }
-        return p2pConnection;
+        finally {
+            this.pendingDialsByPeerId.delete(peerId);
+        }
+    }
+    async performDial(nextHopAddress, peerId) {
+        this.logger.debug('Dialing new connection', {
+            address: nextHopAddress.value,
+            peerId,
+        });
+        const connection = await this.p2pNode.dial(nextHopAddress.libp2pTransports.map((ma) => ma.toMultiaddr()));
+        this.logger.debug('Successfully dialed connection', {
+            peerId,
+            status: connection.status,
+            remotePeer: connection.remotePeer?.toString(),
+        });
+        return connection;
     }
     /**
      * Connect to a given address, reusing libp2p connections when possible
@@ -54,27 +122,34 @@ export class oNodeConnectionManager extends oConnectionManager {
         return connection;
     }
     /**
-     * Check if libp2p has an active connection to the target peer
+     * Check if we have an active connection to the target peer
      * @param address - The address to check
      * @returns true if an active connection exists
      */
     isCached(address) {
         try {
-            const nodeAddress = address;
-            if (!nodeAddress.libp2pTransports ||
-                nodeAddress.libp2pTransports.length === 0) {
+            const peerId = this.getPeerIdFromAddress(address);
+            if (!peerId) {
                 return false;
             }
-            // Extract peer ID from the first transport
-            const peerIdString = nodeAddress.libp2pTransports[0].toPeerId();
-            if (!peerIdString) {
-                return false;
+            // Check our peer ID-based cache first
+            const cachedConnection = this.connectionsByPeerId.get(peerId);
+            if (cachedConnection?.status === 'open') {
+                return true;
             }
-            this.logger.debug('Peer ID string:', peerIdString);
+            // Fall back to checking libp2p's connections
             // the following works since the peer id param is not really required: https://github.com/libp2p/js-libp2p/blob/0bbf5021b53938b2bffcffca6c13c479a95c2a60/packages/libp2p/src/connection-manager/index.ts#L508
-            const connections = this.p2pNode.getConnections(peerIdString); // ignore since converting to a proper peer id breaks the browser implementation
+            const connections = this.p2pNode.getConnections(peerId); // ignore since converting to a proper peer id breaks the browser implementation
             // Check if we have at least one open connection
-            return connections.some((conn) => conn.status === 'open');
+            const hasOpenConnection = connections.some((conn) => conn.status === 'open');
+            // If libp2p has an open connection, update our cache
+            if (hasOpenConnection) {
+                const openConnection = connections.find((conn) => conn.status === 'open');
+                if (openConnection) {
+                    this.connectionsByPeerId.set(peerId, openConnection);
+                }
+            }
+            return hasOpenConnection;
         }
         catch (error) {
             this.logger.debug('Error checking cached connection:', error);
@@ -82,37 +157,71 @@ export class oNodeConnectionManager extends oConnectionManager {
         }
     }
     /**
-     * Get an existing libp2p connection to the target peer
+     * Get an existing connection to the target peer (from cache or libp2p)
      * @param address - The address to get a connection for
-     * @returns The libp2p Connection object or null if not found
+     * @returns The Connection object or null if not found
      */
     getCachedLibp2pConnection(address) {
         try {
-            const nodeAddress = address;
-            if (!nodeAddress.libp2pTransports.length) {
+            const peerId = this.getPeerIdFromAddress(address);
+            if (!peerId) {
                 return null;
             }
-            const peerIdString = nodeAddress.libp2pTransports[0].toPeerId();
-            if (!peerIdString) {
-                return null;
+            // Check peer ID-based cache first
+            const cachedConnection = this.connectionsByPeerId.get(peerId);
+            if (cachedConnection?.status === 'open') {
+                return cachedConnection;
             }
-            const connections = this.p2pNode.getConnections(); // ignore since converting to a proper peer id breaks the browser implementation
-            const filteredConnections = connections.filter((conn) => conn.remotePeer?.toString() === peerIdString);
-            // Return the first open connection, or null if none exist
+            // Query libp2p for connections to this peer
+            const connections = this.p2pNode.getConnections();
+            const filteredConnections = connections.filter((conn) => conn.remotePeer?.toString() === peerId);
+            // Find the first open connection
             const openConnection = filteredConnections.find((conn) => conn.status === 'open');
+            // If we found an open connection in libp2p, cache it by peer ID
             if (openConnection) {
+                this.connectionsByPeerId.set(peerId, openConnection);
                 return openConnection;
             }
-            const connection = this.connections.get(peerIdString);
-            if (connection?.status === 'open') {
-                return connection;
+            // Clean up stale cache entry if connection is no longer open
+            if (cachedConnection) {
+                this.connectionsByPeerId.delete(peerId);
             }
-            // Return the first open connection, or null if none exist
-            return connection ?? null;
+            return null;
         }
         catch (error) {
             this.logger.debug('Error getting cached connection:', error);
             return null;
         }
     }
+    /**
+     * Get cache statistics for monitoring and debugging
+     * @returns Object containing cache statistics
+     */
+    getCacheStats() {
+        return {
+            cachedConnections: this.connectionsByPeerId.size,
+            pendingDials: this.pendingDialsByPeerId.size,
+            connectionsByPeer: Array.from(this.connectionsByPeerId.entries()).map(([peerId, conn]) => ({
+                peerId,
+                status: conn.status,
+            })),
+        };
+    }
+    /**
+     * Clean up all stale (non-open) connections from cache
+     * @returns Number of connections removed
+     */
+    cleanupStaleConnections() {
+        let removed = 0;
+        for (const [peerId, connection] of this.connectionsByPeerId.entries()) {
+            if (connection.status !== 'open') {
+                this.connectionsByPeerId.delete(peerId);
+                removed++;
+            }
+        }
+        if (removed > 0) {
+            this.logger.debug(`Cleaned up ${removed} stale connections`);
+        }
+        return removed;
+    }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"stream-handler.d.ts","sourceRoot":"","sources":["../../../src/connection/stream-handler.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EACL,QAAQ,EACR,SAAS,EAIT,MAAM,EAEP,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGtE;;;;;;;GAOG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,CAAC,EAAE,MAAM;IAI3B;;;OAGG;IACH,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO;IAIhC;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO;IAIjC;;OAEG;IACG,aAAa,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAI7C;;;;;;OAMG;IACG,iBAAiB,CACrB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,mBAAwB,GAC/B,OAAO,CAAC,MAAM,CAAC;IAsClB;;;;;;OAMG;IACG,IAAI,CACR,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE,mBAAwB,GAC/B,OAAO,CAAC,IAAI,CAAC;IAiBhB;;;;;OAKG;IACG,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5E;;;;;;;;OAQG;IACG,oBAAoB,CACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,GACtE,OAAO,CAAC,IAAI,CAAC;IAuChB;;;;;;OAMG;YACW,oBAAoB;IA4BlC;;;;;;;;;;;OAWG;IACG,oBAAoB,CACxB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,EACrB,MAAM,GAAE,mBAAwB,EAChC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,EAC1E,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,SAAS,CAAC;IA+GrB;;;;;;;OAOG;IACG,cAAc,CAClB,OAAO,EAAE,cAAc,EACvB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC;CAyBjB"}
+{"version":3,"file":"stream-handler.d.ts","sourceRoot":"","sources":["../../../src/connection/stream-handler.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EACL,QAAQ,EACR,SAAS,EAIT,MAAM,EAEP,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGtE;;;;;;;GAOG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,CAAC,EAAE,MAAM;IAI3B;;;OAGG;IACH,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO;IAIhC;;;OAGG;IACH,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO;IAIjC;;OAEG;IACG,aAAa,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAI7C;;;;;;OAMG;IACG,iBAAiB,CACrB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,MAAM,EAChB,MAAM,GAAE,mBAAwB,GAC/B,OAAO,CAAC,MAAM,CAAC;IAoClB;;;;;;OAMG;IACG,IAAI,CACR,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,UAAU,EAChB,MAAM,GAAE,mBAAwB,GAC/B,OAAO,CAAC,IAAI,CAAC;IAiBhB;;;;;OAKG;IACG,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5E;;;;;;;;OAQG;IACG,oBAAoB,CACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,GACtE,OAAO,CAAC,IAAI,CAAC;IAuChB;;;;;;OAMG;YACW,oBAAoB;IA4BlC;;;;;;;;;;;OAWG;IACG,oBAAoB,CACxB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,EACrB,MAAM,GAAE,mBAAwB,EAChC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,EAC1E,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAC1B,OAAO,CAAC,SAAS,CAAC;IA+GrB;;;;;;;OAOG;IACG,cAAc,CAClB,OAAO,EAAE,cAAc,EACvB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,GAChD,OAAO,CAAC,IAAI,CAAC;CAyBjB"}

package/dist/src/connection/stream-handler.js

@@ -43,7 +43,6 @@ export class StreamHandler {
             throw new oError(oErrorCodes.INVALID_STATE, 'Connection not open');
         }
         const reusePolicy = config.reusePolicy ?? 'none';
-        this.logger.debug('Reuse policy:', reusePolicy);
         // Check for existing stream if reuse is enabled
         if (reusePolicy === 'reuse') {
             const existingStream = connection.streams.find((stream) => stream.status === 'open' &&
@@ -56,7 +55,6 @@ export class StreamHandler {
             }
         }
         // Create new stream
-        this.logger.debug('Creating new stream');
         const stream = await connection.newStream(protocol, {
             signal: config.signal,
             maxOutboundStreams: config.maxOutboundStreams ?? 1000,

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,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,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;;;;;;;;;;;;;;GAcG;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,uBAAuB;IAgDrC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;YA8Bf,WAAW;IAoEzB,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,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;;;;;;;;;;;;;;GAcG;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,uBAAuB;IAgDrC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;YA8Cf,WAAW;IAoEzB,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/src/managers/o-connection-heartbeat.manager.js

@@ -95,7 +95,21 @@ export class oConnectionHeartbeatManager extends oObject {
             // Note: Using 'as any' since converting to proper PeerId breaks browser implementation
             const connections = this.node.p2pNode.getConnections(peerIdString);
             // Check if any connection is open
-            return connections.some((conn) => conn.status === 'open');
+            const existing = connections.some((conn) => conn.status === 'open');
+            if (existing) {
+                return true;
+            }
+            // check via ping
+            const pingResponse = this.node.use(address, {
+                method: 'ping'
+            }).catch((err) => {
+                if (err.message === 'Can not dial self') {
+                    return true;
+                }
+                this.logger.warn('Could not reach address in heartbeat:' + address.value, err);
+                return null;
+            });
+            return !!pingResponse;
         }
         catch (error) {
             this.logger.debug(`Error checking connection status for ${address}`, error);

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

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

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

@@ -189,6 +189,9 @@ export class oReconnectionManager extends oObject {
         const startTime = Date.now();
         let attempt = 0;
         let currentDelay = this.config.parentDiscoveryIntervalMs;
+        if (!this.node.config.leader) {
+            throw new Error('Cannot connect to parent without leader');
+        }
         // Infinite retry loop - keep trying until parent is found
         while (true) {
             attempt++;
@@ -196,18 +199,20 @@ export class oReconnectionManager extends oObject {
             this.logger.info(`Parent discovery attempt ${attempt} (elapsed: ${elapsedMinutes}m)`);
             try {
                 // Query registry for parent by its known address
-                const response = await this.node.use(oAddress.registry(), {
-                    method: 'find_available_parent',
-                    params: {
-                        parentAddress: this.node.config.parent?.toString(),
-                    },
+                if (!this.node.config.parent) {
+                    throw new Error('Invalid parent definition');
+                }
+                const response = await this.node.use(this.node.config.parent, {
+                    method: 'identify',
+                    params: {},
                 });
-                const { parentAddress, parentTransports } = response.result.data;
+                this.logger.debug('Identify parent response:', response.result.data);
+                const { address: parentAddress, transports: parentTransports } = response.result.data;
                 // Check if parent was found in registry
                 if (parentAddress && parentTransports && parentTransports.length > 0) {
                     this.logger.info(`Parent found in registry: ${parentAddress} with ${parentTransports.length} transports`);
                     // Update parent reference with fresh transports
-                    this.node.config.parent = new oNodeAddress(parentAddress, parentTransports.map((t) => new oNodeTransport(t.value)));
+                    this.node.config.parent = new oNodeAddress(parentAddress, parentTransports.map((value) => new oNodeTransport(value)));
                     // Attempt to register with parent and re-register with registry
                     try {
                         await this.tryDirectParentReconnection();

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

@@ -54,6 +54,11 @@ export declare class oNode extends oToolBase {
      * Override use() to wrap leader/registry requests with retry logic
      */
     teardown(): Promise<void>;
+    /**
+     * Reset node state to allow restart after stop
+     * Called at the end of teardown()
+     */
+    protected resetState(): void;
     getLeaders(): oNodeAddress[];
     getParents(): oNodeAddress[];
     getChildren(): oNodeAddress[];

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

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

package/dist/src/o-node.js

@@ -135,6 +135,10 @@ export class oNode extends oToolBase {
             this.logger.debug('Skipping parent registration, node is leader');
             return;
         }
+        if (!this.parent) {
+            this.logger.warn('no parent, skipping registration');
+            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()) {
@@ -149,7 +153,8 @@ export class oNode extends oToolBase {
         // 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?.toString());
-            await this.use(this.config.parent, {
+            // avoid transports to ensure we do not try direct connection, we need to route via the leader for proper access controls
+            await this.use(new oNodeAddress(this.config.parent.value), {
                 method: 'child_register',
                 params: {
                     address: this.address.toString(),
@@ -162,6 +167,11 @@ export class oNode extends oToolBase {
         }
     }
     async registerLeader() {
+        this.logger.info('Register leader called...');
+        if (!this.leader) {
+            this.logger.warn('No leader defined, skipping registration');
+            return;
+        }
         const address = oAddress.registry();
         const params = {
             method: 'commit',
@@ -187,6 +197,7 @@ export class oNode extends oToolBase {
         }
         this.didRegister = true;
         this.logger.debug('Registering node...');
+        await this.registerParent();
         // register with the leader global registry
         if (!this.config.leader) {
             this.logger.warn('No leaders found, skipping registration');
@@ -195,7 +206,6 @@ export class oNode extends oToolBase {
         else {
             this.logger.debug('Registering node with leader...');
         }
-        await this.registerParent();
         await this.registerLeader();
         this.logger.debug('Registration successful');
     }
@@ -290,7 +300,6 @@ export class oNode extends oToolBase {
                     if (this.config.type === NodeType.LEADER) {
                         return false;
                     }
-                    // deny everything else
                     return true;
                 },
                 // allow the user to override the default connection gater
@@ -305,9 +314,8 @@ export class oNode extends oToolBase {
             maxParallelReconnects: 10,
         };
         // handle the address encapsulation
-        if (this.config.leader &&
-            !this.address.protocol.includes(this.config.leader.protocol)) {
-            const parentAddress = this.config.parent || this.config.leader;
+        if (this.config.parent) {
+            const parentAddress = this.config.parent;
             this.address = CoreUtils.childAddress(parentAddress, this.address);
         }
         return params;
@@ -342,6 +350,7 @@ export class oNode extends oToolBase {
             defaultReadTimeoutMs: this.config.connectionTimeouts?.readTimeoutMs,
             defaultDrainTimeoutMs: this.config.connectionTimeouts?.drainTimeoutMs,
             runOnLimitedConnection: this.config.runOnLimitedConnection ?? false,
+            originAddress: this.address?.value
         });
     }
     async hookInitializeFinished() { }
@@ -360,7 +369,7 @@ export class oNode extends oToolBase {
     }
     async initialize() {
         this.logger.debug('Initializing node...');
-        if (this.p2pNode && this.state !== NodeState.STOPPED) {
+        if (this.state !== NodeState.STOPPED && this.state !== NodeState.STARTING) {
             throw new Error('Node is not in a valid state to be initialized');
         }
         if (!this.address.validate()) {
@@ -379,7 +388,7 @@ export class oNode extends oToolBase {
         this.router.addResolver(new oMethodResolver(this.address));
         this.router.addResolver(new oNodeResolver(this.address));
         // setup a fallback resolver for non-leader nodes
-        if (this.isLeader === false) {
+        if (this.isLeader === false && !!this.leader) {
             this.logger.debug('Adding leader resolver fallback...');
             this.router.addResolver(new oLeaderResolverFallback(this.address));
         }
@@ -421,6 +430,35 @@ export class oNode extends oToolBase {
         if (this.p2pNode) {
             await this.p2pNode.stop();
         }
+        // Reset state to allow restart
+        this.resetState();
+    }
+    /**
+     * Reset node state to allow restart after stop
+     * Called at the end of teardown()
+     */
+    resetState() {
+        // Reset registration flag
+        this.didRegister = false;
+        // Clear peer references
+        this.peerId = undefined;
+        this.p2pNode = undefined;
+        // Clear managers
+        this.connectionManager = undefined;
+        this.connectionHeartbeatManager = undefined;
+        this.reconnectionManager = undefined;
+        // Reset address to staticAddress with no transports
+        this.address = new oNodeAddress(this.staticAddress.value, []);
+        // Reset hierarchy manager
+        this.hierarchyManager = new oNodeHierarchyManager({
+            leaders: this.config.leader ? [this.config.leader] : [],
+            parents: this.config.parent ? [this.config.parent] : [],
+            children: [],
+        });
+        // Clear router (will be recreated in initialize)
+        this.router = undefined;
+        // Call parent reset
+        super.resetState();
     }
     // IHeartbeatableNode interface methods
     getLeaders() {

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,EACL,QAAQ,EACR,QAAQ,EAET,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAKrD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IAC/C,OAAO,CAAC,aAAa,CAAiB;IAEhC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAUhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BnE,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CA2B5D"}
+{"version":3,"file":"o-node.tool.d.ts","sourceRoot":"","sources":["../../src/o-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,QAAQ,EAET,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAKrD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IAC/C,OAAO,CAAC,aAAa,CAAiB;IAEhC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAehC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BnE,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CA2B5D"}