@alipay/ams-checkout 0.0.1748327361-dev.0 → 0.0.1748918972-dev.0

package/esm/foundation/utils/preload_helper.js

@@ -8,7 +8,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { sdkVersion } from "../../config";
 import { createPreloadIframe } from "../service/container/utils";
 import { ProductSceneEnum } from "../../types";
-import { getWebAppUrl } from "../utils/web_app_url_utils";
+import { getWebAppUrl, getWebAppV2Url } from "../utils/web_app_url_utils";
 import { ProductInfoCacheUtil } from "../utils/payment_product_utils";
 import { getWebAppVersion } from "./payment_context_utils";
 import { getSecurityConfigStorageKey, getSecurityHost, getSecurityScene, Security } from "../../util/security";
@@ -22,12 +22,13 @@ var PreloadHelper = /*#__PURE__*/function () {
     key: "preloadWebApp",
     value: function preloadWebApp(productScene, paymentMethodCategoryType) {
       var environment = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'prod';
+      var useV2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       try {
         if (this.isWebAppPreloaded) {
           console.log('[web-sdk] web app already preloaded');
           return;
         }
-        var _this$buildWebAppPrel = this.buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment),
+        var _this$buildWebAppPrel = this.buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment, useV2),
           preloadUrl = _this$buildWebAppPrel.preloadUrl,
           containerId = _this$buildWebAppPrel.containerId;
         var preloadIframe = createPreloadIframe(containerId);
@@ -89,6 +90,7 @@ var PreloadHelper = /*#__PURE__*/function () {
   }, {
     key: "buildWebAppPreloadUrl",
     value: function buildWebAppPreloadUrl(productScene, paymentMethodCategoryType, environment) {
+      var useV2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       var productSceneVersion = productScene === ProductSceneEnum.EASY_PAY ? '2.0' : '1.0';
       var previousProductInfo = ProductInfoCacheUtil.getPreviousProductInfo(productScene);
       if (previousProductInfo) {
@@ -101,14 +103,16 @@ var PreloadHelper = /*#__PURE__*/function () {
         webAppVersion: ''
       };
       sdkMetaData.webAppVersion = getWebAppVersion(sdkMetaData);
-      var preloadUrl = getWebAppUrl({
+      var preloadUrlParams = {
         environment: environment,
         sdkMetaData: sdkMetaData,
         paymentMethodCategoryType: paymentMethodCategoryType,
         isPreload: true,
+        productScene: productScene,
         productSceneVersion: productSceneVersion,
         query: undefined
-      });
+      };
+      var preloadUrl = useV2 ? getWebAppV2Url(preloadUrlParams) : getWebAppUrl(preloadUrlParams);
       return {
         preloadUrl: preloadUrl,
         containerId: containerId

package/esm/foundation/utils/web_app_url_utils.d.ts

@@ -1,5 +1,6 @@
-import { DisplayTypeEnum, PaymentMethodCategoryTypeEnum } from '../../types';
+import { DisplayTypeEnum, PaymentMethodCategoryTypeEnum, ProductSceneEnum, IPaymentSessionMetaData } from '../../types';
 import { SDKMetaData } from '../index';
+import { ESP_PAGE_NAME } from "../../constant/easysafepay";
 /**
  * Tell the SDK which version of the Web App to load.
  * Sent by server inside paymentSession.
@@ -16,6 +17,16 @@ export interface WebAppMatchConfig {
     mid?: string;
     greyscale?: string;
 }
+/**
+ * Tell the SDK which Web App URL to load.
+ * Sent by server inside paymentSession.
+ */
+export interface WebAppUrlMatchConfig {
+    minSDKVersion: string;
+    url: string;
+    doubleFa: string;
+    mids?: string[];
+}
 export interface QueryParams {
     displayType: DisplayTypeEnum;
     locale: string;
@@ -27,20 +38,79 @@ export interface QueryParams {
 export declare const getWebAppUrlInfo: (params: {
     environment: string;
     sdkMetaData: SDKMetaData;
+    productScene: ProductSceneEnum;
     productSceneVersion: string;
     paymentMethodCategoryType: PaymentMethodCategoryTypeEnum;
     isPreload?: boolean;
     query: QueryParams;
+    v2Url?: string;
 }) => {
     path: string;
     locationSearch: string;
 };
+export declare const getWebAppV2Url: (params: {
+    environment: string;
+    sdkMetaData: SDKMetaData;
+    productScene: ProductSceneEnum;
+    productSceneVersion: string;
+    paymentMethodCategoryType: PaymentMethodCategoryTypeEnum;
+    isPreload?: boolean;
+    query: QueryParams;
+    mid?: string;
+    extendInfo?: string;
+}) => string;
 export declare const getWebAppUrl: (params: {
     environment: string;
     sdkMetaData: SDKMetaData;
+    productScene: ProductSceneEnum;
     productSceneVersion: string;
     paymentMethodCategoryType: PaymentMethodCategoryTypeEnum;
     isPreload?: boolean;
     query: QueryParams;
+    v2Url?: string;
 }) => string;
 export declare const parseWebAppMatchConfig: (extendInfo: string) => WebAppMatchConfig[];
+export declare const parseWebAppUrlMatchConfig: (extendInfo: string) => WebAppUrlMatchConfig[];
+/**
+ * Save the current checkout URL to localStorage for the specified product scene.
+ *
+ * @param productScene - The product scene for which the checkout URL should be saved.
+ */
+export declare const saveLocalCheckoutUrl: (productScene: ProductSceneEnum, url: string) => void;
+/**
+ * 获取从外部动态下发的V2AppUrl.
+ *
+ * @param config - sessionData解析来的checkoutInfo列表.
+ */
+export declare const getMatchedWebAppV2Url: (productScene: ProductSceneEnum, mid: string, configs: WebAppUrlMatchConfig[], env: string) => string;
+/**
+ * 获取ESP从sessionData.checkoutInfo内动态下发的Url.
+ */
+export declare const matchEasySafePayV2Url: (params: {
+    configs: WebAppUrlMatchConfig[];
+    mid: string;
+    env: string;
+    pageName: ESP_PAGE_NAME;
+}) => string;
+/**
+ * Retrieve the saved checkout URL from localStorage for the specified product scene.
+ * If no url is found, a default checkout url string is returned.
+ *
+ * @param productScene - The product scene for which the checkout URL should be retrieved.
+ */
+export declare const getLocalCheckoutUrl: (productScene: ProductSceneEnum, environment: string) => string;
+/**
+ * Provide default checkout URL for the specified product scene.
+ * Return URL for 'EASY_PAY' product scene, while for other product scenes, it returns an empty string as they are not currently in use
+ *
+ * @param productScene - The product scene for which the default checkout URL should be provided.
+ */
+export declare const defaultCheckoutUrl: (productScene: ProductSceneEnum, environment?: string) => string;
+/**
+ * V2应用EasySafePay 热更新兜底URL构建规则
+ * 1. 兜底URL版本与sdk版本保持一致
+ * 2. DEV环境下html新增版本前缀
+**/
+export declare const getDefaultEasySafePayPageUrl: (pageName: ESP_PAGE_NAME, env: string) => string;
+/**通过sessionData获取doubleFa,于createComponent时传递给WEB应用*/
+export declare const getDoubleFaUrlFromSession: (paymentSessionObj: IPaymentSessionMetaData, env?: string) => string;

package/esm/foundation/utils/web_app_url_utils.js

@@ -1,25 +1,35 @@
 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 _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 { ComponentSignEnum } from "../../types";
-import { marmotMap } from "../../config";
+import { ComponentSignEnum, ProductSceneEnum } from "../../types";
+import { marmotMap, v2AppMarmotMap, sdkVersion } from "../../config";
 import { queryParse, serialize } from "../../util";
+import { compareVersion } from "../../util/versionCompare";
 import { isDebugLog } from "../../util/debug";
-
+import { ESP_PAGE_NAME } from "../../constant/easysafepay";
 /**
  * Tell the SDK which version of the Web App to load.
  * Sent by server inside paymentSession.
  */
 
+/**
+ * Tell the SDK which Web App URL to load.
+ * Sent by server inside paymentSession.
+ */
+
 export var getWebAppUrlInfo = function getWebAppUrlInfo(params) {
   var environment = params.environment,
     sdkMetaData = params.sdkMetaData,
+    productScene = params.productScene,
     productSceneVersion = params.productSceneVersion,
     paymentMethodCategoryType = params.paymentMethodCategoryType,
     query = params.query,
-    isPreload = params.isPreload;
-  var path = getAppPath(environment, sdkMetaData, productSceneVersion, paymentMethodCategoryType);
+    isPreload = params.isPreload,
+    v2Url = params.v2Url;
+  var path = getAppPath(environment, sdkMetaData, productScene, productSceneVersion, paymentMethodCategoryType, v2Url);
   var _queryParse = queryParse(),
     _sandbox = _queryParse._sandbox,
     _light_sandbox = _queryParse._light_sandbox,
@@ -57,6 +67,30 @@ export var getWebAppUrlInfo = function getWebAppUrlInfo(params) {
     locationSearch: locationSearch
   };
 };
+export var getWebAppV2Url = function getWebAppV2Url(params) {
+  var productScene = params.productScene,
+    isPreload = params.isPreload,
+    mid = params.mid,
+    extendInfo = params.extendInfo,
+    environment = params.environment;
+  var webAppUrlMatchConfig = parseWebAppUrlMatchConfig(extendInfo);
+  var v2Url = isPreload ? getLocalCheckoutUrl(productScene, environment) : getMatchedWebAppV2Url(productScene, mid, webAppUrlMatchConfig, environment);
+  var info = getWebAppUrlInfo(_objectSpread(_objectSpread({}, params), {}, {
+    v2Url: v2Url
+  }));
+  if (!isPreload && v2Url && info.path) {
+    console.log('[web-sdk] save web app, url: ', info.path);
+    saveLocalCheckoutUrl(productScene, info.path);
+  }
+  var webAppUrl;
+  if (info.path.indexOf('?') !== -1) {
+    webAppUrl = "".concat(info.path, "&").concat(info.locationSearch);
+  } else {
+    webAppUrl = "".concat(info.path, "?").concat(info.locationSearch);
+  }
+  console.log('[web-sdk] web app, url: ', webAppUrl);
+  return webAppUrl;
+};
 export var getWebAppUrl = function getWebAppUrl(params) {
   var info = getWebAppUrlInfo(params);
   var webAppUrl;
@@ -70,8 +104,10 @@ export var getWebAppUrl = function getWebAppUrl(params) {
 var getAppPath = function getAppPath() {
   var environment = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'prod';
   var sdkMetaData = arguments.length > 1 ? arguments[1] : undefined;
-  var productSceneVersion = arguments.length > 2 ? arguments[2] : undefined;
-  var paymentMethodCategoryType = arguments.length > 3 ? arguments[3] : undefined;
+  var productScene = arguments.length > 2 ? arguments[2] : undefined;
+  var productSceneVersion = arguments.length > 3 ? arguments[3] : undefined;
+  var paymentMethodCategoryType = arguments.length > 4 ? arguments[4] : undefined;
+  var v2Url = arguments.length > 5 ? arguments[5] : undefined;
   var _ref = queryParse() || {},
     urlTestHost = _ref.host;
   // only for test while testurl?host=https://xxxxx.test.html
@@ -81,7 +117,12 @@ var getAppPath = function getAppPath() {
   var validProductSceneVersion = getValidProductSceneVersion(sdkMetaData.productScene, productSceneVersion, paymentMethodCategoryType);
   var productSceneWithPaymentMethodCategoryType = "".concat(sdkMetaData.productScene, "_").concat(paymentMethodCategoryType);
   var webAppVersion = sdkMetaData.webAppVersion;
-  return "".concat(marmotMap[environment], "/").concat(productSceneWithPaymentMethodCategoryType, "/").concat(validProductSceneVersion, "/index.").concat(webAppVersion, ".html");
+  switch (productScene) {
+    case ProductSceneEnum.EASY_PAY:
+      return v2Url !== null && v2Url !== void 0 ? v2Url : defaultCheckoutUrl(productScene, environment);
+    default:
+      return "".concat(marmotMap[environment], "/").concat(productSceneWithPaymentMethodCategoryType, "/").concat(validProductSceneVersion, "/index.").concat(webAppVersion, ".html");
+  }
 };
 export var parseWebAppMatchConfig = function parseWebAppMatchConfig(extendInfo) {
   if (!extendInfo) {
@@ -96,6 +137,18 @@ export var parseWebAppMatchConfig = function parseWebAppMatchConfig(extendInfo)
     return [];
   }
 };
+export var parseWebAppUrlMatchConfig = function parseWebAppUrlMatchConfig(extendInfo) {
+  if (!extendInfo) {
+    return [];
+  }
+  try {
+    var extendInfoJson = JSON.parse(extendInfo);
+    return extendInfoJson === null || extendInfoJson === void 0 ? void 0 : extendInfoJson.checkoutInfo;
+  } catch (error) {
+    console.error('Parse the url config for Web app failed#', error);
+    return [];
+  }
+};
 var getValidProductSceneVersion = function getValidProductSceneVersion(productScene, productSceneVer, paymentMethodCategoryType) {
   var _supportMapping;
   var supportMapping = (_supportMapping = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_supportMapping, ComponentSignEnum.NONE, ['']), ComponentSignEnum.AUTO_DEBIT_WALLET, ['1.0']), ComponentSignEnum.AUTO_DEBIT_PAY_WALLET, ['']), ComponentSignEnum.CASHIER_PAYMENT_BANK, ['1.0']), ComponentSignEnum.CASHIER_PAYMENT_CARD, ['1.0']), ComponentSignEnum.CASHIER_PAYMENT_APM, ['1.0']), ComponentSignEnum.EASY_PAY_WALLET, ['1.0', '2.0']), ComponentSignEnum.EASY_PAY_APM, ['2.0']), ComponentSignEnum.VAULTING_CARD, ['1.0']), ComponentSignEnum.ELEMENT_PAYMENT, ['1.0']), _defineProperty(_defineProperty(_supportMapping, ComponentSignEnum.ELEMENT_ADDRESS, ['1.0']), ComponentSignEnum.CHECKOUT_PAYMENT, ['1.0']));
@@ -109,4 +162,158 @@ var getValidProductSceneVersion = function getValidProductSceneVersion(productSc
   });
   var latestVersion = targetVersions[targetVersions.length - 1];
   return isSupport ? productSceneVer : latestVersion;
