@freecodecamp/universe-cli 0.5.0 → 0.6.0

package/dist/index.js

@@ -440,6 +440,13 @@ var ProxyError = class extends CliError {
     this.exitCode = mapExitCode(status);
   }
 };
+var AliasDriftError = class extends ProxyError {
+  current;
+  constructor(message, current) {
+    super(409, "alias_drift", message);
+    this.current = current;
+  }
+};
 function mapExitCode(status) {
   if (status === 401 || status === 403) return EXIT_CREDENTIALS;
   if (status === 422 || status === 0 || status >= 500) return EXIT_STORAGE;
@@ -475,9 +482,11 @@ async function readErrorEnvelope(response) {
     };
   }
   if (isProxyErrorEnvelope(raw) && raw.error) {
+    const current = typeof raw.current === "string" ? raw.current : void 0;
     return {
       code: raw.error.code ?? `http_${status}`,
-      message: raw.error.message ?? response.statusText ?? "request failed"
+      message: raw.error.message ?? response.statusText ?? "request failed",
+      ...current === void 0 ? {} : { current }
     };
   }
   return {
@@ -485,6 +494,12 @@ async function readErrorEnvelope(response) {
     message: response.statusText || "request failed"
   };
 }
+function throwProxyError(status, env) {
+  if (status === 409 && env.code === "alias_drift") {
+    throw new AliasDriftError(env.message, env.current ?? "");
+  }
+  throw new ProxyError(status, env.code, env.message);
+}
 function stripTrailingSlash(url) {
   return url.endsWith("/") ? url.slice(0, -1) : url;
 }
@@ -505,7 +520,7 @@ function createProxyClient(cfg) {
     }
     if (!response.ok) {
       const env = await readErrorEnvelope(response);
-      throw new ProxyError(response.status, env.code, env.message);
+      throwProxyError(response.status, env);
     }
     if (response.status === 204) {
       return void 0;
@@ -569,18 +584,55 @@ function createProxyClient(cfg) {
         }
       });
     },
