@alipay/ams-checkout 0.0.1746673215-dev.1 → 0.0.1746674797-dev.0

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

@@ -1,4 +1,4 @@
-import { DisplayTypeEnum, PaymentMethodCategoryTypeEnum } from '../../types';
+import { DisplayTypeEnum, PaymentMethodCategoryTypeEnum, ProductSceneEnum } from '../../types';
 import { SDKMetaData } from '../index';
 /**
  * Tell the SDK which version of the Web App to load.
@@ -16,6 +16,15 @@ export interface WebAppMatchConfig {
     mid?: string;
     greyscale?: string;
 }
+/**
+ * Tell the SDK which Web App URL to load.
+ * Sent by server inside paymentSession.
+ */
+export interface WebAppUrlMatchConfig {
+    version: string;
+    url: string;
+    mid?: string;
+}
 export interface QueryParams {
     displayType: DisplayTypeEnum;
     locale: string;
@@ -27,20 +36,56 @@ 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;
+/**
+ * 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) => 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) => string;

package/esm/foundation/utils/web_app_url_utils.js

@@ -1,9 +1,11 @@
 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 } from "../../config";
 import { queryParse, serialize } from "../../util";
 import { isDebugLog } from "../../util/debug";
 
@@ -12,14 +14,21 @@ import { isDebugLog } from "../../util/debug";
  * 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 +66,29 @@ 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;
+  var webAppUrlMatchConfig = parseWebAppUrlMatchConfig(extendInfo);
+  var v2Url = isPreload ? getLocalCheckoutUrl(productScene) : getMatchedWebAppV2Url(productScene, mid, webAppUrlMatchConfig);
+  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 +102,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 +115,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);
+    default:
+      return "".concat(marmotMap[environment], "/").concat(productSceneWithPaymentMethodCategoryType, "/").concat(validProductSceneVersion, "/index.").concat(webAppVersion, ".html");
+  }
 };
 export var parseWebAppMatchConfig = function parseWebAppMatchConfig(extendInfo) {
   if (!extendInfo) {
@@ -96,6 +135,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 +160,75 @@ 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);
+};
+
+/**
+ * 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) {
+  var key = KEY_CHECKOUT_URL + productScene;
+  var previousCheckoutUrl = localStorage.getItem(key);
+  return previousCheckoutUrl !== null && previousCheckoutUrl !== void 0 ? previousCheckoutUrl : defaultCheckoutUrl(productScene);
+};
+
+/**
+ * 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 defaultEnvironment = 'prod';
+  switch (productScene) {
+    case ProductSceneEnum.EASY_PAY:
+      return "".concat(v2AppMarmotMap[defaultEnvironment], "/easysafepay/pages/sdk-portal/index.html");
+    default:
+      return '';
+  }
+};
+var getMatchedWebAppV2Url = function getMatchedWebAppV2Url(productScene) {
+  var mid = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  if (config.length === 0) {
+    // Default checkout url
+    return defaultCheckoutUrl(productScene);
+  }
+  var sortedConfig = config.sort(function (a, b) {
+    return parseFloat(b.version) - parseFloat(a.version);
+  });
+  var targetConfigEntry = sortedConfig.find(function (configEntry) {
+    var _configEntry$mid;
+    var isMatchMid = (_configEntry$mid = configEntry.mid) !== null && _configEntry$mid !== void 0 && _configEntry$mid.trim() ? configEntry.mid.toUpperCase().includes(mid === null || mid === void 0 ? void 0 : mid.toUpperCase()) : true;
+    if (isMatchMid) {
+      return configEntry;
+    }
+  });
+  if (targetConfigEntry) {
+    // Match merchant ID
+    return targetConfigEntry === null || targetConfigEntry === void 0 ? void 0 : targetConfigEntry.url;
+  }
+  var sortedAllMerchantsConfig = sortedConfig.find(function (configEntry) {
+    return configEntry.mid === undefined || configEntry.mid === '';
+  });
+  if (sortedAllMerchantsConfig) {
+    // Match highest version without merchant ID
+    return sortedAllMerchantsConfig === null || sortedAllMerchantsConfig === void 0 ? void 0 : sortedAllMerchantsConfig.url;
+  }
+
+  // Default checkout url
+  return defaultCheckoutUrl(productScene);
 };

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.js

@@ -71,11 +71,11 @@ export function getDoubleFaUrl(params) {
   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")
+    local: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index-1.0.1.html',
+    dev: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index-1.0.1.html',
+    sit: 'http://page.test.alipay.net/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index.html',
+    pre: 'https://pre.ac.alipay.com/page/antom-web-checkout-v2/easysafepay/pages/double-fa/index.html',
+    prod: 'https://checkout.antom.com/easysafepay/pages/double-fa/index.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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1746673215-dev.1",
+  "version": "0.0.1746674797-dev.0",
   "description": "",
   "author": "",
   "main": "esm/index.js",