@alipay/ams-checkout 0.0.1787898127-dev.2 → 0.0.1787898127-dev.21

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

@@ -1,12 +1,16 @@
 var _excluded = ["onStatusChange"],
   _excluded2 = ["onBeforeConfirm"];
-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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -29,22 +33,31 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { openModal, showToast, sdkQuery, getLocaleFromRenderData, getDevReqConfig, getMetaData, buildPageUrl, debugError, debug, MessageType, request, parseHostSign, SDKBridge, parseTrackerId, oneAccountQuery, OpenSDKError, awaitWrap, themeColorMap, ApplePayHostService, buildRecurringPaymentRequest, checkSessionData, sdkTracker, ModalPort } from "../../../../modern/tools";
+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, getModalMessageTrackData, 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";
+import CallApp from "../../../../util/intl-callapp/es/main";
+import { LogConfig, Logger } from "../../../../util/logger";
+import { getIdengineTimezone } from "../../../../util/timezone";
+import { v4 as uuid } from 'uuid';
 import { EventCallbackCode } from "../type";
-import { adaptSubmitResult, adaptAppearance } from "./adapter";
 import { safeParse } from "../util";
-import { v4 as uuid } from 'uuid';
+import { adaptAppearance, adaptSubmitResult } from "./adapter";
 
 // ============================================================
 // 埋点 helper（不改 opensdk 源码，复用 sdkTracker 单例，trackId 已自动注入）
-// code 规约：7982 + 阶段后缀，与 opensdk internalTracker 对齐
-//   7982mount / 7982handshake / 7982element / 7982（异常无后缀）
+// code 规约：7882 + 阶段后缀
+//   7882mount / 7882handshake / 7882element / 7882（异常无后缀）
 // 只插入调用，不影响任何运行逻辑
 // ============================================================
 
-var TRACK_CODE_PREFIX = '7982';
+var TRACK_CODE_PREFIX = '7882';
+var MODERN_CONTROLLER_ELEMENT_TYPE = 'payment_v1';
 
 /**
  * 优先取 sessionData 解析出的 clientId；
@@ -68,14 +81,17 @@ var resolveMerchantId = function resolveMerchantId(parseData) {
 };
 // reportApiEnd 留为模块级，merchant_id 改为显式参数（由 runApi 从实例传入），
 // 避免原模块级 _merchantId 的多实例共享竞争。track/trackXxx 已改为实例方法读 this.merchantId。
-var reportApiEnd = function reportApiEnd(api, durationMs, merchantId) {
-  var extra = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+var reportApiEnd = function reportApiEnd(api, durationMs, merchantId, productScene) {
+  var extra = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   try {
     sdkTracker.log(_objectSpread({
       code: "".concat(TRACK_CODE_PREFIX, "api"),
       msg: api,
       m1: durationMs,
-      merchant_id: merchantId
+      merchant_id: merchantId,
+      product_scene: productScene,
+      element_type: MODERN_CONTROLLER_ELEMENT_TYPE,
+      idengine_timezone: getIdengineTimezone()
     }, extra));
   } catch (_unused2) {
     /* 埋点失败绝不影响主流程 */
@@ -133,7 +149,7 @@ var normalizeApiInput = function normalizeApiInput(api, params) {
 // 统一包裹：捕获终态（resolve/reject）后上报，原值/原异常原样透传，不影响任何已有逻辑。
 // extraBuilder 供调用方注入实例上下文字段（如 paymentMethodType），其值覆盖 normalizeApiResult 结果。
 var runApi = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, fn, extraBuilder, inputExtra, merchantId) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(api, fn, extraBuilder, inputExtra, merchantId, productScene) {
     var startedAt, result;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -144,12 +160,12 @@ var runApi = /*#__PURE__*/function () {
           return fn();
         case 4:
           result = _context.sent;
-          reportApiEnd(api, Date.now() - startedAt, merchantId, _objectSpread(_objectSpread(_objectSpread({}, inputExtra), normalizeApiResult(api, result)), extraBuilder === null || extraBuilder === void 0 ? void 0 : extraBuilder(false)));
+          reportApiEnd(api, Date.now() - startedAt, merchantId, productScene, _objectSpread(_objectSpread(_objectSpread({}, inputExtra), normalizeApiResult(api, result)), extraBuilder === null || extraBuilder === void 0 ? void 0 : extraBuilder(false)));
           return _context.abrupt("return", result);
         case 9:
           _context.prev = 9;
           _context.t0 = _context["catch"](1);
-          reportApiEnd(api, Date.now() - startedAt, merchantId, _objectSpread(_objectSpread({}, inputExtra), {}, {
+          reportApiEnd(api, Date.now() - startedAt, merchantId, productScene, _objectSpread(_objectSpread({}, inputExtra), {}, {
             d1: 'error',
             d2: (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code) || 'UNKNOWN'
           }, extraBuilder === null || extraBuilder === void 0 ? void 0 : extraBuilder(true)));
@@ -160,17 +176,10 @@ var runApi = /*#__PURE__*/function () {
       }
     }, _callee, null, [[1, 9]]);
   }));
-  return function runApi(_x, _x2, _x3, _x4, _x5) {
+  return function runApi(_x, _x2, _x3, _x4, _x5, _x6) {
     return _ref.apply(this, arguments);
   };
 }();
