@alipay/ams-checkout 0.0.1755253657-dev.2 → 0.0.1755258862-dev.0

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

@@ -17,9 +17,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import 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 { getDoubleFaUrlFromSession } from "../../utils/web_app_url_utils";
+import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isPC, PaymentMethodCategoryTypeEnum, ProductInfoCacheUtil, ProductSceneEnum, RiskSdkInfoEnum, ServiceProvider, uuid, WebAppUrlUtil } from "./deps";
 export var EasySafePayProcessor = /*#__PURE__*/function () {
   function EasySafePayProcessor() {
     _classCallCheck(this, EasySafePayProcessor);
@@ -27,17 +25,13 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     _defineProperty(this, "initConfig", void 0);
     _defineProperty(this, "logger", void 0);
     _defineProperty(this, "securityService", void 0);
-    _defineProperty(this, "eventCenter", void 0);
     _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);
-    _defineProperty(this, "SECURITY_SDK_INIT_TIMEOUT", 1500);
-    _defineProperty(this, "SDK_REQUEST_TIMEOUT", 15000);
-    _defineProperty(this, "LOAD_APP_RESOURCES_TIMEOUT", 15000);
+    _defineProperty(this, "SECURITY_SDK_INIT_TIMEOUT", 18000);
   }
   _createClass(EasySafePayProcessor, [{
     key: "init",
@@ -46,16 +40,15 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       this.instanceId = instanceId;
       this.logger = ServiceProvider.getInstance(this.instanceId).getService('Log');
       this.securityService = ServiceProvider.getInstance(this.instanceId).getService('Security');
-      this.eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
 
       // preload web app
-      PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, this.initConfig.environment, true);
+      PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, this.initConfig.environment);
     }
   }, {
     key: "startBizFlow",
     value: function () {
       var _startBizFlow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(paymentContext) {
-        var _paymentContext$payme2, _paymentContext$start, _this$channelBehavior;
+        var _paymentContext$payme2, _this$channelBehavior;
         var _paymentContext$payme, productSceneVersion, paymentMethodCategoryType, autoDebitWithToken, requireFastSdk, authUrlInfo, isFirstTimeToPay, webAppUrl, resultPayload;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -63,10 +56,9 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               // 放在最前面的逻辑
               // 在PC场景下，几乎所有渠道都是没有拉端的逻辑的，所以需要改成1.0， 这个是历史原因
               if (isPC()) {
-                // 非TOSS渠道，在PC场景需要改成1.0/needAccountConfirmPage=false
+                // 非TOSS渠道，在PC场景需要改成1.0
                 if ('BANKTRANSFER_QUICKPAY' !== ((_paymentContext$payme = paymentContext.paymentSessionObj) === null || _paymentContext$payme === void 0 || (_paymentContext$payme = _paymentContext$payme.paymentMethodInfoView) === null || _paymentContext$payme === void 0 ? void 0 : _paymentContext$payme.paymentMethodType)) {
                   paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion = '1.0';
-                  paymentContext.paymentSessionObj.needAccountConfirmPage = false;
                 }
               }
               this.paymentContext = paymentContext;
@@ -76,18 +68,17 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               autoDebitWithToken = paymentContext.paymentSessionObj.action.autoDebitWithToken;
               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$start = paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _paymentContext$start === void 0 ? void 0 : _paymentContext$start.notRedirectAfterComplete) === true, paymentContext.paymentSessionObj);
-
+              this.channelBehavior = ChannelCustomize.getChannelBehavior(paymentContext.paymentSessionObj);
               // 首次支付
-              isFirstTimeToPay = !autoDebitWithToken; // 处理ESP极速外跳支付场景
-              if (!(isFirstTimeToPay && requireFastSdk)) {
+              isFirstTimeToPay = !autoDebitWithToken; // 处理ESP1.0极速外跳支付场景
+              if (!(productSceneVersion === '1.0' && isFirstTimeToPay && requireFastSdk)) {
                 _context.next = 12;
                 break;
               }
               return _context.abrupt("return", this.buildRedirectResult(authUrlInfo));
             case 12:
               // 下面的场景是需要渲染UI的渠道, 打开WebUrl
-              webAppUrl = this.buildWebAppUrl();
+              webAppUrl = this.buildWebAppUrl(); // const webAppUrl = 'http://svc-9kvjxwjf68cptha8.cloudide.svc.et15-sqa.alipay.net:5173/src/component-app/index.html';
               resultPayload = {
                 url: webAppUrl,
                 allowClickPopupOutsideClose: (_this$channelBehavior = this.channelBehavior) === null || _this$channelBehavior === void 0 ? void 0 : _this$channelBehavior.allowClickOutsideClose
@@ -98,13 +89,15 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 productSceneVersion: productSceneVersion
               });
               // 返回结果之前，发送 sessionData，并且等待Web应用启动的事件，内部是异步处理，不阻塞。
+              console.log('[DEBUG] sendRequestAndWaitWebLaunch start');
               this.sendRequestAndWaitWebLaunch();
+              console.log('[DEBUG] sendRequestAndWaitWebLaunch completed');
               // 返回结果，RENDER，让外层去处理iframe加载等逻辑
               return _context.abrupt("return", {
                 behaviorType: 'RENDER',
                 payload: resultPayload
               });
-            case 17:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -118,19 +111,15 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "buildWebAppUrl",
     value: function buildWebAppUrl() {
-      var _paymentContext$payme3, _paymentContext$payme4, _paymentContext$payme5, _this$initConfig$anal;
+      var _paymentContext$payme3, _paymentContext$payme4, _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 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 productSceneVersion = (_paymentContext$payme4 = paymentContext.paymentSessionObj.paymentSessionConfig) === null || _paymentContext$payme4 === void 0 ? void 0 : _paymentContext$payme4.productSceneVersion;
       var hostSign = this.hostSign;
-      var mid = paymentContext.paymentSessionObj.clientId;
-      var extendInfo = paymentContext.paymentSessionObj.extendInfo;
-      var webAppUrl = WebAppUrlUtil.getWebAppV2Url({
+      var webAppUrl = WebAppUrlUtil.getWebAppUrl({
         environment: this.initConfig.environment,
         paymentMethodCategoryType: paymentMethodCategoryType,
         sdkMetaData: paymentContext.sdkMetaData,
-        productScene: productScene,
         productSceneVersion: productSceneVersion,
         isPreload: false,
         query: {
@@ -139,9 +128,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
           instanceId: this.instanceId,
           locale: this.initConfig.locale,
           hostSign: hostSign
-        },
-        mid: mid,
-        extendInfo: extendInfo
+        }
       });
       return webAppUrl;
     }
@@ -177,216 +164,75 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     key: "sendRequestAndWaitWebLaunch",
     value: function sendRequestAndWaitWebLaunch() {
       var _this = this;
-      console.log('[DEBUG] sendRequestAndWaitWebLaunch start');
-      var webLaunchPromise = new Promise(function (resolve, reject) {
-        console.log('[DEBUG] sendRequestAndWaitWebLaunch webLaunchPromise start');
-        var t = setTimeout(function () {
-          console.log('[DEBUG] sendRequestAndWaitWebLaunch webLaunchPromise timeout');
-          reject(new Error('Load resource timeout'));
-        }, _this.LOAD_APP_RESOURCES_TIMEOUT);
-        _this.eventCenter.listen('onLaunch', function (res) {
-          clearTimeout(t);
+      var eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
+      var webLaunchPromise = new Promise(function (resolve) {
+        eventCenter.listen('onLaunch', function (res) {
           resolve(res);
-          console.log('[DEBUG] sendRequestAndWaitWebLaunch webLaunchPromise onLaunch');
-          _this.logger.logInfo({
-            title: 'sdk_event_webAppOnLaunch'
-          });
         });
-        console.log('[DEBUG] sendRequestAndWaitWebLaunch completed');
       });
-      console.log('[DEBUG] sendRequestAndWaitWebLaunch start Promise all');
+
       // 等请求和 Web启动都Ready之后，发送renderComponent
-      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$paymentContext3, _this$paymentContext$4;
-        var _ref2 = _slicedToArray(_ref, 4),
+      Promise.all([this.initSecuritySDK(), 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),
           _initSecurityRes = _ref2[0],
-          queryRes = _ref2[1],
-          submitRes = _ref2[2],
-          _webLaunchRes = _ref2[3];
-        console.log('[DEBUG] sendRequestAndWaitWebLaunch  success', _initSecurityRes, queryRes, submitRes, _webLaunchRes);
+          submitRes = _ref2[1],
+          _webLaunchRes = _ref2[2];
         var logMetaData = _this.logger.getLogConfig().mdata;
-        var data = {
-          sessionResult: (_this$paymentContext = _this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSessionObj,
-          submitResult: submitRes,
-          paymentSessionData: (_this$paymentContext2 = _this.paymentContext) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSessionId,
-          heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-          renderDisplayType: _this.paymentContext.displayInfo.type,
-          appearance: (_this$paymentContext$ = _this.paymentContext.displayInfo) === null || _this$paymentContext$ === void 0 ? void 0 : _this$paymentContext$.appearance,
-          notRedirectAfterComplete: ((_this$paymentContext$2 = _this.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.notRedirectAfterComplete) === true,
-          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: getDoubleFaUrlFromSession((_this$paymentContext3 = _this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.paymentSessionObj, _this.initConfig.environment),
-          envInfo: {
-            screenHeight: screen.height,
-            screenWidth: screen.width
-          },
-          logMetaData: _objectSpread(_objectSpread({
-            trackId: logMetaData.requestSeq,
-            platform: logMetaData.platform,
-            firstLogTime: logMetaData.firstLogTime
-          }, ((_this$paymentContext$4 = _this.paymentContext.paymentSessionObj) === null || _this$paymentContext$4 === void 0 ? void 0 : _this$paymentContext$4.paymentSessionConfig) || {}), {}, {
-            renderDisplayType: logMetaData.renderDisplayType,
-            sdkVersion: logMetaData.sdkVersion,
-            merchantId: logMetaData.merchantId,
-            instanceId: logMetaData.instanceId,
-            paymentMethodType: logMetaData.paymentMethodType
-          })
-        };
-        if (queryRes) {
-          data.queryResult = queryRes;
-        }
-        console.log('[DEBUG] sendRequestAndWaitWebLaunch  enter.dispatchToApp start', data);
-        _this.eventCenter.dispatchToApp({
+        eventCenter.dispatchToApp({
           event: 'renderComponent',
-          data: data
-        });
-        console.log('[DEBUG] sendRequestAndWaitWebLaunch  enter.dispatchToApp completed');
-        console.log('[DEBUG] sendRequestAndWaitWebLaunch completed');
-        _this.logger.logInfo({
-          title: 'sdk_event_renderComponent'
-        });
-      }).catch(function (error) {
-        console.log('[DEBUG] sendRequestAndWaitWebLaunch  ERROR', error);
-        _this.eventCenter.emit(EVENT.destroy.name, {});
-        _this.eventCenter.emit(EVENT.eventCallback.name, {
-          code: eventCodeEnum.SDK_INTERNAL_ERROR,
-          result: {
-            message: error === null || error === void 0 ? void 0 : error.message
+          data: {
+            sessionResult: (_this$paymentContext = _this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSessionObj,
+            submitResult: submitRes,
+            paymentSessionData: (_this$paymentContext2 = _this.paymentContext) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSessionId,
+            heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
+            renderDisplayType: _this.paymentContext.displayInfo.type,
+            appearance: (_this$paymentContext$ = _this.paymentContext.displayInfo) === null || _this$paymentContext$ === void 0 ? void 0 : _this$paymentContext$.appearance,
+            notRedirectAfterComplete: ((_this$paymentContext$2 = _this.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.notRedirectAfterComplete) === true,
+            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,
+            envInfo: {
+              screenHeight: screen.height,
+              screenWidth: screen.width
+            },
+            logMetaData: _objectSpread(_objectSpread({
+              trackId: logMetaData.requestSeq,
+              platform: logMetaData.platform,
+              firstLogTime: logMetaData.firstLogTime
+            }, ((_this$paymentContext$4 = _this.paymentContext.paymentSessionObj) === null || _this$paymentContext$4 === void 0 ? void 0 : _this$paymentContext$4.paymentSessionConfig) || {}), {}, {
+              renderDisplayType: logMetaData.renderDisplayType,
+              sdkVersion: logMetaData.sdkVersion,
+              merchantId: logMetaData.merchantId,
+              instanceId: logMetaData.instanceId,
+              paymentMethodType: logMetaData.paymentMethodType
+            })
           }
         });
+      }, function (error) {
+        console.log('[DEBUG] - sendRequestAndWaitWebLaunch - ERROR', error);
       });
     }
   }, {
-    key: "processQuery",
+    key: "processSubmitPay",
     value: function () {
-      var _processQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _this$paymentContext4, _this$paymentContext5, _this$paymentContext6, _this$paymentContext$5, _this$paymentContext7, _this$paymentContext8;
-        var queryParams, extendInfo, needAccountConfirmPage, isFirstTimeToPay, needQueryRender, extendInfoData, requestBizId, requester, _this$paymentContext$6, res;
+      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, res;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              console.log('[DEBUG] processQuery start');
-              queryParams = {
-                paymentSessionData: ((_this$paymentContext4 = this.paymentContext) === null || _this$paymentContext4 === void 0 ? void 0 : _this$paymentContext4.paymentSessionId) || '',
-                paymentSessionConfig: (_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 || (_this$paymentContext5 = _this$paymentContext5.paymentSessionObj) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.paymentSessionConfig
-              };
-              extendInfo = (_this$paymentContext6 = this.paymentContext) === null || _this$paymentContext6 === void 0 ? void 0 : _this$paymentContext6.paymentSessionObj.extendInfo;
-              needAccountConfirmPage = (_this$paymentContext$5 = (_this$paymentContext7 = this.paymentContext) === null || _this$paymentContext7 === void 0 ? void 0 : _this$paymentContext7.paymentSessionObj.needAccountConfirmPage) !== null && _this$paymentContext$5 !== void 0 ? _this$paymentContext$5 : true;
-              isFirstTimeToPay = !((_this$paymentContext8 = this.paymentContext) !== null && _this$paymentContext8 !== void 0 && (_this$paymentContext8 = _this$paymentContext8.paymentSessionObj.action) !== null && _this$paymentContext8 !== void 0 && _this$paymentContext8.autoDebitWithToken);
-              needQueryRender = true;
-              try {
-                console.log('[DEBUG] processQuery JSON.parse(extendInfo) start', extendInfo);
-                extendInfoData = JSON.parse(extendInfo);
-                needQueryRender = isEmpty(extendInfoData.needQueryRender) || extendInfoData.needQueryRender === true;
-                console.log('[DEBUG] processQuery JSON.parse(extendInfo) completed', needQueryRender);
-              } catch (error) {
-                console.log('[DEBUG] processQuery JSON.parse(extendInfo) ERROR', error);
-                console.log(error);
-              }
-              this.allowQueryCall = needQueryRender && isFirstTimeToPay && needAccountConfirmPage;
-              console.log('[DEBUG] processQuery allowQueryCall', this.allowQueryCall);
-              if (this.allowQueryCall) {
-                _context2.next = 12;
-                break;
-              }
-              console.log('[DEBUG] processQuery allowQueryCall NO', this.allowQueryCall);
-              return _context2.abrupt("return", null);
-            case 12:
-              requestBizId = uuid();
-              this.logger.logInfo({
-                title: 'sdk_event_sdkQuery'
-              }, {
-                config: JSON.stringify(queryParams.paymentSessionConfig),
-                requestId: requestBizId
-              });
-              console.log('[DEBUG] processQuery ServiceProvider.getInstance start');
-              requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              console.log('[DEBUG] processQuery ServiceProvider.getInstance completed', requester);
-              _context2.prev = 17;
-              console.log('[DEBUG] processQuery requester.request<CashierSdkActionQuerySessionResult start');
-              _context2.t0 = requester;
-              _context2.t1 = _objectSpread(_objectSpread({}, queryParams), {}, {
-                actionType: 'init',
-                integrationType: 'SDK',
-                sdkVersion: (_this$paymentContext$6 = this.paymentContext.sdkMetaData.sdkVersion) !== null && _this$paymentContext$6 !== void 0 ? _this$paymentContext$6 : '1.0.0'
-              });
-              _context2.t2 = this.initConfig.environment;
-              _context2.t3 = this.SDK_REQUEST_TIMEOUT;
-              _context2.next = 25;
-              return this.acquireApdidToken();
-            case 25:
-              _context2.t4 = _context2.sent;
-              _context2.t5 = {
-                deviceId: _context2.t4
-              };
-              _context2.t6 = this.hostSign;
-              _context2.t7 = {
-                env: _context2.t2,
-                timeout: _context2.t3,
-                envInfo: _context2.t5,
-                hostSign: _context2.t6,
-                needEnvInfo: true,
-                'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query'
-              };
-              _context2.next = 31;
-              return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t7);
-            case 31:
-              res = _context2.sent;
-              console.log('[DEBUG] processQuery requester.request<CashierSdkActionQuerySessionResult completed', res);
-              this.logger.logInfo({
-                title: 'sdk_event_sdkQueryEnd'
-              }, {
-                config: JSON.stringify(queryParams.paymentSessionConfig),
-                requestId: requestBizId,
-                rpcTraceId: res.traceId
-              });
-              console.log('[DEBUG] processQuery completed', res);
-              return _context2.abrupt("return", res);
-            case 38:
-              _context2.prev = 38;
-              _context2.t8 = _context2["catch"](17);
-              console.log('[DEBUG] processQuery ERROR', _context2.t8);
-              this.logger.logError({
-                title: 'sdk_event_sdkQuery_failed'
-              }, {
-                config: JSON.stringify(queryParams.paymentSessionConfig),
-                errorMessage: JSON.stringify(_context2.t8),
-                requestId: requestBizId,
-                rpcTraceId: _context2.t8 === null || _context2.t8 === void 0 ? void 0 : _context2.t8.traceId
-              });
-              return _context2.abrupt("return", null);
-            case 43:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this, [[17, 38]]);
-      }));
-      function processQuery() {
-        return _processQuery.apply(this, arguments);
-      }
-      return processQuery;
-    }()
-  }, {
-    key: "processSubmitPay",
-    value: function () {
-      var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$paymentContext9, _this$paymentContext10, _this$paymentContext11, _this$channelBehavior2, _this$channelBehavior3, _this$paymentContext$8, _this$paymentContext12;
-        var submitParams, _ref3, _ref3$productSceneVer, productSceneVersion, _ref4, _ref4$action, _ref4$action2, _ref4$action2$enableS, enableSignAgreement, _ref4$action2$autoDeb, autoDebitWithToken, _this$paymentContext$7, paymentMethodType, isAppWebview, backScheme, requestBizId, extParams, requester, _this$paymentContext$9, res;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              console.log('DEBUG] processSubmitPay start');
+              console.log('[DEBUG] processSubmitPay start');
               submitParams = {
-                paymentSessionData: ((_this$paymentContext9 = this.paymentContext) === null || _this$paymentContext9 === void 0 ? void 0 : _this$paymentContext9.paymentSessionId) || '',
-                paymentSessionConfig: (_this$paymentContext10 = this.paymentContext) === null || _this$paymentContext10 === void 0 || (_this$paymentContext10 = _this$paymentContext10.paymentSessionObj) === null || _this$paymentContext10 === void 0 ? void 0 : _this$paymentContext10.paymentSessionConfig
+                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
               };
               _ref3 = submitParams.paymentSessionConfig || {}, _ref3$productSceneVer = _ref3.productSceneVersion, productSceneVersion = _ref3$productSceneVer === void 0 ? '' : _ref3$productSceneVer;
-              _ref4 = ((_this$paymentContext11 = this.paymentContext) === null || _this$paymentContext11 === void 0 ? void 0 : _this$paymentContext11.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$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;
               if (productSceneVersion === '2.0' && !autoDebitWithToken) {
                 ///EasyPay 2.0 首次传signAgreement字段
                 submitParams['signAgreement'] = enableSignAgreement;
-                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;
+                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;
                 isAppWebview = this.paymentContext.startBizFlowOptions.isAppWebview;
                 if (paymentMethodType == 'ALIPAY_CN' && !isAppWebview) {
                   backScheme = getBackScheme(undefined, this.logger);
@@ -397,22 +243,15 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               }
               this.allowSubmitPayCallAhead = this.channelBehavior.allowSubmitPayCallAhead;
               //console.log('[web-sdk] allowSubmitPayCallAhead =', this.allowSubmitPayCallAhead);
-
-              console.log('DEBUG] processSubmitPay allowSubmitPayCallAhead start', this.allowSubmitPayCallAhead);
               if (this.allowSubmitPayCallAhead) {
-                _context3.next = 10;
+                _context2.next = 8;
                 break;
               }
-              //console.log('[web-sdk] DO NOT call submitPay');
-              console.log('DEBUG] processSubmitPay allowSubmitPayCallAhead ', {
-                message: 'sdk no need to make submitPay request',
-                success: true
-              });
-              return _context3.abrupt("return", {
+              return _context2.abrupt("return", {
                 message: 'sdk no need to make submitPay request',
                 success: true
               });
-            case 10:
+            case 8:
               requestBizId = uuid(); // 下面真实发请求
               this.logger.logInfo({
                 title: 'sdk_event_submitPay'
@@ -420,58 +259,42 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 config: JSON.stringify(submitParams.paymentSessionConfig),
                 requestId: requestBizId
               });
-              console.log('DEBUG] processSubmitPay channelBehavior?.buildSubmitPayExtParams start');
               // 由渠道定制点来构建额外参数
               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$8 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$8 === void 0 || (_this$paymentContext$8 = _this$paymentContext$8.paymentMethodInfoView) === null || _this$paymentContext$8 === void 0 ? void 0 : _this$paymentContext$8.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,
                 paymentSessionData: this.paymentContext.paymentSessionId,
-                paymentSessionObj: this.paymentContext.paymentSessionObj,
                 env: this.initConfig.environment,
-                sdkVersion: this.paymentContext.sdkMetaData.sdkVersion,
-                notRedirectAfterComplete: ((_this$paymentContext12 = this.paymentContext) === null || _this$paymentContext12 === void 0 || (_this$paymentContext12 = _this$paymentContext12.startBizFlowOptions) === null || _this$paymentContext12 === void 0 || (_this$paymentContext12 = _this$paymentContext12.submitPayRequestExtra) === null || _this$paymentContext12 === void 0 ? void 0 : _this$paymentContext12.notRedirectAfterComplete) === true
+                sdkVersion: this.paymentContext.sdkMetaData.sdkVersion
               })) || {};
-              console.log('DEBUG] processSubmitPay channelBehavior?.buildSubmitPayExtParams completed', extParams);
-
-              // 二次支付不再需要该参数
-              if (!autoDebitWithToken) {
-                extParams.complianceSDK = true;
-              }
+              extParams.complianceSDK = true;
               submitParams.extParams = extParams;
-              console.log('DEBUG] processSubmitPay ServiceProvider.getInstance start');
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              console.log('DEBUG] processSubmitPay ServiceProvider.getInstance completed', requester);
-              _context3.prev = 20;
-              console.log('DEBUG] processSubmitPay requester.request<CashierSubmitPayResult start');
-              _context3.t0 = requester;
-              _context3.t1 = _objectSpread(_objectSpread({}, submitParams), {}, {
-                integrationType: 'SDK',
-                sdkVersion: (_this$paymentContext$9 = this.paymentContext.sdkMetaData.sdkVersion) !== null && _this$paymentContext$9 !== void 0 ? _this$paymentContext$9 : '1.0.0'
-              });
-              _context3.t2 = this.initConfig.environment;
-              _context3.t3 = this.SDK_REQUEST_TIMEOUT;
-              _context3.next = 28;
+              _context2.prev = 14;
+              _context2.t0 = requester;
+              _context2.t1 = submitParams;
+              _context2.t2 = this.initConfig.environment;
+              _context2.next = 20;
               return this.acquireApdidToken();
-            case 28:
-              _context3.t4 = _context3.sent;
-              _context3.t5 = {
-                deviceId: _context3.t4
+            case 20:
+              _context2.t3 = _context2.sent;
+              _context2.t4 = {
+                deviceId: _context2.t3
               };
-              _context3.t6 = this.hostSign;
-              _context3.t7 = {
-                env: _context3.t2,
-                timeout: _context3.t3,
-                envInfo: _context3.t5,
-                hostSign: _context3.t6,
+              _context2.t5 = this.hostSign;
+              _context2.t6 = {
+                env: _context2.t2,
+                timeout: 15000,
+                envInfo: _context2.t4,
+                hostSign: _context2.t5,
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
               };
-              _context3.next = 34;
-              return _context3.t0.request.call(_context3.t0, _context3.t1, _context3.t7);
-            case 34:
-              res = _context3.sent;
-              console.log('DEBUG] processSubmitPay requester.request<CashierSubmitPayResult completed', res);
+              _context2.next = 26;
+              return _context2.t0.request.call(_context2.t0, _context2.t1, _context2.t6);
+            case 26:
+              res = _context2.sent;
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
               }, {
@@ -479,26 +302,26 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 requestId: requestBizId,
                 rpcTraceId: res.traceId
               });
-              console.log('DEBUG] processSubmitPay completed', res);
-              return _context3.abrupt("return", res);
-            case 41:
-              _context3.prev = 41;
-              _context3.t8 = _context3["catch"](20);
-              console.log('DEBUG] processSubmitPay ERROR', _context3.t8);
+              console.log('[DEBUG] processSubmitPay completed', res);
+              return _context2.abrupt("return", res);
+            case 32:
+              _context2.prev = 32;
+              _context2.t7 = _context2["catch"](14);
               this.logger.logError({
                 title: 'sdk_event_submitPay_failed'
               }, {
                 config: JSON.stringify(submitParams.paymentSessionConfig),
-                errorMessage: JSON.stringify(_context3.t8),
+                errorMessage: _context2.t7,
                 requestId: requestBizId,
-                rpcTraceId: _context3.t8 === null || _context3.t8 === void 0 ? void 0 : _context3.t8.traceId
+                rpcTraceId: _context2.t7 === null || _context2.t7 === void 0 ? void 0 : _context2.t7.traceId
               });
-              return _context3.abrupt("return", null);
-            case 46:
+              console.log('[DEBUG] processSubmitPay ERROR', _context2.t7);
+              throw _context2.t7;
+            case 37:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this, [[20, 41]]);
+        }, _callee2, this, [[14, 32]]);
       }));
       function processSubmitPay() {
         return _processSubmitPay.apply(this, arguments);
@@ -508,23 +331,23 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "acquireApdidToken",
     value: function () {
-      var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this$paymentContext$10;
+      var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _this$paymentContext$7;
         var securityService, productScene, deviceId;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               securityService = ServiceProvider.getInstance(this.instanceId).getService('Security');
-              productScene = (_this$paymentContext$10 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$10 === void 0 || (_this$paymentContext$10 = _this$paymentContext$10.paymentSessionConfig) === null || _this$paymentContext$10 === void 0 ? void 0 : _this$paymentContext$10.productScene;
+              productScene = (_this$paymentContext$7 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$7 === void 0 || (_this$paymentContext$7 = _this$paymentContext$7.paymentSessionConfig) === null || _this$paymentContext$7 === void 0 ? void 0 : _this$paymentContext$7.productScene;
               deviceId = securityService.getDeviceId({
                 productScene: productScene
               });
-              return _context4.abrupt("return", deviceId);
+              return _context3.abrupt("return", deviceId);
             case 4:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
       function acquireApdidToken() {
         return _acquireApdidToken.apply(this, arguments);
@@ -534,20 +357,18 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "initSecuritySDK",
     value: function () {
-      var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$paymentContext$11, _this$paymentContext$12, _this$paymentContext$13, _this$paymentContext$14, _this$paymentContext$15, _this$paymentContext$16, productSceneVersion, nonInitSecuritySDK, signButtonDisplay, userSignAgreement, isFirstTimeToPay, shouldInitSecuritySDK;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _this$paymentContext$8, _this$paymentContext$9, productSceneVersion, nonCompliant, nonInitSecuritySDK, isFirstTimeToPay, shouldInitSecuritySDK;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               console.log('[DEBUG] initSecuritySDK start');
-              _context5.prev = 1;
+              _context4.prev = 1;
               productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion;
-              nonInitSecuritySDK = (_this$paymentContext$11 = (_this$paymentContext$12 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$12 === void 0 ? void 0 : _this$paymentContext$12.nonInitSecuritySDK) !== null && _this$paymentContext$11 !== void 0 ? _this$paymentContext$11 : false;
-              signButtonDisplay = (_this$paymentContext$13 = (_this$paymentContext$14 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$14 === void 0 ? void 0 : _this$paymentContext$14.signButtonDisplay) !== null && _this$paymentContext$13 !== void 0 ? _this$paymentContext$13 : false;
-              userSignAgreement = (_this$paymentContext$15 = (_this$paymentContext$16 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$16 === void 0 ? void 0 : _this$paymentContext$16.userSignAgreement) !== null && _this$paymentContext$15 !== void 0 ? _this$paymentContext$15 : false;
+              nonCompliant = (_this$paymentContext$8 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$8 === void 0 ? void 0 : _this$paymentContext$8.nonCompliant;
+              nonInitSecuritySDK = (_this$paymentContext$9 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$9 === void 0 ? void 0 : _this$paymentContext$9.nonInitSecuritySDK;
               isFirstTimeToPay = !this.paymentContext.paymentSessionObj.action.autoDebitWithToken;
               shouldInitSecuritySDK = false;
-              console.log("[DEBUG] initSecuritySDK -- productSceneVersion:".concat(productSceneVersion, " | nonInitSecuritySDK:").concat(nonInitSecuritySDK, " | signButtonDisplay:").concat(signButtonDisplay, " | userSignAgreement:").concat(userSignAgreement, " | isFirstTimeToPay:").concat(isFirstTimeToPay));
               if (nonInitSecuritySDK) {
                 // 钱包不依赖风控
                 // console.log('[web-sdk][security-sdk] DO NOT init security sdk when nonInitSecuritySDK is true');
@@ -558,44 +379,47 @@ 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 (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 {
-                    // 切流「隐私合规」且非首次支付
-                    // console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and when not first time to pay');
+                  if (nonCompliant === true) {
+                    // 未切流「隐私合规」
+                    // console.log('[web-sdk][security-sdk] DO init security sdk for easypay 2.0 and nonCompliant is true');
                     shouldInitSecuritySDK = true;
+                  } 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;
+                    }
                   }
                 }
               }
               if (!shouldInitSecuritySDK) {
-                _context5.next = 15;
+                _context4.next = 11;
                 break;
               }
-              console.log("[DEBUG] securityService.initSecurity start ", this.SECURITY_SDK_INIT_TIMEOUT);
-              _context5.next = 14;
+              _context4.next = 11;
               return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
-            case 14:
-              console.log("[DEBUG] securityService.initSecurity completed ");
-            case 15:
+            case 11:
               console.log('[DEBUG] initSecuritySDK completed');
               this.logger.logInfo({
                 title: 'a3753.b101271.c388193.d514078'
               }, {
                 riskSdkInfo: shouldInitSecuritySDK ? RiskSdkInfoEnum.NEED : RiskSdkInfoEnum.NO_NEED
               });
-              _context5.next = 22;
+              _context4.next = 18;
               break;
-            case 19:
-              _context5.prev = 19;
-              _context5.t0 = _context5["catch"](1);
+            case 15:
+              _context4.prev = 15;
+              _context4.t0 = _context4["catch"](1);
               console.log('[DEBUG] initSecuritySDK ERROR');
               // do nothing when init security failed
-            case 22:
+            case 18:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this, [[1, 19]]);
+        }, _callee4, this, [[1, 15]]);
       }));
       function initSecuritySDK() {
         return _initSecuritySDK.apply(this, arguments);