@xiashe/sdk 0.1.12 → 0.1.13

package/alipayWallet.mjs

@@ -8,6 +8,7 @@ const DEFAULT_TIMEOUT_MS = 8 * 60 * 1000;
 const RESOURCE_FETCH_TIMEOUT_MS = 20 * 1000;
 const MAX_OUTPUT_BYTES = 32 * 1024;
 const SENSITIVE_OUTPUT = /payment[-_ ]?proof|payment[-_ ]?needed|seller_signature|runtimeToken|authorization\s*:/i;
+const SENSITIVE_USER_OUTPUT = /payment[-_ ]?proof|payment[-_ ]?needed|seller_signature|runtimeToken|authorization\s*:|trade[_ -]?no|交易(?:流水)?号|out[_ -]?shake|client[_ -]?session/i;
 const DEFAULT_STATE_DIR = path.join(os.homedir(), '.xiashe', 'alipay-402');
 
 export class AlipayWalletError extends Error {
@@ -65,7 +66,7 @@ function statePaths(resourceUrl, options = {}) {
   const directory = stateDirectory(options);
   return {
     directory,
-    paymentNeededPath: path.join(directory, `${base}.payment-needed`),
+    paymentNeededPath: path.join(directory, `${base}.txt`),
     statePath: path.join(directory, `${base}.json`)
   };
 }
@@ -118,8 +119,12 @@ function defaultRunFile(command, args, options) {
 }
 
 function normalizedRunnerResult(result) {
-  if (typeof result === 'string') return { stdout: result, stderr: '' };
-  return { stdout: String(result?.stdout || ''), stderr: String(result?.stderr || '') };
+  if (typeof result === 'string') return { stdout: result, stderr: '', exitCode: 0 };
+  return {
+    stdout: String(result?.stdout || ''),
+    stderr: String(result?.stderr || ''),
+    exitCode: Number.isInteger(result?.exitCode) ? result.exitCode : 0
+  };
 }
 
 async function runOfficialCli(args, options = {}) {
@@ -140,6 +145,16 @@ async function runOfficialCli(args, options = {}) {
     if (error?.killed || error?.signal === 'SIGTERM') {
       throw new AlipayWalletError('ALIPAY_WALLET_TIMEOUT', '支付宝钱包等待确认超时；请用同一支付命令的 status 查询状态。');
     }
+    // The official buyer CLI can use a non-zero process exit for a user-action
+    // state such as “payment pending”. Preserve this invocation's output for
+    // the caller to parse before classifying it as a real command failure.
+    if (Number.isInteger(error?.code)) {
+      return {
+        stdout: String(error.stdout || ''),
+        stderr: String(error.stderr || ''),
+        exitCode: error.code
+      };
+    }
     throw new AlipayWalletError('ALIPAY_WALLET_COMMAND_FAILED', '支付宝官方钱包未完成该操作。');
   }
 }
@@ -169,6 +184,27 @@ function paymentStatusFromOutput(stdout, stderr) {
   };
 }
 
