@olane/o-node 0.7.41 → 0.7.42

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

@@ -14,6 +14,6 @@ export declare class oNodeAddress extends oAddress {
     toString(): string;
     toMultiaddr(): Multiaddr;
     static fromMultiaddr(ma: Multiaddr): oAddress;
-    static fromProtocol(protocol: string): oAddress;
+    static fromProtocol(protocol: string): oNodeAddress;
 }
 //# sourceMappingURL=o-node.address.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"o-node.address.d.ts","sourceRoot":"","sources":["../../../src/router/o-node.address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAa,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAiB,MAAM,eAAe,CAAC;AAExD,qBAAa,YAAa,SAAQ,QAAQ;aAItB,KAAK,EAAE,MAAM;IAHxB,UAAU,EAAE,cAAc,EAAE,CAAM;gBAGvB,KAAK,EAAE,MAAM,EAC7B,UAAU,GAAE,cAAc,EAAO;IAMnC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;KACpC,GAAG,YAAY;IAShB,IAAI,gBAAgB,IAAI,cAAc,EAAE,CAEvC;IAED,IAAI,gBAAgB,IAAI,cAAc,EAAE,CAEvC;IAED,QAAQ,IAAI,MAAM;IAIlB,WAAW,IAAI,SAAS;IAIxB,MAAM,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,GAAG,QAAQ;IAI7C,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ;CAIhD"}
+{"version":3,"file":"o-node.address.d.ts","sourceRoot":"","sources":["../../../src/router/o-node.address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAa,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAiB,MAAM,eAAe,CAAC;AAExD,qBAAa,YAAa,SAAQ,QAAQ;aAItB,KAAK,EAAE,MAAM;IAHxB,UAAU,EAAE,cAAc,EAAE,CAAM;gBAGvB,KAAK,EAAE,MAAM,EAC7B,UAAU,GAAE,cAAc,EAAO;IAMnC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE;QACpB,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;KACpC,GAAG,YAAY;IAShB,IAAI,gBAAgB,IAAI,cAAc,EAAE,CAEvC;IAED,IAAI,gBAAgB,IAAI,cAAc,EAAE,CAEvC;IAED,QAAQ,IAAI,MAAM;IAIlB,WAAW,IAAI,SAAS;IAIxB,MAAM,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,GAAG,QAAQ;IAI7C,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY;CAIpD"}

package/dist/src/router/o-node.address.js

@@ -28,6 +28,6 @@ export class oNodeAddress extends oAddress {
     }
     static fromProtocol(protocol) {
         const addressInput = protocol.replace('/o/', 'o://');
-        return new oAddress(addressInput);
+        return new oNodeAddress(addressInput);
     }
 }

package/dist/src/utils/connection.utils.d.ts

@@ -4,6 +4,6 @@ export declare class ConnectionUtils extends oObject {
     static addressFromConnection(options: {
         currentNode: any;
         connection: Connection;
-    }): Promise<import("@olane/o-core").oAddress>;
+    }): Promise<any>;
 }
 //# sourceMappingURL=connection.utils.d.ts.map

