@flakiness/sdk 0.146.1 → 0.147.0

package/lib/showReport.js

@@ -1,102 +1,31 @@
 // src/showReport.ts
 import chalk from "chalk";
 import open from "open";
-import path4 from "path";
+import path3 from "path";
 
 // src/flakinessProjectConfig.ts
-import fs2 from "fs";
-import path2 from "path";
+import fs from "fs";
+import path from "path";
 
-// src/utils.ts
-import { ReportUtils } from "@flakiness/report";
+// src/git.ts
 import assert from "assert";
-import { spawnSync } from "child_process";
-import fs from "fs";
-import http from "http";
-import https from "https";
-import path, { posix as posixPath, win32 as win32Path } from "path";
-var FLAKINESS_DBG = !!process.env.FLAKINESS_DBG;
-function errorText(error) {
-  return FLAKINESS_DBG ? error.stack : error.message;
-}
-async function retryWithBackoff(job, backoff = []) {
-  for (const timeout of backoff) {
-    try {
-      return await job();
-    } catch (e) {
-      if (e instanceof AggregateError)
-        console.error(`[flakiness.io err]`, errorText(e.errors[0]));
-      else if (e instanceof Error)
-        console.error(`[flakiness.io err]`, errorText(e));
-      else
-        console.error(`[flakiness.io err]`, e);
-      await new Promise((x) => setTimeout(x, timeout));
-    }
+
+// src/pathutils.ts
+import { posix as posixPath, win32 as win32Path } from "path";
+var IS_WIN32_PATH = new RegExp("^[a-zA-Z]:\\\\", "i");
+var IS_ALMOST_POSIX_PATH = new RegExp("^[a-zA-Z]:/", "i");
+function normalizePath(aPath) {
+  if (IS_WIN32_PATH.test(aPath)) {
+    aPath = aPath.split(win32Path.sep).join(posixPath.sep);
   }
-  return await job();
+  if (IS_ALMOST_POSIX_PATH.test(aPath))
+    return "/" + aPath[0] + aPath.substring(2);
+  return aPath;
 }
-var httpUtils;
-((httpUtils2) => {
-  function createRequest({ url, method = "get", headers = {} }) {
-    let resolve;
-    let reject;
-    const responseDataPromise = new Promise((a, b) => {
-      resolve = a;
-      reject = b;
-    });
-    const protocol = url.startsWith("https") ? https : http;
-    headers = Object.fromEntries(Object.entries(headers).filter(([key, value]) => value !== void 0));
-    const request = protocol.request(url, { method, headers }, (res) => {
-      const chunks = [];
-      res.on("data", (chunk) => chunks.push(chunk));
-      res.on("end", () => {
-        if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300)
-          resolve(Buffer.concat(chunks));
-        else
-          reject(new Error(`Request to ${url} failed with ${res.statusCode}`));
-      });
-      res.on("error", (error) => reject(error));
-    });
-    request.on("error", reject);
-    return { request, responseDataPromise };
-  }
-  httpUtils2.createRequest = createRequest;
-  async function getBuffer(url, backoff) {
-    return await retryWithBackoff(async () => {
-      const { request, responseDataPromise } = createRequest({ url });
-      request.end();
-      return await responseDataPromise;
-    }, backoff);
-  }
-  httpUtils2.getBuffer = getBuffer;
-  async function getText(url, backoff) {
-    const buffer = await getBuffer(url, backoff);
-    return buffer.toString("utf-8");
-  }
-  httpUtils2.getText = getText;
-  async function getJSON(url) {
-    return JSON.parse(await getText(url));
-  }
-  httpUtils2.getJSON = getJSON;
-  async function postText(url, text, backoff) {
-    const headers = {
-      "Content-Type": "application/json",
-      "Content-Length": Buffer.byteLength(text) + ""
-    };
-    return await retryWithBackoff(async () => {
-      const { request, responseDataPromise } = createRequest({ url, headers, method: "post" });
-      request.write(text);
-      request.end();
-      return await responseDataPromise;
-    }, backoff);
-  }
-  httpUtils2.postText = postText;
-  async function postJSON(url, json, backoff) {
-    const buffer = await postText(url, JSON.stringify(json), backoff);
-    return JSON.parse(buffer.toString("utf-8"));
-  }
-  httpUtils2.postJSON = postJSON;
-})(httpUtils || (httpUtils = {}));
+
+// src/utils.ts
+import { spawnSync } from "child_process";
+var FLAKINESS_DBG = !!process.env.FLAKINESS_DBG;
 var ansiRegex = new RegExp("[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))", "g");
 function shell(command, args, options) {
   try {
@@ -110,40 +39,8 @@ function shell(command, args, options) {
     return void 0;
   }
 }
-async function resolveAttachmentPaths(report, attachmentsDir) {
-  const attachmentFiles = await listFilesRecursively(attachmentsDir);
-  const filenameToPath = new Map(attachmentFiles.map((file) => [path.basename(file), file]));
-  const attachmentIdToPath = /* @__PURE__ */ new Map();
-  const missingAttachments = /* @__PURE__ */ new Set();
-  ReportUtils.visitTests(report, (test) => {
-    for (const attempt of test.attempts) {
-      for (const attachment of attempt.attachments ?? []) {
-        const attachmentPath = filenameToPath.get(attachment.id);
-        if (!attachmentPath) {
-          missingAttachments.add(attachment.id);
-        } else {
-          attachmentIdToPath.set(attachment.id, {
-            contentType: attachment.contentType,
-            id: attachment.id,
-            path: attachmentPath
-          });
-        }
-      }
-    }
-  });
-  return { attachmentIdToPath, missingAttachments: Array.from(missingAttachments) };
-}
-async function listFilesRecursively(dir, result = []) {
-  const entries = await fs.promises.readdir(dir, { withFileTypes: true });
-  for (const entry of entries) {
-    const fullPath = path.join(dir, entry.name);
-    if (entry.isDirectory())
-      await listFilesRecursively(fullPath, result);
-    else
-      result.push(fullPath);
-  }
-  return result;
-}
+
+// src/git.ts
 function computeGitRoot(somePathInsideGitRepo) {
   const root = shell(`git`, ["rev-parse", "--show-toplevel"], {
     cwd: somePathInsideGitRepo,
@@ -152,20 +49,10 @@ function computeGitRoot(somePathInsideGitRepo) {
   assert(root, `FAILED: git rev-parse --show-toplevel HEAD @ ${somePathInsideGitRepo}`);
   return normalizePath(root);
 }
-var IS_WIN32_PATH = new RegExp("^[a-zA-Z]:\\\\", "i");
-var IS_ALMOST_POSIX_PATH = new RegExp("^[a-zA-Z]:/", "i");
-function normalizePath(aPath) {
-  if (IS_WIN32_PATH.test(aPath)) {
-    aPath = aPath.split(win32Path.sep).join(posixPath.sep);
-  }
-  if (IS_ALMOST_POSIX_PATH.test(aPath))
-    return "/" + aPath[0] + aPath.substring(2);
-  return aPath;
-}
 
 // src/flakinessProjectConfig.ts
 function createConfigPath(dir) {
-  return path2.join(dir, ".flakiness", "config.json");
+  return path.join(dir, ".flakiness", "config.json");
 }
 var gConfigPath;
 function ensureConfigPath() {
@@ -174,9 +61,9 @@ function ensureConfigPath() {
   return gConfigPath;
 }
 function computeConfigPath() {
-  for (let p = process.cwd(); p !== path2.resolve(p, ".."); p = path2.resolve(p, "..")) {
+  for (let p = process.cwd(); p !== path.resolve(p, ".."); p = path.resolve(p, "..")) {
     const configPath = createConfigPath(p);
-    if (fs2.existsSync(configPath))
+    if (fs.existsSync(configPath))
       return configPath;
   }
   try {
@@ -193,7 +80,7 @@ var FlakinessProjectConfig = class _FlakinessProjectConfig {
   }
   static async load() {
     const configPath = ensureConfigPath();
-    const data = await fs2.promises.readFile(configPath, "utf-8").catch((e) => void 0);
+    const data = await fs.promises.readFile(configPath, "utf-8").catch((e) => void 0);
     const json = data ? JSON.parse(data) : {};
     return new _FlakinessProjectConfig(configPath, json);
   }
@@ -213,8 +100,8 @@ var FlakinessProjectConfig = class _FlakinessProjectConfig {
     this._config.projectPublicId = projectId;
   }
   async save() {
-    await fs2.promises.mkdir(path2.dirname(this._configPath), { recursive: true });
-    await fs2.promises.writeFile(this._configPath, JSON.stringify(this._config, null, 2));
+    await fs.promises.mkdir(path.dirname(this._configPath), { recursive: true });
+    await fs.promises.writeFile(this._configPath, JSON.stringify(this._config, null, 2));
   }
 };
 
@@ -224,20 +111,22 @@ import { randomUUIDBase62 } from "@flakiness/shared/node/nodeutils.js";
 import { createTypedHttpExpressMiddleware } from "@flakiness/shared/node/typedHttpExpress.js";
 import bodyParser from "body-parser";
 import compression from "compression";
-import debug from "debug";
+import debug2 from "debug";
 import express from "express";
 import "express-async-errors";
-import http2 from "http";
+import http from "http";
 
 // src/localReportApi.ts
 import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
-import fs3 from "fs";
-import path3 from "path";
+import fs2 from "fs";
+import path2 from "path";
 import { z } from "zod/v4";
 
 // src/localGit.ts
 import { exec } from "child_process";
+import debug from "debug";
 import { promisify } from "util";
+var log = debug("fk:git");
 var execAsync = promisify(exec);
 async function listLocalCommits(gitRoot, head, count) {
   const FIELD_SEPARATOR = "|~|";
@@ -273,11 +162,131 @@ async function listLocalCommits(gitRoot, head, count) {
       };
     });
   } catch (error) {
-    console.error(`Failed to list commits for repository at ${gitRoot}:`, error);
-    throw error;
+    log(`Failed to list commits for repository at ${gitRoot}:`, error);
+    return [];
   }
 }
 
+// src/reportUtils.ts
+import { Multimap } from "@flakiness/shared/common/multimap.js";
+import { xxHash, xxHashObject } from "@flakiness/shared/common/utils.js";
+var ReportUtils;
+((ReportUtils2) => {
+  function visitTests(report, testVisitor) {
+    function visitSuite(suite, parents) {
+      parents.push(suite);
+      for (const test of suite.tests ?? [])
+        testVisitor(test, parents);
+      for (const childSuite of suite.suites ?? [])
+        visitSuite(childSuite, parents);
+      parents.pop();
+    }
+    for (const test of report.tests ?? [])
+      testVisitor(test, []);
+    for (const suite of report.suites)
+      visitSuite(suite, []);
+  }
+  ReportUtils2.visitTests = visitTests;
+  function normalizeReport(report) {
+    const gEnvs = /* @__PURE__ */ new Map();
+    const gSuites = /* @__PURE__ */ new Map();
+    const gTests = new Multimap();
+    const gSuiteIds = /* @__PURE__ */ new Map();
+    const gTestIds = /* @__PURE__ */ new Map();
+    const gEnvIds = /* @__PURE__ */ new Map();
+    const gSuiteChildren = new Multimap();
+    const gSuiteTests = new Multimap();
+    for (const env of report.environments) {
+      const envId = computeEnvId(env);
+      gEnvs.set(envId, env);
+      gEnvIds.set(env, envId);
+    }
+    const usedEnvIds = /* @__PURE__ */ new Set();
+    function visitTests2(tests, suiteId) {
+      for (const test of tests ?? []) {
+        const testId = computeTestId(test, suiteId);
+        gTests.set(testId, test);
+        gTestIds.set(test, testId);
+        gSuiteTests.set(suiteId, test);
+        for (const attempt of test.attempts) {
+          const env = report.environments[attempt.environmentIdx];
+          const envId = gEnvIds.get(env);
+          usedEnvIds.add(envId);
+        }
+      }
+    }
+    function visitSuite(suite, parentSuiteId) {
+      const suiteId = computeSuiteId(suite, parentSuiteId);
+      gSuites.set(suiteId, suite);
+      gSuiteIds.set(suite, suiteId);
+      for (const childSuite of suite.suites ?? []) {
+        visitSuite(childSuite, suiteId);
+        gSuiteChildren.set(suiteId, childSuite);
+      }
+      visitTests2(suite.tests ?? [], suiteId);
+    }
+    function transformTests(tests) {
+      const testIds = new Set(tests.map((test) => gTestIds.get(test)));
+      return [...testIds].map((testId) => {
+        const tests2 = gTests.getAll(testId);
+        const tags = tests2.map((test) => test.tags ?? []).flat();
+        return {
+          location: tests2[0].location,
+          title: tests2[0].title,
+          tags: tags.length ? tags : void 0,
+          attempts: tests2.map((t2) => t2.attempts).flat().map((attempt) => ({
+            ...attempt,
+            environmentIdx: envIdToIndex.get(gEnvIds.get(report.environments[attempt.environmentIdx]))
+          }))
+        };
+      });
+    }
+    function transformSuites(suites) {
+      const suiteIds = new Set(suites.map((suite) => gSuiteIds.get(suite)));
+      return [...suiteIds].map((suiteId) => {
+        const suite = gSuites.get(suiteId);
+        return {
+          location: suite.location,
+          title: suite.title,
+          type: suite.type,
+          suites: transformSuites(gSuiteChildren.getAll(suiteId)),
+          tests: transformTests(gSuiteTests.getAll(suiteId))
+        };
+      });
+    }
+    visitTests2(report.tests ?? [], "suiteless");
+    for (const suite of report.suites)
+      visitSuite(suite);
+    const newEnvironments = [...usedEnvIds];
+    const envIdToIndex = new Map(newEnvironments.map((envId, index) => [envId, index]));
+    return {
+      ...report,
+      environments: newEnvironments.map((envId) => gEnvs.get(envId)),
+      suites: transformSuites(report.suites),
+      tests: transformTests(report.tests ?? [])
+    };
+  }
+  ReportUtils2.normalizeReport = normalizeReport;
+  function computeEnvId(env) {
+    return xxHashObject(env);
+  }
+  function computeSuiteId(suite, parentSuiteId) {
+    return xxHash([
+      parentSuiteId ?? "",
+      suite.type,
+      suite.location?.file ?? "",
+      suite.title
+    ]);
+  }
+  function computeTestId(test, suiteId) {
+    return xxHash([
+      suiteId,
+      test.location?.file ?? "",
+      test.title
+    ]);
+  }
+})(ReportUtils || (ReportUtils = {}));
+
 // src/localReportApi.ts
 var ReportInfo = class {
   constructor(_options) {
@@ -287,7 +296,7 @@ var ReportInfo = class {
   attachmentIdToPath = /* @__PURE__ */ new Map();
   commits = [];
   async refresh() {
-    const report = await fs3.promises.readFile(this._options.reportPath, "utf-8").then((x) => JSON.parse(x)).catch((e) => void 0);
+    const report = await fs2.promises.readFile(this._options.reportPath, "utf-8").then((x) => JSON.parse(x)).catch((e) => void 0);
     if (!report) {
       this.report = void 0;
       this.commits = [];
@@ -297,7 +306,7 @@ var ReportInfo = class {
     if (JSON.stringify(report) === JSON.stringify(this.report))
       return;
     this.report = report;
-    this.commits = await listLocalCommits(path3.dirname(this._options.reportPath), report.commitId, 100);
+    this.commits = await listLocalCommits(path2.dirname(this._options.reportPath), report.commitId, 100);
     const attachmentsDir = this._options.attachmentsFolder;
     const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
     if (missingAttachments.length) {
@@ -331,7 +340,7 @@ var localReportRouter = {
         const idx = ctx.reportInfo.attachmentIdToPath.get(input.attachmentId);
         if (!idx)
           throw TypedHTTP.HttpError.withCode("NOT_FOUND");
-        const buffer = await fs3.promises.readFile(idx.path);
+        const buffer = await fs2.promises.readFile(idx.path);
         return TypedHTTP.ok(buffer, idx.contentType);
       }
     }),
@@ -343,9 +352,43 @@ var localReportRouter = {
     })
   }
 };
+async function resolveAttachmentPaths(report, attachmentsDir) {
+  const attachmentFiles = await listFilesRecursively(attachmentsDir);
+  const filenameToPath = new Map(attachmentFiles.map((file) => [path2.basename(file), file]));
+  const attachmentIdToPath = /* @__PURE__ */ new Map();
+  const missingAttachments = /* @__PURE__ */ new Set();
+  ReportUtils.visitTests(report, (test) => {
+    for (const attempt of test.attempts) {
+      for (const attachment of attempt.attachments ?? []) {
+        const attachmentPath = filenameToPath.get(attachment.id);
+        if (!attachmentPath) {
+          missingAttachments.add(attachment.id);
+        } else {
+          attachmentIdToPath.set(attachment.id, {
+            contentType: attachment.contentType,
+            id: attachment.id,
+            path: attachmentPath
+          });
+        }
+      }
+    }
+  });
+  return { attachmentIdToPath, missingAttachments: Array.from(missingAttachments) };
+}
+async function listFilesRecursively(dir, result = []) {
+  const entries = await fs2.promises.readdir(dir, { withFileTypes: true });
+  for (const entry of entries) {
+    const fullPath = path2.join(dir, entry.name);
+    if (entry.isDirectory())
+      await listFilesRecursively(fullPath, result);
+    else
+      result.push(fullPath);
+  }
+  return result;
+}
 
 // src/localReportServer.ts
-var logHTTPServer = debug("fk:http");
+var logHTTPServer = debug2("fk:http");
 var LocalReportServer = class _LocalReportServer {
   constructor(_server, _port, _authToken) {
     this._server = _server;
@@ -386,7 +429,7 @@ var LocalReportServer = class _LocalReportServer {
       logHTTPServer(err);
       res.status(500).send({ error: "Internal Server Error" });
     });
-    const server = http2.createServer(app);
+    const server = http.createServer(app);
     server.on("error", (err) => {
       if (err.code === "ECONNRESET") {
         logHTTPServer("Client connection reset. Ignoring.");
@@ -412,7 +455,7 @@ var LocalReportServer = class _LocalReportServer {
 
 // src/showReport.ts
 async function showReport(reportFolder) {
-  const reportPath = path4.join(reportFolder, "report.json");
+  const reportPath = path3.join(reportFolder, "report.json");
   const config = await FlakinessProjectConfig.load();
   const projectPublicId = config.projectPublicId();
   const reportViewerEndpoint = config.reportViewerEndpoint();