+    async getAlias(req) {
+      const url = `${base}/api/site/${encodeURIComponent(req.site)}/alias/${encodeURIComponent(req.mode)}`;
+      let response;
+      try {
+        response = await fetchImpl(url, {
+          method: "GET",
+          headers: {
+            Authorization: await userBearer(),
+            Accept: "application/json"
+          }
+        });
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        throw new ProxyError(
+          0,
+          "network_error",
+          `proxy unreachable: ${message}`
+        );
+      }
+      if (response.status === 404) return null;
+      if (!response.ok) {
+        const env = await readErrorEnvelope(response);
+        throwProxyError(response.status, env);
+      }
+      return await response.json();
+    },
     async sitePromote(req) {
       const url = `${base}/api/site/${encodeURIComponent(req.site)}/promote`;
+      const headers = {
+        Authorization: await userBearer(),
+        Accept: "application/json"
+      };
+      const body = {};
+      if (req.deployId !== void 0) body.deployId = req.deployId;
+      if (req.expectedCurrent !== void 0)
+        body.expectedCurrent = req.expectedCurrent;
+      const hasBody = Object.keys(body).length > 0;
+      if (hasBody) headers["Content-Type"] = "application/json";
       return call(url, {
         method: "POST",
-        headers: {
-          Authorization: await userBearer(),
-          Accept: "application/json"
-        }
+        headers,
+        ...hasBody ? { body: JSON.stringify(body) } : {}
       });
     },
     async siteRollback(req) {
       const url = `${base}/api/site/${encodeURIComponent(req.site)}/rollback`;
+      const body = { to: req.to };
+      if (req.expectedCurrent !== void 0)
+        body.expectedCurrent = req.expectedCurrent;
       return call(url, {
         method: "POST",
         headers: {
@@ -588,7 +640,7 @@ function createProxyClient(cfg) {
           Accept: "application/json",
           "Content-Type": "application/json"
         },
-        body: JSON.stringify({ to: req.to })
+        body: JSON.stringify(body)
       });
     },
     async registerSite(req) {
@@ -920,7 +972,7 @@ async function deploy(options, deps = {}) {
       );
     }
     const git = gitState();
-    if (git.dirty) {
+    if (git.dirty && !options.json) {
       warn(
         "git working tree is dirty \u2014 uncommitted changes will not be reflected."
       );
@@ -932,7 +984,7 @@ async function deploy(options, deps = {}) {
       cwd,
       outputDir
     });
-    if (buildResult.skipped) {
+    if (buildResult.skipped && !options.json) {
       info("build.command not set \u2014 using pre-built output.");
     }
     const resolvedOutputDir = buildResult.outputDir;
@@ -991,7 +1043,7 @@ async function deploy(options, deps = {}) {
       );
     } else {
       const sizeKB = (uploadResult.totalSize / 1024).toFixed(1);
-      const nextLine = mode === "preview" ? "Next: universe static promote" : "Promoted to production.";
+      const nextLine = mode === "preview" ? `Next: universe static promote --from ${finalizeResult.deployId}` : "Promoted to production.\nPreview alias unchanged.";
       success(
         [
           `Deployed ${finalizeResult.deployId}`,
@@ -1225,7 +1277,7 @@ var defaultReadPlatformYaml2 = async (cwd) => {
 function emitJson4(envelope) {
   process.stdout.write(JSON.stringify(envelope) + "\n");
 }
-var DEPLOY_ID_RE = /^(\d{8})-(\d{6})-([a-f0-9]+)$/i;
+var DEPLOY_ID_RE = /^(\d{8})-(\d{6})-(\S+)$/;
 function parseDeployId(deployId) {
   const m = DEPLOY_ID_RE.exec(deployId);
   if (!m) return { deployId, timestamp: null, sha: null };
@@ -1294,7 +1346,10 @@ async function ls(options, deps = {}) {
       getAuthToken: () => identity.token
     });
     const raw = await client.siteDeploys({ site });
-    const deploys = raw.map((d) => parseDeployId(d.deployId));
+    const sorted = [...raw].sort(
+      (a, b) => b.deployId.localeCompare(a.deployId)
+    );
+    const deploys = sorted.map((d) => parseDeployId(d.deployId));
     if (options.json) {
       emitJson4(
         buildEnvelope("ls", true, {
@@ -1324,7 +1379,12 @@ async function ls(options, deps = {}) {
 // src/commands/promote.ts
 import { readFile as readFile4 } from "fs/promises";
 import { resolve as resolve4 } from "path";
-import { log as log5 } from "@clack/prompts";
+import { confirm, isCancel, log as log5 } from "@clack/prompts";
+var defaultPromptConfirm = async (msg) => {
+  const r = await confirm({ message: msg, initialValue: false });
+  if (isCancel(r)) return false;
+  return r === true;
+};
 var defaultReadPlatformYaml3 = async (cwd) => {
   return readFile4(resolve4(cwd, "platform.yaml"), "utf-8");
 };
@@ -1356,6 +1416,7 @@ async function promote(options, deps = {}) {
   const success = deps.logSuccess ?? ((s) => log5.success(s));
   const error = deps.logError ?? ((s) => log5.error(s));
   const exit = deps.exit ?? exitWithCode;
+  const promptConfirm = deps.promptConfirm ?? defaultPromptConfirm;
   try {
     const identity = await resolveId({ env });
     if (!identity) {
@@ -1371,12 +1432,75 @@ async function promote(options, deps = {}) {
     });
     let result;
     if (options.from) {
-      result = await client.siteRollback({
+      const prod = await client.getAlias({
         site: config.site,
-        to: options.from
+        mode: "production"
       });
+      const initialExpected = prod?.deployId ?? "";
+      try {
+        result = await client.siteRollback({
+          site: config.site,
+          to: options.from,
+          expectedCurrent: initialExpected
+        });
+      } catch (err) {
+        if (!(err instanceof AliasDriftError)) throw err;
+        if (options.json) throw err;
+        error(
+          `drift: production moved to ${err.current}, expected ${initialExpected}`
+        );
+        const ok = await promptConfirm(
+          `Retry promote --from with expectedCurrent='${err.current}'?`
+        );
+        if (!ok) throw err;
+        result = await client.siteRollback({
+          site: config.site,
+          to: options.from,
+          expectedCurrent: err.current
+        });
+      }
     } else {
-      result = await client.sitePromote({ site: config.site });
+      const preview = await client.getAlias({
+        site: config.site,
+        mode: "preview"
+      });
+      if (preview === null) {
+        throw new ConfigError(
+          "no preview alias to promote \u2014 run `universe static deploy` first"
+        );
+      }
+      const prod = await client.getAlias({
+        site: config.site,
+        mode: "production"
+      });
+      if (!options.json) {
+        success(
+          `Promoting ${preview.deployId} \u2192 ${prod?.deployId ?? "<none>"}`
+        );
+      }
+      const initialExpected = prod?.deployId ?? "";
+      try {
+        result = await client.sitePromote({
+          site: config.site,
+          deployId: preview.deployId,
+          expectedCurrent: initialExpected
+        });
+      } catch (err) {
+        if (!(err instanceof AliasDriftError)) throw err;
+        if (options.json) throw err;
+        error(
+          `drift: production moved to ${err.current}, expected ${initialExpected}`
+        );
+        const ok = await promptConfirm(
+          `Retry promote with expectedCurrent='${err.current}'?`
+        );
+        if (!ok) throw err;
+        result = await client.sitePromote({
+          site: config.site,
+          deployId: preview.deployId,
+          expectedCurrent: err.current
+        });
+      }
     }
     if (options.json) {
       emitJson5(
@@ -1388,20 +1512,27 @@ async function promote(options, deps = {}) {
         })
       );
     } else {
-      success(
-        [
-          `Promoted ${result.deployId} to production`,
-          ``,
-          `  Site:        ${config.site}`,
-          `  Deploy:      ${result.deployId}`,
-          `  Production:  ${result.url}`
-        ].join("\n")
-      );
+      const lines = [
+        `Promoted ${result.deployId} to production`,
+        ``,
+        `  Site:        ${config.site}`,
+        `  Deploy:      ${result.deployId}`,
+        `  Production:  ${result.url}`
+      ];
+      if (options.from) {
+        lines.push(``, "Preview alias unchanged.");
+      }
+      success(lines.join("\n"));
     }
   } catch (err) {
     const { code, message } = wrapProxyError("promote", err);
     if (options.json) {
-      emitJson5(buildErrorEnvelope("promote", code, message));
+      const envelope = buildErrorEnvelope("promote", code, message);
+      if (err instanceof AliasDriftError) {
+        emitJson5({ ...envelope, current: err.current });
+      } else {
+        emitJson5(envelope);
+      }
     } else {
       error(message);
     }
@@ -1412,7 +1543,12 @@ async function promote(options, deps = {}) {
 // src/commands/rollback.ts
 import { readFile as readFile5 } from "fs/promises";
 import { resolve as resolve5 } from "path";
-import { log as log6 } from "@clack/prompts";
+import { confirm as confirm2, isCancel as isCancel2, log as log6 } from "@clack/prompts";
+var defaultPromptConfirm2 = async (msg) => {
+  const r = await confirm2({ message: msg, initialValue: false });
+  if (isCancel2(r)) return false;
+  return r === true;
+};
 var defaultReadPlatformYaml4 = async (cwd) => {
   return readFile5(resolve5(cwd, "platform.yaml"), "utf-8");
 };
@@ -1444,6 +1580,7 @@ async function rollback(options, deps = {}) {
   const success = deps.logSuccess ?? ((s) => log6.success(s));
   const error = deps.logError ?? ((s) => log6.error(s));
   const exit = deps.exit ?? exitWithCode;
+  const promptConfirm = deps.promptConfirm ?? defaultPromptConfirm2;
   try {
     if (!options.to || options.to.trim().length === 0) {
       throw new UsageError(
@@ -1462,10 +1599,35 @@ async function rollback(options, deps = {}) {
       baseUrl,
       getAuthToken: () => identity.token
     });
-    const result = await client.siteRollback({
+    const to = options.to.trim();
+    const prod = await client.getAlias({
       site: config.site,
-      to: options.to.trim()
+      mode: "production"
     });
+    const initialExpected = prod?.deployId ?? "";
+    let result;
+    try {
+      result = await client.siteRollback({
+        site: config.site,
+        to,
+        expectedCurrent: initialExpected
+      });
+    } catch (err) {
+      if (!(err instanceof AliasDriftError)) throw err;
+      if (options.json) throw err;
+      error(
+        `drift: production moved to ${err.current}, expected ${initialExpected}`
+      );
+      const ok = await promptConfirm(
+        `Retry rollback with expectedCurrent='${err.current}'?`
+      );
+      if (!ok) throw err;
+      result = await client.siteRollback({
+        site: config.site,
+        to,
+        expectedCurrent: err.current
+      });
+    }
     if (options.json) {
       emitJson6(
         buildEnvelope("rollback", true, {
@@ -1489,7 +1651,12 @@ async function rollback(options, deps = {}) {
   } catch (err) {
     const { code, message } = wrapProxyError("rollback", err);
     if (options.json) {
-      emitJson6(buildErrorEnvelope("rollback", code, message));
+      const envelope = buildErrorEnvelope("rollback", code, message);
+      if (err instanceof AliasDriftError) {
+        emitJson6({ ...envelope, current: err.current });
+      } else {
+        emitJson6(envelope);
+      }
     } else {
       error(message);
     }
@@ -1849,7 +2016,7 @@ function outputError(ctx, code, message, issues) {
 }
 
 // src/cli.ts
-var version = true ? "0.5.0" : "0.0.0";
+var version = true ? "0.6.0" : "0.0.0";
 function handleActionError(command, json, err) {
   const ctx = { json, command };
   const message = err instanceof Error ? err.message : "unknown error";

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@freecodecamp/universe-cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "main": "dist/index.js",
   "scripts": {
     "test": "vitest run",
+    "test:smoke": "UNIVERSE_E2E_REAL=1 vitest run tests/e2e/smoke-real-artemis.test.ts",
     "build": "tsup",
     "lint": "oxlint src tests",
     "typecheck": "tsc --noEmit",