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

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

@@ -2,6 +2,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 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; }
@@ -19,22 +25,16 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-import { MessageType } from '@antintl/opensdk-core';
-import { SDKBridge } from '@antintl/opensdk-bridge';
-import { request, parseHostSign } from '@antintl/antom-toolset';
+import { openModal, sdkQuery, getLocaleFromRenderData, getDevReqConfig, getMetaData, buildPageUrl, debugError, debug, MessageType, request, parseHostSign, SDKBridge, parseTrackerId, oneAccountQuery, OpenSDKError, awaitWrap, themeColorMap } from "../../../../modern/tools";
 import { device } from "../../../../util";
-import { openModal } from "../../../../modern/tools/openModal";
-import { sdkQuery } from "../../../../modern/oneapi/iexpfront/PaymentSessionService";
-import { getLocaleFromRenderData } from "../../../../modern/tools/getLocaleFromRenderData";
-import { getDevReqConfig } from "../../../../modern/tools/getDevReqConfig";
 import { EventCallbackCode } from "../type";
-import { adaptSubmitResult, adaptErrorToEventCallback, adaptAppearance } from "./adapter";
-import { getMetaData } from "../../../../modern/tools/getMetaData";
-import { debugError, debug } from '@antintl/opensdk-core';
-import { buildPageUrl } from "../../../../modern/tools/buildPageUrl";
-import { AntomSDKError } from "../../../../modern/tools/AntomSDKError";
+import { adaptSubmitResult, adaptAppearance } from "./adapter";
+import CallApp from "../../../../util/intl-callapp/es/main";
+import { ApplePayHostService } from "../../../../modern/sdk/applepay-core/ApplePayHostService";
+import { getApplePayPaymentSession } from "../../../../service";
+import { BusManager, BusMessage } from "../../../bus";
+import { ApplePayActionEnum } from "../../../bus/interface";
 var MOUNT_TIMEOUT = 16000;
-
 /**
  * HostSDKBridge 扩展 SDKBridge，暴露 setTarget 方法供 HOST 模式使用
  */
@@ -45,12 +45,12 @@ var HostSDKBridge = /*#__PURE__*/function (_SDKBridge) {
     _classCallCheck(this, HostSDKBridge);
     return _super.call(this, mode, scope);
   }
-
-  // 暴露 protected 的 setTarget 方法
   _createClass(HostSDKBridge, [{
-    key: "setTargetWindow",
-    value: function setTargetWindow(window) {
-      this.setTarget(window);
+    key: "setTarget",
+    value:
+    // 暴露 protected 的 setTarget 方法
+    function setTarget(window) {
+      _get(_getPrototypeOf(HostSDKBridge.prototype), "setTarget", this).call(this, window);
     }
   }, {
     key: "setDebugCallback",
@@ -61,28 +61,46 @@ var HostSDKBridge = /*#__PURE__*/function (_SDKBridge) {
       }
       (_get2 = _get(_getPrototypeOf(HostSDKBridge.prototype), "setDebugCallback", this)).call.apply(_get2, [this].concat(args));
     }
+  }], [{
+    key: "getGlobalBridge",
+    value: function getGlobalBridge(mode) {
+      return _get(_getPrototypeOf(HostSDKBridge), "getGlobalBridge", this).call(this, mode);
+    }
   }]);
   return HostSDKBridge;
 }(SDKBridge);
 /**
  * AMSElement 特有的消息类型（非标准 MessageType，webapp 需配合实现）
  * 使用索引签名兼容，避免 as any
+ *
+ * GET_APPLE_PAY_TOKEN / REPLY：PC 非 Safari Apple Pay 委托给 SDK 域处理的桥协议。
+ * webapp 发 REQUEST → SDK 跑 ApplePaySdk.startPay 弹 Apple modal → REPLY 回传结果。
  */
 var AMSMessageType = {
   VALIDATE: 'OPENSDK@VALIDATE',
-  VALIDATE_REPLY: 'OPENSDK@VALIDATE_REPLY'
+  VALIDATE_REPLY: 'OPENSDK@VALIDATE_REPLY',
+  GET_APPLE_PAY_TOKEN: 'OPENSDK@GET_APPLE_PAY_TOKEN',
+  GET_APPLE_PAY_TOKEN_REPLY: 'OPENSDK@GET_APPLE_PAY_TOKEN_REPLY',
+  // skipRenderPaymentMethod 场景:webapp 委托 SDK 全权拉起 ApplePay,fire-and-forget
+  // SDK 收到后走 BusManager.publish(ApplePayActionEnum.createComponent) → plugin/applepay 标准链路
+  // (含 onEventCallback 商户通知,不需要 reply 给 webapp)
+  HANDLE_PAYMENT: 'OPENSDK@HANDLE_PAYMENT',
+  // webapp 查询 native plugin 是否注册(Android webview GooglePay 探测用)
+  // webapp 发 REQUEST + requestId → SDK 调 BusManager.isSubscribed → REPLY 回 { requestId, isSubscribed }
+  CHECK_BUS_SUBSCRIBED: 'OPENSDK@CHECK_BUS_SUBSCRIBED',
+  CHECK_BUS_SUBSCRIBED_REPLY: 'OPENSDK@CHECK_BUS_SUBSCRIBED_REPLY'
 };
