@alipay/ams-checkout 0.0.1781004142-dev.13 → 0.0.1781004142-dev.15

package/esm/core/component/element/elementController/index.js

@@ -37,6 +37,7 @@ import { ServiceProvider } from "../../../../foundation/service";
 import { convertPaymentSession } from "../../../../foundation/utils/payment_context_utils";
 import { ProductSceneEnum } from "../../../../types";
 import { ELEMENT_SPM_MAP } from "../../../../util/spm-map";
+import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
 import { ElementContainerService } from "../elementContainerService"; // 引入 ElementContainerService
 import { IContainerStatus } from "../elementContainerService/containerService";
 import { EventCenter as ElementEventCenter } from "../EventCenter/index";
@@ -374,7 +375,7 @@ var ElementController = /*#__PURE__*/function () {
     value: function () {
       var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(submitParams) {
         var _this3 = this;
-        var startEventId, res, logParams, isApplePay, paymentMethodType, BEFORE_CONFIRM_TIMEOUT_MS, timerId, timeoutPromise, shouldContinue, isTimeout, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
+        var startEventId, res, logParams, isApplePay, paymentMethodType, startTime, _yield$executeWithTim, shouldContinue, timedOut, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -404,42 +405,44 @@ var ElementController = /*#__PURE__*/function () {
               isApplePay = this.currentPaymentMethodType === 'APPLEPAY';
               paymentMethodType = this.currentPaymentMethodType || 'UNKNOWN';
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm && !isApplePay)) {
-                _context4.next = 38;
+                _context4.next = 34;
                 break;
               }
-              BEFORE_CONFIRM_TIMEOUT_MS = 15000;
               this.serviceMap.Log.logInfo({
                 title: 'sdk_before_confirm_start'
               }, {
                 paymentMethodType: paymentMethodType,
                 path: 'nonApplePay_sync'
               });
-              _context4.prev = 12;
-              timeoutPromise = new Promise(function (_, reject) {
-                timerId = setTimeout(function () {
-                  return reject(new Error('onBeforeConfirm timed out'));
-                }, BEFORE_CONFIRM_TIMEOUT_MS);
+              _context4.prev = 11;
+              startTime = Date.now();
+              _context4.next = 15;
+              return executeWithTimeout(function () {
+                return submitParams.onBeforeConfirm();
               });
-              _context4.prev = 14;
-              _context4.next = 17;
-              return Promise.race([submitParams.onBeforeConfirm(), timeoutPromise]);
-            case 17:
-              shouldContinue = _context4.sent;
-            case 18:
-              _context4.prev = 18;
-              clearTimeout(timerId);
-              return _context4.finish(18);
-            case 21:
-              if (!(shouldContinue === false)) {
-                _context4.next = 26;
+            case 15:
+              _yield$executeWithTim = _context4.sent;
+              shouldContinue = _yield$executeWithTim.result;
+              timedOut = _yield$executeWithTim.timedOut;
+              if (!(timedOut || !shouldContinue || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS)) {
+                _context4.next = 23;
                 break;
               }
-              this.serviceMap.Log.logInfo({
-                title: 'sdk_before_confirm_abort'
-              }, {
-                paymentMethodType: paymentMethodType,
-                path: 'nonApplePay_sync'
-              });
+              if (timedOut) {
+                this.serviceMap.Log.logError({
+                  title: 'sdk_before_confirm_timeout'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'nonApplePay_sync'
+                });
+              } else {
+                this.serviceMap.Log.logInfo({
+                  title: 'sdk_before_confirm_abort'
+                }, {
+                  paymentMethodType: paymentMethodType,
+                  path: 'nonApplePay_sync'
+                });
+              }
               this.changeLoading(false);
               this.elementEventCenter.endEvent(startEventId, {
                 eventCode: PaymentStatus.FAIL,
@@ -453,35 +456,25 @@ var ElementController = /*#__PURE__*/function () {
                   needChangeSessionForRetry: false
                 }
               });
-            case 26:
+            case 23:
               this.serviceMap.Log.logInfo({
                 title: 'sdk_before_confirm_success'
               }, {
                 paymentMethodType: paymentMethodType,
                 path: 'nonApplePay_sync'
               });
-              _context4.next = 36;
+              _context4.next = 32;
               break;
-            case 29:
-              _context4.prev = 29;
-              _context4.t0 = _context4["catch"](12);
-              isTimeout = _context4.t0 instanceof Error && _context4.t0.message === 'onBeforeConfirm timed out';
-              if (isTimeout) {
-                this.serviceMap.Log.logError({
-                  title: 'sdk_before_confirm_timeout'
-                }, {
-                  paymentMethodType: paymentMethodType,
-                  path: 'nonApplePay_sync'
-                });
-              } else {
-                this.serviceMap.Log.logError({
-                  title: 'sdk_before_confirm_error'
-                }, {
-                  paymentMethodType: paymentMethodType,
-                  errorMessage: String((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || _context4.t0).slice(0, 200),
-                  path: 'nonApplePay_sync'
-                });
-              }
+            case 26:
+              _context4.prev = 26;
+              _context4.t0 = _context4["catch"](11);
+              this.serviceMap.Log.logError({
+                title: 'sdk_before_confirm_error'
+              }, {
+                paymentMethodType: paymentMethodType,
+                errorMessage: String((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || _context4.t0).slice(0, 200),
+                path: 'nonApplePay_sync'
+              });
               this.changeLoading(false);
               this.elementEventCenter.endEvent(startEventId, {
                 eventCode: PaymentStatus.FAIL,
@@ -495,10 +488,10 @@ var ElementController = /*#__PURE__*/function () {
                   needChangeSessionForRetry: false
                 }
               });
-            case 36:
-              _context4.next = 39;
+            case 32:
+              _context4.next = 35;
               break;
-            case 38:
+            case 34:
               if (!(submitParams !== null && submitParams !== void 0 && submitParams.onBeforeConfirm)) {
                 this.serviceMap.Log.logInfo({
                   title: 'sdk_before_confirm_skip'
@@ -507,10 +500,10 @@ var ElementController = /*#__PURE__*/function () {
                   path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
                 });
               }
-            case 39:
+            case 35:
               recordResult = null;
-              _context4.prev = 40;
-              _context4.next = 43;
+              _context4.prev = 36;
+              _context4.next = 39;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
                   var that, recordResultCallback, params, processStep, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, _yield$_this3$onValid2, _data, errorString, errorResult;
@@ -667,10 +660,10 @@ var ElementController = /*#__PURE__*/function () {
                   return _ref3.apply(this, arguments);
                 };
               }());
-            case 43:
+            case 39:
               return _context4.abrupt("return", _context4.sent);
-            case 44:
-              _context4.prev = 44;
+            case 40:
+              _context4.prev = 40;
               _logParams = {
                 eventCode: (_recordResult = recordResult) === null || _recordResult === void 0 ? void 0 : _recordResult.status,
                 errorName: (_recordResult2 = recordResult) === null || _recordResult2 === void 0 || (_recordResult2 = _recordResult2.error) === null || _recordResult2 === void 0 ? void 0 : _recordResult2.code,
@@ -681,12 +674,12 @@ var ElementController = /*#__PURE__*/function () {
               };
               this.elementEventCenter.endEvent(startEventId, _logParams);
               this.changeLoading(false);
-              return _context4.finish(44);
-            case 49:
+              return _context4.finish(40);
+            case 45:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[12, 29], [14,, 18, 21], [40,, 44, 49]]);
+        }, _callee4, this, [[11, 26], [36,, 40, 45]]);
       }));
       function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);

