@xiashe/sdk 0.1.17 → 0.1.18

package/alipayWallet.mjs

@@ -12,6 +12,13 @@ const SENSITIVE_USER_OUTPUT = /payment[-_ ]?proof|payment[-_ ]?needed|seller_sig
 const DEFAULT_STATE_DIR = path.join(os.homedir(), '.xiashe', 'alipay-402');
 const OFFICIAL_MEDIA_EXTENSIONS = new Set(['.png', '.jpg', '.jpeg', '.webp']);
 const MAX_OFFICIAL_MEDIA_BYTES = 8 * 1024 * 1024;
+const SAFE_OFFICIAL_FAILURE_CODES = new Set([
+  'TRADE_PROGRESS_FAILED',
+  'PAYMENT_NEEDED_REJECTED',
+  'SYSTEM_ERROR',
+  'BUYER_IDENTITY_REJECTED',
+  'WALLET_NOT_READY'
+]);
 
 export class AlipayWalletError extends Error {
   constructor(code, message, options = {}) {
@@ -230,6 +237,81 @@ function walletFailureCode(stdout, stderr, exitCode) {
   return Number.isInteger(exitCode) && exitCode !== 0 ? 'official_cli_nonzero_exit' : 'official_cli_unclassified';
 }
 
+/**
+ * The official wallet can return useful machine error codes alongside protocol
+ * material. Expose only a small allow-list: arbitrary vendor output can carry
+ * credentials, URLs, trade identifiers, or PayGuard internals.
+ */
+function safeOfficialFailureCode(stdout, stderr) {
+  const output = `${stdout}\n${stderr}`;
+  const candidate = output.match(/(?:"(?:errorCode|code)"|\b(?:errorCode|code)\b)\s*[:=]\s*["']?([A-Z][A-Z0-9_]{2,80})/i)?.[1]?.toUpperCase() || '';
+  return SAFE_OFFICIAL_FAILURE_CODES.has(candidate) ? candidate : null;
+}
+
+function paymentFailureDiagnosis(failureCode, stdout, stderr) {
+  const officialCode = safeOfficialFailureCode(stdout, stderr);
+  const base = {
+    code: failureCode,
+    stage: 'official_wallet_trade_creation',
+    nextStep: '不要重复付款；保留诊断代码和本次 attemptId 以便定位。'
+  };
+  if (failureCode === 'payment_needed_rejected') {
+    return {
+      ...base,
+      stage: 'alipay_bill_validation',
+      nextStep: '核对支付宝平台中该 APPID 的应用公钥、service_id、收款方 2088 seller_id 和线上接入状态；修复后必须创建新订单再测试。',
+      ...(officialCode ? { officialCode } : {})
+    };
+  }
+  if (failureCode === 'wallet_runtime_not_supported') {
+    return {
+      ...base,
+      stage: 'agent_runtime_identity',
+      nextStep: '当前运行时没有通过支付宝 Agent 身份校验；请换用已被官方钱包识别并已授权的本地 Agent 运行时。',
+      ...(officialCode ? { officialCode } : {})
+    };
+  }
+  if (failureCode === 'buyer_identity_rejected') {
+    return {
+      ...base,
+      stage: 'buyer_identity_validation',
+      nextStep: '支付宝钱包的买家身份未通过校验；完成钱包授权后，用同一受支持运行时创建新订单。',
+      ...(officialCode ? { officialCode } : {})
+    };
+  }
+  if (failureCode === 'wallet_not_ready') {
+    return {
+      ...base,
+      stage: 'wallet_authorization',
+      nextStep: '支付宝钱包未完成授权或未启用；先完成官方钱包授权，再创建新订单。',
+      ...(officialCode ? { officialCode } : {})
+    };
+  }
+  if (failureCode === 'wallet_network_error') {
+    return {
+      ...base,
+      stage: 'wallet_network',
+      nextStep: '钱包或网络请求没有完成；先检查网络，再创建新订单。',
+      ...(officialCode ? { officialCode } : {})
+    };
+  }
+  return {
+    ...base,
+    ...(officialCode ? { officialCode } : {})
+  };
+}
+
+function paymentFailureUserVisible(diagnosis) {
+  const lines = [
+    '支付宝付款未创建可确认交易。',
+    `诊断代码：${diagnosis.code}`,
+    `失败阶段：${diagnosis.stage}`,
+    ...(diagnosis.officialCode ? [`官方返回代码：${diagnosis.officialCode}`] : []),
+    `下一步：${diagnosis.nextStep}`
+  ];
+  return lines.join('\n');
+}
+
 function paymentMessage(status) {
   if (status === 'completed') return '支付宝钱包显示本次付款已完成；正在由服务端确认权益。';
   if (status === 'pending_confirmation') return '支付宝已发起本次付款确认；请打开支付宝 App 完成确认，然后运行 status。';
@@ -285,6 +367,7 @@ function publicPaymentResult(state, status, diagnostic, options = {}) {
   const commandFailed = options.commandFailed === true;
   const failureCode = options.failureCode || 'official_cli_nonzero_exit';
   const failed = status === 'failed' || status === 'wallet_command_failed';
+  const diagnosis = failed ? options.diagnosis : null;
   return {
     ok: !failed,
     status,
@@ -293,7 +376,8 @@ function publicPaymentResult(state, status, diagnostic, options = {}) {
     walletInvoked: true,
     message: failed ? paymentFailureMessage(failureCode) : paymentMessage(status),
     diagnostic,
-    ...(options.userVisible ? { userVisible: options.userVisible } : {}),
+    ...(failed && diagnosis ? { userVisible: paymentFailureUserVisible(diagnosis), diagnosis } : {}),
+    ...(!failed && options.userVisible ? { userVisible: options.userVisible } : {}),
     ...(options.officialMedia ? { officialMedia: options.officialMedia } : {}),
     ...(status === 'pending_confirmation'
       ? { confirmation: { source: 'official_alipay_wallet', surface: 'app_or_official_media', required: true } }
@@ -392,9 +476,11 @@ export async function payAlipay402Resource(input, options = {}) {
   await writePaymentState(state, options);
   if (status === 'completed') await rm(paths.paymentNeededPath, { force: true });
   const failed = commandFailed || status === 'failed';
+  const failureCode = failed ? walletFailureCode(walletInvocation.stdout, walletInvocation.stderr, walletInvocation.exitCode) : undefined;
   return publicPaymentResult(state, status, result.diagnostic, {
     commandFailed: failed,
-    failureCode: failed ? walletFailureCode(walletInvocation.stdout, walletInvocation.stderr, walletInvocation.exitCode) : undefined,
+    failureCode,
+    diagnosis: failed ? paymentFailureDiagnosis(failureCode, walletInvocation.stdout, walletInvocation.stderr) : undefined,
     userVisible: ['pending_confirmation', 'completed'].includes(status)
       ? userVisibleWalletOutput(walletInvocation.stdout, walletInvocation.stderr)
       : null,
@@ -440,9 +526,11 @@ export async function queryAlipay402Resource(input, options = {}) {
     await rm(paymentNeededPath, { force: true });
   }
   const failed = commandFailed || status === 'failed';
+  const failureCode = failed ? walletFailureCode(walletInvocation.stdout, walletInvocation.stderr, walletInvocation.exitCode) : undefined;
   return publicPaymentResult(state, status, result.diagnostic, {
     commandFailed: failed,
-    failureCode: failed ? walletFailureCode(walletInvocation.stdout, walletInvocation.stderr, walletInvocation.exitCode) : undefined,
+    failureCode,
+    diagnosis: failed ? paymentFailureDiagnosis(failureCode, walletInvocation.stdout, walletInvocation.stderr) : undefined,
     userVisible: ['pending_confirmation', 'completed'].includes(status)
       ? userVisibleWalletOutput(walletInvocation.stdout, walletInvocation.stderr)
       : null,

package/index.mjs

@@ -6,7 +6,7 @@ import path from 'node:path';
 import { ConvexHttpClient } from 'convex/browser';
 import { anyApi as api } from 'convex/server';
 
-export const VERSION = '0.1.17';
+export const VERSION = '0.1.18';
 
 export const DEFAULTS = {
   cn: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiashe/sdk",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "type": "module",
   "main": "index.mjs",
   "exports": {