flakiness 0.158.0 → 0.160.0

package/lib/junit.js

@@ -1,121 +1,10 @@
 // src/junit.ts
-import { ReportUtils as ReportUtils2 } from "@flakiness/sdk";
+import { ReportUtils } from "@flakiness/sdk";
 import { parseXml, XmlElement, XmlText } from "@rgrove/parse-xml";
 import assert from "assert";
-import fs2 from "fs";
-import path from "path";
-
-// src/utils.ts
-import { ReportUtils } from "@flakiness/sdk";
-import crypto from "crypto";
 import fs from "fs";
-import http from "http";
-import https from "https";
-function sha1File(filePath) {
-  return new Promise((resolve, reject) => {
-    const hash = crypto.createHash("sha1");
-    const stream = fs.createReadStream(filePath);
-    stream.on("data", (chunk) => {
-      hash.update(chunk);
-    });
-    stream.on("end", () => {
-      resolve(hash.digest("hex"));
-    });
-    stream.on("error", (err) => {
-      reject(err);
-    });
-  });
-}
-var FLAKINESS_DBG = !!process.env.FLAKINESS_DBG;
-function errorText(error) {
-  return FLAKINESS_DBG ? error.stack : error.message;
-}
-function sha1Buffer(data) {
-  const hash = crypto.createHash("sha1");
-  hash.update(data);
-  return hash.digest("hex");
-}
-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));
-    }
-  }
-  return await job();
-}
-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 = {}));
-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");
-
-// src/junit.ts
+import mime from "mime";
+import path from "path";
 function getProperties(element) {
   const propertiesNodes = element.children.filter((node) => node instanceof XmlElement).filter((node) => node.name === "properties");
   if (!propertiesNodes.length)
@@ -158,21 +47,9 @@ function extractStdout(testcase, stdio) {
 }
 async function parseAttachment(value) {
   let absolutePath = path.resolve(process.cwd(), value);
-  if (fs2.existsSync(absolutePath)) {
-    const id = await sha1File(absolutePath);
-    return {
-      contentType: "image/png",
-      path: absolutePath,
-      id,
-      type: "file"
-    };
-  }
-  return {
-    contentType: "text/plain",
-    id: sha1Buffer(value),
-    body: Buffer.from(value),
-    type: "buffer"
-  };
+  if (fs.existsSync(absolutePath))
+    return ReportUtils.createFileAttachment(mime.getType(absolutePath) ?? "image/png", absolutePath);
+  return ReportUtils.createDataAttachment("text/plain", Buffer.from(value));
 }
 async function traverseJUnitReport(context, node) {
   const element = node;
@@ -301,7 +178,7 @@ async function parseJUnit(xmls, options) {
       await traverseJUnitReport(context, element);
   }
   return {
-    report: ReportUtils2.normalizeReport(report),
+    report: ReportUtils.normalizeReport(report),
     attachments: Array.from(context.attachments.values())
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flakiness",
-  "version": "0.158.0",
+  "version": "0.160.0",
   "private": false,
   "bin": {
     "flakiness": "./lib/cli/cli.js"
@@ -20,16 +20,19 @@
   "license": "Fair Source 100",
   "devDependencies": {
     "@playwright/test": "^1.57.0",
+    "@types/debug": "^4.1.12",
     "@types/express": "^4.17.20",
-    "@flakiness/server": "0.158.0",
-    "@flakiness/shared": "0.158.0"
+    "@flakiness/server": "0.160.0",
+    "@flakiness/shared": "0.160.0"
   },
   "dependencies": {
-    "@flakiness/sdk": "^0.154.0",
+    "@flakiness/flakiness-report": "^0.22.0",
+    "@flakiness/sdk": "^1.0.1",
     "@rgrove/parse-xml": "^4.2.0",
     "chalk": "^5.6.2",
-    "commander": "^13.1.0",
-    "debug": "^4.3.7",
+    "commander": "^14.0.0",
+    "debug": "^4.4.3",
+    "mime": "^4.1.0",
     "open": "^10.2.0",
     "ora": "^8.2.0"
   },