@olane/o-node 0.7.12-alpha.50 → 0.7.12-alpha.51

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

@@ -1,4 +1,4 @@
-import { Connection } from '@olane/o-config';
+import { Connection, Stream } from '@olane/o-config';
 import { oConnection, oRequest, oResponse } from '@olane/o-core';
 import { oNodeConnectionConfig } from './interfaces/o-node-connection.config.js';
 export declare class oNodeConnection extends oConnection {
@@ -6,8 +6,10 @@ export declare class oNodeConnection extends oConnection {
     p2pConnection: Connection;
     constructor(config: oNodeConnectionConfig);
     setupConnectionListeners(): void;
-    validate(): void;
+    validate(stream?: Stream): void;
+    getOrCreateStream(): Promise<Stream>;
     transmit(request: oRequest): Promise<oResponse>;
+    postTransmit(stream: Stream): Promise<void>;
     abort(error: Error): Promise<void>;
     close(): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"o-node-connection.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAEL,WAAW,EAGX,QAAQ,EACR,SAAS,EACV,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,qBAAa,eAAgB,SAAQ,WAAW;IAGlC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB;IAFrD,aAAa,EAAE,UAAU,CAAC;gBAEF,MAAM,EAAE,qBAAqB;IAM5D,wBAAwB;IAYxB,QAAQ;IAOF,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAyF/C,KAAK,CAAC,KAAK,EAAE,KAAK;IAMlB,KAAK;CAKZ"}
+{"version":3,"file":"o-node-connection.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAEL,WAAW,EAGX,QAAQ,EACR,SAAS,EACV,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAEjF,qBAAa,eAAgB,SAAQ,WAAW;IAGlC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB;IAFrD,aAAa,EAAE,UAAU,CAAC;gBAEF,MAAM,EAAE,qBAAqB;IAM5D,wBAAwB;IAYxB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;IAmBlB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAcpC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IA2E/C,YAAY,CAAC,MAAM,EAAE,MAAM;IAU3B,KAAK,CAAC,KAAK,EAAE,KAAK;IAMlB,KAAK;CAKZ"}

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

@@ -13,30 +13,37 @@ export class oNodeConnection extends oConnection {
             this.logger.debug('Connection closed for address: ' + this.nextHopAddress.toString());
         });
     }
-    validate() {
+    validate(stream) {
         if (this.config.p2pConnection.status !== 'open') {
             throw new Error('Connection is not valid');
         }
         // do nothing
+        if (!stream || (stream.status !== 'open' && stream.status !== 'reset')) {
+            throw new oError(oErrorCodes.FAILED_TO_DIAL_TARGET, 'Failed to dial target');
+        }
+        if (stream.status === 'reset') {
+            throw new oError(oErrorCodes.CONNECTION_LIMIT_REACHED, 'Connection limit reached');
+        }
+    }
+    async getOrCreateStream() {
+        if (this.p2pConnection.status !== 'open') {
+            throw new oError(oErrorCodes.INVALID_STATE, 'Connection not open');
+        }
+        return this.p2pConnection.newStream(this.nextHopAddress.protocol, {
+            signal: this.abortSignal,
+            maxOutboundStreams: process.env.MAX_OUTBOUND_STREAMS
+                ? parseInt(process.env.MAX_OUTBOUND_STREAMS)
+                : 1000,
+            runOnLimitedConnection: this.config.runOnLimitedConnection ?? false,
+        });
     }
     async transmit(request) {
         try {
             if (this.config.runOnLimitedConnection) {
                 this.logger.debug('Running on limited connection...');
             }
-            const stream = await this.p2pConnection.newStream(this.nextHopAddress.protocol, {
-                signal: this.abortSignal,
-                maxOutboundStreams: process.env.MAX_OUTBOUND_STREAMS
-                    ? parseInt(process.env.MAX_OUTBOUND_STREAMS)
-                    : 1000,
-                runOnLimitedConnection: this.config.runOnLimitedConnection ?? false,
-            });
-            if (!stream || (stream.status !== 'open' && stream.status !== 'reset')) {
-                throw new oError(oErrorCodes.FAILED_TO_DIAL_TARGET, 'Failed to dial target');
-            }
-            if (stream.status === 'reset') {
-                throw new oError(oErrorCodes.CONNECTION_LIMIT_REACHED, 'Connection limit reached');
-            }
+            const stream = await this.getOrCreateStream();
+            this.validate(stream);
             // Send the data with backpressure handling (libp2p v3 best practice)
             const data = new TextEncoder().encode(request.toString());
             const sent = stream.send(data);
@@ -60,17 +67,21 @@ export class oNodeConnection extends oConnection {
                     this.emitter.emit('chunk', response);
                     // marked as the last chunk let's close
                     if (response.result._last || !response.result._isStreaming) {
-                        // this.logger.debug('Last chunk received...');
                         lastResponse = response;
                         // Clean up abort listener before closing
                         if (this.abortSignal) {
                             this.abortSignal.removeEventListener('abort', abortHandler);
                         }
-                        await stream.close();
                         resolve(true);
                     }
                 });
             });