+function userVisibleWalletOutput(stdout, stderr) {
+  const lines = `${stdout}\n${stderr}`
+    .replace(/\u001B\[[0-?]*[ -/]*[@-~]/g, '')
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter((line) => line && !SENSITIVE_USER_OUTPUT.test(line))
+    .slice(0, 12);
+  return lines.length ? lines.join('\n').slice(0, 1_200) : null;
+}
+
+function walletFailureCode(stdout, stderr, exitCode) {
+  const output = `${stdout}\n${stderr}`;
+  if (/余额不足|insufficient\s+balance/i.test(output)) return 'insufficient_balance';
+  if (/已过期|过期|expired/i.test(output)) return 'payment_expired';
+  if (/钱包.*(?:未开启|未授权)|wallet.*(?:not\s+enabled|not\s+authorized)/i.test(output)) return 'wallet_not_ready';
+  if (/买家.*(?:不匹配|校验失败)|buyer.*(?:mismatch|identity)/i.test(output)) return 'buyer_identity_rejected';
+  if (/账单.*(?:无效|签名)|签名.*(?:无效|失败)|bill.*(?:invalid|signature)/i.test(output)) return 'payment_needed_rejected';
+  if (/network|网络|timeout|超时/i.test(output)) return 'wallet_network_error';
+  return Number.isInteger(exitCode) && exitCode !== 0 ? 'official_cli_nonzero_exit' : 'official_cli_unclassified';
+}
+
 function paymentMessage(status) {
   if (status === 'completed') return '支付宝钱包显示本次付款已完成；正在由服务端确认权益。';
   if (status === 'pending_confirmation') return '支付宝已发起本次付款确认；请打开支付宝 App 完成确认，然后运行 status。';
@@ -207,15 +243,20 @@ async function fetchPaymentNeeded(resourceUrl, options = {}) {
   }
 }
 
-function publicPaymentResult(state, status, diagnostic) {
+function publicPaymentResult(state, status, diagnostic, options = {}) {
+  const commandFailed = options.commandFailed === true;
   return {
-    ok: status !== 'failed',
+    ok: status !== 'failed' && status !== 'wallet_command_failed',
     status,
     provider: 'alipay-agent-payment',
     attemptId: `alipay-402:${state.resourceDigest.slice(0, 16)}`,
     walletInvoked: true,
-    message: paymentMessage(status),
-    diagnostic
+    message: status === 'wallet_command_failed'
+      ? '支付宝官方钱包没有生成可确认的付款状态；未授予付费 Skill 权益。'
+      : paymentMessage(status),
+    diagnostic,
+    ...(options.userVisible ? { userVisible: options.userVisible } : {}),
+    ...(commandFailed ? { failureCode: options.failureCode || 'official_cli_nonzero_exit' } : {})
   };
 }
 
@@ -286,20 +327,28 @@ export async function payAlipay402Resource(input, options = {}) {
   };
   await writePaymentState(state, options);
 
-  const { stdout, stderr } = await runOfficialCli([
+  const walletInvocation = await runOfficialCli([
     '402-buyer-pay',
     '--session-id', state.sessionId,
     '--file', state.paymentNeededPath,
     '--resource-url', resourceUrl,
     '--intent-summary', intentSummary
   ], options);
-  const result = paymentStatusFromOutput(stdout, stderr);
-  state.status = result.status;
+  const result = paymentStatusFromOutput(walletInvocation.stdout, walletInvocation.stderr);
+  const commandFailed = walletInvocation.exitCode !== 0 && result.status === 'unknown';
+  const status = commandFailed ? 'wallet_command_failed' : result.status;
+  state.status = status;
   state.queryCredential = result.credential;
   state.updatedAt = new Date().toISOString();
   await writePaymentState(state, options);
-  if (result.status === 'completed') await rm(paths.paymentNeededPath, { force: true });
-  return publicPaymentResult(state, result.status, result.diagnostic);
+  if (status === 'completed') await rm(paths.paymentNeededPath, { force: true });
+  return publicPaymentResult(state, status, result.diagnostic, {
+    commandFailed,
+    failureCode: commandFailed ? walletFailureCode(walletInvocation.stdout, walletInvocation.stderr, walletInvocation.exitCode) : undefined,
+    userVisible: ['pending_confirmation', 'completed', 'failed'].includes(status)
+      ? userVisibleWalletOutput(walletInvocation.stdout, walletInvocation.stderr)
+      : null
+  });
 }
 
 /** Queries an existing local payment attempt using the official query credential. */
@@ -319,19 +368,27 @@ export async function queryAlipay402Resource(input, options = {}) {
   const queryArg = state.queryCredential.type === 'out_shake_no'
     ? ['--out-shake-no', state.queryCredential.value]
     : ['-t', state.queryCredential.value];
-  const { stdout, stderr } = await runOfficialCli([
+  const walletInvocation = await runOfficialCli([
     '402-query-payment-status',
     ...queryArg,
     '--resource-url', resourceUrl
   ], options);
-  const result = paymentStatusFromOutput(stdout, stderr);
-  state.status = result.status;
+  const result = paymentStatusFromOutput(walletInvocation.stdout, walletInvocation.stderr);
+  const commandFailed = walletInvocation.exitCode !== 0 && result.status === 'unknown';
+  const status = commandFailed ? 'wallet_command_failed' : result.status;
+  state.status = status;
   state.queryCredential = result.credential || state.queryCredential;
   state.updatedAt = new Date().toISOString();
   await writePaymentState(state, options);
-  if (result.status === 'completed') {
+  if (status === 'completed') {
     const { paymentNeededPath } = statePaths(resourceUrl, options);
     await rm(paymentNeededPath, { force: true });
   }
-  return publicPaymentResult(state, result.status, result.diagnostic);
+  return publicPaymentResult(state, status, result.diagnostic, {
+    commandFailed,
+    failureCode: commandFailed ? walletFailureCode(walletInvocation.stdout, walletInvocation.stderr, walletInvocation.exitCode) : undefined,
+    userVisible: ['pending_confirmation', 'completed', 'failed'].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.12';
+export const VERSION = '0.1.13';
 
 export const DEFAULTS = {
   cn: {

package/package.json

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