@alipay/ams-checkout 2.0.3 → 2.0.5

package/esm/core/component/ckp/index.js

@@ -82,6 +82,21 @@ export var AMSCheckoutPage = /*#__PURE__*/function () {
         },
         eventCode = _ref.event,
         data = _ref.data;
+      if (eventCode && eventCode !== null && eventCode !== void 0 && eventCode.startsWith('getDomain')) {
+        var _window, _window2;
+        var hostname = (_window = window) === null || _window === void 0 || (_window = _window.location) === null || _window === void 0 ? void 0 : _window.hostname;
+        _this.logger.logInfo({
+          code: 'a3753.b146681',
+          msg: hostname
+        }).send();
+        var content = _objectSpread(_objectSpread({}, dataObj === null || dataObj === void 0 ? void 0 : dataObj.context), {}, {
+          data: {
+            doMain: (_window2 = window) === null || _window2 === void 0 || (_window2 = _window2.location) === null || _window2 === void 0 ? void 0 : _window2.hostname
+          },
+          event: 'appEventCallback'
+        });
+        _this.dispatchToApp(content);
+      }
       if (code && code.startsWith('SDK_PAYMENT')) {
         var _this$eventListener;
         console.log('[antom-web-sdk] <antom-checkout-page>  eventListenerWrapper', event, message, result);

package/esm/core/component/element/config.d.ts

@@ -0,0 +1,10 @@
+export declare enum ProductScene {
+    EXPRESS_CHECKOUT = "EXPRESS_CHECKOUT",
+    ELEMENT_PAYMENT = "ELEMENT_PAYMENT"
+}
+interface EventScenario {
+    eventName: ProductScene;
+    supportedEvents: string[];
+}
+export declare const productEventScenarios: EventScenario[];
+export {};

package/esm/core/component/element/config.js

@@ -0,0 +1,17 @@
+// 定义产品场景的枚举
+export var ProductScene = /*#__PURE__*/function (ProductScene) {
+  ProductScene["EXPRESS_CHECKOUT"] = "EXPRESS_CHECKOUT";
+  ProductScene["ELEMENT_PAYMENT"] = "ELEMENT_PAYMENT";
+  return ProductScene;
+}({});
+
+// 定义一个事件场景的接口
+
+// 存储产品场景及支持的事件名
+export var productEventScenarios = [{
+  eventName: ProductScene.EXPRESS_CHECKOUT,
+  supportedEvents: [] // 没有支持的事件
+}, {
+  eventName: ProductScene.ELEMENT_PAYMENT,
+  supportedEvents: ['paymentMethodChanged', 'valuesChanged'] // 支持的事件
+}];

package/esm/core/component/element/elementController/index.d.ts

@@ -1,4 +1,4 @@
-import { AddressMountOptions, ICommonApiResponse, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions } from '../type';
+import { AddressMountOptions, EventDataMap, EVENTNAME, ICommonApiResponse, IElementOptions, IPaymentApiResponse, LinkAuthMountOptions, PaymentMountOptions, SubmitFuncParams } from '../type';
 declare class ElementController {
     private options;
     private elementContainer;
@@ -33,7 +33,7 @@ declare class ElementController {
     validateFields(): Promise<{
         isValid: boolean;
     }>;
-    submitPayment(): Promise<IPaymentApiResponse>;
+    submitPayment(submitParams: SubmitFuncParams): Promise<IPaymentApiResponse>;
     private changeLoading;
     private addEventListener;
     private sendRequestAndWaitWebLaunch;
@@ -44,5 +44,7 @@ declare class ElementController {
     private destroyHandle;
     destroy(): void;
     private setControllerStatusOrView;
+    on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
+    private isEventAllowed;
 }
 export default ElementController;

package/esm/core/component/element/elementController/index.js

@@ -23,8 +23,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 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 { ServiceProvider } from "../../../../foundation/service";
-import { ELEMENT_SPM_MAP } from "../../../../util/spm-map";
+import { productEventScenarios, ProductScene } from "../config";
 import { cleanMockup, removeRetentionPopup } from "../../../../component/component.popup.style";
 import { destroyModal } from "../../../../component/popupWindow.style";
 import { ERRORMESSAGE, EVENT, PROMISE_CALLBACK_CODE } from "../../../../constant";
@@ -34,14 +33,16 @@ import PaymentProcessor from "../../../../core/component/element/elementProcesso
 import { IElementStatus } from "../../../../foundation";
 import { AntomSDKCore } from "../../../../foundation/core";
 import { ElementProcessor } from "../../../../foundation/product-processor/element";
+import { ServiceProvider } from "../../../../foundation/service";
+import { convertPaymentSession } from "../../../../foundation/utils/payment_context_utils";
 import { ProductSceneEnum } from "../../../../types";
+import { ELEMENT_SPM_MAP } from "../../../../util/spm-map";
 import { ElementContainerService } from "../elementContainerService"; // 引入 ElementContainerService
 import { IContainerStatus } from "../elementContainerService/containerService";
 import { EventCenter as ElementEventCenter } from "../EventCenter/index";
 import { oneAccountUpdate, sdkActionUpdate } from "../mock";
 import { ElementPaymentEvent, ElementPaymentMethod, ElementType, EventCallbackCode, EXPOSURE_API_EVENT, MountElementType, PaymentStatus } from "../type";
-import { checkCanMount, checkCanUpdate, handleRedirect, isLoadErrorPage, safeStringify, showToast } from "../util";
-import { convertPaymentSession } from "../../../../foundation/utils/payment_context_utils";
+import { checkCanMount, checkCanUpdate, handleRedirect, isLoadErrorPage, safeParse, safeStringify, showToast } from "../util";
 var TIMEOUT_DURATION = 10000;
 var ElementController = /*#__PURE__*/function () {
   function ElementController(options) {
@@ -77,7 +78,10 @@ var ElementController = /*#__PURE__*/function () {
         event.emitAndListen({
           event: ElementPaymentEvent.SUBMIT_PAY,
           data: {
-            params: _objectSpread({}, params),
+            params: _objectSpread(_objectSpread({}, params), {}, {
+              doMain: window.location.hostname
+              // sessionResult: this.parseData, 该参数在应用层好像没有使用 TODO
+            }),
             target: target,
             source: ElementPaymentMethod.CONTAINER_ELEMENT
           }
@@ -89,13 +93,16 @@ var ElementController = /*#__PURE__*/function () {
     this.options = options;
     var _options = options;
     this.onStatusChangeCallback = _options === null || _options === void 0 ? void 0 : _options.onStatusChangeCallback;
+    // 初始化 this.elementContainer 的 status 为 INITING
     this.elementContainer = new AntomSDKCore();
     this.elementContainer.registerProcessor(ProductSceneEnum.ELEMENT_PAYMENT, '', new ElementProcessor());
+    // 初始化实例 id，监听 onRedirect 事件
     this.elementContainer.init(this.options, ProductSceneEnum.ELEMENT_PAYMENT);
     this.initService();
     this.elementContainerService = new ElementContainerService({
       instanceId: this.elementContainer.getInstanceId()
     });
+    // status 设置为 READY
     this.setControllerStatusOrView(IElementStatus.READY);
     this.elementEventCenter = new ElementEventCenter({
       logger: this.elementContainer.getServiceProvider().getService('Log')
@@ -205,6 +212,7 @@ var ElementController = /*#__PURE__*/function () {
     key: "initializeAndMountProcessor",
     value: function initializeAndMountProcessor(type, selector, options) {
       this.initElementProcessors(type);
+      // 创建 iframe，拉起应用页面，同时监听全局的数据更新和获取事件
       this.elementContainerService.mount({
         type: type,
         selector: selector,
@@ -241,6 +249,7 @@ var ElementController = /*#__PURE__*/function () {
     key: "mount",
     value: function mount(renderOptions, sdkSelector) {
       var _this2 = this;
+      // 此处的 id 是 sessionData && 分割的前3位
       var _convertPaymentSessio = convertPaymentSession(this.options.sessionData),
         sessionData = _convertPaymentSessio.id;
       var startEventId = this.elementEventCenter.registerEvent(EXPOSURE_API_EVENT.MOUNT, sessionData);
@@ -264,6 +273,7 @@ var ElementController = /*#__PURE__*/function () {
           return;
         }
         _this2.clearAndSetInitTimeout(readyCallback);
+        // 回调 loading 的 onStartLoading
         _this2.changeLoading(true);
         try {
           var startBizFlowData = {
@@ -272,10 +282,14 @@ var ElementController = /*#__PURE__*/function () {
               appendAliasContainerId: true
             })
           };
+          // status 设置为 IN_BIZ_FLOW
           _this2.setControllerStatusOrView(IElementStatus.IN_BIZ_FLOW);
           _this2.elementContainer.startBizFlow(startBizFlowData);
+          // 创建 iframe 加载应用页面
           _this2.initializeAndMountProcessor(renderOptions.type, sdkSelector, renderOptions);
+          // 监听应用页面 onLaunch 事件，请求 sdkAction.query 接口的数据，请求完成后处理数据异常情况或发送 renderComponent 事件及数据给应用层渲染页面内容
           _this2.sendRequestAndWaitWebLaunch(renderOptions, readyCallback);
+          // 监听事件
           _this2.addEventListener(readyCallback);
           _this2.serviceMap.EventCenter.addIFrame(_this2.elementContainerService.getContainerService(renderOptions.type).getContainerService().getWebApp());
         } catch (error) {
@@ -337,7 +351,7 @@ var ElementController = /*#__PURE__*/function () {
   }, {
     key: "submitPayment",
     value: function () {
-      var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _submitPayment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(submitParams) {
         var _this3 = this;
         var startEventId, res, logParams, recordResult, _recordResult, _recordResult2, _recordResult3, _recordResult4, _recordResult5, _logParams;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -369,7 +383,7 @@ var ElementController = /*#__PURE__*/function () {
               _context4.next = 11;
               return new Promise( /*#__PURE__*/function () {
                 var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
-                  var that, recordResultCallback, params, processStep, _yield$_this3$onValid2, data, errorString, errorResult;
+                  var that, recordResultCallback, params, processStep, _submitParams$handleA, _yield$_this3$onValid2, _data, errorString, errorResult;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -422,7 +436,7 @@ var ElementController = /*#__PURE__*/function () {
                               }
                             }, _callee2);
                           }));
-                          return function processStep(_x2, _x3) {
+                          return function processStep(_x3, _x4) {
                             return _ref4.apply(this, arguments);
                           };
                         }(); // 按顺序处理步骤
@@ -449,13 +463,16 @@ var ElementController = /*#__PURE__*/function () {
                           break;
                         }
                         _context3.next = 17;
-                        return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, params);
+                        return _this3.onValidateAndSubmitPay(_this3.elementProcessors[ElementType.payment].eventCenter, ElementPaymentMethod.PAYMENT_ELEMENT, _objectSpread(_objectSpread({}, params), {}, {
+                          handleActions: (_submitParams$handleA = submitParams === null || submitParams === void 0 ? void 0 : submitParams.handleActions) !== null && _submitParams$handleA !== void 0 ? _submitParams$handleA : true,
+                          shipping: submitParams === null || submitParams === void 0 ? void 0 : submitParams.shippingInfo
+                        }));
                       case 17:
                         _yield$_this3$onValid2 = _context3.sent;
-                        data = _yield$_this3$onValid2.data;
+                        _data = _yield$_this3$onValid2.data;
                         // TODO 先快速修复类型, 这里结构和标准返回不一致 @马杰
                         // TODO checkout 返回的错误未包含 status 和 message @马杰 @薛浩
-                        recordResult = data;
+                        recordResult = _data;
                         recordResultCallback(recordResult);
                       case 21:
                         _context3.next = 30;
@@ -484,7 +501,7 @@ var ElementController = /*#__PURE__*/function () {
                     }
                   }, _callee3, null, [[2, 23]]);
                 }));
-                return function (_x) {
+                return function (_x2) {
                   return _ref3.apply(this, arguments);
                 };
               }());
@@ -509,7 +526,7 @@ var ElementController = /*#__PURE__*/function () {
           }
         }, _callee4, this, [[8,, 12, 17]]);
       }));
-      function submitPayment() {
+      function submitPayment(_x) {
         return _submitPayment.apply(this, arguments);
       }
       return submitPayment;
@@ -617,7 +634,10 @@ var ElementController = /*#__PURE__*/function () {
               return _context5.abrupt("return");
             case 7:
               _context5.next = 9;
-              return Promise.all([containerService.createWebLaunchPromise(), this.elementProcessors[type].obtainData()]);
+              return Promise.all([containerService.createWebLaunchPromise(),
+              // 监听 onLaunch 事件
+              this.elementProcessors[type].obtainData() // 请求 sdkAction.query 的数据，connect 还会请求 account.query
+              ]);
             case 9:
               _yield$Promise$all = _context5.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
@@ -626,12 +646,15 @@ var ElementController = /*#__PURE__*/function () {
               this.serviceMap.Log.logInfo({
                 title: 'sdk_event_webAppOnLaunch'
               });
+              // 应用页面加载完成且接口请求完成，状态设置为 READY
               containerService === null || containerService === void 0 || containerService.switchContainerStatus(IContainerStatus.READY);
+              // 处理接口数据异常情况，直接回调，结束流程
               errorResult = this.getErrorFromResponse(obtainDataResult);
               if (errorResult) {
-                // 仅结束resove，传出回调码
+                // 仅结束resolve，传出回调码
                 readyCallback(errorResult);
               }
+              // 页面加载和数据状态 READY 后，SDK 向应用层发送 renderComponent 事件，传递应用层渲染必须的数据
               if (this.areAllContainersReady()) {
                 this.elementContainerService.getContainerServices().forEach(function (_, key) {
                   _this5.sendReady(key, options);
@@ -654,7 +677,7 @@ var ElementController = /*#__PURE__*/function () {
           }
         }, _callee5, this, [[1, 20]]);
       }));
-      function sendRequestAndWaitWebLaunch(_x4, _x5) {
+      function sendRequestAndWaitWebLaunch(_x5, _x6) {
         return _sendRequestAndWaitWebLaunch.apply(this, arguments);
       }
       return sendRequestAndWaitWebLaunch;
@@ -787,7 +810,7 @@ var ElementController = /*#__PURE__*/function () {
                     }
                   }, _callee6);
                 }));
-                return function (_x7) {
+                return function (_x8) {
                   return _ref5.apply(this, arguments);
                 };
               }()));
@@ -797,7 +820,7 @@ var ElementController = /*#__PURE__*/function () {
           }
         }, _callee7);
       }));
