@alipay/ams-checkout 0.0.1754894468-dev.11 → 0.0.1754894468-dev.13

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

@@ -25,20 +25,32 @@ export var formatElementOption = function formatElementOption(options) {
   });
 };
 export var validateElementOption = function validateElementOption(options) {
+  var errors = [];
   if (!options.sessionData) {
+    console.error('sessionData is empty, please check new AMSElement params.');
+    errors.push({
+      field: 'sessionData',
+      message: 'sessionData is empty'
+    });
+  }
+  if (errors.length > 0) {
     var _options$onEventCallb;
     options === null || options === void 0 || (_options$onEventCallb = options.onEventCallback) === null || _options$onEventCallb === void 0 || _options$onEventCallb.call(options, {
       code: EventCallbackCode.SDK_CREATE_COMPONENT_ERROR,
       message: 'sessionData is empty'
     });
-    return false;
   }
-  return true;
+  return {
+    isValid: errors.length === 0,
+    errors: errors
+  };
 };
 
 /**
  * 校验渲染条件
- * 校验当前sdkSelector结点是否存在
+ * 1.校验当前 sdkSelector 结点是否存在
+ * 2.校验当前 Element 的状态是否能够渲染
+ * 3.校验当前 type 类型 Elment 是否已经执行过 mount
  */
 export function checkCanMount(_ref) {
   var sdkSelector = _ref.sdkSelector,
@@ -50,13 +62,15 @@ export function checkCanMount(_ref) {
     console.error("Element with selector ".concat(sdkSelector, " not found."));
     return {
       success: false,
-      errorMsg: "Element with selector ".concat(sdkSelector, " not found.")
+      errorMsg: "Element with selector ".concat(sdkSelector, " not found."),
+      error: ERRORMESSAGE.PARAM_INVALID
     };
   }
   if (status === IElementStatus.DESTROYED) {
     return {
       success: false,
-      errorMsg: "Creating components in the destroyed state is forbidden."
+      errorMsg: "Creating components in the destroyed state is forbidden.",
+      error: ERRORMESSAGE.UI_STATE_ERROR
     };
   }
   if (status === IElementStatus.READY) {
@@ -67,7 +81,8 @@ export function checkCanMount(_ref) {
   if (containerService) {
     return {
       success: false,
-      errorMsg: "SDK status error."
+      errorMsg: "SDK status error.",
+      error: ERRORMESSAGE.UI_STATE_ERROR
     };
   }
   return {
@@ -429,7 +444,7 @@ export function showToast() {
       textAlign: 'center',
       marginTop: '12px',
       lineHeight: '20px',
-      fontFamily: "Noto Sans",
+      fontFamily: 'Noto Sans',
       fontWeight: 400,
       fontSize: '14px'
     }
@@ -474,4 +489,41 @@ export var isElementPad = function isElementPad() {
 };
 export var isElementPC = function isElementPC() {
   return !isElementMobile();
+};
+
+/**
+ * 判断是否需要加载错误页
+ * @param {CashierSdkActionQueryResult} params
+ * @returns {boolean} - 是否需要加载错误页
+ */
+export var isLoadErrorPage = function isLoadErrorPage(params) {
+  var success = params.success,
+    paymentMethods = params.paymentMethods,
+    savedPaymentMethods = params.savedPaymentMethods,
+    orderAmountView = params.orderAmountView,
+    paymentAmountView = params.paymentAmountView;
+
+  // 校验是否存在支付方式
+  var hasValidPaymentMethods = paymentMethods && Array.isArray(paymentMethods) && paymentMethods.length > 0 || savedPaymentMethods && Array.isArray(savedPaymentMethods) && savedPaymentMethods.length > 0;
+
+  // 金额存在性校验
+  var hasAmountViews = !!orderAmountView && !!paymentAmountView;
+
+  // 错误条件判断（满足任意条件即需要展示错误页）
+  return !success ||
+  // 接口请求失败
+  !hasValidPaymentMethods ||
+  // 无有效支付方式
+  !hasAmountViews // 缺少金额展示
+  ;
+};
+export var safeStringify = function safeStringify(payload) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  if (!payload) return defaultValue;
+  try {
+    return JSON.stringify(payload) || defaultValue;
+  } catch (e) {
+    console.error('JSON.stringify failed:', e);
+    return defaultValue;
+  }
 };

package/esm/foundation/core/index.js

@@ -242,7 +242,7 @@ export var AntomSDKCore = /*#__PURE__*/function () {
     value: function () {
       var _startBizFlow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(options) {
         var _this$paymentContext$, _this$paymentContext$2, _this$paymentContext$3;
-        var paymentSession, displayInfo, _convertPaymentSessio2, paymentSessionId, paymentSessionMetaData, mid, webAppMatchConfig, webAppVersion, productScene, paymentMethod, _this$bizFlowStartBeh, payload;
+        var paymentSession, displayInfo, _convertPaymentSessio2, paymentSessionId, paymentSessionMetaData, mid, webAppMatchConfig, webAppVersion, productScene, paymentMethod, _this$bizFlowStartBeh, payload, eventCenter, data;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -252,9 +252,6 @@ export var AntomSDKCore = /*#__PURE__*/function () {
               }
               throw new Error('paymentSession is empty');
             case 2:
-              this.logger.logInfo({
-                title: 'sdk_event_createComponent'
-              });
               this.setStatus(IElementStatus.IN_BIZ_FLOW);
               paymentSession = options.paymentSession, displayInfo = options.displayInfo;
               _convertPaymentSessio2 = convertPaymentSession(paymentSession), paymentSessionId = _convertPaymentSessio2.id, paymentSessionMetaData = _convertPaymentSessio2.data;
@@ -272,10 +269,14 @@ export var AntomSDKCore = /*#__PURE__*/function () {
               webAppMatchConfig = parseWebAppMatchConfig(this.paymentContext.paymentSessionObj.extendInfo);
               webAppVersion = getWebAppVersion(this.sdkMetaData, mid, webAppMatchConfig);
               this.sdkMetaData.webAppVersion = webAppVersion;
-              saveWebAppVersion(webAppVersion, this.sdkMetaData);
-
               // Call service to update via payment context
               ServiceProvider.getInstance(this.instanceId).update(this.paymentContext);
+              // Element使用了新的埋点方案，后续ESP、VAULTING需要同步，将废弃sdk_event_createComponent
+              this.logger.logInfo({
+                title: 'sdk_event_createComponent'
+              });
+              // Storage operations are placed after logInfo
+              saveWebAppVersion(webAppVersion, this.sdkMetaData);
 
               // Invoke processor
               productScene = (_this$paymentContext$2 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$2 === void 0 || (_this$paymentContext$2 = _this$paymentContext$2.paymentSessionConfig) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.productScene;
@@ -322,13 +323,31 @@ export var AntomSDKCore = /*#__PURE__*/function () {
               return _context4.abrupt("return");
             case 36:
               if (!(this.bizFlowStartBehavior.behaviorType === 'REDIRECT')) {
-                _context4.next = 40;
+                _context4.next = 45;
                 break;
               }
               payload = (_this$bizFlowStartBeh = this.bizFlowStartBehavior) === null || _this$bizFlowStartBeh === void 0 ? void 0 : _this$bizFlowStartBeh.payload;
+              if (!options.isNativeAppWebview) {
+                _context4.next = 43;
+                break;
+              }
+              eventCenter = ServiceProvider.getInstance(this.instanceId).getService('EventCenter');
+              data = {
+                normalUrl: (payload === null || payload === void 0 ? void 0 : payload.url) || '',
+                schemeUrl: (payload === null || payload === void 0 ? void 0 : payload.schemeUrl) || '',
+                applinkUrl: (payload === null || payload === void 0 ? void 0 : payload.applinkUrl) || ''
+              };
+              eventCenter.emit(EVENT.eventCallback.name, {
+                code: eventCodeEnum.SDK_REDIRECT,
+                result: {
+                  redirectUrls: data
+                }
+              });
+              return _context4.abrupt("return");
+            case 43:
               redirect(payload, this.instanceId);
               return _context4.abrupt("return");
-            case 40:
+            case 45:
             case "end":
               return _context4.stop();
           }

package/esm/foundation/index.d.ts

@@ -20,6 +20,7 @@ export interface StartBizFlowOptions {
     displayInfo?: Partial<DisplayInfo>;
     submitPayRequestExtra?: any;
     isAppWebview?: boolean;
+    isNativeAppWebview?: boolean;
 }
 export declare class DisplayInfo {
     type: DisplayTypeEnum;

package/esm/foundation/product-processor/easysafepay/index.js

@@ -208,6 +208,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
           appearance: (_this$paymentContext$ = _this.paymentContext.displayInfo) === null || _this$paymentContext$ === void 0 ? void 0 : _this$paymentContext$.appearance,
           notRedirectAfterComplete: ((_this$paymentContext$2 = _this.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this$paymentContext$2 === void 0 ? void 0 : _this$paymentContext$2.notRedirectAfterComplete) === true,
           isAppWebview: _this.paymentContext.startBizFlowOptions.isAppWebview,
+          isNativeAppWebview: _this.paymentContext.startBizFlowOptions.isNativeAppWebview,
           merchantAppointParam: (_this$paymentContext$3 = _this.paymentContext.startBizFlowOptions.submitPayRequestExtra) === null || _this$paymentContext$3 === void 0 ? void 0 : _this$paymentContext$3.merchantAppointParam,
           allowSubmitPayCallAhead: _this.allowSubmitPayCallAhead,
           doubleFaUrl: getDoubleFaUrlFromSession((_this$paymentContext3 = _this.paymentContext) === null || _this$paymentContext3 === void 0 ? void 0 : _this$paymentContext3.paymentSessionObj, _this.initConfig.environment),
@@ -350,7 +351,7 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
     value: function () {
       var _processSubmitPay = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var _this$paymentContext9, _this$paymentContext10, _this$paymentContext11, _this$channelBehavior2, _this$channelBehavior3, _this$paymentContext$8, _this$paymentContext12;
-        var submitParams, _ref3, _ref3$productSceneVer, productSceneVersion, _ref4, _ref4$action, _ref4$action2, _ref4$action2$enableS, enableSignAgreement, _ref4$action2$autoDeb, autoDebitWithToken, _this$paymentContext$7, paymentMethodType, isAppWebview, backScheme, requestBizId, extParams, requester, _this$paymentContext$9, res;
+        var submitParams, _ref3, _ref3$productSceneVer, productSceneVersion, _ref4, _ref4$action, _ref4$action2, _ref4$action2$enableS, enableSignAgreement, _ref4$action2$autoDeb, autoDebitWithToken, _this$paymentContext$7, paymentMethodType, isAppWebview, isNativeAppWebview, backScheme, requestBizId, extParams, requester, _this$paymentContext$9, res;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -365,7 +366,8 @@ export var EasySafePayProcessor = /*#__PURE__*/function () {
                 submitParams['signAgreement'] = enableSignAgreement;
                 paymentMethodType = (_this$paymentContext$7 = this.paymentContext.paymentSessionObj) === null || _this$paymentContext$7 === void 0 || (_this$paymentContext$7 = _this$paymentContext$7.paymentMethodInfoView) === null || _this$paymentContext$7 === void 0 ? void 0 : _this$paymentContext$7.paymentMethodType;
                 isAppWebview = this.paymentContext.startBizFlowOptions.isAppWebview;
-                if (paymentMethodType == 'ALIPAY_CN' && !isAppWebview) {
+                isNativeAppWebview = this.paymentContext.startBizFlowOptions.isNativeAppWebview;
+                if (paymentMethodType === 'ALIPAY_CN' && (!isAppWebview || !isNativeAppWebview)) {
                   backScheme = getBackScheme(undefined, this.logger);
                   if (backScheme && backScheme !== 'https') {
                     submitParams['h5FromApp'] = encodeURIComponent(backScheme);

package/esm/foundation/service/container/popup.d.ts

@@ -6,6 +6,11 @@ export type IPopUpParams = {
     platform: PlatformEnum;
     showCloseOnLoading: boolean;
     onCloseOnLoading: () => void;
+    textDirection?: 'ltr' | 'rtl';
+    loadingConfig?: {
+        theme?: string;
+        backgroundPrimary?: string;
+    };
 };
 /**
  * @author 谦彧 <zhangmian.zm@alipay.com>
@@ -15,6 +20,12 @@ export declare class PopupManager {
     private popupUrlQuery;
     popupApp: HTMLIFrameElement;
     setPopupUrlQuery(queryParams: string): void;
+    /**
+     * 合并URL参数, 优先加载弹窗参数作为基准, 用baseUrl参数覆盖弹窗参数
+     * @param baseUrl 基础URL
+     * @returns 合并后的URL
+     */
+    private mergeUrlParams;
     popup(data: IPopUpParams): Promise<void>;
     pop(): void;
 }

package/esm/foundation/service/container/popup.js

@@ -25,6 +25,26 @@ export var PopupManager = /*#__PURE__*/function () {
     value: function setPopupUrlQuery(queryParams) {
       this.popupUrlQuery = queryParams;
     }
+    /**
+     * 合并URL参数, 优先加载弹窗参数作为基准, 用baseUrl参数覆盖弹窗参数
+     * @param baseUrl 基础URL
+     * @returns 合并后的URL
+     */
+  }, {
+    key: "mergeUrlParams",
+    value: function mergeUrlParams(baseUrl) {
+      var urlObj = new URL(baseUrl);
+      // 优先加载弹窗参数作为基准
+      var mergedParams = new URLSearchParams(this.popupUrlQuery.replace(/^(?:\?|%3F)/i, ''));
+      // 用baseUrl参数覆盖弹窗参数（set方法自动覆盖）
+      urlObj.searchParams.forEach(function (value, key) {
+        mergedParams.set(key, value);
+      });
+      // 将合并后的参数设置到URL对象中
+      urlObj.search = mergedParams.toString();
+      // 返回合并后的URL
+      return urlObj.toString();
+    }
   }, {
     key: "popup",
     value: function () {
@@ -45,7 +65,7 @@ export var PopupManager = /*#__PURE__*/function () {
               pageUrl = data.url;
               _context.prev = 6;
               if (this.popupUrlQuery) {
-                pageUrl = data.url.includes('?') ? "".concat(data.url, "&").concat(this.popupUrlQuery) : "".concat(data.url, "?").concat(this.popupUrlQuery);
+                pageUrl = this.mergeUrlParams(data.url);
               }
               isLoad = false;
               _context.next = 11;
@@ -55,7 +75,8 @@ export var PopupManager = /*#__PURE__*/function () {
                 url: pageUrl,
                 loadingConfig: undefined,
                 showCloseOnLoading: data.showCloseOnLoading,
-                onCloseOnLoading: data.onCloseOnLoading
+                onCloseOnLoading: data.onCloseOnLoading,
+                textDirection: data === null || data === void 0 ? void 0 : data.textDirection
               });
             case 11:
               this.popupApp = _context.sent;

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

@@ -51,6 +51,8 @@ _defineProperty(LogComplianceExtendKeys, "complianceExtParams", {
   callbackData: 'C',
   callbackId: 'C',
   actionNames: 'C',
+  isValid: 'C',
+  needChangeSessionForRetry: 'C',
   // D 维度信息
   operationType: 'D',
   jsApi: 'D',
@@ -86,6 +88,8 @@ _defineProperty(LogComplianceExtendKeys, "complianceExtParams", {
   // 用来标记事件别名
   success: 'D',
   // 用来标记行为是否成功
+  startTime: 'D',
+  endTime: 'D',
   // M 数字类型
   timeCost: 'M',
   pageLoadProgress: 'M',

package/esm/foundation/service/requester/requester.js

@@ -12,8 +12,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 axios from 'axios';
 import { ServiceProvider } from '..';
-import { errorEnum } from "./deps";
-import { appId, device, fomatGetwayError, get, hostSignMap, lightSandboxMap, queryParse, requestHost, safeJson, sdkVersion, sofaId, tntInstId } from "./deps";
+import { appId, device, errorEnum, fomatGetwayError, get, hostSignMap, lightSandboxMap, queryParse, requestHost, safeJson, sdkVersion, sofaId, tntInstId } from "./deps";
 
 /**
  * @author congle.zzq <congle.zzq@alipay.com>
@@ -116,7 +115,7 @@ export var RequesterService = /*#__PURE__*/function () {
                 errorMessage: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message
               });
               timeoutCode = _context.t0 !== null && _context.t0 !== void 0 && (_error$message = _context.t0.message) !== null && _error$message !== void 0 && _error$message.includes('timeout') ? errorEnum.TIMEOUT : '';
-              _errorCode = (_error === null || _error === void 0 ? void 0 : _error.errorCode) || timeoutCode;
+              _errorCode = timeoutCode || (_error === null || _error === void 0 ? void 0 : _error.errorCode);
               this.reportRequestTimeCost({
                 title: 'a3753.b101271.c388193.d521387',
                 name: options === null || options === void 0 ? void 0 : options['Operation-Type'],

package/esm/index.js

@@ -251,7 +251,8 @@ export var AMSEasyPay = /*#__PURE__*/function () {
         displayInfo: {
           type: DisplayTypeEnum.popup
         },
-        isAppWebview: params.isAppWebview
+        isAppWebview: params.isAppWebview,
+        isNativeAppWebview: params.isNativeAppWebview
       });
     }
   }, {

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

@@ -1,9 +1,5 @@
 import type { Logger } from "../../util/logger";
 import { BusContext, BusMessage, BusSubscriber } from "../../core/bus";
-export declare class ApplePayInitMessage {
-    private environment;
-    private locale;
-}
 export declare class ApplePayBusSubscriber extends BusSubscriber {
     private applePay;
     logger: Logger;

package/esm/plugin/applepay/index.js

@@ -1,6 +1,9 @@
 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+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 _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); }; }
@@ -8,9 +11,6 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 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); }
@@ -18,11 +18,13 @@ 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);
-});
+
+// TODO 无意义代码
+// export class ApplePayInitMessage {
+//     private environment:string;
+//     private locale:string;
+// }
+
 export var ApplePayBusSubscriber = /*#__PURE__*/function (_BusSubscriber) {
   _inherits(ApplePayBusSubscriber, _BusSubscriber);
   var _super = _createSuper(ApplePayBusSubscriber);

package/esm/plugin/component/channel.js

@@ -8,14 +8,14 @@ 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 { MODE } from "../../constant/easysafepay";
 import { BusManager, BusMessage } from "../../core/bus";
 import { SecuritySDKActionEnum } from "../../core/bus/interface";
+import { getDoubleFaUrlFromSession } from "../../foundation/utils/web_app_url_utils";
 import { getApplePayPaymentSession, submitPayInfo } from "../../service";
 import { EnvironmentEnum } from "../../types";
 import { device, isEmpty } from "../../util";
 import { APPLE_PAY_RECURRING_VERSION, APPLE_PAY_VERSION } from "../applepay/interface";
-import { getDoubleFaUrlFromSession } from "../../foundation/utils/web_app_url_utils";
-import { MODE } from "../../constant/easysafepay";
 var APPLEPAYERRORENUM = /*#__PURE__*/function (APPLEPAYERRORENUM) {
   APPLEPAYERRORENUM["APPLE_PAY_MISSING_DATA"] = "APPLE_PAY_MISSING_DATA";
   APPLEPAYERRORENUM["APPLE_PAY_NOT_SUPPORTED"] = "APPLE_PAY_NOT_SUPPORTED";
@@ -103,8 +103,21 @@ export var handleGooglePay = function handleGooglePay(data) {
           }
         }
       });
-      // 获取到googlePay token后返回消息给app
-      paymentsClient.loadPaymentData(paymentRequest).then(function (paymentData) {
+      // 使用GooglePay官方API判断设备是否支持，目前WebView场景有bug，不支持的WebView仍然显示支持
+      // UA判断方案和isReadyToPay方案PD决策使用【isReadyToPay方案】
+      // PD已反馈给Google，Google已确认bug待修复
+      paymentsClient.isReadyToPay(paymentRequest).then(function (response) {
+        if (response.result) {
+          // 设备支持 GooglePay，继续拉起
+          return paymentsClient.loadPaymentData(paymentRequest);
+        } else {
+          // 抛错给收银台，目前errorCode未消费
+          reject({
+            errorCode: 'GOOGLE_PAY_NOT_SUPPORTED'
+          });
+        }
+      }).then(function (paymentData) {
+        // 获取到googlePay token后返回消息给app
         if (paymentData) {
           resolve(paymentData);
         }
@@ -112,6 +125,9 @@ export var handleGooglePay = function handleGooglePay(data) {
         reject(err);
       });
     };
+    script.onerror = function (err) {
+      reject(err);
+    };
   });
 };
 export var ApplePaySdk = /*#__PURE__*/function () {

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

@@ -26,6 +26,7 @@ export default class ComponentApp {
     private _renderDisplayType;
     private _multipleCallbackEvents;
     private _isAppWebview;
+    private _isNativeAppWebview;
     _merchantAppointParam: IMerchantAppointParam;
     private _webAppHeartBeatTimeoutFn;
     private _hasRenderComponent;

package/esm/plugin/component/index.js

@@ -17,13 +17,13 @@ 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 { ElementPaymentMethod } from "../../core/component/element/type";
 import { v4 as uuid } from 'uuid';
 import { sdkVersion } from "../../config";
 import { COMPONENTPLUGINID, COMPONENT_CLOSE_BLOCK_ID, COMPONENT_CLOSE_MASK_BLOCK_ID, COMPONENT_CONTAINER_ID, COMPONENT_RETENTION_ID, COMPONENT_SECTION_ID, ERRORMESSAGE, EVENT, LISTENER_PREFIX, LOADING_ID, LOADTIME_LIMIT, MOCKUP_ID, POPUP_LOADTIME_LOG_LIMIT, TIMEOUT_WEB_APP_HEART_BEAT, TIME_DELAY_SEND_HEART_BEAT } from "../../constant";
-import { ElementPaymentMethod } from "../../core/component/oldElement/type";
 import { queryPaymentInfo, submitPayInfo } from "../../service";
 import { ComponentSignEnum, DisplayTypeEnum, eventCodeEnum, MessageName, PlatformEnum, ProductSceneEnum, RedirectType, TargetEnum } from "../../types";
-import { getType, isJsonString, isPC, device } from "../../util";
+import { device, getType, isJsonString, isPC } from "../../util";
 import { getBackScheme } from "../../util/getBackScheme";
 import { isLocalMock } from "../../util/mock";
 import { matchVersion } from "../../util/versionCompare";
@@ -60,6 +60,7 @@ var ComponentApp = /*#__PURE__*/function () {
     _defineProperty(this, "_renderDisplayType", DisplayTypeEnum.popup);
     _defineProperty(this, "_multipleCallbackEvents", void 0);
     _defineProperty(this, "_isAppWebview", void 0);
+    _defineProperty(this, "_isNativeAppWebview", void 0);
     _defineProperty(this, "_merchantAppointParam", void 0);
     _defineProperty(this, "_webAppHeartBeatTimeoutFn", void 0);
     _defineProperty(this, "_hasRenderComponent", false);
@@ -282,6 +283,7 @@ var ComponentApp = /*#__PURE__*/function () {
       var inlineId = "".concat(COMPONENT_CONTAINER_ID).concat(appendAliasContainerId);
       var insertedNode = (this === null || this === void 0 ? void 0 : this._renderDisplayType) === DisplayTypeEnum.inline ? "#".concat(inlineId) : this === null || this === void 0 ? void 0 : this._selector;
       this._isAppWebview = renderParams.isAppWebview;
+      this._isNativeAppWebview = renderParams.isNativeAppWebview;
       this.initLoggerMeta();
       this.initSecurity();
       this._performanceData.push({
@@ -739,7 +741,7 @@ var ComponentApp = /*#__PURE__*/function () {
       this._actionSubmitPromise = new Promise( /*#__PURE__*/function () {
         var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(resolve) {
           var _channelBehavior$buil, _this6$_renderParams$, _this6$_renderParams4;
-          var shouldSkipSubmitPayInSDK, _this6$_renderParams, _this6$_renderParams2, _this6$_renderParams3, _ref10, _ref10$productSceneVe, productSceneVersion, _ref10$productScene, productScene, _ref11, _ref11$action, _ref11$action2, _ref11$action2$enable, enableSignAgreement, _ref11$action2$autoDe, autoDebitWithToken, _ref12, _ref12$paymentMethodI, _ref12$paymentMethodI2, _ref12$paymentMethodI3, paymentMethodType, isAppWebview, backScheme, extParams;
+          var shouldSkipSubmitPayInSDK, _this6$_renderParams, _this6$_renderParams2, _this6$_renderParams3, _ref10, _ref10$productSceneVe, productSceneVersion, _ref10$productScene, productScene, _ref11, _ref11$action, _ref11$action2, _ref11$action2$enable, enableSignAgreement, _ref11$action2$autoDe, autoDebitWithToken, _ref12, _ref12$paymentMethodI, _ref12$paymentMethodI2, _ref12$paymentMethodI3, paymentMethodType, isAppWebview, isNativeAppWebview, backScheme, extParams;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
@@ -764,9 +766,10 @@ var ComponentApp = /*#__PURE__*/function () {
                   _ref11 = ((_this6$_renderParams2 = _this6._renderParams) === null || _this6$_renderParams2 === void 0 ? void 0 : _this6$_renderParams2.paymentSessionMetaData) || {}, _ref11$action = _ref11.action, _ref11$action2 = _ref11$action === void 0 ? {} : _ref11$action, _ref11$action2$enable = _ref11$action2.enableSignAgreement, enableSignAgreement = _ref11$action2$enable === void 0 ? false : _ref11$action2$enable, _ref11$action2$autoDe = _ref11$action2.autoDebitWithToken, autoDebitWithToken = _ref11$action2$autoDe === void 0 ? false : _ref11$action2$autoDe;
                   _ref12 = ((_this6$_renderParams3 = _this6._renderParams) === null || _this6$_renderParams3 === void 0 ? void 0 : _this6$_renderParams3.paymentSessionMetaData) || {}, _ref12$paymentMethodI = _ref12.paymentMethodInfoView, _ref12$paymentMethodI2 = _ref12$paymentMethodI === void 0 ? {} : _ref12$paymentMethodI, _ref12$paymentMethodI3 = _ref12$paymentMethodI2.paymentMethodType, paymentMethodType = _ref12$paymentMethodI3 === void 0 ? '' : _ref12$paymentMethodI3;
                   if (productScene === ProductSceneEnum.EASY_PAY && productSceneVersion === '2.0' && !autoDebitWithToken) {
-                    isAppWebview = _this6._isAppWebview || false; ///EasyPay 2.0 首次传signAgreement字段
+                    isAppWebview = _this6._isAppWebview || false;
+                    isNativeAppWebview = _this6._isNativeAppWebview || false; ///EasyPay 2.0 首次传signAgreement字段
                     params['signAgreement'] = enableSignAgreement;
-                    if (paymentMethodType == 'ALIPAY_CN' && !isAppWebview) {
+                    if (paymentMethodType === 'ALIPAY_CN' && (!isAppWebview || !isNativeAppWebview)) {
                       backScheme = getBackScheme(undefined, _this6.AMSSDK.logger);
                       if (backScheme && backScheme !== 'https') {
                         params['h5FromApp'] = encodeURIComponent(backScheme);
@@ -1869,6 +1872,7 @@ var ComponentApp = /*#__PURE__*/function () {
                     appearance: (_this$_renderParams29 = this._renderParams) === null || _this$_renderParams29 === void 0 ? void 0 : _this$_renderParams29.appearance,
                     notRedirectAfterComplete: ((_this$_renderParams30 = this._renderParams) === null || _this$_renderParams30 === void 0 ? void 0 : _this$_renderParams30.notRedirectAfterComplete) === true,
                     isAppWebview: this._isAppWebview,
+                    isNativeAppWebview: this._isNativeAppWebview,
                     merchantAppointParam: this._merchantAppointParam,
                     allowSubmitPayCallAhead: this._allowSubmitPayCallAhead,
                     /** 地址组件集成的参数 */

package/esm/plugin/drop-in/index.d.ts

@@ -1,5 +1,7 @@
 import type AMSCheckout from '../../core/instance';
 import type { IcreatePaymentParams, EventPayload } from '../../types';
+export declare const getServerPath: (_environment: string, version: string) => string;
+export declare const getServerHost: (_environment: string, version: string) => string;
 export default class CheckoutApp {
     app: any;
     paymentMethodsResult: any;

package/esm/plugin/drop-in/index.js

@@ -15,7 +15,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { BASEPLUGINID, ERRORMESSAGE, EVENT } from "../../constant";
 import { MessageName } from "../../types";
 import { getOrigin, getType, getViewPort, isDom, isJsonString, serialize } from "../../util";
-var getServerPath = function getServerPath() {
+export var getServerPath = function getServerPath() {
   var _environment = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'prod';
   var version = arguments.length > 1 ? arguments[1] : undefined;
   var host = '';
@@ -35,7 +35,7 @@ var getServerPath = function getServerPath() {
   }
   return host;
 };
-var getServerHost = function getServerHost(_environment, version) {
+export var getServerHost = function getServerHost(_environment, version) {
   var reg = /^https?:\/\/([^/<>\s]+\.?)*/;
   var macth = reg.exec(getServerPath(_environment, version));
   return macth && macth[0] || '';

package/esm/types/index.d.ts

@@ -7,7 +7,7 @@
  */
 import { IApplePayContactField } from '../plugin/applepay/interface';
 export type onChange = () => onCnageResult;
-export { ElementType, PaymentElementLayout, ThemeType, type IElementOptions } from '../core/component/oldElement/type';
+export { type IElementOptions, ElementType, PaymentElementLayout, ThemeType } from '../core/component/element/type';
 interface onCnageResult {
     complete: boolean;
     addressValue: AddressItem[];
@@ -123,6 +123,7 @@ export interface IcreateComponent {
     };
     isAppWebview?: boolean;
     merchantAppointParam?: IMerchantAppointParam;
+    isNativeAppWebview?: boolean;
 }
 export interface IappendIframeNodesParams extends IcreateComponent {
     paymentSessionMetaData: IPaymentSessionMetaData;
@@ -425,6 +426,11 @@ export type EventCallbackResult = {
         resultStatus: string;
         resultMessage: string;
     };
+    redirectUrls?: {
+        applinkUrl?: string;
+        schemeUrl?: string;
+        normalUrl?: string;
+    };
     paymentResultCode?: string;
     paymentResultMessage?: string;
     paymentStatus?: string;
@@ -594,6 +600,11 @@ export interface CashierSdkActionQueryResult {
         channelOrderId?: string;
     };
     errorActions?: Record<string, string>;
+    orderAmountView?: IAmountView;
+    paymentAmountView?: IAmountView;
+    paymentMethods?: IPaymentMethod[];
+    savedPaymentMethods?: IPaymentMethod[];
+    traceId?: string;
 }
 export interface CashierSdkActionQuerySessionResult extends IPaymentSessionMetaData {
     success: boolean;
@@ -674,7 +685,11 @@ export declare enum eventCodeEnum {
     SDK_PAYMENT_PROCESSING = "SDK_PAYMENT_PROCESSING",
     SDK_PAYMENT_WARN = "SDK_PAYMENT_WARN",
     SDK_PAYMENT_SHIPPINGCHANGE = "SDK_PAYMENT_SHIPPINGCHANGE",
-    SDK_PAYMENT_APPROVE = "SDK_PAYMENT_APPROVE"
+    SDK_PAYMENT_APPROVE = "SDK_PAYMENT_APPROVE",
+    /**
+     * ESP createComponent时传参isNativeAppWebview:true，ESP外跳授权时透传此SDK给商户
+     */
+    SDK_REDIRECT = "SDK_REDIRECT"
 }
 export declare enum RedirectType {
     ApplinkUrl = "ApplinkUrl",
@@ -832,3 +847,8 @@ export declare enum EventLoggingEventId {
     LeaveAnyWay = "LeaveAnyWay",
     ContinuePaying = "ContinuePaying"
 }
+export interface ErrorMessage {
+    code: string;
+    message: string;
+    [key: string]: ErrorMessage | string;
+}

package/esm/types/index.js

@@ -8,7 +8,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-export { ElementType, PaymentElementLayout, ThemeType } from "../core/component/oldElement/type";
+export { ElementType, PaymentElementLayout, ThemeType } from "../core/component/element/type";
 
 /**
  * SDK options
@@ -194,6 +194,7 @@ export var eventCodeEnum = /*#__PURE__*/function (eventCodeEnum) {
   eventCodeEnum["SDK_PAYMENT_WARN"] = "SDK_PAYMENT_WARN";
   eventCodeEnum["SDK_PAYMENT_SHIPPINGCHANGE"] = "SDK_PAYMENT_SHIPPINGCHANGE";
   eventCodeEnum["SDK_PAYMENT_APPROVE"] = "SDK_PAYMENT_APPROVE";
+  eventCodeEnum["SDK_REDIRECT"] = "SDK_REDIRECT";
   return eventCodeEnum;
 }({});
 export var RedirectType = /*#__PURE__*/function (RedirectType) {