package/esm/core/component/element/elementProcessor/paymentProcessor.js

@@ -33,6 +33,7 @@ import { parseSessionData } from "../../index";
 import { oneAccount, sdkAction } from "../mock";
 import { generateIframeSrc as _generateIframeSrc, isElementPad, isElementPC, safeStringify } from "../util";
 import BaseElementProcessor from "./baseElementProcessor";
+import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
 var logger = new Logger(LogConfig, true);
 var isExpressCheckout = function isExpressCheckout(extendInfo) {
   try {
@@ -194,7 +195,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
       // requests SDK layer to execute merchant's onBeforeConfirm callback via beforeConfirm event,
       // and returns the result (continue/abort) to iframe via dispatchToApp.
       this.eventCenter.listen(EVENT.beforeConfirm.name, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var paymentMethodType, BEFORE_CONFIRM_TIMEOUT_MS, timeoutPromise, startTime, shouldContinue, isTimeout;
+        var paymentMethodType, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -218,25 +219,24 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
               });
               return _context.abrupt("return");
             case 5:
-              BEFORE_CONFIRM_TIMEOUT_MS = 15000;
               logger.logInfo({
                 title: 'sdk_before_confirm_start'
               }, {
                 paymentMethodType: paymentMethodType,
                 path: 'applePay_eventBridge'
               });
-              _context.prev = 7;
-              timeoutPromise = new Promise(function (_, reject) {
-                return setTimeout(function () {
-                  return reject(new Error('onBeforeConfirm timed out'));
-                }, BEFORE_CONFIRM_TIMEOUT_MS);
-              });
+              _context.prev = 6;
               startTime = Date.now();
-              _context.next = 12;
-              return Promise.race([_this2._onBeforeConfirm(), timeoutPromise]);
-            case 12:
-              shouldContinue = _context.sent;
-              if (Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+              _context.next = 10;
+              return executeWithTimeout(function () {
+                return _this2._onBeforeConfirm();
+              });
+            case 10:
+              _yield$executeWithTim = _context.sent;
+              rawResult = _yield$executeWithTim.result;
+              timedOut = _yield$executeWithTim.timedOut;
+              shouldContinue = rawResult; // 双重校验：timedOut（Promise race） + startTime（实际时间差），防止竞态误判
+              if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
                 logger.logError({
                   title: 'sdk_before_confirm_timeout'
                 });
@@ -251,31 +251,21 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
                 event: EVENT.beforeConfirm.name,
                 data: {
                   success: true,
-                  result: shouldContinue !== false
+                  result: !!shouldContinue
                 }
               });
               _context.next = 23;
               break;
