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

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

@@ -87,6 +87,17 @@ var recoverSdkQueryBusinessResponse = function recoverSdkQueryBusinessResponse(e
 };
 var MOUNT_TIMEOUT = 16000;
 var logger = new Logger(LogConfig, true);
+var ELEMENT_DESTROYED_MESSAGE = 'Element already destroyed';
+var getDestroyedError = function getDestroyedError() {
+  return {
+    code: ERRORMESSAGE.UI_STATE_ERROR.code,
+    message: ELEMENT_DESTROYED_MESSAGE
+  };
+};
+var isDestroyedError = function isDestroyedError(error) {
+  var maybeError = error;
+  return maybeError.code === ERRORMESSAGE.UI_STATE_ERROR.code && maybeError.message === ELEMENT_DESTROYED_MESSAGE;
+};
 /**
  * HostSDKBridge 扩展 SDKBridge，暴露 setTarget 方法供 HOST 模式使用
  */
@@ -178,12 +189,15 @@ export var ModernElementController = /*#__PURE__*/function () {
     _defineProperty(this, "notRedirectAfterComplete", false);
     _defineProperty(this, "_sdkInitTime", Date.now());
     _defineProperty(this, "_mountStartTime", 0);
+    _defineProperty(this, "destroyCallbacks", []);
     /** 商户传入的金额覆盖（Apple Pay 弹窗展示用，实际扣款由服务端控制） */
     _defineProperty(this, "_merchantAmount", null);
     /** 商户传入的币种覆盖（Apple Pay 弹窗展示用） */
     _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) {
@@ -278,6 +292,12 @@ export var ModernElementController = /*#__PURE__*/function () {
               _yield$Promise$all = _context.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 1);
               setupConfig = _yield$Promise$all2[0];
+              if (!(this.status === 'destroyed')) {
+                _context.next = 29;
+                break;
+              }
+              throw getDestroyedError();
+            case 29:
               dataStructError = this.validateRenderData(setupConfig.renderData, setupConfig.renderDataError);
               if (dataStructError) {
                 setupConfig.renderDataError = dataStructError;
@@ -292,32 +312,40 @@ export var ModernElementController = /*#__PURE__*/function () {
               this.sendHandshake(setupConfig);
 
               // 5. 等待 HANDSHAKE_ACK
-              _context.next = 33;
+              _context.next = 35;
               return this.waitForHandshakeAck();
-            case 33:
+            case 35:
               this.setStatus('ready');
               this.flushCachedMessages();
               (_this$options$loading3 = this.options.loading) === null || _this$options$loading3 === void 0 || (_this$options$loading4 = _this$options$loading3.onEndLoading) === null || _this$options$loading4 === void 0 || _this$options$loading4.call(_this$options$loading3);
               if (!dataStructError) {
-                _context.next = 38;
+                _context.next = 40;
                 break;
               }
               return _context.abrupt("return", {
                 error: dataStructError
               });
-            case 38:
+            case 40:
               trackMount('mount_success', {
                 m1: this._mountStartTime ? Date.now() - this._mountStartTime : 0
               });
               return _context.abrupt("return", {});
-            case 42:
-              _context.prev = 42;
+            case 44:
+              _context.prev = 44;
               _context.t0 = _context["catch"](8);
+              (_this$options$loading5 = this.options.loading) === null || _this$options$loading5 === void 0 || (_this$options$loading6 = _this$options$loading5.onEndLoading) === null || _this$options$loading6 === void 0 || _this$options$loading6.call(_this$options$loading5);
+              if (!isDestroyedError(_context.t0)) {
+                _context.next = 49;
+                break;
+              }
+              return _context.abrupt("return", {
+                error: _context.t0
+              });
+            case 49:
               trackError('mount_error', {
                 d1: (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code) || 'UNKNOWN',
                 d2: (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || ''
               });
-              (_this$options$loading5 = this.options.loading) === null || _this$options$loading5 === void 0 || (_this$options$loading6 = _this$options$loading5.onEndLoading) === null || _this$options$loading6 === void 0 || _this$options$loading6.call(_this$options$loading5);
               this.cleanup();
               errorResult = {
                 code: _context.t0.code || 'UNKNOWN',
@@ -327,11 +355,11 @@ export var ModernElementController = /*#__PURE__*/function () {
               return _context.abrupt("return", {
                 error: errorResult
               });
-            case 50:
+            case 54:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[8, 42]]);
+        }, _callee, this, [[8, 44]]);
       }));
       function mount(_x, _x2) {
         return _mount.apply(this, arguments);
@@ -356,7 +384,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           _this = this,
           _parseData$paymentMet,
           _sdkQueryResult$data;
-        var sessionData, parseData, isConnect, paymentSessionConfig, genSdkQueryPromise, genOneAccountQueryPromise, promises, _ref2, _ref3, sdkQueryResult, oneAccountQueryResult, _sdkQueryResult$error, _sdkQueryResult$error2, _oneAccountQueryResul, _oneAccountQueryResul2, preferredLocale, locale, renderDataError;
+        var sessionData, parseData, isConnect, 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;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -372,7 +400,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               request.setGlobalOptions({
                 hostSign: parseHostSign(sessionData),
                 env: this.options.environment,
-                sdkVersion: "0.0.1783663570-dev.6" || '',
+                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);
@@ -405,13 +433,20 @@ export var ModernElementController = /*#__PURE__*/function () {
                 }));
               };
               promises = isConnect ? [genSdkQueryPromise(), genOneAccountQueryPromise()] : [genSdkQueryPromise(), undefined];
