@forzalabs/remora 1.0.9 → 1.0.11

package/executors/ExecutorOrchestrator.js

@@ -62,6 +62,7 @@ class ExecutorOrchestratorClass {
                 this.init();
                 const executorResults = [];
                 const sourceFilesByProducer = yield this.readySourceFiles(consumer);
+                let globalWorkerIndex = 0;
                 for (const pair of sourceFilesByProducer) {
                     const { prod, cProd, response } = pair;
                     // Make sure that the data files are there, if missing and isOptional = true, then skip
@@ -75,12 +76,15 @@ class ExecutorOrchestratorClass {
                     const firstLine = (yield DriverHelper_1.default.quickReadFile(response.files[0].fullUri, 1))[0];
                     const header = ProducerExecutor_1.default.processHeader(firstLine, prod);
                     const prodDimensions = ProducerExecutor_1.default.reconcileHeader(header, prod);
-                    for (const file of response.files) {
+                    const totalFiles = response.files.length;
+                    for (const [fileIndex, file] of response.files.entries()) {
                         const chunks = ExecutorOrchestrator.scopeWork(file.fullUri);
                         const workerThreads = [];
-                        for (const [index, chunk] of chunks.entries()) {
+                        for (const chunk of chunks) {
                             // Spawn off thread
-                            const workerId = `${usageId}_${index}`;
+                            const workerId = `${usageId}_${globalWorkerIndex}`;
+                            const currentWorkerIndex = globalWorkerIndex;
+                            globalWorkerIndex++;
                             const workerData = {
                                 chunk,
                                 consumer,
@@ -89,10 +93,10 @@ class ExecutorOrchestratorClass {
                                 workerId: workerId,
                                 options: options
                             };
-                            _progress.register((index + 1).toString());
+                            _progress.register((currentWorkerIndex + 1).toString(), prod.name, fileIndex, totalFiles);
                             workersId.push(workerId);
                             workerThreads.push(this._executorPool.exec('executor', [workerData], {
-                                on: payload => this.onWorkAdvanced(payload, index, _progress)
+                                on: payload => this.onWorkAdvanced(payload, currentWorkerIndex, _progress)
                             }));
                         }
                         executorResults.push(...yield Promise.all(workerThreads));

package/executors/ExecutorProgress.js

@@ -6,11 +6,12 @@ class ExecutorProgress {
         this._FPS = 2;
         this._lastRenderTime = 0;
         this._lastRenderedLines = -1;
-        this.register = (name) => {
-            this.workers[name] = 0;
+        this.register = (name, producerName, fileIndex, totalFiles) => {
+            this.workers[name] = { progress: 0, producerName, fileIndex, totalFiles };
         };
         this.update = (name, value) => {
-            this.workers[name] = value;
+            if (this.workers[name])
+                this.workers[name].progress = value;
             const now = Date.now();
             const interval = 1000 / this._FPS;
             if (now - this._lastRenderTime >= interval) {
@@ -20,7 +21,7 @@ class ExecutorProgress {
         };
         this.complete = () => {
             for (const key of Object.keys(this.workers)) {
-                this.workers[key] = 1;
+                this.workers[key].progress = 1;
             }
             this.render();
         };
@@ -35,13 +36,14 @@ class ExecutorProgress {
             }
             this._lastRenderedLines = 0;
             for (const key of Object.keys(this.workers)) {
-                const wrk = this.workers[key] * 100;
-                const percentage = Math.min(100, Math.max(0, wrk));
+                const worker = this.workers[key];
+                const percentage = Math.min(100, Math.max(0, worker.progress * 100));
                 const barWidth = 30;
                 const filledWidth = Math.floor((percentage / 100) * barWidth);
                 const emptyWidth = barWidth - filledWidth;
                 const bar = '#'.repeat(filledWidth) + '-'.repeat(emptyWidth);
-                console.log(`Worker ${key.padStart(2, '0')}: [${bar}] ${percentage.toFixed(2)}%`);
+                const fileInfo = worker.totalFiles > 1 ? ` [${worker.fileIndex + 1}/${worker.totalFiles}]` : '';
+                console.log(`Worker ${key.padStart(2, '0')}: [${bar}] ${percentage.toFixed(2)}% (${worker.producerName}${fileInfo})`);
                 this._lastRenderedLines++;
             }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@forzalabs/remora",
-    "version": "1.0.9",
+    "version": "1.0.11",
     "description": "A powerful CLI tool for seamless data translation.",
     "main": "index.js",
     "private": false,