viberadar 0.3.210 → 0.3.212

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,CAuzG1G"}
+{"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)) {
@@ -2268,12 +2275,20 @@ function startServer({ data: initialData, port, projectRoot }) {
             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');
+            const hasVus = cfg.vus !== undefined && cfg.vus !== null && String(cfg.vus).trim() !== '';
+            const hasDuration = cfg.duration !== undefined && cfg.duration !== null && String(cfg.duration).trim() !== '';
             envVars.BASE_URL = baseUrl;
             const config = {
-                vus: normalizeLoadVus(cfg.vus),
-                duration: normalizeLoadDuration(cfg.duration),
+                vus: hasVus ? normalizeLoadVus(cfg.vus) : undefined,
+                duration: hasDuration ? normalizeLoadDuration(cfg.duration) : undefined,
                 baseUrl,
                 scriptName: sanitizeLoadScriptName(cfg.scriptName),
+                executionMode,
+                vusEnvName,
+                durationEnvName,
                 dataDir,
                 resultDir,
                 runDir: paths?.runDir,
@@ -2282,6 +2297,13 @@ function startServer({ data: initialData, port, projectRoot }) {
                 dataFilesCopied: paths?.dataFilesCopied,
                 envVars: redactLoadEnvVars(envVars),
             };
+            if (executionMode === 'script') {
+                if (hasVus && config.vus != null)
+                    envVars[vusEnvName] = String(config.vus);
+                if (hasDuration && config.duration)
+                    envVars[durationEnvName] = config.duration;
+                config.envVars = redactLoadEnvVars(envVars);
+            }
             return { config, envVars, dataDir, resultDir };
         }
         function flattenK6Checks(group) {
@@ -5097,7 +5119,7 @@ a{color:var(--blue)}
                 req.on('data', (d) => { body += d; });
                 req.on('end', () => {
                     try {
-                        const { name, script, vus, duration, baseUrl, dataDir, resultDir } = 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' }));
@@ -5112,9 +5134,10 @@ a{color:var(--blue)}
                             date,
                             script,
                             fileName,
-                            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),
                         };
@@ -5278,7 +5301,11 @@ a{color:var(--blue)}
                     const runDir = path.join(loadRunsDir, runId);
                     const workDir = path.join(runDir, 'work');
                     const defaultResultDir = path.join(runDir, 'results');
-                    const initial = buildLoadConfig(cfg);
+                    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');
@@ -5295,7 +5322,7 @@ a{color:var(--blue)}
                         res.end(JSON.stringify({ error: e.message }));
                         return;
                     }
-                    const { config: loadConfig, envVars } = buildLoadConfig(cfg, {
+                    const { config: loadConfig, envVars } = buildLoadConfig(effectiveCfg, {
                         runDir,
                         workDir,
                         resultPath,
@@ -5314,15 +5341,11 @@ 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 || 10), '--duration', loadConfig.duration || '30s');
+                    }
+                    args.push(...envFlags, '--summary-export', summaryPath, '--out', `json=${jsonOutPath}`, scriptPath);
                     loadProc = (0, child_process_1.spawn)('k6', args, {
                         cwd: workDir, env: { ...process.env }, shell: WIN, stdio: 'pipe',
                     });