-import CallApp from "../../../../util/intl-callapp/es/main";
-import { getApplePayPaymentSession } from "../../../../service";
-import { BusManager, BusMessage } from "../../../bus";
-import { ApplePayActionEnum } from "../../../bus/interface";
-import { ERRORMESSAGE, PROMISE_CALLBACK_CODE } from "../../../../constant";
-import { LogConfig, Logger } from "../../../../util/logger";
-import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../../../util/beforeConfirm";
 var recoverSdkQueryBusinessResponse = function recoverSdkQueryBusinessResponse(error) {
   var response = error === null || error === void 0 ? void 0 : error.response;
   if ((response === null || response === void 0 ? void 0 : response.success) === false) {
@@ -269,6 +278,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 +303,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);
     /**
@@ -300,6 +312,8 @@ export var ModernElementController = /*#__PURE__*/function () {
      * 实例隔离：多实例并发 mount 时各自持有，避免原模块级 _merchantId 的共享竞争。
      */
     _defineProperty(this, "merchantId", '');
+    /** session 中的真实业务场景，仅作为埋点公共维度，不参与业务判断。 */
+    _defineProperty(this, "productScene", '');
     this.options = options;
     this.onStatusChange = onStatusChange;
     if (options.sessionData) {
@@ -320,6 +334,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",
@@ -332,7 +352,10 @@ export var ModernElementController = /*#__PURE__*/function () {
         sdkTracker.log(_objectSpread({
           code: code,
           msg: msg,
-          merchant_id: this.merchantId
+          merchant_id: this.merchantId,
+          product_scene: this.productScene,
+          element_type: MODERN_CONTROLLER_ELEMENT_TYPE,
+          idengine_timezone: getIdengineTimezone()
         }, extra));
       } catch (_unused3) {
         /* 埋点失败绝不影响主流程 */
@@ -362,11 +385,44 @@ export var ModernElementController = /*#__PURE__*/function () {
       var extra = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       this.track('error', msg, extra);
     }
+  }, {
+    key: "createRequestTracker",
+    value: function createRequestTracker() {
+      var _this2 = this;
+      try {
+        var requestTracker = Object.create(sdkTracker);
+        requestTracker.log = function () {
+          try {
+            for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+              args[_key2] = arguments[_key2];
+            }
+            var event = args[0],
+              rest = args.slice(1);
+            if (event && _typeof(event) === 'object') {
+              sdkTracker.log.apply(sdkTracker, [_objectSpread(_objectSpread({}, event), {}, {
+                merchant_id: _this2.merchantId,
+                product_scene: _this2.productScene,
+                element_type: MODERN_CONTROLLER_ELEMENT_TYPE,
+                idengine_timezone: getIdengineTimezone()
+              })].concat(_toConsumableArray(rest)));
+              return;
+            }
+            sdkTracker.log.apply(sdkTracker, args);
+          } catch (_unused4) {
+            /* 埋点失败绝不影响请求 */
+          }
+        };
+        return requestTracker;
+      } catch (_unused5) {
+        return sdkTracker;
+      }
+    }
   }, {
     key: "mount",
     value: function () {
       var _mount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(renderOptions, sdkSelector) {
-        var _this = this;
+        var _this3 = this;
+        var _metaData$paymentSess, metaData;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -375,23 +431,25 @@ export var ModernElementController = /*#__PURE__*/function () {
               // 缺失/无效时会 throw，这里容错吞掉——失败的校验仍由后续 setup() 内的 checkSessionData
               // 抛出、走 mount_error 统一上报，不改变错误时序。
               try {
-                this.merchantId = resolveMerchantId(checkSessionData(this.options.sessionData, 'ELEMENT_PAYMENT'));
-              } catch (_unused4) {
+                metaData = checkSessionData(this.options.sessionData, 'ELEMENT_PAYMENT');
+                this.merchantId = resolveMerchantId(metaData);
+                this.productScene = (metaData === null || metaData === void 0 || (_metaData$paymentSess = metaData.paymentSessionConfig) === null || _metaData$paymentSess === void 0 ? void 0 : _metaData$paymentSess.productScene) || '';
+              } catch (_unused6) {
                 /* setup 校验异常会统一上报 */
               }
               return _context2.abrupt("return", runApi('mount', function () {
-                return _this.doMount(renderOptions, sdkSelector);
+                return _this3.doMount(renderOptions, sdkSelector);
               }, undefined, normalizeApiInput('mount', {
                 renderOptions: renderOptions,
                 sdkSelector: sdkSelector
-              }), this.merchantId));
+              }), this.merchantId, this.productScene));
             case 2:
             case "end":
               return _context2.stop();
           }
         }, _callee2, this);
       }));
-      function mount(_x6, _x7) {
+      function mount(_x7, _x8) {
         return _mount.apply(this, arguments);
       }
       return mount;
@@ -445,7 +503,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   if (iframeOrigin && iframeOrigin !== 'null') {
                     this.bridge.setOrigin(iframeOrigin);
                   }
-                } catch (_unused5) {
+                } catch (_unused7) {
                   // URL 解析失败时保持默认 origin
                 }
               } else {
@@ -538,7 +596,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           }
         }, _callee3, this, [[8, 44]]);
       }));
