@alipay/ams-checkout 2.0.19 → 2.0.21

package/esm/plugin/component/channel.d.ts

@@ -32,7 +32,7 @@ export declare class ApplePaySdk {
      */
     private paymentStatus;
     /**
-     * @description oncancel 原因标记，用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止
+     * @description oncancel 原因标记，用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止/超时
      */
     private cancelReason;
     private logger;
@@ -40,7 +40,7 @@ export declare class ApplePaySdk {
     private shipping?;
     private merchantAmount;
     private merchantCurrency;
-    private onBeforeConfirm?;
+    private onBeforeConfirm;
     constructor({ paymentSessionData, parseData, logger, env, shipping, merchantAmount, merchantCurrency, }: {
         paymentSessionData: string;
         parseData: IPaymentSessionMetaData;

package/esm/plugin/component/channel.js

@@ -17,7 +17,7 @@ import { getDoubleFaUrlFromSession } from "../../foundation/utils/web_app_url_ut
 import { getApplePayPaymentSession, submitPayInfo } from "../../service";
 import { EnvironmentEnum } from "../../types";
 import { device, isEmpty } from "../../util";
-import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../util/beforeConfirm";
+import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS, MERCHANT_CONFIRM_ABORT_CODE, MERCHANT_CONFIRM_TIMEOUT_CODE } from "../../util/beforeConfirm";
 import { APPLE_PAY_RECURRING_VERSION, APPLE_PAY_VERSION } from "../applepay/interface";
 var APPLEPAYERRORENUM = /*#__PURE__*/function (APPLEPAYERRORENUM) {
   APPLEPAYERRORENUM["APPLE_PAY_MISSING_DATA"] = "APPLE_PAY_MISSING_DATA";
@@ -155,7 +155,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
      */
     _defineProperty(this, "paymentStatus", void 0);
     /**
-     * @description oncancel 原因标记，用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止
+     * @description oncancel 原因标记，用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止/超时
      */
     _defineProperty(this, "cancelReason", null);
     _defineProperty(this, "logger", void 0);
@@ -163,7 +163,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     _defineProperty(this, "shipping", void 0);
     _defineProperty(this, "merchantAmount", void 0);
     _defineProperty(this, "merchantCurrency", void 0);
-    _defineProperty(this, "onBeforeConfirm", void 0);
+    _defineProperty(this, "onBeforeConfirm", null);
     this.paymentSessionData = paymentSessionData;
     this.parseData = parseData;
     this.env = env;
@@ -213,6 +213,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
         try {
           if (!_this.session) return;
           _this.paymentStatus = PAYMENT_STATUS.PENDING;
+          _this.cancelReason = 'USER_CANCEL';
           _this.session.onvalidatemerchant = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(event) {
               var requestParams, res, merchantSession, _this$logger, _this$logger2;
@@ -282,7 +283,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
           }();
           _this.session.onpaymentauthorized = /*#__PURE__*/function () {
             var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(event) {
-              var exception, _event$payment, token, billingContact, shippingContact, _this$parseData, obj, _this$parseData$payme, requiredBillingContactFields, requiredShippingContactFields, _this$logger3, _this$logger4, _this$logger6, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue, _this$logger5, _this$session2, _this$session2$comple, _this$logger7, _this$session3, _this$session3$comple, res, _this$logger8;
+              var exception, _event$payment, token, billingContact, shippingContact, _this$parseData, obj, _this$parseData$payme, requiredBillingContactFields, requiredShippingContactFields, _this$logger3, _this$logger4, _this$logger6, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue, isTimeout, _this$logger5, _this$session2, _this$session2$comple, _this$logger7, _this$session3, _this$session3$comple, res, _this$logger8;
               return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                 while (1) switch (_context3.prev = _context3.next) {
                   case 0:
@@ -323,26 +324,25 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                     _context3.next = 39;
                     break;
                   case 11:
-                    // 清空回原始状态
-                    _this.cancelReason = 'USER_CANCEL';
                     (_this$logger4 = _this.logger) === null || _this$logger4 === void 0 || _this$logger4.logInfo({
                       title: 'sdk_before_confirm_start'
                     }, {
                       paymentMethodType: 'APPLEPAY',
                       path: 'applePay_chrome_sdk'
                     });
-                    _context3.prev = 13;
+                    _context3.prev = 12;
                     startTime = Date.now();
-                    _context3.next = 17;
+                    _context3.next = 16;
                     return executeWithTimeout(function () {
                       return _this.onBeforeConfirm();
                     });
-                  case 17:
+                  case 16:
                     _yield$executeWithTim = _context3.sent;
                     rawResult = _yield$executeWithTim.result;
                     timedOut = _yield$executeWithTim.timedOut;
                     shouldContinue = rawResult;
-                    if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+                    isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS;
+                    if (isTimeout) {
                       (_this$logger5 = _this.logger) === null || _this$logger5 === void 0 || _this$logger5.logError({
                         title: 'sdk_before_confirm_timeout'
                       });
@@ -357,11 +357,11 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                       _context3.next = 29;
                       break;
                     }
-                    _this.cancelReason = 'MERCHANT_ABORT';
+                    _this.cancelReason = isTimeout ? 'MERCHANT_TIMEOUT' : 'MERCHANT_ABORT';
                     (_this$session2 = _this.session) === null || _this$session2 === void 0 || (_this$session2$comple = _this$session2.completePayment) === null || _this$session2$comple === void 0 || _this$session2$comple.call(_this$session2, window.ApplePaySession.STATUS_FAILURE);
                     _this.abortSession();
                     reject({
-                      errorCode: 'MERCHANT_CONFIRM_ABORT'
+                      errorCode: isTimeout ? MERCHANT_CONFIRM_TIMEOUT_CODE : MERCHANT_CONFIRM_ABORT_CODE
                     });
                     return _context3.abrupt("return");
                   case 29:
@@ -369,7 +369,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                     break;
                   case 31:
                     _context3.prev = 31;
-                    _context3.t0 = _context3["catch"](13);
+                    _context3.t0 = _context3["catch"](12);
                     (_this$logger7 = _this.logger) === null || _this$logger7 === void 0 || _this$logger7.logError({
                       title: 'sdk_before_confirm_error'
                     }, {
@@ -381,7 +381,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                     (_this$session3 = _this.session) === null || _this$session3 === void 0 || (_this$session3$comple = _this$session3.completePayment) === null || _this$session3$comple === void 0 || _this$session3$comple.call(_this$session3, window.ApplePaySession.STATUS_FAILURE);
                     _this.abortSession();
                     reject({
-                      errorCode: 'MERCHANT_CONFIRM_ABORT'
+                      errorCode: MERCHANT_CONFIRM_ABORT_CODE
                     });
                     return _context3.abrupt("return");
                   case 39:
@@ -402,7 +402,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                   case "end":
                     return _context3.stop();
                 }
-              }, _callee3, null, [[13, 31]]);
+              }, _callee3, null, [[12, 31]]);
             }));
             return function (_x2) {
               return _ref3.apply(this, arguments);
@@ -420,10 +420,10 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                 title: 'a3753.b103030.c386485.d507498'
               });
             }
