@alipay/alipay-aipay 1.7.0 → 1.7.2

package/skill-pre/references/onboarding/modules/scripts/network_retry.sh

@@ -0,0 +1,135 @@
+#!/bin/bash
+
+# Source after error_handler.sh. This wrapper never changes MCP argv or business JSON.
+
+NETWORK_RETRY_CLASS=""
+NETWORK_DISPATCH_STATE=""
+NETWORK_ATTEMPTS=0
+
+network_retry_is_local_transport_error() {
+  printf '%s' "$1" | grep -Eqi \
+    'network[ _]error|网络连接失败|could not resolve host|name or service not known|nodename nor servname|connection refused|failed to connect|fetch failed|socket hang up|econn(refused|reset)|enotfound|eai_again|etimedout|(^|[^[:alpha:]])timeout([^[:alpha:]]|$)|timed out|tls[^[:cntrl:]]*(error|failed|failure)|network access[^[:cntrl:]]*(denied|blocked)[^[:cntrl:]]*before connection'
+}
+
+network_retry_is_not_sent() {
+  printf '%s' "$1" | grep -Eqi \
+    'could not resolve host|name or service not known|nodename nor servname|connection refused|network access[^[:cntrl:]]*(denied|blocked)[^[:cntrl:]]*before connection'
+}
+
+network_retry_is_explicit_network_restriction() {
+  printf '%s' "$1" | grep -Eqi \
+    'network access[^[:cntrl:]]*(denied|blocked)[^[:cntrl:]]*before connection'
+}
+
+network_retry_emit_exhausted() {
+  local action_name="$1" classification="$2" dispatch="$3" attempt="$4" evidence="$5"
+  local recovery="NONE"
+  if network_retry_is_local_transport_error "$evidence"; then
+    recovery="RETRY_WITH_NETWORK"
+  fi
+  echo "ALIPAY_AIPAY_INTERNAL:NETWORK_RETRY_EXHAUSTED=${action_name}:${classification}:${dispatch}:${attempt}:${recovery}" >&2
+}
+
+run_network_retry() {
+  local result_var="$1" operation="$2" action_name="$3"
+  shift 3
+  [ "${1:-}" = "--" ] || { echo "NETWORK_RETRY_ERROR:缺少 -- 参数分隔符" >&2; return 64; }
+  shift
+  [ "$#" -gt 0 ] || { echo "NETWORK_RETRY_ERROR:缺少命令 argv" >&2; return 64; }
+  case "$operation" in read|write) ;; *) echo "NETWORK_RETRY_ERROR:operation 必须为 read 或 write" >&2; return 64 ;; esac
+
+  local max_retries="${NETWORK_RETRY_MAX_RETRIES:-2}"
+  local delay_seconds="${NETWORK_RETRY_DELAY_SECONDS:-3}"
+  local attempt=0 stdout_file stderr_file stdout stderr combined result_payload rc classification transient dispatch
+  stdout_file=$(mktemp "${TMPDIR:-/tmp}/alipay-aipay-stdout.XXXXXX") || return 1
+  stderr_file=$(mktemp "${TMPDIR:-/tmp}/alipay-aipay-stderr.XXXXXX") || { rm -f "$stdout_file"; return 1; }
+  chmod 600 "$stdout_file" "$stderr_file" 2>/dev/null || true
+  trap 'rm -f "$stdout_file" "$stderr_file"; trap - RETURN' RETURN
+
+  while true; do
+    attempt=$((attempt + 1))
+    : > "$stdout_file"
+    : > "$stderr_file"
+    "$@" >"$stdout_file" 2>"$stderr_file"
+    rc=$?
+    stdout=$(cat "$stdout_file")
+    stderr=$(cat "$stderr_file")
+    combined=$(printf '%s\n%s' "$stdout" "$stderr")
+    classification=""
+    transient=false
+    dispatch="MAYBE_SENT"
+
+    if type alipay_cli_has_local_state_permission_error >/dev/null 2>&1 &&
+       alipay_cli_has_local_state_permission_error "$combined"; then
+      NETWORK_RETRY_CLASS="CLI_LOCAL_FS_PERMISSION"
+      NETWORK_DISPATCH_STATE="MAYBE_SENT"
+      NETWORK_ATTEMPTS="$attempt"
+      printf -v "$result_var" '%s' "$stdout"
+      if [ "$operation" = "read" ]; then
+        if [ "${ALIPAY_AIPAY_SUPPRESS_LOCAL_FS_RETRY_MARKER:-0}" != "1" ]; then
+          emit_control "CLI_FLOW:RETRY_WITH_LOCAL_FS_PERMISSION"
+        fi
+        return "${ALIPAY_CLI_LOCAL_STATE_PERMISSION_EXIT_CODE:-77}"
+      fi
+      return 75
+    fi
+
+    local stdout_is_business_json=false unwrapped_stdout=""
+    if [ -n "$stdout" ]; then
+      classification=$(detect_error "$stdout" 2>/dev/null || true)
+      unwrapped_stdout=$(unwrap_mcp "$stdout" 2>/dev/null || true)
+      if printf '%s' "$unwrapped_stdout" | jq -e . >/dev/null 2>&1; then
+        stdout_is_business_json=true
+      fi
+      # 合法业务 JSON 始终以 stdout 为准。普通启动日志会被 detect_error 归为
+      # CLI_ERROR；此时仍须检查 stderr，避免真实连接失败被非空 stdout 掩盖。
+      if [ "$stdout_is_business_json" != true ] && [ "$rc" -ne 0 ] && [ -n "$stderr" ]; then
+        classification=$(detect_error "$stderr" 2>/dev/null || true)
+      fi
+    elif [ -n "$stderr" ]; then
+      classification=$(detect_error "$stderr" 2>/dev/null || true)
+    fi
+
+    case "$classification" in
+      MCP_SERVICE_ERROR|SERVICE_UNSTABLE) transient=true ;;
+      *)
+        if [ "$stdout_is_business_json" != true ] && { [ "$rc" -ne 0 ] || [ -n "$stderr" ]; } && network_retry_is_local_transport_error "$stderr"; then
+          classification="LOCAL_TRANSPORT_ERROR"
+          transient=true
+        fi
+        ;;
+    esac
+
+    if network_retry_is_not_sent "$stderr"; then
+      dispatch="NOT_SENT"
+    fi
+
+    NETWORK_RETRY_CLASS="$classification"
+    NETWORK_DISPATCH_STATE="$dispatch"
+    NETWORK_ATTEMPTS="$attempt"
+    result_payload="$stdout"
+    if [ "$stdout_is_business_json" != true ] && [ "$rc" -ne 0 ] && [ -n "$stderr" ]; then
+      result_payload="$stderr"
+    fi
+    printf -v "$result_var" '%s' "$result_payload"
+
+    if [ "$transient" != true ]; then
+      return 0
+    fi
+
+    if [ "$operation" = "write" ] && [ "$dispatch" != "NOT_SENT" ]; then
+      return 75
+    fi
+
+    if network_retry_is_explicit_network_restriction "$combined"; then
+      network_retry_emit_exhausted "$action_name" "$classification" "$dispatch" "$attempt" "$combined"
+      return 76
+    fi
+
+    if [ "$attempt" -gt "$max_retries" ]; then
+      network_retry_emit_exhausted "$action_name" "$classification" "$dispatch" "$attempt" "$combined"
+      return 76
+    fi
+    sleep "$delay_seconds"
+  done
+}