+};
+var KEY_CHECKOUT_URL = "web_url_";
+
+/**
+ * Save the current checkout URL to localStorage for the specified product scene.
+ *
+ * @param productScene - The product scene for which the checkout URL should be saved.
+ */
+export var saveLocalCheckoutUrl = function saveLocalCheckoutUrl(productScene, url) {
+  var key = KEY_CHECKOUT_URL + productScene;
+  localStorage.setItem(key, url);
+};
+
+/**
+ * 获取从外部动态下发的V2AppUrl.
+ *
+ * @param config - sessionData解析来的checkoutInfo列表.
+ */
+export var getMatchedWebAppV2Url = function getMatchedWebAppV2Url(productScene) {
+  var mid = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var configs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var env = arguments.length > 3 ? arguments[3] : undefined;
+  switch (productScene) {
+    case ProductSceneEnum.EASY_PAY:
+      return matchEasySafePayV2Url({
+        configs: configs,
+        mid: mid,
+        env: env,
+        pageName: ESP_PAGE_NAME.SDK_PORTAL
+      });
+    default:
+      return defaultCheckoutUrl(productScene, env);
+  }
+};
+
+/**
+ * 获取ESP从sessionData.checkoutInfo内动态下发的Url.
+ */
+export var matchEasySafePayV2Url = function matchEasySafePayV2Url(params) {
+  var _params$configs = params.configs,
+    configs = _params$configs === void 0 ? [] : _params$configs,
+    _params$mid = params.mid,
+    mid = _params$mid === void 0 ? '' : _params$mid,
+    env = params.env,
+    pageName = params.pageName;
+  var matchURLByMid = function matchURLByMid() {
+    var sortedConfigs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var targetConfigEntry = sortedConfigs.find(function (configEntry) {
+      var _configEntry$mids;
+      var isMatchMid = !!(configEntry !== null && configEntry !== void 0 && (_configEntry$mids = configEntry.mids) !== null && _configEntry$mids !== void 0 && _configEntry$mids.includes(mid));
+      var isMatchVersion = compareVersion(sdkVersion, configEntry.minSDKVersion) >= 0;
+      if (isMatchMid && isMatchVersion) {
+        return configEntry;
+      }
+    });
+    return targetConfigEntry;
+  };
+  var matchURLBySDKVersion = function matchURLBySDKVersion() {
+    var sortedConfigs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var targetConfigEntry = sortedConfigs.find(function (configEntry) {
+      var isCommonConfig = (configEntry === null || configEntry === void 0 ? void 0 : configEntry.mids) === undefined;
+      var isMatchVersion = compareVersion(sdkVersion, configEntry.minSDKVersion) >= 0;
+      if (isCommonConfig && isMatchVersion) {
+        return configEntry;
+      }
+    });
+    return targetConfigEntry;
+  };
+  var matchConfig = function matchConfig() {
+    // 按SDK版本降排序
+    var sortedConfig = configs.sort(function (a, b) {
+      return compareVersion(b.minSDKVersion, a.minSDKVersion);
+    });
+
+    // 匹配仅针对部分商户生效(mid),且符合版本号的URL
+    var matchedURLByMid = matchURLByMid(sortedConfig);
+    if (matchedURLByMid) return matchedURLByMid;
+
+    // 匹配对所有商户生效(无mid),且符合版本号的URL
+    var matchedURLBySDKVersion = matchURLBySDKVersion(sortedConfig);
+    if (matchedURLBySDKVersion) return matchedURLBySDKVersion;
+  };
+  var defaultEspUrl = getDefaultEasySafePayPageUrl(pageName, env);
+
+  // 匹配config
+  var config = matchConfig();
+  if (!config) return defaultEspUrl;
+
+  // 根据pageName匹配URL
+  if (pageName == ESP_PAGE_NAME.SDK_PORTAL) return (config === null || config === void 0 ? void 0 : config.url) || defaultEspUrl;
+  if (pageName == ESP_PAGE_NAME.DOUBLE_FA) return (config === null || config === void 0 ? void 0 : config.doubleFa) || defaultEspUrl;
+  return defaultEspUrl;
+};
+
+/**
+ * Retrieve the saved checkout URL from localStorage for the specified product scene.
+ * If no url is found, a default checkout url string is returned.
+ *
+ * @param productScene - The product scene for which the checkout URL should be retrieved.
+ */
+export var getLocalCheckoutUrl = function getLocalCheckoutUrl(productScene, environment) {
+  var key = KEY_CHECKOUT_URL + productScene;
+  var previousCheckoutUrl = localStorage.getItem(key);
+  return previousCheckoutUrl !== null && previousCheckoutUrl !== void 0 ? previousCheckoutUrl : defaultCheckoutUrl(productScene, environment);
+};
+
+/**
+ * Provide default checkout URL for the specified product scene.
+ * Return URL for 'EASY_PAY' product scene, while for other product scenes, it returns an empty string as they are not currently in use
+ *
+ * @param productScene - The product scene for which the default checkout URL should be provided.
+ */
+export var defaultCheckoutUrl = function defaultCheckoutUrl(productScene) {
+  var environment = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "prod";
+  switch (productScene) {
+    case ProductSceneEnum.EASY_PAY:
+      return getDefaultEasySafePayPageUrl(ESP_PAGE_NAME.SDK_PORTAL, environment);
+    default:
+      return '';
+  }
+};
+
+/**
+ * V2应用EasySafePay 热更新兜底URL构建规则
+ * 1. 兜底URL版本与sdk版本保持一致
+ * 2. DEV环境下html新增版本前缀
+**/
+export var getDefaultEasySafePayPageUrl = function getDefaultEasySafePayPageUrl(pageName, env) {
+  // 生成的URL EXAMPLE:
+  // const DEFAULT_DOUBLE_FA_URL_MAPPING = {
+  //   local: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/1.36.0/pages/double-fa/index-1.36.0.html',
+  //   dev: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/1.36.0/pages/double-fa/index-1.36.0.html',
+  //   sit: 'http://page.test.alipay.net/page/antom-web-checkout-v2/easysafepay/1.36.0/pages/double-fa/index.html',
+  //   pre: 'https://pre.ac.alipay.com/page/antom-web-checkout-v2/easysafepay/1.36.0/pages/double-fa/index.html',
+  //   prod: 'https://checkout.antom.com/easysafepay/1.36.0/pages/double-fa/index.html',
+  // };
+  var environment = env || "prod";
+  if (environment === "dev") return "".concat(v2AppMarmotMap[environment], "/easysafepay/").concat(sdkVersion, "/pages/").concat(pageName, "/index-").concat(sdkVersion, ".html");else return "".concat(v2AppMarmotMap[environment], "/easysafepay/").concat(sdkVersion, "/pages/").concat(pageName, "/index.html");
+};
+
+/**通过sessionData获取doubleFa,于createComponent时传递给WEB应用*/
+//TODO 后续需要构造一个类，专门用于构造&存储web应用url
+export var getDoubleFaUrlFromSession = function getDoubleFaUrlFromSession(paymentSessionObj) {
+  var env = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "prod";
+  var mid = paymentSessionObj.clientId;
+  var extendInfo = paymentSessionObj.extendInfo;
+  var configs = parseWebAppUrlMatchConfig(extendInfo);
+  var url = matchEasySafePayV2Url({
+    configs: configs,
+    mid: mid,
+    env: env,
+    pageName: ESP_PAGE_NAME.DOUBLE_FA
+  });
+  return url;
 };