-      function updatePayment(_x6) {
+      function updatePayment(_x7) {
         return _updatePayment.apply(this, arguments);
       }
       return updatePayment;
@@ -834,6 +857,30 @@ var ElementController = /*#__PURE__*/function () {
       (_this$onStatusChangeC = this.onStatusChangeCallback) === null || _this$onStatusChangeC === void 0 || _this$onStatusChangeC.call(this, "\u72B6\u6001\u7531 ".concat(_status, " \u53D8\u66F4\u4E3A ").concat(status));
       this.elementContainer.setStatus(status);
     }
+  }, {
+    key: "on",
+    value: function on(event, callback) {
+      if (!this.isEventAllowed(event)) {
+        return console.error("Event \"".concat(event, "\" is not allowed."));
+      }
+      this.serviceMap.EventCenter.listen(event, function (data) {
+        callback === null || callback === void 0 || callback(data);
+      });
+    }
+  }, {
+    key: "isEventAllowed",
+    value: function isEventAllowed(event) {
+      var _safeParse, _this$elementContaine;
+      // 获取当前场景
+      var isExpressCheckout = (_safeParse = safeParse((_this$elementContaine = this.elementContainer.getPaymentContext()) === null || _this$elementContaine === void 0 || (_this$elementContaine = _this$elementContaine.paymentSessionObj) === null || _this$elementContaine === void 0 ? void 0 : _this$elementContaine.extendInfo)) === null || _safeParse === void 0 ? void 0 : _safeParse.expressCheckout;
+      var productScene = isExpressCheckout ? ProductScene.EXPRESS_CHECKOUT : ProductScene.ELEMENT_PAYMENT;
+      // 查找对应的产品场景
+      var scenario = productEventScenarios.find(function (s) {
+        return s.eventName === productScene;
+      });
+      // 检查场景存在且事件名称在支持的事件列表中
+      return scenario !== undefined && scenario.supportedEvents.includes(event);
+    }
   }]);
   return ElementController;
 }();

