@alipay/ams-checkout 1.6.0 → 1.6.1

package/esm/plugin/component/index.js

@@ -17,11 +17,10 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 /* 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, RedirectType, renderDisplayTypeEnum, SecuritySceneEnum, targetEnum } from "../../types";
+import { queryPaymentInfo, submitPayInfo } from "../../service";
+import { componentSignEnum, eventCodeEnum, messageName, platformEnum, productSceneEnum, RedirectType, renderDisplayTypeEnum, 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";
@@ -44,11 +43,13 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_appVersion", void 0);
     _defineProperty(this, "_isRetention", void 0);
     _defineProperty(this, "_actionQueryPromise", null);
+    _defineProperty(this, "_actionSubmitPromise", null);
     _defineProperty(this, "_renderParams", null);
     _defineProperty(this, "_componentSign", componentSignEnum.NONE);
     _defineProperty(this, "_appLocationSearch", void 0);
     _defineProperty(this, "_renderDisplayType", renderDisplayTypeEnum.popup);
-    this._appVersion = '1.6.0';
+    _defineProperty(this, "_multipleCallbackEvents", void 0);
+    this._appVersion = '1.6.1';
     this._isInitComponent = false;
     this._selector = "#".concat(COMPONENT_SECTION_ID);
     this.createIframeNode = function () {
@@ -85,7 +86,6 @@ var ComponentApp = /*#__PURE__*/function () {
     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({
@@ -114,39 +114,39 @@ var ComponentApp = /*#__PURE__*/function () {
       this.createIframeNode = renderFunc;
     }
   }, {
-    key: "initAPSecurity",
-    value: function initAPSecurity() {
+    key: "initSecurity",
+    value: function initSecurity() {
       var _this$_renderParams2,
         _this = this;
-      if (componentSignEnum.CASHIER_PAYMENT_CARD !== this._componentSign) {
-        return;
-      }
-      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 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;
-        }
+      var product = (_this$_renderParams2 = this._renderParams) === null || _this$_renderParams2 === void 0 || (_this$_renderParams2 = _this$_renderParams2.paymentSessionMetaData) === null || _this$_renderParams2 === void 0 || (_this$_renderParams2 = _this$_renderParams2.paymentSessionConfig) === null || _this$_renderParams2 === void 0 ? void 0 : _this$_renderParams2.productScene;
+      if (componentSignEnum.CASHIER_PAYMENT_BANK === this._componentSign) {
+        this.AMSSDK.logger.logInfo({
+          title: 'sdk_event_security_unneeded_scenarios'
+        }, {
+          product: product
+        });
       }
-      this.AMSSDK.logger.logInfo({
-        title: 'sdk_event_securitySdkInit'
+      var securitySDK = this.AMSSDK._getSecuritySDKByProductScene({
+        product: product
       });
-      initSecuritySDK(appName, h5gateway, function () {
-        _this.AMSSDK.logger.logInfo({
-          title: 'sdk_event_securitySdkInitSuccess'
+      if (!securitySDK) {
+        this.AMSSDK.logger.logInfo({
+          title: 'sdk_event_securitySdkInit'
         });
-      }, function () {
-        // TODO Distinguishing Call Scenarios of Security SDK Failures
-        _this.AMSSDK.logger.logError({
-          title: 'sdk_error_securitySdkInitFailed'
+        this.AMSSDK._newSecuritySDKByScene({
+          product: product
+        }, function () {
+          _this.AMSSDK.logger.logInfo({
+            title: 'sdk_event_securitySdkInitSuccess'
+          });
+        }, function () {
+          _this.AMSSDK.logger.logError({
+            title: 'sdk_error_securitySdkInitFailed'
+          }, {
+            sign: 'SDK internal initialization'
+          });
         });
-      });
+      }
     }
   }, {
     key: "logDeviceId",
@@ -172,23 +172,47 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "getDeviceIdAndLog",
     value: function getDeviceIdAndLog() {
       var _this2 = this;
+      var deviceIdParameter = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var isPolling = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       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;
+          var productScene, getDeviceIdStartTime, securitySDK, 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;
+                productScene = (_this2$_renderParams = _this2._renderParams) === null || _this2$_renderParams === void 0 || (_this2$_renderParams = _this2$_renderParams.paymentSessionMetaData) === null || _this2$_renderParams === void 0 || (_this2$_renderParams = _this2$_renderParams.paymentSessionConfig) === null || _this2$_renderParams === void 0 ? void 0 : _this2$_renderParams.productScene;
                 getDeviceIdStartTime = Date.now();
-                _context.next = 4;
-                return getApdidToken(getAppname(SecuritySceneEnum.CARD), securityConfig);
-              case 4:
-                deviceId = _context.sent;
+                securitySDK = _this2.AMSSDK._getSecuritySDKByProductScene({
+                  product: (deviceIdParameter === null || deviceIdParameter === void 0 ? void 0 : deviceIdParameter.productScene) || productScene
+                });
+                deviceId = '';
+                if (!securitySDK) {
+                  _context.next = 16;
+                  break;
+                }
+                if (!(isPolling && parseInt(deviceIdParameter === null || deviceIdParameter === void 0 ? void 0 : deviceIdParameter.tokenCollectTime) > 0)) {
+                  _context.next = 11;
+                  break;
+                }
+                _context.next = 8;
+                return securitySDK.pollingGetApdidToken(deviceIdParameter);
+              case 8:
+                _context.t0 = _context.sent;
+                _context.next = 14;
+                break;
+              case 11:
+                _context.next = 13;
+                return securitySDK.getApdidToken();
+              case 13:
+                _context.t0 = _context.sent;
+              case 14:
+                deviceId = _context.t0;
                 _this2.logDeviceId(deviceId, getDeviceIdStartTime);
+              case 16:
                 resolve(deviceId);
-              case 7:
+              case 17:
               case "end":
                 return _context.stop();
             }
@@ -214,7 +238,7 @@ var ComponentApp = /*#__PURE__*/function () {
       if (renderParams !== null && renderParams !== void 0 && renderParams.selector) this._selector = renderParams.selector;
       this._renderDisplayType = renderParams.renderDisplayType;
       var insertedNode = this._renderDisplayType === renderDisplayTypeEnum.inline ? "#".concat(COMPONENT_CONTAINER_ID) : this._selector;
-      this.initAPSecurity();
+      this.initSecurity();
       this.initLoggerMeta();
       this._performanceData.push({
         key: 'sdk_create_component',
@@ -235,12 +259,12 @@ var ComponentApp = /*#__PURE__*/function () {
         this.renderPopupLoading(renderParams);
       }
       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.all([this.createActionQueryPromise(), this.createSubmitPromise(), this.createIframeNode(this, insertedNode, this._renderDisplayType), this._createLoadAppPromise()]).then(function () {
         return Promise.resolve();
       }).catch(function (error) {
+        _this3.AMSSDK.logger.logError({
+          title: 'sdk_error_created_app_process_failed'
+        }).send();
         _this3._isInitComponent = false;
         _this3.cleanContainer();
         return Promise.reject(error);
@@ -302,7 +326,7 @@ var ComponentApp = /*#__PURE__*/function () {
       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;
+          var envInfo, params, _this5$_renderParams5, _ref3, _ref3$productSceneVer, productSceneVersion, _ref3$productScene, productScene, _ref4, _ref4$action, _ref4$action2, _ref4$action2$autoDeb, autoDebitWithToken, _this5$_renderParams6, _action$web, _action$wap, action, signType;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -315,74 +339,80 @@ var ComponentApp = /*#__PURE__*/function () {
                   notRedirectAfterComplete: ((_this5$_renderParams3 = _this5._renderParams) === null || _this5$_renderParams3 === void 0 ? void 0 : _this5$_renderParams3.notRedirectAfterComplete) === true
                 };
                 /**
-                 * @description card
+                 * @description Simulated or unnecessary scenarios
                  */
-                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;
+                if (!(isLocalMock() || (_this5$_renderParams4 = _this5._renderParams) !== null && _this5$_renderParams4 !== void 0 && (_this5$_renderParams4 = _this5$_renderParams4.paymentSessionMetaData) !== null && _this5$_renderParams4 !== void 0 && (_this5$_renderParams4 = _this5$_renderParams4.action) !== null && _this5$_renderParams4 !== void 0 && _this5$_renderParams4.skipSdkQuery)) {
+                  _context2.next = 4;
                   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;
+                return _context2.abrupt("return", resolve({
+                  message: 'sdk no need to make query request',
+                  success: true
+                }));
+              case 4:
+                if (!(componentSignEnum.CASHIER_PAYMENT_CARD === _this5._componentSign || componentSignEnum.VAULTING_CARD === _this5._componentSign)) {
+                  _context2.next = 9;
                   break;
                 }
-                _context2.next = 10;
+                params.paymentMethodType = 'CARD';
+                _context2.next = 8;
                 return _this5.getDeviceIdAndLog();
-              case 10:
+              case 8:
                 envInfo.deviceId = _context2.sent;
-              case 11:
+              case 9:
                 if (!(componentSignEnum.EASY_PAY_WALLET === _this5._componentSign)) {
-                  _context2.next = 16;
+                  _context2.next = 17;
                   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;
+                _ref4 = ((_this5$_renderParams5 = _this5._renderParams) === null || _this5$_renderParams5 === void 0 ? void 0 : _this5$_renderParams5.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;
+                  _context2.next = 14;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
+              case 14:
+                _context2.next = 16;
+                return _this5.getDeviceIdAndLog();
               case 16:
+                envInfo.deviceId = _context2.sent;
+              case 17:
                 if (!(componentSignEnum.AUTO_DEBIT_WALLET === _this5._componentSign)) {
-                  _context2.next = 23;
+                  _context2.next = 27;
                   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) || {};
+                action = ((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 || (_this5$_renderParams6 = _this5$_renderParams6.paymentSessionMetaData) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.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;
+                  _context2.next = 22;
                   break;
                 }
                 return _context2.abrupt("return", resolve({
                   message: 'sdk no need to make query request',
                   success: true
                 }));
-              case 21:
+              case 22:
                 if (!(!signType || signType !== 'REDIRECT')) {
-                  _context2.next = 23;
+                  _context2.next = 24;
                   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:
+              case 24:
+                _context2.next = 26;
+                return _this5.getDeviceIdAndLog();
+              case 26:
+                envInfo.deviceId = _context2.sent;
+              case 27:
+                _this5.AMSSDK.logger.logInfo({
+                  title: 'sdk_event_sdkQuery'
+                }, {
+                  paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
+                }).send();
                 queryPaymentInfo(params, {
                   env: _this5.AMSSDK.options.env.environment,
                   envInfo: envInfo
@@ -406,8 +436,14 @@ var ComponentApp = /*#__PURE__*/function () {
                     code: ERRORMESSAGE.CREATECOMPONENT_ERROR.code
                   });
                   reject(err);
+                }).finally(function () {
+                  _this5.AMSSDK.logger.logInfo({
+                    title: 'sdk_event_sdkQueryEnd'
+                  }, {
+                    paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
+                  }).send();
                 });
-              case 26:
+              case 29:
               case "end":
                 return _context2.stop();
             }
@@ -419,6 +455,90 @@ var ComponentApp = /*#__PURE__*/function () {
       }());
       return this._actionQueryPromise;
     }
+  }, {
+    key: "createSubmitPromise",
+    value: function createSubmitPromise() {
+      var _this$_renderParams3,
+        _this$_renderParams4,
+        _this6 = this;
+      this._performanceData.push({
+        key: 'sdk_submit_start',
+        value: Date.now()
+      });
+      var params = {
+        paymentSessionData: this._renderParams && ((_this$_renderParams3 = this._renderParams) === null || _this$_renderParams3 === void 0 ? void 0 : _this$_renderParams3.sessionData) || '',
+        paymentSessionConfig: (_this$_renderParams4 = this._renderParams) === null || _this$_renderParams4 === void 0 || (_this$_renderParams4 = _this$_renderParams4.paymentSessionMetaData) === null || _this$_renderParams4 === void 0 ? void 0 : _this$_renderParams4.paymentSessionConfig
+      };
+
+      // eslint-disable-next-line no-async-promise-executor
+      this._actionSubmitPromise = new Promise( /*#__PURE__*/function () {
+        var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
+          var _this6$_renderParams;
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                if (!(!((_this6$_renderParams = _this6._renderParams) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.paymentSessionMetaData) !== null && _this6$_renderParams !== void 0 && (_this6$_renderParams = _this6$_renderParams.action) !== null && _this6$_renderParams !== void 0 && _this6$_renderParams.skipSdkQuery) || componentSignEnum.EASY_PAY_WALLET !== _this6._componentSign)) {
+                  _context3.next = 2;
+                  break;
+                }
+                return _context3.abrupt("return", resolve({
+                  message: 'sdk no need to make submitPay request',
+                  success: true
+                }));
+              case 2:
+                _this6.AMSSDK.logger.logInfo({
+                  title: 'sdk_event_submitPay'
+                }, {
+                  paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
+                }).send();
+                _context3.t0 = submitPayInfo;
+                _context3.t1 = params;
+                _context3.t2 = _this6.AMSSDK.options.env.environment;
+                _context3.next = 8;
+                return _this6.getDeviceIdAndLog();
+              case 8:
+                _context3.t3 = _context3.sent;
+                _context3.t4 = {
+                  deviceId: _context3.t3
+                };
+                _context3.t5 = {
+                  env: _context3.t2,
+                  timeout: 15000,
+                  envInfo: _context3.t4
+                };
+                _context3.t6 = _this6.AMSSDK.logger;
+                (0, _context3.t0)(_context3.t1, _context3.t5, _context3.t6).then(function (res) {
+                  _this6._performanceData.push({
+                    key: 'sdk_submit_end',
+                    value: Date.now()
+                  });
+                  if (res !== null && res !== void 0 && res.success) {
+                    resolve(res);
+                  } else {
+                    resolve(res);
+                  }
+                }).catch(function () {
+                  resolve({
+                    success: false
+                  });
+                }).finally(function () {
+                  _this6.AMSSDK.logger.logInfo({
+                    title: 'sdk_event_submitPayEnd'
+                  }, {
+                    paymentSessionConfig: JSON.stringify(params.paymentSessionConfig)
+                  }).send();
+                });
+              case 13:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        return function (_x3) {
+          return _ref5.apply(this, arguments);
+        };
+      }());
+    }
   }, {
     key: "cleanElement",
     value: function cleanElement() {
@@ -535,9 +655,9 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "createPopupWindow",
     value: function createPopupWindow(data) {
-      var _this$_renderParams3;
+      var _this$_renderParams5;
       this._threedData = data;
-      var sessionData = encodeURIComponent((_this$_renderParams3 = this._renderParams) === null || _this$_renderParams3 === void 0 ? void 0 : _this$_renderParams3.sessionData);
+      var sessionData = encodeURIComponent((_this$_renderParams5 = this._renderParams) === null || _this$_renderParams5 === void 0 ? void 0 : _this$_renderParams5.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,
@@ -547,19 +667,19 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "getDeviceIdAndCallback",
     value: function () {
-      var _getDeviceIdAndCallback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(eventContext) {
+      var _getDeviceIdAndCallback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(eventContext) {
         var deviceId;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               if (!(eventContext !== null && eventContext !== void 0 && eventContext.eventCallbackId)) {
-                _context3.next = 5;
+                _context4.next = 5;
                 break;
               }
-              _context3.next = 3;
-              return this.getDeviceIdAndLog();
+              _context4.next = 3;
+              return this.getDeviceIdAndLog(eventContext === null || eventContext === void 0 ? void 0 : eventContext.data, true);
             case 3:
-              deviceId = _context3.sent;
+              deviceId = _context4.sent;
               this.dispatchToApp({
                 context: {
                   event: 'appEventCallback',
@@ -571,11 +691,11 @@ var ComponentApp = /*#__PURE__*/function () {
               });
             case 5:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this);
+        }, _callee4, this);
       }));
-      function getDeviceIdAndCallback(_x3) {
+      function getDeviceIdAndCallback(_x4) {
         return _getDeviceIdAndCallback.apply(this, arguments);
       }
       return getDeviceIdAndCallback;
@@ -605,7 +725,7 @@ 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, EVENT.popupWindow.name, EVENT.threedReady.name, EVENT.closePopup.name, EVENT.getDeviceId.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, EVENT.declareEventCallbackInfo.name];
       if (!eventKeyMap.includes(data.context.event)) {
         return;
       }
@@ -678,6 +798,10 @@ var ComponentApp = /*#__PURE__*/function () {
         this.handleDeclareInfo(data.context.data);
         return;
       }
+      if (data.context.event === EVENT.declareEventCallbackInfo.name) {
+        this._multipleCallbackEvents = data.context.data;
+        return;
+      }
       if (data.context.event === EVENT.eventCallback.name) {
         this.AMSSDK.logger.logInfo({
           title: 'sdk_event_event_callback'
@@ -740,7 +864,7 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "handleRedirect",
     value: function handleRedirect(data) {
-      var _this6 = this;
+      var _this7 = this;
       var _data = typeof data === 'string' ? {
         normalUrl: data
       } : {
@@ -755,11 +879,11 @@ var ComponentApp = /*#__PURE__*/function () {
         redirectInfo: JSON.stringify(_data)
       }).send();
       var successCallback = function successCallback(type, url) {
-        _this6.dispatchToSDK(EVENT.eventCallback.name, {
+        _this7.dispatchToSDK(EVENT.eventCallback.name, {
           code: eventCodeEnum.SDK_CALL_URL_SUCCESS,
           message: "Successfully opened the app,".concat(type, ": ").concat(url)
         });
-        _this6.AMSSDK.logger.logInfo({
+        _this7.AMSSDK.logger.logInfo({
           title: 'sdk_event_call_url_success'
         }, {
           redirectInfo: JSON.stringify(_data),
@@ -768,11 +892,11 @@ var ComponentApp = /*#__PURE__*/function () {
         }).send();
       };
       var failCallback = function failCallback(type, url) {
-        _this6.dispatchToSDK(EVENT.eventCallback.name, {
-          code: eventCodeEnum.SDK_CALL_URL_SUCCESS,
+        _this7.dispatchToSDK(EVENT.eventCallback.name, {
+          code: eventCodeEnum.SDK_CALL_URL_ERROR,
           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({
+        _this7.AMSSDK.logger.logInfo({
           title: 'sdk_error_call_url_failed'
         }, {
           redirectInfo: JSON.stringify(_data),
@@ -795,14 +919,14 @@ var ComponentApp = /*#__PURE__*/function () {
         successCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
       }).catch(function () {
         failCallback(RedirectType.ApplinkUrl, _data === null || _data === void 0 ? void 0 : _data.applinkUrl);
-        return _this6.AMSSDK._redirect({
+        return _this7.AMSSDK._redirect({
           schemeUrl: _data === null || _data === void 0 ? void 0 : _data.schemeUrl
         });
       }).then(function () {
         successCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
       }).catch(function () {
         failCallback(RedirectType.SchemeUrl, _data === null || _data === void 0 ? void 0 : _data.schemeUrl);
-        return _this6.AMSSDK._redirect({
+        return _this7.AMSSDK._redirect({
           normalUrl: _data === null || _data === void 0 ? void 0 : _data.normalUrl
         });
       }).then(function () {
@@ -813,13 +937,31 @@ var ComponentApp = /*#__PURE__*/function () {
     }
   }, {
     key: "handleDeclareInfo",
-    value: function handleDeclareInfo(_ref5) {
-      var _ref5$closeDialogData = _ref5.closeDialogData,
-        closeDialogData = _ref5$closeDialogData === void 0 ? {} : _ref5$closeDialogData;
+    value: function handleDeclareInfo(_ref6) {
+      var _ref6$closeDialogData = _ref6.closeDialogData,
+        closeDialogData = _ref6$closeDialogData === void 0 ? {} : _ref6$closeDialogData;
       _handleDeclareInfo({
         closeDialogData: closeDialogData
       });
     }
+  }, {
+    key: "handleDeclarePopWindowCallback",
+    value: function handleDeclarePopWindowCallback() {
+      var eventInfoName = 'popWindowEventInfo';
+      if (this._multipleCallbackEvents && eventInfoName in this._multipleCallbackEvents) {
+        var eventInfo = this._multipleCallbackEvents[eventInfoName];
+        if (eventInfo.enableCallback) {
+          this.dispatchToSDK(EVENT.eventCallback.name, {
+            code: eventInfo.eventName,
+            result: {
+              result: eventInfo.eventResult
+            }
+          });
+        }
+      } else {
+        console.log("not valid ".concat(eventInfoName, " in "), this._multipleCallbackEvents);
+      }
+    }
   }, {
     key: "handleCloseBtnShow",
     value: function handleCloseBtnShow(showClose) {
@@ -889,22 +1031,26 @@ var ComponentApp = /*#__PURE__*/function () {
   }, {
     key: "sendRenderEvent",
     value: function () {
-      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) {
+      var _sendRenderEvent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        var _this$_renderParams6, _this$_renderParams7, _this$_renderParams8, _this$_renderParams9, _this$_renderParams10, res, submitRes;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _context4.prev = 0;
-              if (this._actionQueryPromise) {
-                _context4.next = 3;
+              _context5.prev = 0;
+              if (!(!this._actionQueryPromise || !this._actionSubmitPromise)) {
+                _context5.next = 3;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 3:
-              _context4.next = 5;
+              _context5.next = 5;
               return this._actionQueryPromise;
             case 5:
-              res = _context4.sent;
+              res = _context5.sent;
+              _context5.next = 8;
+              return this._actionSubmitPromise;
+            case 8:
+              submitRes = _context5.sent;
               this._performanceData.push({
                 key: 'sdk_render_component',
                 value: Date.now()
@@ -914,12 +1060,13 @@ var ComponentApp = /*#__PURE__*/function () {
                   event: 'renderComponent',
                   data: {
                     queryResult: res,
-                    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,
+                    submitResult: submitRes,
+                    sessionResult: (_this$_renderParams6 = this._renderParams) === null || _this$_renderParams6 === void 0 ? void 0 : _this$_renderParams6.paymentSessionMetaData,
+                    paymentSessionData: (_this$_renderParams7 = this._renderParams) === null || _this$_renderParams7 === void 0 ? void 0 : _this$_renderParams7.sessionData,
                     heightOfVisible: Math.max(window.changingPageHeight, window.innerHeight),
-                    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,
+                    renderDisplayType: (_this$_renderParams8 = this._renderParams) === null || _this$_renderParams8 === void 0 ? void 0 : _this$_renderParams8.renderDisplayType,
+                    appearance: (_this$_renderParams9 = this._renderParams) === null || _this$_renderParams9 === void 0 ? void 0 : _this$_renderParams9.appearance,
+                    notRedirectAfterComplete: ((_this$_renderParams10 = this._renderParams) === null || _this$_renderParams10 === void 0 ? void 0 : _this$_renderParams10.notRedirectAfterComplete) === true,
                     envInfo: {
                       screenHeight: screen.height,
                       screenWidth: screen.width
@@ -936,16 +1083,16 @@ var ComponentApp = /*#__PURE__*/function () {
                 }
               });
               // eslint-disable-next-line no-empty
-              _context4.next = 13;
+              _context5.next = 16;
               break;
-            case 11:
-              _context4.prev = 11;
-              _context4.t0 = _context4["catch"](0);
-            case 13:
+            case 14:
+              _context5.prev = 14;
+              _context5.t0 = _context5["catch"](0);
+            case 16:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this, [[0, 11]]);
+        }, _callee5, this, [[0, 14]]);
       }));
       function sendRenderEvent() {
         return _sendRenderEvent.apply(this, arguments);
@@ -959,7 +1106,7 @@ var ComponentApp = /*#__PURE__*/function () {
     key: "cleanContainer",
     value: function cleanContainer() {
       var _document$getElementB4,
-        _this7 = this;
+        _this8 = this;
       var immediately = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       this._loadAppPromiseResolve && this._loadAppPromiseResolve(true);
       this._performanceData = [];
@@ -971,7 +1118,7 @@ var ComponentApp = /*#__PURE__*/function () {
       mockup === null || mockup === void 0 || mockup.classList.add("".concat(MOCKUP_ID, "-hidden"));
       if (immediately) this.cleanElement();else {
         setTimeout(function () {
-          _this7.cleanElement();
+          _this8.cleanElement();
         }, 300);
       }
     }
@@ -994,6 +1141,7 @@ var ComponentApp = /*#__PURE__*/function () {
       if (this._isRetention) this.showRetentionPopup();else {
         this.cleanContainer();
         this.dispatchToSDK(EVENT.close.name, {});
+        this.handleDeclarePopWindowCallback();
       }
     }
   }, {
@@ -1002,6 +1150,7 @@ var ComponentApp = /*#__PURE__*/function () {
       this.dispatchToSDK(EVENT.close.name, {});
       this.hideRetentionPopupFunc();
       this.cleanContainer();
+      this.handleDeclarePopWindowCallback();
     }
   }, {
     key: "removeRetentionPopup",