-
 /**
  * ModernElementController 使用 opensdk-core 的 HostBridge 实现新架构通信。
  *
  * Mount 流程（正确）:
  * 1. setup() — 解析 sessionData 获取 metaData，准备 HANDSHAKE 配置
- * 2. 创建 iframe，设置 src
- * 3. 将 iframe 添加到容器
- * 4. 监听 READY_HANDSHAKE → setTarget(iframe.contentWindow) → send(HANDSHAKE, mergedConfig)
- * 5. 等待 HANDSHAKE_ACK → 设置 status = 'ready'
- * 6. ready 后发送缓存的消息
+ * 2. 创建 iframe（先不设置 src，避免提前触发加载）
+ * 3. 先注册所有事件监听，再设置 iframe.src 和 appendChild 触发加载
+ * 4. setup() 与 waitForReadyHandshake() 并行执行
+ * 5. 两者都完成后，sendHandshake() 发送 HANDSHAKE 配置
+ * 6. 等待 HANDSHAKE_ACK → 设置 status = 'ready'
+ * 7. ready 后发送缓存的消息
  */
 export var ModernElementController = /*#__PURE__*/function () {
   function ModernElementController(options) {
@@ -91,13 +109,12 @@ export var ModernElementController = /*#__PURE__*/function () {
     _defineProperty(this, "bridge", void 0);
     _defineProperty(this, "iframe", null);
     _defineProperty(this, "status", 'initialized');
-    _defineProperty(this, "eventListeners", new Map());
     _defineProperty(this, "cachedSend", []);
     // Modal 相关资源
-    _defineProperty(this, "modalIframe", null);
     _defineProperty(this, "modalBridge", null);
     _defineProperty(this, "modalDestroy", null);
     _defineProperty(this, "_closeConfirmResolve", null);
+    _defineProperty(this, "notRedirectAfterComplete", false);
     this.options = options;
     this.bridge = new HostSDKBridge('HOST', 'payment');
     this.bridge.setDebugCallback(function (msg, direction) {
@@ -119,7 +136,7 @@ export var ModernElementController = /*#__PURE__*/function () {
     value: function () {
       var _mount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(renderOptions, sdkSelector) {
         var _this$options$loading, _this$options$loading2;
-        var container, _this$options, _this$options$onEvent, _this$options$loading3, _this$options$loading4, setupConfig, iframeUrl, _this$options$loading5, _this$options$loading6, _this$options2, _this$options2$onEven, errorResult;
+        var container, _this$options, _this$options$onEvent, _this$options$loading3, _this$options$loading4, iframeUrl, readyHandshakePromise, _yield$Promise$all, _yield$Promise$all2, setupConfig, dataStructError, _this$options$loading5, _this$options$loading6, _this$options2, _this$options2$onEven, errorResult;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -142,40 +159,53 @@ export var ModernElementController = /*#__PURE__*/function () {
               (_this$options$loading = this.options.loading) === null || _this$options$loading === void 0 || (_this$options$loading2 = _this$options$loading.onStartLoading) === null || _this$options$loading2 === void 0 || _this$options$loading2.call(_this$options$loading);
               this.status = 'mounting';
               _context.prev = 6;
-              _context.next = 9;
-              return this.setup(renderOptions);
-            case 9:
-              setupConfig = _context.sent;
-              console.log('step1: setupConfig', setupConfig);
-
-              // 2. 创建 iframe，设置 src
+              // 1. 创建 iframe（先不设置 src，避免提前触发加载）
               iframeUrl = this.buildIframeUrl();
-              console.log('step2: iframeUrl', iframeUrl, this.options.environment);
               this.iframe = document.createElement('iframe');
-              this.iframe.src = iframeUrl;
               this.iframe.style.width = '100%';
               this.iframe.style.border = 'none';
               this.iframe.style.height = '0';
               this.iframe.style.transition = 'height 0.3s ease';
 
-              // 3. 将 iframe 添加到容器
-              console.log('step3: iframe added to container');
+              // 2. 先注册所有事件监听（包括 READY_HANDSHAKE），再设置 src 和 appendChild 触发加载，
+              //    避免 iframe 快速加载时丢失早期消息
+              this.bindBridgeEvents();
+              readyHandshakePromise = this.waitForReadyHandshake();
+              this.iframe.src = iframeUrl;
               container.appendChild(this.iframe);
 
-              // 4-5. 执行握手流程
-              console.log('step4-5: handshake completed');
-              _context.next = 24;
-              return this.performHandshake(setupConfig);
-            case 24:
-              console.log('step6: events bound');
-              // 6. 绑定持续监听的事件
-              this.bindBridgeEvents();
+              // 3. setup()（网络请求）与 waitForReadyHandshake()（等待 iframe 加载）并行执行
+              _context.next = 19;
+              return Promise.all([this.setup(renderOptions), readyHandshakePromise]);
+            case 19:
+              _yield$Promise$all = _context.sent;
+              _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 1);
+              setupConfig = _yield$Promise$all2[0];
+              this.status = 'mounted';
+
+              // 4. 两者都完成后，发送 HANDSHAKE 配置
+              this.sendHandshake(setupConfig);
+
+              // 5. 等待 HANDSHAKE_ACK
+              _context.next = 26;
+              return this.waitForHandshakeAck();
+            case 26:
               this.status = '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);
-              return _context.abrupt("return", {});
+              // 参照老逻辑 isLoadErrorPage，对 renderData 做数据格式校验
+              dataStructError = this.validateRenderData(setupConfig.renderData);
+              if (!dataStructError) {
+                _context.next = 32;
+                break;
+              }
+              return _context.abrupt("return", {
+                error: dataStructError
+              });
             case 32:
-              _context.prev = 32;
+              return _context.abrupt("return", {});
+            case 35:
+              _context.prev = 35;
               _context.t0 = _context["catch"](6);
               (_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();
@@ -187,11 +217,11 @@ export var ModernElementController = /*#__PURE__*/function () {
               return _context.abrupt("return", {
                 error: errorResult
               });
-            case 39:
+            case 42:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[6, 32]]);
+        }, _callee, this, [[6, 35]]);
       }));
       function mount(_x, _x2) {
         return _mount.apply(this, arguments);
@@ -212,61 +242,91 @@ export var ModernElementController = /*#__PURE__*/function () {
     key: "setup",
     value: (function () {
       var _setup = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(renderOptions) {
-        var _result$data;
-        var sessionData, parseData, result, preferredLocale, locale;
+        var _parseData$connectFac, _parseData$paymentMet, _sdkQueryResult$data;
+        var sessionData, parseData, isConnect, paymentSessionConfig, genSdkQueryPromise, genOneAccountQueryPromise, promises, _ref, _ref2, sdkQueryResult, oneAccountQueryResult, preferredLocale, locale, renderDataError;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
+              // 缓存起来，submit时使用
+              this.notRedirectAfterComplete = renderOptions.notRedirectAfterComplete || false;
               sessionData = this.options.sessionData;
               parseData = getMetaData(sessionData); // 初始化 request 全局配置，使 sdkQuery 能正确发起请求
               request.setGlobalOptions({
                 hostSign: parseHostSign(sessionData),
                 env: this.options.environment,
-                sdkVersion: "0.0.1779094014-dev.2" || ''
-              });
-
-              // 调用 sdkQuery 获取渲染数据，参照 VaultingElement.setup()
-              _context2.next = 5;
-              return sdkQuery({
-                extParams: {
-                  isUserPreferredLocale: true
-                },
-                paymentSessionConfig: parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig,
-                paymentSessionData: sessionData
-              }).then(function (res) {
-                return {
-                  data: res,
-                  error: undefined
-                };
-              }).catch(function (e) {
-                var _AntomSDKError$unific;
-                return {
-                  error: (_AntomSDKError$unific = AntomSDKError.unificationError(e)) === null || _AntomSDKError$unific === void 0 ? void 0 : _AntomSDKError$unific.toJSON(),
-                  data: undefined
-                };
+                sdkVersion: "0.0.1779094014-dev.21" || ''
               });
-            case 5:
-              result = _context2.sent;
+              isConnect = !!(parseData !== null && parseData !== void 0 && (_parseData$connectFac = parseData.connectFactor) !== null && _parseData$connectFac !== void 0 && _parseData$connectFac.enableConnect);
+              paymentSessionConfig = parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig;
+              genSdkQueryPromise = function genSdkQueryPromise() {
+                return awaitWrap(sdkQuery({
+                  extParams: {
+                    isUserPreferredLocale: true
+                  },
+                  paymentSessionConfig: parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig,
+                  paymentSessionData: sessionData
+                }));
+              };
+              genOneAccountQueryPromise = function genOneAccountQueryPromise() {
+                return awaitWrap(oneAccountQuery({
+                  paymentSessionConfig: paymentSessionConfig,
+                  paymentSessionData: sessionData,
+                  accountInfo: {
+                    email: ''
+                  }
+                }));
+              };
+              promises = isConnect ? [genSdkQueryPromise(), genOneAccountQueryPromise()] : [genSdkQueryPromise(), undefined];
+              _context2.next = 11;
+              return Promise.all(promises);
+            case 11:
+              _ref = _context2.sent;
+              _ref2 = _slicedToArray(_ref, 2);
+              sdkQueryResult = _ref2[0];
+              oneAccountQueryResult = _ref2[1];
               // 从 renderData 中提取 preferredLocale
-              preferredLocale = getLocaleFromRenderData(result.data);
-              locale = preferredLocale || this.options.locale;
+              preferredLocale = getLocaleFromRenderData(sdkQueryResult.data);
+              locale = preferredLocale || this.options.locale; // 优先使用请求错误，其次使用数据结构校验错误
+              renderDataError = sdkQueryResult.error || (oneAccountQueryResult === null || oneAccountQueryResult === void 0 ? void 0 : oneAccountQueryResult.error);
               return _context2.abrupt("return", {
+                // 更新字段，对应老的paymentSessionData
                 sessionData: sessionData,
-                environment: this.options.environment,
+                // 新增字段，对应老的queryResult成功时
+                renderData: sdkQueryResult.data,
+                // 新增字段，对应老的queryResult失败时及 oneAccountQueryResult 失败时
+                renderDataError: renderDataError,
+                // 更新字段，对应老的oneAccountQueryResult成功时
+                connectAccount: oneAccountQueryResult === null || oneAccountQueryResult === void 0 ? void 0 : oneAccountQueryResult.data,
+                // 更新字段，对应老的sessionResult
+                sessionMetaData: parseData,
+                // 更新字段，对应老的doMain
+                merchantDomain: window.location.hostname,
+                // 更新字段，对应老的appearance，结构按新的来
+                appearance: adaptAppearance((renderOptions === null || renderOptions === void 0 ? void 0 : renderOptions.appearance) || this.options.appearance, renderOptions.merchantAppointParam),
+                // 原老字段
+                logMetaData: {
+                  paymentMethodCategoryType: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.paymentMethodCategoryType,
+                  productSceneVersion: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.productSceneVersion,
+                  trackId: parseTrackerId(sessionData),
+                  merchantId: parseData === null || parseData === void 0 ? void 0 : parseData.clientId,
+                  paymentMethodType: parseData === null || parseData === void 0 || (_parseData$paymentMet = parseData.paymentMethodInfoView) === null || _parseData$paymentMet === void 0 ? void 0 : _parseData$paymentMet.paymentMethodType
+                },
+                // 原老字段
+                heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
+                // 新sdk字段
                 locale: locale,
-                paymentSessionConfig: parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig,
-                appearance: adaptAppearance((renderOptions === null || renderOptions === void 0 ? void 0 : renderOptions.appearance) || this.options.appearance),
-                // 新增字段
-                renderData: result.data,
-                renderDataError: result.error,
-                sdkVersion: "0.0.1779094014-dev.2" || '',
-                merchantId: ((_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.merchantId) || '',
-                env: this.options.environment || 'prod',
+                // 新sdk字段
+                sdkVersion: "0.0.1779094014-dev.21" || '',
+                // 新sdk字段
+                merchantId: (sdkQueryResult === null || sdkQueryResult === void 0 || (_sdkQueryResult$data = sdkQueryResult.data) === null || _sdkQueryResult$data === void 0 ? void 0 : _sdkQueryResult$data.merchantId) || '',
+                // 新sdk字段
+                env: this.options.environment === 'sandbox' ? 'sandbox' : 'prod',
+                // 新sdk字段，开发环境调试使用
                 _requestConfig: _objectSpread({
-                  env: this.options.environment || 'prod'
+                  env: this.options.environment === 'sandbox' ? 'sandbox' : 'prod'
                 }, getDevReqConfig())
               });
-            case 9:
+            case 19:
             case "end":
               return _context2.stop();
           }
@@ -278,122 +338,384 @@ export var ModernElementController = /*#__PURE__*/function () {
       return setup;
     }()
     /**
-     * 执行握手流程:
-     * - 监听 READY_HANDSHAKE → setTarget → send(HANDSHAKE, mergedConfig)
-     * - 等待 HANDSHAKE_ACK → resolve
+     * 校验 renderData 数据格式，参照老逻辑 isLoadErrorPage 的三个校验维度：
+     * 1. success 字段 — 接口是否返回业务成功
+     * 2. 支付方式 — paymentMethods 或 savedPaymentMethods 必须存在且为非空数组
+     * 3. 金额视图 — orderAmountView 和 paymentAmountView 必须同时存在
+     *
+     * 当数据结构异常时，构造 ERR_DATA_STRUCT_UNRECOGNIZED 错误
      */
     )
   }, {
-    key: "performHandshake",
-    value: (function () {
-      var _performHandshake = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(setupConfig) {
-        var _this = this;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              return _context3.abrupt("return", new Promise(function (resolve, reject) {
-                var timer = setTimeout(function () {
-                  reject({
-                    code: 'SDK_LAUNCH_PAYMENT_APP_ERROR',
-                    message: 'Mount timeout'
-                  });
-                }, MOUNT_TIMEOUT);
-
-                // 监听 HEIGHT_UPDATE（只需要注册一次，放在握手前避免丢失早期消息）
-                _this.bridge.on(MessageType.HEIGHT_UPDATE, function (height) {
-                  console.log(height, 'HEIGHT_UPDATE');
-                  if (_this.iframe) _this.iframe.style.height = "".concat(height, "px");
-                });
-
-                // 4. 监听 READY_HANDSHAKE → setTarget → send(HANDSHAKE, mergedConfig)
-                _this.bridge.once(MessageType.READY_HANDSHAKE, function () {
-                  var _this$iframe;
-                  console.log('READY_HANDSHAKE');
-                  if (!((_this$iframe = _this.iframe) !== null && _this$iframe !== void 0 && _this$iframe.contentWindow)) {
-                    clearTimeout(timer);
-                    reject({
-                      code: 'SDK_LAUNCH_PAYMENT_APP_ERROR',
-                      message: 'Iframe contentWindow not available'
-                    });
-                    return;
-                  }
-                  _this.bridge.setTargetWindow(_this.iframe.contentWindow);
+    key: "validateRenderData",
+    value: function validateRenderData(renderData) {
+      if (!renderData) {
+        return {
+          source: 'SDK_INTERNAL',
+          code: 'ERR_DATA_STRUCT_UNRECOGNIZED',
+          message: 'An error occurred. The transaction cannot be initiated.',
+          reason: 'renderData is empty',
+          traceId: ''
+        };
+      }
+      var success = renderData.success,
+        paymentMethods = renderData.paymentMethods,
+        savedPaymentMethods = renderData.savedPaymentMethods,
+        orderAmountView = renderData.orderAmountView,
+        paymentAmountView = renderData.paymentAmountView;
 
-                  // 设置安全源
-                  try {
-                    var iframeOrigin = new URL(_this.iframe.src).origin;
-                    if (iframeOrigin && iframeOrigin !== 'null') {
-                      _this.bridge.setOrigin(iframeOrigin);
-                    }
-                  } catch (_unused) {
-                    // URL 解析失败时保持默认 origin
-                  }
+      // 校验是否存在有效支付方式
+      var hasValidPaymentMethods = paymentMethods && Array.isArray(paymentMethods) && paymentMethods.length > 0 || savedPaymentMethods && Array.isArray(savedPaymentMethods) && savedPaymentMethods.length > 0;
 
-                  // HANDSHAKE payload 包含 setup() 返回的完整配置
-                  _this.bridge.send(MessageType.HANDSHAKE, setupConfig);
-                });
+      // 金额存在性校验
+      var hasAmountViews = !!orderAmountView && !!paymentAmountView;
 
-                // 5. 等待 HANDSHAKE_ACK
-                _this.bridge.once(MessageType.HANDSHAKE_ACK, function () {
-                  clearTimeout(timer);
-                  resolve();
-                });
-              }));
-            case 1:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3);
-      }));
-      function performHandshake(_x4) {
-        return _performHandshake.apply(this, arguments);
+      // 满足任一异常条件即判定数据结构不可识别
+      if (!success || !hasValidPaymentMethods || !hasAmountViews) {
+        return {
+          source: 'SDK_INTERNAL',
+          code: 'ERR_DATA_STRUCT_UNRECOGNIZED',
+          message: 'An error occurred. The transaction cannot be initiated.',
+          reason: "Data structure validation failed: success=".concat(success, ", hasValidPaymentMethods=").concat(hasValidPaymentMethods, ", hasAmountViews=").concat(hasAmountViews),
+          traceId: ''
+        };
       }
-      return performHandshake;
-    }()
+      return undefined;
+    }
+
     /**
-     * 绑定持续监听的 bridge 事件
+     * 注册所有 bridge 事件监听（必须在 iframe 加载前调用，避免丢失早期消息）
      */
-    )
   }, {
     key: "bindBridgeEvents",
     value: function bindBridgeEvents() {
-      var _this2 = this;
-      this.bridge.on(MessageType.ERROR, function (payload) {
-        var _this2$options, _this2$options$onEven;
-        (_this2$options = _this2.options) === null || _this2$options === void 0 || (_this2$options$onEven = _this2$options.onEventCallback) === null || _this2$options$onEven === void 0 || _this2$options$onEven.call(_this2$options, adaptErrorToEventCallback(payload));
+      var _this = this;
+      this.bridge.on(MessageType.HEIGHT_UPDATE, function (height) {
+        if (_this.iframe) _this.iframe.style.height = "".concat(height, "px");
       });
       this.bridge.on(MessageType.REDIRECT, function (payload) {
         var url = payload.url,
-          mode = payload.mode;
-        if (mode === 'replace') {
-          window.location.replace(url);
-        } else {
-          window.location.href = url;
+          mode = payload.mode,
+          appLinkUrl = payload.appLinkUrl,
+          schemaUrl = payload.schemaUrl,
+          destory = payload.destory;
+        if (destory) {
+          _this.destroy();
+        }
+        function fallbackJump() {
+          if (mode === 'replace') {
+            window.location.replace(url);
+          } else {
+            window.location.href = url;
+          }
+        }
+        try {
+          if (appLinkUrl || schemaUrl) {
+            var app = new CallApp({
+              resultJudgmentTime: 2000,
+              fallback: function fallback() {
+                fallbackJump();
+              }
+            });
+            app.open({
+              scheme: schemaUrl,
+              link: appLinkUrl
+            });
+          } else {
+            fallbackJump();
+          }
+        } catch (error) {
+          fallbackJump();
         }
       });
       this.bridge.on(MessageType.OPEN_MODAL, function (payload) {
-        _this2.handleOpenModal(payload);
+        _this.handleOpenModal(payload);
       });
       this.bridge.on(MessageType.CLOSE_MODAL, function () {
-        _this2.handleCloseModal();
+        _this.handleCloseModal();
+      });
+
+      // PC 非 Safari Apple Pay：webapp 委托 SDK 域调起 Apple modal 拿 token
+      this.bridge.on(AMSMessageType.GET_APPLE_PAY_TOKEN, function (payload) {
+        _this.handleGetApplePayToken(payload);
+      });
+
+      // skipRenderPaymentMethod 场景：webapp 委托 SDK 全权拉起 ApplePay,fire-and-forget
+      // 走 plugin/applepay 标准链路(onEventCallback 自动通知商户)
+      this.bridge.on(AMSMessageType.HANDLE_PAYMENT, function (payload) {
+        _this.handleHandlePayment(payload);
+      });
+
+      // webapp 查询 native plugin 是否注册（Android webview GooglePay 探测用）
+      this.bridge.on(AMSMessageType.CHECK_BUS_SUBSCRIBED, function (payload) {
+        _this.bridge.send(AMSMessageType.CHECK_BUS_SUBSCRIBED_REPLY, {
+          requestId: payload.requestId,
+          isSubscribed: BusManager.isSubscribed(payload.actionName)
+        });
+      });
+    }
+
+    /**
+     * 处理 webapp 委托的 Apple Pay token 请求。
+     * Chrome 等非 Safari 浏览器内 iframe 无法拉起 Apple 二维码 modal（jsapi 注入需父域），
+     * 改由 SDK 域 new ApplePaySdk().startPay() 拉起 Apple modal，结果通过 bridge 回传。
+     */
+  }, {
+    key: "handleGetApplePayToken",
+    value: (function () {
+      var _handleGetApplePayToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(payload) {
+        var _paymentMethod,
+          _this2 = this;
+        var sessionData, applePayProps, paymentRequest, merchantCapabilities, merchantInfo, paymentAmount, supportedNetworks, version, requiredBillingContactFields, requiredShippingContactFields, finalAmount, finalCurrency, capturedResult, service;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              sessionData = this.options.sessionData;
+              applePayProps = payload === null || payload === void 0 || (_paymentMethod = payload.paymentMethod) === null || _paymentMethod === void 0 || (_paymentMethod = _paymentMethod.paymentMethodDetail) === null || _paymentMethod === void 0 ? void 0 : _paymentMethod.applePayProps;
+              paymentRequest = applePayProps === null || applePayProps === void 0 ? void 0 : applePayProps.paymentRequest;
+              if (paymentRequest) {
+                _context5.next = 6;
+                break;
+              }
+              this.bridge.send(AMSMessageType.GET_APPLE_PAY_TOKEN_REPLY, {
+                success: false,
+                result: {
+                  errorCode: 'APPLE_PAY_MISSING_DATA',
+                  errorMessage: 'paymentRequest not found in payload'
+                }
+              });
+              return _context5.abrupt("return");
+            case 6:
+              merchantCapabilities = paymentRequest.merchantCapabilities, merchantInfo = paymentRequest.merchantInfo, paymentAmount = paymentRequest.paymentAmount, supportedNetworks = paymentRequest.supportedNetworks, version = paymentRequest.version, requiredBillingContactFields = paymentRequest.requiredBillingContactFields, requiredShippingContactFields = paymentRequest.requiredShippingContactFields;
+              finalAmount = (paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.formattedValue) || (paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value);
+              finalCurrency = paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency;
+              service = new ApplePayHostService({
+                paymentRequest: {
+                  countryCode: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.countryCode,
+                  currencyCode: finalCurrency,
+                  merchantCapabilities: merchantCapabilities,
+                  supportedNetworks: supportedNetworks,
+                  requiredBillingContactFields: requiredBillingContactFields,
+                  requiredShippingContactFields: requiredShippingContactFields,
+                  total: {
+                    type: 'final',
+                    label: (merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.merchantName) || 'Payment',
+                    amount: finalAmount
+                  },
+                  version: version
+                },
+                enableModalCloseListener: true,
+                callbacks: {
+                  validateMerchant: function () {
+                    var _validateMerchant = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(validationURL) {
+                      var res;
+                      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                        while (1) switch (_context3.prev = _context3.next) {
+                          case 0:
+                            _context3.next = 2;
+                            return getApplePayPaymentSession(sessionData, {
+                              validateUrl: validationURL,
+                              paymentSessionData: sessionData,
+                              merchantDomain: window.location.hostname
+                            }, {
+                              env: _this2.options.environment,
+                              envInfo: {
+                                deviceId: ''
+                              }
+                            }, undefined);
+                          case 2:
+                            res = _context3.sent;
+                            if (!(res !== null && res !== void 0 && res.success && res.merchantSessionObject)) {
+                              _context3.next = 5;
+                              break;
+                            }
+                            return _context3.abrupt("return", typeof res.merchantSessionObject === 'string' ? JSON.parse(res.merchantSessionObject) : res.merchantSessionObject);
+                          case 5:
+                            throw {
+                              errorCode: 'APPLE_PAY_VALIDATION_FAILED',
+                              errorMessage: (res === null || res === void 0 ? void 0 : res.errorMessage) || 'Merchant validation failed'
+                            };
+                          case 6:
+                          case "end":
+                            return _context3.stop();
+                        }
+                      }, _callee3);
+                    }));
+                    function validateMerchant(_x5) {
+                      return _validateMerchant.apply(this, arguments);
+                    }
+                    return validateMerchant;
+                  }(),
+                  onAuthorized: function () {
+                    var _onAuthorized = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref3) {
+                      var token, billingContact, shippingContact;
+                      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                        while (1) switch (_context4.prev = _context4.next) {
+                          case 0:
+                            token = _ref3.token, billingContact = _ref3.billingContact, shippingContact = _ref3.shippingContact;
+                            capturedResult = {
+                              token: token,
+                              billingContact: billingContact,
+                              shippingContact: shippingContact
+                            };
+                            return _context4.abrupt("return", {
+                              success: true,
+                              result: capturedResult
+                            });
+                          case 3:
+                          case "end":
+                            return _context4.stop();
+                        }
+                      }, _callee4);
+                    }));
+                    function onAuthorized(_x6) {
+                      return _onAuthorized.apply(this, arguments);
+                    }
+                    return onAuthorized;
+                  }()
+                }
+              });
+              _context5.prev = 10;
+              _context5.next = 13;
+              return service.startPay();
+            case 13:
+              this.bridge.send(AMSMessageType.GET_APPLE_PAY_TOKEN_REPLY, {
+                success: true,
+                result: capturedResult
+              });
+              _context5.next = 19;
+              break;
+            case 16:
+              _context5.prev = 16;
+              _context5.t0 = _context5["catch"](10);
+              this.bridge.send(AMSMessageType.GET_APPLE_PAY_TOKEN_REPLY, {
+                success: false,
+                result: {
+                  errorCode: (_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.errorCode) || 'APPLE_PAY_NOT_SUPPORTED',
+                  errorMessage: _context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.errorMessage
+                }
+              });
+            case 19:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this, [[10, 16]]);
+      }));
+      function handleGetApplePayToken(_x4) {
+        return _handleGetApplePayToken.apply(this, arguments);
+      }
+      return handleGetApplePayToken;
+    }()
+    /**
+     * 处理 webapp 委托的 skipRenderPaymentMethod 拉起请求(fire-and-forget)。
+     * 走 plugin/applepay 标准链路:ApplePayBusSubscriber.onCreateComponent 自动注入
+     * onEventCallback,通过 BusManager.publish(SDKCallbackActionEnum.onEventCallback)
+     * 通知商户。SDK 端不需要 reply 给 webapp。
+     */
+    )
+  }, {
+    key: "handleHandlePayment",
+    value: function handleHandlePayment(_payload) {
+      var sessionData = this.options.sessionData;
+      var parseData = getMetaData(sessionData);
+      BusManager.publish(new BusMessage(ApplePayActionEnum.createComponent, JSON.stringify({
+        appendParams: {
+          iframeNodesParams: {
+            sessionData: sessionData,
+            paymentSessionMetaData: parseData
+          }
+        },
+        options: {
+          environment: this.options.environment,
+          locale: this.options.locale
+        }
+      })));
+    }
+
+    /**
+     * 等待 webapp 发送 READY_HANDSHAKE（表示 iframe 已加载并准备好握手），
+     * 收到后设置 bridge target 和安全源
+     */
+  }, {
+    key: "waitForReadyHandshake",
+    value: function waitForReadyHandshake() {
+      var _this3 = this;
+      return new Promise(function (resolve, reject) {
+        var timer = setTimeout(function () {
+          reject({
+            code: 'SDK_LAUNCH_PAYMENT_APP_ERROR',
+            message: 'Mount timeout'
+          });
+        }, MOUNT_TIMEOUT);
+        _this3.bridge.once(MessageType.READY_HANDSHAKE, function () {
+          var _this3$iframe;
+          clearTimeout(timer);
+          if (!((_this3$iframe = _this3.iframe) !== null && _this3$iframe !== void 0 && _this3$iframe.contentWindow)) {
+            reject({
+              code: 'SDK_LAUNCH_PAYMENT_APP_ERROR',
+              message: 'Iframe contentWindow not available'
+            });
+            return;
+          }
+          _this3.bridge.setTarget(_this3.iframe.contentWindow);
+          try {
+            var iframeOrigin = new URL(_this3.iframe.src).origin;
+            if (iframeOrigin && iframeOrigin !== 'null') {
+              _this3.bridge.setOrigin(iframeOrigin);
+            }
+          } catch (_unused) {
+            // URL 解析失败时保持默认 origin
+          }
+          resolve();
+        });
+      });
+    }
+
+    /**
+     * 发送 HANDSHAKE 配置给 webapp（setup 和 READY_HANDSHAKE 都完成后调用）
+     */
+  }, {
+    key: "sendHandshake",
+    value: function sendHandshake(setupConfig) {
+      this.bridge.send(MessageType.HANDSHAKE, setupConfig);
+    }
+
+    /**
+     * 等待 webapp 返回 HANDSHAKE_ACK（确认握手完成）
+     */
+  }, {
+    key: "waitForHandshakeAck",
+    value: function waitForHandshakeAck() {
+      var _this4 = this;
+      return new Promise(function (resolve, reject) {
+        var timer = setTimeout(function () {
+          reject({
+            code: 'SDK_LAUNCH_PAYMENT_APP_ERROR',
+            message: 'Mount timeout'
+          });
+        }, MOUNT_TIMEOUT);
+        _this4.bridge.once(MessageType.HANDSHAKE_ACK, function () {
+          clearTimeout(timer);
+          resolve();
+        });
       });
     }
   }, {
     key: "submitPayment",
     value: function () {
-      var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+      var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
         var _this$options$loading7,
           _this$options$loading8,
-          _this3 = this;
+          _this5 = this;
         var result, _this$options$loading9, _this$options$loading10;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               if (!(this.status !== 'ready')) {
-                _context4.next = 2;
+                _context6.next = 2;
                 break;
               }
-              return _context4.abrupt("return", {
+              return _context6.abrupt("return", {
                 status: 'FAIL',
                 error: {
                   code: 'UI_STATE_ERROR',
@@ -402,26 +724,28 @@ export var ModernElementController = /*#__PURE__*/function () {
               });
             case 2:
               (_this$options$loading7 = this.options.loading) === null || _this$options$loading7 === void 0 || (_this$options$loading8 = _this$options$loading7.onStartLoading) === null || _this$options$loading8 === void 0 || _this$options$loading8.call(_this$options$loading7);
-              _context4.prev = 3;
-              this.send(MessageType.SUBMIT, params);
-              _context4.next = 7;
+              _context6.prev = 3;
+              this.send(MessageType.SUBMIT, _objectSpread(_objectSpread({}, params), {}, {
+                redirect: this.notRedirectAfterComplete ? 'if_required' : 'always'
+              }));
+              _context6.next = 7;
               return new Promise(function (resolve) {
-                _this3.bridge.once(MessageType.SUBMIT_REPLY, resolve);
+                _this5.bridge.once(MessageType.SUBMIT_REPLY, resolve);
               });
             case 7:
-              result = _context4.sent;
-              return _context4.abrupt("return", adaptSubmitResult(result));
+              result = _context6.sent;
+              return _context6.abrupt("return", adaptSubmitResult(result));
             case 9:
-              _context4.prev = 9;
+              _context6.prev = 9;
               (_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 _context4.finish(9);
+              return _context6.finish(9);
             case 12:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
-        }, _callee4, this, [[3,, 9, 12]]);
+        }, _callee6, this, [[3,, 9, 12]]);
       }));