+            stream.addEventListener('close', async () => {
+                this.logger.debug('Stream closed by remote peer, closing connection...');
+                stream.close().catch((error) => {
+                    this.logger.error('Error closing stream: ', error);
+                });
+            });
             // If send() returns false, wait for the stream to drain before continuing
             if (!sent) {
                 this.logger.debug('Stream buffer full, waiting for drain...');
@@ -78,9 +89,8 @@ export class oNodeConnection extends oConnection {
                     signal: AbortSignal.timeout(this.config.drainTimeoutMs ?? 30000),
                 }); // Default: 30 second timeout
             }
-            if (stream.status === 'open') {
-                await stream.abort(new Error('Connection closed'));
-            }
+            // handle cleanup of the stream
+            await this.postTransmit(stream);
             const response = oResponse.fromJSON(lastResponse);
             return response;
         }
@@ -91,6 +101,16 @@ export class oNodeConnection extends oConnection {
             throw error;
         }
     }
+    async postTransmit(stream) {
+        if (stream.status === 'open') {
+            stream.close().catch((error) => {
+                this.logger.error('Error closing stream after transmission: ', error);
+            });
+        }
+        else {
+            this.logger.debug('Stream is not open, skipping cleanup');
+        }
+    }
     async abort(error) {
         this.logger.debug('Aborting connection');
         await this.p2pConnection.abort(error);

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

@@ -8,6 +8,7 @@ export declare class oNodeConnectionManager extends oConnectionManager {
     private defaultReadTimeoutMs?;
     private defaultDrainTimeoutMs?;
     constructor(config: oNodeConnectionManagerConfig);
+    getOrCreateConnection(nextHopAddress: oAddress, address: oAddress): Promise<Connection>;
     /**
      * Connect to a given address, reusing libp2p connections when possible
      * @param config - Connection configuration

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,EAAU,UAAU,EAAU,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,sBAAuB,SAAQ,kBAAkB;IAKhD,QAAQ,CAAC,MAAM,EAAE,4BAA4B;IAJzD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,oBAAoB,CAAC,CAAS;IACtC,OAAO,CAAC,qBAAqB,CAAC,CAAS;gBAElB,MAAM,EAAE,4BAA4B;IAOzD;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAgDlE;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IA4BpC;;;;OAIG;IACH,yBAAyB,CAAC,OAAO,EAAE,QAAQ,GAAG,UAAU,GAAG,IAAI;CA0BhE"}
+{"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,EAAU,UAAU,EAAU,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,sBAAuB,SAAQ,kBAAkB;IAKhD,QAAQ,CAAC,MAAM,EAAE,4BAA4B;IAJzD,OAAO,CAAC,OAAO,CAAS;IACxB,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;IA2BtB;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA6BlE;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IA4BpC;;;;OAIG;IACH,yBAAyB,CAAC,OAAO,EAAE,QAAQ,GAAG,UAAU,GAAG,IAAI;CA0BhE"}

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

@@ -8,13 +8,7 @@ export class oNodeConnectionManager extends oConnectionManager {
         this.defaultReadTimeoutMs = config.defaultReadTimeoutMs;
         this.defaultDrainTimeoutMs = config.defaultDrainTimeoutMs;
     }
-    /**
-     * Connect to a given address, reusing libp2p connections when possible
-     * @param config - Connection configuration
-     * @returns The connection object
-     */
-    async connect(config) {
-        const { address, nextHopAddress, callerAddress, readTimeoutMs, drainTimeoutMs, } = config;
+    async getOrCreateConnection(nextHopAddress, address) {
         // Check if libp2p already has an active connection to this peer
         const existingConnection = this.getCachedLibp2pConnection(nextHopAddress);
         let p2pConnection;
@@ -27,6 +21,16 @@ 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()));
         }
+        return p2pConnection;
+    }
+    /**
+     * Connect to a given address, reusing libp2p connections when possible
+     * @param config - Connection configuration
+     * @returns The connection object
+     */
+    async connect(config) {
+        const { address, nextHopAddress, callerAddress, readTimeoutMs, drainTimeoutMs, } = config;
+        const p2pConnection = await this.getOrCreateConnection(nextHopAddress, address);
         const connection = new oNodeConnection({
             nextHopAddress: nextHopAddress,
             address: address,

package/dist/src/o-node.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-node.tool.d.ts","sourceRoot":"","sources":["../../src/o-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,QAAQ,EAIT,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAIrD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACzC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAUhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAwCnE,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CA2B5D"}
+{"version":3,"file":"o-node.tool.d.ts","sourceRoot":"","sources":["../../src/o-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,QAAQ,EAIT,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAIrD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACzC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAUhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CnE,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC;IAQ9B,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CA2B5D"}

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

@@ -54,6 +54,12 @@ export class oNodeTool extends oTool(oServerNode) {
         };
         // Attach listener synchronously before any async operations
         stream.addEventListener('message', messageHandler);
+        stream.addEventListener('close', () => {
+            this.logger.debug('Stream closed by remote peer');
+            stream.close().catch((error) => {
+                this.logger.error('Error closing stream: ', error);
+            });
+        });
     }
     async _tool_identify() {
         return {

package/package.json

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