@alipay/ams-checkout 0.0.1710212811-dev.30 → 0.0.1710212811-dev.32

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

@@ -1,3 +1,58 @@
+import { Logger } from "../../util/logger";
+/**
+ *  公用字段：
+ * publish_v: string 发送者版本
+ * base_v: string 基础包版本
+ */
+export declare enum BusLogEventEnum {
+    /**
+     * 发送消息
+     * action：string
+     * sub: bool 是否订阅
+     */
+    sdk_event_busPublishMessage = "sdk_event_busPublishMessage",
+    /**
+     * 发送消息时，返回事件结果(Web)
+     * action：string
+     */
+    sdk_event_busPublishCallback = "sdk_event_busPublishCallback",
+    /**
+     * 查询是否订阅
+     * action：string
+     * sub: bool
+     */
+    sdk_event_busIsSubscribe = "sdk_event_busIsSubscribe",
+    /**
+     * 订阅协议
+     * actions: string[] , 用逗号拼接
+     */
+    sdk_event_busSubscribe = "sdk_event_busSubscribe",
+    /**
+     * 退订协议
+     * actions: string[] , 用逗号拼接
+     */
+    sdk_event_busUnsubscribe = "sdk_event_busUnsubscribe",
+    /**
+     * 清除缓存（Web/Android）
+     */
+    sdk_event_busClear = "sdk_event_busClear",
+    /**
+     * 添加拦截器（Web/Android）
+     */
+    sdk_event_busAddInterceptor = "sdk_event_busAddInterceptor",
+    /**
+     * 发送消息时，对应aciton未订阅
+     */
+    sdk_error_busPublishUnsubscribeError = "sdk_error_busPublishUnsubscribeError",
+    /**
+     * 发送消息时异常
+     */
+    sdk_error_busPublishError = "sdk_error_busPublishError",
+    /**
+     * 发送消息无结果(Web)
+     */
+    sdk_error_busPublishNoResult = "sdk_error_busPublishNoResult"
+}
 /**
  * 扩展协议可序列化的消息定义
  */