package/skill-pre/references/onboarding/modules/scripts/query_sign_status.sh

@@ -0,0 +1,105 @@
+#!/bin/bash
+#=============================================================================
+# 脚本名称: query_sign_status.sh
+# 功能描述: 查询签约状态并根据结果判断后续流程
+# 调用位置: Step 3.1 状态与资源查询
+# 调用前置: 脚本通过 error_handler.sh 间接初始化 DEV_TOOL_NAME/PLATFORM_ID；需传入 --sales-code，或兼容使用 SALES_CODE 环境变量
+# 用法: bash query_sign_status.sh --sales-code <code> [--product-type aipay|webpay|apppay]
+# 返回值: 在 stderr 输出签约状态控制信号；stdout 只保留受控错误正文
+#           SIGN_STATUS=NOT_SIGNED | SIGN_STATUS=SIGNED_EFFECTIVE | SIGN_STATUS=SIGN_SUBMITTED | SIGN_STATUS=OTHER_STATUS
+#           AI 按量付费:   FLOW:AI_PAY_NOT_SIGNED | FLOW:AI_PAY_SIGNED
+#           AI 网页应用收款:   FLOW:PC_WEB_NOT_SIGNED  | FLOW:PC_WEB_SIGNED
+#           AI 移动应用收款:    FLOW:APP_NOT_SIGNED     | FLOW:APP_SIGNED
+#=============================================================================
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# 一次性 source error_handler（含 unwrap_mcp）
+if [ -f "${SCRIPT_DIR}/error_handler.sh" ]; then
+  source "${SCRIPT_DIR}/error_handler.sh"
+else
+  echo "❌ 缺少错误处理脚本: ${SCRIPT_DIR}/error_handler.sh"
+  exit 1
+fi
+source "${SCRIPT_DIR}/network_retry.sh"
+source "${SCRIPT_DIR}/sign_status_parser.sh"
+
+require_command jq || exit 1
+require_command alipay-cli || exit 1
+
+export PRODUCT_TYPE="${PRODUCT_TYPE:-unknown}"
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --sales-code)
+      [ $# -ge 2 ] || { echo "❌ 缺少参数值: $1"; exit 1; }
+      SALES_CODE="$2"; shift 2 ;;
+    --product-type)
+      [ $# -ge 2 ] || { echo "❌ 缺少参数值: $1"; exit 1; }
+      PRODUCT_TYPE="$2"; shift 2 ;;
+    *)
+      echo "❌ 未知参数: $1"
+      echo "用法: bash query_sign_status.sh --sales-code <code> [--product-type aipay|webpay|apppay]"
+      exit 1 ;;
+  esac
+done
+
+if [ -z "$SALES_CODE" ]; then
+  echo "❌ 缺少 salesCode（请传入 --sales-code，或设置 SALES_CODE 环境变量）"
+  exit 1
+fi
+
+case "$SALES_CODE" in
+  "I1080300001000160457")
+    EXPECTED_PRODUCT_TYPE="aipay"
+    ;;
+  "I1080300001000041203")
+    EXPECTED_PRODUCT_TYPE="webpay"
+    ;;
+  "I1080300001000041313")
+    EXPECTED_PRODUCT_TYPE="apppay"
+    ;;
+  *)
+    echo "❌ 未知 SALES_CODE: ${SALES_CODE}"
+    exit 1
+    ;;
+esac
+
+if [ "$PRODUCT_TYPE" != "unknown" ] && [ "$PRODUCT_TYPE" != "$EXPECTED_PRODUCT_TYPE" ]; then
+  echo "❌ PRODUCT_TYPE 与 SALES_CODE 不匹配：PRODUCT_TYPE=${PRODUCT_TYPE}, SALES_CODE=${SALES_CODE}"
+  echo "📋 期望 PRODUCT_TYPE=${EXPECTED_PRODUCT_TYPE}"
+  exit 1
+fi
+
+init_alipay_cli_product "$EXPECTED_PRODUCT_TYPE" || exit 1
+
+# 查询签约状态
+require_alipay_cli_local_state_access_or_emit || exit "$?"
+export PLATFORM="${DEV_TOOL_NAME}" PLATFORM_ID="${PLATFORM_ID:-}"
+run_network_retry RESULT read query_sign_status -- alipay-cli mcp call ar-query.queryArInfosBySalesProd \
+  -d "{\"request\":{\"salesProductCodes\":[\"${SALES_CODE}\"]},\"ctx\":{}}" \
+  --json
+RETRY_RC=$?
+if [ "$RETRY_RC" -eq "${ALIPAY_CLI_LOCAL_STATE_PERMISSION_EXIT_CODE:-77}" ]; then
+  exit "$RETRY_RC"
+fi
+if [ "$RETRY_RC" -ne 0 ]; then
+  echo "❌ 签约状态查询因网络或服务异常在自动重试两次后仍未恢复"
+  exit 1
+fi
+
+# 错误检测
+if ! handle_error "$RESULT" "MCP_AUTHENTICATED_CALL"; then
+  exit 1
+fi
+
+# 解包 MCP 信封后解析业务字段
+BUSINESS=$(unwrap_mcp "$RESULT")
+
+# 只有明确返回数组才可判断签约状态；缺少字段必须阻断，避免误判为未签约。
+if ! SIGN_STATUS_OUTPUT=$(emit_sign_status_from_business "$BUSINESS" "$SALES_CODE"); then
+  echo "❌ 签约状态返回结构异常，无法解析 arInfoList"
+  exit 1
+fi
+printf '%s\n' "$SIGN_STATUS_OUTPUT" \
+  | while IFS= read -r marker; do emit_control "$marker"; done