@ranger1/dx 0.1.84 → 0.1.85

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

@@ -38,6 +38,17 @@ function resolveVerifyConfig(verifyConfig = {}) {
         healthCheckConfig.timeoutSeconds == null
           ? 10
           : requirePositiveInteger(healthCheckConfig.timeoutSeconds, 'verify.healthCheck.timeoutSeconds'),
+      maxWaitSeconds:
+        healthCheckConfig.maxWaitSeconds == null
+          ? 24
+          : requirePositiveInteger(healthCheckConfig.maxWaitSeconds, 'verify.healthCheck.maxWaitSeconds'),
+      retryIntervalSeconds:
+        healthCheckConfig.retryIntervalSeconds == null
+          ? 2
+          : requirePositiveInteger(
+              healthCheckConfig.retryIntervalSeconds,
+              'verify.healthCheck.retryIntervalSeconds',
+            ),
     },
   }
 }

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

@@ -28,6 +28,7 @@ export function parseRemoteResult({ stdout = '', stderr = '', exitCode = 0 }) {
       message: 'ok',
       rollbackAttempted: false,
       rollbackSucceeded: null,
+      summary: null,
     }
   }
 
@@ -38,5 +39,6 @@ export function parseRemoteResult({ stdout = '', stderr = '', exitCode = 0 }) {
     message,
     rollbackAttempted: false,
     rollbackSucceeded: null,
+    summary: null,
   }
 }

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

@@ -32,6 +32,8 @@ export function buildRemoteDeployScript(phaseModel = []) {
   const shouldMigrate = deploy.prismaMigrateDeploy !== false && deploy.skipMigration !== true
   const healthCheckUrl = healthCheck?.url ? String(healthCheck.url) : ''
   const healthCheckTimeoutSeconds = Number(healthCheck?.timeoutSeconds || 10)
+  const healthCheckMaxWaitSeconds = Number(healthCheck?.maxWaitSeconds || 24)
+  const healthCheckRetryIntervalSeconds = Number(healthCheck?.retryIntervalSeconds || 2)
 
   return `#!/usr/bin/env bash
 set -euo pipefail
@@ -55,6 +57,8 @@ SERVICE_NAME=${escapeShell(serviceName)}
 START_ENTRY=${escapeShell(startupEntry)}
 HEALTHCHECK_URL=${escapeShell(healthCheckUrl)}
 HEALTHCHECK_TIMEOUT_SECONDS=${healthCheckTimeoutSeconds}
+HEALTHCHECK_MAX_WAIT_SECONDS=${healthCheckMaxWaitSeconds}
+HEALTHCHECK_RETRY_DELAY_SECONDS=${healthCheckRetryIntervalSeconds}
 KEEP_RELEASES=${keepReleases}
 SHOULD_GENERATE=${shouldGenerate ? '1' : '0'}
 SHOULD_MIGRATE=${shouldMigrate ? '1' : '0'}
@@ -82,6 +86,7 @@ emit_result() {
   local message="$3"
   local rollback_attempted="$4"
   local rollback_succeeded="$5"
+  local summary_json="\${6:-null}"
   if [[ "$RESULT_EMITTED" -eq 1 ]]; then
     return
   fi
@@ -89,8 +94,8 @@ emit_result() {
   message="\${message//\\\\/\\\\\\\\}"
   message="\${message//\"/\\\\\"}"
   message="\${message//$'\\n'/\\\\n}"
-  printf 'DX_REMOTE_RESULT={"ok":%s,"phase":"%s","message":"%s","rollbackAttempted":%s,"rollbackSucceeded":%s}\\n' \\
-    "$ok" "$phase" "$message" "$rollback_attempted" "$rollback_succeeded"
+  printf 'DX_REMOTE_RESULT={"ok":%s,"phase":"%s","message":"%s","rollbackAttempted":%s,"rollbackSucceeded":%s,"summary":%s}\\n' \\
+    "$ok" "$phase" "$message" "$rollback_attempted" "$rollback_succeeded" "$summary_json"
 }
 
 cleanup() {
@@ -189,6 +194,16 @@ run_with_env() {
   )
 }
 
+json_escape() {
+  local value="\${1-}"
+  value="\${value//\\\\/\\\\\\\\}"
+  value="\${value//\"/\\\\\"}"
+  value="\${value//$'\\n'/\\\\n}"
+  value="\${value//$'\\r'/\\\\r}"
+  value="\${value//$'\\t'/\\\\t}"
+  printf '%s' "$value"
+}
+
 read_pm2_env_var() {
   local key="$1"
   pm2 jlist | node -e '
@@ -200,6 +215,32 @@ read_pm2_env_var() {
   ' "$key" "$SERVICE_NAME"
 }
 
+read_pm2_status() {
+  pm2 jlist | node -e '
+    const fs = require("node:fs")
+    const list = JSON.parse(fs.readFileSync(0, "utf8"))
+    const app = list.find(item => item?.name === process.argv[1])
+    process.stdout.write(String(app?.pm2_env?.status || ""))
+  ' "$SERVICE_NAME"
+}
+
+build_summary_json() {
+  local release_name="$1"
+  local current_release_path="$2"
+  local service_status="$3"
+  local app_env="$4"
+  local node_env="$5"
+  local health_url="$6"
+  printf '{"releaseName":"%s","currentRelease":"%s","serviceName":"%s","serviceStatus":"%s","appEnv":"%s","nodeEnv":"%s","healthUrl":"%s"}' \
+    "$(json_escape "$release_name")" \
+    "$(json_escape "$current_release_path")" \
+    "$(json_escape "$SERVICE_NAME")" \
+    "$(json_escape "$service_status")" \
+    "$(json_escape "$app_env")" \
+    "$(json_escape "$node_env")" \
+    "$(json_escape "$health_url")"
+}
+
 attempt_pm2_restore() {
   if [[ -z "$PREVIOUS_CURRENT_TARGET" || ! -e "$PREVIOUS_CURRENT_TARGET/$ECOSYSTEM_CONFIG" ]]; then
     ROLLBACK_SUCCEEDED=false
@@ -366,6 +407,7 @@ if [[ "$START_MODE" == "pm2" ]]; then
     exit 1
   fi
 
+  pm2_service_status="$(read_pm2_status)"
   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
@@ -382,9 +424,20 @@ if [[ "$START_MODE" == "pm2" ]]; then
 fi
 
 if [[ -n "$HEALTHCHECK_URL" ]]; then
-  curl -fsS --max-time "$HEALTHCHECK_TIMEOUT_SECONDS" "$HEALTHCHECK_URL" >/dev/null
+  healthcheck_started_at="$(date +%s)"
+  until curl -fsS --max-time "$HEALTHCHECK_TIMEOUT_SECONDS" "$HEALTHCHECK_URL" >/dev/null; do
+    healthcheck_elapsed_seconds=$(( $(date +%s) - healthcheck_started_at ))
+    if [[ "$healthcheck_elapsed_seconds" -ge "$HEALTHCHECK_MAX_WAIT_SECONDS" ]]; then
+      echo "health check failed within $HEALTHCHECK_MAX_WAIT_SECONDS seconds: $HEALTHCHECK_URL" >&2
+      exit 1
+    fi
+    sleep "$HEALTHCHECK_RETRY_DELAY_SECONDS"
+  done
 fi
 
+summary_service_status="\${pm2_service_status:-direct-attached}"
+summary_json="$(build_summary_json "$VERSION_NAME" "$current_release" "$summary_service_status" "$EXPECTED_APP_ENV" "$EXPECTED_NODE_ENV" "$HEALTHCHECK_URL")"
+
 CURRENT_PHASE="cleanup"
 echo "DX_REMOTE_PHASE=cleanup"
 release_count=0
@@ -402,6 +455,6 @@ done < <(
   fi
 )
 
-emit_result true "cleanup" "ok" false null
+emit_result true "cleanup" "ok" false null "$summary_json"
 `
 }

