viberadar 0.3.214 → 0.3.216

package/dist/ui/dashboard.html

@@ -1793,6 +1793,7 @@ let loadDurationDraft = '30s';
 let loadDataDirDraft = '';
 let loadResultDirDraft = '';
 let loadAccountsJsonDraft = '';
+let loadImportedEnvVarsDraft = {};
 let loadView = 'library';     // 'library' | 'editor'
 
 function toggleObsHint(id) {
@@ -7767,6 +7768,8 @@ function applyLoadConfigToFields(cfg) {
   loadDurationDraft = cfg.duration || loadDurationDraft;
   loadDataDirDraft = cfg.dataDir || loadDataDirDraft;
   loadResultDirDraft = cfg.resultDir || loadResultDirDraft;
+  if (cfg.accountsJson) loadAccountsJsonDraft = cfg.accountsJson;
+  if (cfg.accounts) loadAccountsJsonDraft = typeof cfg.accounts === 'string' ? cfg.accounts : JSON.stringify(cfg.accounts, null, 2);
   const baseEl = document.getElementById('loadBaseUrl');
   const vusEl = document.getElementById('loadVus');
   const durEl = document.getElementById('loadDuration');
@@ -7800,6 +7803,155 @@ function normalizeAccountsJson(raw) {
   }
 }
 
+function normalizeLoadImport(raw, sourceName) {
+  const root = raw && typeof raw === 'object' ? raw : {};
+  const cfg = root.config && typeof root.config === 'object' ? { ...root.config, ...root } : root;
+  const envVars = cfg.envVars && typeof cfg.envVars === 'object' && !Array.isArray(cfg.envVars) ? { ...cfg.envVars } : {};
+  const imported = {
+    scriptName: cfg.scriptName || cfg.name || (sourceName || '').replace(/\.json$/i, '') || '',
+    script: cfg.script || cfg.k6Script || cfg.code || '',
+    baseUrl: cfg.baseUrl || envVars.BASE_URL || '',
+    vus: cfg.vus || cfg.VUs || cfg.users || '',
+    duration: cfg.duration || cfg.testDuration || '',
+    dataDir: cfg.dataDir || cfg.dataPath || '',
+    resultDir: cfg.resultDir || cfg.resultsDir || '',
+    accounts: cfg.accounts || cfg.usersJson || cfg.accountsJson || envVars.TEST_ACCOUNTS_JSON || '',
+    envVars,
+  };
+  delete imported.envVars.BASE_URL;
+  delete imported.envVars.TEST_ACCOUNTS_JSON;
+  delete imported.envVars.TEST_EMAIL;
+  delete imported.envVars.TEST_PASSWORD;
+  return imported;
+}
+
+function applyLoadImport(raw, sourceName) {
+  const imported = normalizeLoadImport(raw, sourceName);
+  if (imported.script) loadScriptDraft = String(imported.script);
+  if (imported.scriptName) loadScriptNameDraft = String(imported.scriptName);
+  if (imported.baseUrl) loadBaseUrlDraft = String(imported.baseUrl);
+  if (imported.vus) loadVusDraft = parseInt(String(imported.vus), 10) || loadVusDraft;
+  if (imported.duration) loadDurationDraft = String(imported.duration);
+  if (imported.dataDir) loadDataDirDraft = String(imported.dataDir);
+  if (imported.resultDir) loadResultDirDraft = String(imported.resultDir);
+  if (imported.accounts) {
+    loadAccountsJsonDraft = typeof imported.accounts === 'string'
+      ? imported.accounts
+      : JSON.stringify(imported.accounts, null, 2);
+  }
+  loadImportedEnvVarsDraft = imported.envVars || {};
+  loadView = 'editor';
+  renderContent();
+}
+
+function loadImportConfigClick() {
+  openLoadImportConfigModal();
+}
+
+function readLoadImportConfigText(text, sourceName) {
+  const raw = JSON.parse(String(text || '{}'));
+  applyLoadImport(raw, sourceName);
+}
+
+function loadImportConfigFile(input) {
+  const file = input && input.files && input.files[0];
+  if (!file) return;
+  const reader = new FileReader();
+  reader.onload = () => {
+    try {
+      readLoadImportConfigText(reader.result || '{}', file.name);
+      const overlay = document.getElementById('loadImportConfigOverlay');
+      if (overlay) overlay.remove();
+    } catch (e) {
+      alert('Конфиг не импортирован: ' + e.message);
+    }
+  };
+  reader.onerror = () => alert('Не удалось прочитать файл конфига');
+  reader.readAsText(file);
+}
+
+function openLoadImportConfigModal() {
+  let overlay = document.getElementById('loadImportConfigOverlay');
+  if (overlay) overlay.remove();
+  overlay = document.createElement('div');
+  overlay.id = 'loadImportConfigOverlay';
+  overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.62);display:flex;align-items:center;justify-content:center;z-index:9999;padding:18px';
+  overlay.innerHTML = `
+    <div style="background:var(--bg-card);border:1px solid var(--border);border-radius:8px;padding:18px;width:720px;max-width:96vw;max-height:92vh;overflow:auto">
+      <div style="display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:10px">
+        <div>
+          <div style="font-size:15px;font-weight:600;color:var(--text)">Импорт k6 конфига</div>
+          <div style="font-size:12px;color:var(--muted);margin-top:3px">Вставь JSON из буфера или выбери файл. После импорта поля можно править вручную.</div>
+        </div>
+        <button id="loadImportClose" class="load-btn" style="padding:4px 9px">Закрыть</button>
+      </div>
+      <textarea id="loadImportConfigText" spellcheck="false" placeholder='{"name":"auth-browse","baseUrl":"https://demo.unica.hopper-it.ru","vus":10,"duration":"2m","accounts":[{"email":"user@example.com","password":"pass"}],"script":"import http from ..."}' style="width:100%;min-height:260px;resize:vertical;background:var(--bg);border:1px solid var(--border);border-radius:6px;color:var(--text);font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:12px;line-height:1.45;padding:10px;outline:none"></textarea>
+      <div id="loadImportStatus" style="min-height:18px;margin-top:8px;font-size:12px;color:var(--muted)">JSON пока не вставлен</div>
+      <div style="display:flex;gap:8px;justify-content:space-between;align-items:center;margin-top:14px;flex-wrap:wrap">
+        <div>
+          <input id="loadConfigImportFile" type="file" accept=".json,application/json" style="display:none" onchange="loadImportConfigFile(this)" />
+          <button class="load-btn" id="loadImportFileBtn">Выбрать JSON-файл</button>
+        </div>
+        <div style="display:flex;gap:8px">
+          <button class="load-btn" id="loadImportCancel">Отмена</button>
+          <button class="load-btn load-btn-run" id="loadImportApply" disabled>Импорт</button>
+        </div>
+      </div>
+    </div>`;
+  document.body.appendChild(overlay);
+
+  const textEl = overlay.querySelector('#loadImportConfigText');
+  const statusEl = overlay.querySelector('#loadImportStatus');
+  const applyBtn = overlay.querySelector('#loadImportApply');
+  const close = () => overlay.remove();
+  const validate = () => {
+    const text = textEl.value.trim();
+    if (!text) {
+      statusEl.textContent = 'JSON пока не вставлен';
+      statusEl.style.color = 'var(--muted)';
+      applyBtn.disabled = true;
+      return;
+    }
+    try {
+      const raw = JSON.parse(text);
+      const imported = normalizeLoadImport(raw, 'clipboard');
+      const parts = [];
+      if (imported.scriptName) parts.push(imported.scriptName);
+      if (imported.baseUrl) parts.push(imported.baseUrl);
+      if (imported.vus) parts.push(`${imported.vus} VUs`);
+      if (imported.duration) parts.push(imported.duration);
+      statusEl.textContent = `JSON валидный${parts.length ? ': ' + parts.join(' · ') : ''}`;
+      statusEl.style.color = 'var(--green)';
+      applyBtn.disabled = false;
+    } catch (e) {
+      statusEl.textContent = 'JSON невалидный: ' + e.message;
+      statusEl.style.color = 'var(--red)';
+      applyBtn.disabled = true;
+    }
+  };
+
+  overlay.addEventListener('click', e => { if (e.target === overlay) close(); });
+  overlay.querySelector('#loadImportClose').addEventListener('click', close);
+  overlay.querySelector('#loadImportCancel').addEventListener('click', close);
+  overlay.querySelector('#loadImportFileBtn').addEventListener('click', () => {
+    const input = overlay.querySelector('#loadConfigImportFile');
+    input.value = '';
+    input.click();
+  });
+  textEl.addEventListener('input', validate);
+  applyBtn.addEventListener('click', () => {
+    try {
+      readLoadImportConfigText(textEl.value, 'clipboard');
+      close();
+    } catch (e) {
+      statusEl.textContent = 'Конфиг не импортирован: ' + e.message;
+      statusEl.style.color = 'var(--red)';
+      applyBtn.disabled = true;
+    }
+  });
+  setTimeout(() => textEl.focus(), 0);
+}
+
 function renderLoad(c) {
   const isRunning = loadState && loadState.status === 'running';
   const isDone    = loadState && (loadState.status === 'done' || loadState.status === 'stopped');
@@ -7853,12 +8005,15 @@ function renderLoad(c) {
       <div class="load-library-header">
         <div>
           <div style="font-size:16px;font-weight:600;color:var(--fg)">Нагрузочные тесты</div>
-          <div style="font-size:12px;color:var(--muted);margin-top:2px">${loadK6Version ? escapeHtml(loadK6Version) : ''} · ${loadSavedScripts.length} сохранённых</div>
-        </div>
-        <button class="load-btn load-btn-run" style="font-size:13px;padding:8px 20px" onclick="loadNewTest()">＋ Новый тест</button>
-      </div>
-
-      ${loadSavedScripts.length === 0
+          <div style="font-size:12px;color:var(--muted);margin-top:2px">${loadK6Version ? escapeHtml(loadK6Version) : ''} · ${loadSavedScripts.length} сохранённых</div>
+        </div>
+        <div class="load-btns" style="margin:0">
+          <button class="load-btn" style="font-size:13px;padding:8px 14px" onclick="loadImportConfigClick()">Импорт конфига</button>
+          <button class="load-btn load-btn-run" style="font-size:13px;padding:8px 20px" onclick="loadNewTest()">＋ Новый тест</button>
+        </div>
+      </div>
+
+      ${loadSavedScripts.length === 0
         ? `<div class="load-library-empty">
             <div style="font-size:32px;margin-bottom:12px">📋</div>
             <div style="font-size:14px;font-weight:500;margin-bottom:6px">Нет сохранённых тестов</div>
@@ -7905,10 +8060,11 @@ function renderLoad(c) {
 
   c.innerHTML = `<div class="load-screen">
 
-    <div class="load-editor-topbar">
-      ${!isRunning ? `<button class="load-back-btn" onclick="loadView='library';renderContent()">← Все тесты</button>` : ''}
-      <span style="font-size:12px;color:var(--muted);margin-left:4px">${statusBadge}</span>
-    </div>
+    <div class="load-editor-topbar">
+      ${!isRunning ? `<button class="load-back-btn" onclick="loadView='library';renderContent()">← Все тесты</button>` : ''}
+      ${!isRunning ? `<button class="load-btn" style="font-size:12px;padding:5px 10px" onclick="loadImportConfigClick()">Импорт конфига</button>` : ''}
+      <span style="font-size:12px;color:var(--muted);margin-left:4px">${statusBadge}</span>
+    </div>
 
     <div class="load-section">
       <div class="load-section-title">Конфигурация ${loadK6Version ? `<span style="color:var(--dim);font-weight:400">${escapeHtml(loadK6Version)}</span>` : ''}</div>
@@ -8021,18 +8177,20 @@ function renderLoad(c) {
   }
 }
 
-function loadNewTest() {
-  loadScriptDraft = '';
-  loadScriptNameDraft = '';
-  loadView = 'editor';
-  renderContent();
-}
+function loadNewTest() {
+  loadScriptDraft = '';
+  loadScriptNameDraft = '';
+  loadImportedEnvVarsDraft = {};
+  loadView = 'editor';
+  renderContent();
+}
 
 function loadOpenScript(name) {
   const s = loadSavedScripts.find(x => x.name === name);
   if (!s) return;
   loadScriptDraft = s.script;
   loadScriptNameDraft = s.name;
+  loadImportedEnvVarsDraft = {};
   if (s.baseUrl) loadBaseUrlDraft = s.baseUrl;
   if (s.vus) loadVusDraft = s.vus;
   if (s.duration) loadDurationDraft = s.duration;
@@ -8082,8 +8240,8 @@ async function runLoadTest() {
   loadLogLines = [];
   loadBuckets  = [];
 
-  try {
-    const envVars = {};
+  try {
+    const envVars = { ...(loadImportedEnvVarsDraft || {}) };
     if (accountsInfo.accounts.length > 0) {
       envVars.TEST_ACCOUNTS_JSON = accountsInfo.text;
       envVars.TEST_EMAIL = accountsInfo.accounts[0].email;
@@ -8278,6 +8436,7 @@ async function loadOpenRun(runId) {
     loadLogLines = d.logs || [];
     loadScriptDraft = d.script || '';
     loadScriptNameDraft = d.config?.scriptName || d.scriptName || '';
+    loadImportedEnvVarsDraft = {};
     if (d.config) applyLoadConfigToFields(d.config);
     loadView = 'editor';
     renderContent();
@@ -8321,6 +8480,7 @@ async function loadLoadScript(name) {
   if (!s) return;
   loadScriptDraft = s.script;
   loadScriptNameDraft = s.name;
+  loadImportedEnvVarsDraft = {};
   if (s.baseUrl) loadBaseUrlDraft = s.baseUrl;
   if (s.vus) loadVusDraft = s.vus;
   if (s.duration) loadDurationDraft = s.duration;

package/package.json

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