@alipay/ams-checkout 2.0.27 → 2.0.28

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

@@ -33,7 +33,7 @@ import { ERRORMESSAGE, PROMISE_CALLBACK_CODE } from "../../../../constant";
 import { BusManager, BusMessage } from "../../../bus";
 import { ApplePayActionEnum } from "../../../bus/interface";
 import { shouldQueryOneAccount } from "../../../utils/connectConfig";
-import { ApplePayHostService, awaitWrap, buildPageUrl, buildRecurringPaymentRequest, checkSessionData, debug, debugError, getDevReqConfig, getLocaleFromRenderData, getMetaData, MessageType, ModalPort, oneAccountQuery, openModal, OpenSDKError, parseHostSign, parseTrackerId, request, SDKBridge, sdkQuery, sdkTracker, showToast, themeColorMap } from "../../../../modern/tools";
+import { ApplePayHostService, awaitWrap, buildPageUrl, buildRecurringPaymentRequest, checkSessionData, debug, debugError, getDevReqConfig, getLocaleFromRenderData, getModalMessageTrackData, getMetaData, installModalMessageMonitor, MessageType, ModalPort, oneAccountQuery, openModal, OpenSDKError, parseHostSign, parseTrackerId, request, SDKBridge, sdkQuery, sdkTracker, showToast, themeColorMap } from "../../../../modern/tools";
 import { getApplePayPaymentSession } from "../../../../service";
 import { device } from "../../../../util";
 import { BEFORE_CONFIRM_TIMEOUT_MS, executeWithTimeout, MERCHANT_CONFIRM_ABORT_CODE, MERCHANT_CONFIRM_TIMEOUT_CODE } from "../../../../util/beforeConfirm";
