@microbt/environment 1.2.10 → 1.2.11

package/dist/esm/environment/index.d.ts

@@ -1,19 +1,4 @@
 export declare const SUPPORTED_DOMAINS: string[];
-/**
- * 验证域名是否在支持列表中
- * @param domain 要验证的域名
- * @returns 有效的域名
- * @throws 如果域名不在支持列表中
- */
-export declare function validateDomain(domain: string): string;
-/**
- * 验证传入的域名是否有效
- * 对于支持 region 的域名，必须是包含环境信息的完整域名（如二级域名）
- * 对于不支持 region 的域名，根域名也是有效的
- * @param domain 要验证的域名
- * @returns 是否为有效域名
- */
-export declare function validateDomainWithRegion(domain: string): boolean;
 export declare function environment(): string;
 export declare function region(): string;
 export declare function isAWSDomain(): boolean;

package/dist/esm/environment/index.js

@@ -13,35 +13,16 @@ var SUPPORTED_DOMAINS = [
   "127.0.0.1",
   "localhost"
 ];
-function validateDomain(domain) {
-  const validDomain = SUPPORTED_DOMAINS.find((d) => domain.endsWith(d));
-  if (!validDomain) {
-    throw new Error(`Unsupported domain: ${domain}`);
-  }
-  return validDomain;
-}
-function validateDomainWithRegion(domain) {
-  try {
-    const validBaseDomain = validateDomain(domain);
-    const strategy = EnvironmentStrategyFactory.getStrategy(validBaseDomain);
-    if (!strategy.features.supportRegion) {
-      return true;
-    }
-    if (domain === validBaseDomain) {
-      return false;
-    }
-    const extractedRegion = strategy.getRegion(domain);
-    return extractedRegion !== "unknown";
-  } catch (e) {
-    return false;
-  }
-}
 function getCurrentDomain() {
   if (typeof location === "undefined") {
     throw new Error("location is not defined");
   }
   const host = location.host;
-  return validateDomain(host);
+  const domain = SUPPORTED_DOMAINS.find((d) => host.endsWith(d));
+  if (!domain) {
+    throw new Error(`Unsupported domain: ${host}`);
+  }
+  return domain;
 }
 function environment() {
   try {
@@ -77,7 +58,5 @@ export {
   SUPPORTED_DOMAINS,
   environment,
   isAWSDomain,
-  region,
-  validateDomain,
-  validateDomainWithRegion
+  region
 };

package/dist/esm/gateway/index.d.ts

@@ -1,10 +1,9 @@
 /**
- * 根据域名生成基于 name 和 path 的 baseUrl
+ * 根据当前域名生成基于 name 和 path 的 baseUrl
  *
  * @param params 配置参数
  * @param params.name - 必填，API 服务名称（例如：'api', 'iot-api'）
  * @param params.path - 可选，API 路径（例如：'/saas'）
- * @param params.domain - 可选，指定域名（必须符合SUPPORTED_DOMAINS约束）
  * @returns 生成的 URL。如果生成失败则返回传入的 path 值
  *
  * @example
@@ -12,7 +11,6 @@
  * // 中国区开发环境
  * baseUrl({ name: 'api' }) // => '//api-cn-dev.superacme.com'
  * baseUrl({ name: 'iot-api', path: '/saas' }) // => '//iot-api-cn-dev.superacme.com/saas'
- * baseUrl({ name: 'api', domain: 'superacme.com' }) // => '//api-cn-dev.superacme.com'
  *
  * // 美区 AWS 环境
  * // location.host: 'mall-us-aws.superacme.com'
@@ -21,7 +19,6 @@
  * // Safio365 域名系列
  * // location.host: 'iot-dev.safio365.com'
  * baseUrl({ name: 'iot-api', path: '/saas' }) // => '//iot-api-dev.safio365.com/saas'
- * baseUrl({ name: 'iot-api', domain: 'safio365.com' }) // => '//iot-api-dev.safio365.com/saas'
  *
  * // Sensforge 域名系列
  * // location.host: 'api-dev.sensforge.com'
@@ -33,5 +30,4 @@
 export declare function baseUrl(params: {
     name: string;
     path?: string;
-    domain?: string;
 }): string | undefined;

package/dist/esm/gateway/index.js

@@ -1,56 +1,37 @@
 // src/gateway/index.ts
-import { EnvironmentStrategyFactory } from "../environment/factory";
-import {
-  environment,
-  isAWSDomain,
-  region,
-  validateDomain,
-  validateDomainWithRegion
-} from "../environment/index";
+import { environment, isAWSDomain, region, SUPPORTED_DOMAINS } from "../environment/index";
 import { URLStrategyFactory } from "./factory";
 function getCurrentDomain() {
   const host = location.host;
-  return validateDomain(host);
+  const domain = SUPPORTED_DOMAINS.find((domain2) => host.endsWith(domain2));
+  if (!domain) {
+    throw new Error(`Unsupported domain: ${host}`);
+  }
+  return domain;
 }
 function baseUrl(params) {
   try {
     if (!params.name) {
       throw new Error("name parameter is required");
     }
-    let domain;
-    if (params.domain) {
-      if (!validateDomainWithRegion(params.domain)) {
-        const baseDomain = validateDomain(params.domain);
-        const strategy2 = EnvironmentStrategyFactory.getStrategy(baseDomain);
-        if (strategy2.features.supportRegion) {
-          throw new Error(
-            `Domain '${params.domain}' requires region information. Cannot determine region from root domain. Please provide a subdomain like 'api-cn-dev.${params.domain}' instead.`
-          );
-        } else {
-          throw new Error(`Invalid domain '${params.domain}'.`);
-        }
-      }
-      domain = validateDomain(params.domain);
-    } else {
-      domain = getCurrentDomain();
-    }
+    const domain = getCurrentDomain();
     const strategy = URLStrategyFactory.getStrategy(domain);
     const urlParams = {
       name: params.name,
       path: params.path || ""
     };
     if (strategy.features.supportEnv) {
-      const env = params.domain ? EnvironmentStrategyFactory.getStrategy(domain).getEnvironment(params.domain) : environment();
+      const env = environment();
       if (env === "unknown") {
         return params.path;
       }
       urlParams.env = env;
     }
     if (strategy.features.supportRegion) {
-      urlParams.region = params.domain ? EnvironmentStrategyFactory.getStrategy(domain).getRegion(params.domain) : region();
+      urlParams.region = region();
     }
     if (strategy.features.supportAWS) {
-      urlParams.isAWS = params.domain ? EnvironmentStrategyFactory.getStrategy(domain).isAWS(params.domain) : isAWSDomain();
+      urlParams.isAWS = isAWSDomain();
     }
     return strategy.generateURL(urlParams);
   } catch (error) {

package/dist/esm/global.d.ts

@@ -46,7 +46,6 @@ declare global {
     region?: string;
     isAWS?: boolean;
     path?: string;
-    domain?: string;
   };
 
   interface DomainFeatures {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microbt/environment",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "description": "microbt app library for environment",
   "keywords": [],
   "license": "MIT",