package/esm/core/component/element/elementProcessor/paymentProcessor.js

@@ -88,7 +88,9 @@ var PaymentProcessor = /*#__PURE__*/function (_BaseElementProcessor) {
           sessionResult: paymentContext === null || paymentContext === void 0 ? void 0 : paymentContext.paymentSessionObj,
           notRedirectAfterComplete: (extraParam === null || extraParam === void 0 ? void 0 : extraParam.notRedirectAfterComplete) === true,
           merchantAppointParam: extraParam === null || extraParam === void 0 ? void 0 : extraParam.merchantAppointParam,
-          originOneAccountQueryResult: extraParam === null || extraParam === void 0 ? void 0 : extraParam.originOneAccountQueryResult
+          originOneAccountQueryResult: extraParam === null || extraParam === void 0 ? void 0 : extraParam.originOneAccountQueryResult,
+          // TODO: 传递商户页面的domain
+          doMain: window.location.hostname
         }
       });
     }

package/esm/core/component/element/index.d.ts

@@ -1,4 +1,4 @@
-import { IElementOptions, PaymentMountOptions } from './type';
+import { EventDataMap, EVENTNAME, IElementOptions, PaymentMountOptions, SubmitFuncParams } from './type';
 export declare class ElementComponent {
     private options;
     private controller;
@@ -8,6 +8,7 @@ export declare class ElementComponent {
     validateFields(): Promise<{
         isValid: boolean;
     }>;
-    submitPayment(): Promise<import("./type").IPaymentApiResponse>;
+    submitPayment(params: SubmitFuncParams): Promise<import("./type").IPaymentApiResponse>;
     destroy(): void;
+    on<T extends EVENTNAME>(event: T, callback: (data: EventDataMap[T]) => void): void;
 }

package/esm/core/component/element/index.js

@@ -62,14 +62,19 @@ export var ElementComponent = /*#__PURE__*/function () {
     }
   }, {
     key: "submitPayment",
-    value: function submitPayment() {
-      return this.controller.submitPayment();
+    value: function submitPayment(params) {
+      return this.controller.submitPayment(params);
     }
   }, {
     key: "destroy",
     value: function destroy() {
       this.controller.destroy();
     }
+  }, {
+    key: "on",
+    value: function on(event, callback) {
+      this.controller.on(event, callback);
+    }
   }]);
   return ElementComponent;
 }();