@@ -56,7 +111,8 @@ export declare class BusManager {
     private static interceptors;
     private static subscribersMap;
     private static isDebug;
-    static debugTrace(enable: boolean): void;
+    private static logger;
+    static debugTrace(enable: boolean, logger: Logger): void;
     private static traceLog;
     private static traceError;
     static clear(): void;

package/esm/core/bus/index.js

@@ -2,12 +2,33 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function (_e) { function e(_x) { return _e.apply(this, arguments); } e.toString = function () { return _e.toString(); }; return e; }(function (e) { throw e; }), f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function (_e2) { function e(_x2) { return _e2.apply(this, arguments); } e.toString = function () { return _e2.toString(); }; return e; }(function (e) { didErr = true; err = e; }), f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/**
+ *  公用字段：
+ * publish_v: string 发送者版本
+ * base_v: string 基础包版本
+ */
+export var BusLogEventEnum = /*#__PURE__*/function (BusLogEventEnum) {
+  BusLogEventEnum["sdk_event_busPublishMessage"] = "sdk_event_busPublishMessage";
+  BusLogEventEnum["sdk_event_busPublishCallback"] = "sdk_event_busPublishCallback";
+  BusLogEventEnum["sdk_event_busIsSubscribe"] = "sdk_event_busIsSubscribe";
+  BusLogEventEnum["sdk_event_busSubscribe"] = "sdk_event_busSubscribe";
+  BusLogEventEnum["sdk_event_busUnsubscribe"] = "sdk_event_busUnsubscribe";
+  BusLogEventEnum["sdk_event_busClear"] = "sdk_event_busClear";
+  BusLogEventEnum["sdk_event_busAddInterceptor"] = "sdk_event_busAddInterceptor";
+  BusLogEventEnum["sdk_error_busPublishUnsubscribeError"] = "sdk_error_busPublishUnsubscribeError";
+  BusLogEventEnum["sdk_error_busPublishError"] = "sdk_error_busPublishError";
+  BusLogEventEnum["sdk_error_busPublishNoResult"] = "sdk_error_busPublishNoResult";
+  return BusLogEventEnum;
+}({});
+
 /**
  * 扩展协议可序列化的消息定义
  */
@@ -106,40 +127,50 @@ export var BusManager = /*#__PURE__*/function () {
   }
   _createClass(BusManager, null, [{
     key: "debugTrace",
-    value: function debugTrace(enable) {
+    value: function debugTrace(enable, logger) {
       this.isDebug = enable;
+      this.logger = logger;
     }
   }, {
     key: "traceLog",
-    value: function traceLog(message) {
+    value: function traceLog(title, optionalParams) {
+      var report = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
       if (this.isDebug) {
-        for (var _len = arguments.length, optionalParams = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-          optionalParams[_key - 1] = arguments[_key];
-        }
-        console.log([BusManager.TAG, message].concat(optionalParams).join(this._logSplit));
+        console.log([BusManager.TAG, title].concat(optionalParams).join(this._logSplit));
+      }
+      if (report && this.logger) {
+        this.logger.logInfo({
+          title: title
+        }, _objectSpread({
+          biz: 'sdk'
+        }, optionalParams)).send();
       }
     }
   }, {
     key: "traceError",
-    value: function traceError(message) {
+    value: function traceError(title, optionalParams) {
       if (this.isDebug) {
-        for (var _len2 = arguments.length, optionalParams = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-          optionalParams[_key2 - 1] = arguments[_key2];
-        }
-        console.error([BusManager.TAG, message].concat(optionalParams).join(this._logSplit));
+        console.error([BusManager.TAG, title].concat(optionalParams).join(this._logSplit));
+      }
+      if (this.logger) {
+        this.logger.logError({
+          title: title
+        }, _objectSpread({
+          biz: 'sdk'
+        }, optionalParams)).send();
       }
     }
   }, {
     key: "clear",
     value: function clear() {
-      BusManager.traceLog('clear');
+      BusManager.traceLog(BusLogEventEnum.sdk_event_busClear);
       BusManager.interceptors.length = 0;
       BusManager.subscribersMap.clear();
     }
   }, {
     key: "addInterceptor",
     value: function addInterceptor(interceptor) {
-      BusManager.traceLog('addInterceptor');
+      BusManager.traceLog(BusLogEventEnum.sdk_event_busAddInterceptor);
       if (!BusManager.interceptors.includes(interceptor)) {
         BusManager.interceptors.push(interceptor);
       }
@@ -148,16 +179,23 @@ export var BusManager = /*#__PURE__*/function () {
     key: "publishForResult",
     value: function publishForResult(message, config) {
       var _this = this;
+      var failed = true;
       return new Promise(function (resolve, reject) {
         var _config$timeoutMs;
         _this.publish(message, function (result) {
+          failed = true;
           resolve(result);
         });
         setTimeout(function () {
-          if ((config === null || config === void 0 ? void 0 : config.fallback) !== null) {
-            resolve(message.result(config === null || config === void 0 ? void 0 : config.fallback));
-          } else {
-            reject('publish timeout');
+          if (failed) {
+            BusManager.traceError(BusLogEventEnum.sdk_error_busPublishNoResult, {
+              action: message.getAction()
+            });
+            if ((config === null || config === void 0 ? void 0 : config.fallback) !== null) {
+              resolve(message.result(config === null || config === void 0 ? void 0 : config.fallback));
+            } else {
+              reject('publish timeout');
+            }
           }
         }, (_config$timeoutMs = config === null || config === void 0 ? void 0 : config.timeoutMs) !== null && _config$timeoutMs !== void 0 ? _config$timeoutMs : 2000);
       });
@@ -166,7 +204,9 @@ export var BusManager = /*#__PURE__*/function () {
     key: "publish",
     value: function publish(message, callback) {
       var _callBack = function _callBack(result) {
-        BusManager.traceLog('publish result  ' + (message === null || message === void 0 ? void 0 : message.getAction()), result === null || result === void 0 ? void 0 : result.getData());
+        BusManager.traceLog(BusLogEventEnum.sdk_event_busPublishCallback, {
+          action: message.getAction()
+        });
         if (callback) {
           callback(result);
         }
@@ -174,7 +214,9 @@ export var BusManager = /*#__PURE__*/function () {
       var context = new BusContext(_callBack);
       var actionName = message.getAction();
       var subscribers = BusManager.subscribersMap.get(actionName);
-      BusManager.traceLog('publish', JSON.stringify(message));
+      BusManager.traceLog(BusLogEventEnum.sdk_event_busPublishMessage, {
+        action: message.getAction()
+      });
       if (subscribers) {
         var _iterator = _createForOfIteratorHelper(subscribers),
           _step;
@@ -184,7 +226,10 @@ export var BusManager = /*#__PURE__*/function () {
             try {
               subscriber.onMessage(context, message);
             } catch (e) {
-              BusManager.traceError('excute onMessage error ', message, e);
+              BusManager.traceError(BusLogEventEnum.sdk_error_busPublishError, {
+                action: message.getAction(),
+                error: e
+              });
               var _iterator2 = _createForOfIteratorHelper(BusManager.interceptors),
                 _step2;
               try {
@@ -222,14 +267,18 @@ export var BusManager = /*#__PURE__*/function () {
         if (handle) {
           BusManager.publish(message, callback); // Re-publish the message
         } else {
-          BusManager.traceError('notSubscribeMessage', JSON.stringify(message));
+          BusManager.traceError(BusLogEventEnum.sdk_error_busPublishUnsubscribeError, {
+            action: message.getAction()
+          });
         }
       }
     }
   }, {
     key: "subscribe",
     value: function subscribe(subscriber) {
-      BusManager.traceLog('subscribe', subscriber === null || subscriber === void 0 ? void 0 : subscriber.actionNames());
+      BusManager.traceLog(BusLogEventEnum.sdk_event_busSubscribe, {
+        actions: subscriber === null || subscriber === void 0 ? void 0 : subscriber.actionNames()
+      });
       var _iterator4 = _createForOfIteratorHelper(subscriber.actionNames()),
         _step4;
       try {
@@ -252,7 +301,9 @@ export var BusManager = /*#__PURE__*/function () {
   }, {
     key: "unsubscribe",
     value: function unsubscribe(subscriber) {
-      BusManager.traceLog('unsubscribe', subscriber === null || subscriber === void 0 ? void 0 : subscriber.actionNames());
+      BusManager.traceLog(BusLogEventEnum.sdk_event_busUnsubscribe, {
+        actions: subscriber === null || subscriber === void 0 ? void 0 : subscriber.actionNames()
+      });
       var _iterator5 = _createForOfIteratorHelper(subscriber.actionNames()),
         _step5;
       try {
@@ -277,7 +328,10 @@ export var BusManager = /*#__PURE__*/function () {
     value: function isSubscribed(actionName) {
       var subscribers = BusManager.subscribersMap.get(actionName);
       if (subscribers && subscribers.length > 0) {
-        BusManager.traceLog('isSubscribed: ' + actionName, true);
+        BusManager.traceLog(BusLogEventEnum.sdk_event_busIsSubscribe, {
+          action: actionName,
+          sub: true
+        });
         return true;
       }
       var handle = false;
@@ -294,9 +348,13 @@ export var BusManager = /*#__PURE__*/function () {
         _iterator6.f();
       }
       if (handle) {
+        // 内部会上报
         return BusManager.subscribersMap.has(actionName);
       }
-      BusManager.traceLog('isSubscribed: ' + actionName, false);
+      BusManager.traceLog(BusLogEventEnum.sdk_event_busIsSubscribe, {
+        action: actionName,
+        sub: false
+      });
       return false;
     }
   }]);
@@ -306,4 +364,5 @@ _defineProperty(BusManager, "TAG", 'BusManager');
 _defineProperty(BusManager, "_logSplit", ' , ');
 _defineProperty(BusManager, "interceptors", []);
 _defineProperty(BusManager, "subscribersMap", new Map());
-_defineProperty(BusManager, "isDebug", true);
+_defineProperty(BusManager, "isDebug", true);
+_defineProperty(BusManager, "logger", void 0);

package/esm/core/component/index.js

@@ -206,7 +206,7 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
     value: function registerBusAbility() {
       var _this$originOptions,
         _this2 = this;
-      BusManager.debugTrace(((_this$originOptions = this.originOptions) === null || _this$originOptions === void 0 ? void 0 : _this$originOptions.environment) !== environmentEnum.prod);
+      BusManager.debugTrace(((_this$originOptions = this.originOptions) === null || _this$originOptions === void 0 ? void 0 : _this$originOptions.environment) !== environmentEnum.prod, this.logger);
       BusManager.clear();
       BusManager.addInterceptor({
         onPublishException: function onPublishException(message, e) {

package/esm/plugin/applepay/component.d.ts

@@ -7,6 +7,15 @@
  */
 import { ApplePaySubTypeEnum, IAppendParams, IApplePayOptionsParams } from '../../types';
 import { Logger } from '../../util/logger';
+export declare enum ApplePayComponentEvent {
+    sdk_event_appleAvailable = "sdk_event_appleAvailable",
+    sdk_event_appleCreateComponent = "sdk_event_appleCreateComponent",
+    sdk_event_appleShowPaymentSheet = "sdk_event_appleShowPaymentSheet",
+    sdk_event_appleOnvalidatemerchant = "sdk_event_appleOnvalidatemerchant",
+    sdk_event_appleSubmitToken = "sdk_event_appleSubmitToken",
+    sdk_event_applePaymentResult = "sdk_event_applePaymentResult",
+    sdk_event_appleDestoryComponent = "sdk_event_appleDestoryComponent"
+}
 /**
  * Apple pay Component
  */
@@ -16,7 +25,8 @@ declare class ApplePayComponent {
     private _sessionData;
     private _isFinish;
     private _options;
-    logger: Logger;
+    private logger;
+    private isRecurring;
     constructor(options: IApplePayOptionsParams, logger: Logger);
     /**
      * Is Apple Pay Enabled

package/esm/plugin/applepay/component.js

@@ -20,6 +20,17 @@ import ApplePayService from "./service";
 import { getApplePayPaymentSession, submitPayInfo } from "../../service";
 import { BusManager, BusMessage } from "../../core/bus";
 import { SecuritySDKActionEnum } from "../../core/bus/interface";
+export var ApplePayComponentEvent = /*#__PURE__*/function (ApplePayComponentEvent) {
+  ApplePayComponentEvent["sdk_event_appleAvailable"] = "sdk_event_appleAvailable";
+  ApplePayComponentEvent["sdk_event_appleCreateComponent"] = "sdk_event_appleCreateComponent";
+  ApplePayComponentEvent["sdk_event_appleShowPaymentSheet"] = "sdk_event_appleShowPaymentSheet";
+  ApplePayComponentEvent["sdk_event_appleOnvalidatemerchant"] = "sdk_event_appleOnvalidatemerchant";
+  ApplePayComponentEvent["sdk_event_appleSubmitToken"] = "sdk_event_appleSubmitToken";
+  ApplePayComponentEvent["sdk_event_applePaymentResult"] = "sdk_event_applePaymentResult";
+  ApplePayComponentEvent["sdk_event_appleDestoryComponent"] = "sdk_event_appleDestoryComponent";
+  return ApplePayComponentEvent;
+}({});
+
 /**
  * Apple pay Component
  */
@@ -32,13 +43,14 @@ var ApplePayComponent = /*#__PURE__*/function () {
     _defineProperty(this, "_isFinish", false);
     _defineProperty(this, "_options", void 0);
     _defineProperty(this, "logger", void 0);
+    _defineProperty(this, "isRecurring", false);
     this.logger = logger;
     this._options = Object.assign({
       environment: environmentEnum.prod
     }, options, {
       product: productSceneEnum.CARD_APPLE_PAY
     });
-    this._applePayService = new ApplePayService();
+    this._applePayService = new ApplePayService(logger);
   }
 
   /**
@@ -65,7 +77,19 @@ var ApplePayComponent = /*#__PURE__*/function () {
   }, {
     key: "onEventCallback",
     value: function onEventCallback(state) {
-      var _this$_options;
+      var _state$result, _state$result2, _this$_options;
+      this.logger.logInfo({
+        name: 'APPLE_PAY',
+        title: ApplePayComponentEvent.sdk_event_applePaymentResult
+      }, {
+        biz: 'sdk',
+        type: 'funnel',
+        success: eventCodeEnum.SDK_PAYMENT_FAIL === (state === null || state === void 0 ? void 0 : state.code),
+        code: state === null || state === void 0 ? void 0 : state.code,
+        errorCode: state === null || state === void 0 || (_state$result = state.result) === null || _state$result === void 0 ? void 0 : _state$result.errorCode,
+        errorMessage: state === null || state === void 0 || (_state$result2 = state.result) === null || _state$result2 === void 0 ? void 0 : _state$result2.errorMessage,
+        recurring: this.isRecurring
+      }).send();
       (_this$_options = this._options) === null || _this$_options === void 0 || _this$_options.onEventCallback(state);
     }
 
@@ -78,6 +102,7 @@ var ApplePayComponent = /*#__PURE__*/function () {
     value: function submitPay(appendParams) {
       var _appendParams$iframeN,
         _appendParams$iframeN2,
+        _this$_parseData,
         _this = this;
       this._isFinish = false;
       this._parseData = appendParams === null || appendParams === void 0 || (_appendParams$iframeN = appendParams.iframeNodesParams) === null || _appendParams$iframeN === void 0 ? void 0 : _appendParams$iframeN.paymentSessionMetaData;
@@ -85,28 +110,29 @@ var ApplePayComponent = /*#__PURE__*/function () {
       if (!this._parseData || !this._sessionData) {
         this.onEventCallback({
           code: eventCodeEnum.SDK_PAYMENT_FAIL,
-          message: 'Abnormal response data is null'
+          message: 'Abnormal params paymentSessionData'
         });
         this.logger.logError({
           name: 'APPLE_PAY',
           title: 'sessionDataNull',
-          msg: 'Abnormal response data is null'
+          msg: 'Abnormal paymentSessionData'
         }, {
           type: 'error',
           biz: 'sdk'
         }).send();
         return;
       }
+      this.isRecurring = ((_this$_parseData = this._parseData) === null || _this$_parseData === void 0 || (_this$_parseData = _this$_parseData.paymentSessionFactor) === null || _this$_parseData === void 0 ? void 0 : _this$_parseData.recurringInfo) !== null;
       var getDeviceId = /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var _yield$BusManager$pub, _this$_parseData;
+          var _yield$BusManager$pub, _this$_parseData2;
           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
+                    productScene: (_this$_parseData2 = _this._parseData) === null || _this$_parseData2 === void 0 || (_this$_parseData2 = _this$_parseData2.paymentSessionConfig) === null || _this$_parseData2 === void 0 ? void 0 : _this$_parseData2.productScene
                   }
                 })), {
                   fallback: ""
@@ -259,18 +285,20 @@ var ApplePayComponent = /*#__PURE__*/function () {
         var _data$actionForm;
         _this._isFinish = true;
         _this.onEventCallback({
-          code: eventCodeEnum.SDK_PAYMENT_FINISH,
+          code: eventCodeEnum.SDK_PAYMENT_SUCCESSFUL,
+          message: 'Payment successful',
           result: {
             redirectUrl: (data === null || data === void 0 || (_data$actionForm = data.actionForm) === null || _data$actionForm === void 0 ? void 0 : _data$actionForm.redirectUrl) || ''
           }
         });
       };
-      var logError = function logError(msg, error) {
+      var logError = function logError(code, msg, error) {
         // log error
         _this.logger.logError({
           name: 'APPLE_PAY',
           title: msg,
           label: msg,
+          code: code,
           msg: error
         }, {
           type: 'error',
@@ -280,32 +308,24 @@ var ApplePayComponent = /*#__PURE__*/function () {
           return;
         }
         _this._isFinish = true;
-        if (msg === 'UserCancel') {
+        if (error !== null && error !== void 0 && error.errorCode) {
           _this.onEventCallback({
-            code: eventCodeEnum.SDK_PAYMENT_CANCEL
+            code: code,
+            message: msg,
+            result: {
+              errorCode: error === null || error === void 0 ? void 0 : error.errorCode,
+              errorMessage: error === null || error === void 0 ? void 0 : error.errorMessage
+            }
           });
         } else {
           _this.onEventCallback({
-            code: eventCodeEnum.SDK_PAYMENT_FAIL,
-            result: {
-              errorMsg: msg
-            }
+            code: code,
+            message: msg
           });
         }
       };
-      var applePayTrace = function applePayTrace(msg) {
-        // set log funnel
-        _this.logger.logInfo({
-          name: 'APPLE_PAY',
-          title: msg,
-          label: msg
-        }, {
-          type: 'funnel',
-          biz: 'sdk'
-        }).send();
-      };
       // set Apple Pay params
-      this._applePayService.setApplePayParams(getMerchantSession, completePaymentAuthorized, completeApplePay, logError, applePayTrace);
+      this._applePayService.setApplePayParams(getMerchantSession, completePaymentAuthorized, completeApplePay, logError);
       // init Apple Pay service
       try {
         this._applePayService.startPay(this._parseData);

package/esm/plugin/applepay/index.js

@@ -16,7 +16,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { BusManager, BusMessage, BusSubscriber } from "../../core/bus";
 import { ApplePayActionEnum, PaymentActionEnum, SDKCallbackActionEnum } from "../../core/bus/interface";
-import ApplePayComponent from "./component";
+import ApplePayComponent, { ApplePayComponentEvent } from "./component";
 import ApplePayService from "./service";
 export var ApplePayInitMessage = /*#__PURE__*/_createClass(function ApplePayInitMessage() {
   _classCallCheck(this, ApplePayInitMessage);
@@ -50,8 +50,18 @@ export var ApplePayBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
     value: function onCanMakePayments(context, message) {
       var _message$getJSONObjec;
       console.log('onCanMakePayments', message.getData());
-      var canMakePayments = ApplePayService.canMakePayments((_message$getJSONObjec = message.getJSONObject()) === null || _message$getJSONObjec === void 0 ? void 0 : _message$getJSONObjec.subPaymentMethod);
+      var subPaymentMethod = (_message$getJSONObjec = message.getJSONObject()) === null || _message$getJSONObjec === void 0 ? void 0 : _message$getJSONObjec.subPaymentMethod;
+      var canMakePayments = ApplePayService.canMakePayments(subPaymentMethod);
       context === null || context === void 0 || context.onCallBack(message.result(canMakePayments));
+      this.logger.logInfo({
+        name: 'APPLE_PAY',
+        title: ApplePayComponentEvent.sdk_event_appleAvailable
+      }, {
+        biz: 'sdk',
+        type: 'funnel',
+        success: canMakePayments,
+        recurring: subPaymentMethod === 'ApplePayRecurringPayment'
+      }).send();
     }
   }, {
     key: "onCreateComponent",
@@ -74,6 +84,13 @@ export var ApplePayBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
     value: function onDestoryComponent(context, message) {
       this.applePay = null;
       console.log('onDestoryComponent', context, message);
+      this.logger.logInfo({
+        name: 'APPLE_PAY',
+        title: ApplePayComponentEvent.sdk_event_appleDestoryComponent
+      }, {
+        biz: 'sdk',
+        type: 'funnel'
+      }).send();
     }
   }, {
     key: "onMessage",

package/esm/plugin/applepay/interface.d.ts

@@ -158,6 +158,4 @@ export type ICompletePaymentAuthorized = (params: {
     paymentToken?: string;
 }) => Promise<any>;
 export type ICompleteApplePay = (data: any) => void;
-export type ILogError = (msg: string, error?: any) => void;
-export type traceMsg = 'start' | 'sessionBegin' | 'onValidateMerchant' | 'completeMerchantValidation' | 'onpaymentauthorized' | 'completePaymentAuthorized' | 'completeApplePay';
-export type IApplePayTrace = (msg: traceMsg) => void;
+export type ILogError = (code: string, msg: string, error?: any) => void;

package/esm/plugin/applepay/interface.js

@@ -66,8 +66,4 @@ export var APPLE_PAY_RECURRING_VERSION = 14;
 
 // ICompleteApplePay spi type
 
-// ILogError spi type
-
-// trace msg type
-
-// IApplePayTrace spi type
+// ILogError spi type

package/esm/plugin/applepay/service.d.ts

@@ -5,8 +5,9 @@
  * 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.
  */
-import { IGetMerchantSession, ICompletePaymentAuthorized, ICompleteApplePay, ILogError, IApplePayTrace } from './interface';
+import { IGetMerchantSession, ICompletePaymentAuthorized, ICompleteApplePay, ILogError } from './interface';
 import { ApplePaySubTypeEnum, IpaymentSessionMetaData } from '../../types';
+import { Logger } from '../../util/logger';
 /**
  * Apple Pay Service
  */
@@ -14,12 +15,14 @@ declare class ApplePayService {
     private merchantIdentifier;
     private merchantName;
     private session;
+    private paymentState;
     private getMerchantSession;
     private completePaymentAuthorized;
     private completeApplePay;
     private logError;
-    private applePayTrace;
-    constructor();
+    private isRecurring;
+    private logger;
+    constructor(logger: Logger);
     /**
      * set Apple Pay Params
      * @param getMerchantSession
@@ -28,7 +31,7 @@ declare class ApplePayService {
      * @param logError
      * @param applePayTrace
      */
-    setApplePayParams(getMerchantSession: IGetMerchantSession, completePaymentAuthorized: ICompletePaymentAuthorized, completeApplePay: ICompleteApplePay, logError: ILogError, applePayTrace: IApplePayTrace): void;
+    setApplePayParams(getMerchantSession: IGetMerchantSession, completePaymentAuthorized: ICompletePaymentAuthorized, completeApplePay: ICompleteApplePay, logError: ILogError): void;
     /**
      * Is Apple Pay Enabled
      * @param subTypeEnum
@@ -41,6 +44,7 @@ declare class ApplePayService {
      */
     hasActiveCard(merchantIdentifier: string): Promise<boolean>;
     private onvalidatemerchant;
+    private sessionAbort;
     private onpaymentauthorized;
     /**
      * Start Pay