@todesktop/cli 1.7.0-2 → 1.7.0-4

package/dist/cli.js

@@ -4437,6 +4437,8 @@ function SmokeTestView({
     case "build-error": {
       return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(BuildError, { build: state.build, message: (_a = state.error) == null ? void 0 : _a.message });
     }
+    case "canceled":
+      return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(import_ink36.Text, { children: "Smoke test canceled." });
     case "complete":
       return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(import_ink36.Text, { bold: true, color: "greenBright", children: "Smoke test passed." });
     case "error":
@@ -4494,6 +4496,64 @@ function isBuildTestable(build) {
     return false;
   }
 }
+function isTestRunning(build) {
+  const { isFinished } = makeProgress(build);
+  return !isFinished;
+}
+function makeProgress(build) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  const def = {
+    progress: 0,
+    state: "progress",
+    shouldSkip: false
+  };
+  const linux = {
+    ...((_a = build.smokeTest) == null ? void 0 : _a.linux) || def,
+    shouldSkip: ((_b = build.linux) == null ? void 0 : _b.shouldSkip) || false,
+    message: ((_d = (_c = build.smokeTest) == null ? void 0 : _c.linux) == null ? void 0 : _d.message) || "Starting"
+  };
+  const mac = {
+    ...((_e = build.smokeTest) == null ? void 0 : _e.mac) || def,
+    shouldSkip: ((_f = build.mac) == null ? void 0 : _f.shouldSkip) || false,
+    message: ((_h = (_g = build.smokeTest) == null ? void 0 : _g.mac) == null ? void 0 : _h.message) || "Starting"
+  };
+  const windows = {
+    ...((_i = build.smokeTest) == null ? void 0 : _i.windows) || def,
+    shouldSkip: ((_j = build.windows) == null ? void 0 : _j.shouldSkip) || false,
+    message: ((_l = (_k = build.smokeTest) == null ? void 0 : _k.windows) == null ? void 0 : _l.message) || "Starting"
+  };
+  const platforms = [linux, mac, windows].filter(
+    (p) => !p.shouldSkip && p.state !== "skipped"
+  );
+  const platformArr = ["mac", "windows", "linux"];
+  const isRunning = platformArr.some(
+    (platform) => {
+      var _a2;
+      return Boolean(
+        build.smokeTest && ((_a2 = build.smokeTest[platform]) == null ? void 0 : _a2.state) === "progress" && !build.smokeTest.isCanceled
+      );
+    }
+  );
+  const isFinished = !isRunning;
+  let totalState = "progress";
+  if ((_m = build.smokeTest) == null ? void 0 : _m.isCanceled) {
+    totalState = "canceled";
+  } else if (platforms.every((p) => p.state === "done")) {
+    totalState = "done";
+  } else if (isFinished && platforms.some((p) => p.state === "error")) {
+    totalState = "error";
+  }
+  return {
+    isFinished,
+    linux,
+    mac,
+    windows,
+    total: {
+      error: platforms.filter((p) => p.state === "error").map((p) => p.message).join("\n\n"),
+      state: totalState
+    }
+  };
+}
 function validateBuild(build) {
   if (build.status !== "succeeded") {
     throw new SmokeError(
@@ -4605,46 +4665,6 @@ async function waitUntilFinished({
     );
   });
 }
-function makeProgress(build) {
-  var _a, _b, _c, _d, _e, _f;
-  const def = {
-    progress: 0,
-    state: "progress",
-    shouldSkip: false
-  };
-  const linux = {
-    ...((_a = build.smokeTest) == null ? void 0 : _a.linux) || def,
-    shouldSkip: ((_b = build.linux) == null ? void 0 : _b.shouldSkip) || false
-  };
-  const mac = {
-    ...((_c = build.smokeTest) == null ? void 0 : _c.mac) || def,
-    shouldSkip: ((_d = build.mac) == null ? void 0 : _d.shouldSkip) || false
-  };
-  const windows = {
-    ...((_e = build.smokeTest) == null ? void 0 : _e.windows) || def,
-    shouldSkip: ((_f = build.windows) == null ? void 0 : _f.shouldSkip) || false
-  };
-  const platforms = [linux, mac, windows].filter(
-    (p) => !p.shouldSkip && p.state !== "skipped"
-  );
-  const isFinished = platforms.every((p) => p.state !== "progress");
-  let totalState = "progress";
-  if (platforms.every((p) => p.state === "done")) {
-    totalState = "done";
-  } else if (isFinished && platforms.some((p) => p.state === "error")) {
-    totalState = "error";
-  }
-  return {
-    isFinished,
-    linux,
-    mac,
-    windows,
-    total: {
-      error: platforms.filter((p) => p.state === "error").map((p) => p.message).join("\n\n"),
-      state: totalState
-    }
-  };
-}
 
 // src/commands/smoke-test/SmokeTestCommand.tsx
 var import_jsx_runtime42 = require("react/jsx-runtime");
@@ -4679,7 +4699,10 @@ function SmokeTestContainer({
   configPath
 }) {
   const exit = useExit_default();
-  const [state, setState] = (0, import_react22.useState)({ buildId, state: "loading" });
+  const [state, setState] = (0, import_react22.useState)({
+    buildId,
+    state: "loading"
+  });
   const [abortController] = (0, import_react22.useState)(new AbortController());
   const abortSignal = abortController.signal;
   (0, import_react22.useEffect)(() => {
@@ -4719,7 +4742,7 @@ async function smokeTestWorkflow({
     const build = await fetchBuild({ appId, buildId, userId });
     updateState({ appId, build, userId });
     validateBuild(build);
-    if (!abortSignal.aborted) {
+    if (!abortSignal.aborted && !isTestRunning(build)) {
       await queueSmokeTest({ appId, buildId, nodeVersion, userId });
     }
     updateState({ state: "progress" });
@@ -4729,9 +4752,13 @@ async function smokeTestWorkflow({
       userId,
       onProgress: (progress) => updateState({ progress })
     });
-    updateState({
-      state: total.state == "error" ? "progress-error" : "complete"
-    });
+    const stateMap = {
+      done: "complete",
+      progress: "complete",
+      error: "progress-error",
+      canceled: "canceled"
+    };
+    updateState({ state: stateMap[total.state] });
   } catch (error) {
     updateState({ error, state: error.type || "error" });
   }
@@ -4741,10 +4768,7 @@ function buildCanBeCanceled(build) {
   if ((_a = build == null ? void 0 : build.smokeTest) == null ? void 0 : _a.isCanceled) {
     return false;
   }
-  if (!((_b = build == null ? void 0 : build.smokeTest) == null ? void 0 : _b.buildServerExecutionId)) {
-    return false;
-  }
-  return true;
+  return Boolean((_b = build == null ? void 0 : build.smokeTest) == null ? void 0 : _b.buildServerExecutionId);
 }
 function isCancelable(state) {
   const cancelableStates = ["loading", "progress"];
@@ -4811,7 +4835,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.7.0-1",
+  version: "1.7.0-3",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",