diffpx 0.0.5 → 0.0.6

package/package.json

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

package/src/runner.js

@@ -45,20 +45,20 @@ function getProgress(status) {
     };
 }
 
-async function runJob({diffpxKey, payload}) {
-    const initialSnapshotsTotal = Array.isArray(payload?.snapshots) ? payload.snapshots.length : 1;
-    const initialWidthsTotal = Array.isArray(payload?.settings?.width) ? payload.settings.width.length : 1;
-    const isTTY = !!process.stdout.isTTY;
+async function runJob({ppKey, payload}) {
     const multiBar = new cliProgress.MultiBar({
         clearOnComplete: false,
         hideCursor: true,
         barCompleteChar: '█',
         barIncompleteChar: '░',
         format: '{name} [{bar}] {percentage}% | {value}/{total}',
-        noTTYOutput: !isTTY,
-        notTTYSchedule: 1000
+        noTTYOutput: true,
+        notTTYSchedule: 500
     }, cliProgress.Presets.shades_classic);
 
+    const initialSnapshotsTotal = Array.isArray(payload?.snapshots) ? payload.snapshots.length : 1;
+    const initialWidthsTotal = Array.isArray(payload?.settings?.width) ? payload.settings.width.length : 1;
+
     const snapshotsBar = multiBar.create(
         Math.max(1, initialSnapshotsTotal),
         0,
@@ -74,15 +74,14 @@ async function runJob({diffpxKey, payload}) {
     let jobId = null;
 
     try {
-        const diffpxUrl = process.env.DIFFPX_URL || '';
-        const res = await submitRun(diffpxUrl, diffpxKey, payload);
+        const res = await submitRun(ppKey, 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(diffpxUrl, diffpxKey, jobId, {
-            intervalMs: Number(process.env.DIFFPX_POLL_INTERVAL_MS || 1000),
+        const finalStatus = await pollRun(ppKey, jobId, {
+            intervalMs: Number(process.env.PP_POLL_INTERVAL_MS || 1000),
             onStatus: (status) => {
                 const p = getProgress(status);
 
@@ -90,17 +89,14 @@ async function runJob({diffpxKey, payload}) {
                 const widthLabel = normalizePxLabel(p.widthLabel) || getInitialWidthName(payload);
 
                 const snapTotal = p.snapshotsTotal > 0 ? p.snapshotsTotal : Math.max(1, initialSnapshotsTotal);
-                const snapDone = p.snapshotsTotal > 0
-                    ? Math.min(p.snapshotsDone, p.snapshotsTotal)
-                    : (snapshotsBar ? snapshotsBar.value : 0);
-
-                const wTotal = p.widthsTotal > 0 ? p.widthsTotal : Math.max(1, initialWidthsTotal);
-                const wDone = p.widthsTotal > 0
-                    ? Math.min(p.widthsDone, p.widthsTotal)
-                    : widthsBar.value;
+                const snapDone = p.snapshotsTotal > 0 ? Math.min(p.snapshotsDone, p.snapshotsTotal) : snapshotsBar.value;
 
                 snapshotsBar.setTotal(snapTotal);
                 snapshotsBar.update(snapDone, {name: 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});
             }