diffpx 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diffpx",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "bin": {
     "diffpx": "bin/diffpx.js"
   },

package/src/runner.js

@@ -45,15 +45,14 @@ function getProgress(status) {
     };
 }
 
-async function runJob({ppKey, payload}) {
+async function runJob({diffpxKey, payload}) {
     const multiBar = new cliProgress.MultiBar({
         clearOnComplete: false,
         hideCursor: true,
         barCompleteChar: '█',
         barIncompleteChar: '░',
         format: '{name} [{bar}] {percentage}% | {value}/{total}',
-        noTTYOutput: true,
-        notTTYSchedule: 500
+        stream: process.stdout
     }, cliProgress.Presets.shades_classic);
 
     const initialSnapshotsTotal = Array.isArray(payload?.snapshots) ? payload.snapshots.length : 1;
@@ -72,16 +71,19 @@ async function runJob({ppKey, payload}) {
     );
 
     let jobId = null;
+    let lastSnapshot = {total: Math.max(1, initialSnapshotsTotal), done: 0, label: getInitialSnapshotName(payload)};
+    let lastWidth = {total: Math.max(1, initialWidthsTotal), done: 0, label: getInitialWidthName(payload)};
 
     try {
-        const res = await submitRun(ppKey, payload);
+        const diffpxUrl = process.env.DIFFPX_URL || '';
+        const res = await submitRun(diffpxUrl, diffpxKey, payload);
         jobId = res?.jobId || res?.id || res?.job_id || res?.data?.jobId || null;
         if (!jobId) {
             throw new Error('Server did not return a job id');
         }
 
-        const finalStatus = await pollRun(ppKey, jobId, {
-            intervalMs: Number(process.env.PP_POLL_INTERVAL_MS || 1000),
+        const finalStatus = await pollRun(diffpxUrl, diffpxKey, jobId, {
+            intervalMs: Number(process.env.DIFFPX_POLL_INTERVAL_MS || 1000),
             onStatus: (status) => {
                 const p = getProgress(status);
 
@@ -91,14 +93,20 @@ async function runJob({ppKey, payload}) {
                 const snapTotal = p.snapshotsTotal > 0 ? p.snapshotsTotal : Math.max(1, initialSnapshotsTotal);
                 const snapDone = p.snapshotsTotal > 0 ? Math.min(p.snapshotsDone, p.snapshotsTotal) : snapshotsBar.value;
 
-                snapshotsBar.setTotal(snapTotal);
-                snapshotsBar.update(snapDone, {name: snapshotLabel});
+                if (snapTotal !== lastSnapshot.total || snapDone !== lastSnapshot.done || snapshotLabel !== lastSnapshot.label) {
+                    snapshotsBar.setTotal(snapTotal);
+                    snapshotsBar.update(snapDone, {name: snapshotLabel});
+                    lastSnapshot = {total: snapTotal, done: snapDone, label: snapshotLabel};
+                }
 
                 const wTotal = p.widthsTotal > 0 ? p.widthsTotal : Math.max(1, initialWidthsTotal);
                 const wDone = p.widthsTotal > 0 ? Math.min(p.widthsDone, p.widthsTotal) : widthsBar.value;
 
-                widthsBar.setTotal(wTotal);
-                widthsBar.update(wDone, {name: widthLabel});
+                if (wTotal !== lastWidth.total || wDone !== lastWidth.done || widthLabel !== lastWidth.label) {
+                    widthsBar.setTotal(wTotal);
+                    widthsBar.update(wDone, {name: widthLabel});
+                    lastWidth = {total: wTotal, done: wDone, label: widthLabel};
+                }
             }
         });