package/esm/core/component/element/type.d.ts

@@ -179,10 +179,15 @@ export interface PaymentMountOptions extends BaseMountOptions {
             'radius-component': string;
             'radius-button': string;
             'wrapper-padding': string;
+            'stroke-default': string;
+            'stroke-active': string;
         }>>;
         card?: {
             showBrandIcon?: boolean;
         };
+        accordion?: {
+            showRadio?: boolean;
+        };
     };
     notRedirectAfterComplete?: boolean;
     merchantAppointParam?: IMerchantAppointParam;
@@ -238,6 +243,23 @@ export interface PaymentSubmitData {
         paymentMethodId?: string;
     };
 }
+export interface ShippingInfo {
+    shippingName: {
+        firstName: string;
+        lastName: string;
+        middleName?: string;
+        fullName?: string;
+    };
+    shippingPhoneNo: string;
+    shippingAddress: {
+        region: string;
+        address1: string;
+        address2: string;
+        city?: string;
+        state?: string;
+        zipCode: string;
+    };
+}
 export interface AddressSubmitData {
     shippingName: {
         firstName: string;
@@ -261,6 +283,10 @@ export interface AddressSubmitData {
     shippingId: string;
     actionFlag?: 'I' | 'U' | 'D';
 }
+export interface SubmitFuncParams {
+    handleActions?: boolean;
+    shippingInfo?: ShippingInfo;
+}
 export interface SubmitServiceParams extends PaymentSubmitData {
     accountInfo: AuthSubmitData['accountInfo'];
     shipping?: AddressSubmitData;
@@ -413,6 +439,14 @@ export interface IToastOptions {
     icon?: 'SUCCESS' | 'FAIL';
     spin?: boolean;
 }
+interface IPaymentSession {
+    nextAction: INextAction;
+}
+interface INextAction {
+    normalUrl: string;
+    applinkUrl?: string;
+    schemeUrl?: string;
+}
 export interface ICommonApiResponse {
     error?: {
         code: string;
@@ -423,8 +457,9 @@ export interface ICommonApiResponse {
     };
 }
 export interface IPaymentApiResponse extends ICommonApiResponse {
-    status: keyof typeof PaymentStatus;
+    status: keyof typeof PaymentStatus | '';
     userCanceled3D?: boolean;
+    session?: IPaymentSession;
 }
 export declare class InvalidElementConfigError extends Error {
     errors: Array<{
@@ -443,4 +478,30 @@ export declare enum EXPOSURE_API_EVENT {
     VALIDATAFIELDS = "validateFields",
     UPDATEPAYMENT = "updatePayment"
 }
+export declare enum EVENTNAME {
+    PAYMENTMETHODCHANGED = "paymentMethodChanged",
+    VALUESCHANGED = "valuesChanged"
+}
+interface PaymentMethodChangedData {
+    type: string;
+    name: string;
+}
+interface ValuesChangedData {
+    region: string;
+    state: string;
+    city: string;
+    address1: string;
+    address2: string;
+    zipCode: string;
+    phoneNo: string;
+    name: {
+        firstName: string;
+        lastName: string;
+        middleName: string;
+    };
+}
+export interface EventDataMap {
+    [EVENTNAME.PAYMENTMETHODCHANGED]: PaymentMethodChangedData;
+    [EVENTNAME.VALUESCHANGED]: ValuesChangedData;
+}
 export {};

package/esm/core/component/element/type.js

@@ -147,4 +147,11 @@ export var EXPOSURE_API_EVENT = /*#__PURE__*/function (EXPOSURE_API_EVENT) {
   EXPOSURE_API_EVENT["VALIDATAFIELDS"] = "validateFields";
   EXPOSURE_API_EVENT["UPDATEPAYMENT"] = "updatePayment";
   return EXPOSURE_API_EVENT;
-}({});
+}({});
+export var EVENTNAME = /*#__PURE__*/function (EVENTNAME) {
+  EVENTNAME["PAYMENTMETHODCHANGED"] = "paymentMethodChanged";
+  EVENTNAME["VALUESCHANGED"] = "valuesChanged";
+  return EVENTNAME;
+}({});
+
+// 支付方式改变的回调函数的数据结构

package/esm/core/component/element/util.d.ts

@@ -83,3 +83,4 @@ export declare const isElementPC: () => boolean;
  */
 export declare const isLoadErrorPage: (params: CashierSdkActionQueryResult) => boolean;
 export declare const safeStringify: (payload: any, defaultValue?: string) => string;
+export declare const safeParse: (payload: any, defaultValue?: Record<string, any>) => Record<string, any>;

package/esm/core/component/element/util.js

@@ -535,4 +535,14 @@ export var safeStringify = function safeStringify(payload) {
     console.error('JSON.stringify failed:', e);
     return defaultValue;
   }
+};
+export var safeParse = function safeParse(payload) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  if (!payload) return defaultValue;
+  try {
+    return JSON.parse(payload) || defaultValue;
+  } catch (e) {
+    console.error('JSON.parse failed:', e);
+    return defaultValue;
+  }
 };

package/esm/foundation/service/log/index.d.ts

@@ -1,5 +1,5 @@
-import { PaymentContext, SDKMetaData, Service } from '../../index';
 import { IoptionsParams } from '../../../types';
+import { PaymentContext, SDKMetaData, Service } from '../../index';
 import { LogExtra, LogMetaData, LogPayload } from './types';
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>

package/esm/foundation/service/log/index.js

@@ -8,10 +8,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { EnvironmentEnum } from "../../../types";
-import { LogComplianceProcessor } from "./processor";
 import { isPC } from "../../../util";
-import { getStorageString, setStorageString } from "../../../util/storage";
 import { SPM_MAP } from "../../../util/spm-map";
+import { getStorageString, setStorageString } from "../../../util/storage";
+import { LogComplianceProcessor } from "./processor";
 
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
@@ -185,14 +185,14 @@ export var LogService = /*#__PURE__*/function () {
     value: function loadScript(url, callback) {
       var _this3 = this;
       /*
-      * 如果宿主环境存在AMD加载器，通过直接创建script标签的方式加载会造成宿主环境报错：
-      * Message: Mismatched anonymous define() module
-      * 原因是直接通过script标签加载的模块如果没有定义模块名，会被AMD加载器认为是匿名模块，
-      * 而宿主环境中已经存在匿名模块，导致报错。
-      *
-      * TODO: 所有通过window.iTracker调用的方法都需要判断
-      *  是否是AMD环境，如果是，需要通过require加载获取iTracker实例
-      * */
+       * 如果宿主环境存在AMD加载器，通过直接创建script标签的方式加载会造成宿主环境报错：
+       * Message: Mismatched anonymous define() module
+       * 原因是直接通过script标签加载的模块如果没有定义模块名，会被AMD加载器认为是匿名模块，
+       * 而宿主环境中已经存在匿名模块，导致报错。
+       *
+       * TODO: 所有通过window.iTracker调用的方法都需要判断
+       *  是否是AMD环境，如果是，需要通过require加载获取iTracker实例
+       * */
       if (typeof window.define === 'function' && window.define.amd && typeof window.require === 'function') {
         var moduleId = 'antom_iTracker';
         try {
@@ -227,7 +227,12 @@ export var LogService = /*#__PURE__*/function () {
       script.onerror = function () {
         console.error("unable to load Antom script: ".concat(url));
       };
-      document.body.appendChild(script);
+      // CDN 方式接入 sdk，执行时机可能在 body 创建之前
+      if (document.body) {
+        document.body.appendChild(script);
+      } else if (document.head) {
+        document.head.appendChild(script);
+      }
     }
   }, {
     key: "initTracker",

package/esm/plugin/component/channel.js

@@ -193,7 +193,9 @@ export var ApplePaySdk = /*#__PURE__*/function () {
                     _context2.prev = 0;
                     requestParams = {
                       validateUrl: event === null || event === void 0 ? void 0 : event.validationURL,
-                      paymentSessionData: _this.paymentSessionData
+                      paymentSessionData: _this.paymentSessionData,
+                      // TODO: 新增appplay入参
+                      merchantDomain: window.location.hostname
                     };
                     _context2.t0 = getApplePayPaymentSession;
                     _context2.t1 = _this.paymentSessionData;
@@ -395,7 +397,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     key: "initApplePaySession",
     value: function () {
       var _initApplePaySession = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _this$logger7, _this$parseData3, _this$logger6, _this$parseData$payme2, recurringInfo, version, _this$logger8;
+        var _this$logger7, _this$parseData3, _this$logger6, _ref4, recurringInfo, version, _this$logger8;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -430,7 +432,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
               }
               throw new Error('Apple Pay not supported');
             case 12:
-              _this$parseData$payme2 = (_this$parseData3 = this.parseData) === null || _this$parseData3 === void 0 ? void 0 : _this$parseData3.paymentSessionFactor, recurringInfo = _this$parseData$payme2.recurringInfo;
+              _ref4 = ((_this$parseData3 = this.parseData) === null || _this$parseData3 === void 0 ? void 0 : _this$parseData3.paymentSessionFactor) || {}, recurringInfo = _ref4.recurringInfo;
               version = recurringInfo ? APPLE_PAY_RECURRING_VERSION : APPLE_PAY_VERSION;
               if (this.isCanMakePayments(version)) {
                 _context5.next = 16;
@@ -478,12 +480,12 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     key: "initSessionParams",
     get: function get() {
       var _this$parseData4;
-      var _ref4 = ((_this$parseData4 = this.parseData) === null || _this$parseData4 === void 0 ? void 0 : _this$parseData4.paymentSessionFactor) || {},
-        merchantInfo = _ref4.merchantInfo,
-        order = _ref4.order,
-        paymentAmount = _ref4.paymentAmount,
-        recurringInfo = _ref4.recurringInfo,
-        extendInfo = _ref4.extendInfo;
+      var _ref5 = ((_this$parseData4 = this.parseData) === null || _this$parseData4 === void 0 ? void 0 : _this$parseData4.paymentSessionFactor) || {},
+        merchantInfo = _ref5.merchantInfo,
+        order = _ref5.order,
+        paymentAmount = _ref5.paymentAmount,
+        recurringInfo = _ref5.recurringInfo,
+        extendInfo = _ref5.extendInfo;
       var request = {
         countryCode: merchantInfo === null || merchantInfo === void 0 ? void 0 : merchantInfo.registeredCountry,
         currencyCode: paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.currency,
@@ -529,10 +531,10 @@ export var ApplePaySdk = /*#__PURE__*/function () {
     key: "isRequiredParameters",
     get: function get() {
       var _this$parseData5;
-      var _ref5 = ((_this$parseData5 = this.parseData) === null || _this$parseData5 === void 0 ? void 0 : _this$parseData5.paymentSessionFactor) || {},
-        merchantInfo = _ref5.merchantInfo,
-        extendInfo = _ref5.extendInfo,
-        paymentAmount = _ref5.paymentAmount;
+      var _ref6 = ((_this$parseData5 = this.parseData) === null || _this$parseData5 === void 0 ? void 0 : _this$parseData5.paymentSessionFactor) || {},
+        merchantInfo = _ref6.merchantInfo,
+        extendInfo = _ref6.extendInfo,
+        paymentAmount = _ref6.paymentAmount;
       return !isEmpty(merchantInfo) && !isEmpty(paymentAmount) && !isEmpty(extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.supportedNetworks) && !isEmpty(extendInfo === null || extendInfo === void 0 ? void 0 : extendInfo.merchantCapabilities);
     }
   }, {

package/esm/types/index.d.ts

@@ -620,6 +620,7 @@ export interface CashierSdkActionQuerySessionResult extends IPaymentSessionMetaD
 export interface ApplePayPaymentSessionRequest {
     validateUrl: string;
     paymentSessionData: string;
+    merchantDomain?: string;
 }
 /**
  * Get App Pay Payment Session Result.