@flakiness/sdk 0.145.0 → 0.145.1

package/lib/playwright-test.js

@@ -2,15 +2,15 @@
 import { ReportUtils as ReportUtils2 } from "@flakiness/report";
 import { Multimap } from "@flakiness/shared/common/multimap.js";
 import chalk2 from "chalk";
-import fs7 from "fs";
-import path6 from "path";
+import fs6 from "fs";
+import path5 from "path";
 
 // src/cli/cmd-show-report.ts
 import chalk from "chalk";
 import open from "open";
-import path5 from "path";
+import path4 from "path";
 
-// src/flakinessConfig.ts
+// src/flakinessProjectConfig.ts
 import fs2 from "fs";
 import path2 from "path";
 
@@ -317,7 +317,7 @@ function createEnvironments(projects) {
   return result;
 }
 
-// src/flakinessConfig.ts
+// src/flakinessProjectConfig.ts
 function createConfigPath(dir) {
   return path2.join(dir, ".flakiness", "config.json");
 }
@@ -340,7 +340,7 @@ function computeConfigPath() {
     return createConfigPath(process.cwd());
   }
 }
-var FlakinessConfig = class _FlakinessConfig {
+var FlakinessProjectConfig = class _FlakinessProjectConfig {
   constructor(_configPath, _config) {
     this._configPath = _configPath;
     this._config = _config;
@@ -349,20 +349,10 @@ var FlakinessConfig = class _FlakinessConfig {
     const configPath = ensureConfigPath();
     const data = await fs2.promises.readFile(configPath, "utf-8").catch((e) => void 0);
     const json = data ? JSON.parse(data) : {};
-    return new _FlakinessConfig(configPath, json);
-  }
-  static async projectOrDie(session) {
-    const config = await _FlakinessConfig.load();
-    const projectPublicId = config.projectPublicId();
-    if (!projectPublicId)
-      throw new Error(`Please link to flakiness project with 'npx flakiness link'`);
-    const project = await session.api.project.getProject.GET({ projectPublicId }).catch((e) => void 0);
-    if (!project)
-      throw new Error(`Failed to fetch linked project; please re-link with 'npx flakiness link'`);
-    return project;
+    return new _FlakinessProjectConfig(configPath, json);
   }
   static createEmpty() {
-    return new _FlakinessConfig(ensureConfigPath(), {});
+    return new _FlakinessProjectConfig(ensureConfigPath(), {});
   }
   path() {
     return this._configPath;
@@ -370,6 +360,9 @@ var FlakinessConfig = class _FlakinessConfig {
   projectPublicId() {
     return this._config.projectPublicId;
   }
+  reportViewerEndpoint() {
+    return this._config.customReportViewerEndpoint ?? "https://report.flakiness.io";
+  }
   setProjectPublicId(projectId) {
     this._config.projectPublicId = projectId;
   }
@@ -379,72 +372,8 @@ var FlakinessConfig = class _FlakinessConfig {
   }
 };
 
-// src/flakinessSession.ts
-import fs3 from "fs/promises";
-import os2 from "os";
-import path3 from "path";
-
-// src/serverapi.ts
-import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
-function createServerAPI(endpoint, options) {
-  endpoint += "/api/";
-  const fetcher = options?.auth ? (url, init) => fetch(url, {
-    ...init,
-    headers: {
-      ...init.headers,
-      "Authorization": `Bearer ${options.auth}`
-    }
-  }) : fetch;
-  if (options?.retries)
-    return TypedHTTP.createClient(endpoint, (url, init) => retryWithBackoff(() => fetcher(url, init), options.retries));
-  return TypedHTTP.createClient(endpoint, fetcher);
-}
-
-// src/flakinessSession.ts
-var CONFIG_DIR = (() => {
-  const configDir = process.platform === "darwin" ? path3.join(os2.homedir(), "Library", "Application Support", "flakiness") : process.platform === "win32" ? path3.join(os2.homedir(), "AppData", "Roaming", "flakiness") : path3.join(os2.homedir(), ".config", "flakiness");
-  return configDir;
-})();
-var CONFIG_PATH = path3.join(CONFIG_DIR, "config.json");
-var FlakinessSession = class _FlakinessSession {
-  constructor(_config) {
-    this._config = _config;
-    this.api = createServerAPI(this._config.endpoint, { auth: this._config.token });
-  }
-  static async loadOrDie() {
-    const session = await _FlakinessSession.load();
-    if (!session)
-      throw new Error(`Please login first with 'npx flakiness login'`);
-    return session;
-  }
-  static async load() {
-    const data = await fs3.readFile(CONFIG_PATH, "utf-8").catch((e) => void 0);
-    if (!data)
-      return void 0;
-    const json = JSON.parse(data);
-    return new _FlakinessSession(json);
-  }
-  static async remove() {
-    await fs3.unlink(CONFIG_PATH).catch((e) => void 0);
-  }
-  api;
-  endpoint() {
-    return this._config.endpoint;
-  }
-  path() {
-    return CONFIG_PATH;
-  }
-  sessionToken() {
-    return this._config.token;
-  }
-  async save() {
-    await fs3.mkdir(CONFIG_DIR, { recursive: true });
-    await fs3.writeFile(CONFIG_PATH, JSON.stringify(this._config, null, 2));
-  }
-};
-
 // src/localReportServer.ts
-import { TypedHTTP as TypedHTTP3 } from "@flakiness/shared/common/typedHttp.js";
+import { TypedHTTP as TypedHTTP2 } from "@flakiness/shared/common/typedHttp.js";
 import { randomUUIDBase62 } from "@flakiness/shared/node/nodeutils.js";
 import { createTypedHttpExpressMiddleware } from "@flakiness/shared/node/typedHttpExpress.js";
 import bodyParser from "body-parser";
@@ -455,9 +384,9 @@ import "express-async-errors";
 import http2 from "http";
 
 // src/localReportApi.ts
-import { TypedHTTP as TypedHTTP2 } from "@flakiness/shared/common/typedHttp.js";
-import fs4 from "fs";
-import path4 from "path";
+import { TypedHTTP } from "@flakiness/shared/common/typedHttp.js";
+import fs3 from "fs";
+import path3 from "path";
 import { z } from "zod/v4";
 
 // src/localGit.ts
@@ -512,7 +441,7 @@ var ReportInfo = class {
   attachmentIdToPath = /* @__PURE__ */ new Map();
   commits = [];
   async refresh() {
-    const report = await fs4.promises.readFile(this._options.reportPath, "utf-8").then((x) => JSON.parse(x)).catch((e) => void 0);
+    const report = await fs3.promises.readFile(this._options.reportPath, "utf-8").then((x) => JSON.parse(x)).catch((e) => void 0);
     if (!report) {
       this.report = void 0;
       this.commits = [];
@@ -522,7 +451,7 @@ var ReportInfo = class {
     if (JSON.stringify(report) === JSON.stringify(this.report))
       return;
     this.report = report;
-    this.commits = await listLocalCommits(path4.dirname(this._options.reportPath), report.commitId, 100);
+    this.commits = await listLocalCommits(path3.dirname(this._options.reportPath), report.commitId, 100);
     const attachmentsDir = this._options.attachmentsFolder;
     const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
     if (missingAttachments.length) {
@@ -535,7 +464,7 @@ var ReportInfo = class {
     this.attachmentIdToPath = attachmentIdToPath;
   }
 };
-var t = TypedHTTP2.Router.create();
+var t = TypedHTTP.Router.create();
 var localReportRouter = {
   ping: t.get({
     handler: async () => {
@@ -555,9 +484,9 @@ var localReportRouter = {
       handler: async ({ ctx, input }) => {
         const idx = ctx.reportInfo.attachmentIdToPath.get(input.attachmentId);
         if (!idx)
-          throw TypedHTTP2.HttpError.withCode("NOT_FOUND");
-        const buffer = await fs4.promises.readFile(idx.path);
-        return TypedHTTP2.ok(buffer, idx.contentType);
+          throw TypedHTTP.HttpError.withCode("NOT_FOUND");
+        const buffer = await fs3.promises.readFile(idx.path);
+        return TypedHTTP.ok(buffer, idx.contentType);
       }
     }),
     json: t.get({
@@ -585,7 +514,7 @@ var LocalReportServer = class _LocalReportServer {
     app.use(bodyParser.json({ limit: 256 * 1024 }));
     app.use((req, res, next) => {
       if (!req.path.startsWith("/" + authToken))
-        throw TypedHTTP3.HttpError.withCode("UNAUTHORIZED");
+        throw TypedHTTP2.HttpError.withCode("UNAUTHORIZED");
       res.setHeader("Access-Control-Allow-Headers", "*");
       res.setHeader("Access-Control-Allow-Origin", options.endpoint);
       res.setHeader("Access-Control-Allow-Methods", "*");
@@ -606,7 +535,7 @@ var LocalReportServer = class _LocalReportServer {
       createRootContext: async ({ req, res, input }) => ({ reportInfo })
     }));
     app.use((err2, req, res, next) => {
-      if (err2 instanceof TypedHTTP3.HttpError)
+      if (err2 instanceof TypedHTTP2.HttpError)
         return res.status(err2.status).send({ error: err2.message });
       logHTTPServer(err2);
       res.status(500).send({ error: "Internal Server Error" });
@@ -637,35 +566,37 @@ var LocalReportServer = class _LocalReportServer {
 
 // src/cli/cmd-show-report.ts
 async function cmdShowReport(reportFolder) {
-  const reportPath = path5.join(reportFolder, "report.json");
-  const session = await FlakinessSession.load();
-  const config = await FlakinessConfig.load();
+  const reportPath = path4.join(reportFolder, "report.json");
+  const config = await FlakinessProjectConfig.load();
   const projectPublicId = config.projectPublicId();
-  const project = projectPublicId && session ? await session.api.project.getProject.GET({ projectPublicId }).catch((e) => void 0) : void 0;
-  const endpoint = session?.endpoint() ?? "https://flakiness.io";
+  const reportViewerEndpoint = config.reportViewerEndpoint();
   const server = await LocalReportServer.create({
-    endpoint,
+    endpoint: reportViewerEndpoint,
     port: 9373,
     reportPath,
     attachmentsFolder: reportFolder
   });
-  const reportEndpoint = project ? `${endpoint}/localreport/${project.org.orgSlug}/${project.projectSlug}?port=${server.port()}&token=${server.authToken()}` : `${endpoint}/localreport?port=${server.port()}&token=${server.authToken()}`;
+  const url = new URL(reportViewerEndpoint);
+  url.searchParams.set("port", String(server.port()));
+  url.searchParams.set("token", server.authToken());
+  if (projectPublicId)
+    url.searchParams.set("ppid", projectPublicId);
   console.log(chalk.cyan(`
-  Serving Flakiness report at ${reportEndpoint}
+  Serving Flakiness report at ${url.toString()}
   Press Ctrl+C to quit.`));
-  await open(reportEndpoint);
+  await open(url.toString());
   await new Promise(() => {
   });
 }
 
 // src/createTestStepSnippets.ts
 import { codeFrameColumns } from "@babel/code-frame";
-import fs5 from "fs";
+import fs4 from "fs";
 function createTestStepSnippets(filepathToSteps) {
   for (const [filepath, steps] of filepathToSteps) {
     let source;
     try {
-      source = fs5.readFileSync(filepath, "utf-8");
+      source = fs4.readFileSync(filepath, "utf-8");
     } catch (e) {
       continue;
     }
@@ -690,8 +621,26 @@ function createTestStepSnippets(filepathToSteps) {
 // src/reportUploader.ts
 import { compressTextAsync, compressTextSync } from "@flakiness/shared/node/compression.js";
 import assert2 from "assert";
-import fs6 from "fs";
-import { URL } from "url";
+import fs5 from "fs";
+import { URL as URL2 } from "url";
+
+// src/serverapi.ts
+import { TypedHTTP as TypedHTTP3 } from "@flakiness/shared/common/typedHttp.js";
+function createServerAPI(endpoint, options) {
+  endpoint += "/api/";
+  const fetcher = options?.auth ? (url, init) => fetch(url, {
+    ...init,
+    headers: {
+      ...init.headers,
+      "Authorization": `Bearer ${options.auth}`
+    }
+  }) : fetch;
+  if (options?.retries)
+    return TypedHTTP3.createClient(endpoint, (url, init) => retryWithBackoff(() => fetcher(url, init), options.retries));
+  return TypedHTTP3.createClient(endpoint, fetcher);
+}
+
+// src/reportUploader.ts
 var ReportUploader = class _ReportUploader {
   static optionsFromEnv(overrides) {
     const flakinessAccessToken = overrides?.flakinessAccessToken ?? process.env["FLAKINESS_ACCESS_TOKEN"];
@@ -757,7 +706,7 @@ var ReportUpload = class {
     const response2 = await this._api.run.completeUpload.POST({
       upload_token: response.result.upload_token
     }).then((result) => ({ result, error: void 0 })).catch((e) => ({ error: e, result: void 0 }));
-    const url = response2?.result?.report_url ? new URL(response2?.result.report_url, this._options.flakinessEndpoint).toString() : void 0;
+    const url = response2?.result?.report_url ? new URL2(response2?.result.report_url, this._options.flakinessEndpoint).toString() : void 0;
     return { success: true, reportUrl: url };
   }
   async _uploadReport(data, uploadUrl, syncCompression) {
@@ -788,16 +737,16 @@ var ReportUpload = class {
           url: uploadUrl,
           headers: {
             "Content-Type": attachment.contentType,
-            "Content-Length": (await fs6.promises.stat(attachmentPath)).size + ""
+            "Content-Length": (await fs5.promises.stat(attachmentPath)).size + ""
           },
           method: "put"
         });
-        fs6.createReadStream(attachmentPath).pipe(request);
+        fs5.createReadStream(attachmentPath).pipe(request);
         await responseDataPromise;
       }, HTTP_BACKOFF);
       return;
     }
-    let buffer = attachment.body ? attachment.body : attachment.path ? await fs6.promises.readFile(attachment.path) : void 0;
+    let buffer = attachment.body ? attachment.body : attachment.path ? await fs5.promises.readFile(attachment.path) : void 0;
     assert2(buffer);
     const encoding = compressable ? "br" : void 0;
     if (compressable)
@@ -822,7 +771,7 @@ var ReportUpload = class {
 
 // src/systemUtilizationSampler.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import os3 from "os";
+import os2 from "os";
 function getAvailableMemMacOS() {
   const lines = spawnSync2("vm_stat", { encoding: "utf8" }).stdout.trim().split("\n");
   const pageSize = parseInt(lines[0].match(/page size of (\d+) bytes/)[1], 10);
@@ -843,7 +792,7 @@ function getAvailableMemMacOS() {
 function getSystemUtilization() {
   let idleTicks = 0;
   let totalTicks = 0;
-  for (const cpu of os3.cpus()) {
+  for (const cpu of os2.cpus()) {
     totalTicks += cpu.times.user + cpu.times.nice + cpu.times.sys + cpu.times.irq + cpu.times.idle;
     idleTicks += cpu.times.idle;
   }
@@ -851,14 +800,14 @@ function getSystemUtilization() {
     idleTicks,
     totalTicks,
     timestamp: Date.now(),
-    freeBytes: os3.platform() === "darwin" ? getAvailableMemMacOS() : os3.freemem()
+    freeBytes: os2.platform() === "darwin" ? getAvailableMemMacOS() : os2.freemem()
   };
 }
 function toFKUtilization(sample, previous) {
   const idleTicks = sample.idleTicks - previous.idleTicks;
   const totalTicks = sample.totalTicks - previous.totalTicks;
   const cpuUtilization = Math.floor((1 - idleTicks / totalTicks) * 1e4) / 100;
-  const memoryUtilization = Math.floor((1 - sample.freeBytes / os3.totalmem()) * 1e4) / 100;
+  const memoryUtilization = Math.floor((1 - sample.freeBytes / os2.totalmem()) * 1e4) / 100;
   return {
     cpuUtilization,
     memoryUtilization,
@@ -873,7 +822,7 @@ var SystemUtilizationSampler = class {
     this.result = {
       samples: [],
       startTimestamp: this._lastSample.timestamp,
-      totalMemoryBytes: os3.totalmem()
+      totalMemoryBytes: os2.totalmem()
     };
     this._timer = setTimeout(this._addSample.bind(this), 50);
   }
@@ -894,7 +843,7 @@ var err = (txt) => console.error(chalk2.red(`[flakiness.io] ${txt}`));
 var FlakinessReporter = class {
   constructor(_options = {}) {
     this._options = _options;
-    this._outputFolder = path6.join(process.cwd(), this._options.outputFolder ?? process.env.FLAKINESS_OUTPUT_DIR ?? "flakiness-report");
+    this._outputFolder = path5.join(process.cwd(), this._options.outputFolder ?? process.env.FLAKINESS_OUTPUT_DIR ?? "flakiness-report");
   }
   _config;
   _rootSuite;
@@ -997,7 +946,7 @@ var FlakinessReporter = class {
       location: pwStep.location ? this._createLocation(context, pwStep.location) : void 0
     };
     if (pwStep.location) {
-      const resolvedPath = path6.resolve(pwStep.location.file);
+      const resolvedPath = path5.resolve(pwStep.location.file);
       this._filepathToSteps.set(resolvedPath, step);
     }
     if (pwStep.error)
@@ -1046,10 +995,10 @@ var FlakinessReporter = class {
     const environmentsMap = createEnvironments(this._config.projects);
     if (this._options.collectBrowserVersions) {
       try {
-        let playwrightPath = fs7.realpathSync(process.argv[1]);
-        while (path6.basename(playwrightPath) !== "test")
-          playwrightPath = path6.dirname(playwrightPath);
-        const module = await import(path6.join(playwrightPath, "index.js"));
+        let playwrightPath = fs6.realpathSync(process.argv[1]);
+        while (path5.basename(playwrightPath) !== "test")
+          playwrightPath = path5.dirname(playwrightPath);
+        const module = await import(path5.join(playwrightPath, "index.js"));
         for (const [project, env] of environmentsMap) {
           const { browserName = "chromium", channel, headless } = project.use;
           let browserType;
@@ -1116,8 +1065,8 @@ var FlakinessReporter = class {
     if (shouldOpen) {
       await cmdShowReport(this._outputFolder);
     } else {
-      const defaultOutputFolder = path6.join(process.cwd(), "flakiness-report");
-      const folder = defaultOutputFolder === this._outputFolder ? "" : path6.relative(process.cwd(), this._outputFolder);
+      const defaultOutputFolder = path5.join(process.cwd(), "flakiness-report");
+      const folder = defaultOutputFolder === this._outputFolder ? "" : path5.relative(process.cwd(), this._outputFolder);
       console.log(`
 To open last Flakiness report, install Flakiness CLI tool and run:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flakiness/sdk",
-  "version": "0.145.0",
+  "version": "0.145.1",
   "private": false,
   "bin": {
     "flakiness": "./lib/cli/cli.js"
@@ -50,7 +50,7 @@
   "author": "Degu Labs, Inc",
   "license": "Fair Source 100",
   "devDependencies": {
-    "@flakiness/server": "0.145.0",
+    "@flakiness/server": "0.145.1",
     "@playwright/test": "^1.57.0",
     "@types/babel__code-frame": "^7.0.6",
     "@types/compression": "^1.8.1",
@@ -58,8 +58,8 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.26.2",
-    "@flakiness/report": "0.145.0",
-    "@flakiness/shared": "0.145.0",
+    "@flakiness/report": "0.145.1",
+    "@flakiness/shared": "0.145.1",
     "@rgrove/parse-xml": "^4.2.0",
     "body-parser": "^1.20.3",
     "chalk": "^5.6.2",