@olane/o-node 0.7.47 → 0.7.49

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

@@ -47,15 +47,19 @@ export class oNodeTool extends oTool(oServerNode) {
         });
         await this.handleProtocolReuse(address);
     }
-    async initialize() {
-        await super.initialize();
-        this.streamHandler = new StreamHandler(this.logger);
+    async initializeProtocols() {
+        this.logger.info('Initializing custom protocols for node...');
         await this.handleProtocol(this.address);
         if (this.staticAddress &&
             this.staticAddress?.toString() !== this.address.toString()) {
             await this.handleProtocol(this.staticAddress);
         }
     }
+    async initialize() {
+        await super.initialize();
+        this.streamHandler = new StreamHandler(this.logger);
+        await this.initializeProtocols();
+    }
     async handleStreamReuse(stream, connection) {
         return this.handleStream(stream, connection, true);
     }

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

@@ -1,6 +1,11 @@
 import { Connection } from '@olane/o-config';
 import { oObject } from '@olane/o-core';
 export declare class ConnectionUtils extends oObject {
+    /**
+     * Waits for a peer to appear in the peer store with sufficient protocol information.
+     * Implements retry logic to handle race conditions where peer store is not immediately populated.
+     */
+    private static waitForPeerInStore;
     static addressFromConnection(options: {
         currentNode: any;
         connection: Connection;

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,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;CA+DF"}
+{"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;IAC1C;;;OAGG;mBACkB,kBAAkB;WAgCnB,qBAAqB,CAAC,OAAO,EAAE;QACjD,WAAW,EAAE,GAAG,CAAC;QACjB,UAAU,EAAE,UAAU,CAAC;KACxB;CA0DF"}

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

@@ -2,25 +2,46 @@ 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) {
-        try {
-            const { currentNode, connection } = options;
-            const p2pNode = currentNode.p2pNode;
-            // Extract the actual olane address from the peer store
+    /**
+     * Waits for a peer to appear in the peer store with sufficient protocol information.
+     * Implements retry logic to handle race conditions where peer store is not immediately populated.
+     */
+    static async waitForPeerInStore(p2pNode, remotePeerId) {
+        const MAX_RETRIES = 100; // 5 seconds total (100 * 50ms)
+        const RETRY_DELAY_MS = 50;
+        const MIN_PROTOCOLS = 2;
+        for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
             const peers = await p2pNode.peerStore.all();
             const remotePeer = peers.find((peer) => {
-                return peer.id.toString() === connection.remotePeer.toString();
+                return peer.id.toString() === remotePeerId.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.`);
+            // Check if peer exists and has sufficient protocol information
+            if (remotePeer && remotePeer.protocols.length > MIN_PROTOCOLS) {
+                return remotePeer;
+            }
+            // Wait before next retry
+            if (attempt < MAX_RETRIES - 1) {
+                await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY_MS));
             }
+        }
+        // Timeout exceeded
+        throw new Error(`Timeout waiting for peer ${remotePeerId.toString()} to appear in peer store with sufficient protocols (waited ${MAX_RETRIES * RETRY_DELAY_MS}ms)`);
+    }
+    // TODO: improve this logic (poor implementation for now)
+    static async addressFromConnection(options) {
+        try {
+            const { currentNode, connection } = options;
+            const p2pNode = currentNode.p2pNode;
+            // Wait for peer to appear in peer store with sufficient protocol information
+            // This handles race conditions where peer store is not immediately populated
+            const remotePeer = await this.waitForPeerInStore(p2pNode, connection.remotePeer);
             // Get origin address for comparison
             const originAddress = currentNode.address?.value;
             if (!originAddress) {
                 throw new Error('Origin address is not configured');
             }
-            const oProtocol = remotePeer.protocols.find((p) => p.startsWith('/o/'));
+            const oProtocol = remotePeer.protocols.find((p) => p.startsWith('/o/') &&
+                p.includes(currentNode?.address?.protocol) === false);
             if (!oProtocol) {
                 throw new Error('Failed to extract remote address, could not find o-protocol in peer protocols.');
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.47",
+  "version": "0.7.49",
   "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.47",
+    "@olane/o-test": "0.7.49",
     "@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.47",
-    "@olane/o-core": "0.7.47",
-    "@olane/o-protocol": "0.7.47",
-    "@olane/o-tool": "0.7.47",
+    "@olane/o-config": "0.7.49",
+    "@olane/o-core": "0.7.49",
+    "@olane/o-protocol": "0.7.49",
+    "@olane/o-tool": "0.7.49",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0",
     "json5": "^2.2.3"
   },
-  "gitHead": "2730d1ccdfb58549ebd253ded9479156086cc066"
+  "gitHead": "710399363610686d2c245af0ac6773fb794add25"
 }

package/dist/test/astream-reuse.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=astream-reuse.spec.d.ts.map

package/dist/test/astream-reuse.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"astream-reuse.spec.d.ts","sourceRoot":"","sources":["../../test/astream-reuse.spec.ts"],"names":[],"mappings":""}

package/dist/test/astream-reuse.spec.js

@@ -1,107 +0,0 @@
-import { expect } from 'chai';
-import { TestEnvironment } from './helpers/index.js';
-import { NetworkTopologies, } from './helpers/network-builder.js';
-import { oNodeAddress } from '../src/router/o-node.address.js';
-describe('Stream Reuse', () => {
-    const env = new TestEnvironment();
-    let builder;
-    afterEach(async () => {
-        if (builder) {
-            await builder.cleanup();
-        }
-        await env.cleanup();
-    });
-    describe('Stream Reuse with reusePolicy="reuse"', () => {
-        it('should reuse the same stream across multiple requests', async () => {
-            builder = await NetworkTopologies.twoNode();
-            const leader = builder.getNode('o://leader');
-            const child = builder.getNode('o://child');
-            // Track stream IDs
-            const streamIds = [];
-            // Make first request
-            const response1 = await leader.use(new oNodeAddress(child.address.toString(), child.address.libp2pTransports), {
-                method: 'echo',
-                params: { message: 'first' },
-            });
-            expect(response1.result.success).to.be.true;
-            // Get active connection to inspect streams
-            const connectionManager = leader.connectionManager;
-            const connection = connectionManager.getCachedLibp2pConnection(child.address);
-            connection.reusePolicy;
-            if (connection) {
-                // Store initial stream count and first stream ID
-                const initialStreamCount = connection.streams.length;
-                if (connection.streams.length > 0) {
-                    streamIds.push(connection.streams[0].id);
-                }
-                // Make second request
-                const response2 = await leader.use(new oNodeAddress(child.address.toString(), child.address.libp2pTransports), {
-                    method: 'echo',
-                    params: { message: 'second' },
-                });
-                expect(response2.result.success).to.be.true;
-                // Get stream count after second request
-                const finalStreamCount = connection.streams.length;
-                if (connection.streams.length > 0) {
-                    streamIds.push(connection.streams[0].id);
-                }
-                // With default behavior (reusePolicy='none'), new streams are created
-                // This test verifies current behavior
-                expect(streamIds.length).to.be.greaterThan(0);
-                expect(finalStreamCount).to.be.greaterThan(0);
-            }
-        });
-    });
-    describe('Stream Creation with reusePolicy="none"', () => {
-        it('should create new streams for each request', async () => {
-            builder = await NetworkTopologies.twoNode();
-            const leader = builder.getNode('o://leader');
-            const child = builder.getNode('o://child');
-            // Make multiple requests
-            for (let i = 0; i < 3; i++) {
-                const response = await leader.use(new oNodeAddress(child.address.toString(), child.address.libp2pTransports), {
-                    method: 'echo',
-                    params: { message: `request-${i}` },
-                });
-                expect(response.result.success).to.be.true;
-            }
-            // Get connection to verify stream behavior
-            const connectionManager = leader.connectionManager;
-            const connection = connectionManager.getCachedLibp2pConnection(child.address);
-            // With default reusePolicy='none', streams are closed after each request
-            // So we expect minimal open streams
-            expect(connection).to.exist;
-            if (connection) {
-                // The number of open streams should be limited since old ones are closed
-                expect(connection.streams.length).to.be.lessThan(10);
-            }
-        });
-    });
-    describe('Stream Persistence After Transmission', () => {
-        it('should close streams after transmission with reusePolicy="none"', async () => {
-            builder = await NetworkTopologies.twoNode();
-            const leader = builder.getNode('o://leader');
-            const child = builder.getNode('o://child');
-            // Make a request
-            const response = await leader.use(new oNodeAddress(child.address.toString(), child.address.libp2pTransports), {
-                method: 'echo',
-                params: { message: 'test' },
-            });
-            expect(response.result.success).to.be.true;
-            // Get connection
-            const connectionManager = leader.connectionManager;
-            const connection = connectionManager.getCachedLibp2pConnection(child.address);
-            expect(connection).to.exist;
-            if (connection) {
-                // Make another request to verify new stream can be created
-                const response2 = await leader.use(new oNodeAddress(child.address.toString(), child.address.libp2pTransports), {
-                    method: 'echo',
-                    params: { message: 'test2' },
-                });
-                expect(response2.result.success).to.be.true;
-                // Verify connection is still functional
-                expect(connection.status).to.equal('open');
-            }
-        });
-    });
-});