diffpx 0.0.3 → 0.0.5

package/bin/diffpx.js

@@ -4,10 +4,7 @@ const {loadConfig} = require('../src/configLoader');
 const {runJob} = require('../src/runner');
 
 (async () => {
-    const {config, devicesConfig, settings} = await loadConfig();
-
-    const ppKey = process.env.PP_KEY;
-    if (!ppKey) throw new Error('No API key found in .env or settings.yml');
+    const {config, devicesConfig, settings, diffpxKey, diffpxUrl} = await loadConfig();
 
     const timestamp = new Date().toISOString().replace('T', ' ').split('.')[0];
     const groupId = crypto.randomUUID();
@@ -15,14 +12,16 @@ const {runJob} = require('../src/runner');
     const payload = {
         timestamp,
         groupId,
-        settings,
+        settings: {
+            ...settings
+        },
         devices: devicesConfig,
         snapshots: config
     };
 
     try {
         await runJob({
-            ppKey,
+            diffpxKey,
             payload
         });
     } catch (err) {

package/package.json

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

package/src/configLoader.js

@@ -3,9 +3,9 @@ const yaml = require('js-yaml');
 const validateConfig = require('./validateConfig');
 
 async function loadConfig() {
-    const { config, devicesConfig } = await validateConfig();
-    const settings = yaml.load(fs.readFileSync('settings.yml', 'utf8'));
-    return { config, devicesConfig, settings };
+    const { config, devicesConfig, diffpxKey, diffpxUrl } = await validateConfig();
+    const settings = yaml.load(fs.readFileSync('settings.yml', 'utf8')) || {};
+    return { config, devicesConfig, settings, diffpxKey, diffpxUrl };
 }
 
 module.exports = { loadConfig };

package/src/runner.js

@@ -45,18 +45,20 @@ function getProgress(status) {
     };
 }
 
-async function runJob({ppKey, payload}) {
+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;
     const multiBar = new cliProgress.MultiBar({
         clearOnComplete: false,
         hideCursor: true,
         barCompleteChar: '█',
         barIncompleteChar: '░',
-        format: '{name} [{bar}] {percentage}% | {value}/{total}'
+        format: '{name} [{bar}] {percentage}% | {value}/{total}',
+        noTTYOutput: !isTTY,
+        notTTYSchedule: 1000
     }, 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,
@@ -72,14 +74,15 @@ async function runJob({ppKey, payload}) {
     let jobId = null;
 
     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);
 
@@ -87,14 +90,17 @@ async function runJob({ppKey, 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.value;
-
-                snapshotsBar.setTotal(snapTotal);
-                snapshotsBar.update(snapDone, {name: snapshotLabel});
+                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 wDone = p.widthsTotal > 0
+                    ? Math.min(p.widthsDone, p.widthsTotal)
+                    : widthsBar.value;
 
+                snapshotsBar.setTotal(snapTotal);
+                snapshotsBar.update(snapDone, {name: snapshotLabel});
                 widthsBar.setTotal(wTotal);
                 widthsBar.update(wDone, {name: widthLabel});
             }

package/src/upload.js

@@ -1,8 +1,6 @@
 const axios = require('axios');
 require('dotenv').config({ path: require('path').join(process.cwd(), '.env') });
 
-const ppUrl = process.env.PP_URL || '';
-
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
 function axiosErrorMessage(err) {
@@ -19,16 +17,16 @@ function axiosErrorMessage(err) {
         .join(' | ');
 }
 
-async function submitRun(ppKey, payload) {
-    if (!ppUrl) {
-        throw new Error('PP_URL not configured');
+async function submitRun(diffpxUrl, diffpxKey, payload) {
+    if (!diffpxUrl) {
+        throw new Error('DIFFPX_URL not configured');
     }
 
     try {
-        const res = await axios.post(`${ppUrl}/runs`, payload, {
+        const res = await axios.post(`${diffpxUrl}/runs`, payload, {
             headers: {
                 'Content-Type': 'application/json',
-                Authorization: `Bearer ${ppKey}`
+                Authorization: `Bearer ${diffpxKey}`
             },
             maxBodyLength: Infinity
         });
@@ -39,15 +37,15 @@ async function submitRun(ppKey, payload) {
     }
 }
 
-async function fetchJobStatus(ppKey, jobId) {
-    if (!ppUrl) {
-        throw new Error('PP_URL not configured');
+async function fetchJobStatus(diffpxUrl, diffpxKey, jobId) {
+    if (!diffpxUrl) {
+        throw new Error('DIFFPX_URL not configured');
     }
 
     try {
-        const res = await axios.get(`${ppUrl}/runs/${encodeURIComponent(jobId)}`, {
+        const res = await axios.get(`${diffpxUrl}/runs/${encodeURIComponent(jobId)}`, {
             headers: {
-                Authorization: `Bearer ${ppKey}`
+                Authorization: `Bearer ${diffpxKey}`
             }
         });
 
@@ -57,9 +55,9 @@ async function fetchJobStatus(ppKey, jobId) {
     }
 }
 
-async function pollRun(ppKey, jobId, {intervalMs = 1000, onStatus} = {}) {
+async function pollRun(diffpxUrl, diffpxKey, jobId, {intervalMs = 1000, onStatus} = {}) {
     for (;;) {
-        const status = await fetchJobStatus(ppKey, jobId);
+        const status = await fetchJobStatus(diffpxUrl, diffpxKey, jobId);
         if (onStatus) onStatus(status);
 
         const state = String(status?.state || status?.status || '').toLowerCase();

package/src/validateConfig.js

@@ -5,12 +5,11 @@ require('dotenv').config({ path: require('path').join(process.cwd(), '.env') });
 
 async function validateConfig() {
     const errors = [];
+    const diffpxKey = process.env.DIFFPX_KEY;
+    const diffpxUrl = process.env.DIFFPX_URL;
 
-    const ppKey = process.env.PP_KEY;
-    const ppUrl = process.env.PP_URL;
-
-    if (!ppKey) errors.push("🔴 Missing PP_KEY in .env");
-    if (!ppUrl) errors.push("🔴 Missing PP_URL in .env");
+    if (!diffpxKey) errors.push("🔴 Missing DIFFPX_KEY (set in .env or CI vars)");
+    if (!diffpxUrl) errors.push("🔴 Missing DIFFPX_URL (set in .env or CI vars)");
 
     if (errors.length > 0) {
         console.error("🔴 Configuration check failed:");
@@ -19,14 +18,14 @@ async function validateConfig() {
     }
 
     try {
-        await axios.get(`${ ppUrl }/auth/ping`, {
-            headers: { Authorization: `Bearer ${ ppKey }` },
+        await axios.get(`${ diffpxUrl }/auth/ping`, {
+            headers: { Authorization: `Bearer ${ diffpxKey }` },
             timeout: 5000
         });
     } catch (err) {
         const msg = err.response?.data?.error || err.message;
         if (String(msg).includes("ECONNREFUSED") || String(msg).includes("ENOTFOUND")) {
-            console.error("🔴 API validation failed: Connection to server failed. Make sure PP_URL in .env is correct");
+            console.error("🔴 API validation failed: Connection to server failed. Make sure DIFFPX_URL is correct");
         } else {
             console.error("🔴 API validation failed:", msg);
         }
@@ -66,7 +65,7 @@ async function validateConfig() {
         console.log("🟢 Configuration check passed.");
     }
 
-    return { config, devicesConfig };
+    return { config, devicesConfig, diffpxKey, diffpxUrl };
 }
 
 module.exports = validateConfig;