@olane/o-node 0.7.1 → 0.7.3

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

@@ -1,11 +1,11 @@
-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 {
     protected readonly config: oNodeConnectionConfig;
-    protected p2pConnection: Connection;
+    p2pConnection: Connection;
     constructor(config: oNodeConnectionConfig);
-    read(source: any): Promise<any>;
+    read(source: Stream): Promise<any>;
     validate(): void;
     transmit(request: oRequest): Promise<oResponse>;
     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,EAAiC,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EACL,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;IAF5D,SAAS,CAAC,aAAa,EAAE,UAAU,CAAC;gBAEL,MAAM,EAAE,qBAAqB;IAKtD,IAAI,CAAC,MAAM,EAAE,GAAG;IAUtB,QAAQ;IAOF,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IA4B/C,KAAK;CAKZ"}
+{"version":3,"file":"o-node-connection.d.ts","sourceRoot":"","sources":["../../../src/connection/o-node-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAIV,MAAM,EAEP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,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;IAKtD,IAAI,CAAC,MAAM,EAAE,MAAM;IAWzB,QAAQ;IAOF,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAuC/C,KAAK;CAKZ"}

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

@@ -1,4 +1,4 @@
-import { Uint8ArrayList, pushable, all } from '@olane/o-config';
+import { Uint8ArrayList, byteStream, } from '@olane/o-config';
 import { oConnection, oError, oErrorCodes, oResponse, } from '@olane/o-core';
 export class oNodeConnection extends oConnection {
     constructor(config) {
@@ -7,12 +7,13 @@ export class oNodeConnection extends oConnection {
         this.p2pConnection = config.p2pConnection;
     }
     async read(source) {
-        const chunks = await all(source);
-        const data = new Uint8ArrayList(...chunks).slice();
-        if (!data || data.length === 0) {
-            throw new Error('No data received');
-        }
-        return JSON.parse(new TextDecoder().decode(data));
+        const bytes = byteStream(source);
+        const output = await bytes.read({
+            signal: AbortSignal.timeout(5000),
+        });
+        const outputObj = output instanceof Uint8ArrayList ? output.subarray() : output;
+        const jsonStr = new TextDecoder().decode(outputObj);
+        return JSON.parse(jsonStr);
     }
     validate() {
         if (this.config.p2pConnection.status !== 'open') {
@@ -22,14 +23,18 @@ export class oNodeConnection extends oConnection {
     }
     async transmit(request) {
         try {
-            const stream = await this.p2pConnection.newStream(this.nextHopAddress.protocol);
-            // Create a pushable stream
-            const pushableStream = pushable();
-            pushableStream.push(new TextEncoder().encode(request.toString()));
-            pushableStream.end();
+            const stream = await this.p2pConnection.newStream(this.nextHopAddress.protocol, {
+                maxOutboundStreams: Infinity,
+            });
+            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');
+            }
             // Send the data
-            await stream.sink(pushableStream);
-            const res = await this.read(stream.source);
+            await stream.send(new TextEncoder().encode(request.toString()));
+            const res = await this.read(stream);
             // process the response
             const response = new oResponse({
                 ...res.result,

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,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,sBAAuB,SAAQ,kBAAkB;IAC5D,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,EAAE,4BAA4B;IAKhD;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IA6ClE,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAIpC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,WAAW,GAAG,IAAI;CAe3D"}
+{"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,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,4BAA4B,EAAE,MAAM,kDAAkD,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,qBAAa,sBAAuB,SAAQ,kBAAkB;IAC5D,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,EAAE,4BAA4B;IAKhD;;;;OAIG;IACG,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAkDlE,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAIpC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,WAAW,GAAG,IAAI;CAe3D"}

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

@@ -14,18 +14,18 @@ export class oNodeConnectionManager extends oConnectionManager {
         const { address, nextHopAddress, callerAddress } = config;
         // check if we already have a connection to this address
         // TODO: how can we enable caching of connections & connection lifecycles
-        // if (this.isCached(nextHopAddress)) {
-        //   const cachedConnection = this.getCachedConnection(nextHopAddress);
-        //   if (cachedConnection) {
-        //     this.logger.debug(
-        //       'Using cached connection for address: ' + address.toString(),
-        //     );
-        //     return cachedConnection;
-        //   } else {
-        //     // cached item is not valid, remove it
-        //     this.cache.delete(nextHopAddress.toString());
-        //   }
-        // }
+        if (this.isCached(nextHopAddress)) {
+            const cachedConnection = this.getCachedConnection(nextHopAddress);
+            if (cachedConnection &&
+                cachedConnection.p2pConnection.status === 'open') {
+                this.logger.debug('Using cached connection for address: ' + address.toString());
+                return cachedConnection;
+            }
+            else {
+                // cached item is not valid, remove it
+                this.cache.delete(nextHopAddress.toString());
+            }
+        }
         // first time setup connection
         try {
             const p2pConnection = await this.p2pNode.dial(nextHopAddress.libp2pTransports.map((ma) => ma.toMultiaddr()));
@@ -35,7 +35,7 @@ export class oNodeConnectionManager extends oConnectionManager {
                 p2pConnection: p2pConnection,
                 callerAddress: callerAddress,
             });
-            // this.cache.set(address.toString(), connection);
+            // this.cache.set(nextHopAddress.toString(), connection);
             return connection;
         }
         catch (error) {

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

@@ -35,6 +35,7 @@ export declare class oNode extends oToolBase {
      * @returns The libp2p config
      */
     configure(): Promise<Libp2pConfig>;
+    protected createNode(): Promise<Libp2p>;
     connect(nextHopAddress: oNodeAddress, targetAddress: oNodeAddress): Promise<oNodeConnection>;
     initialize(): Promise<void>;
     teardown(): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"o-node.d.ts","sourceRoot":"","sources":["../../src/o-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EACN,YAAY,EACb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAKL,QAAQ,EAET,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,EAAmB,SAAS,EAAE,MAAM,eAAe,CAAC;AAI3D,qBAAa,KAAM,SAAQ,SAAS;IAC3B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,MAAM,CAAC;IACjB,OAAO,EAAG,YAAY,CAAC;IACvB,MAAM,EAAE,WAAW,CAAC;IACpB,iBAAiB,EAAG,sBAAsB,CAAC;IAC3C,gBAAgB,EAAG,qBAAqB,CAAC;IAChD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;gBAE3B,MAAM,EAAE,WAAW;IAK/B,IAAI,MAAM,IAAI,YAAY,GAAG,IAAI,CAEhC;IAED,IAAI,aAAa,IAAI,YAAY,CAEhC;IAED,IAAI,YAAY,IAAI,MAAM,GAAG,IAAI,CAOhC;IAED,mBAAmB,IAAI,GAAG,EAAE;IAItB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC,IAAI,aAAa,IAAI,YAAY,CAEhC;IAED,IAAI,gBAAgB,IAAI,cAAc,EAAE,CAEvC;IAED,IAAI,UAAU,IAAI,cAAc,EAAE,CAIjC;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC/B,aAAa,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;IAItC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAG1D;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IA2FlC,OAAO,CACX,cAAc,EAAE,YAAY,EAC5B,aAAa,EAAE,YAAY,GAC1B,OAAO,CAAC,eAAe,CAAC;IA0BrB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAMhC"}
+{"version":3,"file":"o-node.d.ts","sourceRoot":"","sources":["../../src/o-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EACN,YAAY,EACb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAKL,QAAQ,EAET,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,OAAO,EAAmB,SAAS,EAAE,MAAM,eAAe,CAAC;AAI3D,qBAAa,KAAM,SAAQ,SAAS;IAC3B,MAAM,EAAG,MAAM,CAAC;IAChB,OAAO,EAAG,MAAM,CAAC;IACjB,OAAO,EAAG,YAAY,CAAC;IACvB,MAAM,EAAE,WAAW,CAAC;IACpB,iBAAiB,EAAG,sBAAsB,CAAC;IAC3C,gBAAgB,EAAG,qBAAqB,CAAC;IAChD,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;gBAE3B,MAAM,EAAE,WAAW;IAK/B,IAAI,MAAM,IAAI,YAAY,GAAG,IAAI,CAEhC;IAED,IAAI,aAAa,IAAI,YAAY,CAKhC;IAED,IAAI,YAAY,IAAI,MAAM,GAAG,IAAI,CAOhC;IAED,mBAAmB,IAAI,GAAG,EAAE;IAItB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC,IAAI,aAAa,IAAI,YAAY,CAEhC;IAED,IAAI,gBAAgB,IAAI,cAAc,EAAE,CAEvC;IAED,IAAI,UAAU,IAAI,cAAc,EAAE,CAIjC;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC/B,aAAa,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM;IAItC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAStB,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAG1D;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;cA0FxB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAMvC,OAAO,CACX,cAAc,EAAE,YAAY,EAC5B,aAAa,EAAE,YAAY,GAC1B,OAAO,CAAC,eAAe,CAAC;IA0BrB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAoC3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAMhC"}

package/dist/src/o-node.js

@@ -1,4 +1,4 @@
-import { bootstrap, createNode, defaultLibp2pConfig, } from '@olane/o-config';
+import { createNode, defaultLibp2pConfig, } from '@olane/o-config';
 import { v4 as uuidv4 } from 'uuid';
 import { oNodeRouter } from './router/o-node.router.js';
 import { oNodeHierarchyManager } from './o-node.hierarchy-manager.js';
@@ -7,7 +7,6 @@ import { CoreUtils, NodeState, NodeType, oAddress, RestrictedAddresses, } from '
 import { oNodeAddress } from './router/o-node.address.js';
 import { oNodeConnectionManager } from './connection/o-node-connection.manager.js';
 import { oNodeResolver } from './router/resolvers/o-node.resolver.js';
-import { NetworkUtils } from './utils/network.utils.js';
 import { oMethodResolver, oToolBase } from '@olane/o-tool';
 import { oLeaderResolverFallback } from './router/index.js';
 export class oNode extends oToolBase {
@@ -20,7 +19,10 @@ export class oNode extends oToolBase {
         return this.isLeader ? this.address : this.config?.leader || null;
     }
     get networkConfig() {
-        return this.config.network || defaultLibp2pConfig;
+        return {
+            ...defaultLibp2pConfig,
+            ...(this.config.network || {}),
+        };
     }
     get parentPeerId() {
         if (!this.parent || this.parent?.transports?.length === 0) {
@@ -109,7 +111,11 @@ export class oNode extends oToolBase {
     }
     async start() {
         await super.start();
-        await NetworkUtils.advertiseToNetwork(this.address, this.staticAddress, this.p2pNode);
+        // await NetworkUtils.advertiseToNetwork(
+        //   this.address,
+        //   this.staticAddress,
+        //   this.p2pNode,
+        // );
     }
     async validateJoinRequest(request) {
         return true;
@@ -120,11 +126,9 @@ export class oNode extends oToolBase {
      */
     async configure() {
         const params = {
+            ...defaultLibp2pConfig,
             ...this.networkConfig,
             transports: this.configureTransports(),
-            connectionManager: {
-                ...(this.networkConfig.connectionManager || {}),
-            },
             listeners: (this.config.network?.listeners ||
                 defaultLibp2pConfig.listeners ||
                 []).concat(`/memory/${uuidv4()}`), // ensure we allow for local in-memory communication
@@ -144,13 +148,21 @@ export class oNode extends oToolBase {
         if (this.parentTransports.length > 0) {
             // peer discovery is only allowed through the parent transports
             const transports = this.parentTransports.map((t) => t.toMultiaddr().toString()) || [];
-            this.logger.debug('Parent transports: ', transports);
-            params.peerDiscovery = [
-                bootstrap({
-                    list: transports.concat(this.leader?.libp2pTransports.map((t) => t.toString()) || []),
-                }),
-                ...(defaultLibp2pConfig.peerDiscovery || []),
-            ];
+            // this.logger.debug('Parent transports: ', transports);
+            // this.logger.debug(
+            //   'Bootstrap transports: ',
+            //   transports.concat(
+            //     this.leader?.libp2pTransports.map((t) => t.toString()) || [],
+            //   ),
+            // );
+            // params.peerDiscovery = [
+            //   bootstrap({
+            //     list: transports.concat(
+            //       this.leader?.libp2pTransports.map((t) => t.toString()) || [],
+            //     ),
+            //   }),
+            //   ...(defaultLibp2pConfig.peerDiscovery || []),
+            // ];
             //   // let's make sure we only allow communication through the parent transports
             params.connectionGater = {
                 // who can call us?
@@ -177,12 +189,15 @@ export class oNode extends oToolBase {
         if (this.config.leader &&
             !this.address.protocol.includes(this.config.leader.protocol)) {
             const parentAddress = this.config.parent || this.config.leader;
-            this.logger.debug('Encapsulating address: ' + this.address.toString(), parentAddress.toString());
             this.address = CoreUtils.childAddress(parentAddress, this.address);
-            this.logger.debug('Encapsulated address: ' + this.address.toString());
         }
         return params;
     }
+    async createNode() {
+        const params = await this.configure();
+        this.p2pNode = await createNode(params);
+        return this.p2pNode;
+    }
     async connect(nextHopAddress, targetAddress) {
         if (!this.connectionManager) {
             this.logger.error('Connection manager not initialized');
@@ -214,8 +229,7 @@ export class oNode extends oToolBase {
         if (!this.address.validate()) {
             throw new Error('Invalid address');
         }
-        const params = await this.configure();
-        this.p2pNode = await createNode(params);
+        await this.createNode();
         await this.initializeRouter();
         this.logger.debug('Node initialized!', this.transports.map((t) => t.toString()));
         this.address.setTransports(this.transports);

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

@@ -1,6 +1,6 @@
 import { oAddress } from '@olane/o-core';
-import { IncomingStreamData } from '@olane/o-config';
 import { oServerNode } from './nodes/server.node.js';
+import { Connection, Stream } from '@olane/o-config';
 declare const oNodeTool_base: typeof oServerNode;
 /**
  * oTool is a mixin that extends the base class and implements the oTool interface
@@ -10,7 +10,7 @@ declare const oNodeTool_base: typeof oServerNode;
 export declare class oNodeTool extends oNodeTool_base {
     handleProtocol(address: oAddress): Promise<void>;
     initialize(): Promise<void>;
-    handleStream(streamData: IncomingStreamData): Promise<void>;
+    handleStream(stream: Stream, connection: Connection): Promise<void>;
 }
 export {};
 //# sourceMappingURL=o-node.tool.d.ts.map

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,EAKT,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;;AAErD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACzC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAKhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,YAAY,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;CAgClE"}
+{"version":3,"file":"o-node.tool.d.ts","sourceRoot":"","sources":["../../src/o-node.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAKT,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;;AAErD;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,cAAkB;IACzC,cAAc,CAAC,OAAO,EAAE,QAAQ;IAQhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA0C1E"}

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

@@ -9,7 +9,10 @@ import { oServerNode } from './nodes/server.node.js';
 export class oNodeTool extends oTool(oServerNode) {
     async handleProtocol(address) {
         this.logger.debug('Handling protocol: ' + address.protocol);
-        await this.p2pNode.handle(address.protocol, this.handleStream.bind(this));
+        await this.p2pNode.handle(address.protocol, this.handleStream.bind(this), {
+            maxInboundStreams: Infinity,
+            maxOutboundStreams: Infinity,
+        });
     }
     async initialize() {
         await super.initialize();
@@ -19,30 +22,35 @@ export class oNodeTool extends oTool(oServerNode) {
             await this.handleProtocol(this.staticAddress);
         }
     }
-    async handleStream(streamData) {
-        const { stream } = streamData;
-        const requestConfig = await CoreUtils.processStream(stream);
-        const request = new oRequest(requestConfig);
-        let success = true;
-        const result = await this.execute(request, stream).catch((error) => {
-            this.logger.error('Error executing tool: ', error, typeof error);
-            success = false;
-            const responseError = error instanceof oError
-                ? error
-                : new oError(oErrorCodes.UNKNOWN, error.message);
-            return {
-                error: responseError.toJSON(),
-            };
+    async handleStream(stream, connection) {
+        stream.addEventListener('message', async (event) => {
+            if (!event.data) {
+                this.logger.warn('Malformed event data');
+                return;
+            }
+            const requestConfig = await CoreUtils.processStream(event);
+            const request = new oRequest(requestConfig);
+            let success = true;
+            const result = await this.execute(request, stream).catch((error) => {
+                this.logger.error('Error executing tool: ', request.toString(), error, typeof error);
+                success = false;
+                const responseError = error instanceof oError
+                    ? error
+                    : new oError(oErrorCodes.UNKNOWN, error.message);
+                return {
+                    error: responseError.toJSON(),
+                };
+            });
+            if (success) {
+                this.metrics.successCount++;
+            }
+            else {
+                this.metrics.errorCount++;
+            }
+            // compose the response & add the expected connection + request fields
+            const response = CoreUtils.buildResponse(request, result, result?.error);
+            // add the request method to the response
+            await CoreUtils.sendResponse(response, stream);
         });
-        if (success) {
-            this.metrics.successCount++;
-        }
-        else {
-            this.metrics.errorCount++;
-        }
-        // compose the response & add the expected connection + request fields
-        const response = CoreUtils.buildResponse(request, result, result?.error);
-        // add the request method to the response
-        return CoreUtils.sendResponse(response, stream);
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"o-node.router.d.ts","sourceRoot":"","sources":["../../../src/router/o-node.router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAOL,cAAc,EACd,aAAa,EACd,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,qBAAa,WAAY,SAAQ,WAAW;;cAK1B,OAAO,CACrB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,GAAG,CAAC;IAgFf,OAAO,CAAC,qBAAqB;IAsBvB,SAAS,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAoB3E,UAAU,CAAC,qBAAqB,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAetE"}
+{"version":3,"file":"o-node.router.d.ts","sourceRoot":"","sources":["../../../src/router/o-node.router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAML,cAAc,EACd,aAAa,EACd,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,qBAAa,WAAY,SAAQ,WAAW;;cAK1B,OAAO,CACrB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,GAAG,CAAC;IA2Ef,OAAO,CAAC,qBAAqB;IAsBvB,SAAS,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAqB3E,UAAU,CAAC,qBAAqB,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAetE"}

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

@@ -1,7 +1,7 @@
 import { oNodeAddress } from './o-node.address.js';
 import { CoreUtils, oAddress, oError, oErrorCodes, oRequest, } from '@olane/o-core';
 import { oToolRouter } from '@olane/o-tool';
-import { pipe, pushable } from '@olane/o-config';
+import { oNodeConnection } from '../connection/o-node-connection.js';
 export class oNodeRouter extends oToolRouter {
     constructor() {
         super();
@@ -49,15 +49,15 @@ export class oNodeRouter extends oToolRouter {
         }
         // dial the target
         try {
-            const targetStream = await node?.p2pNode.dialProtocol(address.libp2pTransports.map((t) => t.toMultiaddr()), address.protocol);
-            if (!targetStream) {
-                throw new oError(oErrorCodes.FAILED_TO_DIAL_TARGET, 'Failed to dial target');
-            }
-            const pushableStream = pushable();
-            pushableStream.push(new TextEncoder().encode(nextHopRequest.toString()));
-            pushableStream.end();
-            await targetStream.sink(pushableStream);
-            await pipe(targetStream.source, stream?.sink);
+            const connection = await node?.p2pNode.dial(address.libp2pTransports.map((t) => t.toMultiaddr()));
+            const nodeConnection = new oNodeConnection({
+                p2pConnection: connection,
+                nextHopAddress: address,
+                address: node.address,
+                callerAddress: node.address,
+            });
+            await nodeConnection.transmit(nextHopRequest);
+            // await stream.send(new TextEncoder().encode(response.toString()));
         }
         catch (error) {
             if (error?.name === 'UnsupportedProtocolError') {
@@ -83,6 +83,7 @@ export class oNodeRouter extends oToolRouter {
     async translate(address, node) {
         const externalRoute = this.handleExternalAddress(address, node);
         if (externalRoute) {
+            this.logger.debug('External route found', externalRoute);
             return externalRoute;
         }
         const { nextHopAddress, targetAddress, requestOverride } = await this.addressResolution.resolve({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-node",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -33,7 +33,7 @@
     "url": "git+https://github.com/olane-labs/olane.git"
   },
   "author": "oLane Inc.",
-  "license": "ISC",
+  "license": "(MIT OR Apache-2.0)",
   "description": "oLane p2p node used to host agentic functionality",
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
@@ -56,10 +56,10 @@
     "typescript": "5.4.5"
   },
   "peerDependencies": {
-    "@olane/o-config": "^0.7.0",
-    "@olane/o-core": "^0.7.0",
-    "@olane/o-protocol": "^0.7.0",
-    "@olane/o-tool": "^0.7.0"
+    "@olane/o-config": "^0.7.2",
+    "@olane/o-core": "^0.7.2",
+    "@olane/o-protocol": "^0.7.2",
+    "@olane/o-tool": "^0.7.2"
   },
   "dependencies": {
     "debug": "^4.4.1",