@alipay/ams-checkout 0.0.1710212811-dev.14 → 0.0.1710212811-dev.17

package/esm/core/component/index.js

@@ -39,6 +39,7 @@ import { BusManager, BusMessage } from "../bus";
 import { ApplePayActionEnum, PaymentActionEnum } from "../bus/interface";
 import { SDKCallbackBusSubscriber } from "../bus/ability/callback";
 import { ApplePayBusSubscriber } from "../../plugin/applepay";
+import { SecurityBusSubscriber } from "../bus/ability/security";
 import { TrackerBusSubscriber } from "../bus/ability/tracker";
 export var getComponentSign = function getComponentSign(params) {
   var _params$paymentSessio = params.paymentSessionConfig,
@@ -110,7 +111,6 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
   function AMSComponent(options) {
     var _this;
     _classCallCheck(this, AMSComponent);
-    BusManager.clear();
     _this = _super.call(this, options);
     // Instantiate the plug-in and set render
     _defineProperty(_assertThisInitialized(_this), "_componentApp", void 0);
@@ -205,9 +205,9 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
     key: "registerBusAbility",
     value: function registerBusAbility() {
       var _this$originOptions,
-        _this2 = this,
-        _this$originOptions2;
+        _this2 = this;
       BusManager.debugTrace(((_this$originOptions = this.originOptions) === null || _this$originOptions === void 0 ? void 0 : _this$originOptions.environment) !== environmentEnum.prod);
+      BusManager.clear();
       BusManager.addInterceptor({
         onPublishException: function onPublishException(message, e) {
           _this2.logger.logInfo({
@@ -218,7 +218,14 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
         }
       });
       // subscribe basic ablility
-      BusManager.subscribe(new SDKCallbackBusSubscriber((_this$originOptions2 = this.originOptions) === null || _this$originOptions2 === void 0 ? void 0 : _this$originOptions2.onEventCallback));
+      BusManager.subscribe(new SDKCallbackBusSubscriber(function (state) {
+        var _this2$originOptions;
+        (_this2$originOptions = _this2.originOptions) === null || _this2$originOptions === void 0 || _this2$originOptions.onEventCallback(state);
+      }));
+      BusManager.subscribe(new SecurityBusSubscriber(function (deviceIdParameter, isPolling) {
+        var _this2$_componentApp;
+        return (_this2$_componentApp = _this2._componentApp) === null || _this2$_componentApp === void 0 ? void 0 : _this2$_componentApp.getDeviceIdAndLog(deviceIdParameter, isPolling);
+      }));
       BusManager.subscribe(new TrackerBusSubscriber(this.logger));
       // subscribe plugin
       BusManager.subscribe(new ApplePayBusSubscriber(this.logger));

package/esm/plugin/applepay/component.js

@@ -126,58 +126,81 @@ var ApplePayComponent = /*#__PURE__*/function () {
         }).send();
         return;
       }
+      var getDeviceId = /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var _yield$BusManager$pub, _this$_parseData;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return BusManager.publishForResult(new BusMessage(SecuritySDKActionEnum.getSecurityDeviceId, JSON.stringify({
+                  deviceIdParameter: {
+                    productScene: (_this$_parseData = _this._parseData) === null || _this$_parseData === void 0 || (_this$_parseData = _this$_parseData.paymentSessionConfig) === null || _this$_parseData === void 0 ? void 0 : _this$_parseData.productScene
+                  }
+                })));
+              case 2:
+                _context.t1 = _yield$BusManager$pub = _context.sent;
+                _context.t0 = _context.t1 === null;
+                if (_context.t0) {
+                  _context.next = 6;
+                  break;
+                }
+                _context.t0 = _yield$BusManager$pub === void 0;
+              case 6:
+                if (!_context.t0) {
+                  _context.next = 10;
+                  break;
+                }
+                _context.t2 = void 0;
+                _context.next = 11;
+                break;
+              case 10:
+                _context.t2 = _yield$BusManager$pub.getData();
+              case 11:
+                return _context.abrupt("return", _context.t2);
+              case 12:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        return function getDeviceId() {
+          return _ref.apply(this, arguments);
+        };
+      }();
       /**
        * Get MerchantSession spi
        * @param event
        */
       var getMerchantSession = /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-          var _yield$BusManager$pub;
+        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
           var validationUrl, requestParams;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+            while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                validationUrl = _ref.validationUrl;
+                validationUrl = _ref2.validationUrl;
                 // get validateUrl
                 requestParams = {
                   validateUrl: validationUrl,
                   paymentSessionData: _this._sessionData
                 }; // get deviceId
-                _context.t0 = getApplePayPaymentSession;
-                _context.t1 = _this._sessionData;
-                _context.t2 = requestParams;
-                _context.t3 = _this._options.environment;
-                _context.next = 8;
-                return BusManager.publishForResult(new BusMessage(SecuritySDKActionEnum.getSecurityDeviceId));
+                _context2.t0 = getApplePayPaymentSession;
+                _context2.t1 = _this._sessionData;
+                _context2.t2 = requestParams;
+                _context2.t3 = _this._options.environment;
+                _context2.next = 8;
+                return getDeviceId();
               case 8:
-                _context.t5 = _yield$BusManager$pub = _context.sent;
-                _context.t4 = _context.t5 === null;
-                if (_context.t4) {
-                  _context.next = 12;
-                  break;
-                }
-                _context.t4 = _yield$BusManager$pub === void 0;
-              case 12:
-                if (!_context.t4) {
-                  _context.next = 16;
-                  break;
-                }
-                _context.t6 = void 0;
-                _context.next = 17;
-                break;
-              case 16:
-                _context.t6 = _yield$BusManager$pub.getData();
-              case 17:
-                _context.t7 = _context.t6;
-                _context.t8 = {
-                  deviceId: _context.t7
+                _context2.t4 = _context2.sent;
+                _context2.t5 = {
+                  deviceId: _context2.t4
                 };
-                _context.t9 = {
-                  env: _context.t3,
-                  envInfo: _context.t8
+                _context2.t6 = {
+                  env: _context2.t3,
+                  envInfo: _context2.t5
                 };
-                _context.t10 = _this.logger;
-                return _context.abrupt("return", (0, _context.t0)(_context.t1, _context.t2, _context.t9, _context.t10).then(function (res) {
+                _context2.t7 = _this.logger;
+                return _context2.abrupt("return", (0, _context2.t0)(_context2.t1, _context2.t2, _context2.t6, _context2.t7).then(function (res) {
                   if (res !== null && res !== void 0 && res.success && res.merchantSessionObject) {
                     return Promise.resolve(res.merchantSessionObject);
                   }
@@ -188,14 +211,14 @@ var ApplePayComponent = /*#__PURE__*/function () {
                 }).catch(function (error) {
                   return Promise.reject(error);
                 }));
-              case 22:
+              case 13:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
-          }, _callee);
+          }, _callee2);
         }));
         return function getMerchantSession(_x) {
-          return _ref2.apply(this, arguments);
+          return _ref3.apply(this, arguments);
         };
       }();
 