package/esm/index.js

@@ -271,7 +271,7 @@ export var AMSEasyPay = /*#__PURE__*/function () {
         securityRegion: 'SG',
         environment: 'prod'
       };
-      PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, options.environment);
+      PreloadHelper.preloadWebApp(ProductSceneEnum.EASY_PAY, PaymentMethodCategoryTypeEnum.WALLET, options.environment, true);
     }
   }]);
   return AMSEasyPay;

package/esm/plugin/component/cashierApp.js

@@ -15,7 +15,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * 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 { elementAppMarmotMap, marmotMap, sdkVersion } from "../../config/index";
+import { v2AppMarmotMap, marmotMap, sdkVersion } from "../../config/index";
 import { ComponentSignEnum, ComponentSignEnumV2 } from "../../types";
 import { isDebugLog } from "../../util/debug";
 import { queryParse, serialize } from "../../util/index";
@@ -103,7 +103,7 @@ export var getAppPath = function getAppPath() {
   }
   // 地址应用特殊处理
   if (componentSign === ComponentSignEnum.ELEMENT_ADDRESS) {
-    return "".concat(elementAppMarmotMap[environment], "/element-address/").concat(finalAppVersion, "/pages/address/index.html");
+    return "".concat(v2AppMarmotMap[environment], "/element-address/").concat(finalAppVersion, "/pages/address/index.html");
   }
   // element应用特殊处理
   if (_toConsumableArray(Object.values(ComponentSignEnumV2)).includes(componentSign)) {
@@ -117,9 +117,9 @@ export var getAppPath = function getAppPath() {
     }
     if (isExpressCheckout) {
       // express_checkout模式走单独映射
-      return "".concat(elementAppMarmotMap[environment], "/elements/").concat(finalAppVersion, "/pages/express_checkout/index.html");
+      return "".concat(v2AppMarmotMap[environment], "/elements/").concat(finalAppVersion, "/pages/express_checkout/index.html");
     } else {
-      return "".concat(elementAppMarmotMap[environment], "/elements/").concat(finalAppVersion, "/pages/").concat(productScene.toLowerCase(), "/index.html");
+      return "".concat(v2AppMarmotMap[environment], "/elements/").concat(finalAppVersion, "/pages/").concat(productScene.toLowerCase(), "/index.html");
     }
   }
   return "".concat(marmotMap[environment], "/").concat(componentSign, "/").concat(finalProductSceneVersion, "/index.").concat(finalAppVersion, ".html");

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

