@alipay/ams-checkout 1.5.8 → 1.5.10

package/esm/plugin/component/index.js

@@ -14,23 +14,18 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
  * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
  * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
  */
-/* eslint-disable no-console */
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import { marmotMap } from "../../config/index";
 import { COMPONENTPLUGINID, COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CONTAINER_ID, COMPONENT_RETENTION_ID, COMPONENT_SECTION_ID, ERRORMESSAGE, EVENT, LISTENER_PREFIX, LOADING_ID, LOADTIME_LIMIT, MOCKUP_ID } from "../../constant";
 import { queryPaymentInfo } from "../../service";
-import { componentSignEnum, eventCodeEnum, messageName, platformEnum, productSceneEnum, renderDisplayTypeEnum, targetEnum } from "../../types";
-import { getType, isJsonString, isPC, queryParse } from "../../util";
+import { componentSignEnum, eventCodeEnum, messageName, platformEnum, productSceneEnum, RedirectType, renderDisplayTypeEnum, SecuritySceneEnum, targetEnum } from "../../types";
+import { getType, isJsonString, isPC } from "../../util";
 import { isLocalMock } from "../../util/mock";
+import { getApdidToken, getAppname, getSecurityHost, initSecuritySDK } from "../../util/security";
 import { createIframe, getAppDomain, getIframeUrl } from "./cashierApp";
 import { addInlineLoading, createInlineBaseElement } from "./component.inline.style";
 import { addPopupLoading, createBaseElement, createMockup, createRetentionPopup, handleDeclareInfo as _handleDeclareInfo, hideRetentionPopup, removeRetentionPopup as _removeRetentionPopup } from "./component.popup.style";