-      function doMount(_x8, _x9) {
+      function doMount(_x9, _x10) {
         return _doMount.apply(this, arguments);
       }
       return doMount;
@@ -557,8 +615,9 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "setup",
     value: (function () {
       var _setup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(renderOptions) {
-        var _parseData$connectFac,
-          _this2 = this,
+        var _parseData$paymentSes,
+          _parseData$connectFac,
+          _this4 = 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;
@@ -572,18 +631,20 @@ export var ModernElementController = /*#__PURE__*/function () {
               sessionData = this.options.sessionData; // checkSessionData 失败会 throw AntomSDKError（SESSION_DATA_INVALID），
               // 冒泡到 mount 的 catch 由 mount_error 统一上报，此处无需额外处理
               parseData = checkSessionData(sessionData, 'ELEMENT_PAYMENT');
+              this.merchantId || (this.merchantId = resolveMerchantId(parseData));
+              this.productScene = (parseData === null || parseData === void 0 || (_parseData$paymentSes = parseData.paymentSessionConfig) === null || _parseData$paymentSes === void 0 ? void 0 : _parseData$paymentSes.productScene) || '';
               lastEnv = this.options.environment === 'sandbox' ? 'sandbox' : 'prod';
               this.options.environment;
 
               // 初始化 request 全局配置，使 sdkQuery 能正确发起请求
-              // tracker: sdkTracker —— 接入 HTTP 层自动埋点（B 套），上报每个请求的成败/RTT/错误码
-              // 与 antom.ts 入口对齐；不传则 sdkQuery/submitPay/inquiry 等网络细节不可观测
+              // 实例级 tracker wrapper 接入 HTTP 自动埋点，并仅在日志中补齐 controller 公共维度。
+              // 不传 tracker 则 sdkQuery/submitPay/inquiry 等网络细节不可观测。
               request.setGlobalOptions(_objectSpread(_objectSpread({
                 hostSign: parseHostSign(sessionData),
                 env: lastEnv
               }, getDevReqConfig()), {}, {
-                sdkVersion: "0.0.1787898127-dev.2" || '',
-                tracker: sdkTracker
+                sdkVersion: "0.0.1787898127-dev.21" || '',
+                tracker: this.createRequestTracker()
               }));
               isConnect = !!(parseData !== null && parseData !== void 0 && (_parseData$connectFac = parseData.connectFactor) !== null && _parseData$connectFac !== void 0 && _parseData$connectFac.enableConnect);
               shouldQueryOneAccountFlag = shouldQueryOneAccount(isConnect, parseData === null || parseData === void 0 ? void 0 : parseData.extendInfo);
@@ -595,14 +656,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: _this4.notRedirectAfterComplete,
                   // sdk需要传入该字段
                   paymentSessionConfig: parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig,
                   paymentSessionData: sessionData
                 }, {
                   // 传商户初始化的 locale，服务端据此返回对应语言（缺失则回落用户偏好/en_US）
                   envInfo: {
-                    locale: _this2.options.locale
+                    locale: _this4.options.locale
                   }
                 }).catch(recoverSdkQueryBusinessResponse));
               };
@@ -618,14 +679,14 @@ export var ModernElementController = /*#__PURE__*/function () {
               promises = shouldQueryOneAccountFlag ? [genSdkQueryPromise(), genOneAccountQueryPromise()] : [genSdkQueryPromise(), undefined];
               cancelDestroyCallback = function cancelDestroyCallback() {};
               destroyPromise = new Promise(function (_, reject) {
-                cancelDestroyCallback = _this2.onDestroy(function () {
+                cancelDestroyCallback = _this4.onDestroy(function () {
                   return reject(getDestroyedError());
                 });
               });
               queryPromise = Promise.all(promises);
-              _context4.next = 19;
+              _context4.next = 21;
               return Promise.race([queryPromise, destroyPromise]).finally(cancelDestroyCallback);
-            case 19:
+            case 21:
               _yield$Promise$race$f = _context4.sent;
               _yield$Promise$race$f2 = _slicedToArray(_yield$Promise$race$f, 2);
               sdkQueryResult = _yield$Promise$race$f2[0];
@@ -680,7 +741,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                 // 新sdk字段
                 locale: locale,
                 // 新sdk字段
-                sdkVersion: "0.0.1787898127-dev.2" || '',
+                sdkVersion: "0.0.1787898127-dev.21" || '',
                 // 新sdk字段
                 merchantId: (sdkQueryResult === null || sdkQueryResult === void 0 || (_sdkQueryResult$data = sdkQueryResult.data) === null || _sdkQueryResult$data === void 0 ? void 0 : _sdkQueryResult$data.merchantId) || '',
                 // 新sdk字段
@@ -690,13 +751,13 @@ export var ModernElementController = /*#__PURE__*/function () {
                   env: lastEnv
                 }, getDevReqConfig())
               });
-            case 29:
+            case 31:
             case "end":
               return _context4.stop();
           }
         }, _callee4, this);
       }));
