@alipay/ams-checkout 1.10.0 → 1.11.0

package/esm/plugin/applepay/index.js

@@ -0,0 +1,117 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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 _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+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); }
+import { BusManager, BusMessage, BusSubscriber } from "../../core/bus";
+import { ApplePayActionEnum, PaymentActionEnum, SDKCallbackActionEnum } from "../../core/bus/interface";
+import ApplePayComponent, { ApplePayComponentEvent } from "./component";
+import ApplePayService from "./service";
+export var ApplePayInitMessage = /*#__PURE__*/_createClass(function ApplePayInitMessage() {
+  _classCallCheck(this, ApplePayInitMessage);
+  _defineProperty(this, "environment", void 0);
+  _defineProperty(this, "locale", void 0);
+});
+export var ApplePayBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
+  _inherits(ApplePayBusSubscriber, _BusSubscriber);
+  var _super = _createSuper(ApplePayBusSubscriber);
+  function ApplePayBusSubscriber(logger) {
+    var _this;
+    _classCallCheck(this, ApplePayBusSubscriber);
+    _this = _super.call(this);
+    _defineProperty(_assertThisInitialized(_this), "applePay", void 0);
+    _defineProperty(_assertThisInitialized(_this), "logger", void 0);
+    _this.logger = logger;
+    return _this;
+  }
+  _createClass(ApplePayBusSubscriber, [{
+    key: "actionNames",
+    value: function actionNames() {
+      return Object.values(ApplePayActionEnum).concat(Object.values(PaymentActionEnum));
+    }
+  }, {
+    key: "onOptionalInit",
+    value: function onOptionalInit(context, message) {
+      console.log('onOptionalInit', message.getData());
+    }
+  }, {
+    key: "onCanMakePayments",
+    value: function onCanMakePayments(context, message) {
+      var _message$getJSONObjec;
+      console.log('onCanMakePayments', message.getData());
+      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",
+    value: function onCreateComponent(context, message) {
+      var data = message.getJSONObject();
+      console.log('onCreateComponent', message);
+      this.applePay = new ApplePayComponent(_objectSpread(_objectSpread({}, data === null || data === void 0 ? void 0 : data.options), {}, {
+        onEventCallback: function onEventCallback(state) {
+          console.log('onCreateComponent#onEventCallback', state);
+          if (state) {
+            BusManager.publish(new BusMessage(SDKCallbackActionEnum.onEventCallback, JSON.stringify(state)));
+          }
+        }
+      }), this.logger);
+      var appendParams = data === null || data === void 0 ? void 0 : data.appendParams;
+      this.applePay.submitPay(appendParams);
+    }
+  }, {
+    key: "onDestoryComponent",
+    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",
+    value: function onMessage(context, message) {
+      switch (message.getAction()) {
+        case PaymentActionEnum.optional_init:
+          this.onOptionalInit(context, message);
+          break;
+        case ApplePayActionEnum.canMakePayments:
+          this.onCanMakePayments(context, message);
+          break;
+        case ApplePayActionEnum.createComponent:
+          this.onCreateComponent(context, message);
+          break;
+        case ApplePayActionEnum.destoryComponent:
+          this.onDestoryComponent(context, message);
+          break;
+        default:
+          console.log("Unknown action: " + message.getAction());
+      }
+    }
+  }]);
+  return ApplePayBusSubscriber;
+}(BusSubscriber);

package/esm/{common → plugin}/applepay/interface.d.ts

@@ -6,6 +6,8 @@
  * 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.
  */
 export type Version = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+export declare const APPLE_PAY_VERSION = 2;
+export declare const APPLE_PAY_RECURRING_VERSION = 14;
 export interface IApplePayValidateMerchantEvent {
     validationURL: string;
 }
@@ -35,10 +37,41 @@ export interface IApplePayPaymentContact {
     countryCode: string;
 }
 export type IApplePayLineItemType = 'final' | 'pending';