-import APDID from '@alipay/jshield-apdid';
-import { getSecurityHost, getAppname } from "../../util/security";
-var _ref = queryParse() || {},
-  preinit = _ref.preinit,
-  rebuild = _ref.rebuild,
-  scene = _ref.scene,
-  region = _ref.region;
+import { createModal, destroyModal, insertStyleSheet } from "./popupWindow.style";
 window.changingPageHeight = window.innerHeight;
 var ComponentApp = /*#__PURE__*/function () {
   function ComponentApp() {
@@ -41,6 +36,8 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_performanceData", []);
     _defineProperty(this, "_loadAppPromiseResolve", null);
     _defineProperty(this, "_isInitComponent", void 0);
+    _defineProperty(this, "_threedData", void 0);
+    _defineProperty(this, "popupWindow", void 0);
     _defineProperty(this, "appDomain", void 0);
     _defineProperty(this, "createIframeNode", void 0);
     _defineProperty(this, "_selector", void 0);
@@ -49,17 +46,17 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_actionQueryPromise", null);
     _defineProperty(this, "_renderParams", null);
     _defineProperty(this, "_componentSign", componentSignEnum.NONE);
-    _defineProperty(this, "_clickEventName", void 0);
+    _defineProperty(this, "_appLocationSearch", void 0);
     _defineProperty(this, "_renderDisplayType", renderDisplayTypeEnum.popup);
-    this._appVersion = '1.5.8';
+    this._appVersion = '1.5.9';
     this._isInitComponent = false;
     this._selector = "#".concat(COMPONENT_SECTION_ID);
     this.createIframeNode = function () {
       return Promise.resolve();
     };
     this.platform = isPC() ? platformEnum.desktop : platformEnum.mobile;
-    this._clickEventName = this.platform === platformEnum.mobile ? 'touchend' : 'click';
     this._isRetention = true;
+    this._appLocationSearch = '';
     this._performanceData.push({
       key: 'sdk_init',
       value: Date.now()
@@ -84,6 +81,29 @@ var ComponentApp = /*#__PURE__*/function () {
       this.AMSSDK = AMSSDK;
       this.subscribeFromSDK();
     }
+  }, {
+    key: "initLoggerMeta",
+    value: function initLoggerMeta() {
+      var _this$_renderParams, _paymentSessionMetaDa;
+      console.log('this._renderParams', JSON.stringify(this._renderParams), null, 3);
+      var paymentSessionMetaData = (_this$_renderParams = this._renderParams) === null || _this$_renderParams === void 0 ? void 0 : _this$_renderParams.paymentSessionMetaData;
+      var paymentSessionConfig = paymentSessionMetaData.paymentSessionConfig;
+      this.AMSSDK.logger.setMedta({
+        platform: this.platform === platformEnum.desktop ? 'PC' : 'WAP',
+        // PC/WAP,
+        sdkVersion: this._appVersion,
+        instanceId: this.AMSSDK._instanceId,
+        storageId: this.AMSSDK._storageId,
+        // the better way to use md5 paymentSesionID
+        renderDisplayType: paymentSessionMetaData === null || paymentSessionMetaData === void 0 ? void 0 : paymentSessionMetaData.renderDisplayType,
+        merchantId: paymentSessionMetaData === null || paymentSessionMetaData === void 0 ? void 0 : paymentSessionMetaData.clientId,
+        productScene: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.productScene,
+        productSceneVersion: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.productSceneVersion,
+        paymentMethodType: paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa === void 0 ? void 0 : _paymentSessionMetaDa.paymentMethodType,
+        paymentMethodCategoryType: paymentSessionConfig === null || paymentSessionConfig === void 0 ? void 0 : paymentSessionConfig.paymentMethodCategoryType
+      });
+      this.AMSSDK.logger.setComponentStartTime(Date.now());
+    }
 
     /**
      * @description Set the rendering capability of the cashier plug-in. Different technology stacks have some differences in the packaging and use of rendering functions
@@ -96,24 +116,84 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "initAPSecurity",
     value: function initAPSecurity() {
-      var _this$_renderParams;
+      var _this$_renderParams2,
+        _this = this;
       if (componentSignEnum.CASHIER_PAYMENT_CARD !== this._componentSign) {
         return;
       }
-      var securityConfig = (_this$_renderParams = this._renderParams) === null || _this$_renderParams === void 0 || (_this$_renderParams = _this$_renderParams.paymentSessionMetaData) === null || _this$_renderParams === void 0 ? void 0 : _this$_renderParams.securityConfig;
+      var securityConfig = (_this$_renderParams2 = this._renderParams) === null || _this$_renderParams2 === void 0 || (_this$_renderParams2 = _this$_renderParams2.paymentSessionMetaData) === null || _this$_renderParams2 === void 0 ? void 0 : _this$_renderParams2.securityConfig;
       if (!securityConfig) {
         return;
       }
       var appName = securityConfig === null || securityConfig === void 0 ? void 0 : securityConfig.appName;
       var h5gateway = securityConfig === null || securityConfig === void 0 ? void 0 : securityConfig.h5gateway;
-      if (preinit === 'true' || rebuild === 'true') {
-        appName = getAppname(scene);
-        h5gateway = getSecurityHost(region);
-      }
-      APDID.initToken(appName, {
-        host: h5gateway
-      }, function (success, tokenResult, msg) {
-        console.log("initToken result tokenResult", JSON.stringify(tokenResult));
+
+      // if merchant have init securitySDK and same as service paymentSessionMetaData, no need init again
+      if (this.AMSSDK.securityConfig) {
+        if (appName === getAppname(this.AMSSDK.securityConfig.scene) && h5gateway === getSecurityHost(this.AMSSDK.securityConfig.region)) {
+          return;
+        }
+      }
+      this.AMSSDK.logger.logInfo({
+        title: 'sdk_event_securitySdkInit'
+      });
+      initSecuritySDK(appName, h5gateway, function () {
+        _this.AMSSDK.logger.logInfo({
+          title: 'sdk_event_securitySdkInitSuccess'
+        });
+      }, function () {
+        // TODO Distinguishing Call Scenarios of Security SDK Failures
+        _this.AMSSDK.logger.logError({
+          title: 'sdk_error_securitySdkInitFailed'
+        });
+      });
+    }
+  }, {
+    key: "logDeviceId",
+    value: function logDeviceId(deviceId, getDeviceIdStartTime) {
+      var time = "".concat(Date.now() - getDeviceIdStartTime);
+      if (deviceId) {
+        this.AMSSDK.logger.logInfo({
+          title: 'sdk_event_securitySdkGetTokenSuccess'
+        }, {
+          deviceId: deviceId,
+          time: time
+        }).send();
+      } else {
+        this.AMSSDK.logger.logInfo({
+          title: 'sdk_error_securitySdkGetTokenFailed'
+        }, {
+          deviceId: deviceId,
+          time: time
+        }).send();
+      }
+    }
+  }, {
+    key: "getDeviceIdAndLog",
+    value: function getDeviceIdAndLog() {
+      var _this2 = this;
+      return new Promise(function (resolve) {
+        // To avoid rendering being blocked, move the logic to the next event loop for processing
+        setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var _this2$_renderParams;
+          var securityConfig, getDeviceIdStartTime, deviceId;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                securityConfig = (_this2$_renderParams = _this2._renderParams) === null || _this2$_renderParams === void 0 || (_this2$_renderParams = _this2$_renderParams.paymentSessionMetaData) === null || _this2$_renderParams === void 0 ? void 0 : _this2$_renderParams.securityConfig;
+                getDeviceIdStartTime = Date.now();
+                _context.next = 4;
+                return getApdidToken(getAppname(SecuritySceneEnum.CARD), securityConfig);
+              case 4:
+                deviceId = _context.sent;
+                _this2.logDeviceId(deviceId, getDeviceIdStartTime);
+                resolve(deviceId);
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        })), 0);
       });
     }
 
@@ -123,7 +203,7 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "appendIframeNodes",
     value: function appendIframeNodes(componentSign, renderParams) {
-      var _this = this;
+      var _this3 = this;
       if (this._isInitComponent) {
         this.dispatchToSDK(EVENT.error.name, ERRORMESSAGE.CREATECOMPONENT_ERROR.SINGLETON_COMPONENT_ERROR);
         return Promise.reject(ERRORMESSAGE.CREATECOMPONENT_ERROR.SINGLETON_COMPONENT_ERROR);
@@ -135,6 +215,7 @@ var ComponentApp = /*#__PURE__*/function () {
       this._renderDisplayType = renderParams.renderDisplayType;
       var insertedNode = this._renderDisplayType === renderDisplayTypeEnum.inline ? "#".concat(COMPONENT_CONTAINER_ID) : this._selector;
       this.initAPSecurity();
+      this.initLoggerMeta();
       this._performanceData.push({
         key: 'sdk_create_component',
         value: Date.now()
@@ -145,6 +226,7 @@ var ComponentApp = /*#__PURE__*/function () {
       if (this._renderDisplayType === renderDisplayTypeEnum.inline) {
         var container = createInlineBaseElement(this._selector);
         if (container) this.renderInlineLoading(renderParams, container);
+        insertStyleSheet();
       }
       if (this._renderDisplayType === renderDisplayTypeEnum.popup) {
         createBaseElement(this.platform, this.closeBtnFunc.bind(this));
@@ -154,10 +236,13 @@ var ComponentApp = /*#__PURE__*/function () {
       }
       this.createApp(renderParams);
       return Promise.all([this.createActionQueryPromise(), this.createIframeNode(this, insertedNode, this._renderDisplayType), this._createLoadAppPromise()]).then(function () {
+        _this3.AMSSDK.logger.logInfo({
+          title: 'sdk_event_successfully_created_app_process'
+        }).send();
         return Promise.resolve();
       }).catch(function (error) {
-        _this._isInitComponent = false;
-        _this.cleanContainer();
+        _this3._isInitComponent = false;
+        _this3.cleanContainer();
         return Promise.reject(error);
       });
     }
@@ -183,17 +268,20 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "_createLoadAppPromise",
     value: function _createLoadAppPromise() {
-      var _this2 = this;
+      var _this4 = this;
       return new Promise(function (resolve, reject) {
-        _this2._loadAppPromiseResolve = resolve;
+        _this4._loadAppPromiseResolve = resolve;
         setTimeout(function () {
           reject(ERRORMESSAGE.CREATECOMPONENT_ERROR.LOAD_APP_TIMEOUT);
         }, LOADTIME_LIMIT);
       }).catch(function (error) {
-        _this2.dispatchToSDK(EVENT.error.name, {
+        _this4.dispatchToSDK(EVENT.error.name, {
           code: ERRORMESSAGE.CREATECOMPONENT_ERROR.code,
           message: ERRORMESSAGE.CREATECOMPONENT_ERROR.LOAD_APP_TIMEOUT.message
         });
+        _this4.AMSSDK.logger.logError({
+          title: 'sdk_error_web_app_timeout'
+        }).send();
         return Promise.reject(error);
       });
     }
@@ -204,109 +292,131 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "createActionQueryPromise",
     value: function createActionQueryPromise() {
-      var _this3 = this;
+      var _this5 = this;
       this._performanceData.push({
         key: 'sdk_action_query_start',
         value: Date.now()
       });
-      this._actionQueryPromise = new Promise(function (resolve, reject) {
-        var _this3$_renderParams, _this3$_renderParams2, _this3$_renderParams3;
-        var params = {
-          paymentSessionData: _this3._renderParams && ((_this3$_renderParams = _this3._renderParams) === null || _this3$_renderParams === void 0 ? void 0 : _this3$_renderParams.sessionData) || '',
-          paymentSessionConfig: (_this3$_renderParams2 = _this3._renderParams) === null || _this3$_renderParams2 === void 0 || (_this3$_renderParams2 = _this3$_renderParams2.paymentSessionMetaData) === null || _this3$_renderParams2 === void 0 ? void 0 : _this3$_renderParams2.paymentSessionConfig
-        };
-        /**
-         * @description card
-         */
-        if (componentSignEnum.CASHIER_PAYMENT_CARD === _this3._componentSign || componentSignEnum.VAULTING_CARD === _this3._componentSign) {
-          params.paymentMethodType = 'CARD';
-        }
-        var needDeviceId = false;
-        var waitTime = '3000';
-        var securityConfig = (_this3$_renderParams3 = _this3._renderParams) === null || _this3$_renderParams3 === void 0 || (_this3$_renderParams3 = _this3$_renderParams3.paymentSessionMetaData) === null || _this3$_renderParams3 === void 0 ? void 0 : _this3$_renderParams3.securityConfig;
-        if (componentSignEnum.CASHIER_PAYMENT_CARD === _this3._componentSign && securityConfig) {
-          var _this3$_renderParams4;
-          var extendInfo = ((_this3$_renderParams4 = _this3._renderParams) === null || _this3$_renderParams4 === void 0 || (_this3$_renderParams4 = _this3$_renderParams4.paymentSessionMetaData) === null || _this3$_renderParams4 === void 0 ? void 0 : _this3$_renderParams4.extendInfo) || '';
-          var info = JSON.parse(extendInfo);
-          if ((info === null || info === void 0 ? void 0 : info.cardTokenPay) !== 'false') {
-            needDeviceId = true;
-            waitTime = securityConfig === null || securityConfig === void 0 ? void 0 : securityConfig.tokenCollectTime;
-          }
-        }
-
-        /**
-         * @description easyPay
-         */
-        if (componentSignEnum.EASY_PAY_WALLET === _this3._componentSign) {
-          var _this3$_renderParams5;
-          var _ref2 = params.paymentSessionConfig || {},
-            _ref2$productSceneVer = _ref2.productSceneVersion,
-            productSceneVersion = _ref2$productSceneVer === void 0 ? '' : _ref2$productSceneVer,
-            _ref2$productScene = _ref2.productScene,
-            productScene = _ref2$productScene === void 0 ? '' : _ref2$productScene;
-          var _ref3 = ((_this3$_renderParams5 = _this3._renderParams) === null || _this3$_renderParams5 === void 0 ? void 0 : _this3$_renderParams5.paymentSessionMetaData) || {},
-            _ref3$action = _ref3.action,
-            _ref3$action2 = _ref3$action === void 0 ? {} : _ref3$action,
-            _ref3$action2$autoDeb = _ref3$action2.autoDebitWithToken,
-            autoDebitWithToken = _ref3$action2$autoDeb === void 0 ? false : _ref3$action2$autoDeb;
-          if (productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken) {
-            // if EASY_PAY 2.0 , no need to query payment request
-            return resolve({
-              message: 'sdk no need to make query request',
-              success: true
-            });
-          }
-        }
-        /**
-         * @author tianqiang
-         * @description autoDebit
-         */
-        if (componentSignEnum.AUTO_DEBIT_WALLET === _this3._componentSign) {
-          var _this3$_renderParams6, _action$web, _action$wap;
-          var action = ((_this3$_renderParams6 = _this3._renderParams) === null || _this3$_renderParams6 === void 0 || (_this3$_renderParams6 = _this3$_renderParams6.paymentSessionMetaData) === null || _this3$_renderParams6 === void 0 ? void 0 : _this3$_renderParams6.action) || {};
-          var signType = isPC() ? action === null || action === void 0 || (_action$web = action.web) === null || _action$web === void 0 ? void 0 : _action$web.signType : action === null || action === void 0 || (_action$wap = action.wap) === null || _action$wap === void 0 ? void 0 : _action$wap.signType;
-          if (signType === 'SMS') {
-            return resolve({
-              message: 'sdk no need to make query request',
-              success: true
-            });
-          }
-          if (!signType || signType !== 'REDIRECT') {
-            return resolve({
-              success: false
-            });
-          }
-        }
 
-        // mock
-        if (isLocalMock()) {
-          return resolve({
-            message: 'sdk no need to make query request',
-            success: true
-          });
-        }
-        queryPaymentInfo(params, {
-          env: _this3.AMSSDK.options.env.environment,
-          locale: _this3.AMSSDK.options.locale,
-          needDeviceId: needDeviceId,
-          waitTime: waitTime
-        }).then(function (res) {
-          _this3._performanceData.push({
-            key: 'sdk_action_query_end',
-            value: Date.now()
-          });
-          if (res !== null && res !== void 0 && res.success) {
-            resolve(res);
-          } else {
-            resolve(res);
-          }
-        }).catch(function (err) {
-          _this3.dispatchToSDK(EVENT.error.name, {
-            code: ERRORMESSAGE.CREATECOMPONENT_ERROR.code
-          });
-          reject(err);
-        });
-      });
+      // eslint-disable-next-line no-async-promise-executor
+      this._actionQueryPromise = new Promise( /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
+          var _this5$_renderParams, _this5$_renderParams2, _this5$_renderParams3, _this5$_renderParams4;
+          var envInfo, params, securityConfig, _this5$_renderParams5, extendInfo, info, _this5$_renderParams6, _ref3, _ref3$productSceneVer, productSceneVersion, _ref3$productScene, productScene, _ref4, _ref4$action, _ref4$action2, _ref4$action2$autoDeb, autoDebitWithToken, _this5$_renderParams7, _action$web, _action$wap, action, signType;
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
+              case 0:
+                envInfo = {
+                  locale: _this5.AMSSDK.options.locale
+                };
+                params = {
+                  paymentSessionData: _this5._renderParams && ((_this5$_renderParams = _this5._renderParams) === null || _this5$_renderParams === void 0 ? void 0 : _this5$_renderParams.sessionData) || '',
+                  paymentSessionConfig: (_this5$_renderParams2 = _this5._renderParams) === null || _this5$_renderParams2 === void 0 || (_this5$_renderParams2 = _this5$_renderParams2.paymentSessionMetaData) === null || _this5$_renderParams2 === void 0 ? void 0 : _this5$_renderParams2.paymentSessionConfig,
+                  notRedirectAfterComplete: ((_this5$_renderParams3 = _this5._renderParams) === null || _this5$_renderParams3 === void 0 ? void 0 : _this5$_renderParams3.notRedirectAfterComplete) === true
+                };
+                /**
+                 * @description card
+                 */
+                if (componentSignEnum.CASHIER_PAYMENT_CARD === _this5._componentSign || componentSignEnum.VAULTING_CARD === _this5._componentSign) {
+                  params.paymentMethodType = 'CARD';
+                }
+                securityConfig = (_this5$_renderParams4 = _this5._renderParams) === null || _this5$_renderParams4 === void 0 || (_this5$_renderParams4 = _this5$_renderParams4.paymentSessionMetaData) === null || _this5$_renderParams4 === void 0 ? void 0 : _this5$_renderParams4.securityConfig;
+                if (!(componentSignEnum.CASHIER_PAYMENT_CARD === _this5._componentSign && securityConfig)) {
+                  _context2.next = 11;
+                  break;
+                }
+                extendInfo = ((_this5$_renderParams5 = _this5._renderParams) === null || _this5$_renderParams5 === void 0 || (_this5$_renderParams5 = _this5$_renderParams5.paymentSessionMetaData) === null || _this5$_renderParams5 === void 0 ? void 0 : _this5$_renderParams5.extendInfo) || '{}';
+                info = JSON.parse(extendInfo);
+                if (!((info === null || info === void 0 ? void 0 : info.cardTokenPay) !== 'false')) {
+                  _context2.next = 11;
+                  break;
+                }
+                _context2.next = 10;
+                return _this5.getDeviceIdAndLog();
+              case 10:
+                envInfo.deviceId = _context2.sent;
+              case 11:
+                if (!(componentSignEnum.EASY_PAY_WALLET === _this5._componentSign)) {
+                  _context2.next = 16;
+                  break;
+                }
+                _ref3 = params.paymentSessionConfig || {}, _ref3$productSceneVer = _ref3.productSceneVersion, productSceneVersion = _ref3$productSceneVer === void 0 ? '' : _ref3$productSceneVer, _ref3$productScene = _ref3.productScene, productScene = _ref3$productScene === void 0 ? '' : _ref3$productScene;
+                _ref4 = ((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb;
+                if (!(productScene === productSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken)) {
+                  _context2.next = 16;
+                  break;
+                }
+                return _context2.abrupt("return", resolve({
+                  message: 'sdk no need to make query request',
+                  success: true
+                }));
+              case 16:
+                if (!(componentSignEnum.AUTO_DEBIT_WALLET === _this5._componentSign)) {
+                  _context2.next = 23;
+                  break;
+                }
+                action = ((_this5$_renderParams7 = _this5._renderParams) === null || _this5$_renderParams7 === void 0 || (_this5$_renderParams7 = _this5$_renderParams7.paymentSessionMetaData) === null || _this5$_renderParams7 === void 0 ? void 0 : _this5$_renderParams7.action) || {};
+                signType = isPC() ? action === null || action === void 0 || (_action$web = action.web) === null || _action$web === void 0 ? void 0 : _action$web.signType : action === null || action === void 0 || (_action$wap = action.wap) === null || _action$wap === void 0 ? void 0 : _action$wap.signType;
+                if (!(signType === 'SMS')) {
+                  _context2.next = 21;
+                  break;
+                }
+                return _context2.abrupt("return", resolve({
+                  message: 'sdk no need to make query request',
+                  success: true
+                }));
+              case 21:
+                if (!(!signType || signType !== 'REDIRECT')) {
+                  _context2.next = 23;
+                  break;
+                }
+                return _context2.abrupt("return", resolve({
+                  success: false
+                }));
+              case 23:
+                if (!isLocalMock()) {
+                  _context2.next = 25;
+                  break;
+                }
+                return _context2.abrupt("return", resolve({
+                  message: 'sdk no need to make query request',
+                  success: true
+                }));
+              case 25:
+                queryPaymentInfo(params, {
+                  env: _this5.AMSSDK.options.env.environment,
+                  envInfo: envInfo
+                }, _this5.AMSSDK.logger).then(function (res) {
+                  _this5._performanceData.push({
+                    key: 'sdk_action_query_end',
+                    value: Date.now()
+                  });
+                  if (res !== null && res !== void 0 && res.success) {
+                    resolve(res);
+                  } else {
+                    resolve(res);
+                  }
+                }).catch(function (err) {
+                  if (componentSignEnum.CASHIER_PAYMENT_CARD === _this5._componentSign) {
+                    return resolve({
+                      success: false
+                    });
+                  }
+                  _this5.dispatchToSDK(EVENT.error.name, {
+                    code: ERRORMESSAGE.CREATECOMPONENT_ERROR.code
+                  });
+                  reject(err);
+                });
+              case 26:
+              case "end":
+                return _context2.stop();
+            }
+          }, _callee2);
+        }));
+        return function (_x, _x2) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
       return this._actionQueryPromise;
     }
   }, {
@@ -368,17 +478,21 @@ var ComponentApp = /*#__PURE__*/function () {
           extendInfo: extendInfo
         });
         this.app = createIframe(this.AMSSDK.options.mode, this.platform);
-        this.app.src = getIframeUrl({
-          renderDisplayType: renderParams.renderDisplayType,
-          componentSign: this._componentSign,
-          analytics: this.AMSSDK.options.analytics,
-          productSceneVersion: productSceneVersion,
-          environment: environment,
-          appVersion: this._appVersion,
-          extendInfo: extendInfo,
-          locale: this.AMSSDK.options.locale,
-          instanceId: this.AMSSDK._instanceId
-        });
+        var _getIframeUrl = getIframeUrl({
+            renderDisplayType: renderParams.renderDisplayType,
+            componentSign: this._componentSign,
+            analytics: this.AMSSDK.options.analytics,
+            productSceneVersion: productSceneVersion,
+            environment: environment,
+            appVersion: this._appVersion,
+            extendInfo: extendInfo,
+            locale: this.AMSSDK.options.locale,
+            instanceId: this.AMSSDK._instanceId
+          }),
+          path = _getIframeUrl.path,
+          locationSearch = _getIframeUrl.locationSearch;
+        this._appLocationSearch = locationSearch;
+        this.app.src = "".concat(path, "?").concat(locationSearch);
 
         // Subscribe to messages from iframe
         this.addEventListener();
@@ -391,17 +505,11 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "listener",
     value: function listener(e) {
-      if (e.origin !== this.appDomain) {
-        return;
-      }
+      if (e.origin !== this.appDomain) return;
       var isJson = isJsonString(e.data);
       if (isJson) {
         var data = JSON.parse(e.data);
-        if (data.name !== messageName.APP_TO_SDK && data.name !== messageName.APP_TO_APP || data.instanceId !== this.AMSSDK._instanceId) {
-          return;
-        }
-        // TODO
-        // 如果带有callback标识，则从map结构中取出callbackfunc，执行，执行后在map结构中删除
+        if (data.name !== messageName.APP_TO_SDK && data.name !== messageName.APP_TO_APP || data.instanceId !== this.AMSSDK._instanceId) return;
         this._handleAppMessage(data);
       } else {
         console.warn(ERRORMESSAGE.NOT_JSON_FORMAT);
@@ -424,7 +532,54 @@ var ComponentApp = /*#__PURE__*/function () {
         }
       });
     }
-
+  }, {
+    key: "createPopupWindow",
+    value: function createPopupWindow(data) {
+      var _this$_renderParams3;
+      this._threedData = data;
+      var sessionData = encodeURIComponent((_this$_renderParams3 = this._renderParams) === null || _this$_renderParams3 === void 0 ? void 0 : _this$_renderParams3.sessionData);
+      var threedPageUrl = "".concat(marmotMap[this.AMSSDK.options.env.environment], "/threedPage/index.html?scene=threedWrapperPage&sessionData=").concat(sessionData, "&").concat(this._appLocationSearch);
+      this.popupWindow = createModal({
+        device: this.platform,
+        url: threedPageUrl
+      });
+    }
+  }, {
+    key: "getDeviceIdAndCallback",
+    value: function () {
+      var _getDeviceIdAndCallback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(eventContext) {
+        var deviceId;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              if (!(eventContext !== null && eventContext !== void 0 && eventContext.eventCallbackId)) {
+                _context3.next = 5;
+                break;
+              }
+              _context3.next = 3;
+              return this.getDeviceIdAndLog();
+            case 3:
+              deviceId = _context3.sent;
+              this.dispatchToApp({
+                context: {
+                  event: 'appEventCallback',
+                  eventCallbackId: eventContext === null || eventContext === void 0 ? void 0 : eventContext.eventCallbackId,
+                  data: {
+                    deviceId: deviceId
+                  }
+                }
+              });
+            case 5:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function getDeviceIdAndCallback(_x3) {
+        return _getDeviceIdAndCallback.apply(this, arguments);
+      }
+      return getDeviceIdAndCallback;
+    }()
     /**
      * @description Initialize subscription iframe message
      */
@@ -450,10 +605,32 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "_handleAppMessage",
     value: function _handleAppMessage(data) {
-      var eventKeyMap = [EVENT.launch.name, EVENT.redirect.name, EVENT.sizeChanged.name, EVENT.log.name, EVENT.close.name, EVENT.error.name, EVENT.eventCallback.name, EVENT.submitForm.name, EVENT.showCloseButton.name, EVENT.hideCloseButton.name, EVENT.setAllowRetention.name, EVENT.declareCheckoutInfo.name, EVENT.showPopup.name, EVENT.dismissLoading.name];
+      var eventKeyMap = [EVENT.launch.name, EVENT.redirect.name, EVENT.sizeChanged.name, EVENT.log.name, EVENT.close.name, EVENT.error.name, EVENT.eventCallback.name, EVENT.submitForm.name, EVENT.showCloseButton.name, EVENT.hideCloseButton.name, EVENT.setAllowRetention.name, EVENT.declareCheckoutInfo.name, EVENT.showPopup.name, EVENT.dismissLoading.name, EVENT.popupWindow.name, EVENT.threedReady.name, EVENT.closePopup.name, EVENT.getDeviceId.name];
       if (!eventKeyMap.includes(data.context.event)) {
         return;
       }
+      if (data.context.event === EVENT.getDeviceId.name) {
+        this.getDeviceIdAndCallback(data.context);
+        return;
+      }
+      if (data.context.event === EVENT.closePopup.name) {
+        destroyModal();
+        return;
+      }
+      if (data.context.event === EVENT.threedReady.name) {
+        this.dispatchToApp({
+          context: {
+            event: 'renderThreedPage',
+            data: this._threedData
+          }
+        }, this.popupWindow);
+        return;
+      }
+      if (data.context.event === EVENT.popupWindow.name) {
+        var _data$context;
+        this.createPopupWindow((_data$context = data.context) === null || _data$context === void 0 ? void 0 : _data$context.data);
+        return;
+      }
       if (data.context.event === EVENT.dismissLoading.name) {
         var _data$context$data;
         this.dispatchToSDK(EVENT.eventCallback.name, {
@@ -501,6 +678,11 @@ var ComponentApp = /*#__PURE__*/function () {
         this.handleDeclareInfo(data.context.data);
         return;
       }
+      if (data.context.event === EVENT.eventCallback.name) {
+        this.AMSSDK.logger.logInfo({
+          title: 'sdk_event_event_callback'
+        }).send();
+      }
 
       // The plug-in communicates with the sdk after processing
       this.dispatchToSDK(data.context.event, data.context.data, data.context.eventCallbackId);
@@ -558,7 +740,7 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "handleRedirect",
     value: function handleRedirect(data) {
-      var _this4 = this;
+      var _this6 = this;
       var _data = typeof data === 'string' ? {
         normalUrl: data
       } : {
@@ -567,23 +749,42 @@ var ComponentApp = /*#__PURE__*/function () {
         normalUrl: (data === null || data === void 0 ? void 0 : data.normalUrl) || '',
         target: data === null || data === void 0 ? void 0 : data.target
       };
+      this.AMSSDK.logger.logInfo({
+        title: 'sdk_event_call_url_start'
+      }, {
+        redirectInfo: JSON.stringify(_data)
+      }).send();
       var successCallback = function successCallback(type, url) {
-        _this4.dispatchToSDK(EVENT.eventCallback.name, {
+        _this6.dispatchToSDK(EVENT.eventCallback.name, {
           code: eventCodeEnum.SDK_CALL_URL_SUCCESS,
           message: "Successfully opened the app,".concat(type, ": ").concat(url)
         });
+        _this6.AMSSDK.logger.logInfo({
+          title: 'sdk_event_call_url_success'
+        }, {
+          redirectInfo: JSON.stringify(_data),
+          openType: type,
+          url: url
+        }).send();
       };
-      var failCallback = function failCallback() {
-        _this4.dispatchToSDK(EVENT.eventCallback.name, {
+      var failCallback = function failCallback(type, url) {
+        _this6.dispatchToSDK(EVENT.eventCallback.name, {
           code: eventCodeEnum.SDK_CALL_URL_SUCCESS,
           message: "Failed to open app,applinkUrl: ".concat(_data === null || _data === void 0 ? void 0 : _data.applinkUrl, " schemeUrl: ").concat(_data === null || _data === void 0 ? void 0 : _data.schemeUrl, " normalUrl: ").concat(_data === null || _data === void 0 ? void 0 : _data.normalUrl)
         });
+        _this6.AMSSDK.logger.logInfo({
+          title: 'sdk_error_call_url_failed'
+        }, {
+          redirectInfo: JSON.stringify(_data),
+          openType: type,
+          url: url
+        }).send();
       };
 
       // 支持 target: _blank，新开tab页打开
       if (_data.target === targetEnum.BLANK) {
-        if (!_data.normalUrl) return failCallback();
-        successCallback('normalUrl', _data.normalUrl);
+        if (!_data.normalUrl) return failCallback(RedirectType.NormalUrl, '');
+        successCallback(RedirectType.NormalUrl, _data.normalUrl);
         window.open(_data.normalUrl);
         return;
       }
@@ -591,28 +792,30 @@ var ComponentApp = /*#__PURE__*/function () {
       this.AMSSDK._redirect({
         applinkUrl: _data === null || _data === void 0 ? void 0 : _data.applinkUrl
       }).then(function () {
-        successCallback('applinkUrl', _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
+        successCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
       }).catch(function () {
-        return _this4.AMSSDK._redirect({
+        failCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
+        return _this6.AMSSDK._redirect({
           schemeUrl: _data === null || _data === void 0 ? void 0 : _data.schemeUrl
         });
       }).then(function () {
-        successCallback('schemeUrl', _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
+        successCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
       }).catch(function () {
-        return _this4.AMSSDK._redirect({
+        failCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
+        return _this6.AMSSDK._redirect({
           normalUrl: _data === null || _data === void 0 ? void 0 : _data.normalUrl
         });
       }).then(function () {
-        successCallback('normalUrl', _data === null || _data === void 0 ? void 0 : _data.normalUrl);
+        successCallback(RedirectType.NormalUrl, _data === null || _data === void 0 ? void 0 : _data.normalUrl);
       }).catch(function () {
-        failCallback();
+        failCallback(RedirectType.NormalUrl, _data === null || _data === void 0 ? void 0 : _data.normalUrl);
       });
     }
   }, {
     key: "handleDeclareInfo",
-    value: function handleDeclareInfo(_ref4) {
-      var _ref4$closeDialogData = _ref4.closeDialogData,
-        closeDialogData = _ref4$closeDialogData === void 0 ? {} : _ref4$closeDialogData;
+    value: function handleDeclareInfo(_ref5) {
+      var _ref5$closeDialogData = _ref5.closeDialogData,
+        closeDialogData = _ref5$closeDialogData === void 0 ? {} : _ref5$closeDialogData;
       _handleDeclareInfo({
         closeDialogData: closeDialogData
       });
@@ -644,13 +847,21 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "dispatchToApp",
     value: function dispatchToApp(payload) {
+      var targetElement = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       var data = Object.assign({}, payload, {
         name: messageName.SDK_TO_APP,
         mode: this.AMSSDK.options.mode,
         appId: COMPONENTPLUGINID,
         instanceId: this.AMSSDK._instanceId
       });
-      // TODO 如果存在回调函数，则增加callBack标识，并存入map。map可以设置
+      this.AMSSDK.logger.logInfo({
+        title: 'sdk_event_send_message_to_web'
+      }, {
+        event: data === null || data === void 0 ? void 0 : data.context.event
+      }).send();
+      if (targetElement && targetElement.contentWindow) {
+        return targetElement.contentWindow.postMessage(JSON.stringify(data), '*');
+      }
       if (this.app && this.app.contentWindow) {
         return this.app.contentWindow.postMessage(JSON.stringify(data), this.appDomain);
       }
@@ -678,22 +889,22 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "sendRenderEvent",
     value: function () {
-      var _sendRenderEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _this$_renderParams2, _this$_renderParams3, _this$_renderParams4, _this$_renderParams5, res;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _sendRenderEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _this$_renderParams4, _this$_renderParams5, _this$_renderParams6, _this$_renderParams7, _this$_renderParams8, res;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _context.prev = 0;
+              _context4.prev = 0;
               if (this._actionQueryPromise) {
-                _context.next = 3;
+                _context4.next = 3;
                 break;
               }
-              return _context.abrupt("return");
+              return _context4.abrupt("return");
             case 3:
-              _context.next = 5;
+              _context4.next = 5;
               return this._actionQueryPromise;
             case 5:
-              res = _context.sent;
+              res = _context4.sent;
               this._performanceData.push({
                 key: 'sdk_render_component',
                 value: Date.now()
@@ -703,11 +914,12 @@ var ComponentApp = /*#__PURE__*/function () {
                   event: 'renderComponent',
                   data: {
                     queryResult: res,
-                    sessionResult: (_this$_renderParams2 = this._renderParams) === null || _this$_renderParams2 === void 0 ? void 0 : _this$_renderParams2.paymentSessionMetaData,
-                    paymentSessionData: (_this$_renderParams3 = this._renderParams) === null || _this$_renderParams3 === void 0 ? void 0 : _this$_renderParams3.sessionData,
+                    sessionResult: (_this$_renderParams4 = this._renderParams) === null || _this$_renderParams4 === void 0 ? void 0 : _this$_renderParams4.paymentSessionMetaData,
+                    paymentSessionData: (_this$_renderParams5 = this._renderParams) === null || _this$_renderParams5 === void 0 ? void 0 : _this$_renderParams5.sessionData,
                     heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-                    renderDisplayType: (_this$_renderParams4 = this._renderParams) === null || _this$_renderParams4 === void 0 ? void 0 : _this$_renderParams4.renderDisplayType,
-                    appearance: (_this$_renderParams5 = this._renderParams) === null || _this$_renderParams5 === void 0 ? void 0 : _this$_renderParams5.appearance,
+                    renderDisplayType: (_this$_renderParams6 = this._renderParams) === null || _this$_renderParams6 === void 0 ? void 0 : _this$_renderParams6.renderDisplayType,
+                    appearance: (_this$_renderParams7 = this._renderParams) === null || _this$_renderParams7 === void 0 ? void 0 : _this$_renderParams7.appearance,
+                    notRedirectAfterComplete: ((_this$_renderParams8 = this._renderParams) === null || _this$_renderParams8 === void 0 ? void 0 : _this$_renderParams8.notRedirectAfterComplete) === true,
                     envInfo: {
                       screenHeight: screen.height,
                       screenWidth: screen.width
@@ -724,16 +936,16 @@ var ComponentApp = /*#__PURE__*/function () {
                 }
               });
               // eslint-disable-next-line no-empty
-              _context.next = 13;
+              _context4.next = 13;
               break;
             case 11:
-              _context.prev = 11;
-              _context.t0 = _context["catch"](0);
+              _context4.prev = 11;
+              _context4.t0 = _context4["catch"](0);
             case 13:
             case "end":
-              return _context.stop();
+              return _context4.stop();
           }
-        }, _callee, this, [[0, 11]]);
+        }, _callee4, this, [[0, 11]]);
       }));
       function sendRenderEvent() {
         return _sendRenderEvent.apply(this, arguments);
@@ -747,7 +959,7 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "cleanContainer",
     value: function cleanContainer() {
       var _document$getElementB4,
-        _this5 = this;
+        _this7 = this;
       var immediately = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       this._loadAppPromiseResolve && this._loadAppPromiseResolve(true);
       this._performanceData = [];
@@ -759,7 +971,7 @@ var ComponentApp = /*#__PURE__*/function () {
       mockup === null || mockup === void 0 || mockup.classList.add("".concat(MOCKUP_ID, "-hidden"));
       if (immediately) this.cleanElement();else {
         setTimeout(function () {
-          _this5.cleanElement();
+          _this7.cleanElement();
         }, 300);
       }
     }