http-request-manager 18.12.4 → 18.12.8

package/fesm2022/http-request-manager.mjs

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { inject, Injectable, APP_ID, Inject, InjectionToken, isDevMode, signal, effect, computed, Injector, Optional, EventEmitter, Input, Output, ViewEncapsulation, Component, NgModule, ViewChild } from '@angular/core';
 import { ComponentStore } from '@ngrx/component-store';
-import { map, catchError, filter, tap, finalize, takeWhile, retry, startWith, mergeMap, takeUntil, concatMap, toArray, withLatestFrom, switchMap, delay, take, scan, distinctUntilChanged } from 'rxjs/operators';
+import { map, catchError, filter, finalize, tap, scan, takeWhile, retry, startWith, mergeMap, takeUntil, concatMap, toArray, withLatestFrom, switchMap, delay, take, distinctUntilChanged } from 'rxjs/operators';
 import { HttpClient, HttpHeaders, HttpEventType, HttpHeaderResponse, HttpErrorResponse, HTTP_INTERCEPTORS } from '@angular/common/http';
 import * as CryptoJS from 'crypto-js';
 import { from, BehaviorSubject, EMPTY, throwError, defer, interval, timer, Subject, of, Observable, merge, Subscription, take as take$1, catchError as catchError$1, map as map$1, tap as tap$1, switchMap as switchMap$1, startWith as startWith$1, distinctUntilChanged as distinctUntilChanged$1, combineLatest, filter as filter$1, takeUntil as takeUntil$1, ReplaySubject } from 'rxjs';
