@microbt/environment 1.2.9 → 1.2.10

package/.claude/settings.local.json

@@ -6,6 +6,7 @@
       "Bash(node:*)"
     ],
     "deny": [],
-    "ask": []
+    "ask": [],
+    "defaultMode": "acceptEdits"
   }
 }

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

@@ -6,6 +6,14 @@ export declare const SUPPORTED_DOMAINS: string[];
  * @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

@@ -20,6 +20,22 @@ function validateDomain(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");
@@ -62,5 +78,6 @@ export {
   environment,
   isAWSDomain,
   region,
-  validateDomain
+  validateDomain,
+  validateDomainWithRegion
 };

package/dist/esm/gateway/index.js

@@ -1,5 +1,12 @@
 // src/gateway/index.ts
-import { environment, isAWSDomain, region, validateDomain } from "../environment/index";
+import { EnvironmentStrategyFactory } from "../environment/factory";
+import {
+  environment,
+  isAWSDomain,
+  region,
+  validateDomain,
+  validateDomainWithRegion
+} from "../environment/index";
 import { URLStrategyFactory } from "./factory";
 function getCurrentDomain() {
   const host = location.host;
@@ -10,24 +17,40 @@ function baseUrl(params) {
     if (!params.name) {
       throw new Error("name parameter is required");
     }
-    const domain = params.domain ? validateDomain(params.domain) : getCurrentDomain();
+    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 strategy = URLStrategyFactory.getStrategy(domain);
     const urlParams = {
       name: params.name,
       path: params.path || ""
     };
     if (strategy.features.supportEnv) {
-      const env = environment();
+      const env = params.domain ? EnvironmentStrategyFactory.getStrategy(domain).getEnvironment(params.domain) : environment();
       if (env === "unknown") {
         return params.path;
       }
       urlParams.env = env;
     }
     if (strategy.features.supportRegion) {
-      urlParams.region = region();
+      urlParams.region = params.domain ? EnvironmentStrategyFactory.getStrategy(domain).getRegion(params.domain) : region();
     }
     if (strategy.features.supportAWS) {
-      urlParams.isAWS = isAWSDomain();
+      urlParams.isAWS = params.domain ? EnvironmentStrategyFactory.getStrategy(domain).isAWS(params.domain) : isAWSDomain();
     }
     return strategy.generateURL(urlParams);
   } catch (error) {

package/package.json

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