@@ -204,53 +227,34 @@ var ApplePayComponent = /*#__PURE__*/function () {
        * @param tokens
        */
       var completePaymentAuthorized = /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
-          var _yield$BusManager$pub2;
+        var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
           var paymentToken, params;
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
               case 0:
-                paymentToken = _ref3.paymentToken;
+                paymentToken = _ref4.paymentToken;
                 params = {
                   paymentFactors: {
                     instPaymentToken: paymentToken
                   },
                   paymentSessionData: _this._sessionData
                 };
-                _context2.t0 = submitPayInfo;
-                _context2.t1 = params;
-                _context2.t2 = _this._options.environment;
-                _context2.next = 7;
-                return BusManager.publishForResult(new BusMessage(SecuritySDKActionEnum.getSecurityDeviceId));
+                _context3.t0 = submitPayInfo;
+                _context3.t1 = params;
+                _context3.t2 = _this._options.environment;
+                _context3.next = 7;
+                return getDeviceId();
               case 7:
-                _context2.t4 = _yield$BusManager$pub2 = _context2.sent;
-                _context2.t3 = _context2.t4 === null;
-                if (_context2.t3) {
-                  _context2.next = 11;
-                  break;
-                }
-                _context2.t3 = _yield$BusManager$pub2 === void 0;
-              case 11:
-                if (!_context2.t3) {
-                  _context2.next = 15;
-                  break;
-                }
-                _context2.t5 = void 0;
-                _context2.next = 16;
-                break;
-              case 15:
-                _context2.t5 = _yield$BusManager$pub2.getData();
-              case 16:
-                _context2.t6 = _context2.t5;
-                _context2.t7 = {
-                  deviceId: _context2.t6
+                _context3.t3 = _context3.sent;
+                _context3.t4 = {
+                  deviceId: _context3.t3
                 };
-                _context2.t8 = {
-                  env: _context2.t2,
-                  envInfo: _context2.t7
+                _context3.t5 = {
+                  env: _context3.t2,
+                  envInfo: _context3.t4
                 };
-                _context2.t9 = _this.logger;
-                return _context2.abrupt("return", (0, _context2.t0)(_context2.t1, _context2.t8, _context2.t9).then(function (res) {
+                _context3.t6 = _this.logger;
+                return _context3.abrupt("return", (0, _context3.t0)(_context3.t1, _context3.t5, _context3.t6).then(function (res) {
                   _this.logger.logInfo({
                     name: 'APPLE_PAY',
                     title: 'submitPayStatus',
@@ -268,14 +272,14 @@ var ApplePayComponent = /*#__PURE__*/function () {
                 }).catch(function (error) {
                   return Promise.reject(error);
                 }));
-              case 21:
+              case 12:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
-          }, _callee2);
+          }, _callee3);
         }));
         return function completePaymentAuthorized(_x2) {
-          return _ref4.apply(this, arguments);
+          return _ref5.apply(this, arguments);
         };
       }();
       var completeApplePay = function completeApplePay(data) {

package/esm/plugin/component/index.js

@@ -17,7 +17,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * 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 @typescript-eslint/no-explicit-any */
-import { SecurityBusSubscriber } from "../../core/bus/ability/security";
 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, POPUP_LOADTIME_LOG_LIMIT, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT } from "../../constant";
 import { queryPaymentInfo, submitPayInfo } from "../../service";
 import { componentSignEnum, eventCodeEnum, messageName, platformEnum, productSceneEnum, RedirectType, renderDisplayTypeEnum, targetEnum } from "../../types";
@@ -27,7 +26,6 @@ import { createIframe, createPreloadIframe, getAppDomain, getIframeUrl } from ".
 import { addInlineLoading, createInlineBaseElement } from "./component.inline.style";
 import { addPopupLoading, createBaseElement, createMockup, createRetentionPopup, handleDeclareInfo as _handleDeclareInfo, hideRetentionPopup, removeRetentionPopup as _removeRetentionPopup } from "./component.popup.style";
 import { createModal, destroyModal, insertStyleSheet } from "./popupWindow.style";
-import { BusManager } from "../../core/bus";
 window.changingPageHeight = window.innerHeight;
 var ComponentApp = /*#__PURE__*/function () {
   function ComponentApp() {
@@ -73,7 +71,6 @@ var ComponentApp = /*#__PURE__*/function () {
       value: Date.now()
     });
     this._globalData = new Map();
-    BusManager.subscribe(new SecurityBusSubscriber(this.getDeviceIdAndLog));
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1710212811-dev.14",
+  "version": "0.0.1710212811-dev.17",
   "description": "",
   "author": "",
   "main": "esm/index.js",