@alipay/ams-checkout 1.10.1 → 1.11.0

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/index.d.ts

@@ -1,6 +1,6 @@
 import type AMSCheckout from '../../core/instance';
 import type { eventPayload, eventPayloadContext, IappendIframeNodesParams, IMerchantAppointParam, Iselector } from '../../types';
-import { componentSignEnum, platformEnum, renderDisplayTypeEnum } from '../../types';
+import { componentSignEnum, DeviceIdParameter, platformEnum, renderDisplayTypeEnum } from '../../types';
 type IrenderFuncParams = (context: ComponentApp, selector: Iselector, renderDisplayType: renderDisplayTypeEnum) => Promise<void>;
 export default class ComponentApp {
     app: null | HTMLIFrameElement;
@@ -44,7 +44,7 @@ export default class ComponentApp {
     setPreloadRender(renderFunc: any): void;
     private initSecurity;
     private logDeviceId;
-    private getDeviceIdAndLog;
+    getDeviceIdAndLog(deviceIdParameter?: DeviceIdParameter, isPolling?: boolean): Promise<string>;
     /**
      * @description render iframe content
      */

package/esm/plugin/component/index.js

@@ -54,7 +54,7 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_merchantAppointParam", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutId", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutFn", void 0);
-    this._appVersion = '1.10.1';
+    this._appVersion = '1.11.0';
     this._isInitComponent = false;
     this._selector = "#".concat(COMPONENT_SECTION_ID);
     this.createIframeNode = function () {
@@ -364,7 +364,7 @@ var ComponentApp = /*#__PURE__*/function () {
       this._actionQueryPromise = new Promise( /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
           var _this5$_renderParams, _this5$_renderParams2, _this5$_renderParams3, _this5$_renderParams4, _this5$_renderParams5;
-          var envInfo, params, _this5$_renderParams$, extendInfo, enableVaultingApiOptimize, enableEasypayApiOptimize, extendInfoData, _this5$_renderParams6, _this5$_renderParams7, _ref3, _ref3$productSceneVer, productSceneVersion, _ref3$productScene, productScene, _ref4, _ref4$action, _ref4$action2, _ref4$action2$autoDeb, autoDebitWithToken, _this5$_renderParams8, _action$web, _action$wap, action, signType;
+          var envInfo, params, _ref3, extendInfo, enableVaultingApiOptimize, enableEasypayApiOptimize, extendInfoData, _this5$_renderParams6, _this5$_renderParams7, _ref4, _ref4$productSceneVer, productSceneVersion, _ref4$productScene, productScene, _ref5, _ref5$action, _ref5$action2, _ref5$action2$autoDeb, autoDebitWithToken, _this5$_renderParams8, _action$web, _action$wap, action, signType;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -380,7 +380,7 @@ var ComponentApp = /*#__PURE__*/function () {
                 /**
                  * @description Simulated or unnecessary scenarios
                  */
-                _this5$_renderParams$ = (_this5$_renderParams4 = _this5._renderParams) === null || _this5$_renderParams4 === void 0 ? void 0 : _this5$_renderParams4.paymentSessionMetaData, extendInfo = _this5$_renderParams$.extendInfo;
+                _ref3 = ((_this5$_renderParams4 = _this5._renderParams) === null || _this5$_renderParams4 === void 0 ? void 0 : _this5$_renderParams4.paymentSessionMetaData) || {}, extendInfo = _ref3.extendInfo;
                 enableVaultingApiOptimize = false;
                 enableEasypayApiOptimize = false;
                 try {
@@ -427,8 +427,8 @@ var ComponentApp = /*#__PURE__*/function () {
                   _context2.next = 26;
                   break;
                 }
-                _ref3 = params.paymentSessionConfig || {}, _ref3$productSceneVer = _ref3.productSceneVersion, productSceneVersion = _ref3$productSceneVer === void 0 ? '' : _ref3$productSceneVer, _ref3$productScene = _ref3.productScene, productScene = _ref3$productScene === void 0 ? '' : _ref3$productScene;
-                _ref4 = ((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData) || {}, _ref4$action = _ref4.action, _ref4$action2 = _ref4$action === void 0 ? {} : _ref4$action, _ref4$action2$autoDeb = _ref4$action2.autoDebitWithToken, autoDebitWithToken = _ref4$action2$autoDeb === void 0 ? false : _ref4$action2$autoDeb;
+                _ref4 = params.paymentSessionConfig || {}, _ref4$productSceneVer = _ref4.productSceneVersion, productSceneVersion = _ref4$productSceneVer === void 0 ? '' : _ref4$productSceneVer, _ref4$productScene = _ref4.productScene, productScene = _ref4$productScene === void 0 ? '' : _ref4$productScene;
+                _ref5 = ((_this5$_renderParams6 = _this5._renderParams) === null || _this5$_renderParams6 === void 0 ? void 0 : _this5$_renderParams6.paymentSessionMetaData) || {}, _ref5$action = _ref5.action, _ref5$action2 = _ref5$action === void 0 ? {} : _ref5$action, _ref5$action2$autoDeb = _ref5$action2.autoDebitWithToken, autoDebitWithToken = _ref5$action2$autoDeb === void 0 ? false : _ref5$action2$autoDeb;
                 if (!((_this5$_renderParams7 = _this5._renderParams) !== null && _this5$_renderParams7 !== void 0 && (_this5$_renderParams7 = _this5$_renderParams7.paymentSessionMetaData) !== null && _this5$_renderParams7 !== void 0 && (_this5$_renderParams7 = _this5$_renderParams7.action) !== null && _this5$_renderParams7 !== void 0 && _this5$_renderParams7.skipSdkQuery && enableEasypayApiOptimize)) {
                   _context2.next = 21;
                   break;
@@ -542,7 +542,7 @@ var ComponentApp = /*#__PURE__*/function () {
 
       // eslint-disable-next-line no-async-promise-executor
       this._actionSubmitPromise = new Promise( /*#__PURE__*/function () {
-        var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
+        var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
           var _this6$_renderParams;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
@@ -605,7 +605,7 @@ var ComponentApp = /*#__PURE__*/function () {
           }, _callee3);
         }));
         return function (_x3) {
-          return _ref5.apply(this, arguments);
+          return _ref6.apply(this, arguments);
         };
       }());
     }
@@ -1196,9 +1196,9 @@ var ComponentApp = /*#__PURE__*/function () {
     }
   }, {
     key: "handleDeclareInfo",
-    value: function handleDeclareInfo(_ref6) {
-      var _ref6$closeDialogData = _ref6.closeDialogData,
-        closeDialogData = _ref6$closeDialogData === void 0 ? {} : _ref6$closeDialogData;
+    value: function handleDeclareInfo(_ref7) {
+      var _ref7$closeDialogData = _ref7.closeDialogData,
+        closeDialogData = _ref7$closeDialogData === void 0 ? {} : _ref7$closeDialogData;
       _handleDeclareInfo({
         closeDialogData: closeDialogData
       });

package/esm/plugin/const.d.ts

@@ -0,0 +1,2 @@
+import { IExtendPlugin } from './type';
+export declare const ExtendPlugin: IExtendPlugin;

package/esm/plugin/const.js

@@ -0,0 +1,19 @@
+import { ApplePayActionEnum, PaymentActionEnum } from "../core/bus/interface";
+import { paymentMethodCategoryTypeEnum, productSceneEnum, ProductSceneVersion } from "../types/index";
+export var ExtendPlugin = [{
+  sessionMatcher: {
+    productScene: productSceneEnum.CASHIER_PAYMENT,
+    productSceneVersion: ProductSceneVersion.V1,
+    paymentMethodCategoryType: paymentMethodCategoryTypeEnum.CARD,
+    paymentMethodTypes: ["CARD_APPLE_PAY"]
+  },
+  paymentChannelMatcher: {
+    paymentMethod: 'ApplePay'
+  },
+  busActionNames: {
+    canMakePayments: ApplePayActionEnum.canMakePayments,
+    optional_init: PaymentActionEnum.optional_init,
+    createComponent: ApplePayActionEnum.createComponent,
+    destoryComponent: ApplePayActionEnum.destoryComponent
+  }
+}];

package/esm/plugin/type.d.ts

@@ -0,0 +1,33 @@
+import { BusSubscriber } from '../core/bus';
+import { paymentMethodCategoryTypeEnum, productSceneEnum, ProductSceneVersion } from '../types';
+export type IExtendPlugin = IExtendPluginItem[];
+export interface ComponentActionNamesType {
+    canMakePayments?: string;
+    optional_init?: string;
+    createComponent?: string;
+    mountComponent?: string;
+    submit?: string;
+    destoryComponent?: string;
+}
+export type IExtendPluginItem = {
+    /**
+     * 以下为sessionData匹配的场景
+     */
+    sessionMatcher?: {
+        productScene: productSceneEnum;
+        productSceneVersion: ProductSceneVersion;
+        paymentMethodCategoryType: paymentMethodCategoryTypeEnum;
+        paymentMethodTypes: string[];
+    };
+    /**
+     * 用于无sessionData场景，比如：canMakePayments
+     */
+    paymentChannelMatcher?: {
+        paymentMethod: string;
+    };
+    /**
+     * 以下plugin 实现的定义
+     */
+    busActionNames: ComponentActionNamesType;
+    busSubscriber?: BusSubscriber;
+};

package/esm/request/index.d.ts

@@ -1,5 +1,5 @@
 import { RequestConfig } from '../types';
-import { Logger } from '../util/logger';
+import type { Logger } from '../util/logger';
 /**
  *
  * @param requestData 请求参数