@@ -269,6 +269,7 @@ var AMSMessageType = {
  */
 export var ModernElementController = /*#__PURE__*/function () {
   function ModernElementController(_ref2) {
+    var _this = this;
     var onStatusChange = _ref2.onStatusChange,
       options = _objectWithoutProperties(_ref2, _excluded);
     _classCallCheck(this, ModernElementController);
@@ -293,6 +294,8 @@ export var ModernElementController = /*#__PURE__*/function () {
     _defineProperty(this, "_merchantCurrency", null);
     /** 当前选中的支付方式类型（如 'APPLEPAY', 'CARD'），通过 paymentMethodChanged 事件更新 */
     _defineProperty(this, "currentPaymentMethodType", '');
+    /** Removes the passive host-window modal monitor for this controller. */
+    _defineProperty(this, "stopModalMessageMonitor", void 0);
     /** 提交进行中标志：submitPayment 执行期间为 true，用于拒绝并发重入，避免旧闭包串扰/重复拉起钱包 */
     _defineProperty(this, "isSubmitting", false);
     /**
@@ -320,6 +323,12 @@ export var ModernElementController = /*#__PURE__*/function () {
         debug('INFO', direction === 'OUT' ? 'SDK_INTERNAL' : 'APP_RUNTIME', msg.type, msg.payload);
       }
     });
+    this.stopModalMessageMonitor = installModalMessageMonitor(function (data) {
+      return _this.trackElement('modal_lifecycle_monitor', getModalMessageTrackData(data));
+    }, function (event) {
+      var _this$iframe;
+      return event.source === ((_this$iframe = _this.iframe) === null || _this$iframe === void 0 ? void 0 : _this$iframe.contentWindow);
+    });
   }
   _createClass(ModernElementController, [{
     key: "track",
@@ -366,7 +375,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "mount",
     value: function () {
       var _mount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(renderOptions, sdkSelector) {
-        var _this = this;
+        var _this2 = this;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -380,7 +389,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 /* setup 校验异常会统一上报 */
               }
               return _context2.abrupt("return", runApi('mount', function () {
-                return _this.doMount(renderOptions, sdkSelector);
+                return _this2.doMount(renderOptions, sdkSelector);
               }, undefined, normalizeApiInput('mount', {
                 renderOptions: renderOptions,
                 sdkSelector: sdkSelector
@@ -558,7 +567,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     value: (function () {
       var _setup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(renderOptions) {
         var _parseData$connectFac,
-          _this2 = this,
+          _this3 = this,
           _parseData$paymentMet,
           _sdkQueryResult$data;
         var sessionData, parseData, lastEnv, isConnect, shouldQueryOneAccountFlag, paymentSessionConfig, genSdkQueryPromise, genOneAccountQueryPromise, promises, cancelDestroyCallback, destroyPromise, queryPromise, _yield$Promise$race$f, _yield$Promise$race$f2, sdkQueryResult, oneAccountQueryResult, _sdkQueryResult$error, _sdkQueryResult$error2, _oneAccountQueryResul, _oneAccountQueryResul2, preferredLocale, locale, renderDataError;
@@ -582,7 +591,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 hostSign: parseHostSign(sessionData),
                 env: lastEnv
               }, getDevReqConfig()), {}, {
-                sdkVersion: "2.0.27" || '',
+                sdkVersion: "2.0.28" || '',
                 tracker: sdkTracker
               }));
               isConnect = !!(parseData !== null && parseData !== void 0 && (_parseData$connectFac = parseData.connectFactor) !== null && _parseData$connectFac !== void 0 && _parseData$connectFac.enableConnect);
@@ -595,14 +604,14 @@ export var ModernElementController = /*#__PURE__*/function () {
                     isUserPreferredLocale: true
                   },
                   merchantAppointParam: (_renderOptions$mercha = renderOptions.merchantAppointParam) !== null && _renderOptions$mercha !== void 0 && _renderOptions$mercha.storedCard ? renderOptions.merchantAppointParam : undefined,
-                  notRedirectAfterComplete: _this2.notRedirectAfterComplete,
+                  notRedirectAfterComplete: _this3.notRedirectAfterComplete,
                   // sdk需要传入该字段
                   paymentSessionConfig: parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig,
                   paymentSessionData: sessionData
                 }, {
                   // 传商户初始化的 locale，服务端据此返回对应语言（缺失则回落用户偏好/en_US）
                   envInfo: {
-                    locale: _this2.options.locale
+                    locale: _this3.options.locale
                   }
                 }).catch(recoverSdkQueryBusinessResponse));
               };
@@ -618,7 +627,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               promises = shouldQueryOneAccountFlag ? [genSdkQueryPromise(), genOneAccountQueryPromise()] : [genSdkQueryPromise(), undefined];
               cancelDestroyCallback = function cancelDestroyCallback() {};
               destroyPromise = new Promise(function (_, reject) {
-                cancelDestroyCallback = _this2.onDestroy(function () {
+                cancelDestroyCallback = _this3.onDestroy(function () {
                   return reject(getDestroyedError());
                 });
               });
@@ -680,7 +689,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 // 新sdk字段
                 locale: locale,
                 // 新sdk字段
-                sdkVersion: "2.0.27" || '',
+                sdkVersion: "2.0.28" || '',
                 // 新sdk字段
                 merchantId: (sdkQueryResult === null || sdkQueryResult === void 0 || (_sdkQueryResult$data = sdkQueryResult.data) === null || _sdkQueryResult$data === void 0 ? void 0 : _sdkQueryResult$data.merchantId) || '',
                 // 新sdk字段
@@ -793,20 +802,20 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "bindBridgeEvents",
     value: function bindBridgeEvents() {
-      var _this3 = this;
+      var _this4 = this;
       this.bridge.on(MessageType.HEIGHT_UPDATE, function (height) {
-        if (_this3.iframe) _this3.iframe.style.height = "".concat(height, "px");
+        if (_this4.iframe) _this4.iframe.style.height = "".concat(height, "px");
       });
       this.bridge.on(AMSMessageType.SHOWTOAST, function (payload, _ports, meta) {
-        var _this3$iframe, _this3$modalIframe;
-        if (meta && meta.source !== ((_this3$iframe = _this3.iframe) === null || _this3$iframe === void 0 ? void 0 : _this3$iframe.contentWindow) && meta.source !== ((_this3$modalIframe = _this3.modalIframe) === null || _this3$modalIframe === void 0 ? void 0 : _this3$modalIframe.contentWindow)) {
+        var _this4$iframe, _this4$modalIframe;
+        if (meta && meta.source !== ((_this4$iframe = _this4.iframe) === null || _this4$iframe === void 0 ? void 0 : _this4$iframe.contentWindow) && meta.source !== ((_this4$modalIframe = _this4.modalIframe) === null || _this4$modalIframe === void 0 ? void 0 : _this4$modalIframe.contentWindow)) {
           return;
         }
         showToast(payload);
       });
       this.bridge.on(MessageType.REDIRECT, function (payload, _ports, meta) {
-        var _this3$iframe2, _this3$modalIframe2;
-        if (meta && meta.source !== ((_this3$iframe2 = _this3.iframe) === null || _this3$iframe2 === void 0 ? void 0 : _this3$iframe2.contentWindow) && meta.source !== ((_this3$modalIframe2 = _this3.modalIframe) === null || _this3$modalIframe2 === void 0 ? void 0 : _this3$modalIframe2.contentWindow)) {
+        var _this4$iframe2, _this4$modalIframe2;
+        if (meta && meta.source !== ((_this4$iframe2 = _this4.iframe) === null || _this4$iframe2 === void 0 ? void 0 : _this4$iframe2.contentWindow) && meta.source !== ((_this4$modalIframe2 = _this4.modalIframe) === null || _this4$modalIframe2 === void 0 ? void 0 : _this4$modalIframe2.contentWindow)) {
           return;
         }
         var url = payload.url,
@@ -815,7 +824,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           schemaUrl = payload.schemaUrl,
           destroy = payload.destroy;
         // d1=mode(redirect/replace) d2=跳转类型 d3=兜底url d4=appLinkUrl d5=schemaUrl d6=是否销毁
-        _this3.trackElement('redirect', {
+        _this4.trackElement('redirect', {
           d1: mode || 'redirect',
           d2: appLinkUrl ? 'app_link' : schemaUrl ? 'schema' : 'url',
           d3: url || '',
@@ -824,7 +833,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           d6: destroy ? '1' : '0'
         });
         if (destroy) {
-          _this3.destroy();
+          _this4.destroy();
         }
         function fallbackJump() {
           if (mode === 'replace') {
@@ -838,7 +847,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             var app = new CallApp({
               resultJudgmentTime: 2000,
               fallback: function fallback() {
-                _this3.trackElement('redirect_fallback', {
+                _this4.trackElement('redirect_fallback', {
                   d1: 'callapp_failed',
                   d2: url || ''
                 });
@@ -853,7 +862,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             fallbackJump();
           }
         } catch (error) {
-          _this3.trackError('redirect_error', {
+          _this4.trackError('redirect_error', {
             d1: 'callapp_exception',
             d2: (error === null || error === void 0 ? void 0 : error.message) || '',
             d3: url || ''
@@ -862,34 +871,34 @@ export var ModernElementController = /*#__PURE__*/function () {
         }
       });
       this.bridge.on(MessageType.OPEN_MODAL, function (payload, _ports, meta) {
-        var _this3$iframe3;
-        if (meta && meta.source !== ((_this3$iframe3 = _this3.iframe) === null || _this3$iframe3 === void 0 ? void 0 : _this3$iframe3.contentWindow)) {
+        var _this4$iframe3;
+        if (meta && meta.source !== ((_this4$iframe3 = _this4.iframe) === null || _this4$iframe3 === void 0 ? void 0 : _this4$iframe3.contentWindow)) {
           return;
         }
-        _this3.handleOpenModal(payload);
-        _this3.bridge.once(MessageType.CLOSE_MODAL, function () {
-          _this3.handleCloseModal();
+        _this4.handleOpenModal(payload);
+        _this4.bridge.once(MessageType.CLOSE_MODAL, function () {
+          _this4.handleCloseModal();
         });
       });
       this.bridge.on(MessageType.DESTROY_ELEMENT, function (_payload, _ports, meta) {
-        var _this3$iframe4;
-        if (meta && meta.source !== ((_this3$iframe4 = _this3.iframe) === null || _this3$iframe4 === void 0 ? void 0 : _this3$iframe4.contentWindow)) {
+        var _this4$iframe4;
+        if (meta && meta.source !== ((_this4$iframe4 = _this4.iframe) === null || _this4$iframe4 === void 0 ? void 0 : _this4$iframe4.contentWindow)) {
           return;
         }
-        _this3.destroy();
+        _this4.destroy();
       });
 
       // skipRenderPaymentMethod 场景：webapp 委托 SDK 全权拉起 ApplePay,fire-and-forget
       // 走 plugin/applepay 标准链路(onEventCallback 自动通知商户)
       this.bridge.on(AMSMessageType.HANDLE_PAYMENT, function () {
-        _this3.handleHandlePayment();
+        _this4.handleHandlePayment();
       });
 
       // Apple Pay beforeConfirm：在 submitPayment 内通过 bridge.once 监听，此处不再注册
 
       // 支付方式变化：iframe 通知 SDK 当前选中的支付方式类型
       this.bridge.on(AMSMessageType.PAYMENT_METHOD_CHANGED, function (payload) {
-        _this3.currentPaymentMethodType = (payload === null || payload === void 0 ? void 0 : payload.type) || '';
+        _this4.currentPaymentMethodType = (payload === null || payload === void 0 ? void 0 : payload.type) || '';
       });
     }
 
@@ -903,7 +912,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     value: (function () {
       var _handleGetApplePayToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(payload, onBeforeConfirm) {
         var _paymentMethod,
-          _this4 = this;
+          _this5 = this;
         var sessionData, applePayProps, paymentRequest, merchantCapabilities, merchantInfo, paymentAmount, supportedNetworks, version, requiredBillingContactFields, requiredShippingContactFields, finalAmount, finalCurrency, capturedResult, recurringRequest, service, _capturedResult, errCode;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
@@ -975,7 +984,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                         while (1) switch (_context5.prev = _context5.next) {
                           case 0:
-                            _this4.trackElement('applepay_validate_start', {
+                            _this5.trackElement('applepay_validate_start', {
                               d1: 'merchant_validate'
                             });
                             _context5.next = 3;
@@ -984,7 +993,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                               paymentSessionData: sessionData,
                               merchantDomain: window.location.hostname
                             }, {
-                              env: _this4.options.environment,
+                              env: _this5.options.environment,
                               envInfo: {
                                 deviceId: ''
                               }
@@ -995,12 +1004,12 @@ export var ModernElementController = /*#__PURE__*/function () {
                               _context5.next = 7;
                               break;
                             }
-                            _this4.trackElement('applepay_validate_success', {
+                            _this5.trackElement('applepay_validate_success', {
                               d1: 'got_session'
                             });
                             return _context5.abrupt("return", typeof res.merchantSessionObject === 'string' ? JSON.parse(res.merchantSessionObject) : res.merchantSessionObject);
                           case 7:
-                            _this4.trackError('applepay_merchant_validate_failed', {
+                            _this5.trackError('applepay_merchant_validate_failed', {
                               d1: 'VALIDATION_FAILED',
                               d2: (res === null || res === void 0 ? void 0 : res.errorMessage) || 'Merchant validation failed'
                             });
@@ -1043,7 +1052,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                             isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS;
                             shouldContinue = !isTimeout && !!rawResult;
                             if (isTimeout) {
-                              _this4.trackError('sdk_before_confirm_timeout', {
+                              _this5.trackError('sdk_before_confirm_timeout', {
                                 d1: 'applePay_chrome_modern'
                               });
                             }
@@ -1071,7 +1080,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                               billingContact: billingContact,
                               shippingContact: shippingContact
                             };
-                            _this4.trackElement('applepay_authorized', {
+                            _this5.trackElement('applepay_authorized', {
                               d1: token ? 'has_token' : 'no_token'
                             });
                             return _context6.abrupt("return", {
@@ -1158,7 +1167,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "handleGetGooglePayToken",
     value: function handleGetGooglePayToken(payload) {
       var _data$paymentMethodDe,
-        _this5 = this,
+        _this6 = this,
         _google;
       var data = payload === null || payload === void 0 ? void 0 : payload.data;
       var googlePayProps = data === null || data === void 0 || (_data$paymentMethodDe = data.paymentMethodDetail) === null || _data$paymentMethodDe === void 0 ? void 0 : _data$paymentMethodDe.googlePayProps;
@@ -1202,10 +1211,10 @@ export var ModernElementController = /*#__PURE__*/function () {
           };
         }).then(function (paymentData) {
           if (paymentData) {
-            _this5.trackElement('googlepay_token_success', {
+            _this6.trackElement('googlepay_token_success', {
               d1: 'has_token'
             });
-            _this5.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
+            _this6.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
               success: true,
               result: paymentData
             });
@@ -1213,16 +1222,16 @@ export var ModernElementController = /*#__PURE__*/function () {
         }).catch(function (err) {
           var statusCode = (err === null || err === void 0 ? void 0 : err.statusCode) || 'GOOGLE_PAY_PAYMENT_FAILED';
           if (statusCode === 'CANCELED') {
-            _this5.trackElement('googlepay_cancel', {
+            _this6.trackElement('googlepay_cancel', {
               d1: 'user_cancel'
             });
           } else {
-            _this5.trackError('googlepay_token_failed', {
+            _this6.trackError('googlepay_token_failed', {
               d1: statusCode,
               d2: (err === null || err === void 0 ? void 0 : err.statusMessage) || ''
             });
           }
-          _this5.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
+          _this6.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
             success: false,
             err: _objectSpread({
               statusCode: statusCode
@@ -1254,10 +1263,10 @@ export var ModernElementController = /*#__PURE__*/function () {
         loadAndPay();
       };
       script.onerror = function () {
-        _this5.trackError('googlepay_script_load_failed', {
+        _this6.trackError('googlepay_script_load_failed', {
           d1: 'script_error'
         });
-        _this5.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
+        _this6.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
           success: false,
           err: {
             statusCode: 'GOOGLE_PAY_NOT_SUPPORTED'
@@ -1306,7 +1315,7 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "handleBeforeConfirmInternal",
     value: function handleBeforeConfirmInternal(onBeforeConfirm) {
-      var _this6 = this;
+      var _this7 = this;
       if (!onBeforeConfirm) {
         logger.logInfo({
           title: 'sdk_before_confirm_skip'
@@ -1343,7 +1352,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         }, {
           shouldContinue: shouldContinue
         });
-        _this6.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, _objectSpread({
+        _this7.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, _objectSpread({
           success: true,
           result: !!shouldContinue
         }, isTimeout ? {
@@ -1356,7 +1365,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           errorMessage: String((error === null || error === void 0 ? void 0 : error.message) || error).slice(0, 200),
           path: 'modernController_bridge'
         });
-        _this6.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, {
+        _this7.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, {
           success: false,
           result: false
         });
@@ -1370,12 +1379,12 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "waitForReadyHandshake",
     value: function waitForReadyHandshake() {
-      var _this7 = this;
+      var _this8 = this;
       return new Promise(function (resolve, reject) {
         var cancelDestroyCallback = function cancelDestroyCallback() {};
         var timer = setTimeout(function () {
           cancelDestroyCallback();
-          _this7.trackError('ready_handshake_timeout', {
+          _this8.trackError('ready_handshake_timeout', {
             d1: String(MOUNT_TIMEOUT)
           });
           reject({
@@ -1383,16 +1392,16 @@ export var ModernElementController = /*#__PURE__*/function () {
             message: 'An error occurred; the transaction cannot be initiated.'
           });
         }, MOUNT_TIMEOUT);
-        cancelDestroyCallback = _this7.onDestroy(function () {
+        cancelDestroyCallback = _this8.onDestroy(function () {
           clearTimeout(timer);
           reject(getDestroyedError());
         });
-        _this7.bridge.once(MessageType.READY_HANDSHAKE, function () {
-          var _this7$iframe;
+        _this8.bridge.once(MessageType.READY_HANDSHAKE, function () {
+          var _this8$iframe;
           clearTimeout(timer);
           cancelDestroyCallback();
-          if (!((_this7$iframe = _this7.iframe) !== null && _this7$iframe !== void 0 && _this7$iframe.contentWindow)) {
-            _this7.trackError('iframe_contentwindow_unavailable', {
+          if (!((_this8$iframe = _this8.iframe) !== null && _this8$iframe !== void 0 && _this8$iframe.contentWindow)) {
+            _this8.trackError('iframe_contentwindow_unavailable', {
               d1: 'after_ready_handshake'
             });
             reject({
@@ -1401,9 +1410,9 @@ export var ModernElementController = /*#__PURE__*/function () {
             });
             return;
           }
-          _this7.bridge.setTarget(_this7.iframe.contentWindow);
-          _this7.trackHandshake('ready_handshake_received', {
-            m1: _this7._mountStartTime ? Date.now() - _this7._mountStartTime : 0
+          _this8.bridge.setTarget(_this8.iframe.contentWindow);
+          _this8.trackHandshake('ready_handshake_received', {
+            m1: _this8._mountStartTime ? Date.now() - _this8._mountStartTime : 0
           });
           resolve();
         });
@@ -1428,12 +1437,12 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "waitForHandshakeAck",
     value: function waitForHandshakeAck() {
-      var _this8 = this;
+      var _this9 = this;
       return new Promise(function (resolve, reject) {
         var cancelDestroyCallback = function cancelDestroyCallback() {};
         var timer = setTimeout(function () {
           cancelDestroyCallback();
-          _this8.trackError('handshake_ack_timeout', {
+          _this9.trackError('handshake_ack_timeout', {
             d1: String(MOUNT_TIMEOUT)
           });
           reject({
@@ -1441,15 +1450,15 @@ export var ModernElementController = /*#__PURE__*/function () {
             message: 'An error occurred; the transaction cannot be initiated.'
           });
         }, MOUNT_TIMEOUT);
-        cancelDestroyCallback = _this8.onDestroy(function () {
+        cancelDestroyCallback = _this9.onDestroy(function () {
           clearTimeout(timer);
           reject(getDestroyedError());
         });
-        _this8.bridge.once(MessageType.HANDSHAKE_ACK, function () {
+        _this9.bridge.once(MessageType.HANDSHAKE_ACK, function () {
           clearTimeout(timer);
           cancelDestroyCallback();
-          _this8.trackHandshake('handshake_ack_received', {
-            m1: _this8._mountStartTime ? Date.now() - _this8._mountStartTime : 0
+          _this9.trackHandshake('handshake_ack_received', {
+            m1: _this9._mountStartTime ? Date.now() - _this9._mountStartTime : 0
           });
           resolve();
         });
@@ -1459,15 +1468,15 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "submitPayment",
     value: function () {
       var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this9 = this;
+        var _this10 = this;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
               return _context8.abrupt("return", runApi('submitPayment', function () {
-                return _this9.doSubmitPayment(params);
+                return _this10.doSubmitPayment(params);
               }, function () {
-                return _this9.currentPaymentMethodType ? {
-                  d4: _this9.currentPaymentMethodType
+                return _this10.currentPaymentMethodType ? {
+                  d4: _this10.currentPaymentMethodType
                 } : {};
               }, normalizeApiInput('submitPayment', params), this.merchantId));
             case 1:
@@ -1485,7 +1494,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "doSubmitPayment",
     value: function () {
       var _doSubmitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
-        var _this10 = this;
+        var _this11 = this;
         var _this$options$loading7, _this$options$loading8, isApplePay, _ref6, onBeforeConfirm, serializableParams, startTime, _yield$executeWithTim2, shouldContinue, timedOut, isTimeout, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, cleanups, _result$error5, resultPromise, result, _this$options$loading9, _this$options$loading10;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
@@ -1638,20 +1647,20 @@ export var ModernElementController = /*#__PURE__*/function () {
               resultPromise = new Promise(function (resolve) {
                 // 先注册事件监听，再发送 SUBMIT，避免 webapp 快速响应导致消息丢失
                 // PC 非 Safari：webapp 委托 SDK 拉起 Apple Pay 拿 token
-                cleanups.push(_this10.bridge.once(AMSMessageType.GET_APPLE_PAY_TOKEN, function (payload) {
-                  _this10.handleGetApplePayToken(payload, onBeforeConfirm).then(function () {
+                cleanups.push(_this11.bridge.once(AMSMessageType.GET_APPLE_PAY_TOKEN, function (payload) {
+                  _this11.handleGetApplePayToken(payload, onBeforeConfirm).then(function () {
                     // token 已回传 webapp，继续等 SUBMIT_REPLY
                   });
                 }));
                 // Web element GP：webapp 委托 SDK/父 frame 调 loadPaymentData 拿 token
-                cleanups.push(_this10.bridge.once(AMSMessageType.GET_GOOGLE_PAY_TOKEN, function (payload) {
-                  _this10.handleGetGooglePayToken(payload);
+                cleanups.push(_this11.bridge.once(AMSMessageType.GET_GOOGLE_PAY_TOKEN, function (payload) {
+                  _this11.handleGetGooglePayToken(payload);
                 }));
                 // Safari：webapp 请求执行商户 onBeforeConfirm 回调
-                cleanups.push(_this10.bridge.once(AMSMessageType.BEFORE_CONFIRM, function () {
-                  _this10.handleBeforeConfirmInternal(onBeforeConfirm || null);
+                cleanups.push(_this11.bridge.once(AMSMessageType.BEFORE_CONFIRM, function () {
+                  _this11.handleBeforeConfirmInternal(onBeforeConfirm || null);
                 }));
-                cleanups.push(_this10.bridge.once(MessageType.SUBMIT_REPLY, resolve));
+                cleanups.push(_this11.bridge.once(MessageType.SUBMIT_REPLY, resolve));
               }); // 监听注册完成后再发送 SUBMIT，确保不会遗漏快速响应
               this.send(MessageType.SUBMIT, _objectSpread(_objectSpread({}, serializableParams), {}, {
                 redirect: this.notRedirectAfterComplete ? 'if_required' : 'always',
@@ -1707,12 +1716,12 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "validateFields",
     value: function () {
       var _validateFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-        var _this11 = this;
+        var _this12 = this;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
               return _context10.abrupt("return", runApi('validateFields', function () {
-                return _this11.doValidateFields();
+                return _this12.doValidateFields();
               }, undefined, undefined, this.merchantId));
             case 1:
             case "end":
@@ -1729,7 +1738,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "doValidateFields",
     value: function () {
       var _doValidateFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-        var _this12 = this;
+        var _this13 = this;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -1747,17 +1756,17 @@ export var ModernElementController = /*#__PURE__*/function () {
               this.send(AMSMessageType.VALIDATE);
               return _context11.abrupt("return", new Promise(function (resolve) {
                 var timer = setTimeout(function () {
-                  _this12.trackError('validate_fields_timeout', {
+                  _this13.trackError('validate_fields_timeout', {
                     d1: '15000'
                   });
                   resolve({
                     isValid: false
                   });
                 }, 15000);
-                _this12.bridge.once(AMSMessageType.VALIDATE_REPLY, function (payload) {
+                _this13.bridge.once(AMSMessageType.VALIDATE_REPLY, function (payload) {
                   clearTimeout(timer);
                   var isValid = !!(payload !== null && payload !== void 0 && payload.isValid);
-                  _this12.trackElement('validate_result', {
+                  _this13.trackElement('validate_result', {
                     d1: isValid ? 'valid' : 'invalid'
                   });
                   resolve(payload || {
@@ -1803,16 +1812,17 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$iframe;
+      var _this$iframe2;
       this.trackElement('destroy', {
         d1: this.status
       });
       if (this.status === 'initialized' || this.status === 'destroyed') {
         return;
       }
+      this.stopModalMessageMonitor();
       this.handleCloseModal();
       this.bridge.destroy();
-      if ((_this$iframe = this.iframe) !== null && _this$iframe !== void 0 && _this$iframe.parentNode) this.iframe.parentNode.removeChild(this.iframe);
+      if ((_this$iframe2 = this.iframe) !== null && _this$iframe2 !== void 0 && _this$iframe2.parentNode) this.iframe.parentNode.removeChild(this.iframe);
       this.iframe = null;
       this.setStatus('destroyed');
       this.runDestroyCallbacks();
@@ -1821,8 +1831,8 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "cleanup",
     value: function cleanup() {
-      var _this$iframe2;
-      if ((_this$iframe2 = this.iframe) !== null && _this$iframe2 !== void 0 && _this$iframe2.parentNode) this.iframe.parentNode.removeChild(this.iframe);
+      var _this$iframe3;
+      if ((_this$iframe3 = this.iframe) !== null && _this$iframe3 !== void 0 && _this$iframe3.parentNode) this.iframe.parentNode.removeChild(this.iframe);
       this.iframe = null;
       this.setStatus('initialized');
       this.cachedSend = [];
@@ -1840,7 +1850,7 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "onDestroy",
     value: function onDestroy(callback) {
-      var _this13 = this;
+      var _this14 = this;
       if (this.status === 'destroyed') {
         callback();
         return function () {
@@ -1849,7 +1859,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       }
       this.destroyCallbacks.push(callback);
       return function () {
-        _this13.destroyCallbacks = _this13.destroyCallbacks.filter(function (item) {
+        _this14.destroyCallbacks = _this14.destroyCallbacks.filter(function (item) {
           return item !== callback;
         });
       };
@@ -1889,12 +1899,12 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "flushCachedMessages",
     value: function flushCachedMessages() {
-      var _this14 = this;
+      var _this15 = this;
       if (this.cachedSend.length > 0) {
         this.cachedSend.forEach(function (_ref7) {
           var type = _ref7.type,
             payload = _ref7.payload;
-          _this14.bridge.send(type, payload);
+          _this15.bridge.send(type, payload);
         });
         this.cachedSend = [];
       }
@@ -1917,7 +1927,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       var _payload$appearance,
         _themeColorMap$appear,
         _payload$appearance2,
-        _this15 = this;
+        _this16 = this;
       // 清理已存在的 modal
       this.handleCloseModal();
       var mode = device.isMobile ? 'mobile' : 'desktop';
@@ -1973,7 +1983,7 @@ export var ModernElementController = /*#__PURE__*/function () {
         destroy = _openModal.destroy;
       var offReady = modalBridge.once(MessageType.MODAL_TRANSFER_READY, function (_payload, _ports, meta) {
         if (meta && meta.source !== iframe.contentWindow) return;
-        _this15.trackElement('modal_loaded', {
+        _this16.trackElement('modal_loaded', {
           d1: payload.url
         });
         // 确保 target 已设置（如果 load 事件尚未触发，在此设置）
@@ -2002,13 +2012,13 @@ export var ModernElementController = /*#__PURE__*/function () {
       this.modalIframe = iframe;
       this.modalDestroy = function () {
         if (payload.closeConfirm) {
-          _this15.trackElement('modal_close_confirm', {
+          _this16.trackElement('modal_close_confirm', {
             d1: 'confirm_resolved'
           });
         }
         destroy();
         offReady();
-        _this15.modalIframe = null;
+        _this16.modalIframe = null;
       };
     }