@olane/o-node 0.7.12-alpha.72 → 0.7.12-alpha.74

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;IA6BtB;;;;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;CAehE"}
+{"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"}

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

@@ -23,7 +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()));
         }
-        this.connections.set(nextHopAddress.toString(), p2pConnection);
+        if (nextHopAddress.libp2pTransports.length) {
+            const peerIdString = nextHopAddress.libp2pTransports[0].toPeerId();
+            if (peerIdString) {
+                this.connections.set(peerIdString, p2pConnection);
+            }
+        }
         return p2pConnection;
     }
     /**
@@ -84,7 +89,21 @@ export class oNodeConnectionManager extends oConnectionManager {
     getCachedLibp2pConnection(address) {
         try {
             const nodeAddress = address;
-            const connection = this.connections.get(nodeAddress.toString());
+            if (!nodeAddress.libp2pTransports.length) {
+                return null;
+            }
+            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);
+            // Return the first open connection, or null if none exist
+            const openConnection = filteredConnections.find((conn) => conn.status === 'open');
+            if (openConnection) {
+                return openConnection;
+            }
+            const connection = this.connections.get(peerIdString);
             if (connection?.status === 'open') {
                 return connection;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.12-alpha.72",
+  "version": "0.7.12-alpha.74",
   "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.72",
-    "@olane/o-core": "0.7.12-alpha.72",
-    "@olane/o-protocol": "0.7.12-alpha.72",
-    "@olane/o-tool": "0.7.12-alpha.72",
+    "@olane/o-config": "0.7.12-alpha.74",
+    "@olane/o-core": "0.7.12-alpha.74",
+    "@olane/o-protocol": "0.7.12-alpha.74",
+    "@olane/o-tool": "0.7.12-alpha.74",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0"
   },
-  "gitHead": "69b76ea2f2298b8487235c4e5eb882fc6372d8b9"
+  "gitHead": "4fe582574d5c63841d40db42d8aaa74d9f2d01a1"
 }