k6-perf-reporter 1.6.6 → 1.7.1

package/.claude/settings.local.json

@@ -0,0 +1,18 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm run *)",
+      "Bash(npx tsc *)",
+      "Bash(git checkout *)",
+      "Bash(git add *)",
+      "Bash(git commit -m ' *)",
+      "Bash(git push *)",
+      "Bash(xargs cat *)",
+      "Bash(npm test *)",
+      "Bash(git commit *)",
+      "Bash(git pull *)",
+      "Bash(git stash *)",
+      "Bash(wc *)"
+    ]
+  }
+}

package/.config.example.json

@@ -8,5 +8,8 @@
   "slack": {
     "token": "${SLACK_TOKEN}",
     "channel": "#k6-reports"
+  },
+  "cache": {
+    "ttl": 3600
   }
 }

package/dist/cache.d.ts

@@ -0,0 +1,11 @@
+import { ReporterResponse } from "./data-collector";
+export declare class Cache {
+    private cacheDir;
+    private ttlMs;
+    constructor(ttlSeconds: number, cacheDir?: string);
+    private getCacheKey;
+    private getCachePath;
+    get(runId: string, startTime: string, endTime: string): ReporterResponse | null;
+    set(runId: string, startTime: string, endTime: string, data: ReporterResponse): void;
+}
+//# sourceMappingURL=cache.d.ts.map

package/dist/cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAQpD,qBAAa,KAAK;IAChB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,KAAK,CAAS;gBAEV,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IAKjD,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,YAAY;IAIpB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IA2B/E,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;CAgBrF"}

package/dist/cache.js

@@ -0,0 +1,61 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Cache = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const crypto_1 = __importDefault(require("crypto"));
+const logger_1 = require("./logger");
+class Cache {
+    constructor(ttlSeconds, cacheDir) {
+        this.ttlMs = ttlSeconds * 1000;
+        this.cacheDir = cacheDir || path_1.default.resolve(".cache");
+    }
+    getCacheKey(runId, startTime, endTime) {
+        const raw = `${runId}:${startTime}:${endTime}`;
+        return crypto_1.default.createHash("md5").update(raw).digest("hex");
+    }
+    getCachePath(key) {
+        return path_1.default.join(this.cacheDir, `${key}.json`);
+    }
+    get(runId, startTime, endTime) {
+        const key = this.getCacheKey(runId, startTime, endTime);
+        const filePath = this.getCachePath(key);
+        if (!fs_1.default.existsSync(filePath)) {
+            logger_1.logger.debug(`Cache.get: miss (no file) key=${key}`);
+            return null;
+        }
+        try {
+            const raw = fs_1.default.readFileSync(filePath, "utf-8");
+            const entry = JSON.parse(raw);
+            if (Date.now() - entry.timestamp > this.ttlMs) {
+                logger_1.logger.debug(`Cache.get: expired key=${key}, age=${Math.round((Date.now() - entry.timestamp) / 1000)}s, ttl=${Math.round(this.ttlMs / 1000)}s`);
+                fs_1.default.unlinkSync(filePath);
+                return null;
+            }
+            logger_1.logger.debug(`Cache.get: hit key=${key}, age=${Math.round((Date.now() - entry.timestamp) / 1000)}s`);
+            return entry.data;
+        }
+        catch {
+            logger_1.logger.warn(`Cache.get: failed to read cache file ${filePath}`);
+            return null;
+        }
+    }
+    set(runId, startTime, endTime, data) {
+        const key = this.getCacheKey(runId, startTime, endTime);
+        const filePath = this.getCachePath(key);
+        if (!fs_1.default.existsSync(this.cacheDir)) {
+            fs_1.default.mkdirSync(this.cacheDir, { recursive: true });
+        }
+        const entry = {
+            timestamp: Date.now(),
+            data,
+        };
+        fs_1.default.writeFileSync(filePath, JSON.stringify(entry, null, 2), "utf-8");
+        logger_1.logger.debug(`Cache.set: wrote key=${key} to ${filePath}`);
+    }
+}
+exports.Cache = Cache;
+//# sourceMappingURL=cache.js.map

