@alipay/ams-checkout 0.0.1783663570-dev.7 → 0.0.1783663570-dev.8

package/esm/config/index.js

@@ -30,7 +30,7 @@ export var v2AppMarmotMap = {
   light_sandbox: 'https://checkout.antom.com',
   prod: 'https://checkout.antom.com'
 };
-export var sdkVersion = "0.0.1783663570-dev.7";
+export var sdkVersion = "0.0.1783663570-dev.8";
 
 /**
  * @description: 目前应用层分为v1和v2，会存在两个应用版本号不是同步发布的情况。所以需要把默认的应用版本号配置抽离出来。

package/esm/core/component/element/modernElementController/index.d.ts

@@ -38,6 +38,8 @@ export declare class ModernElementController implements IElementController {
     private _merchantCurrency;
     /** 当前选中的支付方式类型（如 'APPLEPAY', 'CARD'），通过 paymentMethodChanged 事件更新 */
     private currentPaymentMethodType;
+    /** 提交进行中标志：submitPayment 执行期间为 true，用于拒绝并发重入，避免旧闭包串扰/重复拉起钱包 */
+    private isSubmitting;
     constructor({ onStatusChange, ...options }: ModernElementControllerOptions);
     mount(renderOptions: PaymentMountOptions, sdkSelector: string): Promise<ICommonApiResponse>;
     /**

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

@@ -196,6 +196,8 @@ export var ModernElementController = /*#__PURE__*/function () {
     _defineProperty(this, "_merchantCurrency", null);
     /** 当前选中的支付方式类型（如 'APPLEPAY', 'CARD'），通过 paymentMethodChanged 事件更新 */
     _defineProperty(this, "currentPaymentMethodType", '');
+    /** 提交进行中标志：submitPayment 执行期间为 true，用于拒绝并发重入，避免旧闭包串扰/重复拉起钱包 */
+    _defineProperty(this, "isSubmitting", false);
     this.options = options;
     this.onStatusChange = onStatusChange;
     if (options.sessionData) {
@@ -398,7 +400,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               request.setGlobalOptions({
                 hostSign: parseHostSign(sessionData),
                 env: this.options.environment,
-                sdkVersion: "0.0.1783663570-dev.7" || '',
+                sdkVersion: "0.0.1783663570-dev.8" || '',
                 tracker: sdkTracker
               });
               isConnect = !!(parseData !== null && parseData !== void 0 && (_parseData$connectFac = parseData.connectFactor) !== null && _parseData$connectFac !== void 0 && _parseData$connectFac.enableConnect);
@@ -494,7 +496,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 // 新sdk字段
                 locale: locale,
                 // 新sdk字段
-                sdkVersion: "0.0.1783663570-dev.7" || '',
+                sdkVersion: "0.0.1783663570-dev.8" || '',
                 // 新sdk字段
                 merchantId: (sdkQueryResult === null || sdkQueryResult === void 0 || (_sdkQueryResult$data = sdkQueryResult.data) === null || _sdkQueryResult$data === void 0 ? void 0 : _sdkQueryResult$data.merchantId) || '',
                 // 新sdk字段
@@ -1240,10 +1242,8 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "submitPayment",
     value: function () {
       var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
-        var _this$options$loading7,
-          _this$options$loading8,
-          _this8 = this;
-        var isApplePay, _ref5, onBeforeConfirm, serializableParams, startTime, _yield$executeWithTim2, shouldContinue, timedOut, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, _result$error, resultPromise, result, _this$options$loading9, _this$options$loading10;
+        var _this8 = this;
+        var _this$options$loading7, _this$options$loading8, isApplePay, _ref5, onBeforeConfirm, serializableParams, startTime, _yield$executeWithTim2, shouldContinue, timedOut, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, cleanups, _result$error, resultPromise, result, _this$options$loading9, _this$options$loading10;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -1262,10 +1262,25 @@ export var ModernElementController = /*#__PURE__*/function () {
                 }
               });
             case 3:
+              if (!this.isSubmitting) {
+                _context6.next = 6;
+                break;
+              }
+              trackError('submit_in_progress', {});
+              return _context6.abrupt("return", {
+                status: 'FAIL',
+                error: {
+                  code: 'UI_STATE_ERROR',
+                  message: 'submit already in progress'
+                }
+              });
+            case 6:
+              this.isSubmitting = true;
+              _context6.prev = 7;
               isApplePay = this.currentPaymentMethodType === 'APPLEPAY'; // 剥除 onBeforeConfirm 函数，避免 postMessage 序列化报错
               _ref5 = params || {}, onBeforeConfirm = _ref5.onBeforeConfirm, serializableParams = _objectWithoutProperties(_ref5, _excluded2); // ── 非 Apple Pay：同步执行 onBeforeConfirm（submit 前拦截，对齐老 ElementController） ──
               if (!(onBeforeConfirm && !isApplePay)) {
-                _context6.next = 26;
+                _context6.next = 31;
                 break;
               }
               logger.logInfo({
@@ -1274,18 +1289,18 @@ export var ModernElementController = /*#__PURE__*/function () {
                 paymentMethodType: this.currentPaymentMethodType || 'UNKNOWN',
                 path: 'nonApplePay_sync'
               });
-              _context6.prev = 7;
+              _context6.prev = 12;
               startTime = Date.now();
-              _context6.next = 11;
+              _context6.next = 16;
               return executeWithTimeout(function () {
                 return onBeforeConfirm();
               });
-            case 11:
+            case 16:
               _yield$executeWithTim2 = _context6.sent;
               shouldContinue = _yield$executeWithTim2.result;
               timedOut = _yield$executeWithTim2.timedOut;
               if (!(timedOut || !shouldContinue || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS)) {
-                _context6.next = 17;
+                _context6.next = 22;
                 break;
               }
               if (timedOut) {
@@ -1310,18 +1325,18 @@ export var ModernElementController = /*#__PURE__*/function () {
                   message: 'Merchant canceled payment.'
                 }
               });
-            case 17:
+            case 22:
               logger.logInfo({
                 title: 'sdk_before_confirm_success'
               }, {
                 paymentMethodType: this.currentPaymentMethodType || 'UNKNOWN',
                 path: 'nonApplePay_sync'
               });
-              _context6.next = 24;
+              _context6.next = 29;
               break;
-            case 20:
-              _context6.prev = 20;
-              _context6.t0 = _context6["catch"](7);
+            case 25:
+              _context6.prev = 25;
+              _context6.t0 = _context6["catch"](12);
               logger.logError({
                 title: 'sdk_before_confirm_error'
               }, {
@@ -1336,10 +1351,10 @@ export var ModernElementController = /*#__PURE__*/function () {
                   message: 'Merchant canceled payment.'
                 }
               });
-            case 24:
-              _context6.next = 27;
+            case 29:
+              _context6.next = 32;
               break;
-            case 26:
+            case 31:
               if (!onBeforeConfirm) {
                 logger.logInfo({
                   title: 'sdk_before_confirm_skip'
@@ -1348,7 +1363,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
                 });
               }
-            case 27:
+            case 32:
               // Apple Pay: 标记是否有 beforeConfirm，供 SUBMIT 消息的 hasBeforeConfirm 字段使用
               hasBeforeConfirmForApplePay = isApplePay && !!onBeforeConfirm; // ── amount/currency 校验 + 缓存（对齐老 ElementController 逻辑） ──
               hasAmount = !!(serializableParams !== null && serializableParams !== void 0 && serializableParams.amount);
@@ -1368,24 +1383,28 @@ export var ModernElementController = /*#__PURE__*/function () {
               trackElement('submit_start', {
                 d1: this.notRedirectAfterComplete ? 'if_required' : 'always'
               });
-              _context6.prev = 35;
+              // 收集本轮 once 监听的 cleanup：submitPayment 每次注册四类监听，但一轮只会命中部分，
+              // 未命中的 once wrapper 绑着旧闭包（旧 onBeforeConfirm / 旧 resolve）会残留并串扰后续提交，
+              // 在 submit 终态统一释放（二次 off 幂等，已命中的 once 已自行 off）。
+              cleanups = [];
+              _context6.prev = 41;
               resultPromise = new Promise(function (resolve) {
                 // 先注册事件监听，再发送 SUBMIT，避免 webapp 快速响应导致消息丢失
                 // PC 非 Safari：webapp 委托 SDK 拉起 Apple Pay 拿 token
-                _this8.bridge.once(AMSMessageType.GET_APPLE_PAY_TOKEN, function (payload) {
+                cleanups.push(_this8.bridge.once(AMSMessageType.GET_APPLE_PAY_TOKEN, function (payload) {
                   _this8.handleGetApplePayToken(payload, onBeforeConfirm).then(function () {
                     // token 已回传 webapp，继续等 SUBMIT_REPLY
                   });
-                });
+                }));
                 // Web element GP：webapp 委托 SDK/父 frame 调 loadPaymentData 拿 token
-                _this8.bridge.once(AMSMessageType.GET_GOOGLE_PAY_TOKEN, function (payload) {
+                cleanups.push(_this8.bridge.once(AMSMessageType.GET_GOOGLE_PAY_TOKEN, function (payload) {
                   _this8.handleGetGooglePayToken(payload);
-                });
+                }));
                 // Safari：webapp 请求执行商户 onBeforeConfirm 回调
-                _this8.bridge.once(AMSMessageType.BEFORE_CONFIRM, function () {
+                cleanups.push(_this8.bridge.once(AMSMessageType.BEFORE_CONFIRM, function () {
                   _this8.handleBeforeConfirmInternal(onBeforeConfirm || null);
-                });
-                _this8.bridge.once(MessageType.SUBMIT_REPLY, resolve);
+                }));
+                cleanups.push(_this8.bridge.once(MessageType.SUBMIT_REPLY, resolve));
               }); // 监听注册完成后再发送 SUBMIT，确保不会遗漏快速响应
               this.send(MessageType.SUBMIT, _objectSpread(_objectSpread({}, serializableParams), {}, {
                 redirect: this.notRedirectAfterComplete ? 'if_required' : 'always',
@@ -1394,32 +1413,43 @@ export var ModernElementController = /*#__PURE__*/function () {
                 amount: serializableParams.amount,
                 currency: serializableParams.currency
               } : {}));
-              _context6.next = 40;
+              _context6.next = 46;
               return resultPromise;
-            case 40:
+            case 46:
               result = _context6.sent;
               trackElement('submit_reply', {
                 d1: (result === null || result === void 0 ? void 0 : result.status) || '',
                 d2: (result === null || result === void 0 || (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.code) || ''
               });
               return _context6.abrupt("return", adaptSubmitResult(result));
-            case 45:
-              _context6.prev = 45;
-              _context6.t1 = _context6["catch"](35);
+            case 51:
+              _context6.prev = 51;
+              _context6.t1 = _context6["catch"](41);
               trackError('submit_error', {
                 d1: (_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.code) || 'UNKNOWN',
                 d2: (_context6.t1 === null || _context6.t1 === void 0 ? void 0 : _context6.t1.message) || ''
               });
               throw _context6.t1;
-            case 49:
-              _context6.prev = 49;
+            case 55:
+              _context6.prev = 55;
+              cleanups.forEach(function (fn) {
+                try {
+                  fn();
+                } catch (_unused4) {
+                  /* ignore cleanup error */
+                }
+              });
               (_this$options$loading9 = this.options.loading) === null || _this$options$loading9 === void 0 || (_this$options$loading10 = _this$options$loading9.onEndLoading) === null || _this$options$loading10 === void 0 || _this$options$loading10.call(_this$options$loading9);
-              return _context6.finish(49);
-            case 52:
+              return _context6.finish(55);
+            case 59:
+              _context6.prev = 59;
+              this.isSubmitting = false;
+              return _context6.finish(59);
+            case 62:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[7, 20], [35, 45, 49, 52]]);
+        }, _callee6, this, [[7,, 59, 62], [12, 25], [41, 51, 55, 59]]);
       }));
       function submitPayment(_x8) {
         return _submitPayment.apply(this, arguments);
@@ -1683,7 +1713,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             if (iframeOrigin && iframeOrigin !== 'null') {
               modalBridge.setOrigin(iframeOrigin);
             }
-          } catch (_unused4) {
+          } catch (_unused5) {
             // URL 解析失败时保持默认 origin
           }
           // 如果 payload 有 appearance，通过 TRANSFER_MODAL_APPEARANCE 消息发送给 modal