diffpx 0.0.8 → 0.0.10

package/package.json

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

package/src/runner.js

@@ -51,8 +51,7 @@ async function runJob({diffpxKey, payload}) {
         hideCursor: true,
         barCompleteChar: '█',
         barIncompleteChar: '░',
-        format: '{name} [{bar}] {percentage}% | {value}/{total}',
-        stream: process.stdout
+        format: '{name} [{bar}] {percentage}% | {value}/{total}'
     }, cliProgress.Presets.shades_classic);
 
     const initialSnapshotsTotal = Array.isArray(payload?.snapshots) ? payload.snapshots.length : 1;
@@ -71,8 +70,6 @@ async function runJob({diffpxKey, 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 diffpxUrl = process.env.DIFFPX_URL || '';
@@ -83,7 +80,7 @@ async function runJob({diffpxKey, payload}) {
         }
 
         const finalStatus = await pollRun(diffpxUrl, diffpxKey, jobId, {
-            intervalMs: Number(process.env.DIFFPX_POLL_INTERVAL_MS || 1000),
+            intervalMs: 1000,
             onStatus: (status) => {
                 const p = getProgress(status);
 
@@ -93,20 +90,14 @@ async function runJob({diffpxKey, 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;
 
-                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};
-                }
+                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;
 
-                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};
-                }
+                widthsBar.setTotal(wTotal);
+                widthsBar.update(wDone, {name: widthLabel});
             }
         });
 

package/src/upload.js

@@ -8,11 +8,14 @@ function axiosErrorMessage(err) {
     const statusText = err?.response?.statusText;
 
     const data = err?.response?.data;
+    const jsonMsg = data && typeof data === 'object'
+        ? String(data.error || data.message || '').trim()
+        : '';
     const body = typeof data === 'string'
         ? ((data.match(/<pre>([\s\S]*?)<\/pre>/i)?.[1] || data).replace(/<[^>]*>/g, ' ').replace(/\s+/g, ' ').trim())
         : '';
 
-    return [status ? `HTTP ${status}${statusText ? ` ${statusText}` : ''}` : '', body || '']
+    return [status ? `HTTP ${status}${statusText ? ` ${statusText}` : ''}` : '', jsonMsg || body || '']
         .filter(Boolean)
         .join(' | ');
 }

package/src/validateConfig.js

@@ -32,8 +32,11 @@ async function validateConfig() {
         process.exit(1);
     }
 
-    const config = yaml.load(fs.readFileSync('snapshots.yml', 'utf8'));
-    const devicesList = yaml.load(fs.readFileSync('devices.yml', 'utf8'));
+    const rawConfig = yaml.load(fs.readFileSync('snapshots.yml', 'utf8'));
+    const rawDevices = yaml.load(fs.readFileSync('devices.yml', 'utf8'));
+
+    const config = Array.isArray(rawConfig) ? rawConfig : [];
+    const devicesList = Array.isArray(rawDevices) ? rawDevices : [];
 
     const devicesConfig = {};
     for (const d of devicesList) devicesConfig[d.name] = d;
@@ -41,6 +44,10 @@ async function validateConfig() {
     const seenNames = new Set();
     const configErrors = [];
 
+    if (!config.length) {
+        configErrors.push('🔴 snapshots.yml must contain at least one snapshot');
+    }
+
     for (const entry of config) {
         if (seenNames.has(entry.name)) {
             configErrors.push(`🔴 Duplicate snapshot name "${ entry.name }" found in snapshots.yml`);