package/dist/cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"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"}

package/dist/cli.js

@@ -4,11 +4,45 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const config_1 = require("./config");
 const data_collector_1 = require("./data-collector");
+const datasources_1 = require("./datasources");
 const reporters_1 = require("./reporters");
+const VALID_REPORTERS = ["cli", "json", "markdown", "slack"];
+function defaultOutputPath(name, runId) {
+    const extensions = {
+        json: "json",
+        markdown: "md",
+    };
+    const ext = extensions[name];
+    return ext ? `report-${runId}.${ext}` : undefined;
+}
+async function runReporter(name, report, options, configInstance) {
+    const output = options.output || defaultOutputPath(name, report.runId);
+    switch (name) {
+        case "json":
+            new reporters_1.JsonReporter().report(report, output);
+            break;
+        case "markdown":
+            new reporters_1.MarkdownReporter().report(report, output);
+            break;
+        case "slack": {
+            const slackConfig = configInstance.getSlackConfig();
+            if (!slackConfig) {
+                throw new Error("Slack token not configured. Set SLACK_TOKEN environment variable or configure in config file.");
+            }
+            const slackReporter = new reporters_1.SlackReporter(slackConfig.token, slackConfig.channel);
+            await slackReporter.report(report);
+            console.log("Report sent to Slack");
+            break;
+        }
+        case "cli":
+            new reporters_1.CliReporter().report(report);
+            break;
+    }
+}
 function main() {
     commander_1.program
         .name("k6-reporter")
-        .description("Generate CLI reports from k6 tests stored in InfluxDB")
+        .description("Generate CLI reports from k6 performance tests")
         .version("1.6.0");
     commander_1.program
         .command("generate")
@@ -17,33 +51,34 @@ function main() {
         .option("-st, --start-time <time>", "Start time in ISO 8601 format or relative like '-1h'")
         .option("-et, --end-time <time>", "End time in ISO 8601 format (defaults to now)")
         .option("-c, --config <path>", "Path to config file", ".config.json")
+        .option("-d, --datasource <type>", "Data source: 'influxdb' or 'prometheus'")
         .option("-f, --format <format>", "Output format: 'json', 'cli', 'markdown', or 'slack'", "cli")
-        .option("-o, --output <path>", "Output file path (for json format)")
+        .option("-r, --report <reporters>", "Run one or more reporters (comma-separated): cli, json, markdown, slack")
+        .option("-o, --output <path>", "Output file path (for json and markdown formats)")
+        .option("--no-cache", "Disable cache, always fetch fresh data")
         .action(async (options) => {
         try {
-            const config = config_1.Config.getInstance(options.config).getInfluxConfig();
-            const collector = new data_collector_1.DataCollector(config);
-            const report = await collector.collect(options.runId, options.startTime || "-1h", options.endTime || "now()");
-            if (options.format === "json") {
-                const jsonReporter = new reporters_1.JsonReporter();
-                jsonReporter.report(report, options.output);
-            }
-            else if (options.format === "markdown") {
-                const markdownReporter = new reporters_1.MarkdownReporter();
-                markdownReporter.report(report, options.output);
+            if (options.report && options.format !== "cli") {
+                throw new Error("Cannot use --report and --format together. Use --report for multiple reporters.");
             }
-            else if (options.format === "slack") {
-                const slackConfig = config_1.Config.getInstance(options.config).getSlackConfig();
-                if (!slackConfig) {
-                    throw new Error("Slack token not configured. Set SLACK_TOKEN environment variable or configure in config file.");
+            const configInstance = config_1.Config.getInstance(options.config);
+            const dsType = (options.datasource || configInstance.getDataSourceType());
+            const dataSource = (0, datasources_1.createDataSource)(dsType, configInstance);
+            const cacheTtl = options.cache ? configInstance.getCacheConfig().ttl : 0;
+            const collector = new data_collector_1.DataCollector(dataSource, cacheTtl);
+            const report = await collector.collect(options.runId, options.startTime || "-1h", options.endTime || "now()");
+            if (options.report) {
+                const reporters = options.report.split(",").map((r) => r.trim());
+                const invalid = reporters.filter((r) => !VALID_REPORTERS.includes(r));
+                if (invalid.length > 0) {
+                    throw new Error(`Invalid reporter(s): ${invalid.join(", ")}. Valid options: ${VALID_REPORTERS.join(", ")}`);
+                }
+                for (const name of reporters) {
+                    await runReporter(name, report, options, configInstance);
                 }
-                const slackReporter = new reporters_1.SlackReporter(slackConfig.token, slackConfig.channel);
-                await slackReporter.report(report);
-                console.log("Report sent to Slack");
             }
             else {
-                const cliReporter = new reporters_1.CliReporter();
-                cliReporter.report(report);
+                await runReporter(options.format, report, options, configInstance);
             }
         }
         catch (error) {
@@ -56,7 +91,7 @@ function main() {
         .description("Show help and examples")
         .action(() => {
         console.log(`
-k6-reporter - Generate CLI reports from k6 tests stored in InfluxDB
+k6-reporter - Generate reports from k6 performance tests
 
 USAGE:
   k6-reporter <command> [options]
@@ -73,8 +108,11 @@ OPTIONS:
   -st, --start-time       Start time (relative: -1h, -30m, or ISO 8601)
   -et, --end-time         End time (ISO 8601 format, defaults to now)
   -c, --config            Path to config file (default: .config.json)
+  -d, --datasource        Data source: 'influxdb' or 'prometheus' (default: influxdb)
   -f, --format            Output format: 'json', 'cli', 'markdown', or 'slack' (default: cli)
+  -r, --report            Run one or more reporters (comma-separated): cli, json, markdown, slack
   -o, --output            Output file path (for json and markdown formats)
+  --no-cache              Disable cache, always fetch fresh data
   -h, --help              Show command help
   -V, --version           Show version
 
@@ -101,9 +139,18 @@ EXAMPLES:
   7. Use custom config file:
      k6-reporter generate --run-id 123456790121 -c /path/to/config.json
 
-  8. Get help for generate command:
+  8. Use Prometheus datasource:
+     k6-reporter generate --run-id 123456790121 -d prometheus
+
+  9. Get help for generate command:
      k6-reporter generate --help
 
+  10. Run multiple reporters at once:
+     k6-reporter generate --run-id 123456790121 --report cli,slack
+
+  11. Generate Markdown and JSON reports together:
+     k6-reporter generate --run-id 123456790121 --report markdown,json -o report
+
 TIME FORMAT:
 
   Relative times (from now):
@@ -117,14 +164,28 @@ TIME FORMAT:
 
 CONFIG FILE:
 
-  The config file (.config.json) should contain InfluxDB connection settings:
+  The config file (.config.json) supports multiple datasources:
 
   {
-    "influxUrl": "https://influxdb.example.com",
-    "influxToken": "your-influx-token",
-    "influxOrg": "your-org",
-    "influxBucket": "your-bucket"
+    "dataSource": "influxdb",
+    "influx": {
+      "url": "https://influxdb.example.com",
+      "token": "your-influx-token",
+      "org": "your-org",
+      "bucket": "your-bucket"
+    }
   }
+
+ENVIRONMENT VARIABLES:
+
+  DATASOURCE         Data source type (influxdb, prometheus)
+  INFLUX_URL         InfluxDB URL
+  INFLUX_TOKEN       InfluxDB token
+  INFLUX_ORG         InfluxDB organization
+  INFLUX_BUCKET      InfluxDB bucket
+  SLACK_TOKEN        Slack bot token
+  SLACK_CHANNEL      Slack channel ID
+  CACHE_TTL          Cache TTL in seconds (default: 3600)
       `);
     });
     commander_1.program.parse();

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/config.d.ts

@@ -1,3 +1,4 @@
+export type DataSourceType = "influxdb" | "prometheus";
 export interface InfluxConfig {
     url: string;
     token: string;
@@ -8,18 +9,26 @@ export interface SlackConfig {
     token: string;
     channel: string;
 }
+export interface CacheConfig {
+    ttl: number;
+}
 export declare class Config {
     private static instance;
-    private influxConfig;
+    private dataSourceType;
+    private rawInflux;
     private slackConfig;
+    private cacheConfig;
     private configPath;
     private constructor();
     private loadRawConfig;
-    private parseInfluxConfig;
+    private parseDataSourceType;
+    getInfluxConfig(): InfluxConfig;
     private parseSlackConfig;
+    private parseCacheConfig;
     private resolveValue;
     static getInstance(configPath?: string): Config;
-    getInfluxConfig(): InfluxConfig;
+    getDataSourceType(): DataSourceType;
     getSlackConfig(): SlackConfig | null;
+    getCacheConfig(): CacheConfig;
 }
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAOD,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAS;IAChC,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO;IAOP,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,gBAAgB;IAiBxB,OAAO,CAAC,YAAY;IAWpB,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAO/C,eAAe,IAAI,YAAY;IAI/B,cAAc,IAAI,WAAW,GAAG,IAAI;CAGrC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,YAAY,CAAC;AAEvD,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;CACb;AASD,qBAAa,MAAM;IACjB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAS;IAChC,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,SAAS,CAAsC;IACvD,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO;IASP,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,mBAAmB;IAS3B,eAAe,IAAI,YAAY;IAgB/B,OAAO,CAAC,gBAAgB;IAiBxB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,YAAY;IAWpB,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAO/C,iBAAiB,IAAI,cAAc;IAInC,cAAc,IAAI,WAAW,GAAG,IAAI;IAIpC,cAAc,IAAI,WAAW;CAG9B"}

package/dist/config.js

@@ -11,8 +11,10 @@ class Config {
         this.slackConfig = null;
         this.configPath = configPath || ".config.json";
         const rawConfig = this.loadRawConfig();
-        this.influxConfig = this.parseInfluxConfig(rawConfig.influx);
+        this.dataSourceType = this.parseDataSourceType(rawConfig.dataSource);
+        this.rawInflux = rawConfig.influx;
         this.slackConfig = this.parseSlackConfig(rawConfig.slack);
+        this.cacheConfig = this.parseCacheConfig(rawConfig.cache);
     }
     loadRawConfig() {
         const fullPath = path_1.default.resolve(this.configPath);
@@ -27,11 +29,19 @@ class Config {
         }
         return {};
     }
-    parseInfluxConfig(rawConfig) {
-        const url = this.resolveValue(rawConfig?.url, "INFLUX_URL");
-        const token = this.resolveValue(rawConfig?.token, "INFLUX_TOKEN");
-        const org = this.resolveValue(rawConfig?.org, "INFLUX_ORG");
-        const bucket = this.resolveValue(rawConfig?.bucket, "INFLUX_BUCKET");
+    parseDataSourceType(raw) {
+        const envValue = process.env["DATASOURCE"];
+        const value = envValue || raw || "influxdb";
+        if (value !== "influxdb" && value !== "prometheus") {
+            throw new Error(`Unknown datasource type: '${value}'. Supported: influxdb, prometheus`);
+        }
+        return value;
+    }
+    getInfluxConfig() {
+        const url = this.resolveValue(this.rawInflux?.url, "INFLUX_URL");
+        const token = this.resolveValue(this.rawInflux?.token, "INFLUX_TOKEN");
+        const org = this.resolveValue(this.rawInflux?.org, "INFLUX_ORG");
+        const bucket = this.resolveValue(this.rawInflux?.bucket, "INFLUX_BUCKET");
         if (!url || !token || !org || !bucket) {
             throw new Error("InfluxDB configuration is incomplete. " +
                 "Set INFLUX_URL, INFLUX_TOKEN, INFLUX_ORG, INFLUX_BUCKET via environment variables or config file.");
@@ -50,6 +60,18 @@ class Config {
         }
         return { token, channel };
     }
+    parseCacheConfig(rawConfig) {
+        const DEFAULT_TTL = 3600;
+        const envTtl = process.env["CACHE_TTL"];
+        if (envTtl) {
+            return { ttl: parseInt(envTtl, 10) };
+        }
+        const ttl = rawConfig?.ttl;
+        if (typeof ttl === "number") {
+            return { ttl };
+        }
+        return { ttl: DEFAULT_TTL };
+    }
     resolveValue(configValue, envVar) {
         // First check environment variable (takes priority)
         const envValue = process.env[envVar];
@@ -65,12 +87,15 @@ class Config {
         }
         return Config.instance;
     }
-    getInfluxConfig() {
-        return this.influxConfig;
+    getDataSourceType() {
+        return this.dataSourceType;
     }
     getSlackConfig() {
         return this.slackConfig;
     }
+    getCacheConfig() {
+        return this.cacheConfig;
+    }
 }
 exports.Config = Config;
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/data-collector.d.ts

@@ -1,15 +1,12 @@
-import { InfluxConfig } from "./config";
-export interface ReporterResponse {
-    runId: string;
-    startTime: string;
-    endTime: string;
-    timestamp: string;
-    data: unknown;
-}
+import { DataSource } from "./datasources";
+import { ReporterResponse } from "./types";
+export { ReporterResponse } from "./types";
 export declare class DataCollector {
-    private extractor;
+    private dataSource;
     private loader;
-    constructor(config: InfluxConfig);
+    private cache;
+    constructor(dataSource: DataSource, cacheTtl?: number);
+    private formatElapsed;
     collect(runId: string, startTime?: string, endTime?: string, data?: unknown): Promise<ReporterResponse>;
 }
 //# sourceMappingURL=data-collector.d.ts.map

package/dist/data-collector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-collector.d.ts","sourceRoot":"","sources":["../src/data-collector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;CACf;AAED,qBAAa,aAAa;IACxB,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,MAAM,CAAgB;gBAElB,MAAM,EAAE,YAAY;IAI1B,OAAO,CACX,KAAK,EAAE,MAAM,EACb,SAAS,GAAE,MAAc,EACzB,OAAO,GAAE,MAAgB,EACzB,IAAI,GAAE,OAAY,GACjB,OAAO,CAAC,gBAAgB,CAAC;CAkG7B"}
+{"version":3,"file":"data-collector.d.ts","sourceRoot":"","sources":["../src/data-collector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAe3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,qBAAa,aAAa;IACxB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,KAAK,CAAe;gBAEhB,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,MAAM;IAKrD,OAAO,CAAC,aAAa;IAQf,OAAO,CACX,KAAK,EAAE,MAAM,EACb,SAAS,GAAE,MAAc,EACzB,OAAO,GAAE,MAAgB,EACzB,IAAI,GAAE,OAAY,GACjB,OAAO,CAAC,gBAAgB,CAAC;CAqG7B"}

package/dist/data-collector.js

@@ -1,65 +1,72 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataCollector = void 0;
-const influx_data_extractor_1 = require("./influx-data-extractor");
+const metrics_1 = require("./metrics");
 const loader_1 = require("./loader");
+const cache_1 = require("./cache");
+const logger_1 = require("./logger");
 class DataCollector {
-    constructor(config) {
+    constructor(dataSource, cacheTtl) {
         this.loader = new loader_1.Loader();
-        this.extractor = new influx_data_extractor_1.InfluxDataExtractor(config);
+        this.dataSource = dataSource;
+        this.cache = cacheTtl != null && cacheTtl > 0 ? new cache_1.Cache(cacheTtl) : null;
+    }
+    formatElapsed(ms) {
+        const seconds = Math.floor(ms / 1000);
+        if (seconds < 60)
+            return `${seconds}s`;
+        const minutes = Math.floor(seconds / 60);
+        const remainingSeconds = seconds % 60;
+        return remainingSeconds > 0 ? `${minutes}m ${remainingSeconds}s` : `${minutes}m`;
     }
     async collect(runId, startTime = "-1h", endTime = "now()", data = {}) {
-        this.loader.start("Extracting http_reqs...");
-        const httpReqs = await this.extractor.extractHttpReqs(runId, startTime, endTime);
-        this.loader.success("Extracted http_reqs");
-        this.loader.start("Extracting vus...");
-        const vus = await this.extractor.extractVus(runId, startTime, endTime);
-        this.loader.success("Extracted vus");
-        this.loader.start("Extracting vus_max...");
-        const vusMax = await this.extractor.extractVusMax(runId, startTime, endTime);
-        this.loader.success("Extracted vus_max");
-        this.loader.start("Extracting iterations...");
-        const iterations = await this.extractor.extractIterations(runId, startTime, endTime);
-        this.loader.success("Extracted iterations");
-        this.loader.start("Calculating test duration...");
-        const duration = await this.extractor.calculateTestDuration(runId, startTime, endTime);
-        this.loader.success("Calculated test duration");
-        this.loader.start("Extracting checks...");
-        const checks = await this.extractor.extractChecks(runId, startTime, endTime);
-        this.loader.success("Extracted checks");
-        this.loader.start("Extracting http_req_failed...");
-        const httpReqFailed = await this.extractor.extractHttpReqFailed(runId, startTime, endTime);
-        this.loader.success("Extracted http_req_failed");
-        this.loader.start("Extracting http_req_duration...");
-        const httpReqDuration = await this.extractor.extractHttpReqDuration(runId, startTime, endTime);
-        this.loader.success("Extracted http_req_duration");
-        this.loader.start("Extracting http_req_duration (success only)...");
-        const httpReqDurationSuccess = await this.extractor.extractHttpReqDurationSuccess(runId, startTime, endTime);
-        this.loader.success("Extracted http_req_duration (success only)");
-        this.loader.start("Extracting iteration_duration...");
-        const iterationDuration = await this.extractor.extractIterationDuration(runId, startTime, endTime);
-        this.loader.success("Extracted iteration_duration");
-        this.loader.start("Extracting error_responses...");
-        const errorResponses = await this.extractor.extractErrorResponses(runId, startTime, endTime);
-        this.loader.success("Extracted error_responses");
-        this.loader.start("Extracting top slow URLs...");
-        const topSlowUrls = await this.extractor.extractTopSlowUrls(runId, startTime, endTime);
-        this.loader.success("Extracted top slow URLs");
-        this.loader.start("Extracting error requests...");
-        const errorRequests = await this.extractor.extractErrorRequests(runId, startTime, endTime);
-        this.loader.success("Extracted error requests");
-        this.loader.start("Extracting success requests...");
-        const successRequests = await this.extractor.extractSuccessRequests(runId, startTime, endTime);
-        this.loader.success("Extracted success requests");
-        this.loader.start("Extracting error responses text...");
-        const errorResponsesText = await this.extractor.extractErrorResponsesText(runId, startTime, endTime);
-        this.loader.success("Extracted error responses text");
-        this.loader.start("Extracting RPS per URL...");
-        const rpsPerUrl = await this.extractor.extractRpsPerUrl(runId, startTime, endTime);
-        this.loader.success("Extracted RPS per URL");
-        this.loader.start("Extracting RPS aggregated (5s intervals)...");
-        const rpsAggregated = await this.extractor.extractRpsAggregated(runId, startTime, endTime);
-        this.loader.success("Extracted RPS aggregated");
+        logger_1.logger.info(`DataCollector.collect: runId=${runId}, range=[${startTime}, ${endTime}]`);
+        if (this.cache) {
+            const cached = this.cache.get(runId, startTime, endTime);
+            if (cached) {
+                logger_1.logger.info("DataCollector.collect: cache hit, skipping data fetch");
+                this.loader.success("Loaded report from cache");
+                return cached;
+            }
+            logger_1.logger.debug("DataCollector.collect: cache miss, fetching from datasource");
+        }
+        // Phase 1: Parallel bulk fetch — all independent queries at once
+        this.loader.start("Fetching all data in parallel...");
+        const fetchStart = Date.now();
+        logger_1.logger.info("DataCollector.collect: starting parallel data fetch (9 queries)");
+        const [httpReqsData, httpReqDurationData, duration, vus, vusMax, iterations, checks, iterationDuration, errorResponsesText,] = await Promise.all([
+            this.dataSource.fetchHttpReqsData(runId, startTime, endTime),
+            this.dataSource.fetchHttpReqDurationData(runId, startTime, endTime),
+            this.dataSource.calculateTestDuration(runId, startTime, endTime),
+            this.dataSource.extractVus(runId, startTime, endTime),
+            this.dataSource.extractVusMax(runId, startTime, endTime),
+            this.dataSource.extractIterations(runId, startTime, endTime),
+            this.dataSource.extractChecks(runId, startTime, endTime),
+            this.dataSource.extractIterationDuration(runId, startTime, endTime),
+            this.dataSource.extractErrorResponsesText(runId, startTime, endTime),
+        ]);
+        const fetchElapsed = Date.now() - fetchStart;
+        logger_1.logger.info(`DataCollector.collect: parallel fetch completed in ${fetchElapsed}ms`);
+        logger_1.logger.debug(`DataCollector.collect: fetched rows — httpReqs=${httpReqsData.length}, httpReqDuration=${httpReqDurationData.length}, ` +
+            `errorResponsesText=${errorResponsesText.responses.length}`);
+        this.loader.success(`Data fetching finished in ${this.formatElapsed(fetchElapsed)}`);
+        // Phase 2: Derive metrics from cached data (no additional queries)
+        this.loader.start("Computing metrics...");
+        logger_1.logger.info("DataCollector.collect: computing derived metrics");
+        // Update iterations with duration info
+        if (iterations.total > 0 && duration.durationSeconds > 0) {
+            iterations.rate = iterations.total / duration.durationSeconds;
+        }
+        const httpReqs = (0, metrics_1.extractHttpReqsFromData)(httpReqsData, duration);
+        const httpReqFailed = (0, metrics_1.extractHttpReqFailedFromData)(httpReqsData);
+        const httpReqDuration = (0, metrics_1.extractHttpReqDurationFromData)(httpReqDurationData);
+        const httpReqDurationSuccess = (0, metrics_1.extractHttpReqDurationSuccessFromData)(httpReqDurationData);
+        const errorResponses = (0, metrics_1.extractErrorResponsesFromData)(httpReqsData, duration);
+        const errorRequests = (0, metrics_1.extractErrorRequestsFromData)(httpReqsData, httpReqDurationData);
+        const requests = (0, metrics_1.extractRequestsFromData)(httpReqsData, httpReqDurationData);
+        const rpsAggregated = (0, metrics_1.extractRpsAggregatedFromData)(httpReqsData);
+        logger_1.logger.info("DataCollector.collect: all metrics computed");
+        this.loader.success("Computed all metrics");
         const reportData = {
             ...(typeof data === "object" && data !== null ? data : {}),
             httpReqs,
@@ -73,20 +80,23 @@ class DataCollector {
             httpReqDurationSuccess,
             iterationDuration,
             errorResponses,
-            rpsPerUrl,
-            topSlowUrls,
+            requests,
             errorRequests,
-            successRequests,
             errorResponsesText,
             rpsAggregated,
         };
-        return {
+        const result = {
             runId,
             startTime: duration.startTime || startTime,
             endTime: duration.endTime || endTime,
             timestamp: new Date().toISOString(),
             data: reportData,
         };
+        if (this.cache) {
+            this.cache.set(runId, startTime, endTime, result);
+            logger_1.logger.debug("DataCollector.collect: result cached");
+        }
+        return result;
     }
 }
 exports.DataCollector = DataCollector;