@flakiness/sdk 0.145.0 → 0.146.0

package/lib/{cli/cmd-show-report.js → showReport.js}

@@ -1,9 +1,9 @@
-// src/cli/cmd-show-report.ts
+// src/showReport.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";
 
@@ -163,7 +163,7 @@ function normalizePath(aPath) {
   return aPath;
 }
 
-// src/flakinessConfig.ts
+// src/flakinessProjectConfig.ts
 function createConfigPath(dir) {
   return path2.join(dir, ".flakiness", "config.json");
 }
@@ -186,7 +186,7 @@ function computeConfigPath() {
     return createConfigPath(process.cwd());
   }
 }
-var FlakinessConfig = class _FlakinessConfig {
+var FlakinessProjectConfig = class _FlakinessProjectConfig {
   constructor(_configPath, _config) {
     this._configPath = _configPath;
     this._config = _config;
@@ -195,20 +195,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;
@@ -216,6 +206,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;
   }
@@ -225,72 +218,8 @@ var FlakinessConfig = class _FlakinessConfig {
   }
 };
 
-// src/flakinessSession.ts
-import fs3 from "fs/promises";
-import os 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(os.homedir(), "Library", "Application Support", "flakiness") : process.platform === "win32" ? path3.join(os.homedir(), "AppData", "Roaming", "flakiness") : path3.join(os.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";
@@ -301,9 +230,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
@@ -358,7 +287,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 = [];
@@ -368,7 +297,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) {
@@ -381,7 +310,7 @@ var ReportInfo = class {
     this.attachmentIdToPath = attachmentIdToPath;
   }
 };
-var t = TypedHTTP2.Router.create();
+var t = TypedHTTP.Router.create();
 var localReportRouter = {
   ping: t.get({
     handler: async () => {
@@ -401,9 +330,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({
@@ -431,7 +360,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", "*");
@@ -452,7 +381,7 @@ var LocalReportServer = class _LocalReportServer {
       createRootContext: async ({ req, res, input }) => ({ reportInfo })
     }));
     app.use((err, req, res, next) => {
-      if (err instanceof TypedHTTP3.HttpError)
+      if (err instanceof TypedHTTP2.HttpError)
         return res.status(err.status).send({ error: err.message });
       logHTTPServer(err);
       res.status(500).send({ error: "Internal Server Error" });
@@ -481,29 +410,31 @@ 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();
+// src/showReport.ts
+async function showReport(reportFolder) {
+  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(() => {
   });
 }
 export {
-  cmdShowReport
+  showReport
 };
-//# sourceMappingURL=cmd-show-report.js.map
+//# sourceMappingURL=showReport.js.map

package/package.json

@@ -1,10 +1,7 @@
 {
   "name": "@flakiness/sdk",
-  "version": "0.145.0",
+  "version": "0.146.0",
   "private": false,
-  "bin": {
-    "flakiness": "./lib/cli/cli.js"
-  },
   "exports": {
     "./localReportApi": {
       "types": "./types/src/localReportApi.d.ts"
@@ -14,21 +11,21 @@
       "import": "./lib/reportUploader.js",
       "require": "./lib/reportUploader.js"
     },
+    "./showReport": {
+      "types": "./types/src/showReport.d.ts",
+      "import": "./lib/showReport.js",
+      "require": "./lib/showReport.js"
+    },
+    "./flakinessProjectConfig": {
+      "types": "./types/src/flakinessProjectConfig.d.ts",
+      "import": "./lib/flakinessProjectConfig.js",
+      "require": "./lib/flakinessProjectConfig.js"
+    },
     "./utils": {
       "types": "./types/src/utils.d.ts",
       "import": "./lib/utils.js",
       "require": "./lib/utils.js"
     },
-    "./playwright": {
-      "types": "./types/src/playwrightJSONReport.d.ts",
-      "import": "./lib/playwrightJSONReport.js",
-      "require": "./lib/playwrightJSONReport.js"
-    },
-    "./junit": {
-      "types": "./types/src/junit.d.ts",
-      "import": "./lib/junit.js",
-      "require": "./lib/junit.js"
-    },
     "./playwright-test": {
       "types": "./types/src/playwright-test.d.ts",
       "import": "./lib/playwright-test.js",
@@ -50,7 +47,7 @@
   "author": "Degu Labs, Inc",
   "license": "Fair Source 100",
   "devDependencies": {
-    "@flakiness/server": "0.145.0",
+    "@flakiness/server": "0.146.0",
     "@playwright/test": "^1.57.0",
     "@types/babel__code-frame": "^7.0.6",
     "@types/compression": "^1.8.1",
@@ -58,8 +55,8 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.26.2",
-    "@flakiness/report": "0.145.0",
-    "@flakiness/shared": "0.145.0",
+    "@flakiness/report": "0.146.0",
+    "@flakiness/shared": "0.146.0",
     "@rgrove/parse-xml": "^4.2.0",
     "body-parser": "^1.20.3",
     "chalk": "^5.6.2",