@olane/o-node 0.7.51 → 0.7.53

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

@@ -3,8 +3,8 @@ import { oTool } from '@olane/o-tool';
 import { oServerNode } from './nodes/server.node.js';
 import { oNodeTransport } from './router/o-node.transport.js';
 import { oNodeAddress } from './router/o-node.address.js';
-import { StreamHandler } from './connection/stream-handler.js';
 import { ConnectionUtils } from './utils/connection.utils.js';
+import { StreamManagerEvent } from './connection/stream-manager.events.js';
 /**
  * oTool is a mixin that extends the base class and implements the oTool interface
  * @param Base - The base class to extend
@@ -60,7 +60,6 @@ export class oNodeTool extends oTool(oServerNode) {
     }
     async initialize() {
         await super.initialize();
-        this.streamHandler = new StreamHandler(this.logger);
         await this.initializeProtocols();
     }
     async handleStreamReuse(stream, connection) {
@@ -70,32 +69,43 @@ export class oNodeTool extends oTool(oServerNode) {
         if (reuse) {
             this.logger.debug('Handle stream with reuse = true');
             // record inbound connection to manager
-            const remoteAddress = await ConnectionUtils.addressFromConnection({
-                currentNode: this,
-                connection: connection,
-            });
-            this.connectionManager.answer({
-                nextHopAddress: remoteAddress,
-                address: remoteAddress,
-                callerAddress: this.address,
-                p2pConnection: connection,
-                reuse,
-                // requestHandler: this.execute.bind(this), TODO: do we need this?
+        }
+        const remoteAddress = await ConnectionUtils.addressFromConnection({
+            currentNode: this,
+            connection: connection,
+        });
+        await this.connectionManager.answer({
+            nextHopAddress: remoteAddress,
+            address: remoteAddress,
+            callerAddress: this.address,
+            p2pConnection: connection,
+            reuse,
+        });
+        // Get the oNodeConnection for this libp2p connection
+        const oConnection = this.connectionManager.getConnectionByP2pConnection(connection);
+        if (!oConnection) {
+            this.logger.error('No oNodeConnection found for incoming stream', {
+                remotePeer: connection.remotePeer.toString(),
+                connectionId: connection.id,
             });
+            return;
         }
-        // Use StreamHandler for consistent stream handling
-        // This follows libp2p v3 best practices for length-prefixed streaming
-        await this.streamHandler.handleIncomingStream(stream, connection, async (request, stream) => {
+        // Subscribe to InboundRequest events from the stream manager
+        // This follows an event-driven pattern for handling incoming requests
+        oConnection.streamManager.on(StreamManagerEvent.InboundRequest, async (data) => {
             try {
-                const result = await this.execute(request, stream);
-                // Return the raw result - StreamHandler will build and send the response
+                const result = await this.execute(data.request, data.stream);
+                // Return the raw result - StreamManager will build and send the response
                 return result;
             }
             catch (error) {
-                this.logger.error('Error executing tool: ', request.toString(), error, typeof error);
-                throw error; // StreamHandler will handle error response building
+                this.logger.error('Error executing tool: ', data.request.toString(), error, typeof error);
+                throw error; // StreamManager will handle error response building
             }
         });
+        // Use the connection's StreamManager for consistent stream handling
+        // This follows libp2p v3 best practices for length-prefixed streaming
+        await oConnection.streamManager.handleIncomingStream(stream, connection);
     }
     async _tool_identify() {
         return {

package/dist/test/helpers/stream-pool-test-helpers.d.ts

@@ -1,76 +1 @@
-import { oNodeConnectionStream } from '../../src/connection/o-node-connection-stream.js';
-import { StreamPoolManagerConfig } from '../../src/index.js';
-/**
- * Create a mock stream for testing
- */
-export declare function createMockStream(id?: string, options?: {
-    status?: 'open' | 'closed' | 'reset';
-    writeStatus?: 'writable' | 'writing' | 'closed';
-    readStatus?: 'readable' | 'reading' | 'closed';
-    remoteReadStatus?: 'readable' | 'reading' | 'closed';
-}): any;
-/**
- * Create a mock P2P connection for testing
- */
-export declare function createMockP2PConnection(id?: string, status?: 'open' | 'closed'): any;
-/**
- * Create a mock StreamHandler for testing
- */
-export declare function createMockStreamHandler(): any;
-/**
- * Create a mock oNodeConnectionStream
- */
-export declare function createMockConnectionStream(p2pStream?: any, streamType?: 'dedicated-reader' | 'request-response' | 'general'): oNodeConnectionStream;
-/**
- * Factory for creating StreamPoolManager test config
- */
-export declare function createStreamPoolManagerConfig(overrides?: Partial<StreamPoolManagerConfig>): StreamPoolManagerConfig;
-/**
- * Event capture helper for testing event emissions
- */
-export declare class EventCapture {
-    private emitter;
-    private events;
-    constructor(emitter: any);
-    /**
-     * Start capturing events
-     */
-    start(eventNames: string[]): void;
-    /**
-     * Get all captured events
-     */
-    getEvents(): Array<{
-        type: string;
-        data: any;
-        timestamp: number;
-    }>;
-    /**
-     * Get events of specific type
-     */
-    getEventsByType(type: string): any[];
-    /**
-     * Check if event was emitted
-     */
-    hasEvent(type: string): boolean;
-    /**
-     * Get count of specific event type
-     */
-    getEventCount(type: string): number;
-    /**
-     * Wait for specific event
-     */
-    waitForEvent(type: string, timeoutMs?: number): Promise<any>;
-    /**
-     * Clear captured events
-     */
-    clear(): void;
-}
-/**
- * Helper to make a stream invalid
- */
-export declare function makeStreamInvalid(stream: any): void;
-/**
- * Helper to wait for condition with timeout
- */
-export declare function waitFor(condition: () => boolean, timeoutMs?: number, intervalMs?: number): Promise<void>;
 //# sourceMappingURL=stream-pool-test-helpers.d.ts.map