@@ -884,6 +884,7 @@ class StreamingProcessor {
         this.contentType = '';
         this.maxBufferSize = 10 * 1024 * 1024; // 10MB limit
         this.lastParsedLength = 0; // Track parsed position to avoid duplicates
+        this.lastParsedLineEnd = 0; // Track end of last-parsed complete line for NDJSON incremental parsing
         this.streamConfig = config || { streamType: StreamType.AI_STREAMING };
     }
     /**
@@ -906,18 +907,26 @@ class StreamingProcessor {
                 return null;
             case HttpEventType.DownloadProgress:
                 if (event.partialText) {
-                    this.appendToBuffer(event.partialText);
+                    // partialText is cumulative, so replace the buffer instead of appending
+                    this.buffer = event.partialText;
                     const parsedData = this.parseBuffer();
-                    // Only return NEW items since last parse (progressive updates)
-                    const newItems = parsedData.slice(this.lastParsedLength);
-                    // received = cumulative total for display, newItems.length = new this chunk
-                    const received = newItems.length; // Changed from lastParsedLength
-                    this.lastParsedLength = parsedData.length;
+                    // For NDJSON incremental parsing, parsedData already contains only new items.
+                    // For other formats, parsedData is cumulative so slice from lastParsedLength.
+                    const isIncremental = this.streamConfig.streamType === StreamType.NDJSON;
+                    const newItems = isIncremental ? parsedData : parsedData.slice(this.lastParsedLength);
+                    // received = cumulative total for progress display
+                    const received = isIncremental
+                        ? this.lastParsedLength + parsedData.length
+                        : parsedData.length;
+                    this.lastParsedLength = received;
+                    // Return null when no new items — prevents empty array emissions
+                    if (newItems.length === 0) {
+                        return null;
+                    }
                     const total = this.totalFromHeader;
                     const percent = total
                         ? Math.min(100, Math.round((received / total) * 100))
                         : 0;
-                    // console.log('[STREAM] progress:', percent, 'received:', received, 'total:', total, 'bufferLen:', this.buffer.length, 'parsedCount:', parsedData.length);
                     const progress = {
                         received,
                         total,
@@ -925,19 +934,24 @@ class StreamingProcessor {
                         stage: 'streaming'
                     };
                     return {
-                        data: newItems.length > 0 ? newItems : [],
+                        data: newItems,
                         progress
                     };
                 }
                 return null;
             case HttpEventType.Response:
                 if (event.body) {
-                    this.appendToBuffer(event.body);
+                    // event.body is the complete response, replace the buffer
+                    this.buffer = event.body;
                     const parsedData = this.parseBuffer();
-                    // Only return items not already returned via progress events
-                    const remaining = parsedData.slice(this.lastParsedLength);
-                    this.lastParsedLength = parsedData.length;
-                    const received = parsedData.length;
+                    // For NDJSON incremental parsing, parsedData already contains only new items.
+                    // For other formats, parsedData is cumulative so slice from lastParsedLength.
+                    const isIncremental = this.streamConfig.streamType === StreamType.NDJSON;
+                    const remaining = isIncremental ? parsedData : parsedData.slice(this.lastParsedLength);
+                    const received = isIncremental
+                        ? this.lastParsedLength + parsedData.length
+                        : parsedData.length;
+                    this.lastParsedLength = received;
                     const total = this.totalFromHeader;
                     const percent = total
                         ? Math.min(100, Math.round((received / total) * 100))
@@ -966,6 +980,7 @@ class StreamingProcessor {
         // Implement sliding window if buffer gets too large
         if (this.buffer.length > this.maxBufferSize) {
             this.buffer = this.buffer.slice(-this.maxBufferSize / 2);
+            this.lastParsedLineEnd = 0;
         }
     }
     /**
@@ -976,11 +991,25 @@ class StreamingProcessor {
             return [];
         }
         try {
+            if (this.streamConfig.streamType === StreamType.NDJSON) {
+                // For NDJSON, only parse complete lines since the last parse.
+                // Find the last newline in the buffer — everything after it is an incomplete line.
+                const lastNewlineIndex = this.buffer.lastIndexOf('\n');
+                if (lastNewlineIndex === -1) {
+                    // No complete lines yet
+                    return [];
+                }
+                // Parse only the content from lastParsedLineEnd up to (and including) the last newline
+                const bufferToParse = this.buffer.substring(this.lastParsedLineEnd, lastNewlineIndex + 1);
+                this.lastParsedLineEnd = lastNewlineIndex + 1;
+                const result = parseStreamData(bufferToParse, this.contentType, this.streamConfig);
+                return result;
+            }
             const result = parseStreamData(this.buffer, this.contentType, this.streamConfig);
             return result;
         }
         catch (error) {
-            console.warn('Failed to parse streaming data:', error);
+            // console.warn('Failed to parse streaming data:', error);
             return [];
         }
     }
@@ -991,6 +1020,7 @@ class StreamingProcessor {
         this.buffer = '';
         this.contentType = '';
         this.lastParsedLength = 0;
+        this.lastParsedLineEnd = 0;
         this.totalFromHeader = undefined;
     }
     /**
@@ -2891,7 +2921,9 @@ class RequestService extends WebsocketService {
                 observe: 'events',
                 responseType: 'text',
                 reportProgress: true
-            }).pipe(tap(data => console.log('STREAM DATA', data)), requestStreaming({
+            }).pipe(
+            // tap(data => console.log('STREAM DATA', data)),
+            requestStreaming({
                 streamType: options.streamType || StreamType.AI_STREAMING,
                 totalHeader: options.totalHeader
             }), this.requestStreaming(options), finalize(() => {
@@ -2981,19 +3013,19 @@ class RequestService extends WebsocketService {
     requestStreaming(options) {
         return (source$) => {
             return source$.pipe(tap(output => {
-                // Update progress from stream output
                 this.progress.next(output.progress.percent);
                 this.streamProgress.next(output.progress);
-            }), map(output => {
-                const data = output.data;
-                if (!data || (Array.isArray(data) && data.length === 0)) {
-                    return data;
-                }
+            }), scan((acc, output) => {
+                // Accumulate data from each emission
+                const newData = output.data;
                 if (options?.adapter) {
-                    return data.map((item) => options.adapter(item));
+                    const adaptedData = newData.map((item) => options.adapter(item));
+                    return [...acc, ...adaptedData];
                 }
-                return data;
-            }));
+                else {
+                    return [...acc, ...newData];
+                }
+            }, []));
         };
     }
     downloadFileRequest(options) {
@@ -4170,7 +4202,7 @@ class HTTPManagerService extends RequestService {
     }
     handleSequentialError(request, error, index, options) {
         if (options.logErrors !== false) {
-            console.error(`Batch request ${index} failed:`, error);
+            // console.error(`Batch request ${index} failed:`, error);
         }
         if (options.stopOnError) {
             return throwError(() => error);
@@ -4182,7 +4214,7 @@ class HTTPManagerService extends RequestService {
     }
     handleParallelError(request, error, index, options) {
         if (options.logErrors !== false) {
-            console.error(`Batch request ${index} failed:`, error);
+            // console.error(`Batch request ${index} failed:`, error);
         }
         if (options.ignoreErrors) {
             return of(undefined);
@@ -4277,17 +4309,17 @@ class RequestSignalsService extends WebsocketService {
      * - Streams are protected - non-stream requests wait for active streams
      */
     queueRequest(request$, method, isStream = false) {
-        console.log(`[Queue] ${method} queued (isStream=${isStream})`, {
-            activeMethod: this.activeMethod,
-            activeStreamMethod: this.activeStreamMethod,
-            queueLength: this.requestQueue.length
-        });
+        // console.log(`[Queue] ${method} queued (isStream=${isStream})`, {
+        //   activeMethod: this.activeMethod,
+        //   activeStreamMethod: this.activeStreamMethod,
+        //   queueLength: this.requestQueue.length
+        // });
         return new Observable((observer) => {
-            console.log(`[Queue] ${method} observer created, checking conditions...`, {
-                activeMethod: this.activeMethod,
-                activeStreamMethod: this.activeStreamMethod,
-                isStream
-            });
+            // console.log(`[Queue] ${method} observer created, checking conditions...`, {
+            //   activeMethod: this.activeMethod,
+            //   activeStreamMethod: this.activeStreamMethod,
+            //   isStream
+            // });
             const queuedRequest = {
                 observable: request$,
                 resolve: (value) => observer.next(value),
@@ -4297,7 +4329,7 @@ class RequestSignalsService extends WebsocketService {
             };
             // If a stream is currently active, non-stream requests must wait
             if (this.activeStreamMethod && !isStream) {
-                console.log(`[Queue] ${method} queued (1), waiting for stream ${this.activeStreamMethod}`);
+                // console.log(`[Queue] ${method} queued (1), waiting for stream ${this.activeStreamMethod}`);
                 this.requestQueue.push(queuedRequest);
                 return () => {
                     const idx = this.requestQueue.findIndex(q => q === queuedRequest);
@@ -4307,7 +4339,7 @@ class RequestSignalsService extends WebsocketService {
             }
             // If a request is already running, queue this one (FIFO)
             if (this.activeMethod) {
-                console.log(`[Queue] ${method} queued (2), waiting for ${this.activeMethod}`);
+                // console.log(`[Queue] ${method} queued (2), waiting for ${this.activeMethod}`);
                 this.requestQueue.push(queuedRequest);
                 return () => {
                     const idx = this.requestQueue.findIndex(q => q === queuedRequest);
@@ -4316,7 +4348,7 @@ class RequestSignalsService extends WebsocketService {
                 };
             }
             // No active request - start immediately
-            console.log(`[Queue] ${method} starting immediately`);
+            // console.log(`[Queue] ${method} starting immediately`);
             this.startRequest(queuedRequest, observer);
             return () => {
                 const idx = this.requestQueue.findIndex(q => q === queuedRequest);
@@ -4334,23 +4366,23 @@ class RequestSignalsService extends WebsocketService {
             this.activeStreamMethod = queuedRequest.method;
         }
         this._activeRequestCount.update(c => c + 1);
-        console.log(`[Queue] Starting ${queuedRequest.method}${queuedRequest.isStream ? ' (STREAM)' : ''}`, {
-            activeMethod: this.activeMethod,
-            activeStreamMethod: this.activeStreamMethod,
-            queueLength: this.requestQueue.length
-        });
+        // console.log(`[Queue] Starting ${queuedRequest.method}${queuedRequest.isStream ? ' (STREAM)' : ''}`, {
+        //   activeMethod: this.activeMethod,
+        //   activeStreamMethod: this.activeStreamMethod,
+        //   queueLength: this.requestQueue.length
+        // });
         const sub = queuedRequest.observable.subscribe({
             next: (value) => {
-                console.log(`[Queue] ${queuedRequest.method} received value, isStream=${queuedRequest.isStream}`);
+                // console.log(`[Queue] ${queuedRequest.method} received value, isStream=${queuedRequest.isStream}`);
                 observer.next(value);
             },
             error: (error) => {
-                console.log(`[Queue] ${queuedRequest.method} error:`, error);
+                // console.log(`[Queue] ${queuedRequest.method} error:`, error);
                 observer.error(error);
                 this.cleanupAndProcessNext(queuedRequest.method, !!queuedRequest.isStream);
             },
             complete: () => {
-                console.log(`[Queue] ${queuedRequest.method} complete, isStream=${queuedRequest.isStream}`);
+                // console.log(`[Queue] ${queuedRequest.method} complete, isStream=${queuedRequest.isStream}`);
                 observer.complete();
                 this.cleanupAndProcessNext(queuedRequest.method, !!queuedRequest.isStream);
             }
@@ -4361,35 +4393,29 @@ class RequestSignalsService extends WebsocketService {
      * Clean up completed request and process next in queue
      */
     cleanupAndProcessNext(method, wasStream) {
-        console.log(`[Queue] cleanupAndProcessNext called: method=${method}, wasStream=${wasStream}`, {
-            activeMethod: this.activeMethod,
-            activeStreamMethod: this.activeStreamMethod,
-            queueLength: this.requestQueue.length
-        });
+        // console.log(`[Queue] cleanupAndProcessNext called: method=${method}, wasStream=${wasStream}`, {
+        //   activeMethod: this.activeMethod,
+        //   activeStreamMethod: this.activeStreamMethod,
+        //   queueLength: this.requestQueue.length
+        // });
         this.activeRequests.delete(method);
         this.activeMethod = null;
         if (wasStream) {
             this.activeStreamMethod = null;
         }
-        this._activeRequestCount.update(c => {
-            const newCount = Math.max(0, c - 1);
-            if (newCount === 0) {
-                this.progress.set(0);
-            }
-            return newCount;
-        });
-        console.log(`[Queue] After cleanup:`, {
-            activeMethod: this.activeMethod,
-            activeStreamMethod: this.activeStreamMethod,
-            queueLength: this.requestQueue.length
-        });
+        this._activeRequestCount.update(c => Math.max(0, c - 1));
+        // console.log(`[Queue] After cleanup:`, {
+        //   activeMethod: this.activeMethod,
+        //   activeStreamMethod: this.activeStreamMethod,
+        //   queueLength: this.requestQueue.length
+        // });
         // Process next request in queue
         if (this.requestQueue.length > 0) {
             const next = this.requestQueue.shift();
-            console.log(`[Queue] Processing next from queue: ${next.method}`, {
-                isStream: next.isStream,
-                queueLength: this.requestQueue.length
-            });
+            // console.log(`[Queue] Processing next from queue: ${next.method}`, {
+            //   isStream: next.isStream,
+            //   queueLength: this.requestQueue.length
+            // });
             this.startRequest(next, {
                 next: (value) => next.resolve(value),
                 error: (error) => next.reject(error),
@@ -8467,7 +8493,7 @@ class RequestManagerBasicDemoComponent {
     // Update displayed columns when data changes
     updateDisplayedColumns(data) {
         this.displayedColumns = this.getColumnsFromData(data);
-        console.log('[DEMO] Updated columns:', this.displayedColumns);
+        // console.log('[DEMO] Updated columns:', this.displayedColumns)
     }
     // Helper to check if value is an object
     isObject(value) {
@@ -8727,7 +8753,7 @@ class RequestManagerBasicDemoComponent {
         this.requestParams.GET = reqParams.apiOptions;
         this.STREAM$ = this.httpManagerService.getRequest(reqParams.apiOptions, reqParams.path)
             .pipe(tap((data) => {
-            console.log("API STREAM response", data);
+            // console.log("API STREAM response", data)
             if (data && data.length > 0) {
                 this.updateDisplayedColumns(data);
             }
@@ -9032,7 +9058,7 @@ class RequestManagerStateDemoComponent {
         this.stateManagerDemoService.data$.pipe(tap$1((data) => console.log("API STREAM_AI response", data)));
         this.error$.pipe(tap$1((data) => {
             debugger;
-            console.log("API STREAM response", data);
+            // console.log("API STREAM response", data)
         }), catchError$1(error => {
             return throwError(() => this.errorHandling(error, 'STREAM'));
         }));
@@ -9208,7 +9234,7 @@ class RequestManagerDemoComponent {
     // Update displayed columns when data changes
     updateDisplayedColumns(data) {
         this.displayedColumns = this.getColumnsFromData(data);
-        console.log('[DEMO] Updated columns:', this.displayedColumns);
+        // console.log('[DEMO] Updated columns:', this.displayedColumns)
     }
     // Helper to check if value is an object
     isObject(value) {
@@ -9492,7 +9518,7 @@ class RequestManagerDemoComponent {
         this.STREAM_error$.next('');
         this.STREAM$ = this.httpManagerService.getRequest(reqParams.apiOptions, reqParams.path)
             .pipe(tap((data) => {
-            console.log("API STREAM response", data);
+            // console.log("API STREAM response", data)
             if (data && data.length > 0) {
                 this.updateDisplayedColumns(data);
             }