@@ -11,12 +11,14 @@ export type IChannelBehavior = {
 type GetDoubleFaParams = {
     instanceId: string;
     paymentSessionData: string;
+    paymentSessionObj: IPaymentSessionMetaData;
     locale: string;
     paymentMethodType: string;
     env: string;
     sdkVersion: string;
+    notRedirectAfterComplete: boolean;
 };
-export declare function getChannelBehavior(paymentSessionMetaData?: IPaymentSessionMetaData): IChannelBehavior | undefined;
+export declare function getChannelBehavior(paymentSessionMetaData?: IPaymentSessionMetaData, notRedirectAfterComplete?: boolean): IChannelBehavior | undefined;
 export declare function getDoubleFaUrl(params: GetDoubleFaParams): string;
 export declare const handleGooglePay: (data: EventPayload) => Promise<unknown>;
 export declare class ApplePaySdk {

package/esm/plugin/component/channel.js

@@ -14,6 +14,8 @@ 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";
@@ -27,7 +29,7 @@ var PAYMENT_STATUS = /*#__PURE__*/function (PAYMENT_STATUS) {
   PAYMENT_STATUS["NORMAL"] = "NORMAL";
   return PAYMENT_STATUS;
 }(PAYMENT_STATUS || {});
-export function getChannelBehavior(paymentSessionMetaData) {
+export function getChannelBehavior(paymentSessionMetaData, notRedirectAfterComplete) {
   var _paymentSessionMetaDa, _paymentSessionMetaDa2, _paymentSessionMetaDa3, _paymentSessionMetaDa4, _paymentSessionMetaDa5, _paymentSessionMetaDa6, _paymentSessionMetaDa7, _paymentSessionMetaDa8;
   // TOSS EASYPAY 2.0
   if ('BANKTRANSFER_QUICKPAY' === (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa = paymentSessionMetaData.paymentMethodInfoView) === null || _paymentSessionMetaDa === void 0 ? void 0 : _paymentSessionMetaDa.paymentMethodType) && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa2 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa2 === void 0 ? void 0 : _paymentSessionMetaDa2.productScene) === 'EASY_PAY' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa3 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa3 === void 0 ? void 0 : _paymentSessionMetaDa3.paymentMethodCategoryType) === 'APM' && (paymentSessionMetaData === null || paymentSessionMetaData === void 0 || (_paymentSessionMetaDa4 = paymentSessionMetaData.paymentSessionConfig) === null || _paymentSessionMetaDa4 === void 0 ? void 0 : _paymentSessionMetaDa4.productSceneVersion) === '2.0') {
@@ -40,7 +42,8 @@ export function getChannelBehavior(paymentSessionMetaData) {
       buildSubmitPayExtParams: function buildSubmitPayExtParams(params) {
         var callBackUrl = getDoubleFaUrl(params);
         return {
-          callBackUrl: callBackUrl
+          callBackUrl: callBackUrl,
+          notRedirectAfterComplete: notRedirectAfterComplete === true
         };
       }
     };
@@ -65,20 +68,15 @@ export function getDoubleFaUrl(params) {
   var instanceId = params.instanceId,
     paymentMethodType = params.paymentMethodType,
     paymentSessionData = params.paymentSessionData,
+    paymentSessionObj = params.paymentSessionObj,
     locale = params.locale,
     env = params.env,
-    sdkVersion = params.sdkVersion;
+    sdkVersion = params.sdkVersion,
+    notRedirectAfterComplete = params.notRedirectAfterComplete;
   var isLandscapeOrientation = false; // Web 不含横屏
 
-  var DOUBLE_FA_URL_MAPPING = {
-    local: "http://page.alipay.net/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
-    dev: "http://page.alipay.net/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
-    sit: "http://page.test.alipay.net/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
-    pre: "https://pre.ac.alipay.com/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html"),
-    prod: "https://ac.alipay.com/page/antom-web-checkout/src/component-app/doubleFA/index.".concat(sdkVersion, ".html")
-  };
-  var doubleFaBaseUrl = DOUBLE_FA_URL_MAPPING[env] || DOUBLE_FA_URL_MAPPING.prod;
-  return "".concat(doubleFaBaseUrl, "?scene=cashierResultPage&instanceId=").concat(instanceId, "&paymentSessionData=").concat(encodeURIComponent(paymentSessionData), "&isLandscape=").concat(isLandscapeOrientation ? 'true' : '', "&pmt=").concat(paymentMethodType, "&locale=").concat(locale, "&sdkVersion=").concat(sdkVersion);
+  var baseDoubleFaUrl = getDoubleFaUrlFromSession(paymentSessionObj, env);
+  return "".concat(baseDoubleFaUrl) + '?' + "scene=cashierResultPage" + '&' + "instanceId=".concat(instanceId) + '&' + "paymentSessionData=".concat(encodeURIComponent(paymentSessionData)) + '&' + "isLandscape=".concat(isLandscapeOrientation ? 'true' : '') + '&' + "pmt=".concat(paymentMethodType) + '&' + "locale=".concat(locale) + '&' + "mode=".concat(MODE.SDK) + '&' + "sdkVersion=".concat(sdkVersion) + '&' + "&notRedirectAfterComplete=".concat(notRedirectAfterComplete);
 }
 export var handleGooglePay = function handleGooglePay(data) {
   return new Promise(function (resolve, reject) {