@flakiness/sdk 0.98.0 → 0.100.0

package/lib/cli/cli.js

@@ -773,8 +773,8 @@ function sha1File(filePath) {
     stream.on("end", () => {
       resolve(hash.digest("hex"));
     });
-    stream.on("error", (err) => {
-      reject(err);
+    stream.on("error", (err2) => {
+      reject(err2);
     });
   });
 }
@@ -1494,7 +1494,21 @@ var KNOWN_CLIENT_IDS = {
 // src/cli/cmd-login.ts
 import open from "open";
 import os3 from "os";
+
+// src/cli/cmd-logout.ts
+async function cmdLogout() {
+  const session2 = await FlakinessSession.load();
+  if (!session2)
+    return;
+  const currentSession = await session2.api.user.currentSession.GET().catch((e) => void 0);
+  if (currentSession)
+    await session2.api.user.logoutSession.POST({ sessionId: currentSession.sessionPublicId });
+  await FlakinessSession.remove();
+}
+
+// src/cli/cmd-login.ts
 async function cmdLogin(endpoint) {
+  await cmdLogout();
   const api = createServerAPI(endpoint);
   const data = await api.deviceauth.createRequest.POST({
     clientId: KNOWN_CLIENT_IDS.OFFICIAL_CLI,
@@ -1532,17 +1546,6 @@ async function cmdLogin(endpoint) {
   }
 }
 
-// src/cli/cmd-logout.ts
-async function cmdLogout() {
-  const session2 = await FlakinessSession.load();
-  if (!session2)
-    return;
-  const currentSession = await session2.api.user.currentSession.GET().catch((e) => void 0);
-  if (currentSession)
-    await session2.api.user.logoutSession.POST({ sessionId: currentSession.sessionPublicId });
-  await FlakinessSession.remove();
-}
-
 // src/cli/cmd-show-report.ts
 import chalk from "chalk";
 import open2 from "open";
@@ -1646,6 +1649,17 @@ var LocalReportServer = class _LocalReportServer {
     this._authToken = _authToken;
   }
   static async create(options) {
+    const report = JSON.parse(await fs8.promises.readFile(options.reportPath, "utf-8"));
+    const attachmentsDir = options.attachmentsFolder;
+    const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
+    if (missingAttachments.length) {
+      const first = missingAttachments.slice(0, 3);
+      for (let i = 0; i < 3 && i < missingAttachments.length; ++i)
+        console.warn(`Missing attachment with id ${missingAttachments[i]}`);
+      if (missingAttachments.length > 3)
+        console.warn(`...and ${missingAttachments.length - 3} more missing attachments.`);
+    }
+    const commits = await listLocalCommits(process.cwd(), report.commitId, 100);
     const app = express();
     app.set("etag", false);
     const authToken = randomUUIDBase62();
@@ -1671,37 +1685,21 @@ var LocalReportServer = class _LocalReportServer {
     });
     app.use("/" + authToken, createTypedHttpExpressMiddleware({
       router: localReportRouter,
-      createRootContext: async ({ req, res, input }) => {
-        const report = JSON.parse(await fs8.promises.readFile(options.reportPath, "utf-8"));
-        const attachmentsDir = options.attachmentsFolder;
-        const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
-        if (missingAttachments.length) {
-          const first = missingAttachments.slice(0, 3);
-          for (let i = 0; i < 3 && i < missingAttachments.length; ++i)
-            console.warn(`Missing attachment with id ${missingAttachments[i]}`);
-          if (missingAttachments.length > 3)
-            console.warn(`...and ${missingAttachments.length - 3} more missing attachments.`);
-        }
-        return {
-          report,
-          commits: await listLocalCommits(process.cwd(), report.commitId, 100),
-          attachmentIdToPath
-        };
-      }
+      createRootContext: async ({ req, res, input }) => ({ report, commits, attachmentIdToPath })
     }));
-    app.use((err, req, res, next) => {
-      if (err instanceof TypedHTTP3.HttpError)
-        return res.status(err.status).send({ error: err.message });
-      logHTTPServer(err);
+    app.use((err2, req, res, next) => {
+      if (err2 instanceof TypedHTTP3.HttpError)
+        return res.status(err2.status).send({ error: err2.message });
+      logHTTPServer(err2);
       res.status(500).send({ error: "Internal Server Error" });
     });
     const server = http2.createServer(app);
-    server.on("error", (err) => {
-      if (err.code === "ECONNRESET") {
+    server.on("error", (err2) => {
+      if (err2.code === "ECONNRESET") {
         logHTTPServer("Client connection reset. Ignoring.");
         return;
       }
-      throw err;
+      throw err2;
     });
     const port = await new Promise((resolve) => server.listen(options.port, () => {
       resolve(server.address().port);
@@ -1725,7 +1723,7 @@ async function cmdShowReport(reportFolder) {
   const session2 = await FlakinessSession.load();
   const config = await FlakinessConfig.load();
   const projectPublicId = config.projectPublicId();
-  const project = projectPublicId && session2 ? await session2.api.project.getProject.GET({ projectPublicId }) : void 0;
+  const project = projectPublicId && session2 ? await session2.api.project.getProject.GET({ projectPublicId }).catch((e) => void 0) : void 0;
   const endpoint = session2?.endpoint() ?? "https://flakiness.io";
   const server = await LocalReportServer.create({
     endpoint,
@@ -2110,21 +2108,24 @@ async function cmdUploadPlaywrightJson(relativePath, options) {
 }
 
 // src/cli/cmd-upload.ts
+import chalk2 from "chalk";
 import fs11 from "fs/promises";
 import path9 from "path";
+var warn = (txt) => console.warn(chalk2.yellow(`[flakiness.io] WARN: ${txt}`));
+var err = (txt) => console.error(chalk2.red(`[flakiness.io] Error: ${txt}`));
+var log = (txt) => console.log(`[flakiness.io] ${txt}`);
 async function cmdUpload(relativePath, options) {
   const fullPath = path9.resolve(relativePath);
   if (!await fs11.access(fullPath, fs11.constants.F_OK).then(() => true).catch(() => false)) {
-    console.error(`Error: path ${fullPath} is not accessible`);
+    err(`Path ${fullPath} is not accessible!`);
     process.exit(1);
   }
   const text = await fs11.readFile(fullPath, "utf-8");
   const report = JSON.parse(text);
   const attachmentsDir = options.attachmentsDir ?? path9.dirname(fullPath);
   const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
-  if (missingAttachments.length && !options.ignoreMissingAttachments) {
-    console.log(`Missing ${missingAttachments.length} attachments - exiting. Use --ignore-missing-attachments to force upload.`);
-    process.exit(1);
+  if (missingAttachments.length) {
+    warn(`Missing ${missingAttachments.length} attachments`);
   }
   const uploader = new ReportUploader({
     flakinessAccessToken: options.accessToken,
@@ -2133,9 +2134,9 @@ async function cmdUpload(relativePath, options) {
   const upload = uploader.createUpload(report, Array.from(attachmentIdToPath.values()));
   const uploadResult = await upload.upload();
   if (!uploadResult.success) {
-    console.log(`[flakiness.io] X Failed to upload to ${options.endpoint}: ${uploadResult.message}`);
+    err(`Failed to upload to ${options.endpoint}: ${uploadResult.message}`);
   } else {
-    console.log(`[flakiness.io] \u2713 Report uploaded ${uploadResult.reportUrl ?? uploadResult.message ?? ""}`);
+    log(`\u2713 Uploaded ${uploadResult.reportUrl ?? uploadResult.message ?? ""}`);
   }
 }
 
@@ -2156,7 +2157,6 @@ var session = await FlakinessSession.load();
 var optAccessToken = new Option("-t, --access-token <token>", "A read-write flakiness.io access token").env("FLAKINESS_ACCESS_TOKEN");
 var optEndpoint = new Option("-e, --endpoint <url>", "An endpoint where the service is deployed").default(session?.endpoint() ?? "https://flakiness.io").env("FLAKINESS_ENDPOINT");
 var optAttachmentsDir = new Option("--attachments-dir <dir>", "Directory containing attachments to upload. Defaults to the report directory");
-var optIgnoreMissingAttachments = new Option("--ignore-missing-attachments", "Upload report even if some attachments are missing.").default("", "Same directory as the report file");
 async function runCommand(callback) {
   try {
     await callback();
@@ -2260,7 +2260,7 @@ program.command("download").description("Download run").addOption(optSince).addO
   }
   await Promise.all(downloaders);
 }));
-program.command("upload").description("Upload Flakiness report to the flakiness.io service").argument("<relative-path>", "Path to the Flakiness report file").addOption(optAccessToken).addOption(optEndpoint).addOption(optAttachmentsDir).addOption(optIgnoreMissingAttachments).action(async (relativePath, options) => {
+program.command("upload").description("Upload Flakiness report to the flakiness.io service").argument("<relative-path>", "Path to the Flakiness report file").addOption(optAccessToken).addOption(optEndpoint).addOption(optAttachmentsDir).action(async (relativePath, options) => {
   await runCommand(async () => {
     await cmdUpload(relativePath, await ensureAccessToken(options));
   });

package/lib/cli/cmd-login.js

@@ -164,8 +164,20 @@ var FlakinessSession = class _FlakinessSession {
   }
 };
 
+// src/cli/cmd-logout.ts
+async function cmdLogout() {
+  const session = await FlakinessSession.load();
+  if (!session)
+    return;
+  const currentSession = await session.api.user.currentSession.GET().catch((e) => void 0);
+  if (currentSession)
+    await session.api.user.logoutSession.POST({ sessionId: currentSession.sessionPublicId });
+  await FlakinessSession.remove();
+}
+
 // src/cli/cmd-login.ts
 async function cmdLogin(endpoint) {
+  await cmdLogout();
   const api = createServerAPI(endpoint);
   const data = await api.deviceauth.createRequest.POST({
     clientId: KNOWN_CLIENT_IDS.OFFICIAL_CLI,

package/lib/cli/cmd-show-report.js

@@ -387,6 +387,17 @@ var LocalReportServer = class _LocalReportServer {
     this._authToken = _authToken;
   }
   static async create(options) {
+    const report = JSON.parse(await fs5.promises.readFile(options.reportPath, "utf-8"));
+    const attachmentsDir = options.attachmentsFolder;
+    const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
+    if (missingAttachments.length) {
+      const first = missingAttachments.slice(0, 3);
+      for (let i = 0; i < 3 && i < missingAttachments.length; ++i)
+        console.warn(`Missing attachment with id ${missingAttachments[i]}`);
+      if (missingAttachments.length > 3)
+        console.warn(`...and ${missingAttachments.length - 3} more missing attachments.`);
+    }
+    const commits = await listLocalCommits(process.cwd(), report.commitId, 100);
     const app = express();
     app.set("etag", false);
     const authToken = randomUUIDBase62();
@@ -412,23 +423,7 @@ var LocalReportServer = class _LocalReportServer {
     });
     app.use("/" + authToken, createTypedHttpExpressMiddleware({
       router: localReportRouter,
-      createRootContext: async ({ req, res, input }) => {
-        const report = JSON.parse(await fs5.promises.readFile(options.reportPath, "utf-8"));
-        const attachmentsDir = options.attachmentsFolder;
-        const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
-        if (missingAttachments.length) {
-          const first = missingAttachments.slice(0, 3);
-          for (let i = 0; i < 3 && i < missingAttachments.length; ++i)
-            console.warn(`Missing attachment with id ${missingAttachments[i]}`);
-          if (missingAttachments.length > 3)
-            console.warn(`...and ${missingAttachments.length - 3} more missing attachments.`);
-        }
-        return {
-          report,
-          commits: await listLocalCommits(process.cwd(), report.commitId, 100),
-          attachmentIdToPath
-        };
-      }
+      createRootContext: async ({ req, res, input }) => ({ report, commits, attachmentIdToPath })
     }));
     app.use((err, req, res, next) => {
       if (err instanceof TypedHTTP3.HttpError)
@@ -466,7 +461,7 @@ async function cmdShowReport(reportFolder) {
   const session = await FlakinessSession.load();
   const config = await FlakinessConfig.load();
   const projectPublicId = config.projectPublicId();
-  const project = projectPublicId && session ? await session.api.project.getProject.GET({ projectPublicId }) : void 0;
+  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 server = await LocalReportServer.create({
     endpoint,

package/lib/cli/cmd-upload.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli/cmd-upload.ts
+import chalk from "chalk";
 import fs3 from "fs/promises";
 import path2 from "path";
 
@@ -284,19 +285,21 @@ var ReportUpload = class {
 };
 
 // src/cli/cmd-upload.ts
+var warn = (txt) => console.warn(chalk.yellow(`[flakiness.io] WARN: ${txt}`));
+var err = (txt) => console.error(chalk.red(`[flakiness.io] Error: ${txt}`));
+var log = (txt) => console.log(`[flakiness.io] ${txt}`);
 async function cmdUpload(relativePath, options) {
   const fullPath = path2.resolve(relativePath);
   if (!await fs3.access(fullPath, fs3.constants.F_OK).then(() => true).catch(() => false)) {
-    console.error(`Error: path ${fullPath} is not accessible`);
+    err(`Path ${fullPath} is not accessible!`);
     process.exit(1);
   }
   const text = await fs3.readFile(fullPath, "utf-8");
   const report = JSON.parse(text);
   const attachmentsDir = options.attachmentsDir ?? path2.dirname(fullPath);
   const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
-  if (missingAttachments.length && !options.ignoreMissingAttachments) {
-    console.log(`Missing ${missingAttachments.length} attachments - exiting. Use --ignore-missing-attachments to force upload.`);
-    process.exit(1);
+  if (missingAttachments.length) {
+    warn(`Missing ${missingAttachments.length} attachments`);
   }
   const uploader = new ReportUploader({
     flakinessAccessToken: options.accessToken,
@@ -305,9 +308,9 @@ async function cmdUpload(relativePath, options) {
   const upload = uploader.createUpload(report, Array.from(attachmentIdToPath.values()));
   const uploadResult = await upload.upload();
   if (!uploadResult.success) {
-    console.log(`[flakiness.io] X Failed to upload to ${options.endpoint}: ${uploadResult.message}`);
+    err(`Failed to upload to ${options.endpoint}: ${uploadResult.message}`);
   } else {
-    console.log(`[flakiness.io] \u2713 Report uploaded ${uploadResult.reportUrl ?? uploadResult.message ?? ""}`);
+    log(`\u2713 Uploaded ${uploadResult.reportUrl ?? uploadResult.message ?? ""}`);
   }
 }
 export {

package/lib/localReportServer.js

@@ -222,6 +222,17 @@ var LocalReportServer = class _LocalReportServer {
     this._authToken = _authToken;
   }
   static async create(options) {
+    const report = JSON.parse(await fs3.promises.readFile(options.reportPath, "utf-8"));
+    const attachmentsDir = options.attachmentsFolder;
+    const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
+    if (missingAttachments.length) {
+      const first = missingAttachments.slice(0, 3);
+      for (let i = 0; i < 3 && i < missingAttachments.length; ++i)
+        console.warn(`Missing attachment with id ${missingAttachments[i]}`);
+      if (missingAttachments.length > 3)
+        console.warn(`...and ${missingAttachments.length - 3} more missing attachments.`);
+    }
+    const commits = await listLocalCommits(process.cwd(), report.commitId, 100);
     const app = express();
     app.set("etag", false);
     const authToken = randomUUIDBase62();
@@ -247,23 +258,7 @@ var LocalReportServer = class _LocalReportServer {
     });
     app.use("/" + authToken, createTypedHttpExpressMiddleware({
       router: localReportRouter,
-      createRootContext: async ({ req, res, input }) => {
-        const report = JSON.parse(await fs3.promises.readFile(options.reportPath, "utf-8"));
-        const attachmentsDir = options.attachmentsFolder;
-        const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
-        if (missingAttachments.length) {
-          const first = missingAttachments.slice(0, 3);
-          for (let i = 0; i < 3 && i < missingAttachments.length; ++i)
-            console.warn(`Missing attachment with id ${missingAttachments[i]}`);
-          if (missingAttachments.length > 3)
-            console.warn(`...and ${missingAttachments.length - 3} more missing attachments.`);
-        }
-        return {
-          report,
-          commits: await listLocalCommits(process.cwd(), report.commitId, 100),
-          attachmentIdToPath
-        };
-      }
+      createRootContext: async ({ req, res, input }) => ({ report, commits, attachmentIdToPath })
     }));
     app.use((err, req, res, next) => {
       if (err instanceof TypedHTTP2.HttpError)

package/lib/playwright-test.js

@@ -518,6 +518,17 @@ var LocalReportServer = class _LocalReportServer {
     this._authToken = _authToken;
   }
   static async create(options) {
+    const report = JSON.parse(await fs5.promises.readFile(options.reportPath, "utf-8"));
+    const attachmentsDir = options.attachmentsFolder;
+    const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
+    if (missingAttachments.length) {
+      const first = missingAttachments.slice(0, 3);
+      for (let i = 0; i < 3 && i < missingAttachments.length; ++i)
+        console.warn(`Missing attachment with id ${missingAttachments[i]}`);
+      if (missingAttachments.length > 3)
+        console.warn(`...and ${missingAttachments.length - 3} more missing attachments.`);
+    }
+    const commits = await listLocalCommits(process.cwd(), report.commitId, 100);
     const app = express();
     app.set("etag", false);
     const authToken = randomUUIDBase62();
@@ -543,23 +554,7 @@ var LocalReportServer = class _LocalReportServer {
     });
     app.use("/" + authToken, createTypedHttpExpressMiddleware({
       router: localReportRouter,
-      createRootContext: async ({ req, res, input }) => {
-        const report = JSON.parse(await fs5.promises.readFile(options.reportPath, "utf-8"));
-        const attachmentsDir = options.attachmentsFolder;
-        const { attachmentIdToPath, missingAttachments } = await resolveAttachmentPaths(report, attachmentsDir);
-        if (missingAttachments.length) {
-          const first = missingAttachments.slice(0, 3);
-          for (let i = 0; i < 3 && i < missingAttachments.length; ++i)
-            console.warn(`Missing attachment with id ${missingAttachments[i]}`);
-          if (missingAttachments.length > 3)
-            console.warn(`...and ${missingAttachments.length - 3} more missing attachments.`);
-        }
-        return {
-          report,
-          commits: await listLocalCommits(process.cwd(), report.commitId, 100),
-          attachmentIdToPath
-        };
-      }
+      createRootContext: async ({ req, res, input }) => ({ report, commits, attachmentIdToPath })
     }));
     app.use((err2, req, res, next) => {
       if (err2 instanceof TypedHTTP3.HttpError)
@@ -597,7 +592,7 @@ async function cmdShowReport(reportFolder) {
   const session = await FlakinessSession.load();
   const config = await FlakinessConfig.load();
   const projectPublicId = config.projectPublicId();
-  const project = projectPublicId && session ? await session.api.project.getProject.GET({ projectPublicId }) : void 0;
+  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 server = await LocalReportServer.create({
     endpoint,

package/package.json

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