-            case 18:
-              _context.prev = 18;
-              _context.t0 = _context["catch"](7);
-              isTimeout = _context.t0 instanceof Error && _context.t0.message === 'onBeforeConfirm timed out';
-              if (isTimeout) {
-                logger.logError({
-                  title: 'sdk_before_confirm_timeout'
-                }, {
-                  paymentMethodType: paymentMethodType,
-                  path: 'applePay_eventBridge'
-                });
-              } else {
-                logger.logError({
-                  title: 'sdk_before_confirm_error'
-                }, {
-                  paymentMethodType: paymentMethodType,
-                  errorMessage: String((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || _context.t0).slice(0, 200),
-                  path: 'applePay_eventBridge'
-                });
-              }
+            case 19:
+              _context.prev = 19;
+              _context.t0 = _context["catch"](6);
+              logger.logError({
+                title: 'sdk_before_confirm_error'
+              }, {
+                paymentMethodType: paymentMethodType,
+                errorMessage: String((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || _context.t0).slice(0, 200),
+                path: 'applePay_eventBridge'
+              });
               _this2.eventCenter.dispatchToApp({
                 event: EVENT.beforeConfirm.name,
                 data: {
@@ -287,7 +277,7 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[7, 18]]);
+        }, _callee, null, [[6, 19]]);
       })));
     }
   }, {

package/esm/plugin/component/channel.js

@@ -17,6 +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 { APPLE_PAY_RECURRING_VERSION, APPLE_PAY_VERSION } from "../applepay/interface";
 var APPLEPAYERRORENUM = /*#__PURE__*/function (APPLEPAYERRORENUM) {
   APPLEPAYERRORENUM["APPLE_PAY_MISSING_DATA"] = "APPLE_PAY_MISSING_DATA";
@@ -212,7 +213,6 @@ export var ApplePaySdk = /*#__PURE__*/function () {
         try {
           if (!_this.session) return;
           _this.paymentStatus = PAYMENT_STATUS.PENDING;
-          _this.session.begin();
           _this.session.onvalidatemerchant = /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(event) {
               var requestParams, res, merchantSession, _this$logger, _this$logger2;
@@ -282,7 +282,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, BEFORE_CONFIRM_TIMEOUT_MS, _this$logger6, timerId, timeoutPromise, startTime, shouldContinue, _this$logger5, _this$session2, _this$session2$comple, _this$session3, _this$session3$comple, isTimeout, _this$logger7, _this$logger8, res, _this$logger9;
+              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;
               return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                 while (1) switch (_context3.prev = _context3.next) {
                   case 0:
@@ -296,7 +296,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                     };
                     _event$payment = event === null || event === void 0 ? void 0 : event.payment, token = _event$payment.token, billingContact = _event$payment.billingContact, shippingContact = _event$payment.shippingContact;
                     if (!token) {
-                      _context3.next = 48;
+                      _context3.next = 46;
                       break;
                     }
                     obj = {
@@ -320,33 +320,29 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                       paymentMethodType: 'APPLEPAY',
                       path: 'applePay_chrome_sdk'
                     });
-                    _context3.next = 41;
+                    _context3.next = 39;
                     break;
                   case 11:
                     // 清空回原始状态
                     _this.cancelReason = 'USER_CANCEL';
-                    BEFORE_CONFIRM_TIMEOUT_MS = 15000;
                     (_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 = 14;
-                    timerId = null;
-                    timeoutPromise = new Promise(function (_, reject) {
-                      timerId = setTimeout(function () {
-                        return reject(new Error('onBeforeConfirm timed out'));
-                      }, BEFORE_CONFIRM_TIMEOUT_MS);
-                    });
+                    _context3.prev = 13;
                     startTime = Date.now();
-                    _context3.next = 20;
-                    return Promise.race([_this.onBeforeConfirm(), timeoutPromise]);
-                  case 20:
-                    shouldContinue = _context3.sent;
-                    // 正常返回时清除超时定时器，避免 unhandled promise rejection
-                    if (timerId !== null) clearTimeout(timerId);
-                    if (Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
+                    _context3.next = 17;
+                    return executeWithTimeout(function () {
+                      return _this.onBeforeConfirm();
+                    });
+                  case 17:
+                    _yield$executeWithTim = _context3.sent;
+                    rawResult = _yield$executeWithTim.result;
+                    timedOut = _yield$executeWithTim.timedOut;
+                    shouldContinue = rawResult;
+                    if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
                       (_this$logger5 = _this.logger) === null || _this$logger5 === void 0 || _this$logger5.logError({
                         title: 'sdk_before_confirm_timeout'
                       });
@@ -358,7 +354,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                       shouldContinue: shouldContinue
                     });
                     if (shouldContinue) {
-                      _context3.next = 30;
+                      _context3.next = 29;
                       break;
                     }
                     _this.cancelReason = 'MERCHANT_ABORT';
@@ -368,29 +364,19 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                       errorCode: 'MERCHANT_CONFIRM_ABORT'
                     });
                     return _context3.abrupt("return");
-                  case 30:
-                    _context3.next = 41;
+                  case 29:
+                    _context3.next = 39;
                     break;
-                  case 32:
-                    _context3.prev = 32;
-                    _context3.t0 = _context3["catch"](14);
-                    isTimeout = _context3.t0 instanceof Error && _context3.t0.message === 'onBeforeConfirm timed out';
-                    if (isTimeout) {
-                      (_this$logger7 = _this.logger) === null || _this$logger7 === void 0 || _this$logger7.logError({
-                        title: 'sdk_before_confirm_timeout'
-                      }, {
-                        paymentMethodType: 'APPLEPAY',
-                        path: 'applePay_chrome_sdk'
-                      });
-                    } else {
-                      (_this$logger8 = _this.logger) === null || _this$logger8 === void 0 || _this$logger8.logError({
-                        title: 'sdk_before_confirm_error'
-                      }, {
-                        paymentMethodType: 'APPLEPAY',
-                        path: 'applePay_chrome_sdk',
-                        errorMessage: String((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message) || _context3.t0).slice(0, 200)
-                      });
-                    }
+                  case 31:
+                    _context3.prev = 31;
+                    _context3.t0 = _context3["catch"](13);
+                    (_this$logger7 = _this.logger) === null || _this$logger7 === void 0 || _this$logger7.logError({
+                      title: 'sdk_before_confirm_error'
+                    }, {
+                      paymentMethodType: 'APPLEPAY',
+                      path: 'applePay_chrome_sdk',
+                      errorMessage: String((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.message) || _context3.t0).slice(0, 200)
+                    });
                     _this.cancelReason = 'MERCHANT_ABORT';
                     (_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();
@@ -398,25 +384,25 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                       errorCode: 'MERCHANT_CONFIRM_ABORT'
                     });
                     return _context3.abrupt("return");
-                  case 41:
-                    _context3.next = 43;
+                  case 39:
+                    _context3.next = 41;
                     return _this.submitPay(obj);
-                  case 43:
+                  case 41:
                     res = _context3.sent;
                     _this.setPayStatus(res);
                     resolve(res);
-                    _context3.next = 50;
+                    _context3.next = 48;
                     break;
-                  case 48:
-                    (_this$logger9 = _this.logger) === null || _this$logger9 === void 0 || _this$logger9.logError({
+                  case 46:
+                    (_this$logger8 = _this.logger) === null || _this$logger8 === void 0 || _this$logger8.logError({
                       title: 'a3753.b103030.c386485.d507486'
                     });
                     exception();
-                  case 50:
+                  case 48:
                   case "end":
                     return _context3.stop();
                 }
-              }, _callee3, null, [[14, 32]]);
+              }, _callee3, null, [[13, 31]]);
             }));
             return function (_x2) {
               return _ref3.apply(this, arguments);
@@ -424,13 +410,13 @@ export var ApplePaySdk = /*#__PURE__*/function () {
           }();
           _this.session.oncancel = function () {
             if (_this.paymentStatus === PAYMENT_STATUS.PENDING) {
-              var _this$logger10;
-              (_this$logger10 = _this.logger) === null || _this$logger10 === void 0 || _this$logger10.logError({
+              var _this$logger9;
+              (_this$logger9 = _this.logger) === null || _this$logger9 === void 0 || _this$logger9.logError({
                 title: 'a3753.b103030.c386485.d507497'
               });
             } else {
-              var _this$logger11;
-              (_this$logger11 = _this.logger) === null || _this$logger11 === void 0 || _this$logger11.logInfo({
+              var _this$logger10;
+              (_this$logger10 = _this.logger) === null || _this$logger10 === void 0 || _this$logger10.logInfo({
                 title: 'a3753.b103030.c386485.d507498'
               });
             }
@@ -524,7 +510,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     key: "initApplePaySession",
     value: function () {
       var _initApplePaySession = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$logger13, _this$parseData3, _this$logger12, _ref4, recurringInfo, version, _this$logger14;
+        var _this$logger12, _this$parseData3, _this$logger11, _ref4, recurringInfo, version, _this$logger13;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -539,7 +525,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                 _context5.next = 7;
                 break;
               }
-              (_this$logger12 = this.logger) === null || _this$logger12 === void 0 || _this$logger12.logError({
+              (_this$logger11 = this.logger) === null || _this$logger11 === void 0 || _this$logger11.logError({
                 title: 'a3753.b103030.c386485.d507448'
               });
               this.paymentStatus = PAYMENT_STATUS.NORMAL;
@@ -547,7 +533,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                 errorCode: APPLEPAYERRORENUM.APPLE_PAY_MISSING_DATA
               }));
             case 7:
-              (_this$logger13 = this.logger) === null || _this$logger13 === void 0 || _this$logger13.logInfo({
+              (_this$logger12 = this.logger) === null || _this$logger12 === void 0 || _this$logger12.logInfo({
                 title: 'a3753.b103030.c386485.d507459'
               });
               _context5.next = 10;
@@ -573,7 +559,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
             case 19:
               _context5.prev = 19;
               _context5.t0 = _context5["catch"](0);
-              (_this$logger14 = this.logger) === null || _this$logger14 === void 0 || _this$logger14.logError({
+              (_this$logger13 = this.logger) === null || _this$logger13 === void 0 || _this$logger13.logError({
                 title: 'a3753.b103030.c386485.d507471'
               });
               return _context5.abrupt("return", Promise.reject({

package/esm/util/beforeConfirm.d.ts

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

package/esm/util/beforeConfirm.js

@@ -0,0 +1,68 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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;
+
+/**
+ * 带超时的异步执行，始终清理定时器避免 unhandled promise rejection。
+ * 
+ * @param fn - 要执行的异步函数
+ * @param timeoutMs - 超时时间（毫秒），默认 15000
+ * @returns result 为 fn 的返回值（超时时为 undefined），timedOut 表示是否因超时返回
+ */
+export function executeWithTimeout(_x) {
+  return _executeWithTimeout.apply(this, arguments);
+}
+function _executeWithTimeout() {
+  _executeWithTimeout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(fn) {
+    var timeoutMs,
+      timerId,
+      timeoutPromise,
+      result,
+      isTimeout,
+      _args = arguments;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          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'));
+            }, timeoutMs);
+          });
+          _context.prev = 2;
+          _context.next = 5;
+          return Promise.race([fn(), timeoutPromise]);
+        case 5:
+          result = _context.sent;
+          return _context.abrupt("return", {
+            result: result,
+            timedOut: false
+          });
+        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;
+            break;
+          }
+          return _context.abrupt("return", {
+            result: undefined,
+            timedOut: true
+          });
+        case 14:
+          throw _context.t0;
+        case 15:
+          _context.prev = 15;
+          clearTimeout(timerId);
+          return _context.finish(15);
+        case 18:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[2, 9, 15, 18]]);
+  }));
+  return _executeWithTimeout.apply(this, arguments);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1781004142-dev.13",
+  "version": "0.0.1781004142-dev.15",
   "description": "",
   "author": "",
   "exports": {