@cedarjs/cli 8.0.0-canary.3431 → 8.0.0-canary.3434

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -13,7 +13,7 @@ import {
   PROCESS_META_DIR_NAME
 } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
-import { getConfig, getPaths } from "../../../lib/index.js";
+import { getPaths } from "../../../lib/index.js";
 import { MONITOR_ADAPTERS, MONITORS, isMonitor } from "./monitors.js";
 const CONFIG_FILENAME = "deploy.toml";
 const DOCS_URL = "https://cedarjs.com/docs/deploy/baremetal";
@@ -142,25 +142,8 @@ const API_PROCESS_META_FILES = GENERATED_DATA_DIRS.map(
     API_PROCESS_META_FILE_NAME
   ].join("/")
 );
-const API_SERVER_DIST_DIRS = [
-  "node_modules/@cedarjs/api-server/dist",
-  "api/node_modules/@cedarjs/api-server/dist"
-].map((dir) => `${CURRENT_RELEASE_SYMLINK_NAME}/${dir}`);
-const releaseWritesApiProcessMeta = async (ssh, serverConfig) => {
-  try {
-    await ssh.exec(serverConfig.path, "grep", [
-      "-rqs",
-      "writeApiProcessMeta",
-      ...API_SERVER_DIST_DIRS
-    ]);
-    return true;
-  } catch (e) {
-    if (typeof e === "object" && e !== null && "exitCode" in e && (e.exitCode === 1 || e.exitCode === 2)) {
-      return false;
-    }
-    throw e;
-  }
-};
+class ApiProcessMetaMissingError extends Error {
+}
 const readApiProcessMeta = async (ssh, serverConfig) => {
   const [preferredFile, fallbackFile] = API_PROCESS_META_FILES;
   let contents = "";
@@ -173,8 +156,11 @@ const readApiProcessMeta = async (ssh, serverConfig) => {
       fallbackFile
     ]);
     contents = result.stdout;
-  } catch {
-    throw new Error(
+  } catch (e) {
+    if (typeof e !== "object" || e === null || !("exitCode" in e) || e.exitCode !== 1) {
+      throw e;
+    }
+    throw new ApiProcessMetaMissingError(
       `The api server hasn't written ${preferredFile} yet. It does that once it's listening.`
     );
   }
@@ -217,24 +203,13 @@ const waitForHealthCheck = async ({
   const deadline = Date.now() + timeoutSeconds * 1e3;
   let lastFailure = "";
   let keepTrying = true;
-  let writesApiProcessMeta;
-  const apiProcessMeta = async () => {
-    try {
-      return await readApiProcessMeta(ssh, serverConfig);
-    } catch (e) {
-      writesApiProcessMeta ??= await releaseWritesApiProcessMeta(
-        ssh,
-        serverConfig
-      );
-      if (writesApiProcessMeta) {
-        throw e;
-      }
-      return { port: getConfig().api.port, host: "" };
-    }
-  };
+  let apiProcessMetaMissing = false;
   while (keepTrying) {
     try {
-      const url = "url" in target ? target.url : apiServerUrl(await apiProcessMeta(), target.apiPath);
+      const url = "url" in target ? target.url : apiServerUrl(
+        await readApiProcessMeta(ssh, serverConfig),
+        target.apiPath
+      );
       await ssh.exec(serverConfig.path, "curl", [
         "--fail",
         "--location",
@@ -248,6 +223,7 @@ const waitForHealthCheck = async ({
       ]);
       return;
     } catch (e) {
+      apiProcessMetaMissing = e instanceof ApiProcessMetaMissingError;
       lastFailure = e instanceof Error ? e.message : String(e);
       onFailedAttempt?.(lastFailure);
     }
@@ -260,6 +236,12 @@ const waitForHealthCheck = async ({
     [
       `Health check failed: ${describeHealthCheckTarget(target)} did not respond successfully within ${timeoutSeconds} seconds of restarting the ${serverConfig.processNames?.join(", ")} process(es).`,
       `Last attempt: ${lastFailure}`,
+      // TODO: Remove this hint in the next major. By then the releases kept
+      // on servers have had plenty of time to all be built with a Cedar
+      // version that writes the process meta file
+      ...apiProcessMetaMissing ? [
+        "Releases built with a Cedar version from before the api server wrote this file never write it. This includes a release you rolled back to from before you upgraded Cedar. Set `healthCheckUrl` in deploy.toml to check such a release."
+      ] : [],
       "",
       ...nextSteps,
       `If your app serves its health check somewhere else, set \`healthCheckUrl\` in deploy.toml. Set it to \`false\` to skip the check. See ${DOCS_URL}#health-check`
@@ -979,6 +961,7 @@ const handler = async (yargs) => {
   }
 };
 export {
+  ApiProcessMetaMissingError,
   DEFAULT_SERVER_CONFIG,
   RELEASE_DIR_PATTERN,
   apiServerUrl,
@@ -994,7 +977,6 @@ export {
   manifestAssetFiles,
   parseConfig,
   readApiProcessMeta,
-  releaseWritesApiProcessMeta,
   rollbackTasks,
   serverConfigWithDefaults,
   throwMissingConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "8.0.0-canary.3431",
+  "version": "8.0.0-canary.3434",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.10",
     "@babel/types": "7.29.8",
-    "@cedarjs/api-server": "8.0.0-canary.3431",
-    "@cedarjs/babel-config": "8.0.0-canary.3431",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3431",
-    "@cedarjs/internal": "8.0.0-canary.3431",
-    "@cedarjs/prerender": "8.0.0-canary.3431",
-    "@cedarjs/project-config": "8.0.0-canary.3431",
-    "@cedarjs/structure": "8.0.0-canary.3431",
-    "@cedarjs/telemetry": "8.0.0-canary.3431",
-    "@cedarjs/utils": "8.0.0-canary.3431",
-    "@cedarjs/vite": "8.0.0-canary.3431",
-    "@cedarjs/web-server": "8.0.0-canary.3431",
+    "@cedarjs/api-server": "8.0.0-canary.3434",
+    "@cedarjs/babel-config": "8.0.0-canary.3434",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3434",
+    "@cedarjs/internal": "8.0.0-canary.3434",
+    "@cedarjs/prerender": "8.0.0-canary.3434",
+    "@cedarjs/project-config": "8.0.0-canary.3434",
+    "@cedarjs/structure": "8.0.0-canary.3434",
+    "@cedarjs/telemetry": "8.0.0-canary.3434",
+    "@cedarjs/utils": "8.0.0-canary.3434",
+    "@cedarjs/vite": "8.0.0-canary.3434",
+    "@cedarjs/web-server": "8.0.0-canary.3434",
     "@listr2/prompt-adapter-enquirer": "4.4.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "2.12.0",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3431",
+    "@cedarjs/framework-tools": "8.0.0-canary.3434",
     "@prisma/dmmf": "7.10.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.80.0",