@olane/o-node 0.7.12-alpha.35 → 0.7.12-alpha.36

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,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;IA+FlE,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;IAkDlE,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAIpC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,WAAW,GAAG,IAAI;CAe3D"}

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

@@ -29,47 +29,18 @@ 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);
-                // 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,
+        });
+        // this.cache.set(nextHopAddress.toString(), connection);
+        return connection;
     }
     isCached(address) {
         return this.cache.has(address.toString());

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,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;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;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/src/managers/o-connection-heartbeat.manager.js

@@ -73,7 +73,14 @@ export class oConnectionHeartbeatManager extends oObject {
         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/src/o-node.notification-manager.js

@@ -17,7 +17,10 @@ export class oNodeNotificationManager extends oNotificationManager {
         this.logger.debug('Setting up libp2p event listeners...');
         // Peer connection events
         this.p2pNode.addEventListener('peer:connect', this.handlePeerConnect.bind(this));
-        this.p2pNode.addEventListener('peer:disconnect', this.handlePeerDisconnect.bind(this));
+        // this.p2pNode.addEventListener(
+        //   'peer:disconnect',
+        //   this.handlePeerDisconnect.bind(this),
+        // );
         // Peer discovery events
         this.p2pNode.addEventListener('peer:discovery', this.handlePeerDiscovery.bind(this));
         // Connection events

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.12-alpha.35",
+  "version": "0.7.12-alpha.36",
   "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.35",
-    "@olane/o-core": "0.7.12-alpha.35",
-    "@olane/o-protocol": "0.7.12-alpha.35",
-    "@olane/o-tool": "0.7.12-alpha.35",
+    "@olane/o-config": "0.7.12-alpha.36",
+    "@olane/o-core": "0.7.12-alpha.36",
+    "@olane/o-protocol": "0.7.12-alpha.36",
+    "@olane/o-tool": "0.7.12-alpha.36",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0"
   },
-  "gitHead": "c5f5289fedab194e9ea5e9a8cdca00da6904dea1"
+  "gitHead": "412f68e62d9c368e0937475d67896922b3aa4ae1"
 }