-      function setup(_x10) {
+      function setup(_x11) {
         return _setup.apply(this, arguments);
       }
       return setup;
@@ -793,20 +854,20 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "bindBridgeEvents",
     value: function bindBridgeEvents() {
-      var _this3 = this;
+      var _this5 = this;
       this.bridge.on(MessageType.HEIGHT_UPDATE, function (height) {
-        if (_this3.iframe) _this3.iframe.style.height = "".concat(height, "px");
+        if (_this5.iframe) _this5.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 _this5$iframe, _this5$modalIframe;
+        if (meta && meta.source !== ((_this5$iframe = _this5.iframe) === null || _this5$iframe === void 0 ? void 0 : _this5$iframe.contentWindow) && meta.source !== ((_this5$modalIframe = _this5.modalIframe) === null || _this5$modalIframe === void 0 ? void 0 : _this5$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 _this5$iframe2, _this5$modalIframe2;
+        if (meta && meta.source !== ((_this5$iframe2 = _this5.iframe) === null || _this5$iframe2 === void 0 ? void 0 : _this5$iframe2.contentWindow) && meta.source !== ((_this5$modalIframe2 = _this5.modalIframe) === null || _this5$modalIframe2 === void 0 ? void 0 : _this5$modalIframe2.contentWindow)) {
           return;
         }
         var url = payload.url,
@@ -815,7 +876,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', {
+        _this5.trackElement('redirect', {
           d1: mode || 'redirect',
           d2: appLinkUrl ? 'app_link' : schemaUrl ? 'schema' : 'url',
           d3: url || '',
@@ -824,7 +885,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           d6: destroy ? '1' : '0'
         });
         if (destroy) {
-          _this3.destroy();
+          _this5.destroy();
         }
         function fallbackJump() {
           if (mode === 'replace') {
@@ -838,7 +899,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             var app = new CallApp({
               resultJudgmentTime: 2000,
               fallback: function fallback() {
-                _this3.trackElement('redirect_fallback', {
+                _this5.trackElement('redirect_fallback', {
                   d1: 'callapp_failed',
                   d2: url || ''
                 });
@@ -853,7 +914,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             fallbackJump();
           }
         } catch (error) {
-          _this3.trackError('redirect_error', {
+          _this5.trackError('redirect_error', {
             d1: 'callapp_exception',
             d2: (error === null || error === void 0 ? void 0 : error.message) || '',
             d3: url || ''
@@ -862,34 +923,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 _this5$iframe3;
+        if (meta && meta.source !== ((_this5$iframe3 = _this5.iframe) === null || _this5$iframe3 === void 0 ? void 0 : _this5$iframe3.contentWindow)) {
           return;
         }
-        _this3.handleOpenModal(payload);
-        _this3.bridge.once(MessageType.CLOSE_MODAL, function () {
-          _this3.handleCloseModal();
+        _this5.handleOpenModal(payload);
+        _this5.bridge.once(MessageType.CLOSE_MODAL, function () {
+          _this5.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 _this5$iframe4;
+        if (meta && meta.source !== ((_this5$iframe4 = _this5.iframe) === null || _this5$iframe4 === void 0 ? void 0 : _this5$iframe4.contentWindow)) {
           return;
         }
-        _this3.destroy();
+        _this5.destroy();
       });
 
       // skipRenderPaymentMethod 场景：webapp 委托 SDK 全权拉起 ApplePay,fire-and-forget
       // 走 plugin/applepay 标准链路(onEventCallback 自动通知商户)
       this.bridge.on(AMSMessageType.HANDLE_PAYMENT, function () {
-        _this3.handleHandlePayment();
+        _this5.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) || '';
+        _this5.currentPaymentMethodType = (payload === null || payload === void 0 ? void 0 : payload.type) || '';
       });
     }
 
@@ -903,7 +964,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     value: (function () {
       var _handleGetApplePayToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(payload, onBeforeConfirm) {
         var _paymentMethod,
-          _this4 = this;
+          _this6 = 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 +1036,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', {
+                            _this6.trackElement('applepay_validate_start', {
                               d1: 'merchant_validate'
                             });
                             _context5.next = 3;
@@ -984,7 +1045,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                               paymentSessionData: sessionData,
                               merchantDomain: window.location.hostname
                             }, {
-                              env: _this4.options.environment,
+                              env: _this6.options.environment,
                               envInfo: {
                                 deviceId: ''
                               }
@@ -995,12 +1056,12 @@ export var ModernElementController = /*#__PURE__*/function () {
                               _context5.next = 7;
                               break;
                             }
-                            _this4.trackElement('applepay_validate_success', {
+                            _this6.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', {
+                            _this6.trackError('applepay_merchant_validate_failed', {
                               d1: 'VALIDATION_FAILED',
                               d2: (res === null || res === void 0 ? void 0 : res.errorMessage) || 'Merchant validation failed'
                             });
@@ -1013,20 +1074,20 @@ export var ModernElementController = /*#__PURE__*/function () {
                         }
                       }, _callee5);
                     }));
-                    function validateMerchant(_x13) {
+                    function validateMerchant(_x14) {
                       return _validateMerchant.apply(this, arguments);
                     }
                     return validateMerchant;
                   }(),
                   onAuthorized: function () {
                     var _onAuthorized = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref4) {
-                      var token, billingContact, shippingContact, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue;
+                      var token, billingContact, shippingContact, startTime, _yield$executeWithTim, rawResult, timedOut, isTimeout, shouldContinue;
                       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
                         while (1) switch (_context6.prev = _context6.next) {
                           case 0:
                             token = _ref4.token, billingContact = _ref4.billingContact, shippingContact = _ref4.shippingContact;
                             if (!onBeforeConfirm) {
-                              _context6.next = 18;
+                              _context6.next = 19;
                               break;
                             }
                             _context6.prev = 2;
@@ -1040,50 +1101,51 @@ export var ModernElementController = /*#__PURE__*/function () {
                             rawResult = _yield$executeWithTim.result;
                             timedOut = _yield$executeWithTim.timedOut;
                             // 双重校验：timedOut（Promise race）+ startTime（实际时间差），与老 ElementController 对齐
-                            shouldContinue = !timedOut && !!rawResult && Date.now() - startTime < BEFORE_CONFIRM_TIMEOUT_MS;
-                            if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
-                              _this4.trackError('sdk_before_confirm_timeout', {
+                            isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS;
+                            shouldContinue = !isTimeout && !!rawResult;
+                            if (isTimeout) {
+                              _this6.trackError('sdk_before_confirm_timeout', {
                                 d1: 'applePay_chrome_modern'
                               });
                             }
                             if (shouldContinue) {
-                              _context6.next = 13;
+                              _context6.next = 14;
                               break;
                             }
                             return _context6.abrupt("return", {
                               success: false,
-                              errorCode: 'MERCHANT_CONFIRM_ABORT'
+                              errorCode: isTimeout ? MERCHANT_CONFIRM_TIMEOUT_CODE : MERCHANT_CONFIRM_ABORT_CODE
                             });
-                          case 13:
-                            _context6.next = 18;
+                          case 14:
+                            _context6.next = 19;
                             break;
-                          case 15:
-                            _context6.prev = 15;
+                          case 16:
+                            _context6.prev = 16;
                             _context6.t0 = _context6["catch"](2);
                             return _context6.abrupt("return", {
                               success: false,
-                              errorCode: 'MERCHANT_CONFIRM_ABORT'
+                              errorCode: MERCHANT_CONFIRM_ABORT_CODE
                             });
-                          case 18:
+                          case 19:
                             capturedResult = {
                               token: token,
                               billingContact: billingContact,
                               shippingContact: shippingContact
                             };
-                            _this4.trackElement('applepay_authorized', {
+                            _this6.trackElement('applepay_authorized', {
                               d1: token ? 'has_token' : 'no_token'
                             });
                             return _context6.abrupt("return", {
                               success: true,
                               result: capturedResult
                             });
-                          case 21:
+                          case 22:
                           case "end":
                             return _context6.stop();
                         }
-                      }, _callee6, null, [[2, 15]]);
+                      }, _callee6, null, [[2, 16]]);
                     }));
-                    function onAuthorized(_x14) {
+                    function onAuthorized(_x15) {
                       return _onAuthorized.apply(this, arguments);
                     }
                     return onAuthorized;
@@ -1132,7 +1194,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           }
         }, _callee7, this, [[15, 22]]);
       }));
-      function handleGetApplePayToken(_x11, _x12) {
+      function handleGetApplePayToken(_x12, _x13) {
         return _handleGetApplePayToken.apply(this, arguments);
       }
       return handleGetApplePayToken;
@@ -1157,7 +1219,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "handleGetGooglePayToken",
     value: function handleGetGooglePayToken(payload) {
       var _data$paymentMethodDe,
-        _this5 = this,
+        _this7 = 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;
@@ -1201,10 +1263,10 @@ export var ModernElementController = /*#__PURE__*/function () {
           };
         }).then(function (paymentData) {
           if (paymentData) {
-            _this5.trackElement('googlepay_token_success', {
+            _this7.trackElement('googlepay_token_success', {
               d1: 'has_token'
             });
-            _this5.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
+            _this7.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
               success: true,
               result: paymentData
             });
@@ -1212,16 +1274,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', {
+            _this7.trackElement('googlepay_cancel', {
               d1: 'user_cancel'
             });
           } else {
-            _this5.trackError('googlepay_token_failed', {
+            _this7.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, {
+          _this7.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
             success: false,
             err: _objectSpread({
               statusCode: statusCode
@@ -1253,10 +1315,10 @@ export var ModernElementController = /*#__PURE__*/function () {
         loadAndPay();
       };
       script.onerror = function () {
-        _this5.trackError('googlepay_script_load_failed', {
+        _this7.trackError('googlepay_script_load_failed', {
           d1: 'script_error'
         });
-        _this5.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
+        _this7.bridge.send(AMSMessageType.GET_GOOGLE_PAY_TOKEN_REPLY, {
           success: false,
           err: {
             statusCode: 'GOOGLE_PAY_NOT_SUPPORTED'
@@ -1305,7 +1367,7 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "handleBeforeConfirmInternal",
     value: function handleBeforeConfirmInternal(onBeforeConfirm) {
-      var _this6 = this;
+      var _this8 = this;
       if (!onBeforeConfirm) {
         logger.logInfo({
           title: 'sdk_before_confirm_skip'
@@ -1330,8 +1392,9 @@ export var ModernElementController = /*#__PURE__*/function () {
         var rawResult = _ref5.result,
           timedOut = _ref5.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) {
+        var isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS;
+        var shouldContinue = !isTimeout && !!rawResult;
+        if (isTimeout) {
           logger.logError({
             title: 'sdk_before_confirm_timeout'
           });
@@ -1341,10 +1404,12 @@ export var ModernElementController = /*#__PURE__*/function () {
         }, {
           shouldContinue: shouldContinue
         });
-        _this6.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, {
+        _this8.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, _objectSpread({
           success: true,
           result: !!shouldContinue
-        });
+        }, isTimeout ? {
+          isTimeout: true
+        } : {}));
       }).catch(function (error) {
         logger.logError({
           title: 'sdk_before_confirm_error'
@@ -1352,7 +1417,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, {
+        _this8.bridge.send(AMSMessageType.BEFORE_CONFIRM_REPLY, {
           success: false,
           result: false
         });
@@ -1366,12 +1431,12 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "waitForReadyHandshake",
     value: function waitForReadyHandshake() {
-      var _this7 = this;
+      var _this9 = this;
       return new Promise(function (resolve, reject) {
         var cancelDestroyCallback = function cancelDestroyCallback() {};
         var timer = setTimeout(function () {
           cancelDestroyCallback();
-          _this7.trackError('ready_handshake_timeout', {
+          _this9.trackError('ready_handshake_timeout', {
             d1: String(MOUNT_TIMEOUT)
           });
           reject({
@@ -1379,16 +1444,16 @@ export var ModernElementController = /*#__PURE__*/function () {
             message: 'An error occurred; the transaction cannot be initiated.'
           });
         }, MOUNT_TIMEOUT);
-        cancelDestroyCallback = _this7.onDestroy(function () {
+        cancelDestroyCallback = _this9.onDestroy(function () {
           clearTimeout(timer);
           reject(getDestroyedError());
         });
-        _this7.bridge.once(MessageType.READY_HANDSHAKE, function () {
-          var _this7$iframe;
+        _this9.bridge.once(MessageType.READY_HANDSHAKE, function () {
+          var _this9$iframe;
           clearTimeout(timer);
           cancelDestroyCallback();
-          if (!((_this7$iframe = _this7.iframe) !== null && _this7$iframe !== void 0 && _this7$iframe.contentWindow)) {
-            _this7.trackError('iframe_contentwindow_unavailable', {
+          if (!((_this9$iframe = _this9.iframe) !== null && _this9$iframe !== void 0 && _this9$iframe.contentWindow)) {
+            _this9.trackError('iframe_contentwindow_unavailable', {
               d1: 'after_ready_handshake'
             });
             reject({
@@ -1397,9 +1462,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
+          _this9.bridge.setTarget(_this9.iframe.contentWindow);
+          _this9.trackHandshake('ready_handshake_received', {
+            m1: _this9._mountStartTime ? Date.now() - _this9._mountStartTime : 0
           });
           resolve();
         });
@@ -1424,12 +1489,12 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "waitForHandshakeAck",
     value: function waitForHandshakeAck() {
-      var _this8 = this;
+      var _this10 = this;
       return new Promise(function (resolve, reject) {
         var cancelDestroyCallback = function cancelDestroyCallback() {};
         var timer = setTimeout(function () {
           cancelDestroyCallback();
-          _this8.trackError('handshake_ack_timeout', {
+          _this10.trackError('handshake_ack_timeout', {
             d1: String(MOUNT_TIMEOUT)
           });
           reject({
@@ -1437,15 +1502,15 @@ export var ModernElementController = /*#__PURE__*/function () {
             message: 'An error occurred; the transaction cannot be initiated.'
           });
         }, MOUNT_TIMEOUT);
-        cancelDestroyCallback = _this8.onDestroy(function () {
+        cancelDestroyCallback = _this10.onDestroy(function () {
           clearTimeout(timer);
           reject(getDestroyedError());
         });
-        _this8.bridge.once(MessageType.HANDSHAKE_ACK, function () {
+        _this10.bridge.once(MessageType.HANDSHAKE_ACK, function () {
           clearTimeout(timer);
           cancelDestroyCallback();
-          _this8.trackHandshake('handshake_ack_received', {
-            m1: _this8._mountStartTime ? Date.now() - _this8._mountStartTime : 0
+          _this10.trackHandshake('handshake_ack_received', {
+            m1: _this10._mountStartTime ? Date.now() - _this10._mountStartTime : 0
           });
           resolve();
         });
@@ -1455,24 +1520,24 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "submitPayment",
     value: function () {
       var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(params) {
-        var _this9 = this;
+        var _this11 = 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 _this11.doSubmitPayment(params);
               }, function () {
-                return _this9.currentPaymentMethodType ? {
-                  d4: _this9.currentPaymentMethodType
+                return _this11.currentPaymentMethodType ? {
+                  d4: _this11.currentPaymentMethodType
                 } : {};
-              }, normalizeApiInput('submitPayment', params), this.merchantId));
+              }, normalizeApiInput('submitPayment', params), this.merchantId, this.productScene));
             case 1:
             case "end":
               return _context8.stop();
           }
         }, _callee8, this);
       }));
-      function submitPayment(_x15) {
+      function submitPayment(_x16) {
         return _submitPayment.apply(this, arguments);
       }
       return submitPayment;
@@ -1481,8 +1546,8 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "doSubmitPayment",
     value: function () {
       var _doSubmitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(params) {
-        var _this10 = this;
-        var _this$options$loading7, _this$options$loading8, isApplePay, _ref6, onBeforeConfirm, serializableParams, startTime, _yield$executeWithTim2, shouldContinue, timedOut, hasBeforeConfirmForApplePay, hasAmount, hasCurrency, cleanups, _result$error5, resultPromise, result, _this$options$loading9, _this$options$loading10;
+        var _this12 = 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) {
             case 0:
@@ -1519,7 +1584,7 @@ export var ModernElementController = /*#__PURE__*/function () {
               isApplePay = this.currentPaymentMethodType === 'APPLEPAY'; // 剥除 onBeforeConfirm 函数，避免 postMessage 序列化报错
               _ref6 = params || {}, onBeforeConfirm = _ref6.onBeforeConfirm, serializableParams = _objectWithoutProperties(_ref6, _excluded2); // ── 非 Apple Pay：同步执行 onBeforeConfirm（submit 前拦截，对齐老 ElementController） ──
               if (!(onBeforeConfirm && !isApplePay)) {
-                _context9.next = 31;
+                _context9.next = 32;
                 break;
               }
               logger.logInfo({
@@ -1538,11 +1603,13 @@ export var ModernElementController = /*#__PURE__*/function () {
               _yield$executeWithTim2 = _context9.sent;
               shouldContinue = _yield$executeWithTim2.result;
               timedOut = _yield$executeWithTim2.timedOut;
-              if (!(timedOut || !shouldContinue || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS)) {
-                _context9.next = 22;
+              // 双重校验：timedOut（Promise race）+ startTime（实际时间差），防止竞态误判
+              isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS;
+              if (!(isTimeout || !shouldContinue)) {
+                _context9.next = 23;
                 break;
               }
-              if (timedOut) {
+              if (isTimeout) {
                 logger.logError({
                   title: 'sdk_before_confirm_timeout'
                 }, {
@@ -1560,21 +1627,22 @@ export var ModernElementController = /*#__PURE__*/function () {
               return _context9.abrupt("return", {
                 status: 'FAIL',
                 error: {
-                  code: 'MERCHANT_CONFIRM_ABORT',
-                  message: 'Merchant canceled payment.'
+                  code: isTimeout ? MERCHANT_CONFIRM_TIMEOUT_CODE : MERCHANT_CONFIRM_ABORT_CODE,
+                  message: isTimeout ? 'Merchant confirmation timed out.' : 'Merchant canceled payment.',
+                  needChangeSessionForRetry: false
                 }
               });
-            case 22:
+            case 23:
               logger.logInfo({
                 title: 'sdk_before_confirm_success'
               }, {
                 paymentMethodType: this.currentPaymentMethodType || 'UNKNOWN',
                 path: 'nonApplePay_sync'
               });
-              _context9.next = 29;
+              _context9.next = 30;
               break;
-            case 25:
-              _context9.prev = 25;
+            case 26:
+              _context9.prev = 26;
               _context9.t0 = _context9["catch"](12);
               logger.logError({
                 title: 'sdk_before_confirm_error'
@@ -1586,14 +1654,15 @@ export var ModernElementController = /*#__PURE__*/function () {
               return _context9.abrupt("return", {
                 status: 'FAIL',
                 error: {
-                  code: 'MERCHANT_CONFIRM_ABORT',
-                  message: 'Merchant canceled payment.'
+                  code: MERCHANT_CONFIRM_ABORT_CODE,
+                  message: 'Merchant canceled payment.',
+                  needChangeSessionForRetry: false
                 }
               });
-            case 29:
-              _context9.next = 32;
+            case 30:
+              _context9.next = 33;
               break;
-            case 31:
+            case 32:
               if (!onBeforeConfirm) {
                 logger.logInfo({
                   title: 'sdk_before_confirm_skip'
@@ -1602,7 +1671,7 @@ export var ModernElementController = /*#__PURE__*/function () {
                   path: isApplePay ? 'applePay_eventBridge' : 'nonApplePay_sync'
                 });
               }
-            case 32:
+            case 33:
               // Apple Pay: 标记是否有 beforeConfirm，供 SUBMIT 消息的 hasBeforeConfirm 字段使用
               hasBeforeConfirmForApplePay = isApplePay && !!onBeforeConfirm; // ── amount/currency 校验 + 缓存（对齐老 ElementController 逻辑） ──
               hasAmount = !!(serializableParams !== null && serializableParams !== void 0 && serializableParams.amount);
@@ -1626,24 +1695,24 @@ export var ModernElementController = /*#__PURE__*/function () {
               // 未命中的 once wrapper 绑着旧闭包（旧 onBeforeConfirm / 旧 resolve）会残留并串扰后续提交，
               // 在 submit 终态统一释放（二次 off 幂等，已命中的 once 已自行 off）。
               cleanups = [];
-              _context9.prev = 41;
+              _context9.prev = 42;
               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(_this12.bridge.once(AMSMessageType.GET_APPLE_PAY_TOKEN, function (payload) {
+                  _this12.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(_this12.bridge.once(AMSMessageType.GET_GOOGLE_PAY_TOKEN, function (payload) {
+                  _this12.handleGetGooglePayToken(payload);
                 }));
                 // Safari：webapp 请求执行商户 onBeforeConfirm 回调
-                cleanups.push(_this10.bridge.once(AMSMessageType.BEFORE_CONFIRM, function () {
-                  _this10.handleBeforeConfirmInternal(onBeforeConfirm || null);
+                cleanups.push(_this12.bridge.once(AMSMessageType.BEFORE_CONFIRM, function () {
+                  _this12.handleBeforeConfirmInternal(onBeforeConfirm || null);
                 }));
-                cleanups.push(_this10.bridge.once(MessageType.SUBMIT_REPLY, resolve));
+                cleanups.push(_this12.bridge.once(MessageType.SUBMIT_REPLY, resolve));
               }); // 监听注册完成后再发送 SUBMIT，确保不会遗漏快速响应
               this.send(MessageType.SUBMIT, _objectSpread(_objectSpread({}, serializableParams), {}, {
                 redirect: this.notRedirectAfterComplete ? 'if_required' : 'always',
@@ -1652,45 +1721,45 @@ export var ModernElementController = /*#__PURE__*/function () {
                 amount: serializableParams.amount,
                 currency: serializableParams.currency
               } : {}));
-              _context9.next = 46;
+              _context9.next = 47;
               return resultPromise;
-            case 46:
+            case 47:
               result = _context9.sent;
               this.trackElement('submit_reply', {
                 d1: (result === null || result === void 0 ? void 0 : result.status) || '',
                 d2: (result === null || result === void 0 || (_result$error5 = result.error) === null || _result$error5 === void 0 ? void 0 : _result$error5.code) || ''
               });
               return _context9.abrupt("return", adaptSubmitResult(result));
-            case 51:
-              _context9.prev = 51;
-              _context9.t1 = _context9["catch"](41);
+            case 52:
+              _context9.prev = 52;
+              _context9.t1 = _context9["catch"](42);
               this.trackError('submit_error', {
                 d1: (_context9.t1 === null || _context9.t1 === void 0 ? void 0 : _context9.t1.code) || 'UNKNOWN',
                 d2: (_context9.t1 === null || _context9.t1 === void 0 ? void 0 : _context9.t1.message) || ''
               });
               throw _context9.t1;
-            case 55:
-              _context9.prev = 55;
+            case 56:
+              _context9.prev = 56;
               cleanups.forEach(function (fn) {
                 try {
                   fn();
-                } catch (_unused7) {
+                } catch (_unused9) {
                   /* 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 _context9.finish(55);
-            case 59:
-              _context9.prev = 59;
+              return _context9.finish(56);
+            case 60:
+              _context9.prev = 60;
               this.isSubmitting = false;
-              return _context9.finish(59);
-            case 62:
+              return _context9.finish(60);
+            case 63:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, this, [[7,, 59, 62], [12, 25], [41, 51, 55, 59]]);
+        }, _callee9, this, [[7,, 60, 63], [12, 26], [42, 52, 56, 60]]);
       }));
-      function doSubmitPayment(_x16) {
+      function doSubmitPayment(_x17) {
         return _doSubmitPayment.apply(this, arguments);
       }
       return doSubmitPayment;
@@ -1699,13 +1768,13 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "validateFields",
     value: function () {
       var _validateFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-        var _this11 = this;
+        var _this13 = 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();
-              }, undefined, undefined, this.merchantId));
+                return _this13.doValidateFields();
+              }, undefined, undefined, this.merchantId, this.productScene));
             case 1:
             case "end":
               return _context10.stop();
@@ -1721,7 +1790,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "doValidateFields",
     value: function () {
       var _doValidateFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-        var _this12 = this;
+        var _this14 = this;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -1739,17 +1808,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', {
+                  _this14.trackError('validate_fields_timeout', {
                     d1: '15000'
                   });
                   resolve({
                     isValid: false
                   });
                 }, 15000);
-                _this12.bridge.once(AMSMessageType.VALIDATE_REPLY, function (payload) {
+                _this14.bridge.once(AMSMessageType.VALIDATE_REPLY, function (payload) {
                   clearTimeout(timer);
                   var isValid = !!(payload !== null && payload !== void 0 && payload.isValid);
-                  _this12.trackElement('validate_result', {
+                  _this14.trackElement('validate_result', {
                     d1: isValid ? 'valid' : 'invalid'
                   });
                   resolve(payload || {
@@ -1782,7 +1851,7 @@ export var ModernElementController = /*#__PURE__*/function () {
           }
         }, _callee12);
       }));
-      function updatePayment(_x17) {
+      function updatePayment(_x18) {
         return _updatePayment.apply(this, arguments);
       }
       return updatePayment;
@@ -1795,16 +1864,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();
@@ -1813,8 +1883,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 = [];
@@ -1832,7 +1902,7 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "onDestroy",
     value: function onDestroy(callback) {
-      var _this13 = this;
+      var _this15 = this;
       if (this.status === 'destroyed') {
         callback();
         return function () {
@@ -1841,7 +1911,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       }
       this.destroyCallbacks.push(callback);
       return function () {
-        _this13.destroyCallbacks = _this13.destroyCallbacks.filter(function (item) {
+        _this15.destroyCallbacks = _this15.destroyCallbacks.filter(function (item) {
           return item !== callback;
         });
       };
@@ -1881,12 +1951,12 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "flushCachedMessages",
     value: function flushCachedMessages() {
-      var _this14 = this;
+      var _this16 = this;
       if (this.cachedSend.length > 0) {
         this.cachedSend.forEach(function (_ref7) {
           var type = _ref7.type,
             payload = _ref7.payload;
-          _this14.bridge.send(type, payload);
+          _this16.bridge.send(type, payload);
         });
         this.cachedSend = [];
       }
@@ -1909,7 +1979,7 @@ export var ModernElementController = /*#__PURE__*/function () {
       var _payload$appearance,
         _themeColorMap$appear,
         _payload$appearance2,
-        _this15 = this;
+        _this17 = this;
       // 清理已存在的 modal
       this.handleCloseModal();
       var mode = device.isMobile ? 'mobile' : 'desktop';
@@ -1943,9 +2013,10 @@ export var ModernElementController = /*#__PURE__*/function () {
       // 从 appearance 提取主题信息，组装 loadingConfig（对齐 antom.ts openModal 的处理逻辑）
       var appearanceTheme = (payload === null || payload === void 0 || (_payload$appearance = payload.appearance) === null || _payload$appearance === void 0 ? void 0 : _payload$appearance.theme) || 'default';
       var themeConfig = (_themeColorMap$appear = themeColorMap[appearanceTheme]) !== null && _themeColorMap$appear !== void 0 ? _themeColorMap$appear : themeColorMap.default;
+      var appearanceVariables = payload === null || payload === void 0 || (_payload$appearance2 = payload.appearance) === null || _payload$appearance2 === void 0 ? void 0 : _payload$appearance2.variables;
       var loadingConfig = {
         theme: themeConfig.theme,
-        backgroundColor: (payload === null || payload === void 0 || (_payload$appearance2 = payload.appearance) === null || _payload$appearance2 === void 0 || (_payload$appearance2 = _payload$appearance2.variables) === null || _payload$appearance2 === void 0 ? void 0 : _payload$appearance2['background-primary']) || themeConfig.backgroundColor
+        backgroundColor: (appearanceVariables === null || appearanceVariables === void 0 ? void 0 : appearanceVariables['color-background-primary']) || (appearanceVariables === null || appearanceVariables === void 0 ? void 0 : appearanceVariables['background-primary']) || themeConfig.backgroundColor
       };
 
       // 调用 openModal 工具函数创建 DOM（overlay + modal + iframe + 动画 + close icon + loading）
@@ -1964,7 +2035,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', {
+        _this17.trackElement('modal_loaded', {
           d1: payload.url
         });
         // 确保 target 已设置（如果 load 事件尚未触发，在此设置）
@@ -1975,7 +2046,7 @@ export var ModernElementController = /*#__PURE__*/function () {
             if (iframeOrigin && iframeOrigin !== 'null') {
               modalBridge.setOrigin(iframeOrigin);
             }
-          } catch (_unused8) {
+          } catch (_unused10) {
             // URL 解析失败时保持默认 origin
           }
           // 如果 payload 有 appearance，通过 TRANSFER_MODAL_APPEARANCE 消息发送给 modal
@@ -1993,13 +2064,13 @@ export var ModernElementController = /*#__PURE__*/function () {
       this.modalIframe = iframe;
       this.modalDestroy = function () {
         if (payload.closeConfirm) {
-          _this15.trackElement('modal_close_confirm', {
+          _this17.trackElement('modal_close_confirm', {
             d1: 'confirm_resolved'
           });
         }
         destroy();
         offReady();
-        _this15.modalIframe = null;
+        _this17.modalIframe = null;
       };
     }