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

package/esm/plugin/applepay/component.js

@@ -85,12 +85,12 @@ var ApplePayComponent = /*#__PURE__*/function () {
       if (!this._parseData || !this._sessionData) {
         this.onEventCallback({
           code: eventCodeEnum.SDK_PAYMENT_FAIL,
-          message: 'Abnormal response data is null'
+          message: 'Abnormal paymentSessionData'
         });
         this.logger.logError({
           name: 'APPLE_PAY',
           title: 'sessionDataNull',
-          msg: 'Abnormal response data is null'
+          msg: 'Abnormal paymentSessionData'
         }, {
           type: 'error',
           biz: 'sdk'
@@ -259,18 +259,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,16 +282,18 @@ 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
+            }
           });
         } else {
           _this.onEventCallback({
-            code: eventCodeEnum.SDK_PAYMENT_FAIL,
-            result: {
-              errorMsg: msg
-            }
+            code: code,
+            message: msg
           });
         }
       };

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

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

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

@@ -14,6 +14,7 @@ declare class ApplePayService {
     private merchantIdentifier;
     private merchantName;
     private session;
+    private paymentState;
     private getMerchantSession;
     private completePaymentAuthorized;
     private completeApplePay;

package/esm/plugin/applepay/service.js

@@ -17,6 +17,14 @@ 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";
+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
  */
@@ -27,6 +35,7 @@ var ApplePayService = /*#__PURE__*/function () {
     _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);
@@ -44,7 +53,7 @@ var ApplePayService = /*#__PURE__*/function () {
         _this.session.completeMerchantValidation(merchantSessionObject);
         _this.applePayTrace('completeMerchantValidation');
       }).catch(function (error) {
-        _this.logError('MerchantValidationError', error);
+        _this.logError(eventCodeEnum.SDK_PAYMENT_FAIL, 'MerchantValidationError', error);
         _this.session.abort();
       });
     });
@@ -55,19 +64,22 @@ var ApplePayService = /*#__PURE__*/function () {
         ApplePaySession = _window.ApplePaySession;
       var exception = function exception(error) {
         _this.session.completePayment(ApplePaySession.STATUS_FAILURE);
-        _this.logError('PaymentAuthorizedError', error);
+        _this.logError(eventCodeEnum.SDK_PAYMENT_FAIL, 'PaymentAuthorizedError', error);
         _this.session.abort();
       };
       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;
         }).catch(function (error) {
           exception(error);
+          _this.paymentState = PaymentState.fail;
         });
       } else {
         exception();
@@ -91,13 +103,13 @@ var ApplePayService = /*#__PURE__*/function () {
         recurringInfo = paymentSessionFactor.recurringInfo;
       _this.merchantIdentifier = merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.partnerId;
       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 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 recurringInfo");
           return;
         }
         var lineItem = {
@@ -145,7 +157,16 @@ 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');
+        }
+        try {
+          _this.session.abort();
+        } catch (error) {
+          console.log("session.abort() error");
+        }
       };
       _this.session.begin();
       _this.applePayTrace('sessionBegin');
@@ -168,6 +189,7 @@ var ApplePayService = /*#__PURE__*/function () {
       this.completeApplePay = completeApplePay;
       this.logError = logError;
       this.applePayTrace = applePayTrace;
+      this.paymentState = PaymentState.notStarted;
     }
 
     /**

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.31",
   "description": "",
   "author": "",
   "main": "esm/index.js",