viberadar 0.3.209 → 0.3.211

package/dist/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAO7B,OAAO,EAAE,UAAU,EAA4H,MAAM,YAAY,CAAC;AAOlK,UAAU,aAAa;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;CACrB;AA0vED,wBAAgB,WAAW,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAgvG1G"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAO7B,OAAO,EAAE,UAAU,EAA4H,MAAM,YAAY,CAAC;AAOlK,UAAU,aAAa;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;CACrB;AA0vED,wBAAgB,WAAW,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAs1G1G"}

package/dist/server/index.js

@@ -2216,6 +2216,13 @@ function startServer({ data: initialData, port, projectRoot }) {
             }
             return out;
         }
+        function sanitizeLoadEnvName(value, fallback) {
+            const raw = typeof value === 'string' && value.trim() ? value.trim() : fallback;
+            return /^[A-Za-z_][A-Za-z0-9_]*$/.test(raw) ? raw : fallback;
+        }
+        function detectK6Scenarios(script) {
+            return /\bscenarios\s*:/.test(script) || /export\s+const\s+options[\s\S]*\bscenarios\b/.test(script);
+        }
         function redactLoadEnvVars(envVars) {
             const out = {};
             for (const key of Object.keys(envVars)) {
@@ -2223,18 +2230,77 @@ function startServer({ data: initialData, port, projectRoot }) {
             }
             return out;
         }
-        function buildLoadConfig(cfg) {
+        function resolveLoadLocalPath(value) {
+            if (typeof value !== 'string' || !value.trim())
+                return undefined;
+            const raw = value.trim();
+            return path.resolve(path.isAbsolute(raw) ? raw : path.join(projectRoot, raw));
+        }
+        function copyLoadDataFiles(sourcePath, workDir) {
+            if (!sourcePath || !fs.existsSync(sourcePath))
+                return 0;
+            const stat = fs.statSync(sourcePath);
+            let copied = 0;
+            const copyOne = (src, dst) => {
+                const st = fs.statSync(src);
+                if (st.isDirectory()) {
+                    fs.mkdirSync(dst, { recursive: true });
+                    for (const name of fs.readdirSync(src)) {
+                        if (name === '.git' || name === 'node_modules' || name === 'dist')
+                            continue;
+                        copyOne(path.join(src, name), path.join(dst, name));
+                    }
+                    return;
+                }
+                if (!st.isFile())
+                    return;
+                fs.mkdirSync(path.dirname(dst), { recursive: true });
+                fs.copyFileSync(src, dst);
+                copied++;
+            };
+            if (stat.isDirectory()) {
+                for (const name of fs.readdirSync(sourcePath)) {
+                    if (name === '.git' || name === 'node_modules' || name === 'dist')
+                        continue;
+                    copyOne(path.join(sourcePath, name), path.join(workDir, name));
+                }
+            }
+            else if (stat.isFile()) {
+                copyOne(sourcePath, path.join(workDir, path.basename(sourcePath)));
+            }
+            return copied;
+        }
+        function buildLoadConfig(cfg, paths) {
             const envVars = sanitizeLoadEnvVars(cfg.envVars);
             const baseUrl = typeof cfg.baseUrl === 'string' && cfg.baseUrl.trim() ? cfg.baseUrl.trim() : 'http://localhost:5000';
+            const dataDir = resolveLoadLocalPath(cfg.dataDir);
+            const resultDir = resolveLoadLocalPath(cfg.resultDir);
+            const executionMode = cfg.executionMode === 'script' ? 'script' : 'cli';
+            const vusEnvName = sanitizeLoadEnvName(cfg.vusEnvName, 'SMOKE_VUS');
+            const durationEnvName = sanitizeLoadEnvName(cfg.durationEnvName, 'SMOKE_DURATION');
             envVars.BASE_URL = baseUrl;
             const config = {
                 vus: normalizeLoadVus(cfg.vus),
                 duration: normalizeLoadDuration(cfg.duration),
                 baseUrl,
                 scriptName: sanitizeLoadScriptName(cfg.scriptName),
+                executionMode,
+                vusEnvName,
+                durationEnvName,
+                dataDir,
+                resultDir,
+                runDir: paths?.runDir,
+                workDir: paths?.workDir,
+                resultPath: paths?.resultPath,
+                dataFilesCopied: paths?.dataFilesCopied,
                 envVars: redactLoadEnvVars(envVars),
             };
-            return { config, envVars };
+            if (executionMode === 'script') {
+                envVars[vusEnvName] = String(config.vus);
+                envVars[durationEnvName] = config.duration;
+                config.envVars = redactLoadEnvVars(envVars);
+            }
+            return { config, envVars, dataDir, resultDir };
         }
         function flattenK6Checks(group) {
             let passes = 0;
@@ -2334,6 +2400,10 @@ function startServer({ data: initialData, port, projectRoot }) {
                     fs.unlinkSync(path.join(loadRunsDir, `${old.runId}.json`));
                 }
                 catch { }
+                try {
+                    fs.rmSync(path.join(loadRunsDir, old.runId), { recursive: true, force: true });
+                }
+                catch { }
             }
         }
         function loadLastRunIntoState() {
@@ -5045,7 +5115,7 @@ a{color:var(--blue)}
                 req.on('data', (d) => { body += d; });
                 req.on('end', () => {
                     try {
-                        const { name, script, vus, duration, baseUrl } = JSON.parse(body);
+                        const { name, script, vus, duration, baseUrl, dataDir, resultDir, executionMode, vusEnvName, durationEnvName } = JSON.parse(body);
                         if (!name || !script) {
                             res.writeHead(400, jsonH);
                             res.end(JSON.stringify({ error: 'name and script required' }));
@@ -5063,6 +5133,11 @@ a{color:var(--blue)}
                             vus: normalizeLoadVus(vus),
                             duration: normalizeLoadDuration(duration),
                             baseUrl: typeof baseUrl === 'string' && baseUrl.trim() ? baseUrl.trim() : 'http://localhost:5000',
+                            executionMode: executionMode === 'script' ? 'script' : 'cli',
+                            vusEnvName: sanitizeLoadEnvName(vusEnvName, 'SMOKE_VUS'),
+                            durationEnvName: sanitizeLoadEnvName(durationEnvName, 'SMOKE_DURATION'),
+                            dataDir: resolveLoadLocalPath(dataDir),
+                            resultDir: resolveLoadLocalPath(resultDir),
                         };
                         // overwrite if same name exists
                         const existing = fs.readdirSync(scriptsDir).find(f => {
@@ -5220,12 +5295,24 @@ a{color:var(--blue)}
                         res.end(JSON.stringify({ error: 'No script provided' }));
                         return;
                     }
-                    const { config: loadConfig, envVars } = buildLoadConfig(cfg);
                     const runId = `load-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-                    const scriptPath = path.join(os.tmpdir(), `viberadar-k6-${Date.now()}.js`);
-                    const jsonOutPath = path.join(os.tmpdir(), `viberadar-k6-out-${Date.now()}.ndjson`);
-                    const summaryPath = path.join(os.tmpdir(), `viberadar-k6-summary-${Date.now()}.json`);
+                    const runDir = path.join(loadRunsDir, runId);
+                    const workDir = path.join(runDir, 'work');
+                    const defaultResultDir = path.join(runDir, 'results');
+                    const effectiveCfg = { ...cfg };
+                    if (!effectiveCfg.executionMode) {
+                        effectiveCfg.executionMode = detectK6Scenarios(script) ? 'script' : 'cli';
+                    }
+                    const initial = buildLoadConfig(effectiveCfg);
+                    const resultPath = initial.resultDir ? path.join(initial.resultDir, runId) : defaultResultDir;
+                    const scriptPath = path.join(workDir, 'script.js');
+                    const jsonOutPath = path.join(resultPath, 'metrics.ndjson');
+                    const summaryPath = path.join(resultPath, 'summary.json');
+                    let dataFilesCopied = 0;
                     try {
+                        fs.mkdirSync(workDir, { recursive: true });
+                        fs.mkdirSync(resultPath, { recursive: true });
+                        dataFilesCopied = copyLoadDataFiles(initial.dataDir, workDir);
                         fs.writeFileSync(scriptPath, script, 'utf-8');
                     }
                     catch (e) {
@@ -5233,6 +5320,12 @@ a{color:var(--blue)}
                         res.end(JSON.stringify({ error: e.message }));
                         return;
                     }
+                    const { config: loadConfig, envVars } = buildLoadConfig(effectiveCfg, {
+                        runDir,
+                        workDir,
+                        resultPath,
+                        dataFilesCopied,
+                    });
                     loadRunning = true;
                     loadState = {
                         runId, status: 'running', startTime: Date.now(), buckets: [], totalRequests: 0,
@@ -5246,17 +5339,13 @@ a{color:var(--blue)}
                         if (k && v !== undefined && v !== '')
                             envFlags.push('--env', `${k}=${v}`);
                     }
-                    const args = [
-                        'run',
-                        '--vus', String(loadConfig.vus),
-                        '--duration', loadConfig.duration,
-                        ...envFlags,
-                        '--summary-export', summaryPath,
-                        '--out', `json=${jsonOutPath}`,
-                        scriptPath,
-                    ];
+                    const args = ['run'];
+                    if (loadConfig.executionMode !== 'script') {
+                        args.push('--vus', String(loadConfig.vus), '--duration', loadConfig.duration);
+                    }
+                    args.push(...envFlags, '--summary-export', summaryPath, '--out', `json=${jsonOutPath}`, scriptPath);
                     loadProc = (0, child_process_1.spawn)('k6', args, {
-                        cwd: projectRoot, env: { ...process.env }, shell: WIN, stdio: 'pipe',
+                        cwd: workDir, env: { ...process.env }, shell: WIN, stdio: 'pipe',
                     });
                     const addLog = (line) => {
                         loadState.logs.push(line);
@@ -5353,15 +5442,11 @@ a{color:var(--blue)}
                         saveLoadRun();
                         broadcast('load-done', { runId: loadState.runId, status: loadState.status, summary: loadState.summary });
                         try {
-                            fs.unlinkSync(scriptPath);
-                        }
-                        catch { }
-                        try {
-                            fs.unlinkSync(jsonOutPath);
+                            fs.writeFileSync(path.join(resultPath, 'k6.log'), loadState.logs.join('\n'), 'utf-8');
                         }
                         catch { }
                         try {
-                            fs.unlinkSync(summaryPath);
+                            fs.writeFileSync(path.join(resultPath, 'config.json'), JSON.stringify(loadState.config, null, 2), 'utf-8');
                         }
                         catch { }
                     });
@@ -5376,11 +5461,11 @@ a{color:var(--blue)}
                         saveLoadRun();
                         broadcast('load-done', { runId: loadState.runId, status: 'error', summary: loadState.summary });
                         try {
-                            fs.unlinkSync(scriptPath);
+                            fs.writeFileSync(path.join(resultPath, 'k6.log'), loadState.logs.join('\n'), 'utf-8');
                         }
                         catch { }
                         try {
-                            fs.unlinkSync(summaryPath);
+                            fs.writeFileSync(path.join(resultPath, 'config.json'), JSON.stringify(loadState.config, null, 2), 'utf-8');
                         }
                         catch { }
                     });