@olane/o-node 0.7.12-alpha.71 → 0.7.12-alpha.73

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

@@ -7,6 +7,7 @@ export declare class oNodeConnectionManager extends oConnectionManager {
     protected p2pNode: Libp2p;
     private defaultReadTimeoutMs?;
     private defaultDrainTimeoutMs?;
+    private connections;
     constructor(config: oNodeConnectionManagerConfig);
     getOrCreateConnection(nextHopAddress: oAddress, address: oAddress): Promise<Connection>;
     /**

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;IAKhD,QAAQ,CAAC,MAAM,EAAE,4BAA4B;IAJzD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,oBAAoB,CAAC,CAAS;IACtC,OAAO,CAAC,qBAAqB,CAAC,CAAS;gBAElB,MAAM,EAAE,4BAA4B;IAOnD,qBAAqB,CACzB,cAAc,EAAE,QAAQ,EACxB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,UAAU,CAAC;IA4BtB;;;;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;CA+BhE"}
+{"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;CAuBhE"}

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

@@ -4,6 +4,7 @@ export class oNodeConnectionManager extends oConnectionManager {
     constructor(config) {
         super(config);
         this.config = config;
+        this.connections = new Map();
         this.p2pNode = config.p2pNode;
         this.defaultReadTimeoutMs = config.defaultReadTimeoutMs;
         this.defaultDrainTimeoutMs = config.defaultDrainTimeoutMs;
@@ -22,6 +23,12 @@ export class oNodeConnectionManager extends oConnectionManager {
             this.logger.debug('Dialing new connection for address: ' + address.toString());
             p2pConnection = await this.p2pNode.dial(nextHopAddress.libp2pTransports.map((ma) => ma.toMultiaddr()));
         }
+        if (nextHopAddress.libp2pTransports.length) {
+            const peerIdString = nextHopAddress.libp2pTransports[0].toPeerId();
+            if (peerIdString) {
+                this.connections.set(peerIdString, p2pConnection);
+            }
+        }
         return p2pConnection;
     }
     /**
@@ -82,20 +89,19 @@ export class oNodeConnectionManager extends oConnectionManager {
     getCachedLibp2pConnection(address) {
         try {
             const nodeAddress = address;
-            if (!nodeAddress.libp2pTransports ||
-                nodeAddress.libp2pTransports.length === 0) {
+            if (!nodeAddress.libp2pTransports.length) {
                 return null;
             }
-            // Extract peer ID from the first transport
             const peerIdString = nodeAddress.libp2pTransports[0].toPeerId();
             if (!peerIdString) {
                 return null;
             }
-            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);
+            const connection = this.connections.get(peerIdString);
+            if (connection?.status === 'open') {
+                return connection;
+            }
             // Return the first open connection, or null if none exist
-            const openConnection = filteredConnections.find((conn) => conn.status === 'open');
-            return openConnection || null;
+            return connection ?? null;
         }
         catch (error) {
             this.logger.debug('Error getting cached connection:', error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.12-alpha.71",
+  "version": "0.7.12-alpha.73",
   "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.71",
-    "@olane/o-core": "0.7.12-alpha.71",
-    "@olane/o-protocol": "0.7.12-alpha.71",
-    "@olane/o-tool": "0.7.12-alpha.71",
+    "@olane/o-config": "0.7.12-alpha.73",
+    "@olane/o-core": "0.7.12-alpha.73",
+    "@olane/o-protocol": "0.7.12-alpha.73",
+    "@olane/o-tool": "0.7.12-alpha.73",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0"
   },
-  "gitHead": "985e21cd501b3d9e664482f43fba473ba0396771"
+  "gitHead": "1fc100e9f575b957c9d6c6480eb3a3db10999e94"
 }