@ranger1/dx 0.1.83 → 0.1.84

package/lib/backend-artifact-deploy/config.js

@@ -16,6 +16,32 @@ function requirePositiveInteger(value, fieldPath) {
   return parsed
 }
 
+function resolveVerifyConfig(verifyConfig = {}) {
+  const healthCheckConfig = verifyConfig?.healthCheck
+  if (healthCheckConfig == null) {
+    return {
+      healthCheck: null,
+    }
+  }
+
+  const url = requireString(healthCheckConfig.url, 'verify.healthCheck.url')
+  try {
+    new URL(url)
+  } catch {
+    throw new Error(`缺少必填配置: verify.healthCheck.url`)
+  }
+
+  return {
+    healthCheck: {
+      url,
+      timeoutSeconds:
+        healthCheckConfig.timeoutSeconds == null
+          ? 10
+          : requirePositiveInteger(healthCheckConfig.timeoutSeconds, 'verify.healthCheck.timeoutSeconds'),
+    },
+  }
+}
+
 function resolveBuildCommand(buildConfig, environment) {
   if (buildConfig?.commands && typeof buildConfig.commands === 'object') {
     const selected = buildConfig.commands[environment]
@@ -55,6 +81,7 @@ export function resolveBackendDeployConfig({ cli, targetConfig, environment, fla
   const remoteConfig = deployConfig.remote || null
   const startupConfig = deployConfig.startup || {}
   const runConfig = deployConfig.deploy || {}
+  const verifyConfig = deployConfig.verify || {}
   const buildOnly = Boolean(flags.buildOnly)
   const startupMode = String(startupConfig.mode || 'pm2').trim()
   const prismaGenerate = runConfig.prismaGenerate !== false
@@ -117,6 +144,7 @@ export function resolveBackendDeployConfig({ cli, targetConfig, environment, fla
       prismaMigrateDeploy,
       skipMigration: Boolean(flags.skipMigration),
     },
+    verify: resolveVerifyConfig(verifyConfig),
   }
 
   if (!['pm2', 'direct'].includes(normalized.startup.mode)) {

package/lib/backend-artifact-deploy/remote-phases.js

@@ -8,6 +8,7 @@ export function createRemotePhaseModel(payload) {
     { phase: 'prisma-migrate', payload },
     { phase: 'switch-current', payload },
     { phase: 'startup', payload },
+    { phase: 'verify', payload },
     { phase: 'cleanup', payload },
   ]
 }

package/lib/backend-artifact-deploy/remote-script.js

@@ -8,7 +8,11 @@ export function buildRemoteDeployScript(phaseModel = []) {
   const runtime = payload.runtime || {}
   const startup = payload.startup || {}
   const deploy = payload.deploy || {}
+  const verify = payload.verify || {}
+  const healthCheck = verify.healthCheck || null
   const environment = String(payload.environment || 'production')
+  const expectedAppEnv = environment
+  const expectedNodeEnv = environment === 'development' ? 'development' : 'production'
   const baseDir = String(remote.baseDir || '.')
   const releaseDir = `${baseDir}/releases/${payload.versionName || 'unknown'}`
   const currentLink = `${baseDir}/current`
@@ -26,6 +30,8 @@ export function buildRemoteDeployScript(phaseModel = []) {
   const keepReleases = Number(deploy.keepReleases || 5)
   const shouldGenerate = deploy.prismaGenerate !== false
   const shouldMigrate = deploy.prismaMigrateDeploy !== false && deploy.skipMigration !== true
+  const healthCheckUrl = healthCheck?.url ? String(healthCheck.url) : ''
+  const healthCheckTimeoutSeconds = Number(healthCheck?.timeoutSeconds || 10)
 
   return `#!/usr/bin/env bash
 set -euo pipefail
@@ -36,6 +42,8 @@ ARCHIVE=${escapeShell(uploadedBundlePath)}
 RELEASE_DIR=${escapeShell(releaseDir)}
 CURRENT_LINK=${escapeShell(currentLink)}
 ENV_NAME=${escapeShell(environment)}
+EXPECTED_APP_ENV=${escapeShell(expectedAppEnv)}
+EXPECTED_NODE_ENV=${escapeShell(expectedNodeEnv)}
 ENV_FILE_NAME=${escapeShell(envFileName)}
 ENV_LOCAL_FILE_NAME=${escapeShell(envLocalFileName)}
 PRISMA_SCHEMA=${escapeShell(prismaSchema)}
@@ -45,6 +53,8 @@ INSTALL_COMMAND=${escapeShell(installCommand)}
 START_MODE=${escapeShell(startupMode)}
 SERVICE_NAME=${escapeShell(serviceName)}
 START_ENTRY=${escapeShell(startupEntry)}
+HEALTHCHECK_URL=${escapeShell(healthCheckUrl)}
+HEALTHCHECK_TIMEOUT_SECONDS=${healthCheckTimeoutSeconds}
 KEEP_RELEASES=${keepReleases}
 SHOULD_GENERATE=${shouldGenerate ? '1' : '0'}
 SHOULD_MIGRATE=${shouldMigrate ? '1' : '0'}
@@ -174,10 +184,22 @@ run_with_env() {
   shift
   (
     cd "$cwd"
-    APP_ENV="$ENV_NAME" "$DOTENV_BIN" -o -e "$ENV_FILE_NAME" -e "$ENV_LOCAL_FILE_NAME" -- "$@"
+    APP_ENV="$EXPECTED_APP_ENV" NODE_ENV="$EXPECTED_NODE_ENV" \\
+      "$DOTENV_BIN" -o -e "$ENV_FILE_NAME" -e "$ENV_LOCAL_FILE_NAME" -- "$@"
   )
 }
 
+read_pm2_env_var() {
+  local key="$1"
+  pm2 jlist | node -e '
+    const fs = require("node:fs")
+    const key = process.argv[1]
+    const list = JSON.parse(fs.readFileSync(0, "utf8"))
+    const app = list.find(item => item?.name === process.argv[2])
+    process.stdout.write(String(app?.pm2_env?.[key] || ""))
+  ' "$key" "$SERVICE_NAME"
+}
+
 attempt_pm2_restore() {
   if [[ -z "$PREVIOUS_CURRENT_TARGET" || ! -e "$PREVIOUS_CURRENT_TARGET/$ECOSYSTEM_CONFIG" ]]; then
     ROLLBACK_SUCCEEDED=false
@@ -185,7 +207,8 @@ attempt_pm2_restore() {
   fi
   if (
     cd "$PREVIOUS_CURRENT_TARGET"
-    APP_ENV="$ENV_NAME" "$DOTENV_BIN" -o -e "$ENV_FILE_NAME" -e "$ENV_LOCAL_FILE_NAME" -- \\
+    APP_ENV="$EXPECTED_APP_ENV" NODE_ENV="$EXPECTED_NODE_ENV" \\
+      "$DOTENV_BIN" -o -e "$ENV_FILE_NAME" -e "$ENV_LOCAL_FILE_NAME" -- \\
       pm2 start "$ECOSYSTEM_CONFIG" --only "$SERVICE_NAME" --update-env
     pm2 save
   ); then
@@ -291,7 +314,8 @@ if [[ "$START_MODE" == "pm2" ]]; then
   if ! (
     cd "$CURRENT_LINK"
     pm2 delete "$SERVICE_NAME" || true
-    APP_ENV="$ENV_NAME" "$DOTENV_BIN" -o -e "$ENV_FILE_NAME" -e "$ENV_LOCAL_FILE_NAME" -- \\
+    APP_ENV="$EXPECTED_APP_ENV" NODE_ENV="$EXPECTED_NODE_ENV" \\
+      "$DOTENV_BIN" -o -e "$ENV_FILE_NAME" -e "$ENV_LOCAL_FILE_NAME" -- \\
       pm2 start "$ECOSYSTEM_CONFIG" --only "$SERVICE_NAME" --update-env
     pm2 save
   ); then
@@ -306,7 +330,8 @@ if [[ "$START_MODE" == "pm2" ]]; then
 else
   if ! (
     cd "$CURRENT_LINK"
-    APP_ENV="$ENV_NAME" "$DOTENV_BIN" -o -e "$ENV_FILE_NAME" -e "$ENV_LOCAL_FILE_NAME" -- \\
+    APP_ENV="$EXPECTED_APP_ENV" NODE_ENV="$EXPECTED_NODE_ENV" \\
+      "$DOTENV_BIN" -o -e "$ENV_FILE_NAME" -e "$ENV_LOCAL_FILE_NAME" -- \\
       node "$START_ENTRY"
   ); then
     emit_result false "startup" "direct startup failed" false null
@@ -316,6 +341,50 @@ else
   exit 0
 fi
 
+CURRENT_PHASE="verify"
+echo "DX_REMOTE_PHASE=verify"
+if [[ ! -L "$CURRENT_LINK" ]]; then
+  echo "current 软链接不存在: $CURRENT_LINK" >&2
+  exit 1
+fi
+
+current_release="$(readlink -f "$CURRENT_LINK")"
+expected_release="$(readlink -f "$RELEASE_DIR")"
+if [[ -z "$current_release" || ! -d "$current_release" ]]; then
+  echo "current 软链接未指向有效目录: \${current_release:-<empty>}" >&2
+  exit 1
+fi
+if [[ "$current_release" != "$expected_release" ]]; then
+  echo "current 软链接未指向本次 release: expected=$expected_release actual=$current_release" >&2
+  exit 1
+fi
+
+if [[ "$START_MODE" == "pm2" ]]; then
+  if ! pm2 describe "$SERVICE_NAME" >/dev/null 2>&1; then
+    echo "PM2 进程不存在: $SERVICE_NAME" >&2
+    pm2 list || true
+    exit 1
+  fi
+
+  pm2_app_env="$(read_pm2_env_var APP_ENV)"
+  if [[ "$pm2_app_env" != "$EXPECTED_APP_ENV" ]]; then
+    echo "APP_ENV 不匹配，期望=$EXPECTED_APP_ENV，实际=\${pm2_app_env:-<empty>}" >&2
+    pm2 describe "$SERVICE_NAME" || true
+    exit 1
+  fi
+
+  pm2_node_env="$(read_pm2_env_var NODE_ENV)"
+  if [[ "$pm2_node_env" != "$EXPECTED_NODE_ENV" ]]; then
+    echo "NODE_ENV 不匹配，期望=$EXPECTED_NODE_ENV，实际=\${pm2_node_env:-<empty>}" >&2
+    pm2 describe "$SERVICE_NAME" || true
+    exit 1
+  fi
+fi
+
+if [[ -n "$HEALTHCHECK_URL" ]]; then
+  curl -fsS --max-time "$HEALTHCHECK_TIMEOUT_SECONDS" "$HEALTHCHECK_URL" >/dev/null
+fi
+
 CURRENT_PHASE="cleanup"
 echo "DX_REMOTE_PHASE=cleanup"
 release_count=0

package/lib/backend-artifact-deploy/remote-transport.js

@@ -100,6 +100,7 @@ function createRemotePayload(config, bundle) {
     },
     startup: config.startup,
     deploy: config.deploy,
+    verify: config.verify,
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ranger1/dx",
-  "version": "0.1.83",
+  "version": "0.1.84",
   "type": "module",
   "license": "MIT",
   "repository": {