package/dist/test/helpers/stream-pool-test-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-pool-test-helpers.d.ts","sourceRoot":"","sources":["../../../test/helpers/stream-pool-test-helpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE7D;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,GAAE,MAAsB,EAC1B,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;IACrC,WAAW,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;IAChD,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;IAC/C,gBAAgB,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;CACjD,GACL,GAAG,CAqBL;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,GAAE,MAA0B,EAC9B,MAAM,GAAE,MAAM,GAAG,QAAiB,GACjC,GAAG,CAoBL;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,GAAG,CAwE7C;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,CAAC,EAAE,GAAG,EACf,UAAU,GAAE,kBAAkB,GAAG,kBAAkB,GAAG,SAAqB,GAC1E,qBAAqB,CASvB;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,uBAAuB,CAuBzB;AAED;;GAEG;AACH,qBAAa,YAAY;IAGX,OAAO,CAAC,OAAO;IAF3B,OAAO,CAAC,MAAM,CAA6D;gBAEvD,OAAO,EAAE,GAAG;IAEhC;;OAEG;IACH,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI;IAYjC;;OAEG;IACH,SAAS,IAAI,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAIlE;;OAEG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE;IAIpC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI/B;;OAEG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAInC;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAa,GAAG,OAAO,CAAC,GAAG,CAAC;IAcxE;;OAEG;IACH,KAAK,IAAI,IAAI;CAGd;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI,CAGnD;AAED;;GAEG;AACH,wBAAsB,OAAO,CAC3B,SAAS,EAAE,MAAM,OAAO,EACxB,SAAS,GAAE,MAAa,EACxB,UAAU,GAAE,MAAW,GACtB,OAAO,CAAC,IAAI,CAAC,CASf"}
+{"version":3,"file":"stream-pool-test-helpers.d.ts","sourceRoot":"","sources":["../../../test/helpers/stream-pool-test-helpers.ts"],"names":[],"mappings":""}