@ranger1/dx 0.1.107 → 0.1.109

package/README.md

@@ -463,6 +463,7 @@ SSH 认证说明：
 - `dx deploy backend` 当前直接调用系统 `ssh` / `scp`，不会单独解析 `sshKey`、`identityFile` 之类的 dx 配置项。
 - 因此，发布使用哪把私钥，取决于本机 OpenSSH 的默认认证行为，例如 `ssh-agent`、`~/.ssh/config`、默认私钥文件等。
 - 如果你已经在 `~/.ssh/config` 中配置了主机别名（例如 `Host ai-staging`），推荐直接把 `backendDeploy.remote.host` 写成这个别名，让 OpenSSH 自动匹配对应的 `HostName`、`User`、`Port`、`IdentityFile`。
+- `backendDeploy.remote` 可以保持旧的单远端对象；也可以按环境拆成 `remote.staging` / `remote.production`，此时 `dx deploy backend --staging` 与 `dx deploy backend --prod` 会选择对应环境的远端。
 
 例如本机 `~/.ssh/config`：
 
@@ -494,6 +495,34 @@ Host ai-staging
 }
 ```
 
+按环境区分远端时：
+
+```json
+{
+  "deploy": {
+    "backend": {
+      "internal": "backend-artifact-deploy",
+      "backendDeploy": {
+        "remote": {
+          "staging": {
+            "host": "ai-staging",
+            "port": 22,
+            "user": "deploy",
+            "baseDir": "/srv/example-app"
+          },
+          "production": {
+            "host": "ai-ubuntu-prod",
+            "port": 22,
+            "user": "deploy",
+            "baseDir": "/srv/example-app"
+          }
+        }
+      }
+    }
+  }
+}
+```
+
 注意：
 
 - `remote.host` 写成别名后，dx 仍会显式传入 `remote.user` 和 `remote.port`；如果这两个值与 `~/.ssh/config` 中的 `User` / `Port` 不一致，命令行参数会覆盖 SSH config。

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

@@ -16,6 +16,36 @@ function requirePositiveInteger(value, fieldPath) {
   return parsed
 }
 
+function requireEnvName(value, fieldPath) {
+  const name = requireString(value, fieldPath)
+  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) {
+    throw new Error(`缺少必填配置: ${fieldPath}`)
+  }
+  return name
+}
+
+function resolveHealthCheckEndpoint(healthCheckConfig) {
+  if (healthCheckConfig.url != null) {
+    const url = requireString(healthCheckConfig.url, 'verify.healthCheck.url')
+    try {
+      new URL(url)
+    } catch {
+      throw new Error(`缺少必填配置: verify.healthCheck.url`)
+    }
+    return { url }
+  }
+
+  if (healthCheckConfig.envPort != null) {
+    const rawPath = healthCheckConfig.path == null ? '/health' : requireString(healthCheckConfig.path, 'verify.healthCheck.path')
+    return {
+      envPort: requireEnvName(healthCheckConfig.envPort, 'verify.healthCheck.envPort'),
+      path: rawPath.startsWith('/') ? rawPath : `/${rawPath}`,
+    }
+  }
+
+  throw new Error(`缺少必填配置: verify.healthCheck.url`)
+}
+
 function resolveVerifyConfig(verifyConfig = {}) {
   const healthCheckConfig = verifyConfig?.healthCheck
   if (healthCheckConfig == null) {
@@ -24,16 +54,9 @@ function resolveVerifyConfig(verifyConfig = {}) {
     }
   }
 
-  const url = requireString(healthCheckConfig.url, 'verify.healthCheck.url')
-  try {
-    new URL(url)
-  } catch {
-    throw new Error(`缺少必填配置: verify.healthCheck.url`)
-  }
-
   return {
     healthCheck: {
-      url,
+      ...resolveHealthCheckEndpoint(healthCheckConfig),
       timeoutSeconds:
         healthCheckConfig.timeoutSeconds == null
           ? 10
@@ -80,6 +103,22 @@ function requireRemoteBaseDir(value, fieldPath) {
   return baseDir.replace(/\/+$/, '') || '/'
 }
 
+function resolveRemoteConfig(remoteConfig, environment) {
+  if (!remoteConfig || typeof remoteConfig !== 'object') {
+    return null
+  }
+
+  if (typeof remoteConfig.host === 'string') {
+    return remoteConfig
+  }
+
+  const selected = remoteConfig[environment]
+  if (!selected || typeof selected !== 'object') {
+    throw new Error(`缺少必填配置: remote.${environment}`)
+  }
+  return selected
+}
+
 export function resolveBackendDeployConfig({ cli, targetConfig, environment, flags = {} }) {
   const deployConfig = targetConfig?.backendDeploy
   if (!deployConfig || typeof deployConfig !== 'object') {
@@ -89,7 +128,7 @@ export function resolveBackendDeployConfig({ cli, targetConfig, environment, fla
   const buildConfig = deployConfig.build || {}
   const runtimeConfig = deployConfig.runtime || {}
   const artifactConfig = deployConfig.artifact || {}
-  const remoteConfig = deployConfig.remote || null
+  const remoteConfig = resolveRemoteConfig(deployConfig.remote, environment)
   const startupConfig = deployConfig.startup || {}
   const runConfig = deployConfig.deploy || {}
   const verifyConfig = deployConfig.verify || {}

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 shouldSeed = deploy.prismaSeed === true
   const healthCheckUrl = healthCheck?.url ? String(healthCheck.url) : ''
+  const healthCheckEnvPort = healthCheck?.envPort ? String(healthCheck.envPort) : ''
+  const healthCheckPath = healthCheck?.path ? String(healthCheck.path) : ''
   const healthCheckTimeoutSeconds = Number(healthCheck?.timeoutSeconds || 10)
   const healthCheckMaxWaitSeconds = Number(healthCheck?.maxWaitSeconds || 24)
   const healthCheckRetryIntervalSeconds = Number(healthCheck?.retryIntervalSeconds || 2)
@@ -57,6 +59,8 @@ START_MODE=${escapeShell(startupMode)}
 SERVICE_NAME=${escapeShell(serviceName)}
 START_ENTRY=${escapeShell(startupEntry)}
 HEALTHCHECK_URL=${escapeShell(healthCheckUrl)}
+HEALTHCHECK_ENV_PORT=${escapeShell(healthCheckEnvPort)}
+HEALTHCHECK_PATH=${escapeShell(healthCheckPath)}
 HEALTHCHECK_TIMEOUT_SECONDS=${healthCheckTimeoutSeconds}
 HEALTHCHECK_MAX_WAIT_SECONDS=${healthCheckMaxWaitSeconds}
 HEALTHCHECK_RETRY_DELAY_SECONDS=${healthCheckRetryIntervalSeconds}
@@ -226,6 +230,34 @@ read_pm2_status() {
   ' "$SERVICE_NAME"
 }
 
+resolve_healthcheck_url() {
+  if [[ -n "$HEALTHCHECK_URL" ]]; then
+    printf '%s\n' "$HEALTHCHECK_URL"
+    return
+  fi
+
+  if [[ -z "$HEALTHCHECK_ENV_PORT" ]]; then
+    return
+  fi
+
+  local healthcheck_port
+  healthcheck_port="$(run_with_env "$CURRENT_LINK" env | awk -F= -v key="$HEALTHCHECK_ENV_PORT" '$1 == key { print substr($0, index($0, "=") + 1); exit }')"
+  if ! [[ "$healthcheck_port" =~ ^[0-9]+$ ]]; then
+    echo "health check port env $HEALTHCHECK_ENV_PORT is missing or invalid" >&2
+    exit 1
+  fi
+
+  if [[ -z "$HEALTHCHECK_PATH" ]]; then
+    HEALTHCHECK_PATH="/health"
+  fi
+  if [[ "$HEALTHCHECK_PATH" != /* ]]; then
+    HEALTHCHECK_PATH="/$HEALTHCHECK_PATH"
+  fi
+
+  HEALTHCHECK_URL="http://127.0.0.1:\${healthcheck_port}\${HEALTHCHECK_PATH}"
+  printf '%s\n' "$HEALTHCHECK_URL"
+}
+
 build_summary_json() {
   local release_name="$1"
   local current_release_path="$2"
@@ -436,6 +468,8 @@ if [[ "$START_MODE" == "pm2" ]]; then
   fi
 fi
 
+HEALTHCHECK_URL="$(resolve_healthcheck_url)"
+
 if [[ -n "$HEALTHCHECK_URL" ]]; then
   healthcheck_started_at="$(date +%s)"
   until curl -fsS --max-time "$HEALTHCHECK_TIMEOUT_SECONDS" "$HEALTHCHECK_URL" >/dev/null; do

package/package.json

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