-              _context2.next = 13;
-              return Promise.all(promises);
-            case 13:
-              _ref2 = _context2.sent;
-              _ref3 = _slicedToArray(_ref2, 2);
-              sdkQueryResult = _ref3[0];
-              oneAccountQueryResult = _ref3[1];
+              cancelDestroyCallback = function cancelDestroyCallback() {};
+              destroyPromise = new Promise(function (_, reject) {
+                cancelDestroyCallback = _this.onDestroy(function () {
+                  return reject(getDestroyedError());
+                });
+              });
+              queryPromise = Promise.all(promises);
+              _context2.next = 16;
+              return Promise.race([queryPromise, destroyPromise]).finally(cancelDestroyCallback);
+            case 16:
+              _yield$Promise$race$f = _context2.sent;
+              _yield$Promise$race$f2 = _slicedToArray(_yield$Promise$race$f, 2);
+              sdkQueryResult = _yield$Promise$race$f2[0];
+              oneAccountQueryResult = _yield$Promise$race$f2[1];
               if (sdkQueryResult.error) {
                 trackHandshake('sdk_query_failed', {
                   d1: ((_sdkQueryResult$error = sdkQueryResult.error) === null || _sdkQueryResult$error === void 0 ? void 0 : _sdkQueryResult$error.code) || '',
@@ -461,7 +496,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 // 新sdk字段
                 locale: locale,
                 // 新sdk字段
-                sdkVersion: "0.0.1783663570-dev.6" || '',
+                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字段
@@ -471,7 +506,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   env: this.options.environment === 'sandbox' ? 'sandbox' : 'prod'
                 }, getDevReqConfig())
               });
-            case 23:
+            case 26:
             case "end":
               return _context2.stop();
           }