package/dist/src/utils/connection.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.utils.d.ts","sourceRoot":"","sources":["../../../src/utils/connection.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,qBAAa,eAAgB,SAAQ,OAAO;WACtB,qBAAqB,CAAC,OAAO,EAAE;QACjD,WAAW,EAAE,GAAG,CAAC;QACjB,UAAU,EAAE,UAAU,CAAC;KACxB;CAsCF"}
+{"version":3,"file":"connection.utils.d.ts","sourceRoot":"","sources":["../../../src/utils/connection.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA2B,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAuB,OAAO,EAAE,MAAM,eAAe,CAAC;AAI7D,qBAAa,eAAgB,SAAQ,OAAO;WACtB,qBAAqB,CAAC,OAAO,EAAE;QACjD,WAAW,EAAE,GAAG,CAAC;QACjB,UAAU,EAAE,UAAU,CAAC;KACxB;CAmEF"}

package/dist/src/utils/connection.utils.js

@@ -1,26 +1,48 @@
-import { oObject } from '@olane/o-core';
+import { oError, oErrorCodes, oObject } from '@olane/o-core';
 import { oNodeAddress } from '../router/o-node.address.js';
+import { oNodeTransport } from '../router/o-node.transport.js';
 export class ConnectionUtils extends oObject {
     static async addressFromConnection(options) {
-        const { currentNode, connection } = options;
-        const p2pNode = currentNode.p2pNode;
-        // Extract the actual olane address from the peer store
-        const peers = await p2pNode.peerStore.all();
-        const remotePeer = peers.find((peer) => peer.id.toString() === connection.remotePeer.toString());
-        if (!remotePeer) {
-            console.log('Failed to find peer:', remotePeer);
-            throw new Error(`Failed to extract remote address, peer ${connection.remotePeer.toString()} not found in peer store.`);
+        try {
+            console.log('[ConnectionUtils] addressFromConnection');
+            const { currentNode, connection } = options;
+            const p2pNode = currentNode.p2pNode;
+            // Extract the actual olane address from the peer store
+            const peers = await p2pNode.peerStore.all();
+            const remotePeer = peers.find((peer) => peer.id.toString() === connection.remotePeer.toString());
+            if (!remotePeer) {
+                console.log('Failed to find peer:', remotePeer);
+                throw new Error(`Failed to extract remote address, peer ${connection.remotePeer.toString()} not found in peer store.`);
+            }
+            // Get origin address for comparison
+            const originAddress = currentNode.address?.value;
+            if (!originAddress) {
+                throw new Error('Origin address is not configured');
+            }
+            const originProtocol = originAddress.toString();
+            const oProtocol = remotePeer.protocols.find((p) => p.startsWith('/o/') && p.startsWith(originProtocol) === false);
+            if (!oProtocol) {
+                throw new Error('Failed to extract remote address, could not find o-protocol in peer protocols.');
+            }
+            const address = oNodeAddress.fromProtocol(oProtocol);
+            if (remotePeer.addresses.length === 0 &&
+                address.value === currentNode.leader.value) {
+                // leader - use known address
+                return currentNode.leader;
+            }
+            if (remotePeer.addresses.length === 0 &&
+                address.value === currentNode.parent.value) {
+                // leader - use known address
+                return currentNode.parent;
+            }
+            address.setTransports(remotePeer.addresses.map(({ multiaddr }) => {
+                return new oNodeTransport(multiaddr);
+            }));
+            return address;
         }
-        // Get origin address for comparison
-        const originAddress = currentNode.address?.value;
-        if (!originAddress) {
-            throw new Error('Origin address is not configured');
+        catch (e) {
+            console.error('Failed to get address from connection:', e);
+            throw new oError(oErrorCodes.UNKNOWN, 'Failed to get address from connection');
         }
-        const originProtocol = originAddress.toString();
-        const oProtocol = remotePeer.protocols.find((p) => p.startsWith('/o/') && p.startsWith(originProtocol) === false);
-        if (!oProtocol) {
-            throw new Error('Failed to extract remote address, could not find o-protocol in peer protocols.');
-        }
-        return oNodeAddress.fromProtocol(oProtocol);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.41",
+  "version": "0.7.42",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.29.0",
-    "@olane/o-test": "0.7.41",
+    "@olane/o-test": "0.7.42",
     "@tsconfig/node20": "^20.1.6",
     "@types/jest": "^30.0.0",
     "@types/json5": "^2.2.0",
@@ -60,13 +60,13 @@
     "typescript": "5.4.5"
   },
   "dependencies": {
-    "@olane/o-config": "0.7.41",
-    "@olane/o-core": "0.7.41",
-    "@olane/o-protocol": "0.7.41",
-    "@olane/o-tool": "0.7.41",
+    "@olane/o-config": "0.7.42",
+    "@olane/o-core": "0.7.42",
+    "@olane/o-protocol": "0.7.42",
+    "@olane/o-tool": "0.7.42",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0",
     "json5": "^2.2.3"
   },
-  "gitHead": "f705ab1099e0df6220c8f1d9a44e5b6cd09eb224"
+  "gitHead": "689465b34c2aefe28b6c87e3822d69651f2a49b7"
 }