@alipay/ams-checkout 0.0.1745808793-dev.0 → 0.0.1745808793-dev.2

package/esm/foundation/product-processor/easysafepay/index.js

@@ -18,6 +18,9 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 PreloadHelper from "../../../foundation/utils/preload_helper";
 import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isPC, PaymentMethodCategoryTypeEnum, ProductInfoCacheUtil, ProductSceneEnum, RiskSdkInfoEnum, ServiceProvider, uuid, WebAppUrlUtil, EVENT, eventCodeEnum } from "./deps";
+import { isEmpty } from "../../../util";
+import { getDefaultEasySafePayPageUrl } from "../../utils/web_app_url_utils";
+import { ESP_PAGE_NAME } from "../../../constant/easysafepay";
 export var EasySafePayProcessor = /*#__PURE__*/function () {
   function EasySafePayProcessor() {
     _classCallCheck(this, EasySafePayProcessor);
@@ -29,6 +32,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     _defineProperty(this, "instanceId", void 0);
     // 服务端接口区域信息，请求时决定API域名
     _defineProperty(this, "hostSign", void 0);
+    _defineProperty(this, "allowQueryCall", void 0);
     // 是否允许submitPay提前调用，在ESP非首次的性能优化场景使用
     _defineProperty(this, "allowSubmitPayCallAhead", void 0);
     _defineProperty(this, "channelBehavior", void 0);
@@ -46,7 +50,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       this.eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
 
       // preload web app
-      PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, this.initConfig.environment);
+      PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, this.initConfig.environment, true);
     }
   }, {
     key: "startBizFlow",
@@ -73,6 +77,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               requireFastSdk = paymentContext.paymentSessionObj.action.requireFastSdk;
               authUrlInfo = ((_paymentContext$payme2 = paymentContext.paymentSessionObj) === null || _paymentContext$payme2 === void 0 ? void 0 : _paymentContext$payme2.authUrlInfo) || {};
               this.channelBehavior = ChannelCustomize.getChannelBehavior(paymentContext.paymentSessionObj);
+
               // 首次支付
               isFirstTimeToPay = !autoDebitWithToken; // 处理ESP1.0极速外跳支付场景
               if (!(productSceneVersion === '1.0' && isFirstTimeToPay && requireFastSdk)) {
@@ -113,15 +118,19 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "buildWebAppUrl",
     value: function buildWebAppUrl() {
-      var _paymentContext$payme3, _paymentContext$payme4, _this$initConfig$anal;
+      var _paymentContext$payme3, _paymentContext$payme4, _paymentContext$payme5, _this$initConfig$anal;
       var paymentContext = this.paymentContext;
       var paymentMethodCategoryType = (_paymentContext$payme3 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme3 === void 0 ? void 0 : _paymentContext$payme3.paymentMethodCategoryType;
-      var productSceneVersion = (_paymentContext$payme4 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme4 === void 0 ? void 0 : _paymentContext$payme4.productSceneVersion;
+      var productScene = (_paymentContext$payme4 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme4 === void 0 ? void 0 : _paymentContext$payme4.productScene;
+      var productSceneVersion = (_paymentContext$payme5 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme5 === void 0 ? void 0 : _paymentContext$payme5.productSceneVersion;
       var hostSign = this.hostSign;
-      var webAppUrl = WebAppUrlUtil.getWebAppUrl({
+      var mid = paymentContext.paymentSessionObj.clientId;
+      var extendInfo = paymentContext.paymentSessionObj.extendInfo;
+      var webAppUrl = WebAppUrlUtil.getWebAppV2Url({
         environment: this.initConfig.environment,
         paymentMethodCategoryType: paymentMethodCategoryType,
         sdkMetaData: paymentContext.sdkMetaData,
+        productScene: productScene,
         productSceneVersion: productSceneVersion,
         isPreload: false,
         query: {
@@ -130,7 +139,9 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
           instanceId: this.instanceId,
           locale: this.initConfig.locale,
           hostSign: hostSign
-        }
+        },
+        mid: mid,
+        extendInfo: extendInfo
       });
       return webAppUrl;
     }
@@ -177,17 +188,19 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       });
 
       // 等请求和 Web启动都Ready之后，发送renderComponent
-      Promise.all([this.initSecuritySDK(), this.processSubmitPay(), webLaunchPromise]).then(function (_ref) {
+      Promise.all([this.initSecuritySDK(), this.processQuery(), this.processSubmitPay(), webLaunchPromise]).then(function (_ref) {
         var _this$paymentContext, _this$paymentContext2, _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3, _this$paymentContext$4;
-        var _ref2 = _slicedToArray(_ref, 3),
+        var _ref2 = _slicedToArray(_ref, 4),
           _initSecurityRes = _ref2[0],
-          submitRes = _ref2[1],
-          _webLaunchRes = _ref2[2];
+          queryRes = _ref2[1],
+          submitRes = _ref2[2],
+          _webLaunchRes = _ref2[3];
         var logMetaData = _this.logger.getLogConfig().mdata;
         _this.eventCenter.dispatchToApp({
           event: 'renderComponent',
           data: {
             sessionResult: (_this$paymentContext = _this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSessionObj,
+            queryResult: queryRes,
             submitResult: submitRes,
             paymentSessionData: (_this$paymentContext2 = _this.paymentContext) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSessionId,
             heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
@@ -197,6 +210,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
             isAppWebview: _this.paymentContext.startBizFlowOptions.isAppWebview,
             merchantAppointParam: (_this$paymentContext$3 = _this.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this$paymentContext$3 === void 0 ? void 0 : _this$paymentContext$3.merchantAppointParam,
             allowSubmitPayCallAhead: _this.allowSubmitPayCallAhead,
+            doubleFaUrl: getDefaultEasySafePayPageUrl(ESP_PAGE_NAME.DOUBLE_FA, _this.initConfig.environment),
             envInfo: {
               screenHeight: screen.height,
               screenWidth: screen.width
@@ -225,24 +239,105 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       });
     }
   }, {
-    key: "processSubmitPay",
+    key: "processQuery",
     value: function () {
-      var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _this$paymentContext3, _this$paymentContext4, _this$paymentContext5, _this$channelBehavior2, _this$channelBehavior3, _this$paymentContext$6;
-        var submitParams, _ref3, _ref3$productSceneVer, productSceneVersion, _ref4, _ref4$action, _ref4$action2, _ref4$action2$enableS, enableSignAgreement, _ref4$action2$autoDeb, autoDebitWithToken, _this$paymentContext$5, paymentMethodType, isAppWebview, backScheme, requestBizId, extParams, requester, _this$paymentContext$7, res;
+      var _processQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _this$paymentContext3, _this$paymentContext4;
+        var queryParams, extendInfo, extendInfoData, needQueryRender, requestBizId, requester, _this$paymentContext$5, res;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              submitParams = {
+              queryParams = {
                 paymentSessionData: ((_this$paymentContext3 = this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.paymentSessionId) || '',
                 paymentSessionConfig: (_this$paymentContext4 = this.paymentContext) === null || _this$paymentContext4 === void 0 || (_this$paymentContext4 = _this$paymentContext4.paymentSessionObj) === null || _this$paymentContext4 === void 0 ? void 0 : _this$paymentContext4.paymentSessionConfig
               };
+              extendInfo = this.paymentContext.paymentSessionObj.extendInfo;
+              try {
+                extendInfoData = JSON.parse(extendInfo);
+                needQueryRender = isEmpty(extendInfoData.needQueryRender) || extendInfoData.needQueryRender === true;
+                this.allowQueryCall = needQueryRender;
+              } catch (error) {
+                console.log(error);
+              }
+              if (this.allowQueryCall) {
+                _context2.next = 5;
+                break;
+              }
+              return _context2.abrupt("return", null);
+            case 5:
+              requestBizId = uuid();
+              this.logger.logInfo({
+                title: 'sdk_event_sdkQuery'
+              }, {
+                config: JSON.stringify(queryParams.paymentSessionConfig),
+                requestId: requestBizId
+              });
+              requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
+              _context2.prev = 8;
+              _context2.next = 11;
+              return requester.request(_objectSpread(_objectSpread({}, queryParams), {}, {
+                actionType: 'init',
+                integrationType: 'SDK',
+                sdkVersion: (_this$paymentContext$5 = this.paymentContext.sdkMetaData.sdkVersion) !== null && _this$paymentContext$5 !== void 0 ? _this$paymentContext$5 : '1.0.0'
+              }), {
+                env: this.initConfig.environment,
+                timeout: this.SDK_REQUEST_TIMEOUT,
+                hostSign: this.hostSign,
+                needEnvInfo: true,
+                'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query'
+              });
+            case 11:
+              res = _context2.sent;
+              this.logger.logInfo({
+                title: 'sdk_event_sdkQueryEnd'
+              }, {
+                config: JSON.stringify(queryParams.paymentSessionConfig),
+                requestId: requestBizId,
+                rpcTraceId: res.traceId
+              });
+              return _context2.abrupt("return", res);
+            case 16:
+              _context2.prev = 16;
+              _context2.t0 = _context2["catch"](8);
+              this.logger.logError({
+                title: 'sdk_event_sdkQuery_failed'
+              }, {
+                config: JSON.stringify(queryParams.paymentSessionConfig),
+                errorMessage: JSON.stringify(_context2.t0),
+                requestId: requestBizId,
+                rpcTraceId: _context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.traceId
+              });
+              return _context2.abrupt("return", null);
+            case 20:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this, [[8, 16]]);
+      }));
+      function processQuery() {
+        return _processQuery.apply(this, arguments);
+      }
+      return processQuery;
+    }()
+  }, {
+    key: "processSubmitPay",
+    value: function () {
+      var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _this$paymentContext5, _this$paymentContext6, _this$paymentContext7, _this$channelBehavior2, _this$channelBehavior3, _this$paymentContext$7, _this$paymentContext8;
+        var submitParams, _ref3, _ref3$productSceneVer, productSceneVersion, _ref4, _ref4$action, _ref4$action2, _ref4$action2$enableS, enableSignAgreement, _ref4$action2$autoDeb, autoDebitWithToken, _this$paymentContext$6, paymentMethodType, isAppWebview, backScheme, requestBizId, extParams, requester, _this$paymentContext$8, res;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              submitParams = {
+                paymentSessionData: ((_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.paymentSessionId) || '',
+                paymentSessionConfig: (_this$paymentContext6 = this.paymentContext) === null || _this$paymentContext6 === void 0 || (_this$paymentContext6 = _this$paymentContext6.paymentSessionObj) === null || _this$paymentContext6 === void 0 ? void 0 : _this$paymentContext6.paymentSessionConfig
+              };
               _ref3 = submitParams.paymentSessionConfig || {}, _ref3$productSceneVer = _ref3.productSceneVersion, productSceneVersion = _ref3$productSceneVer === void 0 ? '' : _ref3$productSceneVer;
-              _ref4 = ((_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.paymentSessionObj) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$enableS = _ref4$action2.enableSignAgreement, enableSignAgreement = _ref4$action2$enableS === void 0 ? false : _ref4$action2$enableS, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb;
+              _ref4 = ((_this$paymentContext7 = this.paymentContext) === null || _this$paymentContext7 === void 0 ? void 0 : _this$paymentContext7.paymentSessionObj) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$enableS = _ref4$action2.enableSignAgreement, enableSignAgreement = _ref4$action2$enableS === void 0 ? false : _ref4$action2$enableS, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb;
               if (productSceneVersion === '2.0' && !autoDebitWithToken) {
                 ///EasyPay 2.0 首次传signAgreement字段
                 submitParams['signAgreement'] = enableSignAgreement;
-                paymentMethodType = (_this$paymentContext$5 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$5 === void 0 || (_this$paymentContext$5 = _this$paymentContext$5.paymentMethodInfoView) === null || _this$paymentContext$5 === void 0 ? void 0 : _this$paymentContext$5.paymentMethodType;
+                paymentMethodType = (_this$paymentContext$6 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$6 === void 0 || (_this$paymentContext$6 = _this$paymentContext$6.paymentMethodInfoView) === null || _this$paymentContext$6 === void 0 ? void 0 : _this$paymentContext$6.paymentMethodType;
                 isAppWebview = this.paymentContext.startBizFlowOptions.isAppWebview;
                 if (paymentMethodType == 'ALIPAY_CN' && !isAppWebview) {
                   backScheme = getBackScheme(undefined, this.logger);
@@ -254,10 +349,10 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               this.allowSubmitPayCallAhead = this.channelBehavior.allowSubmitPayCallAhead;
               //console.log('[web-sdk] allowSubmitPayCallAhead =', this.allowSubmitPayCallAhead);
               if (this.allowSubmitPayCallAhead) {
-                _context2.next = 7;
+                _context3.next = 7;
                 break;
               }
-              return _context2.abrupt("return", {
+              return _context3.abrupt("return", {
                 message: 'sdk no need to make submitPay request',
                 success: true
               });
@@ -273,42 +368,45 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               extParams = ((_this$channelBehavior2 = this.channelBehavior) === null || _this$channelBehavior2 === void 0 || (_this$channelBehavior3 = _this$channelBehavior2.buildSubmitPayExtParams) === null || _this$channelBehavior3 === void 0 ? void 0 : _this$channelBehavior3.call(_this$channelBehavior2, {
                 instanceId: this.instanceId,
                 locale: this.initConfig.locale,
-                paymentMethodType: (_this$paymentContext$6 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$6 === void 0 || (_this$paymentContext$6 = _this$paymentContext$6.paymentMethodInfoView) === null || _this$paymentContext$6 === void 0 ? void 0 : _this$paymentContext$6.paymentMethodType,
+                paymentMethodType: (_this$paymentContext$7 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$7 === void 0 || (_this$paymentContext$7 = _this$paymentContext$7.paymentMethodInfoView) === null || _this$paymentContext$7 === void 0 ? void 0 : _this$paymentContext$7.paymentMethodType,
                 paymentSessionData: this.paymentContext.paymentSessionId,
                 env: this.initConfig.environment,
-                sdkVersion: this.paymentContext.sdkMetaData.sdkVersion
-              })) || {};
-              extParams.complianceSDK = true;
+                sdkVersion: this.paymentContext.sdkMetaData.sdkVersion,
+                notRedirectAfterComplete: ((_this$paymentContext8 = this.paymentContext) === null || _this$paymentContext8 === void 0 || (_this$paymentContext8 = _this$paymentContext8.startBizFlowOptions) === null || _this$paymentContext8 === void 0 || (_this$paymentContext8 = _this$paymentContext8.submitPayRequestExtra) === null || _this$paymentContext8 === void 0 ? void 0 : _this$paymentContext8.notRedirectAfterComplete) === true
+              })) || {}; // 二次支付不再需要该参数
+              if (!autoDebitWithToken) {
+                extParams.complianceSDK = true;
+              }
               submitParams.extParams = extParams;
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context2.prev = 13;
-              _context2.t0 = requester;
-              _context2.t1 = _objectSpread(_objectSpread({}, submitParams), {}, {
+              _context3.prev = 13;
+              _context3.t0 = requester;
+              _context3.t1 = _objectSpread(_objectSpread({}, submitParams), {}, {
                 integrationType: 'SDK',
-                sdkVersion: (_this$paymentContext$7 = this.paymentContext.sdkMetaData.sdkVersion) !== null && _this$paymentContext$7 !== void 0 ? _this$paymentContext$7 : '1.0.0'
+                sdkVersion: (_this$paymentContext$8 = this.paymentContext.sdkMetaData.sdkVersion) !== null && _this$paymentContext$8 !== void 0 ? _this$paymentContext$8 : '1.0.0'
               });
-              _context2.t2 = this.initConfig.environment;
-              _context2.t3 = this.SDK_REQUEST_TIMEOUT;
-              _context2.next = 20;
+              _context3.t2 = this.initConfig.environment;
+              _context3.t3 = this.SDK_REQUEST_TIMEOUT;
+              _context3.next = 20;
               return this.acquireApdidToken();
             case 20:
-              _context2.t4 = _context2.sent;
-              _context2.t5 = {
-                deviceId: _context2.t4
+              _context3.t4 = _context3.sent;
+              _context3.t5 = {
+                deviceId: _context3.t4
               };
-              _context2.t6 = this.hostSign;
-              _context2.t7 = {
-                env: _context2.t2,
-                timeout: _context2.t3,
-                envInfo: _context2.t5,
-                hostSign: _context2.t6,
+              _context3.t6 = this.hostSign;
+              _context3.t7 = {
+                env: _context3.t2,
+                timeout: _context3.t3,
+                envInfo: _context3.t5,
+                hostSign: _context3.t6,
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
               };
-              _context2.next = 26;
-              return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t7);
+              _context3.next = 26;
+              return _context3.t0.request.call(_context3.t0, _context3.t1, _context3.t7);
             case 26:
-              res = _context2.sent;
+              res = _context3.sent;
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
               }, {
@@ -316,24 +414,24 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 requestId: requestBizId,
                 rpcTraceId: res.traceId
               });
-              return _context2.abrupt("return", res);
+              return _context3.abrupt("return", res);
             case 31:
-              _context2.prev = 31;
-              _context2.t8 = _context2["catch"](13);
+              _context3.prev = 31;
+              _context3.t8 = _context3["catch"](13);
               this.logger.logError({
                 title: 'sdk_event_submitPay_failed'
               }, {
                 config: JSON.stringify(submitParams.paymentSessionConfig),
-                errorMessage: JSON.stringify(_context2.t8),
+                errorMessage: JSON.stringify(_context3.t8),
                 requestId: requestBizId,
-                rpcTraceId: _context2.t8 === null || _context2.t8 === void 0 ? void 0 : _context2.t8.traceId
+                rpcTraceId: _context3.t8 === null || _context3.t8 === void 0 ? void 0 : _context3.t8.traceId
               });
-              return _context2.abrupt("return", null);
+              return _context3.abrupt("return", null);
             case 35:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[13, 31]]);
+        }, _callee3, this, [[13, 31]]);
       }));
       function processSubmitPay() {
         return _processSubmitPay.apply(this, arguments);
@@ -343,23 +441,23 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "acquireApdidToken",
     value: function () {
-      var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$paymentContext$8;
+      var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _this$paymentContext$9;
         var securityService, productScene, deviceId;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               securityService = ServiceProvider.getInstance(this.instanceId).getService('Security');
-              productScene = (_this$paymentContext$8 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$8 === void 0 || (_this$paymentContext$8 = _this$paymentContext$8.paymentSessionConfig) === null || _this$paymentContext$8 === void 0 ? void 0 : _this$paymentContext$8.productScene;
+              productScene = (_this$paymentContext$9 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$9 === void 0 || (_this$paymentContext$9 = _this$paymentContext$9.paymentSessionConfig) === null || _this$paymentContext$9 === void 0 ? void 0 : _this$paymentContext$9.productScene;
               deviceId = securityService.getDeviceId({
                 productScene: productScene
               });
-              return _context3.abrupt("return", deviceId);
+              return _context4.abrupt("return", deviceId);
             case 4:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
       function acquireApdidToken() {
         return _acquireApdidToken.apply(this, arguments);
@@ -369,15 +467,15 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "initSecuritySDK",
     value: function () {
-      var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this$paymentContext$9, _this$paymentContext$10, productSceneVersion, nonCompliant, nonInitSecuritySDK, isFirstTimeToPay, shouldInitSecuritySDK;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        var _this$paymentContext$10, _this$paymentContext$11, productSceneVersion, nonCompliant, nonInitSecuritySDK, isFirstTimeToPay, shouldInitSecuritySDK;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.prev = 0;
+              _context5.prev = 0;
               productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion;
-              nonCompliant = (_this$paymentContext$9 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$9 === void 0 ? void 0 : _this$paymentContext$9.nonCompliant;
-              nonInitSecuritySDK = (_this$paymentContext$10 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$10 === void 0 ? void 0 : _this$paymentContext$10.nonInitSecuritySDK;
+              nonCompliant = (_this$paymentContext$10 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$10 === void 0 ? void 0 : _this$paymentContext$10.nonCompliant;
+              nonInitSecuritySDK = (_this$paymentContext$11 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$11 === void 0 ? void 0 : _this$paymentContext$11.nonInitSecuritySDK;
               isFirstTimeToPay = !this.paymentContext.paymentSessionObj.action.autoDebitWithToken;
               shouldInitSecuritySDK = false;
               if (nonInitSecuritySDK) {
@@ -407,10 +505,10 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 }
               }
               if (!shouldInitSecuritySDK) {
-                _context4.next = 10;
+                _context5.next = 10;
                 break;
               }
-              _context4.next = 10;
+              _context5.next = 10;
               return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
             case 10:
               this.logger.logInfo({
@@ -418,16 +516,16 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               }, {
                 riskSdkInfo: shouldInitSecuritySDK ? RiskSdkInfoEnum.NEED : RiskSdkInfoEnum.NO_NEED
               });
-              _context4.next = 15;
+              _context5.next = 15;
               break;
             case 13:
-              _context4.prev = 13;
-              _context4.t0 = _context4["catch"](0);
+              _context5.prev = 13;
+              _context5.t0 = _context5["catch"](0);
             case 15:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this, [[0, 13]]);
+        }, _callee5, this, [[0, 13]]);
       }));
       function initSecuritySDK() {
         return _initSecuritySDK.apply(this, arguments);

package/esm/foundation/service/container/index.d.ts

@@ -29,5 +29,6 @@ export declare class ContainerService implements Service {
     private handleAppHeartBeat;
     private changeCloseBtnVisibility;
     private handleMaskCloseBtnShow;
+    private handleCloseButtonTheme;
     getWebApp(): HTMLIFrameElement;
 }

package/esm/foundation/service/container/index.js

@@ -11,7 +11,7 @@ import { isEmpty } from "../../../util";
 import { addInlineLoading, createInlineBaseElement } from "../../../component/component.inline.style";
 import { addPopupLoading, createBaseElement } from "../../../component/component.popup.style";
 import { insertStyleSheet } from "../../../component/popupWindow.style";
-import { COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CLOSE_MASK_BLOCK_ID, COMPONENT_CONTAINER_ID, ERRORMESSAGE, EVENT, LOADING_ID, MOCKUP_ID, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT } from "../../../constant";
+import { COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CLOSE_MASK_BLOCK_ID, COMPONENT_CONTAINER_ID, ERRORMESSAGE, EVENT, LOADING_ID, MOCKUP_ID, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT, closeImg, closeImgLight } from "../../../constant";
 import { DisplayTypeEnum, ProductSceneEnum } from "../../../types";
 import { ServiceProvider } from "../index";
 import { PopupManager } from "./popup";
@@ -194,7 +194,8 @@ export var ContainerService = /*#__PURE__*/function () {
       this.eventCenter.listen(EVENT.sizeChanged.name, function (data) {
         _this.handleSizeChanged(_objectSpread({}, data));
       });
-      this.eventCenter.listen(EVENT.showCloseButton.name, function () {
+      this.eventCenter.listen(EVENT.showCloseButton.name, function (data) {
+        _this.handleCloseButtonTheme(data.theme);
         _this.changeCloseBtnVisibility(true);
       });
       this.eventCenter.listen(EVENT.hideCloseButton.name, function () {
@@ -323,6 +324,23 @@ export var ContainerService = /*#__PURE__*/function () {
         closeBlock === null || closeBlock === void 0 || closeBlock.classList.add("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-hidden"));
       }
     }
+  }, {
+    key: "handleCloseButtonTheme",
+    value: function handleCloseButtonTheme(theme) {
+      if (!theme) return;
+      var closeBlock = document.getElementById(COMPONENT_CLOSE_BLOCK_ID);
+      var closeButtonImg = closeBlock === null || closeBlock === void 0 ? void 0 : closeBlock.querySelector('img');
+      var maskCloseBlock = document.getElementById(COMPONENT_CLOSE_MASK_BLOCK_ID);
+      if (theme === 'light') {
+        closeButtonImg === null || closeButtonImg === void 0 || closeButtonImg.setAttribute('src', closeImgLight);
+        closeBlock === null || closeBlock === void 0 || closeBlock.classList.add("".concat(COMPONENT_CLOSE_BLOCK_ID, "-light"));
+        maskCloseBlock === null || maskCloseBlock === void 0 || maskCloseBlock.classList.add("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-light"));
+      } else {
+        closeButtonImg === null || closeButtonImg === void 0 || closeButtonImg.setAttribute('src', closeImg);
+        closeBlock === null || closeBlock === void 0 || closeBlock.classList.remove("".concat(COMPONENT_CLOSE_BLOCK_ID, "-light"));
+        maskCloseBlock === null || maskCloseBlock === void 0 || maskCloseBlock.classList.remove("".concat(COMPONENT_CLOSE_MASK_BLOCK_ID, "-light"));
+      }
+    }
   }, {
     key: "getWebApp",
     value: function getWebApp() {

package/esm/foundation/utils/preload_helper.d.ts

@@ -4,10 +4,10 @@ export default class PreloadHelper {
     static isWebAppPreloaded: boolean;
     static isSecuritySDKPreloaded: boolean;
     private static securitySdkMap;
-    static preloadWebApp(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment?: string): void;
+    static preloadWebApp(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment?: string, useV2?: boolean): void;
     static preloadSecuritySDK(product: ProductSceneEnum, securityRegion?: string): void;
     static getSecuritySdk(scene: any): Security;
-    static buildWebAppPreloadUrl(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment: string): {
+    static buildWebAppPreloadUrl(productScene: ProductSceneEnum, paymentMethodCategoryType: PaymentMethodCategoryTypeEnum, environment: string, useV2?: boolean): {
         preloadUrl: string;
         containerId: string;
     };

package/esm/foundation/utils/preload_helper.js

@@ -8,7 +8,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { sdkVersion } from "../../config";
 import { createPreloadIframe } from "../service/container/utils";
 import { ProductSceneEnum } from "../../types";
-import { getWebAppUrl } from "../utils/web_app_url_utils";
+import { getWebAppUrl, getWebAppV2Url } from "../utils/web_app_url_utils";
 import { ProductInfoCacheUtil } from "../utils/payment_product_utils";
 import { getWebAppVersion } from "./payment_context_utils";
 import { getSecurityConfigStorageKey, getSecurityHost, getSecurityScene, Security } from "../../util/security";
@@ -22,12 +22,13 @@ var PreloadHelper = /*#__PURE__*/function () {
     key: "preloadWebApp",
     value: function preloadWebApp(productScene, paymentMethodCategoryType) {
       var environment = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'prod';
+      var useV2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       try {
         if (this.isWebAppPreloaded) {
           console.log('[web-sdk] web app already preloaded');
           return;
         }
-        var _this$buildWebAppPrel = this.buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment),
+        var _this$buildWebAppPrel = this.buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment, useV2),
           preloadUrl = _this$buildWebAppPrel.preloadUrl,
           containerId = _this$buildWebAppPrel.containerId;
         var preloadIframe = createPreloadIframe(containerId);
@@ -89,6 +90,7 @@ var PreloadHelper = /*#__PURE__*/function () {
   }, {
     key: "buildWebAppPreloadUrl",
     value: function buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment) {
+      var useV2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       var productSceneVersion = productScene === ProductSceneEnum.EASY_PAY ? '2.0' : '1.0';
       var previousProductInfo = ProductInfoCacheUtil.getPreviousProductInfo(productScene);
       if (previousProductInfo) {
@@ -101,14 +103,16 @@ var PreloadHelper = /*#__PURE__*/function () {
         webAppVersion: ''
       };
       sdkMetaData.webAppVersion = getWebAppVersion(sdkMetaData);
-      var preloadUrl = getWebAppUrl({
+      var preloadUrlParams = {
         environment: environment,
         sdkMetaData: sdkMetaData,
         paymentMethodCategoryType: paymentMethodCategoryType,
         isPreload: true,
+        productScene: productScene,
         productSceneVersion: productSceneVersion,
         query: undefined
-      });
+      };
+      var preloadUrl = useV2 ? getWebAppV2Url(preloadUrlParams) : getWebAppUrl(preloadUrlParams);
       return {
         preloadUrl: preloadUrl,
         containerId: containerId

package/esm/foundation/utils/web_app_url_utils.d.ts

@@ -1,5 +1,6 @@
-import { DisplayTypeEnum, PaymentMethodCategoryTypeEnum } from '../../types';
+import { DisplayTypeEnum, PaymentMethodCategoryTypeEnum, ProductSceneEnum } from '../../types';
 import { SDKMetaData } from '../index';
+import { ESP_PAGE_NAME } from "../../constant/easysafepay";
 /**
  * Tell the SDK which version of the Web App to load.
  * Sent by server inside paymentSession.
@@ -16,6 +17,16 @@ export interface WebAppMatchConfig {
     mid?: string;
     greyscale?: string;
 }
+/**
+ * Tell the SDK which Web App URL to load.
+ * Sent by server inside paymentSession.
+ */
+export interface WebAppUrlMatchConfig {
+    minSDKVersion: string;
+    url: string;
+    doubleFa: string;
+    mids?: string[];
+}
 export interface QueryParams {
     displayType: DisplayTypeEnum;
     locale: string;
@@ -27,20 +38,63 @@ export interface QueryParams {
 export declare const getWebAppUrlInfo: (params: {
     environment: string;
     sdkMetaData: SDKMetaData;
+    productScene: ProductSceneEnum;
     productSceneVersion: string;
     paymentMethodCategoryType: PaymentMethodCategoryTypeEnum;
     isPreload?: boolean;
     query: QueryParams;
+    v2Url?: string;
 }) => {
     path: string;
     locationSearch: string;
 };
+export declare const getWebAppV2Url: (params: {
+    environment: string;
+    sdkMetaData: SDKMetaData;
+    productScene: ProductSceneEnum;
+    productSceneVersion: string;
+    paymentMethodCategoryType: PaymentMethodCategoryTypeEnum;
+    isPreload?: boolean;
+    query: QueryParams;
+    mid?: string;
+    extendInfo?: string;
+}) => string;
 export declare const getWebAppUrl: (params: {
     environment: string;
     sdkMetaData: SDKMetaData;
+    productScene: ProductSceneEnum;
     productSceneVersion: string;
     paymentMethodCategoryType: PaymentMethodCategoryTypeEnum;
     isPreload?: boolean;
     query: QueryParams;
+    v2Url?: string;
 }) => string;
 export declare const parseWebAppMatchConfig: (extendInfo: string) => WebAppMatchConfig[];
+export declare const parseWebAppUrlMatchConfig: (extendInfo: string) => WebAppUrlMatchConfig[];
+/**
+ * Save the current checkout URL to localStorage for the specified product scene.
+ *
+ * @param productScene - The product scene for which the checkout URL should be saved.
+ */
+export declare const saveLocalCheckoutUrl: (productScene: ProductSceneEnum, url: string) => void;
+/**
+ * Retrieve the saved checkout URL from localStorage for the specified product scene.
+ * If no url is found, a default checkout url string is returned.
+ *
+ * @param productScene - The product scene for which the checkout URL should be retrieved.
+ */
+export declare const getLocalCheckoutUrl: (productScene: ProductSceneEnum, environment: string) => string;
+/**
+ * Provide default checkout URL for the specified product scene.
+ * Return URL for 'EASY_PAY' product scene, while for other product scenes, it returns an empty string as they are not currently in use
+ *
+ * @param productScene - The product scene for which the default checkout URL should be provided.
+ */
+export declare const defaultCheckoutUrl: (productScene: ProductSceneEnum, environment?: string) => string;
+export declare const getMatchedWebAppV2Url: (productScene: ProductSceneEnum, mid: string, config: WebAppUrlMatchConfig[], environment: string) => string;
+/**
+ * V2应用EasySafePay 热更新兜底URL构建规则
+ * 1. 兜底URL版本与sdk版本保持一致
+ * 2. DEV环境下html新增版本前缀
+**/
+export declare const getDefaultEasySafePayPageUrl: (pageName: ESP_PAGE_NAME, env: string) => string;