-            // cancelReason === 'MERCHANT_ABORT': onBeforeConfirm 返回 false 或异常，由商户主动中止
-            // 其他：用户主动取消付款界面
+            // cancelReason 标识 onBeforeConfirm 主动中止/超时；其他情况视为用户主动取消付款界面
+            var merchantCancelErrorCode = _this.cancelReason === 'MERCHANT_TIMEOUT' ? MERCHANT_CONFIRM_TIMEOUT_CODE : MERCHANT_CONFIRM_ABORT_CODE;
             reject({
-              errorCode: _this.cancelReason === 'MERCHANT_ABORT' ? 'MERCHANT_CONFIRM_ABORT' : APPLEPAYERRORENUM.APPLE_PAY_CANCEL
+              errorCode: _this.cancelReason === 'MERCHANT_ABORT' || _this.cancelReason === 'MERCHANT_TIMEOUT' ? merchantCancelErrorCode : APPLEPAYERRORENUM.APPLE_PAY_CANCEL
             });
           };
           _this.session.begin();

package/esm/plugin/component/index.js

@@ -156,24 +156,28 @@ var ComponentApp = /*#__PURE__*/function () {
       var securitySDK = this.AMSSDK._getSecuritySDKByProductScene({
         product: product
       });
-      if (!securitySDK) {
-        this.AMSSDK.logger.logInfo({
-          title: 'sdk_event_securitySdkInit'
+      if (securitySDK) {
+        // Already ready
+        return;
+      }
+
+      // Use _newSecuritySDKByScene which handles loading/ready/failed states internally
+      this.AMSSDK.logger.logInfo({
+        title: 'sdk_event_securitySdkInit'
+      });
+      this.AMSSDK._newSecuritySDKByScene({
+        product: product
+      }, function () {
+        _this.AMSSDK.logger.logInfo({
+          title: 'sdk_event_securitySdkInitSuccess'
         });
-        this.AMSSDK._newSecuritySDKByScene({
-          product: product
-        }, function () {
-          _this.AMSSDK.logger.logInfo({
-            title: 'sdk_event_securitySdkInitSuccess'
-          });
-        }, function () {
-          _this.AMSSDK.logger.logError({
-            title: 'sdk_error_securitySdkInitFailed'
-          }, {
-            sign: 'SDK internal initialization'
-          });
+      }, function () {
+        _this.AMSSDK.logger.logError({
+          title: 'sdk_error_securitySdkInitFailed'
+        }, {
+          sign: 'SDK internal initialization'
         });
-      }
+      });
     }
   }, {
     key: "logDeviceId",
@@ -208,36 +212,39 @@ var ComponentApp = /*#__PURE__*/function () {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 productScene = (_this2$_renderParams = _this2._renderParams) === null || _this2$_renderParams === void 0 || (_this2$_renderParams = _this2$_renderParams.paymentSessionMetaData) === null || _this2$_renderParams === void 0 || (_this2$_renderParams = _this2$_renderParams.paymentSessionConfig) === null || _this2$_renderParams === void 0 ? void 0 : _this2$_renderParams.productScene;
-                getDeviceIdStartTime = Date.now();
-                securitySDK = _this2.AMSSDK._getSecuritySDKByProductScene({
+                getDeviceIdStartTime = Date.now(); // Use async version to handle loading state
+                _context.next = 4;
+                return _this2.AMSSDK._awaitSecuritySDKByProductScene({
                   product: (deviceIdParameter === null || deviceIdParameter === void 0 ? void 0 : deviceIdParameter.productScene) || productScene
                 });
+              case 4:
+                securitySDK = _context.sent;
                 deviceId = '';
                 if (!securitySDK) {
-                  _context.next = 16;
+                  _context.next = 18;
                   break;
                 }
                 if (!(isPolling && parseInt(deviceIdParameter === null || deviceIdParameter === void 0 ? void 0 : deviceIdParameter.tokenCollectTime) > 0)) {
-                  _context.next = 11;
+                  _context.next = 13;
                   break;
                 }
-                _context.next = 8;
+                _context.next = 10;
                 return securitySDK.pollingGetApdidToken(deviceIdParameter);
-              case 8:
+              case 10:
                 _context.t0 = _context.sent;
-                _context.next = 14;
+                _context.next = 16;
                 break;
-              case 11:
-                _context.next = 13;
-                return securitySDK.getApdidToken();
               case 13:
+                _context.next = 15;
+                return securitySDK.getApdidToken();
+              case 15:
                 _context.t0 = _context.sent;
-              case 14:
+              case 16:
                 deviceId = _context.t0;
                 _this2.logDeviceId(deviceId, getDeviceIdStartTime);
-              case 16:
+              case 18:
                 resolve(deviceId);
-              case 17:
+              case 19:
               case "end":
                 return _context.stop();
             }

package/esm/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.58.9"
+      "packageVersion": "7.58.11"
     }
   ]
 }

package/esm/types/index.d.ts

@@ -8,7 +8,7 @@
 import type { AxiosHeaderValue } from 'axios';
 import { IApplePayContactField } from '../plugin/applepay/interface';
 export type onChange = () => onCnageResult;
-export { type IElementOptions, ElementType, PaymentElementLayout, ThemeType } from '../core/component/element/type';
+export { ElementType, PaymentElementLayout, ThemeType, type IElementOptions } from '../core/component/element/type';
 interface onCnageResult {
     complete: boolean;
     addressValue: AddressItem[];
@@ -40,6 +40,7 @@ export interface IoptionsParams {
     networkMode?: string;
     mode?: string;
     securityRegion?: 'US' | 'SG' | 'DE';
+    preview?: boolean | 'web' | 'mobile';
 }
 export interface ValidationResult {
     isValid: boolean;
@@ -126,6 +127,7 @@ export interface IcreateComponent {
     isAppWebview?: boolean;
     merchantAppointParam?: IMerchantAppointParam;
     isNativeAppWebview?: boolean;
+    isDemoMode?: boolean;
 }
 export interface IappendIframeNodesParams extends IcreateComponent {
     paymentSessionMetaData: IPaymentSessionMetaData;
@@ -352,6 +354,7 @@ export interface IPaymentSessionMetaData {
     };
     skipRenderPaymentMethod?: boolean;
     needAccountConfirmPage?: boolean;
+    modernWeb?: boolean;
 }
 export interface IPaymentSessionFactor {
     merchantInfo?: IMerchantInfo;
@@ -810,6 +813,7 @@ export interface IPaymentMethod {
         applePayProps?: {
             paymentRequest: ApplePayPaymentRequest;
         };
+        googlePayProps?: any;
     };
     interActionType?: InterActionTypeEnum;
     recommend?: boolean;

package/esm/util/beforeConfirm.d.ts

@@ -1,9 +1,11 @@
-export declare const BEFORE_CONFIRM_TIMEOUT_MS = 15000;
+export declare const BEFORE_CONFIRM_TIMEOUT_MS = 20000;
+export declare const MERCHANT_CONFIRM_ABORT_CODE = "MERCHANT_CONFIRM_ABORT";
+export declare const MERCHANT_CONFIRM_TIMEOUT_CODE = "MERCHANT_CONFIRM_TIMEOUT";
 /**
  * 带超时的异步执行，始终清理定时器避免 unhandled promise rejection。
  *
  * @param fn - 要执行的异步函数
- * @param timeoutMs - 超时时间（毫秒），默认 15000
+ * @param timeoutMs - 超时时间（毫秒），默认 20000
  * @returns result 为 fn 的返回值（超时时为 undefined），timedOut 表示是否因超时返回
  */
 export declare function executeWithTimeout<T>(fn: () => Promise<T>, timeoutMs?: number): Promise<{

package/esm/util/beforeConfirm.js

@@ -2,13 +2,16 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-export var BEFORE_CONFIRM_TIMEOUT_MS = 15000;
+export var BEFORE_CONFIRM_TIMEOUT_MS = 20000;
+export var MERCHANT_CONFIRM_ABORT_CODE = 'MERCHANT_CONFIRM_ABORT';
+export var MERCHANT_CONFIRM_TIMEOUT_CODE = 'MERCHANT_CONFIRM_TIMEOUT';
+var BEFORE_CONFIRM_TIMEOUT_SIGNAL = Symbol('BEFORE_CONFIRM_TIMEOUT');
 
 /**
  * 带超时的异步执行，始终清理定时器避免 unhandled promise rejection。
- * 
+ *
  * @param fn - 要执行的异步函数
- * @param timeoutMs - 超时时间（毫秒），默认 15000
+ * @param timeoutMs - 超时时间（毫秒），默认 20000
  * @returns result 为 fn 的返回值（超时时为 undefined），timedOut 表示是否因超时返回
  */
 export function executeWithTimeout(_x) {
@@ -20,7 +23,6 @@ function _executeWithTimeout() {
       timerId,
       timeoutPromise,
       result,
-      isTimeout,
       _args = arguments;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -28,7 +30,7 @@ function _executeWithTimeout() {
           timeoutMs = _args.length > 1 && _args[1] !== undefined ? _args[1] : BEFORE_CONFIRM_TIMEOUT_MS;
           timeoutPromise = new Promise(function (_, reject) {
             timerId = setTimeout(function () {
-              return reject(new Error('timed out'));
+              return reject(BEFORE_CONFIRM_TIMEOUT_SIGNAL);
             }, timeoutMs);
           });
           _context.prev = 2;
@@ -43,26 +45,25 @@ function _executeWithTimeout() {
         case 9:
           _context.prev = 9;
           _context.t0 = _context["catch"](2);
-          isTimeout = _context.t0 instanceof Error && _context.t0.message === 'timed out';
-          if (!isTimeout) {
-            _context.next = 14;
+          if (!(_context.t0 === BEFORE_CONFIRM_TIMEOUT_SIGNAL)) {
+            _context.next = 13;
             break;
           }
           return _context.abrupt("return", {
             result: undefined,
             timedOut: true
           });
-        case 14:
+        case 13:
           throw _context.t0;
-        case 15:
-          _context.prev = 15;
+        case 14:
+          _context.prev = 14;
           clearTimeout(timerId);
-          return _context.finish(15);
-        case 18:
+          return _context.finish(14);
+        case 17:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 9, 15, 18]]);
+    }, _callee, null, [[2, 9, 14, 17]]);
   }));
   return _executeWithTimeout.apply(this, arguments);
 }