@alipay/ams-checkout 0.0.1746674797-dev.2 → 0.0.1746674797-dev.4

package/esm/component/channel.js

@@ -1,4 +1,5 @@
 import { getDefaultEasySafePayPageUrl } from "../foundation/utils/web_app_url_utils";
+import { ESP_PAGE_NAME } from "../constant/easysafepay";
 export function getChannelBehavior(paymentSessionMetaData) {
   var _paymentSessionMetaDa;
   var allowSubmitPayCallAhead = false;
@@ -76,6 +77,6 @@ export function getDoubleFaUrl(params) {
     sdkVersion = params.sdkVersion;
   var isLandscapeOrientation = false; // Web 不含横屏
 
-  var defaultFaBaseUrl = getDefaultEasySafePayPageUrl("double-fa", env);
+  var defaultFaBaseUrl = getDefaultEasySafePayPageUrl(ESP_PAGE_NAME.DOUBLE_FA, env);
   return "".concat(defaultFaBaseUrl, "?scene=cashierResultPage&instanceId=").concat(instanceId, "&paymentSessionData=").concat(encodeURIComponent(paymentSessionData), "&isLandscape=").concat(isLandscapeOrientation ? 'true' : '', "&pmt=").concat(paymentMethodType, "&locale=").concat(locale, "&sdkVersion=").concat(sdkVersion);
 }

package/esm/constant/easysafepay.d.ts

@@ -0,0 +1,6 @@
+export declare enum ESP_PAGE_NAME {
+    API_PORTAL = "api-portal",
+    SDK_PORTAL = "sdk-portal",
+    DOUBLE_FA = "double-fa",
+    PRELOAD = "preload"
+}

package/esm/constant/easysafepay.js

@@ -0,0 +1,7 @@
+export var ESP_PAGE_NAME = /*#__PURE__*/function (ESP_PAGE_NAME) {
+  ESP_PAGE_NAME["API_PORTAL"] = "api-portal";
+  ESP_PAGE_NAME["SDK_PORTAL"] = "sdk-portal";
+  ESP_PAGE_NAME["DOUBLE_FA"] = "double-fa";
+  ESP_PAGE_NAME["PRELOAD"] = "preload";
+  return ESP_PAGE_NAME;
+}({});

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

@@ -1,5 +1,6 @@
 import { DisplayTypeEnum, PaymentMethodCategoryTypeEnum, ProductSceneEnum } 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.
@@ -21,9 +22,10 @@ export interface WebAppMatchConfig {
  * Sent by server inside paymentSession.
  */
 export interface WebAppUrlMatchConfig {
-    version: string;
+    minSDKVersion: string;
     url: string;
-    mid?: string;
+    doubleFa: string;
+    mids?: string[];
 }
 export interface QueryParams {
     displayType: DisplayTypeEnum;
@@ -89,9 +91,10 @@ export declare const getLocalCheckoutUrl: (productScene: ProductSceneEnum, envir
  * @param productScene - The product scene for which the default checkout URL should be provided.
  */
 export declare const defaultCheckoutUrl: (productScene: ProductSceneEnum, environment?: string) => string;
+export declare const getMatchedWebAppV2Url: (productScene: ProductSceneEnum, mid: string, config: WebAppUrlMatchConfig[], environment: string) => string;
 /**
  * V2应用EasySafePay 热更新兜底URL构建规则
- * 1. 兜底到初始版本v1.0.1
+ * 1. 兜底URL版本与sdk版本保持一致
  * 2. DEV环境下html新增版本前缀
 **/
-export declare const getDefaultEasySafePayPageUrl: (pageName: string, env: string) => string;
+export declare const getDefaultEasySafePayPageUrl: (pageName: ESP_PAGE_NAME, env: string) => string;

package/esm/foundation/utils/web_app_url_utils.js

@@ -5,10 +5,11 @@ 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 { ComponentSignEnum, ProductSceneEnum } from "../../types";
-import { marmotMap, v2AppMarmotMap } from "../../config";
+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.
@@ -196,40 +197,53 @@ 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("api-portal", environment);
+      return getDefaultEasySafePayPageUrl(ESP_PAGE_NAME.API_PORTAL, environment);
     default:
       return '';
   }
 };
-var getMatchedWebAppV2Url = function getMatchedWebAppV2Url(productScene) {
+export 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] : [];
   var environment = arguments.length > 3 ? arguments[3] : undefined;
+  // Default checkout url
   if (config.length === 0) {
-    // Default checkout url
     return defaultCheckoutUrl(productScene, environment);
   }
-  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
+  var matchURLByMid = function matchURLByMid() {
+    var targetConfigEntry = sortedConfig.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 === null || targetConfigEntry === void 0 ? void 0 : targetConfigEntry.url;
-  }
-  var sortedAllMerchantsConfig = sortedConfig.find(function (configEntry) {
-    return configEntry.mid === undefined || configEntry.mid === '';
+  };
+  var matchURLBySDKVersion = function matchURLBySDKVersion() {
+    var targetConfigEntry = sortedConfig.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 === null || targetConfigEntry === void 0 ? void 0 : targetConfigEntry.url;
+  };
+
+  // 按SDK版本降排序
+  var sortedConfig = config.sort(function (a, b) {
+    return compareVersion(b.minSDKVersion, a.minSDKVersion);
   });
-  if (sortedAllMerchantsConfig) {
-    // Match highest version without merchant ID
-    return sortedAllMerchantsConfig === null || sortedAllMerchantsConfig === void 0 ? void 0 : sortedAllMerchantsConfig.url;
-  }
+
+  // 匹配仅针对部分商户生效(mid),且符合版本号的URL
+  var matchedURLByMid = matchURLByMid();
+  if (matchedURLByMid) return matchedURLByMid;
+
+  // 匹配对所有商户生效(无mid),且符合版本号的URL
+  var matchedURLBySDKVersion = matchURLBySDKVersion();
+  if (matchedURLBySDKVersion) return matchedURLBySDKVersion;
 
   // Default checkout url
   return defaultCheckoutUrl(productScene, environment);
@@ -237,19 +251,18 @@ var getMatchedWebAppV2Url = function getMatchedWebAppV2Url(productScene) {
 
 /**
  * V2应用EasySafePay 热更新兜底URL构建规则
- * 1. 兜底到初始版本v1.0.1
+ * 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.0.1/pages/double-fa/index-1.0.1.html',
-  //   dev: 'http://page.alipay.net/page/antom-web-checkout-v2/easysafepay/1.0.1/pages/double-fa/index-1.0.1.html',
-  //   sit: 'http://page.test.alipay.net/page/antom-web-checkout-v2/easysafepay/1.0.1/pages/double-fa/index.html',
-  //   pre: 'https://pre.ac.alipay.com/page/antom-web-checkout-v2/easysafepay/1.0.1/pages/double-fa/index.html',
-  //   prod: 'https://checkout.antom.com/easysafepay/1.0.1/pages/double-fa/index.html',
+  //   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 defaultEasyPayVersion = '1.0.1';
   var environment = env || "prod";
-  if (environment === "dev") return "".concat(v2AppMarmotMap[environment], "/easysafepay/").concat(defaultEasyPayVersion, "/pages/").concat(pageName, "/index-").concat(defaultEasyPayVersion, ".html");else return "".concat(v2AppMarmotMap[environment], "/easysafepay/").concat(defaultEasyPayVersion, "/pages/").concat(pageName, "/index.html");
+  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");
 };

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 { getDefaultEasySafePayPageUrl } from "../../foundation/utils/web_app_url_utils";
+import { ESP_PAGE_NAME } 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";
@@ -70,15 +72,8 @@ export function getDoubleFaUrl(params) {
     sdkVersion = params.sdkVersion;
   var isLandscapeOrientation = false; // Web 不含横屏
 
-  var DOUBLE_FA_URL_MAPPING = {
-    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);
+  var defaultFaBaseUrl = getDefaultEasySafePayPageUrl(ESP_PAGE_NAME.DOUBLE_FA, env);
+  return "".concat(defaultFaBaseUrl, "?scene=cashierResultPage&instanceId=").concat(instanceId, "&paymentSessionData=").concat(encodeURIComponent(paymentSessionData), "&isLandscape=").concat(isLandscapeOrientation ? 'true' : '', "&pmt=").concat(paymentMethodType, "&locale=").concat(locale, "&sdkVersion=").concat(sdkVersion);
 }
 export var handleGooglePay = function handleGooglePay(data) {
   return new Promise(function (resolve, reject) {

package/package.json

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