@alipay/ams-checkout 0.0.1710212811-dev.11 → 0.0.1710212811-dev.12

package/esm/core/bus/ability/security.d.ts

@@ -1,6 +1,6 @@
 import { DeviceIdParameter } from '../../../types';
 import { BusContext, BusMessage, BusSubscriber } from '../index';
-export type onDeviceIdCallback = (deviceIdParameter: DeviceIdParameter, isPolling: boolean) => Promise<string>;
+export type onDeviceIdCallback = (deviceIdParameter?: DeviceIdParameter, isPolling?: boolean) => Promise<string>;
 export declare class SecurityBusSubscriber extends BusSubscriber {
     private _onDeviceIdCallback?;
     constructor(onDeviceIdCallback?: onDeviceIdCallback);

package/esm/core/bus/ability/security.js

@@ -37,38 +37,51 @@ export var SecurityBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
     key: "getSecurityDeviceId",
     value: function () {
       var _getSecurityDeviceId = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(context, message) {
-        var data, deviceId;
+        var data, deviceId, _deviceId;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               console.log('getSecurityDeviceId', message);
               if (!this._onDeviceIdCallback) {
-                _context.next = 15;
+                _context.next = 22;
                 break;
               }
               data = message.getJSONObject();
               _context.prev = 3;
-              _context.next = 6;
-              return this._onDeviceIdCallback(data === null || data === void 0 ? void 0 : data.deviceIdParameter, data === null || data === void 0 ? void 0 : data.isPolling);
-            case 6:
+              if (!(data !== null && data !== void 0 && data.deviceIdParameter)) {
+                _context.next = 11;
+                break;
+              }
+              _context.next = 7;
+              return this._onDeviceIdCallback(data === null || data === void 0 ? void 0 : data.deviceIdParameter, true === (data === null || data === void 0 ? void 0 : data.isPolling));
+            case 7:
               deviceId = _context.sent;
               context === null || context === void 0 || context.onCallBack(message.result(deviceId));
+              _context.next = 15;
+              break;
+            case 11:
               _context.next = 13;
+              return this._onDeviceIdCallback();
+            case 13:
+              _deviceId = _context.sent;
+              context === null || context === void 0 || context.onCallBack(message.result(_deviceId));
+            case 15:
+              _context.next = 20;
               break;
-            case 10:
-              _context.prev = 10;
+            case 17:
+              _context.prev = 17;
               _context.t0 = _context["catch"](3);
-              context === null || context === void 0 || context.onCallBack(message.result());
-            case 13:
-              _context.next = 16;
+              context === null || context === void 0 || context.onCallBack(message.result(""));
+            case 20:
+              _context.next = 23;
               break;
-            case 15:
-              context === null || context === void 0 || context.onCallBack(message.result());
-            case 16:
+            case 22:
+              context === null || context === void 0 || context.onCallBack(message.result(""));
+            case 23:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[3, 10]]);
+        }, _callee, this, [[3, 17]]);
       }));
       function getSecurityDeviceId(_x, _x2) {
         return _getSecurityDeviceId.apply(this, arguments);

package/esm/core/bus/index.js

@@ -160,7 +160,13 @@ export var BusManager = /*#__PURE__*/function () {
   }, {
     key: "publish",
     value: function publish(message, callback) {
-      var context = new BusContext(callback);
+      var _callBack = function _callBack(result) {
+        BusManager.traceLog(BusManager, 'publish result  ' + (message === null || message === void 0 ? void 0 : message.getAction()), result === null || result === void 0 ? void 0 : result.getData());
+        if (callback) {
+          callback(result);
+        }
+      };
+      var context = new BusContext(_callBack);
       var actionName = message.getAction();
       var subscribers = BusManager.subscribersMap.get(actionName);
       BusManager.traceLog(BusManager, 'publish', message);

package/esm/core/component/index.d.ts

@@ -21,7 +21,7 @@ export declare class AMSComponent extends CoreInstance {
      * @param params - The data source created by the component, necessary sessionData, optional appearance configuration, and refer to the documentation for other parameters and detailed information.
      */
     createComponent(params: IcreateComponent): Promise<void>;
-    isApplePay(paymentSessionData: string): boolean;
+    private isApplePay;
     preloadComponent(channelType: any, productSceneVersion: any): void;
     clearPreloadIframe(isTimeOut?: boolean): void;
     /**

package/esm/core/component/index.js

@@ -291,13 +291,12 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
   }, {
     key: "isApplePay",
     value: function isApplePay(paymentSessionData) {
-      var _parseData$paymentSes2;
+      var _parseData$paymentSes2, _parseData$paymentSes3;
       var _parseSessionData3 = parseSessionData(paymentSessionData),
         _parseSessionData4 = _slicedToArray(_parseSessionData3, 2),
         parseData = _parseSessionData4[0],
         sessionData = _parseSessionData4[1];
-      // todo 补充全量判断
-      return sessionData && (parseData === null || parseData === void 0 || (_parseData$paymentSes2 = parseData.paymentSessionFactor) === null || _parseData$paymentSes2 === void 0 || (_parseData$paymentSes2 = _parseData$paymentSes2.paymentMethodInfo) === null || _parseData$paymentSes2 === void 0 ? void 0 : _parseData$paymentSes2.paymentMethodType) === "CARD_APPLE_PAY";
+      return sessionData && (parseData === null || parseData === void 0 || (_parseData$paymentSes2 = parseData.paymentSessionConfig) === null || _parseData$paymentSes2 === void 0 ? void 0 : _parseData$paymentSes2.productScene) === productSceneEnum.CASHIER_PAYMENT && (parseData === null || parseData === void 0 || (_parseData$paymentSes3 = parseData.paymentSessionFactor) === null || _parseData$paymentSes3 === void 0 || (_parseData$paymentSes3 = _parseData$paymentSes3.paymentMethodInfo) === null || _parseData$paymentSes3 === void 0 ? void 0 : _parseData$paymentSes3.paymentMethodType) === "CARD_APPLE_PAY";
     }
   }, {
     key: "preloadComponent",

package/esm/plugin/applepay/component.js

@@ -132,6 +132,7 @@ var ApplePayComponent = /*#__PURE__*/function () {
        */
       var getMerchantSession = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+          var _yield$BusManager$pub;
           var validationUrl, requestParams;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
@@ -149,16 +150,34 @@ var ApplePayComponent = /*#__PURE__*/function () {
                 _context.next = 8;
                 return BusManager.publishForResult(new BusMessage(SecuritySDKActionEnum.getSecurityDeviceId));
               case 8:
-                _context.t4 = _context.sent;
-                _context.t5 = {
-                  deviceId: _context.t4
+                _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
                 };
-                _context.t6 = {
+                _context.t9 = {
                   env: _context.t3,
-                  envInfo: _context.t5
+                  envInfo: _context.t8
                 };
-                _context.t7 = _this.logger;
-                return _context.abrupt("return", (0, _context.t0)(_context.t1, _context.t2, _context.t6, _context.t7).then(function (res) {
+                _context.t10 = _this.logger;
+                return _context.abrupt("return", (0, _context.t0)(_context.t1, _context.t2, _context.t9, _context.t10).then(function (res) {
                   if (res !== null && res !== void 0 && res.success && res.merchantSessionObject) {
                     return Promise.resolve(res.merchantSessionObject);
                   }
@@ -169,7 +188,7 @@ var ApplePayComponent = /*#__PURE__*/function () {
                 }).catch(function (error) {
                   return Promise.reject(error);
                 }));
-              case 13:
+              case 22:
               case "end":
                 return _context.stop();
             }
@@ -186,6 +205,7 @@ var ApplePayComponent = /*#__PURE__*/function () {
        */
       var completePaymentAuthorized = /*#__PURE__*/function () {
         var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
+          var _yield$BusManager$pub2;
           var paymentToken, params;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
@@ -203,16 +223,34 @@ var ApplePayComponent = /*#__PURE__*/function () {
                 _context2.next = 7;
                 return BusManager.publishForResult(new BusMessage(SecuritySDKActionEnum.getSecurityDeviceId));
               case 7:
-                _context2.t3 = _context2.sent;
-                _context2.t4 = {
-                  deviceId: _context2.t3
+                _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
                 };
-                _context2.t5 = {
+                _context2.t8 = {
                   env: _context2.t2,
-                  envInfo: _context2.t4
+                  envInfo: _context2.t7
                 };
-                _context2.t6 = _this.logger;
-                return _context2.abrupt("return", (0, _context2.t0)(_context2.t1, _context2.t5, _context2.t6).then(function (res) {
+                _context2.t9 = _this.logger;
+                return _context2.abrupt("return", (0, _context2.t0)(_context2.t1, _context2.t8, _context2.t9).then(function (res) {
                   _this.logger.logInfo({
                     name: 'APPLE_PAY',
                     title: 'submitPayStatus',
@@ -230,7 +268,7 @@ var ApplePayComponent = /*#__PURE__*/function () {
                 }).catch(function (error) {
                   return Promise.reject(error);
                 }));
-              case 12:
+              case 21:
               case "end":
                 return _context2.stop();
             }

package/esm/plugin/applepay/index.js

@@ -59,7 +59,6 @@ export var ApplePayBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
       var data = message.getJSONObject();
       console.log('onCreateComponent', message);
       this.applePay = new ApplePayComponent(_objectSpread(_objectSpread({}, data === null || data === void 0 ? void 0 : data.options), {}, {
-        // todo 需要补充其它参数的桥接
         onEventCallback: function onEventCallback(state) {
           console.log('onCreateComponent#onEventCallback', state);
           if (state) {

package/package.json

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