@olane/o-node 0.7.12-alpha.29 → 0.7.12-alpha.30

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

@@ -1,11 +1,10 @@
-import { Connection, Stream } from '@olane/o-config';
+import { Connection } 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;
     p2pConnection: Connection;
     constructor(config: oNodeConnectionConfig);
-    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,EACL,UAAU,EAIV,MAAM,EAEP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,WAAW,EAGX,QAAQ,EACR,SAAS,EAEV,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;IA6E/C,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,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;IAK5D,QAAQ;IAOF,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IA6D/C,KAAK;CAKZ"}

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

@@ -1,20 +1,10 @@
-import { Uint8ArrayList, byteStream, } from '@olane/o-config';
-import { CoreUtils, oConnection, oError, oErrorCodes, oResponse, ResponseBuilder, } from '@olane/o-core';
+import { CoreUtils, oConnection, oError, oErrorCodes, oResponse, } from '@olane/o-core';
 export class oNodeConnection extends oConnection {
     constructor(config) {
         super(config);
         this.config = config;
         this.p2pConnection = config.p2pConnection;
     }
-    async read(source) {
-        const bytes = byteStream(source);
-        const output = await bytes.read({
-            signal: AbortSignal.timeout(this.config.readTimeoutMs ?? 120000), // Default: 2 min timeout
-        });
-        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') {
             throw new Error('Connection is not valid');
@@ -27,7 +17,6 @@ export class oNodeConnection extends oConnection {
                 maxOutboundStreams: Infinity,
                 runOnLimitedConnection: true, // TODO: should this be configurable?
             });
-            const isStreamRequest = this.config.isStream;
             if (!stream || (stream.status !== 'open' && stream.status !== 'reset')) {
                 throw new oError(oErrorCodes.FAILED_TO_DIAL_TARGET, 'Failed to dial target');
             }
@@ -37,22 +26,20 @@ export class oNodeConnection extends oConnection {
             // Send the data with backpressure handling (libp2p v3 best practice)
             const data = new TextEncoder().encode(request.toString());
             const sent = stream.send(data);
-            if (isStreamRequest) {
-                this.logger.debug('Detected stream request, attaching message listener');
-                await new Promise((resolve, reject) => {
-                    // TODO: add timeout
-                    stream.addEventListener('message', async (event) => {
-                        const response = await CoreUtils.processStreamResponse(event);
-                        this.emitter.emit('chunk', response);
-                        // marked as the last chunk let's close
-                        if (response.result._last) {
-                            this.logger.debug('Last chunk received, closing stream');
-                            await stream.close();
-                            resolve(true);
-                        }
-                    });
+            let lastResponse;
+            await new Promise((resolve, reject) => {
+                // TODO: add timeout
+                stream.addEventListener('message', async (event) => {
+                    const response = await CoreUtils.processStreamResponse(event);
+                    this.emitter.emit('chunk', response);
+                    // marked as the last chunk let's close
+                    if (response.result._last || !response.result._isStreaming) {
+                        lastResponse = response;
+                        await stream.close();
+                        resolve(true);
+                    }
                 });
-            }
+            });
             // If send() returns false, wait for the stream to drain before continuing
             if (!sent) {
                 this.logger.debug('Stream buffer full, waiting for drain...');
@@ -60,16 +47,7 @@ export class oNodeConnection extends oConnection {
                     signal: AbortSignal.timeout(this.config.drainTimeoutMs ?? 30000),
                 }); // Default: 30 second timeout
             }
-            if (isStreamRequest) {
-                const responseBuilder = ResponseBuilder.create();
-                return Promise.resolve(await responseBuilder.buildFinalChunk(request));
-            }
-            const res = await this.read(stream);
-            await stream.close();
-            // process the response
-            const response = new oResponse({
-                ...res.result,
-            });
+            const response = oResponse.fromJSON(lastResponse);
             return response;
         }
         catch (error) {

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

@@ -50,7 +50,7 @@ export class oNodeConnectionManager extends oConnectionManager {
                     callerAddress: callerAddress,
                     readTimeoutMs: readTimeoutMs ?? this.defaultReadTimeoutMs,
                     drainTimeoutMs: drainTimeoutMs ?? this.defaultDrainTimeoutMs,
-                    isStream: config.isStream || false,
+                    isStream: config.isStream ?? false,
                 });
                 if (attempt > 0) {
                     this.logger.info(`Successfully connected to ${nextHopAddress.toString()} on retry attempt ${attempt}`);

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,EAML,cAAc,EAGd,aAAa,EACd,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAO5C,qBAAa,WAAY,SAAQ,WAAW;IAC1C,OAAO,CAAC,aAAa,CAAqB;;IAO1C;;;;;;;;OAQG;cACa,OAAO,CACrB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,GAAG,CAAC;IA6Bf;;;OAGG;YACW,kBAAkB;IA8DhC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAWhC;;OAEG;YACW,eAAe;IA0C7B;;;OAGG;IACG,SAAS,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAyB3E;;;OAGG;IACH,UAAU,CAAC,qBAAqB,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAGtE"}
+{"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,EAGd,aAAa,EACd,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAO5C,qBAAa,WAAY,SAAQ,WAAW;IAC1C,OAAO,CAAC,aAAa,CAAqB;;IAO1C;;;;;;;;OAQG;cACa,OAAO,CACrB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,GAAG,CAAC;IA6Bf;;;OAGG;YACW,kBAAkB;IA8DhC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAWhC;;OAEG;YACW,eAAe;IA2C7B;;;OAGG;IACG,SAAS,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;IAyB3E;;;OAGG;IACH,UAAU,CAAC,qBAAqB,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO;CAGtE"}

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

@@ -60,7 +60,7 @@ export class oNodeRouter extends oToolRouter {
         // Create ResponseBuilder with metrics tracking
         const responseBuilder = ResponseBuilder.create().withMetrics(node.metrics);
         // Handle streaming requests
-        const isStream = request.params._isStream;
+        const isStream = request.params._isStreaming;
         if (isStream && request.stream) {
             // For streaming, we need to handle the stream chunks
             try {
@@ -119,8 +119,8 @@ export class oNodeRouter extends oToolRouter {
      */
     async dialAndTransmit(address, request, node) {
         try {
-            const isStream = request.params._isStream ||
-                request.params.payload?.params?._isStream;
+            const isStream = request.params._isStreaming ||
+                request.params.payload?.params?._isStreaming;
             const connection = await node.p2pNode.dial(address.libp2pTransports.map((t) => t.toMultiaddr()));
             const nodeConnection = new oNodeConnection({
                 p2pConnection: connection,
@@ -134,7 +134,7 @@ export class oNodeRouter extends oToolRouter {
                 if (!routeRequest.stream) {
                     throw new oError(oErrorCodes.INVALID_REQUEST, 'Stream is required');
                 }
-                nodeConnection.onChunk((response) => {
+                nodeConnection.onChunk(async (response) => {
                     CoreUtils.sendStreamResponse(response, routeRequest.stream);
                 });
                 // allow this to continue as we will tell the transmitter to stream the response and we will intercept via the above listener

package/dist/src/utils/stream.utils.js

@@ -3,19 +3,20 @@ export class StreamUtils extends oObject {
     static async processGenerator(request, generator, stream) {
         const utils = new StreamUtils();
         const responseBuilder = ResponseBuilder.create();
+        let aggregatedResult = '';
         try {
             // Send each chunk from the generator
+            // result should not be an oResponse, but rather a key value pair dict
             for await (const result of generator) {
+                if (result.delta) {
+                    aggregatedResult += result.delta;
+                }
                 const chunkResponse = await responseBuilder.buildChunk(request, result);
                 await CoreUtils.sendStreamResponse(chunkResponse, stream);
             }
-            // Send final chunk
-            const finalResponse = await responseBuilder.buildFinalChunk(request);
-            await CoreUtils.sendStreamResponse(finalResponse, stream);
-            return Promise.resolve({
-                success: true,
-                response: 'Stream completed',
-            });
+            return {
+                message: aggregatedResult,
+            };
         }
         catch (error) {
             // If error occurs during streaming, send error response

package/package.json

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