@alipay/ams-checkout 0.0.1730107332-dev.4 → 0.0.1730706734-dev.0

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

@@ -16,21 +16,21 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { ChannelCustomize, DisplayTypeEnum, getBackScheme, isLocalMock, isPC, ProductInfoCacheUtil, ProductSceneEnum, ServiceProvider, uuid, WebAppUrlUtil } from "./deps";
+import { ChannelCustomize, DisplayTypeEnum, isLocalMock, isPC, ServiceProvider, WebAppUrlUtil } from "./deps";
+
+// 缓存上次产品信息
+var KEY_PREVIOUS_PRODUCT_INFO = 'antom_checkout_previous_ESP_ProductInfo';
 export var EasySafePayProcessor = /*#__PURE__*/function () {
   function EasySafePayProcessor() {
     _classCallCheck(this, EasySafePayProcessor);
     _defineProperty(this, "paymentContext", void 0);
     _defineProperty(this, "initConfig", void 0);
     _defineProperty(this, "logger", void 0);
-    _defineProperty(this, "securityService", void 0);
     _defineProperty(this, "instanceId", void 0);
-    // 服务端接口区域信息，请求时决定API域名
     _defineProperty(this, "hostSign", void 0);
     // 是否允许submitPay提前调用，在ESP非首次的性能优化场景使用
     _defineProperty(this, "allowSubmitPayCallAhead", void 0);
     _defineProperty(this, "channelBehavior", void 0);
-    _defineProperty(this, "SECURITY_SDK_INIT_TIMEOUT", 18000);
   }
   _createClass(EasySafePayProcessor, [{
     key: "init",
@@ -38,7 +38,6 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       this.initConfig = config;
       this.instanceId = instanceId;
       this.logger = ServiceProvider.getInstance(this.instanceId).getService('Log');
-      this.securityService = ServiceProvider.getInstance(this.instanceId).getService('Security');
       this.preloadWebApp(config, this.instanceId, sdkMetaData);
     }
   }, {
@@ -74,16 +73,13 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               }
               return _context.abrupt("return", this.buildRedirectResult(authUrlInfo));
             case 12:
-              _context.next = 14;
-              return this.initSecuritySDK();
-            case 14:
               // 下面的场景是需要渲染UI的渠道, 打开WebUrl
-              webAppUrl = this.buildWebAppUrl(); // const webAppUrl = 'http://svc-9kvjxwjf68cptha8.cloudide.svc.et15-sqa.alipay.net:5173/src/component-app/index.html';
+              webAppUrl = this.buildWebAppUrl();
               resultPayload = {
                 url: webAppUrl,
                 allowClickPopupOutsideClose: (_this$channelBehavior = this.channelBehavior) === null || _this$channelBehavior === void 0 ? void 0 : _this$channelBehavior.allowClickOutsideClose
               };
-              ProductInfoCacheUtil.savePreviousProductInfo(ProductSceneEnum.EASY_PAY, {
+              this.savePreviousProductInfo({
                 paymentMethodCategoryType: paymentMethodCategoryType,
                 hostSign: this.hostSign,
                 productSceneVersion: productSceneVersion
@@ -95,7 +91,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 behaviorType: 'RENDER',
                 payload: resultPayload
               });
-            case 19:
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -111,46 +107,40 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     value: function preloadWebApp(config, instanceId, sdkMetaData) {
       // trigger preload
       var containerService = ServiceProvider.getInstance(this.instanceId).getService('Container');
-      var _this$buildWebAppPrel = this.buildWebAppPreloadUrl(config, instanceId, sdkMetaData),
-        taskId = _this$buildWebAppPrel.taskId,
-        webUrl = _this$buildWebAppPrel.webUrl;
-      containerService.preload(taskId, webUrl);
+      var productScene = this.paymentContext.paymentSessionObj.paymentSessionConfig.productScene;
+      var paymentMethodCategoryType = this.paymentContext.paymentSessionObj.paymentSessionConfig.paymentMethodCategoryType;
+      var containerId = "ams-checkout-component-".concat(productScene, "_").concat(paymentMethodCategoryType);
+      var webAppUrl = this.buildWebAppPreloadUrl(config, instanceId, sdkMetaData);
+      containerService.preload(containerId, webAppUrl);
     }
   }, {
     key: "buildWebAppPreloadUrl",
     value: function buildWebAppPreloadUrl(initConfig, instanceId, sdkMetaData) {
-      var _this = this;
-      var previousProductInfo = ProductInfoCacheUtil.getPreviousProductInfo(ProductSceneEnum.EASY_PAY, function (erorrMsg) {
-        if (erorrMsg) {
-          _this.logger.logError({
-            title: 'performance_optimization_get_previousChannel_error'
-          }, {
-            error: erorrMsg
-          });
-        }
-      });
+      var previousProductInfo = this.getPreviousProductInfo();
       var paymentMethodCategoryType = previousProductInfo === null || previousProductInfo === void 0 ? void 0 : previousProductInfo.paymentMethodCategoryType;
-      var productSceneVersion = (previousProductInfo === null || previousProductInfo === void 0 ? void 0 : previousProductInfo.productSceneVersion) || '2.0';
-      var taskId = "ams-checkout-component-".concat(sdkMetaData.productScene, "_").concat(paymentMethodCategoryType);
+      var productSceneVersion = previousProductInfo === null || previousProductInfo === void 0 ? void 0 : previousProductInfo.productSceneVersion;
       var hostSign = previousProductInfo === null || previousProductInfo === void 0 ? void 0 : previousProductInfo.hostSign;
-      var webUrl = WebAppUrlUtil.getWebAppUrl({
+      var webAppUrlInfo = WebAppUrlUtil.getWebAppUrl({
         environment: initConfig.environment,
         paymentMethodCategoryType: paymentMethodCategoryType,
         sdkMetaData: sdkMetaData,
-        isPreload: true,
         productSceneVersion: productSceneVersion,
         query: {
           analyticsEnabled: initConfig.analytics.enabled,
-          displayType: DisplayTypeEnum.popup,
+          displayType: DisplayTypeEnum.inline,
           instanceId: instanceId,
+          isPreload: 'true',
           locale: initConfig.locale,
           hostSign: hostSign
         }
       });
-      return {
-        webUrl: webUrl,
-        taskId: taskId
-      };
+      var webAppUrl;
+      if (webAppUrlInfo.path.indexOf('?') !== -1) {
+        webAppUrl = "".concat(webAppUrlInfo.path, "&").concat(webAppUrlInfo.locationSearch);
+      } else {
+        webAppUrl = "".concat(webAppUrlInfo.path, "?").concat(webAppUrlInfo.locationSearch);
+      }
+      return webAppUrl;
     }
   }, {
     key: "buildWebAppUrl",
@@ -160,20 +150,26 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       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 hostSign = this.hostSign;
-      var webAppUrl = WebAppUrlUtil.getWebAppUrl({
+      var webAppUrlInfo = WebAppUrlUtil.getWebAppUrl({
         environment: this.initConfig.environment,
         paymentMethodCategoryType: paymentMethodCategoryType,
         sdkMetaData: paymentContext.sdkMetaData,
         productSceneVersion: productSceneVersion,
-        isPreload: false,
         query: {
           analyticsEnabled: this.initConfig.analytics.enabled,
-          displayType: DisplayTypeEnum.popup,
+          displayType: DisplayTypeEnum.inline,
           instanceId: this.instanceId,
+          isPreload: 'true',
           locale: this.initConfig.locale,
           hostSign: hostSign
         }
       });
+      var webAppUrl;
+      if (webAppUrlInfo.path.indexOf('?') !== -1) {
+        webAppUrl = "".concat(webAppUrlInfo.path, "&").concat(webAppUrlInfo.locationSearch);
+      } else {
+        webAppUrl = "".concat(webAppUrlInfo.path, "?").concat(webAppUrlInfo.locationSearch);
+      }
       return webAppUrl;
     }
   }, {
@@ -207,7 +203,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
   }, {
     key: "sendRequestAndWaitWebLaunch",
     value: function sendRequestAndWaitWebLaunch() {
-      var _this2 = this;
+      var _this = this;
       var eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
       var requestPromise = Promise.all([this.processPaymentQuery(), this.processSubmitPay()]).then(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
@@ -218,33 +214,32 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
           submitRes: submitRes
         };
       });
-      var webLaunchPromise = new Promise(function (resolve) {
-        eventCenter.listen('onLaunch', function (res) {
+      var webLaunchPromose = new Promise(function (resolve) {
+        eventCenter.listen('onlaunch', function (res) {
           resolve(res);
         });
       });
 
       // 等请求和 Web启动都Ready之后，发送renderComponent
-      Promise.all([requestPromise, webLaunchPromise]).then(function (_ref3) {
-        var _this2$paymentContext, _this2$paymentContext2, _this2$paymentContext3, _this2$paymentContext4, _this2$paymentContext5, _this2$paymentContext6;
+      Promise.all([requestPromise, webLaunchPromose]).then(function (_ref3) {
+        var _this$paymentContext, _this$paymentContext2, _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3, _this$paymentContext$4;
         var _ref4 = _slicedToArray(_ref3, 2),
           requestResult = _ref4[0],
           launchRes = _ref4[1];
-        var logMetaData = _this2.logger.getLogConfig().mdata;
+        var logMetaData = _this.logger.getLogConfig().mdata;
         eventCenter.dispatchToApp({
           event: 'renderComponent',
           data: {
             queryResult: requestResult.queryRes,
             submitResult: requestResult.submitRes,
-            sessionResult: (_this2$paymentContext = _this2.paymentContext) === null || _this2$paymentContext === void 0 ? void 0 : _this2$paymentContext.paymentSessionObj,
-            paymentSessionData: (_this2$paymentContext2 = _this2.paymentContext) === null || _this2$paymentContext2 === void 0 ? void 0 : _this2$paymentContext2.paymentSession,
+            sessionResult: (_this$paymentContext = _this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSessionObj,
+            paymentSessionData: (_this$paymentContext2 = _this.paymentContext) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSession,
             heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-            renderDisplayType: _this2.paymentContext.displayInfo.type,
-            appearance: (_this2$paymentContext3 = _this2.paymentContext.displayInfo) === null || _this2$paymentContext3 === void 0 ? void 0 : _this2$paymentContext3.appearance,
-            notRedirectAfterComplete: ((_this2$paymentContext4 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext4 === void 0 ? void 0 : _this2$paymentContext4.notRedirectAfterComplete) === true,
-            isAppWebview: _this2.paymentContext.startBizFlowOptions.isAppWebview,
-            merchantAppointParam: (_this2$paymentContext5 = _this2.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this2$paymentContext5 === void 0 ? void 0 : _this2$paymentContext5.merchantAppointParam,
-            allowSubmitPayCallAhead: _this2.allowSubmitPayCallAhead,
+            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,
+            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
@@ -253,7 +248,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               trackId: logMetaData.requestSeq,
               platform: logMetaData.platform,
               firstLogTime: logMetaData.firstLogTime
-            }, ((_this2$paymentContext6 = _this2.paymentContext.paymentSessionObj) === null || _this2$paymentContext6 === void 0 ? void 0 : _this2$paymentContext6.paymentSessionConfig) || {}), {}, {
+            }, ((_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,
@@ -268,8 +263,8 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     key: "processPaymentQuery",
     value: function () {
       var _processPaymentQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var _this$paymentContext, _this$paymentContext2, _this$paymentContext3, _this$paymentContext4, _this$paymentContext5, _this$channelBehavior2;
-        var envInfo, requestData, extendInfo, actionData, enableEasypayApiOptimize, extendInfoData, productSceneVersion, requestBizId, requester, res;
+        var _this$paymentContext3, _this$paymentContext4, _this$paymentContext5, _this$paymentContext6, _this$paymentContext7, _this$channelBehavior2;
+        var envInfo, requestData, extendInfo, actionData, enableEasypayApiOptimize, extendInfoData, productSceneVersion, requester, res;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -277,13 +272,13 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 locale: this.initConfig.locale
               }; //
               requestData = {
-                paymentSessionData: ((_this$paymentContext = this.paymentContext) === null || _this$paymentContext === void 0 ? void 0 : _this$paymentContext.paymentSession) || '',
-                paymentSessionConfig: (_this$paymentContext2 = this.paymentContext) === null || _this$paymentContext2 === void 0 || (_this$paymentContext2 = _this$paymentContext2.paymentSessionObj) === null || _this$paymentContext2 === void 0 ? void 0 : _this$paymentContext2.paymentSessionConfig,
-                notRedirectAfterComplete: ((_this$paymentContext3 = this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.startBizFlowOptions.submitPayRequestExtra.notRedirectAfterComplete) === true
+                paymentSessionData: ((_this$paymentContext3 = this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.paymentSession) || '',
+                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,
+                notRedirectAfterComplete: ((_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.startBizFlowOptions.submitPayRequestExtra.notRedirectAfterComplete) === true
                 // merchantAppointParam: this._merchantAppointParam,
               };
-              extendInfo = ((_this$paymentContext4 = this.paymentContext) === null || _this$paymentContext4 === void 0 || (_this$paymentContext4 = _this$paymentContext4.paymentSessionObj) === null || _this$paymentContext4 === void 0 ? void 0 : _this$paymentContext4.extendInfo) || '';
-              actionData = (_this$paymentContext5 = this.paymentContext) === null || _this$paymentContext5 === void 0 || (_this$paymentContext5 = _this$paymentContext5.paymentSessionObj) === null || _this$paymentContext5 === void 0 ? void 0 : _this$paymentContext5.action;
+              extendInfo = ((_this$paymentContext6 = this.paymentContext) === null || _this$paymentContext6 === void 0 || (_this$paymentContext6 = _this$paymentContext6.paymentSessionObj) === null || _this$paymentContext6 === void 0 ? void 0 : _this$paymentContext6.extendInfo) || '';
+              actionData = (_this$paymentContext7 = this.paymentContext) === null || _this$paymentContext7 === void 0 || (_this$paymentContext7 = _this$paymentContext7.paymentSessionObj) === null || _this$paymentContext7 === void 0 ? void 0 : _this$paymentContext7.action;
               enableEasypayApiOptimize = false;
               try {
                 extendInfoData = JSON.parse(extendInfo);
@@ -333,51 +328,51 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               return this.acquireApdidToken();
             case 17:
               envInfo.deviceId = _context2.sent;
-              requestBizId = uuid(); // 打日志
+              // 打日志
               this.logger.logInfo({
                 title: 'sdk_event_sdkQuery'
               }, {
                 paymentSessionConfig: JSON.stringify(requestData.paymentSessionConfig),
-                requestBizId: requestBizId
+                // TODO: 安全合规考虑
+                requestBody: requestData
               });
 
               // 真正发请求
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context2.prev = 21;
-              _context2.next = 24;
+              _context2.prev = 20;
+              _context2.next = 23;
               return requester.request(requestData, {
                 env: this.initConfig.environment,
                 envInfo: envInfo,
                 hostSign: this.hostSign,
                 'Operation-Type': 'com.ipay.iexpcashier.sdkAction.query'
               });
-            case 24:
+            case 23:
               res = _context2.sent;
               this.logger.logInfo({
                 title: 'sdk_event_sdkQueryEnd'
               }, {
                 paymentSessionConfig: JSON.stringify(requestData.paymentSessionConfig),
-                requestBizId: requestBizId,
-                traceId: res.traceId
+                // TODO: 安全合规考虑
+                responseBody: res
               });
-              return _context2.abrupt("return", res);
-            case 29:
-              _context2.prev = 29;
-              _context2.t0 = _context2["catch"](21);
+              _context2.next = 31;
+              break;
+            case 27:
+              _context2.prev = 27;
+              _context2.t0 = _context2["catch"](20);
               this.logger.logError({
                 title: 'sdk_event_sdkQuery_failed'
               }, {
                 paymentSessionConfig: JSON.stringify(requestData.paymentSessionConfig),
-                errorReason: _context2.t0,
-                requestBizId: requestBizId,
-                traceId: _context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.traceId
+                errorReason: _context2.t0
               });
               throw _context2.t0;
-            case 33:
+            case 31:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[21, 29]]);
+        }, _callee2, this, [[20, 27]]);
       }));
       function processPaymentQuery() {
         return _processPaymentQuery.apply(this, arguments);
@@ -388,14 +383,14 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     key: "processSubmitPay",
     value: function () {
       var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _this$paymentContext6, _this$paymentContext7, _this$paymentContext9, _this$channelBehavior3, _this$channelBehavior4, _this$paymentContext$2;
-        var submitParams, shouldSkipSubmitPayInSDK, _this$paymentContext8, _ref5, _ref5$productSceneVer, productSceneVersion, _ref6, _ref6$action, _ref6$action2, _ref6$action2$enableS, enableSignAgreement, _ref6$action2$autoDeb, autoDebitWithToken, _this$paymentContext$, paymentMethodType, isAppWebview, backScheme, requestBizId, extParams, requester, res;
+        var _this$paymentContext8, _this$paymentContext9, _this$paymentContext11, _this$channelBehavior3, _this$channelBehavior4, _this$paymentContext$5;
+        var submitParams, shouldSkipSubmitPayInSDK, _this$paymentContext10, _ref5, _ref5$productSceneVer, productSceneVersion, _ref5$productScene, productScene, _ref6, _ref6$action, _ref6$action2, _ref6$action2$enableS, enableSignAgreement, _ref6$action2$autoDeb, autoDebitWithToken, extParams, requester, res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               submitParams = {
-                paymentSessionData: ((_this$paymentContext6 = this.paymentContext) === null || _this$paymentContext6 === void 0 ? void 0 : _this$paymentContext6.paymentSession) || '',
-                paymentSessionConfig: (_this$paymentContext7 = this.paymentContext) === null || _this$paymentContext7 === void 0 || (_this$paymentContext7 = _this$paymentContext7.paymentSessionObj) === null || _this$paymentContext7 === void 0 ? void 0 : _this$paymentContext7.paymentSessionConfig
+                paymentSessionData: ((_this$paymentContext8 = this.paymentContext) === null || _this$paymentContext8 === void 0 ? void 0 : _this$paymentContext8.paymentSession) || '',
+                paymentSessionConfig: (_this$paymentContext9 = this.paymentContext) === null || _this$paymentContext9 === void 0 || (_this$paymentContext9 = _this$paymentContext9.paymentSessionObj) === null || _this$paymentContext9 === void 0 ? void 0 : _this$paymentContext9.paymentSessionConfig
               };
               shouldSkipSubmitPayInSDK = false;
               if (this.channelBehavior) {
@@ -404,21 +399,13 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
               } else {
                 // TODO: 拉会找栎昂、甘颜一起对下
                 // 老逻辑，只要服务端标记不跳过sdkquery，就需要跳过submitpay
-                shouldSkipSubmitPayInSDK = !((_this$paymentContext8 = this.paymentContext) !== null && _this$paymentContext8 !== void 0 && (_this$paymentContext8 = _this$paymentContext8.paymentSessionObj) !== null && _this$paymentContext8 !== void 0 && (_this$paymentContext8 = _this$paymentContext8.action) !== null && _this$paymentContext8 !== void 0 && _this$paymentContext8.skipSdkQuery);
+                shouldSkipSubmitPayInSDK = !((_this$paymentContext10 = this.paymentContext) !== null && _this$paymentContext10 !== void 0 && (_this$paymentContext10 = _this$paymentContext10.paymentSessionObj) !== null && _this$paymentContext10 !== void 0 && (_this$paymentContext10 = _this$paymentContext10.action) !== null && _this$paymentContext10 !== void 0 && _this$paymentContext10.skipSdkQuery);
               }
-              _ref5 = submitParams.paymentSessionConfig || {}, _ref5$productSceneVer = _ref5.productSceneVersion, productSceneVersion = _ref5$productSceneVer === void 0 ? '' : _ref5$productSceneVer;
-              _ref6 = ((_this$paymentContext9 = this.paymentContext) === null || _this$paymentContext9 === void 0 ? void 0 : _this$paymentContext9.paymentSessionObj) || {}, _ref6$action = _ref6.action, _ref6$action2 = _ref6$action === void 0 ? {} : _ref6$action, _ref6$action2$enableS = _ref6$action2.enableSignAgreement, enableSignAgreement = _ref6$action2$enableS === void 0 ? false : _ref6$action2$enableS, _ref6$action2$autoDeb = _ref6$action2.autoDebitWithToken, autoDebitWithToken = _ref6$action2$autoDeb === void 0 ? false : _ref6$action2$autoDeb;
+              _ref5 = submitParams.paymentSessionConfig || {}, _ref5$productSceneVer = _ref5.productSceneVersion, productSceneVersion = _ref5$productSceneVer === void 0 ? '' : _ref5$productSceneVer, _ref5$productScene = _ref5.productScene, productScene = _ref5$productScene === void 0 ? '' : _ref5$productScene;
+              _ref6 = ((_this$paymentContext11 = this.paymentContext) === null || _this$paymentContext11 === void 0 ? void 0 : _this$paymentContext11.paymentSessionObj) || {}, _ref6$action = _ref6.action, _ref6$action2 = _ref6$action === void 0 ? {} : _ref6$action, _ref6$action2$enableS = _ref6$action2.enableSignAgreement, enableSignAgreement = _ref6$action2$enableS === void 0 ? false : _ref6$action2$enableS, _ref6$action2$autoDeb = _ref6$action2.autoDebitWithToken, autoDebitWithToken = _ref6$action2$autoDeb === void 0 ? false : _ref6$action2$autoDeb;
               if (productSceneVersion === '2.0' && !autoDebitWithToken) {
                 ///EasyPay 2.0 首次传signAgreement字段
                 submitParams['signAgreement'] = enableSignAgreement;
-                paymentMethodType = (_this$paymentContext$ = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$ === void 0 || (_this$paymentContext$ = _this$paymentContext$.paymentMethodInfoView) === null || _this$paymentContext$ === void 0 ? void 0 : _this$paymentContext$.paymentMethodType;
-                isAppWebview = this.paymentContext.startBizFlowOptions.isAppWebview;
-                if (paymentMethodType == 'ALIPAY_CN' && !isAppWebview) {
-                  backScheme = getBackScheme(undefined, this.logger);
-                  if (backScheme && backScheme !== 'https') {
-                    submitParams['h5FromApp'] = encodeURIComponent(backScheme);
-                  }
-                }
               }
               // 带上标记告知WebCheckOut SDK已发送submitpay请求
               this.allowSubmitPayCallAhead = !shouldSkipSubmitPayInSDK;
@@ -431,31 +418,31 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 success: true
               });
             case 9:
-              requestBizId = uuid(); // 下面真实发请求
+              // 下面真实发请求
               this.logger.logInfo({
                 title: 'sdk_event_submitPay'
               }, {
                 paymentSessionConfig: JSON.stringify(submitParams.paymentSessionConfig),
-                requestBizId: requestBizId
+                // TODO: 安全合规考虑
+                responseBody: submitParams
               });
               // 由渠道定制点来构建额外参数
               extParams = ((_this$channelBehavior3 = this.channelBehavior) === null || _this$channelBehavior3 === void 0 || (_this$channelBehavior4 = _this$channelBehavior3.buildSubmitPayExtParams) === null || _this$channelBehavior4 === void 0 ? void 0 : _this$channelBehavior4.call(_this$channelBehavior3, {
                 instanceId: this.instanceId,
                 locale: this.initConfig.locale,
-                paymentMethodType: (_this$paymentContext$2 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$2 === void 0 || (_this$paymentContext$2 = _this$paymentContext$2.paymentMethodInfoView) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.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,
                 paymentSessionData: this.paymentContext.paymentSession,
                 env: this.initConfig.environment,
                 sdkVersion: this.paymentContext.sdkMetaData.sdkVersion
               })) || {};
               submitParams.extParams = extParams;
               requester = ServiceProvider.getInstance(this.instanceId).getService('Requester');
-              _context3.prev = 14;
               _context3.t0 = requester;
               _context3.t1 = submitParams;
               _context3.t2 = this.initConfig.environment;
-              _context3.next = 20;
+              _context3.next = 18;
               return this.acquireApdidToken();
-            case 20:
+            case 18:
               _context3.t3 = _context3.sent;
               _context3.t4 = {
                 deviceId: _context3.t3
@@ -469,35 +456,22 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 needEnvInfo: true,
                 'Operation-Type': 'com.ipay.iexpcashier.cashier.submitPayByPaymentSession'
               };
-              _context3.next = 26;
+              _context3.next = 24;
               return _context3.t0.request.call(_context3.t0, _context3.t1, _context3.t6);
-            case 26:
+            case 24:
               res = _context3.sent;
               this.logger.logInfo({
                 title: 'sdk_event_submitPayEnd'
               }, {
                 paymentSessionConfig: JSON.stringify(submitParams.paymentSessionConfig),
-                requestBizId: requestBizId,
-                traceId: res.traceId
+                responseBody: res
               });
               return _context3.abrupt("return", res);
-            case 31:
-              _context3.prev = 31;
-              _context3.t7 = _context3["catch"](14);
-              this.logger.logError({
-                title: 'sdk_event_submitPay_failed'
-              }, {
-                paymentSessionConfig: JSON.stringify(submitParams.paymentSessionConfig),
-                errorReason: _context3.t7,
-                requestBizId: requestBizId,
-                traceId: _context3.t7 === null || _context3.t7 === void 0 ? void 0 : _context3.t7.traceId
-              });
-              throw _context3.t7;
-            case 35:
+            case 27:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[14, 31]]);
+        }, _callee3, this);
       }));
       function processSubmitPay() {
         return _processSubmitPay.apply(this, arguments);
@@ -508,13 +482,13 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     key: "acquireApdidToken",
     value: function () {
       var _acquireApdidToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        var _this$paymentContext$3;
+        var _this$paymentContext$6;
         var securityService, productScene, deviceId;
         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$3 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$3 === void 0 || (_this$paymentContext$3 = _this$paymentContext$3.paymentSessionConfig) === null || _this$paymentContext$3 === void 0 ? void 0 : _this$paymentContext$3.productScene;
+              productScene = (_this$paymentContext$6 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$6 === void 0 || (_this$paymentContext$6 = _this$paymentContext$6.paymentSessionConfig) === null || _this$paymentContext$6 === void 0 ? void 0 : _this$paymentContext$6.productScene;
               deviceId = securityService.getDeviceId({
                 productScene: productScene
               });
@@ -531,66 +505,32 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
       return acquireApdidToken;
     }()
   }, {
-    key: "initSecuritySDK",
-    value: function () {
-      var _initSecuritySDK = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$paymentContext$4, productSceneVersion, nonCompliant, isFirstTimeToPay;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
-            case 0:
-              _context5.prev = 0;
-              productSceneVersion = this.paymentContext.paymentSessionObj.paymentSessionConfig.productSceneVersion;
-              nonCompliant = (_this$paymentContext$4 = this.paymentContext.paymentSessionObj.action) === null || _this$paymentContext$4 === void 0 ? void 0 : _this$paymentContext$4.nonCompliant;
-              isFirstTimeToPay = !this.paymentContext.paymentSessionObj.action.autoDebitWithToken;
-              if (!(productSceneVersion === '1.0')) {
-                _context5.next = 9;
-                break;
-              }
-              console.log('[web-sdk][security-sdk] skip init security sdk for easypay 1.0');
-              // 1.0 不初始化 SecuritySDK
-              return _context5.abrupt("return");
-            case 9:
-              if (!(productSceneVersion === '2.0')) {
-                _context5.next = 20;
-                break;
-              }
-              if (!(nonCompliant === true)) {
-                _context5.next = 16;
-                break;
-              }
-              // 未切流「隐私合规」
-              console.log('[web-sdk][security-sdk] init security sdk for easypay 2.0 and nonCompliant is true');
-              _context5.next = 14;
-              return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
-            case 14:
-              _context5.next = 20;
-              break;
-            case 16:
-              if (isFirstTimeToPay) {
-                _context5.next = 20;
-                break;
-              }
-              // 切流「隐私合规」且非首次支付
-              console.log('[web-sdk][security-sdk] init security sdk for easypay 2.0 and when not first time to pay');
-              _context5.next = 20;
-              return this.securityService.initSecurity(this.SECURITY_SDK_INIT_TIMEOUT);
-            case 20:
-              _context5.next = 24;
-              break;
-            case 22:
-              _context5.prev = 22;
-              _context5.t0 = _context5["catch"](0);
-            case 24:
-            case "end":
-              return _context5.stop();
-          }
-        }, _callee5, this, [[0, 22]]);
+    key: "savePreviousProductInfo",
+    value: function savePreviousProductInfo(info) {
+      localStorage.setItem(KEY_PREVIOUS_PRODUCT_INFO, JSON.stringify({
+        productSceneVersion: info.productSceneVersion,
+        paymentMethodCategoryType: info.paymentMethodCategoryType,
+        hostSign: info.hostSign
       }));
-      function initSecuritySDK() {
-        return _initSecuritySDK.apply(this, arguments);
+    }
+  }, {
+    key: "getPreviousProductInfo",
+    value: function getPreviousProductInfo() {
+      var previousProductInfo = localStorage.getItem(KEY_PREVIOUS_PRODUCT_INFO);
+      if (previousProductInfo) {
+        try {
+          return JSON.parse(previousProductInfo);
+        } catch (error) {
+          console.log(error);
+          this.logger.logError({
+            title: 'performance_optimization_get_previousChannel_error'
+          }, {
+            error: error
+          });
+        }
       }
-      return initSecuritySDK;
-    }()
+      return null;
+    }
   }]);
   return EasySafePayProcessor;
 }();

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

@@ -9,8 +9,8 @@ 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 { DisplayTypeEnum } from "../../../types";
 import { createIframe, createPreloadIframe, startSizeChangeAnim } from "./utils";
-import { addInlineLoading, createInlineBaseElement } from "../../../component/component.inline.style";
-import { addPopupLoading, createBaseElement } from "../../../component/component.popup.style";
+import { addInlineLoading, createInlineBaseElement } from "../../../plugin/component/component.inline.style";
+import { addPopupLoading, createBaseElement } from "../../../plugin/component/component.popup.style";
 import { COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CONTAINER_ID, ERRORMESSAGE, LOADING_ID, MOCKUP_ID } from "../../../constant";
 import { ServiceProvider } from "../index";
 import { EVENT } from "../../../constant";
@@ -54,9 +54,8 @@ export var ContainerService = /*#__PURE__*/function () {
   }, {
     key: "load",
     value: function load(displayInfo, url, closeBtnFunc) {
-      var webApp = createIframe('antom-sdk-web-app' + (displayInfo.appendAliasContainerId ? "-".concat(displayInfo.selector) : ''));
-      this.webApp = webApp;
-      this.displayInfo = displayInfo;
+      console.log('load');
+      var webApp = createIframe('antom-sdk-web-app' + (displayInfo.appendAliasContainerId && "-".concat(displayInfo.selector)));
       webApp.src = url;
       this.eventCenter.addIFrame(webApp);
       if (webApp.src.includes('?')) {
@@ -181,6 +180,7 @@ export var ContainerService = /*#__PURE__*/function () {
       });
       this.eventCenter.listen(EVENT.popupWindow.name, function (data) {
         var _this2$displayInfo;
+        if (data.paymentElementOldModel) return;
         _this2.popupManager.popup(_objectSpread({
           platform: (_this2$displayInfo = _this2.displayInfo) === null || _this2$displayInfo === void 0 ? void 0 : _this2$displayInfo.platform
         }, data)).catch(function (error) {

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

@@ -8,7 +8,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { createModal, destroyModal } from "../../../component/popupWindow.style";
+import { createModal, destroyModal } from "../../../plugin/component/popupWindow.style";
 import { LOADTIME_LIMIT, POPUP_LOADTIME_LOG_LIMIT } from "../../../constant";
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>