@@ -543,10 +578,10 @@ export var ModernElementController = /*#__PURE__*/function () {
       // 金额存在性校验
       var hasAmountViews = !!orderAmountView && !!paymentAmountView;
       if (!success) {
-        var _ref4 = renderData,
-          traceId = _ref4.traceId,
-          errorCode = _ref4.errorCode,
-          errorMessage = _ref4.errorMessage;
+        var _ref2 = renderData,
+          traceId = _ref2.traceId,
+          errorCode = _ref2.errorCode,
+          errorMessage = _ref2.errorMessage;
         return this.getLegacySdkQueryError({
           errorCode: errorCode,
           errorMessage: errorMessage,
@@ -580,7 +615,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       });
       this.bridge.on(MessageType.REDIRECT, function (payload, _ports, meta) {
         var _this2$iframe;
-        if ((meta === null || meta === void 0 ? void 0 : meta.source) !== ((_this2$iframe = _this2.iframe) === null || _this2$iframe === void 0 ? void 0 : _this2$iframe.contentWindow)) {
+        if (meta && meta.source !== ((_this2$iframe = _this2.iframe) === null || _this2$iframe === void 0 ? void 0 : _this2$iframe.contentWindow)) {
           return;
         }
         var url = payload.url,
@@ -635,13 +670,21 @@ export var ModernElementController = /*#__PURE__*/function () {
           fallbackJump();
         }
       });
-      this.bridge.on(MessageType.OPEN_MODAL, function (payload) {
+      this.bridge.on(MessageType.OPEN_MODAL, function (payload, _ports, meta) {
+        var _this2$iframe2;
+        if (meta && meta.source !== ((_this2$iframe2 = _this2.iframe) === null || _this2$iframe2 === void 0 ? void 0 : _this2$iframe2.contentWindow)) {
+          return;
+        }
         _this2.handleOpenModal(payload);
-        _this2.bridge.on(MessageType.CLOSE_MODAL, function () {
+        _this2.bridge.once(MessageType.CLOSE_MODAL, function () {
           _this2.handleCloseModal();
         });
       });
-      this.bridge.on(MessageType.DESTROY_ELEMENT, function () {
+      this.bridge.on(MessageType.DESTROY_ELEMENT, function (_payload, _ports, meta) {
+        var _this2$iframe3;
+        if (meta && meta.source !== ((_this2$iframe3 = _this2.iframe) === null || _this2$iframe3 === void 0 ? void 0 : _this2$iframe3.contentWindow)) {
+          return;
+        }
         _this2.destroy();
       });
 
@@ -771,12 +814,12 @@ export var ModernElementController = /*#__PURE__*/function () {
                     return validateMerchant;
                   }(),
                   onAuthorized: function () {
-                    var _onAuthorized = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
+                    var _onAuthorized = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref3) {
                       var token, billingContact, shippingContact, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue;
                       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
                         while (1) switch (_context4.prev = _context4.next) {
                           case 0:
-                            token = _ref5.token, billingContact = _ref5.billingContact, shippingContact = _ref5.shippingContact;
+                            token = _ref3.token, billingContact = _ref3.billingContact, shippingContact = _ref3.shippingContact;
                             if (!onBeforeConfirm) {
                               _context4.next = 18;
                               break;
@@ -1070,9 +1113,9 @@ export var ModernElementController = /*#__PURE__*/function () {
       var startTime = Date.now();
       executeWithTimeout(function () {
         return onBeforeConfirm();
-      }).then(function (_ref6) {
-        var rawResult = _ref6.result,
-          timedOut = _ref6.timedOut;
+      }).then(function (_ref4) {
+        var rawResult = _ref4.result,
+          timedOut = _ref4.timedOut;
         // 双重校验：timedOut（Promise race）+ startTime（实际时间差），与老 ElementController 对齐
         var shouldContinue = !timedOut && !!rawResult && Date.now() - startTime < BEFORE_CONFIRM_TIMEOUT_MS;
         if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
@@ -1112,7 +1155,9 @@ export var ModernElementController = /*#__PURE__*/function () {
     value: function waitForReadyHandshake() {
       var _this6 = this;
       return new Promise(function (resolve, reject) {
+        var cancelDestroyCallback = function cancelDestroyCallback() {};
         var timer = setTimeout(function () {
+          cancelDestroyCallback();
           trackError('ready_handshake_timeout', {
             d1: String(MOUNT_TIMEOUT)
           });
@@ -1121,9 +1166,14 @@ export var ModernElementController = /*#__PURE__*/function () {
             message: 'An error occurred; the transaction cannot be initiated.'
           });
         }, MOUNT_TIMEOUT);
+        cancelDestroyCallback = _this6.onDestroy(function () {
+          clearTimeout(timer);
+          reject(getDestroyedError());
+        });
         _this6.bridge.once(MessageType.READY_HANDSHAKE, function () {
           var _this6$iframe;
           clearTimeout(timer);
+          cancelDestroyCallback();
           if (!((_this6$iframe = _this6.iframe) !== null && _this6$iframe !== void 0 && _this6$iframe.contentWindow)) {
             trackError('iframe_contentwindow_unavailable', {
               d1: 'after_ready_handshake'
@@ -1163,7 +1213,9 @@ export var ModernElementController = /*#__PURE__*/function () {
     value: function waitForHandshakeAck() {
       var _this7 = this;
       return new Promise(function (resolve, reject) {
+        var cancelDestroyCallback = function cancelDestroyCallback() {};
         var timer = setTimeout(function () {
+          cancelDestroyCallback();
           trackError('handshake_ack_timeout', {
             d1: String(MOUNT_TIMEOUT)
           });
@@ -1172,8 +1224,13 @@ export var ModernElementController = /*#__PURE__*/function () {
             message: 'An error occurred; the transaction cannot be initiated.'
           });
         }, MOUNT_TIMEOUT);
+        cancelDestroyCallback = _this7.onDestroy(function () {
+          clearTimeout(timer);
+          reject(getDestroyedError());
+        });
         _this7.bridge.once(MessageType.HANDSHAKE_ACK, function () {
           clearTimeout(timer);
+          cancelDestroyCallback();
           trackHandshake('handshake_ack_received', {
             m1: _this7._mountStartTime ? Date.now() - _this7._mountStartTime : 0
           });
@@ -1185,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, _ref7, 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:
@@ -1207,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 序列化报错
-              _ref7 = params || {}, onBeforeConfirm = _ref7.onBeforeConfirm, serializableParams = _objectWithoutProperties(_ref7, _excluded2); // ── 非 Apple Pay：同步执行 onBeforeConfirm（submit 前拦截，对齐老 ElementController） ──
+              _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({
@@ -1219,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) {
@@ -1255,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'
               }, {
@@ -1281,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'
@@ -1293,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);
@@ -1313,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',
@@ -1339,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);
@@ -1453,8 +1538,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       trackElement('destroy', {
         d1: this.status
       });
-      if (this.status !== 'ready' && this.status !== 'mounted' && this.status !== 'mounting') {
-        debug('INFO', 'SDK_USAGE', 'destroy', "destroy called when status is ".concat(this.status, ", cannot destroy, only destroy when status is 'ready', 'mounted' or 'mounting'"));
+      if (this.status === 'initialized' || this.status === 'destroyed') {
         return;
       }
       this.handleCloseModal();
@@ -1462,6 +1546,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       if ((_this$iframe = this.iframe) !== null && _this$iframe !== void 0 && _this$iframe.parentNode) this.iframe.parentNode.removeChild(this.iframe);
       this.iframe = null;
       this.setStatus('destroyed');
+      this.runDestroyCallbacks();
       this.cachedSend = [];
     }
   }, {
@@ -1477,11 +1562,38 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "setStatus",
     value: function setStatus(status) {
       var _this$onStatusChange;
-      if (status === this.status) return;
+      // Mount promises and timers may settle after destroy, but destroyed is terminal.
+      if (this.status === 'destroyed' || status === this.status) return;
       var previousStatus = this.status;
       this.status = status;
       (_this$onStatusChange = this.onStatusChange) === null || _this$onStatusChange === void 0 || _this$onStatusChange.call(this, status, previousStatus);
     }
+  }, {
+    key: "onDestroy",
+    value: function onDestroy(callback) {
+      var _this10 = this;
+      if (this.status === 'destroyed') {
+        callback();
+        return function () {
+          return undefined;
+        };
+      }
+      this.destroyCallbacks.push(callback);
+      return function () {
+        _this10.destroyCallbacks = _this10.destroyCallbacks.filter(function (item) {
+          return item !== callback;
+        });
+      };
+    }
+  }, {
+    key: "runDestroyCallbacks",
+    value: function runDestroyCallbacks() {
+      var callbacks = this.destroyCallbacks;
+      this.destroyCallbacks = [];
+      callbacks.forEach(function (callback) {
+        return callback();
+      });
+    }
 
     /**
      * 带缓存的消息发送：当 status 不是 ready 时，缓存消息；ready 后由 flushCachedMessages 批量发送
@@ -1508,12 +1620,12 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "flushCachedMessages",
     value: function flushCachedMessages() {
-      var _this10 = this;
+      var _this11 = this;
       if (this.cachedSend.length > 0) {
-        this.cachedSend.forEach(function (_ref8) {
-          var type = _ref8.type,
-            payload = _ref8.payload;
-          _this10.bridge.send(type, payload);
+        this.cachedSend.forEach(function (_ref6) {
+          var type = _ref6.type,
+            payload = _ref6.payload;
+          _this11.bridge.send(type, payload);
         });
         this.cachedSend = [];
       }
@@ -1536,7 +1648,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       var _payload$appearance,
         _themeColorMap$appear,
         _payload$appearance2,
-        _this11 = this;
+        _this12 = this;
       // 清理已存在的 modal
       this.handleCloseModal();
       var mode = device.isMobile ? 'mobile' : 'desktop';
@@ -1582,7 +1694,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           onClose: payload.closeConfirm ? function () {
             return new Promise(function (resolve) {
               // closeConfirm 时等待确认关闭（由 CLOSE_MODAL 消息触发 resolve）
-              _this11._closeConfirmResolve = resolve;
+              _this12._closeConfirmResolve = resolve;
             });
           } : undefined
         })),
@@ -1601,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