package/lib/backend-artifact-deploy.js

@@ -1,6 +1,30 @@
 import { buildBackendArtifact } from './backend-artifact-deploy/artifact-builder.js'
 import { resolveBackendDeployConfig } from './backend-artifact-deploy/config.js'
 import { deployBackendArtifactRemotely } from './backend-artifact-deploy/remote-transport.js'
+import { logger as defaultLogger } from './logger.js'
+
+function printSuccessfulDeploySummary(result, logger) {
+  const summary = result?.summary
+  if (!summary) return
+
+  logger.success(`后端部署成功: ${summary.releaseName || 'unknown-release'}`)
+  if (summary.currentRelease) {
+    logger.info(`[deploy-summary] current=${summary.currentRelease}`)
+  }
+  if (summary.serviceName || summary.serviceStatus) {
+    logger.info(
+      `[deploy-summary] service=${summary.serviceName || 'unknown'} status=${summary.serviceStatus || 'unknown'}`,
+    )
+  }
+  if (summary.appEnv || summary.nodeEnv) {
+    logger.info(
+      `[deploy-summary] APP_ENV=${summary.appEnv || '<empty>'} NODE_ENV=${summary.nodeEnv || '<empty>'}`,
+    )
+  }
+  if (summary.healthUrl) {
+    logger.info(`[deploy-summary] health=${summary.healthUrl}`)
+  }
+}
 
 export async function runBackendArtifactDeploy({
   cli,
@@ -9,6 +33,7 @@ export async function runBackendArtifactDeploy({
   environment,
   deps = {},
 }) {
+  const logger = deps.logger || defaultLogger
   const resolveConfig = deps.resolveConfig || resolveBackendDeployConfig
   const buildArtifact = deps.buildArtifact || buildBackendArtifact
   const deployRemotely =
@@ -28,5 +53,9 @@ export async function runBackendArtifactDeploy({
     return bundle
   }
 
-  return deployRemotely(config, bundle, deps)
+  const result = await deployRemotely(config, bundle, deps)
+  if (result?.ok) {
+    printSuccessfulDeploySummary(result, logger)
+  }
+  return result
 }

package/package.json

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