+export type ApplePayPaymentTiming = "immediate" | "recurring" | "deferred" | "automaticReload";
+export type ApplePayRecurringPaymentDateUnit = "year" | "month" | "day" | "hour" | "minute";
+/**
+ *
+{
+    "label": "Subscription",
+    "amount": "20.00",
+    "type": "final",
+    "paymentTiming": "recurring",
+    "recurringPaymentStartDate": new Date("2022-01-01T00:00:00"),
+    "recurringPaymentIntervalUnit": "month",
+    "recurringPaymentIntervalCount": 6,
+    "recurringPaymentEndDate": new Date("2024-01-01T00:00:00"),
+}
+ */
 export interface IApplePayLineItem {
+    /**
+     * A value that indicates whether the line item is final or pending.
+     */
     type: IApplePayLineItemType;
+    /**
+     * A required value that’s a short, localized description of the line item.
+     */
     label: string;
+    /**
+     * A required value that’s the monetary amount of the line item.
+     */
     amount: string;
+    paymentTiming?: ApplePayPaymentTiming;
+    recurringPaymentStartDate?: Date;
+    recurringPaymentEndDate?: Date;
+    recurringPaymentIntervalUnit?: ApplePayRecurringPaymentDateUnit;
+    recurringPaymentIntervalCount?: number;
+    deferredPaymentDate?: Date;
+    automaticReloadPaymentThresholdAmount?: string;
 }
 export type applePayShippingType = 'shipping' | 'delivery' | 'storePickup' | 'servicePickup';
 export interface IApplePayShippingMethod {
@@ -75,6 +108,34 @@ export interface IApplePayPaymentRequest {
     currencyCode: string;
     shippingType?: applePayShippingType;
     shippingMethods?: IApplePayShippingMethod[];
+    recurringPaymentRequest?: IApplePayRecurringPaymentRequest;
+}
+export interface IApplePayRecurringPaymentRequest {
+    /**
+     * A description of the recurring payment that Apple Pay displays to the user in the payment sheet.
+     */
+    paymentDescription: string;
+    /**
+     * A localized billing agreement that the payment sheet displays to the user before the user authorizes the payment.
+     */
+    billingAgreement?: string;
+    /**
+     * The regular billing cycle for the recurring payment, including start and end dates, an interval, and an interval count.
+     */
+    regularBilling: IApplePayLineItem;
+    /**
+     * 订阅试用的周期控制，暂时不需要
+     * The trial billing cycle for the recurring payment.
+     */
+    trialBilling?: IApplePayLineItem;
+    /**
+     * A URL to a web page where the user can update or delete the payment method for the recurring payment.
+     */
+    managementURL: string;
+    /**
+     * A URL you provide for receiving life-cycle notifications from the Apple Pay servers about the Apple Pay merchant token for the recurring payment.
+     */
+    tokenNotificationURL?: string;
 }
 export interface IApplePaySession {
     supportsVersion?: (version: Version) => boolean;
@@ -97,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

@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2022 International Business Group, Ant Group. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), the rights to use, copy, modify, merge, and/or distribute the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ * 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.
+ */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// https://developer.apple.com/documentation/apple_pay_on_the_web/apple_pay_on_the_web_version_history
+
+export var APPLE_PAY_VERSION = 2;
+export var APPLE_PAY_RECURRING_VERSION = 14;
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepayvalidatemerchantevent
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaymerchantcapability
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaypaymentrequest/1916122-supportednetworks
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaycontactfield
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaypaymentcontact
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaylineitemtype
+
+//https://developer.apple.com/documentation/apple_pay_on_the_web/applepaypaymenttiming
+
+//https://developer.apple.com/documentation/apple_pay_on_the_web/applepayrecurringpaymentdateunit
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaylineitem
+/**
+ * 
+{
+    "label": "Subscription",
+    "amount": "20.00",
+    "type": "final",
+    "paymentTiming": "recurring",
+    "recurringPaymentStartDate": new Date("2022-01-01T00:00:00"),
+    "recurringPaymentIntervalUnit": "month",
+    "recurringPaymentIntervalCount": 6,
+    "recurringPaymentEndDate": new Date("2024-01-01T00:00:00"),
+}
+ */
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepayshippingtype
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepayshippingmethod
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaypayment
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaypaymentauthorizedevent
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/apple_pay_js_api/apple_pay_status_codes
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaypaymentauthorizationresult
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaypaymentrequest
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepayrecurringpaymentrequest
+
+// https://developer.apple.com/documentation/apple_pay_on_the_web/applepaysession
+
+// IGetMerchantSession spi type
+
+// ICompletePaymentAuthorized spi type
+
+// ICompleteApplePay spi type
+
+// ILogError spi type

package/esm/{common/applepay/index.d.ts → 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 { IpaymentSessionMetaData } from '../../types';
+import { IGetMerchantSession, ICompletePaymentAuthorized, ICompleteApplePay, ILogError } from './interface';
+import { ApplePaySubTypeEnum, IpaymentSessionMetaData } from '../../types';
+import type { 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,17 +31,20 @@ 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;
     /**
-     * Apple Pay is enabled
+     * Is Apple Pay Enabled
+     * @param subTypeEnum
+     * @returns
      */
-    isEnabled: () => boolean;
+    static canMakePayments(subTypeEnum?: ApplePaySubTypeEnum): any;
     /**
      * has Active Card in Apple Pay
      * @param merchantIdentifier
      */
     hasActiveCard(merchantIdentifier: string): Promise<boolean>;
     private onvalidatemerchant;
+    private sessionAbort;
     private onpaymentauthorized;
     /**
      * Start Pay

package/esm/{common/applepay/index.js → plugin/applepay/service.js}

@@ -16,104 +16,197 @@ 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 { 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);
-    /**
-     * Apple Pay is enabled
-     */
-    _defineProperty(this, "isEnabled", function () {
-      return window.ApplePaySession ? window.ApplePaySession.canMakePayments() : false;
-    });
+    _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,
         validationUrl: event.validationURL
       }).then(function (merchantSessionObjectString) {
+        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 applePay = paymentSessionFactor.applePay,
+      var extendInfo = paymentSessionFactor.extendInfo,
         merchantInfo = paymentSessionFactor.merchantInfo,
         paymentAmount = paymentSessionFactor.paymentAmount,
-        order = paymentSessionFactor.order;
+        order = paymentSessionFactor.order,
+        recurringInfo = paymentSessionFactor.recurringInfo;
       _this.merchantIdentifier = merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.partnerId;
-      var request = {
-        merchantCapabilities: applePay === null || applePay === void 0 ? void 0 : applePay.merchantCapabilities,
-        supportedNetworks: applePay === null || applePay === void 0 ? void 0 : applePay.supportedNetworks,
-        countryCode: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.registeredCountry,
-        currencyCode: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency,
-        total: {
-          type: 'final',
-          label: order === null || order === void 0 ? void 0 : order.orderDescription,
-          amount: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value
+      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(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(eventCodeEnum.SDK_PAYMENT_ERROR, "Abnormal params recurringInfo");
+          return;
         }
-      };
-      _this.session = new ApplePaySession(2, request);
+        var lineItem = {
+          type: 'final',
+          label: recurringInfo.title,
+          amount: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value,
+          paymentTiming: "recurring",
+          recurringPaymentStartDate: recurringInfo !== null && recurringInfo !== void 0 && recurringInfo.startDate ? new Date(Number(recurringInfo.startDate) * 1000) : null,
+          recurringPaymentEndDate: recurringInfo !== null && recurringInfo !== void 0 && recurringInfo.endDate ? new Date(Number(recurringInfo.endDate) * 1000) : null,
+          recurringPaymentIntervalUnit: recurringInfo !== null && recurringInfo !== void 0 && recurringInfo.intervalUnit ? recurringInfo.intervalUnit : "month",
+          recurringPaymentIntervalCount: (_recurringInfo$interv = recurringInfo === null || recurringInfo === void 0 ? void 0 : recurringInfo.intervalCount) !== null && _recurringInfo$interv !== void 0 ? _recurringInfo$interv : 1
+        };
+        var recurringRequest = {
+          // 不知道显示在哪里
+          paymentDescription: order === null || order === void 0 ? void 0 : order.orderDescription,
+          billingAgreement: recurringInfo.agreementDescription,
+          regularBilling: lineItem,
+          managementURL: recurringInfo === null || recurringInfo === void 0 ? void 0 : recurringInfo.managementURL,
+          tokenNotificationURL: recurringInfo === null || recurringInfo === void 0 ? void 0 : recurringInfo.tokenNotificationURL
+        };
+        var request = {
+          merchantCapabilities: extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.merchantCapabilities,
+          supportedNetworks: extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.supportedNetworks,
+          countryCode: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.registeredCountry,
+          currencyCode: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency,
+          total: lineItem,
+          recurringPaymentRequest: recurringRequest,
+          lineItems: [lineItem]
+        };
+        _this.session = new ApplePaySession(APPLE_PAY_RECURRING_VERSION, request);
+      } else {
+        var _request = {
+          merchantCapabilities: extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.merchantCapabilities,
+          supportedNetworks: extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.supportedNetworks,
+          countryCode: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.registeredCountry,
+          currencyCode: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency,
+          total: {
+            type: 'final',
+            label: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.merchantName,
+            amount: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.value
+          }
+        };
+        _this.session = new ApplePaySession(APPLE_PAY_VERSION, _request);
+      }
+      // 核身前触发
       _this.session.onvalidatemerchant = _this.onvalidatemerchant;
+      // 核身后触发
       _this.session.onpaymentauthorized = _this.onpaymentauthorized;
       _this.session.oncancel = function () {
-        _this.logError('UserCancel');
-        _this.session.abort();
+        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;
   }
 
   /**
@@ -126,13 +219,19 @@ 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;
     }
+
+    /**
+     * Is Apple Pay Enabled
+     * @param subTypeEnum 
+     * @returns 
+     */
   }, {
     key: "hasActiveCard",
     value: (
@@ -165,6 +264,25 @@ 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) {
+      if ('ApplePayRecurringPayment' === subTypeEnum) {
+        return window.ApplePaySession ? window.ApplePaySession.canMakePayments() && window.ApplePaySession.supportsVersion(APPLE_PAY_RECURRING_VERSION) : false;
+      }
+      return window.ApplePaySession ? window.ApplePaySession.canMakePayments() && window.ApplePaySession.supportsVersion(APPLE_PAY_VERSION) : false;
+    }
   }]);
   return ApplePayService;
 }();

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

@@ -17,6 +17,8 @@ export declare const getIframeUrl: (iframeParams: {
     locale: string;
     instanceId: string;
     renderDisplayType: renderDisplayTypeEnum;
+    isPreload?: string;
+    hostSign?: string;
 }) => {
     path: string;
     locationSearch: string;
@@ -25,3 +27,4 @@ export declare const getIframeUrl: (iframeParams: {
  * @description Create iframe
  */
 export declare const createIframe: (mode: string, platform: 'mobile' | 'desktop') => HTMLIFrameElement;
+export declare const createPreloadIframe: (channelType: any, version: any) => HTMLIFrameElement;