@alipay/ams-checkout 0.0.1745808793-dev.1 → 0.0.1745808793-dev.3

package/esm/foundation/core/index.js

@@ -15,14 +15,13 @@ import { cleanMockup, createMockup, createRetentionPopup, handleDeclareInfo, hid
 import { insertStyleSheet } from "../../component/popupWindow.style";
 import { sdkVersion } from "../../config";
 import { COMPONENT_CLOSE_MASK_BLOCK_ID, EVENT, LOADING_ID } from "../../constant";
-import { DisplayTypeEnum, eventCodeEnum } from "../../types";
+import { DisplayTypeEnum, eventCodeEnum, EventLoggingEventId } from "../../types";
 import { DisplayInfo, IElementStatus } from "../index";
 import { ServiceProvider } from "../service";
 import { getGrayscaleId } from "../utils/gray_scale_utils";
 import { convertPaymentSession, getWebAppVersion, saveWebAppVersion } from "../utils/payment_context_utils";
 import { redirect } from "../utils/redirect_utils";
 import { parseWebAppMatchConfig } from "../utils/web_app_url_utils";
-
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
  * @date 2024/9/17
@@ -37,8 +36,11 @@ export var AntomSDKCore = /*#__PURE__*/function () {
     _defineProperty(this, "sdkMetaData", void 0);
     _defineProperty(this, "productProcessors", {});
     _defineProperty(this, "enablePopWindowEventCallback", false);
+    _defineProperty(this, "eventLogging", void 0);
     _defineProperty(this, "status", IElementStatus.UNINIT);
+    _defineProperty(this, "logger", void 0);
     this.status = IElementStatus.INITING;
+    this.logger = ServiceProvider.getInstance(this.instanceId).getService('Log');
   }
   _createClass(AntomSDKCore, [{
     key: "getStatus",
@@ -220,6 +222,7 @@ export var AntomSDKCore = /*#__PURE__*/function () {
       eventCenter.listen(EVENT.declareEventCallbackInfo.name, function (data) {
         if (data !== null && data !== void 0 && data.popWindowEventInfo) {
           _this.enablePopWindowEventCallback = data.popWindowEventInfo.enableCallback;
+          _this.eventLogging = data.eventLogging;
         }
       });
 
@@ -365,7 +368,7 @@ export var AntomSDKCore = /*#__PURE__*/function () {
           showRetentionPopup();
           return;
         } else {
-          _this2.handleClose(isOnCloseEvent);
+          _this2.handleClose(isOnCloseEvent, 'behavior');
         }
       };
 
@@ -391,9 +394,10 @@ export var AntomSDKCore = /*#__PURE__*/function () {
       if (displayType == DisplayTypeEnum.popup) {
         createRetentionPopup(platform, function () {
           hideRetentionPopup();
+          _this2.handleRemain();
         }, function () {
           hideRetentionPopup();
-          _this2.handleClose();
+          _this2.handleClose(false, 'retention');
         });
         createMockup({
           platform: platform,
@@ -404,13 +408,38 @@ export var AntomSDKCore = /*#__PURE__*/function () {
         return;
       }
     }
+  }, {
+    key: "handleRemain",
+    value: function handleRemain() {
+      if (this.eventLogging && this.eventLogging.enableLogging) {
+        this.logger.logInfo({
+          code: this.eventLogging.eventName
+        }, {
+          eventId: EventLoggingEventId.ContinuePaying,
+          eventName: this.eventLogging.eventName,
+          eventAlias: this.eventLogging.eventAlias,
+          userPath: this.eventLogging.userPath
+        });
+      }
+    }
   }, {
     key: "handleClose",
     value: function handleClose() {
       var isOnCloseEvent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      var source = arguments.length > 1 ? arguments[1] : undefined;
       var eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
       eventCenter.emit(EVENT.closeCallback.name, {});
       if (this.enablePopWindowEventCallback && !isOnCloseEvent) {
+        if (this.eventLogging && this.eventLogging.enableLogging) {
+          this.logger.logInfo({
+            code: this.eventLogging.eventName
+          }, {
+            eventId: source === 'behavior' ? EventLoggingEventId.OnlyClose : EventLoggingEventId.LeaveAnyWay,
+            eventName: this.eventLogging.eventName,
+            eventAlias: this.eventLogging.eventAlias,
+            userPath: this.eventLogging.userPath
+          });
+        }
         eventCenter.emit(EVENT.eventCallback.name, {
           code: eventCodeEnum.SDK_PAYMENT_CANCEL,
           result: {

package/esm/foundation/index.d.ts

@@ -76,6 +76,12 @@ export interface SDKMetaData {
     webAppVersion: string;
     greyscaleId?: number;
 }
+export interface EventLogging {
+    enableLogging: boolean;
+    eventName: string;
+    eventAlias: any;
+    userPath: string;
+}
 export interface InitContext {
     initOptions: IoptionsParams;
     sdkMetaData: SDKMetaData;

package/esm/foundation/product-processor/easysafepay/deps.d.ts

@@ -4,7 +4,7 @@ export type { BizFlowStartBehavior, PaymentContext, ProductProcessor, RedirectBe
 export * as ChannelCustomize from '../../../component/channel';
 export type { IChannelBehavior } from '../../../component/channel';
 export { DisplayTypeEnum, PaymentMethodCategoryTypeEnum, ProductSceneEnum, RiskSdkInfoEnum } from '../../../types';
-export type { CashierSdkActionQueryRequest, CashierSdkActionQueryResult, CashierSubmitPayRequest, CashierSubmitPayResult, IoptionsParams, } from '../../../types';
+export type { CashierSdkActionQueryRequest, CashierSdkActionQueryResult, CashierSdkActionQuerySessionResult, CashierSubmitPayRequest, CashierSubmitPayResult, IoptionsParams, } from '../../../types';
 export { isPC } from '../../../util';
 export { getBackScheme } from '../../utils/redirect_utils';
 export { isLocalMock } from '../../../util/mock';

package/esm/foundation/product-processor/easysafepay/index.d.ts

@@ -7,6 +7,7 @@ export declare class EasySafePayProcessor implements ProductProcessor {
     private eventCenter;
     private instanceId;
     private hostSign;
+    private allowQueryCall;
     private allowSubmitPayCallAhead;
     private channelBehavior?;
     private SECURITY_SDK_INIT_TIMEOUT;
@@ -21,6 +22,7 @@ export declare class EasySafePayProcessor implements ProductProcessor {
      *  start waiting web launch, then send renderComponent event
      * */
     private sendRequestAndWaitWebLaunch;
+    private processQuery;
     private processSubmitPay;
     private acquireApdidToken;
     private initSecuritySDK;

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);
@@ -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)) {
@@ -183,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),
@@ -203,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
@@ -231,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);
@@ -260,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
               });
@@ -279,44 +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
+                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'
               }, {
@@ -324,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);
@@ -351,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);
@@ -377,15 +467,16 @@ 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, _this$paymentContext$12, _this$paymentContext$13, _this$paymentContext$14, _this$paymentContext$15, productSceneVersion, nonInitSecuritySDK, signButtonDisplay, userSignAgreement, 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;
+              nonInitSecuritySDK = (_this$paymentContext$10 = (_this$paymentContext$11 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$11 === void 0 ? void 0 : _this$paymentContext$11.nonInitSecuritySDK) !== null && _this$paymentContext$10 !== void 0 ? _this$paymentContext$10 : false;
+              signButtonDisplay = (_this$paymentContext$12 = (_this$paymentContext$13 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$13 === void 0 ? void 0 : _this$paymentContext$13.signButtonDisplay) !== null && _this$paymentContext$12 !== void 0 ? _this$paymentContext$12 : false;
+              userSignAgreement = (_this$paymentContext$14 = (_this$paymentContext$15 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$15 === void 0 ? void 0 : _this$paymentContext$15.userSignAgreement) !== null && _this$paymentContext$14 !== void 0 ? _this$paymentContext$14 : false;
               isFirstTimeToPay = !this.paymentContext.paymentSessionObj.action.autoDebitWithToken;
               shouldInitSecuritySDK = false;
               if (nonInitSecuritySDK) {
@@ -398,44 +489,38 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                   // console.log('[web-sdk][security-sdk] DO NOT init security sdk for easypay 1.0');
                   shouldInitSecuritySDK = false;
                 } else if (productSceneVersion === '2.0') {
-                  if (nonCompliant === true) {
-                    // 未切流「隐私合规」
-                    // console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and nonCompliant is true');
-                    shouldInitSecuritySDK = true;
+                  if (isFirstTimeToPay) {
+                    // console.log((signButtonDisplay && userSignAgreement) ? '[web-sdk][security-sdk] DO init security sdk for easypay 2.0, first time to pay and user agreeement signing from merchant' : '[web-sdk][security-sdk] DO NOT init security sdk for easypay 2.0, first time to pay and user agreeement has not been signed from merchant');
+                    shouldInitSecuritySDK = signButtonDisplay && userSignAgreement;
                   } else {
-                    if (isFirstTimeToPay) {
-                      // console.log('[web-sdk][security-sdk] DO NOT init security sdk for easypay 2.0 and when first time to pay');
-                      shouldInitSecuritySDK = false;
-                    } else {
-                      // 切流「隐私合规」且非首次支付
-                      // console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and when not first time to pay');
-                      shouldInitSecuritySDK = true;
-                    }
+                    // 切流「隐私合规」且非首次支付
+                    // console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and when not first time to pay');
+                    shouldInitSecuritySDK = true;
                   }
                 }
               }
               if (!shouldInitSecuritySDK) {
-                _context4.next = 10;
+                _context5.next = 11;
                 break;
               }
-              _context4.next = 10;
+              _context5.next = 11;
               return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
-            case 10:
+            case 11:
               this.logger.logInfo({
                 title: 'a3753.b101271.c388193.d514078'
               }, {
                 riskSdkInfo: shouldInitSecuritySDK ? RiskSdkInfoEnum.NEED : RiskSdkInfoEnum.NO_NEED
               });
-              _context4.next = 15;
+              _context5.next = 16;
               break;
-            case 13:
-              _context4.prev = 13;
-              _context4.t0 = _context4["catch"](0);
-            case 15:
+            case 14:
+              _context5.prev = 14;
+              _context5.t0 = _context5["catch"](0);
+            case 16:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this, [[0, 13]]);
+        }, _callee5, this, [[0, 14]]);
       }));
       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/web_app_url_utils.d.ts

@@ -1,5 +1,6 @@
 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.
@@ -21,9 +22,10 @@ export interface WebAppMatchConfig {
  * Sent by server inside paymentSession.
  */
 export interface WebAppUrlMatchConfig {
-    version: string;
+    minSDKVersion: string;
     url: string;
-    mid?: string;
+    doubleFa: string;
+    mids?: string[];
 }
 export interface QueryParams {
     displayType: DisplayTypeEnum;
@@ -81,11 +83,18 @@ export declare const saveLocalCheckoutUrl: (productScene: ProductSceneEnum, url:
  *
  * @param productScene - The product scene for which the checkout URL should be retrieved.
  */
-export declare const getLocalCheckoutUrl: (productScene: ProductSceneEnum) => string;
+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) => string;
+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;