@tmlmobilidade/go-utils-exec 20260905.2252.20 → 20260906.1643.56

package/dist/batch/batch-writer.d.ts

@@ -44,12 +44,11 @@ interface BatchWriterParams<T> {
 }
 export declare class BatchWriter<T> {
     private params;
-    private dataBucketAlwaysAvailable;
-    private dataBucketFlushOps;
+    private dataBucket;
+    private flushInProgress;
     private batchTimeoutTimer;
     private idleTimeoutTimer;
     private sessionTimer;
-    private flushInProgress;
     constructor(params: BatchWriterParams<T>);
     /**
      * Flushes the current batch of data.

package/dist/batch/batch-writer.js

@@ -5,15 +5,11 @@ import { Timer } from '@tmlmobilidade/timer';
 export class BatchWriter {
     //
     params;
-    dataBucketAlwaysAvailable = [];
-    dataBucketFlushOps = [];
+    dataBucket = [];
+    flushInProgress = null;
     batchTimeoutTimer = null;
     idleTimeoutTimer = null;
     sessionTimer = new Timer();
-    // ponytail: single in-flight guard, not a queue. Serializes overlapping
-    // flushes (timer-triggered vs batch-full) so inserts never run concurrently
-    // and callers applying backpressure await the same promise.
-    flushInProgress = null;
     constructor(params) {
         if (!params.title)
             throw new Error('BATCHWRITER: Title is required.');
@@ -54,58 +50,40 @@ export class BatchWriter {
      */
     async drain(callback) {
         await this.flush(callback);
-        if (this.dataBucketAlwaysAvailable.length > 0 && !this.idleTimeoutTimer && !this.batchTimeoutTimer && !this.flushInProgress) {
+        if (this.dataBucket.length > 0 && !this.idleTimeoutTimer && !this.batchTimeoutTimer && !this.flushInProgress) {
             await this.flush(callback);
         }
     }
     async runFlush(callback) {
+        //
+        //
+        // Invalidate all timers since a flush operation is being performed
+        if (this.idleTimeoutTimer) {
+            clearTimeout(this.idleTimeoutTimer);
+            this.idleTimeoutTimer = null;
+        }
+        if (this.batchTimeoutTimer) {
+            clearTimeout(this.batchTimeoutTimer);
+            this.batchTimeoutTimer = null;
+        }
+        //
+        // Skip if there is no data to flush
+        if (this.dataBucket.length === 0)
+            return;
+        // Transfer ownership of the current batch.
+        const batch = this.dataBucket;
+        this.dataBucket = [];
         try {
-            //
             const flushTimer = new Timer();
-            const sessionTimerResult = this.sessionTimer.get();
-            //
-            // Invalidate all timers since a flush operation is being performed
-            if (this.idleTimeoutTimer) {
-                clearTimeout(this.idleTimeoutTimer);
-                this.idleTimeoutTimer = null;
-            }
-            if (this.batchTimeoutTimer) {
-                clearTimeout(this.batchTimeoutTimer);
-                this.batchTimeoutTimer = null;
-            }
-            //
-            // Skip if there is no data to flush
-            if (this.dataBucketAlwaysAvailable.length === 0)
-                return;
-            //
-            // Copy everything in dataBucketAlwaysAvailable to dataBucketFlushOps
-            // to prevent any new incoming data to be added to the batch. This is to ensure
-            // that the batch is not modified while it is being processed.
-            this.dataBucketFlushOps = [...this.dataBucketFlushOps, ...this.dataBucketAlwaysAvailable];
-            this.dataBucketAlwaysAvailable = [];
-            //
-            // Process the data for batch insert
-            try {
-                // Call the insert function provided in the params to perform the actual database insertion.
-                if (!this.params.insertFn)
-                    throw new Error('BATCHWRITER: No insert function provided in params');
-                await this.insertWithRetry(this.dataBucketFlushOps);
-                console.info(`BATCHWRITER [${this.params.title}]: Flush | Length: ${this.dataBucketFlushOps.length} (session: ${sessionTimerResult}) (flush: ${flushTimer.get()})`);
-                // Call the flush callback, if provided
-                if (callback)
-                    await callback(this.dataBucketFlushOps);
-                // Reset the flush bucket
-                this.dataBucketFlushOps = [];
-            }
-            catch (error) {
-                console.error(`BATCHWRITER [${this.params.title}]: Error @ flush().insert(): ${error.message}`);
-                throw error; // Re-throw to allow retry logic at higher level
-            }
-            //
+            await this.insertWithRetry(batch);
+            console.info(`BATCHWRITER [${this.params.title}]: Flush | Length: ${batch.length} (session: ${this.sessionTimer.get()}) (flush: ${flushTimer.get()})`);
+            // Call the flush callback, if provided
+            if (callback)
+                await callback(batch);
         }
         catch (error) {
             console.error(`BATCHWRITER [${this.params.title}]: Error @ flush(): ${error.message}`);
-            throw error; // Re-throw to allow retry logic at higher level
+            throw error;
         }
     }
     /**
@@ -118,13 +96,15 @@ export class BatchWriter {
      */
     async insertWithRetry(data) {
         const maxRetries = this.params.max_retries ?? 3;
-        const retryBaseDelayMs = this.params.retry_base_delay_ms ?? 1000;
+        const retryBaseDelayMs = this.params.retry_base_delay_ms ?? 1_000;
         for (let attempt = 0; attempt <= maxRetries; attempt++) {
             try {
                 await this.params.insertFn(data);
                 return;
             }
             catch (error) {
+                if (attempt === maxRetries)
+                    throw error;
                 const parsedError = error;
                 const nextAttempt = attempt + 1;
                 const delayMs = retryBaseDelayMs * (2 ** attempt);
@@ -152,23 +132,24 @@ export class BatchWriter {
         //
         // Check if the batch is full
         const batchSize = this.params.batch_size ?? 10_000;
-        if (this.dataBucketAlwaysAvailable.length >= batchSize) {
+        if (this.dataBucket.length >= batchSize) {
             console.info(`BATCHWRITER [${this.params.title}]: Batch full. Flushing data...`);
             await this.flush(flushCallback);
         }
         //
         // Reset the session timer (for logging purposes)
-        if (this.dataBucketAlwaysAvailable.length === 0) {
+        if (this.dataBucket.length === 0) {
             this.sessionTimer.reset();
         }
         //
         // Add the current data to the batch
         if (Array.isArray(data)) {
-            const combinedDataWithOptions = data.map(item => item);
-            this.dataBucketAlwaysAvailable = [...this.dataBucketAlwaysAvailable, ...combinedDataWithOptions];
+            for (const item of data) {
+                this.dataBucket.push(item);
+            }
         }
         else {
-            this.dataBucketAlwaysAvailable.push(data);
+            this.dataBucket.push(data);
         }
         //
         // Call the write callback, if provided

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmlmobilidade/go-utils-exec",
-	"version": "20260905.2252.20",
+	"version": "20260906.1643.56",
 	"author": {
 		"email": "iso@tmlmobilidade.pt",
 		"name": "TML-ISO"