@alipay/ams-checkout 0.0.1746674797-dev.3 → 0.0.1746674797-dev.5

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

@@ -22,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;
@@ -90,6 +91,7 @@ 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. 兜底URL版本与sdk版本保持一致

package/esm/foundation/utils/web_app_url_utils.js

@@ -7,6 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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";
 /**
@@ -201,35 +202,48 @@ export var defaultCheckoutUrl = function defaultCheckoutUrl(productScene) {
       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);

package/package.json

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