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

package/esm/plugin/applepay/service.js

@@ -17,23 +17,34 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { APPLE_PAY_VERSION, APPLE_PAY_RECURRING_VERSION } from "./interface";
+import { eventCodeEnum } from "../../types";
+import { ApplePayComponentEvent } from "./component";
+var PaymentState = /*#__PURE__*/function (PaymentState) {
+  PaymentState[PaymentState["notStarted"] = 0] = "notStarted";
+  PaymentState[PaymentState["pending"] = 1] = "pending";
+  PaymentState[PaymentState["fail"] = 2] = "fail";
+  PaymentState[PaymentState["success"] = 3] = "success";
+  return PaymentState;
+}(PaymentState || {});
 /**
  * Apple Pay Service
  */
 var ApplePayService = /*#__PURE__*/function () {
-  function ApplePayService() {
+  function ApplePayService(logger) {
     var _this = this;
     _classCallCheck(this, ApplePayService);
     _defineProperty(this, "merchantIdentifier", void 0);
     _defineProperty(this, "merchantName", void 0);
     _defineProperty(this, "session", void 0);
+    _defineProperty(this, "paymentState", void 0);
     _defineProperty(this, "getMerchantSession", void 0);
     _defineProperty(this, "completePaymentAuthorized", void 0);
     _defineProperty(this, "completeApplePay", void 0);
     _defineProperty(this, "logError", void 0);
-    _defineProperty(this, "applePayTrace", void 0);
+    _defineProperty(this, "isRecurring", false);
+    _defineProperty(this, "logger", void 0);
     _defineProperty(this, "onvalidatemerchant", function (event) {
-      _this.applePayTrace('onValidateMerchant');
+      var success = false;
       _this.getMerchantSession({
         displayName: _this.merchantName,
         merchantIdentifier: _this.merchantIdentifier,
@@ -42,47 +53,61 @@ var ApplePayService = /*#__PURE__*/function () {
         console.log("onvalidatemerchant#merchantSessionObjectString", merchantSessionObjectString);
         var merchantSessionObject = JSON.parse(merchantSessionObjectString);
         _this.session.completeMerchantValidation(merchantSessionObject);
-        _this.applePayTrace('completeMerchantValidation');
+        success = true;
       }).catch(function (error) {
-        _this.logError('MerchantValidationError', error);
-        _this.session.abort();
+        _this.logError(eventCodeEnum.SDK_PAYMENT_FAIL, 'MerchantValidationError', error);
+        _this.sessionAbort();
       });
+      _this.logger.logInfo({
+        name: 'APPLE_PAY',
+        title: ApplePayComponentEvent.sdk_event_appleCreateComponent
+      }, {
+        biz: 'sdk',
+        type: 'funnel',
+        success: success,
+        recurring: _this.isRecurring
+      }).send();
     });
     _defineProperty(this, "onpaymentauthorized", function (event) {
       var _event$payment;
-      _this.applePayTrace('onpaymentauthorized');
       var _window = window,
         ApplePaySession = _window.ApplePaySession;
+      var success = false;
       var exception = function exception(error) {
         _this.session.completePayment(ApplePaySession.STATUS_FAILURE);
-        _this.logError('PaymentAuthorizedError', error);
-        _this.session.abort();
+        _this.logError(eventCodeEnum.SDK_PAYMENT_FAIL, 'PaymentAuthorizedError', error);
+        _this.sessionAbort();
       };
       if (event !== null && event !== void 0 && (_event$payment = event.payment) !== null && _event$payment !== void 0 && _event$payment.token) {
-        _this.applePayTrace('completePaymentAuthorized');
+        _this.paymentState = PaymentState.pending;
         _this.completePaymentAuthorized({
           paymentToken: JSON.stringify(event.payment.token)
         }).then(function (data) {
-          _this.applePayTrace('completeApplePay');
           _this.session.completePayment(ApplePaySession.STATUS_SUCCESS);
           _this.completeApplePay(data);
+          _this.paymentState = PaymentState.success;
+          success = true;
         }).catch(function (error) {
           exception(error);
+          _this.paymentState = PaymentState.fail;
         });
       } else {
         exception();
       }
+      _this.logger.logInfo({
+        name: 'APPLE_PAY',
+        title: ApplePayComponentEvent.sdk_event_appleSubmitToken
+      }, {
+        biz: 'sdk',
+        type: 'funnel',
+        success: success,
+        recurring: _this.isRecurring
+      }).send();
     });
     /**
      * Start Pay
      */
     _defineProperty(this, "startPay", function (param) {
-      _this.applePayTrace('start');
-      var _window2 = window,
-        ApplePaySession = _window2.ApplePaySession;
-      if (!ApplePaySession) {
-        throw Error('ApplePaySession is null in window');
-      }
       var paymentSessionFactor = param.paymentSessionFactor;
       var extendInfo = paymentSessionFactor.extendInfo,
         merchantInfo = paymentSessionFactor.merchantInfo,
@@ -90,14 +115,30 @@ var ApplePayService = /*#__PURE__*/function () {
         order = paymentSessionFactor.order,
         recurringInfo = paymentSessionFactor.recurringInfo;
       _this.merchantIdentifier = merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.partnerId;
+      var _window2 = window,
+        ApplePaySession = _window2.ApplePaySession;
+      _this.isRecurring = recurringInfo !== null;
+      _this.logger.logInfo({
+        name: 'APPLE_PAY',
+        title: ApplePayComponentEvent.sdk_event_appleCreateComponent
+      }, {
+        biz: 'sdk',
+        type: 'funnel',
+        success: ApplePaySession !== null,
+        recurring: _this.isRecurring
+      }).send();
+      if (!ApplePaySession) {
+        _this.logError(eventCodeEnum.SDK_PAYMENT_ERROR, "ApplePaySession is only support in Safari");
+        return;
+      }
       if (!(extendInfo !== null && extendInfo !== void 0 && extendInfo.merchantCapabilities) || !(extendInfo !== null && extendInfo !== void 0 && extendInfo.supportedNetworks) || !(merchantInfo !== null && merchantInfo !== void 0 && merchantInfo.registeredCountry) || !(paymentAmount !== null && paymentAmount !== void 0 && paymentAmount.currency) || !(paymentAmount !== null && paymentAmount !== void 0 && paymentAmount.value) || !(merchantInfo !== null && merchantInfo !== void 0 && merchantInfo.merchantName)) {
-        _this.logError("invalid session data");
+        _this.logError(eventCodeEnum.SDK_PAYMENT_ERROR, "Abnormal params paymentSessionFactor");
         return;
       }
       if (recurringInfo) {
         var _recurringInfo$interv;
         if (!(order !== null && order !== void 0 && order.orderDescription) || !(recurringInfo !== null && recurringInfo !== void 0 && recurringInfo.managementURL)) {
-          _this.logError("invalid session data in recurring");
+          _this.logError(eventCodeEnum.SDK_PAYMENT_ERROR, "Abnormal params recurringInfo");
           return;
         }
         var lineItem = {
@@ -145,11 +186,25 @@ var ApplePayService = /*#__PURE__*/function () {
       _this.session.onvalidatemerchant = _this.onvalidatemerchant;
       _this.session.onpaymentauthorized = _this.onpaymentauthorized;
       _this.session.oncancel = function () {
-        _this.logError('UserCancel');
+        if (_this.paymentState === PaymentState.pending) {
+          _this.logError(eventCodeEnum.SDK_PAYMENT_PROCESSING, 'Payment processing but user dismissed the sheet');
+        } else {
+          _this.logError(eventCodeEnum.SDK_PAYMENT_CANCEL, 'User dismissed the sheet');
+        }
+        _this.sessionAbort();
       };
       _this.session.begin();
-      _this.applePayTrace('sessionBegin');
+      _this.logger.logInfo({
+        name: 'APPLE_PAY',
+        title: ApplePayComponentEvent.sdk_event_appleShowPaymentSheet
+      }, {
+        biz: 'sdk',
+        type: 'funnel',
+        success: true,
+        recurring: recurringInfo !== null
+      }).send();
     });
+    this.logger = logger;
   }
 
   /**
@@ -162,12 +217,12 @@ var ApplePayService = /*#__PURE__*/function () {
    */
   _createClass(ApplePayService, [{
     key: "setApplePayParams",
-    value: function setApplePayParams(getMerchantSession, completePaymentAuthorized, completeApplePay, logError, applePayTrace) {
+    value: function setApplePayParams(getMerchantSession, completePaymentAuthorized, completeApplePay, logError) {
       this.getMerchantSession = getMerchantSession;
       this.completePaymentAuthorized = completePaymentAuthorized;
       this.completeApplePay = completeApplePay;
       this.logError = logError;
-      this.applePayTrace = applePayTrace;
+      this.paymentState = PaymentState.notStarted;
     }
 
     /**
@@ -207,6 +262,17 @@ var ApplePayService = /*#__PURE__*/function () {
       }
       return hasActiveCard;
     }())
+  }, {
+    key: "sessionAbort",
+    value: function sessionAbort() {
+      if (this.session) {
+        try {
+          this.session.abort();
+        } catch (error) {
+          console.log("session.abort() error");
+        }
+      }
+    }
   }], [{
     key: "canMakePayments",
     value: function canMakePayments(subTypeEnum) {

package/esm/types/index.d.ts

@@ -448,9 +448,14 @@ export declare enum eventCodeEnum {
     SDK_CREATECOMPONENT_ERROR = "SDK_CREATECOMPONENT_ERROR",
     SDK_CALL_URL_ERROR = "SDK_CALL_URL_ERROR",
     SDK_CALL_URL_SUCCESS = "SDK_CALL_URL_SUCCESS",
-    SDK_PAYMENT_FINISH = "SDK_PAYMENT_FINISH",
+    SDK_PAYMENT_SUCCESSFUL = "SDK_PAYMENT_SUCCESSFUL",
     SDK_PAYMENT_FAIL = "SDK_PAYMENT_FAIL",
-    SDK_PAYMENT_CANCEL = "SDK_PAYMENT_CANCEL"
+    SDK_PAYMENT_ERROR = "SDK_PAYMENT_ERROR",
+    SDK_PAYMENT_CANCEL = "SDK_PAYMENT_CANCEL",
+    /**
+     * 当前为Apple Pay发起了Pay请求，但是用户关闭了页面
+     */
+    SDK_PAYMENT_PROCESSING = "SDK_PAYMENT_PROCESSING"
 }
 export declare enum RedirectType {
     ApplinkUrl = "ApplinkUrl",

package/esm/types/index.js

@@ -153,9 +153,11 @@ export var eventCodeEnum = /*#__PURE__*/function (eventCodeEnum) {
   eventCodeEnum["SDK_CREATECOMPONENT_ERROR"] = "SDK_CREATECOMPONENT_ERROR";
   eventCodeEnum["SDK_CALL_URL_ERROR"] = "SDK_CALL_URL_ERROR";
   eventCodeEnum["SDK_CALL_URL_SUCCESS"] = "SDK_CALL_URL_SUCCESS";
-  eventCodeEnum["SDK_PAYMENT_FINISH"] = "SDK_PAYMENT_FINISH";
+  eventCodeEnum["SDK_PAYMENT_SUCCESSFUL"] = "SDK_PAYMENT_SUCCESSFUL";
   eventCodeEnum["SDK_PAYMENT_FAIL"] = "SDK_PAYMENT_FAIL";
+  eventCodeEnum["SDK_PAYMENT_ERROR"] = "SDK_PAYMENT_ERROR";
   eventCodeEnum["SDK_PAYMENT_CANCEL"] = "SDK_PAYMENT_CANCEL";
+  eventCodeEnum["SDK_PAYMENT_PROCESSING"] = "SDK_PAYMENT_PROCESSING";
   return eventCodeEnum;
 }({});
 export var RedirectType = /*#__PURE__*/function (RedirectType) {

package/package.json

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