-      function submitPayment(_x5) {
+      function submitPayment(_x7) {
         return _submitPayment.apply(this, arguments);
       }
       return submitPayment;
@@ -429,27 +753,27 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "validateFields",
     value: function () {
-      var _validateFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this4 = this;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _validateFields = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        var _this6 = this;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               if (!(this.status !== 'ready')) {
-                _context5.next = 2;
+                _context7.next = 2;
                 break;
               }
-              return _context5.abrupt("return", {
+              return _context7.abrupt("return", {
                 isValid: false
               });
             case 2:
               this.send(AMSMessageType.VALIDATE);
-              return _context5.abrupt("return", new Promise(function (resolve) {
+              return _context7.abrupt("return", new Promise(function (resolve) {
                 var timer = setTimeout(function () {
                   return resolve({
                     isValid: false
                   });
                 }, 15000);
-                _this4.bridge.once(AMSMessageType.VALIDATE_REPLY, function (payload) {
+                _this6.bridge.once(AMSMessageType.VALIDATE_REPLY, function (payload) {
                   clearTimeout(timer);
                   resolve(payload || {
                     isValid: false
@@ -458,53 +782,30 @@ export var ModernElementController = /*#__PURE__*/function () {
               }));
             case 4:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
-        }, _callee5, this);
+        }, _callee7, this);
       }));
       function validateFields() {
         return _validateFields.apply(this, arguments);
       }
       return validateFields;
-    }()
+    }() // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "updatePayment",
     value: function () {
-      var _updatePayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(paymentSessionData) {
-        var parseData, merged;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _updatePayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(paymentSessionData) {
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              if (!(this.status !== 'ready')) {
-                _context6.next = 2;
-                break;
-              }
-              return _context6.abrupt("return", false);
-            case 2:
-              // 更新内部 sessionData
-              this.options.sessionData = paymentSessionData;
-              parseData = getMetaData(paymentSessionData);
-              merged = {
-                sessionData: paymentSessionData,
-                paymentSessionConfig: parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig,
-                environment: this.options.environment,
-                locale: this.options.locale
-              };
-              this.bridge.send(MessageType.UPDATE_CONFIG, {
-                merged: merged,
-                updated: {
-                  sessionData: paymentSessionData,
-                  paymentSessionConfig: parseData === null || parseData === void 0 ? void 0 : parseData.paymentSessionConfig
-                }
-              });
-              return _context6.abrupt("return", true);
-            case 7:
+              return _context8.abrupt("return", false);
+            case 1:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
-        }, _callee6, this);
+        }, _callee8);
       }));
-      function updatePayment(_x6) {
+      function updatePayment(_x8) {
         return _updatePayment.apply(this, arguments);
       }
       return updatePayment;
@@ -512,27 +813,24 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "on",
     value: function on(event, callback) {
-      if (!this.eventListeners.has(event)) this.eventListeners.set(event, new Set());
-      this.eventListeners.get(event).add(callback);
       this.bridge.on(event, callback);
     }
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$iframe2;
+      var _this$iframe;
       this.handleCloseModal();
       this.bridge.destroy();
-      if ((_this$iframe2 = this.iframe) !== null && _this$iframe2 !== void 0 && _this$iframe2.parentNode) this.iframe.parentNode.removeChild(this.iframe);
+      if ((_this$iframe = this.iframe) !== null && _this$iframe !== void 0 && _this$iframe.parentNode) this.iframe.parentNode.removeChild(this.iframe);
       this.iframe = null;
       this.status = 'destroyed';
-      this.eventListeners.clear();
       this.cachedSend = [];
     }
   }, {
     key: "cleanup",
     value: function cleanup() {
-      var _this$iframe3;
-      if ((_this$iframe3 = this.iframe) !== null && _this$iframe3 !== void 0 && _this$iframe3.parentNode) this.iframe.parentNode.removeChild(this.iframe);
+      var _this$iframe2;
+      if ((_this$iframe2 = this.iframe) !== null && _this$iframe2 !== void 0 && _this$iframe2.parentNode) this.iframe.parentNode.removeChild(this.iframe);
       this.iframe = null;
       this.status = 'initialized';
       this.cachedSend = [];
@@ -563,12 +861,12 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "flushCachedMessages",
     value: function flushCachedMessages() {
-      var _this5 = this;
+      var _this7 = this;
       if (this.cachedSend.length > 0) {
-        this.cachedSend.forEach(function (_ref) {
-          var type = _ref.type,
-            payload = _ref.payload;
-          _this5.bridge.send(type, payload);
+        this.cachedSend.forEach(function (_ref4) {
+          var type = _ref4.type,
+            payload = _ref4.payload;
+          _this7.bridge.send(type, payload);
         });
         this.cachedSend = [];
       }
@@ -588,16 +886,39 @@ export var ModernElementController = /*#__PURE__*/function () {
   }, {
     key: "handleOpenModal",
     value: function handleOpenModal(payload) {
-      var _this6 = this;
+      var _payload$appearance,
+        _themeColorMap$appear,
+        _payload$appearance2,
+        _this8 = this;
       // 清理已存在的 modal
       this.handleCloseModal();
       var mode = device.isMobile ? 'mobile' : 'desktop';
 
       // 为 modal 创建独立的 HostBridge 用于通信（scope 使用 payload 的 scope 或 'modal'）
-      var modalBridge = this.modalBridge = new HostSDKBridge('HOST', payload.scope || 'modal');
+      var modalBridge = this.modalBridge = HostSDKBridge.getGlobalBridge('HOST');
+
+      // MessageChannel
+      var messageChannel = new MessageChannel();
+      this.bridge.send(MessageType.TRANSFER_APP_PORT, payload.modalId, [messageChannel.port1]);
+      try {
+        var url = new URL(payload.url);
+        if (payload.closeConfirm) {
+          url.searchParams.append('confirm', 'true');
+        }
+        payload.url = url.toString();
+      } catch (e) {
+        var error = new OpenSDKError('Invalid URL', 'INVALID_MODAL_URL', 'APP_RUNTIME');
+        this.bridge.send(MessageType.OPEN_MODAL_ERROR, error);
+        return;
+      }
 
-      // 处理 closeConfirm 的 MessageChannel
-      var messageChannel = payload.closeConfirm ? new MessageChannel() : null;
+      // 从 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 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
+      };
 
       // 调用 openModal 工具函数创建 DOM（overlay + modal + iframe + 动画 + close icon + loading）
       var _openModal = openModal({
@@ -606,23 +927,21 @@ export var ModernElementController = /*#__PURE__*/function () {
           showClose: payload.showClose,
           hideCloseWhenLoaded: payload.hideCloseWhenLoaded,
           showLoading: payload.showLoading,
+          loadingConfig: loadingConfig,
           onClose: payload.closeConfirm ? function () {
             return new Promise(function (resolve) {
               // closeConfirm 时等待确认关闭（由 CLOSE_MODAL 消息触发 resolve）
-              _this6._closeConfirmResolve = resolve;
+              _this8._closeConfirmResolve = resolve;
             });
           } : undefined
         }),
         iframe = _openModal.iframe,
         destroy = _openModal.destroy;
-      this.modalIframe = iframe;
-      this.modalDestroy = destroy;
-
-      // 监听 modal 的 iframe load 事件
-      iframe.addEventListener('load', function () {
+      var handler = function handler() {
+        iframe.removeEventListener('load', handler);
         // 确保 target 已设置（如果 load 事件尚未触发，在此设置）
         if (iframe.contentWindow) {
-          modalBridge.setTargetWindow(iframe.contentWindow);
+          modalBridge.setTarget(iframe.contentWindow);
           try {
             var iframeOrigin = new URL(iframe.src).origin;
             if (iframeOrigin && iframeOrigin !== 'null') {
@@ -631,21 +950,25 @@ export var ModernElementController = /*#__PURE__*/function () {
           } catch (_unused2) {
             // URL 解析失败时保持默认 origin
           }
-        }
-
-        // 如果 payload 有 appearance，通过 TRANSFER_MODAL_APPEARANCE 消息发送给 modal
-        if (payload.appearance) {
-          modalBridge.send(MessageType.TRANSFER_MODAL_APPEARANCE, payload.appearance);
-        }
+          // 如果 payload 有 appearance，通过 TRANSFER_MODAL_APPEARANCE 消息发送给 modal
+          if (payload.appearance) {
+            modalBridge.send(MessageType.TRANSFER_MODAL_APPEARANCE, payload.appearance);
+          }
+          if (payload.initialData) {
+            modalBridge.send(MessageType.TRANSFER_MODAL_INITIALDATA, payload.initialData);
+          }
 
-        // 如果 payload 有 closeConfirm，创建 MessageChannel port 用于确认关闭
-        if (payload.closeConfirm && messageChannel) {
-          // 发送 port1 给 webapp（主 iframe）
-          _this6.bridge.send(MessageType.TRANSFER_APP_PORT, undefined, [messageChannel.port1]);
           // 发送 port2 给 modal
-          modalBridge.send(MessageType.TRANSFER_MODAL_PORT, undefined, [messageChannel.port2]);
+          modalBridge.send(MessageType.TRANSFER_MODAL_PORT, payload.modalId, [messageChannel.port2]);
         }
-      });
+      };
+      this.modalDestroy = function () {
+        destroy();
+        iframe.removeEventListener('load', handler);
+      };
+
+      // 监听 modal 的 iframe load 事件
+      iframe.addEventListener('load', handler);
     }
 
     /**
@@ -667,7 +990,6 @@ export var ModernElementController = /*#__PURE__*/function () {
         this.modalDestroy();
         this.modalDestroy = null;
       }
-      this.modalIframe = null;
     }
   }, {
     key: "buildIframeUrl",