viberadar 0.3.219 → 0.3.220

package/dist/ui/dashboard.html

@@ -1810,7 +1810,7 @@ let loadRuns          = [];    // saved k6 run history
 let loadScriptNameDraft = '';  // save name input draft
 let loadBaseUrlDraft = 'http://localhost:5000';
 let loadVusDraft = 10;
-let loadDurationDraft = '30s';
+let loadDurationDraft = '1m';
 let loadDataDirDraft = '';
 let loadResultDirDraft = '';
 let loadAccountsJsonDraft = '';
@@ -7706,6 +7706,23 @@ function parseLoadDurationMs(value) {
   return Number.isFinite(asNum) ? asNum * 1000 : 0;
 }
 
+function durationToMinutesValue(value) {
+  const text = String(value || '').trim();
+  if (!text) return '';
+  if (/^\d+(?:\.\d+)?$/.test(text)) return text;
+  const ms = parseLoadDurationMs(text);
+  if (!ms) return text;
+  const min = ms / 60000;
+  return Number.isInteger(min) ? String(min) : String(Math.round(min * 100) / 100);
+}
+
+function durationInputToK6(value) {
+  const text = String(value || '').trim();
+  if (!text) return '1m';
+  if (/^\d+(?:\.\d+)?$/.test(text)) return `${text}m`;
+  return text;
+}
+
 function estimateLoadDurationMs(state) {
   const cfg = state?.config || {};
   const base = parseLoadDurationMs(cfg.duration || loadDurationDraft);
@@ -7753,6 +7770,10 @@ function updateLoadLiveStats() {
   setText('loadAvgValue', stats.avgMs ? `${Math.round(stats.avgMs)} ms` : '—');
   setText('loadErrorValue', `${stats.errorPct.toFixed(2)}%`);
   setText('loadVuValue', String(Math.round(stats.vus || 0)));
+  setText('loadChartRpsValue', stats.currentRps.toFixed(1));
+  setText('loadChartLatencyValue', stats.avgMs ? `${Math.round(stats.avgMs)} ms` : '—');
+  setText('loadChartErrorsValue', `${stats.errorPct.toFixed(2)}%`);
+  setText('loadChartVusValue', String(Math.round(stats.vus || 0)));
   const fill = document.getElementById('loadProgressFill');
   if (fill) fill.style.width = `${stats.progressPct}%`;
 }
@@ -7850,12 +7871,21 @@ function drawLoadChart(id, buckets, valFn, color, label) {
   // Resolve CSS variable colors to actual colors
   const colorMap = { 'var(--blue)': '#58a6ff', 'var(--green)': '#3fb950', 'var(--red)': '#f85149', 'var(--yellow)': '#e3b341' };
   ctx.strokeStyle = colorMap[color] || color;
-  vals.forEach((v, i) => {
-    const x = pad.l + i * step;
-    const y = pad.t + cH * (1 - v / maxVal);
-    if (i === 0) ctx.moveTo(x, y); else ctx.lineTo(x, y);
-  });
-  ctx.stroke();
+  vals.forEach((v, i) => {
+    const x = pad.l + i * step;
+    const y = pad.t + cH * (1 - v / maxVal);
+    if (i === 0) ctx.moveTo(x, y); else ctx.lineTo(x, y);
+  });
+  ctx.stroke();
+
+  ctx.fillStyle = ctx.strokeStyle;
+  vals.forEach((v, i) => {
+    const x = pad.l + i * step;
+    const y = pad.t + cH * (1 - v / maxVal);
+    ctx.beginPath();
+    ctx.arc(x, y, vals.length === 1 ? 3.5 : 2.2, 0, Math.PI * 2);
+    ctx.fill();
+  });
 
   // Label
   ctx.fillStyle = 'rgba(125,133,144,0.9)';
@@ -7894,7 +7924,7 @@ function applyLoadConfigToFields(cfg) {
   const accountsEl = document.getElementById('loadAccountsJson');
   if (baseEl) baseEl.value = loadBaseUrlDraft;
   if (vusEl) vusEl.value = loadVusDraft;
-  if (durEl) durEl.value = loadDurationDraft;
+  if (durEl) durEl.value = durationToMinutesValue(loadDurationDraft);
   if (dataEl) dataEl.value = loadDataDirDraft;
   if (resultEl) resultEl.value = loadResultDirDraft;
   if (accountsEl) accountsEl.value = loadAccountsJsonDraft;
@@ -8197,11 +8227,11 @@ function renderLoad(c) {
           <input id="loadVus" type="number" value="${escapeHtml(String(loadVusDraft))}" min="1" max="10000" style="width:80px" />
         </div>
         <div class="load-config-field">
-          <label>Duration</label>
-          <input id="loadDuration" type="text" value="${escapeHtml(loadDurationDraft)}" style="width:90px" placeholder="30s" />
+          <label>Duration, min</label>
+          <input id="loadDuration" type="number" value="${escapeHtml(durationToMinutesValue(loadDurationDraft))}" min="0.1" step="0.1" style="width:90px" placeholder="10" />
         </div>
       </div>
-      <div class="load-config-hint">Если в скрипте есть <code>options.scenarios</code>, VibeRadar не ломает stages через CLI, а передаёт значения как <code>__ENV.LOAD_VUS</code>/<code>__ENV.LOAD_DURATION</code> и совместимые <code>SMOKE_*</code>/<code>AUTH_*</code>. Если scenarios нет, будут использованы CLI <code>--vus</code>/<code>--duration</code>.</div>
+      <div class="load-config-hint">Duration задаётся в минутах: введи <code>10</code>, VibeRadar передаст в k6 <code>10m</code>. Если в скрипте есть <code>options.scenarios</code>, VibeRadar не ломает stages через CLI, а передаёт значения как <code>__ENV.LOAD_VUS</code>/<code>__ENV.LOAD_DURATION</code> и совместимые <code>SMOKE_*</code>/<code>AUTH_*</code>. Если scenarios нет, будут использованы CLI <code>--vus</code>/<code>--duration</code>.</div>
       <div class="load-config-row" style="margin-top:8px">
         <div class="load-config-field" style="flex:1;min-width:260px">
           <label>Data dir / file <span style="color:var(--dim);font-weight:400">(только если скрипт использует <code>open('./file')</code> или локальные imports)</span></label>
@@ -8262,10 +8292,10 @@ function renderLoad(c) {
         </div>
       </div>
       <div class="load-charts" style="margin-top:12px">
-        <div class="load-chart-box"><div class="load-chart-label"><span>Запросов/сек</span><span class="load-chart-value">${liveStats.currentRps.toFixed(1)}</span></div>${liveStats.hasBuckets ? '<canvas id="loadChartRps"></canvas>' : chartEmpty}</div>
-        <div class="load-chart-box"><div class="load-chart-label"><span>Среднее время ответа</span><span class="load-chart-value">${liveStats.avgMs ? `${Math.round(liveStats.avgMs)} ms` : '—'}</span></div>${liveStats.hasBuckets ? '<canvas id="loadChartLatency"></canvas>' : chartEmpty}</div>
-        <div class="load-chart-box"><div class="load-chart-label"><span>Ошибки</span><span class="load-chart-value">${liveStats.errorPct.toFixed(2)}%</span></div>${liveStats.hasBuckets ? '<canvas id="loadChartErrors"></canvas>' : chartEmpty}</div>
-        <div class="load-chart-box"><div class="load-chart-label"><span>Активные VUs</span><span class="load-chart-value">${Math.round(liveStats.vus || 0)}</span></div>${liveStats.hasBuckets ? '<canvas id="loadChartVus"></canvas>' : chartEmpty}</div>
+        <div class="load-chart-box"><div class="load-chart-label"><span>Запросов/сек</span><span class="load-chart-value" id="loadChartRpsValue">${liveStats.currentRps.toFixed(1)}</span></div>${liveStats.hasBuckets ? '<canvas id="loadChartRps"></canvas>' : chartEmpty}</div>
+        <div class="load-chart-box"><div class="load-chart-label"><span>Среднее время ответа</span><span class="load-chart-value" id="loadChartLatencyValue">${liveStats.avgMs ? `${Math.round(liveStats.avgMs)} ms` : '—'}</span></div>${liveStats.hasBuckets ? '<canvas id="loadChartLatency"></canvas>' : chartEmpty}</div>
+        <div class="load-chart-box"><div class="load-chart-label"><span>Ошибки</span><span class="load-chart-value" id="loadChartErrorsValue">${liveStats.errorPct.toFixed(2)}%</span></div>${liveStats.hasBuckets ? '<canvas id="loadChartErrors"></canvas>' : chartEmpty}</div>
+        <div class="load-chart-box"><div class="load-chart-label"><span>Активные VUs</span><span class="load-chart-value" id="loadChartVusValue">${Math.round(liveStats.vus || 0)}</span></div>${liveStats.hasBuckets ? '<canvas id="loadChartVus"></canvas>' : chartEmpty}</div>
       </div>
     </div>` : ''}
 
@@ -8313,7 +8343,7 @@ function renderLoad(c) {
   const accountsInput = document.getElementById('loadAccountsJson');
   if (baseInput) baseInput.addEventListener('input', () => { loadBaseUrlDraft = baseInput.value || 'http://localhost:5000'; });
   if (vusInput) vusInput.addEventListener('input', () => { loadVusDraft = parseInt(vusInput.value || '10', 10) || 10; });
-  if (durationInput) durationInput.addEventListener('input', () => { loadDurationDraft = durationInput.value || '30s'; });
+  if (durationInput) durationInput.addEventListener('input', () => { loadDurationDraft = durationInputToK6(durationInput.value || '1'); });
   if (dataInput) dataInput.addEventListener('input', () => { loadDataDirDraft = dataInput.value || ''; });
   if (resultInput) resultInput.addEventListener('input', () => { loadResultDirDraft = resultInput.value || ''; });
   if (accountsInput) accountsInput.addEventListener('input', () => { loadAccountsJsonDraft = accountsInput.value || ''; });
@@ -8350,7 +8380,7 @@ function loadOpenScript(name) {
 function loadGenerateScript() {
   const baseUrl  = document.getElementById('loadBaseUrl')?.value || 'http://localhost:5000';
   const vus      = parseInt(document.getElementById('loadVus')?.value || '10');
-  const duration = document.getElementById('loadDuration')?.value || '30s';
+  const duration = durationInputToK6(document.getElementById('loadDuration')?.value || '1');
   const featKey  = document.getElementById('loadFeature')?.value || '';
   let script;
   if (featKey) {
@@ -8369,7 +8399,7 @@ async function runLoadTest() {
   if (!script.trim()) { alert('Скрипт пустой — сначала сгенерируйте или напишите k6-скрипт'); return; }
   const baseUrl = (document.getElementById('loadBaseUrl')?.value || loadBaseUrlDraft || 'http://localhost:5000').trim();
   const vus = parseInt(document.getElementById('loadVus')?.value || String(loadVusDraft || 10), 10) || 10;
-  const duration = (document.getElementById('loadDuration')?.value || loadDurationDraft || '30s').trim();
+  const duration = durationInputToK6(document.getElementById('loadDuration')?.value || loadDurationDraft || '1');
   const scriptName = (document.getElementById('loadScriptName')?.value || loadScriptNameDraft || 'Новый тест').trim();
   const dataDir = (document.getElementById('loadDataDir')?.value || loadDataDirDraft || '').trim();
   const resultDir = (document.getElementById('loadResultDir')?.value || loadResultDirDraft || '').trim();
@@ -8451,7 +8481,7 @@ async function loadAiGenerateScript() {
 
   const baseUrl  = document.getElementById('loadBaseUrl')?.value  || 'http://localhost:5000';
   const vus      = document.getElementById('loadVus')?.value      || '10';
-  const duration = document.getElementById('loadDuration')?.value || '30s';
+  const duration = durationInputToK6(document.getElementById('loadDuration')?.value || '1');
 
   const featureList = (D && D.features || []).map(f => `- ${f.label} (key: ${f.key})`).join('\n');
 
@@ -8599,7 +8629,7 @@ async function loadSaveScript() {
   if (!script.trim()) { alert('Скрипт пустой'); return; }
   const baseUrl = (document.getElementById('loadBaseUrl')?.value || loadBaseUrlDraft || 'http://localhost:5000').trim();
   const vus = parseInt(document.getElementById('loadVus')?.value || String(loadVusDraft || 10), 10) || 10;
-  const duration = (document.getElementById('loadDuration')?.value || loadDurationDraft || '30s').trim();
+  const duration = durationInputToK6(document.getElementById('loadDuration')?.value || loadDurationDraft || '1');
   const dataDir = (document.getElementById('loadDataDir')?.value || loadDataDirDraft || '').trim();
   const resultDir = (document.getElementById('loadResultDir')?.value || loadResultDirDraft || '').trim();
   const accountsRaw = document.getElementById('loadAccountsJson')?.value || loadAccountsJsonDraft || '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "viberadar",
-  "version": "0.3.219",
+  "version": "0.3.220",
   "description": "Live module map with test coverage for vibecoding projects",
   "main": "./dist/cli.js",
   "bin": {