@zrhsh/wukong-cli 0.4.29 → 0.4.30

package/dist/cli.js

@@ -172,6 +172,8 @@ var init_environments = __esm({
         displayName: "Development",
         authBaseUrl: "https://portal-dev.zrhsh.com",
         apiBaseUrl: "https://nrp-dev.zrhsh.com",
+        yosBaseUrl: "https://yos-dev.zrhsh.com",
+        srmBaseUrl: "https://srm-dev.zrhsh.com",
         clientId: "wukong-cli-dev"
       },
       beta: {
@@ -179,6 +181,8 @@ var init_environments = __esm({
         displayName: "Testing",
         authBaseUrl: "https://portal-beta.zrhsh.com",
         apiBaseUrl: "https://nrp-recode.zrhsh.com",
+        yosBaseUrl: "https://yos-beta.zrhsh.com",
+        srmBaseUrl: "https://srm-recode.zrhsh.com",
         clientId: "wukong-cli-beta"
       },
       uat: {
@@ -186,6 +190,8 @@ var init_environments = __esm({
         displayName: "UAT (User Acceptance Testing)",
         authBaseUrl: "https://portal-uat.zrhsh.com",
         apiBaseUrl: "https://nrp-pd.zrhsh.com",
+        yosBaseUrl: "https://yos-uat.zrhsh.com",
+        srmBaseUrl: "https://srm-pd.zrhsh.com",
         clientId: "wukong-cli-uat"
       },
       prod: {
@@ -193,6 +199,8 @@ var init_environments = __esm({
         displayName: "Production",
         authBaseUrl: "https://portal.zrhsh.com",
         apiBaseUrl: "https://nrp.zrhsh.com",
+        yosBaseUrl: "https://yos.zrhsh.com",
+        srmBaseUrl: "https://srm.zrhsh.com",
         clientId: "wukong-cli-prod"
       }
     };
@@ -262,6 +270,9 @@ function loadConfig() {
     return {};
   }
 }
+function normalizeBaseUrl(url) {
+  return url.replace(/\/+$/, "");
+}
 function getMergedEnvironmentConfig(env) {
   const config = loadConfig();
   const defaultEnvConfig = ENVIRONMENTS[env];
@@ -290,12 +301,21 @@ function getMergedEnvironmentConfig(env) {
     return {
       name: env,
       displayName: defaultEnvConfig.displayName,
-      authBaseUrl: envConfig.authBaseUrl,
-      apiBaseUrl: envConfig.apiBaseUrl,
+      authBaseUrl: normalizeBaseUrl(envConfig.authBaseUrl),
+      apiBaseUrl: normalizeBaseUrl(envConfig.apiBaseUrl),
+      // 跨域地址允许不写，缺省沿用内置默认值
+      yosBaseUrl: normalizeBaseUrl(envConfig.yosBaseUrl ?? defaultEnvConfig.yosBaseUrl),
+      srmBaseUrl: normalizeBaseUrl(envConfig.srmBaseUrl ?? defaultEnvConfig.srmBaseUrl),
       clientId: envConfig.clientId
     };
   }
-  return defaultEnvConfig;
+  return {
+    ...defaultEnvConfig,
+    authBaseUrl: normalizeBaseUrl(defaultEnvConfig.authBaseUrl),
+    apiBaseUrl: normalizeBaseUrl(defaultEnvConfig.apiBaseUrl),
+    yosBaseUrl: normalizeBaseUrl(defaultEnvConfig.yosBaseUrl),
+    srmBaseUrl: normalizeBaseUrl(defaultEnvConfig.srmBaseUrl)
+  };
 }
 function getDefaultEnvironment() {
   const envFromVar = process.env.WUKONG_CLI_ENV;
@@ -2551,10 +2571,65 @@ function detectPageQueryEnvelope(body) {
   }
   return {
     code: "PAGEQUERY_ENVELOPE",
-    message: 'current/size \u51FA\u73B0\u5728\u8BF7\u6C42\u4F53\u9876\u5C42\uFF0C\u4F46 param \u5185\u6CA1\u6709\u5D4C\u5957\u7684\u4E1A\u52A1\u6761\u4EF6\u3002\u672C\u6846\u67B6\u7684\u5206\u9875\u67E5\u8BE2\u63A5\u53E3\u9700\u8981\u53CC\u5C42 param\uFF1A{"param":{"current":1,"size":20,"param":{...\u4E1A\u52A1\u6761\u4EF6}}}\u3002\u5199\u6210\u5355\u5C42\u65F6\u63A5\u53E3\u4ECD\u8FD4\u56DE 200\uFF0C\u4F46\u67E5\u8BE2\u6761\u4EF6\u4F1A\u88AB\u9759\u9ED8\u4E22\u5F03\u5E76\u8FD4\u56DE\u5168\u91CF\u6570\u636E\u3002'
+    message: 'current/size \u51FA\u73B0\u5728\u8BF7\u6C42\u4F53\u9876\u5C42\uFF0C\u4E14 param \u5185\u6CA1\u6709\u5D4C\u5957\u7684\u4E1A\u52A1\u6761\u4EF6\u3002\n  \u82E5\u5165\u53C2\u6765\u81EA\u7528\u6237 / \u63A5\u53E3\u6587\u6863 / \u4EE3\u7801 / \u6293\u5305 \u2192 \u4EE5\u539F\u59CB\u5165\u53C2\u4E3A\u51C6\uFF0C\u5FFD\u7565\u672C\u63D0\u793A\u3001\u539F\u6837\u4F20\u9012\u5373\u53EF\u3002\n  \u53EA\u6709\u5728\u6CA1\u6709\u4EFB\u4F55\u539F\u59CB\u5165\u53C2\u3001\u4E14\u786E\u8BA4\u662F\u4E3B\u7AD9\u5206\u9875\u63A5\u53E3\u65F6\uFF0C\u624D\u5C1D\u8BD5\u53CC\u5C42 param\uFF1A\n  {"param":{"current":1,"size":20,"param":{...\u4E1A\u52A1\u6761\u4EF6}}}\n  \u8BD5\u5B8C\u8BF7\u6BD4\u5BF9\u7ED3\u679C\uFF08\u6539\u4E00\u4E2A\u7B5B\u9009\u6761\u4EF6\uFF0C\u770B\u603B\u6570\u662F\u5426\u53D8\u5316\uFF09\uFF0C\u5426\u5219\u53EF\u80FD 200 \u4F46\u6761\u4EF6\u88AB\u4E22\u5F03\u3002'
   };
 }
 
+// src/core/http/target-url.ts
+init_esm_shims();
+var MSYS_ROOT_TAIL = /^[A-Za-z]:.*\/(?:PortableGit|Git|mingw64|usr)(?=\/)/i;
+var SERVICE_SEGMENT = /^(?:oceanet|wukong|yst|yos|srm)(?:-|$)/i;
+function fixGitBashPath(input) {
+  if (!input || input.startsWith("http")) {
+    return input;
+  }
+  if (!/^[A-Za-z]:[\\/]/.test(input)) {
+    return input;
+  }
+  const normalized = input.replace(/\\/g, "/");
+  const rootMatch = normalized.match(MSYS_ROOT_TAIL);
+  if (rootMatch) {
+    return normalized.slice(rootMatch[0].length);
+  }
+  const segments = normalized.split("/");
+  const serviceIndex = segments.findIndex((segment) => SERVICE_SEGMENT.test(segment));
+  if (serviceIndex > 0) {
+    return `/${segments.slice(serviceIndex).join("/")}`;
+  }
+  return input;
+}
+function joinUrl(baseUrl, path2) {
+  const base = baseUrl.replace(/\/+$/, "");
+  if (!path2) {
+    return base;
+  }
+  return `${base}${path2.startsWith("/") ? path2 : `/${path2}`}`;
+}
+function isOceanetApiHost(targetUrl, apiBaseUrl) {
+  try {
+    return new URL(targetUrl).host.toLowerCase() === new URL(apiBaseUrl).host.toLowerCase();
+  } catch {
+    return false;
+  }
+}
+function getHost(targetUrl) {
+  try {
+    return new URL(targetUrl).host.toLowerCase();
+  } catch {
+    return "";
+  }
+}
+function resolveTokenKind(targetUrl) {
+  const host = getHost(targetUrl);
+  if (/^srm[.-]/i.test(host)) {
+    return "yst";
+  }
+  if (/^yos[.-]/i.test(host)) {
+    return "main";
+  }
+  return targetUrl.includes("/yst-") ? "yst" : "main";
+}
+
 // src/core/http/response-guard.ts
 init_esm_shims();
 var AUTH_ERROR_CODES = [401, 403, 9913, 9914];
@@ -2595,15 +2670,6 @@ function fail(message, jsonMode, errorCode = null, exitCode = 1) {
   }
   process.exit(exitCode);
 }
-function fixGitBashPath(url) {
-  if (url.includes(":") && !url.startsWith("http")) {
-    const oceanetIndex = url.indexOf("/oceanet-");
-    if (oceanetIndex >= 0) {
-      return url.substring(oceanetIndex);
-    }
-  }
-  return url;
-}
 function parseHeaders(headers) {
   const result = {};
   if (Array.isArray(headers)) {
@@ -2623,7 +2689,7 @@ function buildUrl2(url, baseUrl) {
   }
   const config = OCEANET_CONFIG();
   const base = baseUrl || config.API_BASE_URL;
-  return `${base}${cleanUrl}`;
+  return joinUrl(base, cleanUrl);
 }
 function parseParams(params) {
   if (!params || Object.keys(params).length === 0) {
@@ -2639,6 +2705,9 @@ function warnOnPageQueryEnvelope(context) {
   if (!["POST", "PUT", "PATCH"].includes(context.method.toUpperCase())) {
     return;
   }
+  if (!isOceanetApiHost(context.fullUrl, OCEANET_CONFIG().API_BASE_URL)) {
+    return;
+  }
   const issue = detectPageQueryEnvelope(context.data);
   if (!issue) {
     return;
@@ -2747,11 +2816,6 @@ async function executeRequest(method, url, options) {
   const jsonMode = options.json === true;
   const spinner = ora4({ text: "Sending request...", isSilent: jsonMode }).start();
   try {
-    const accessToken = await getAccessToken();
-    if (!accessToken) {
-      spinner.fail("Not authenticated");
-      fail("Not authenticated. Please run: wukong-cli auth login", jsonMode);
-    }
     const parsed = parseRequestBody(options.data ?? "");
     if (parsed.error) {
       spinner.fail("Invalid request body");
@@ -2759,9 +2823,18 @@ async function executeRequest(method, url, options) {
       fail(`Invalid JSON in -d: ${parsed.error}
   Received: ${received}`, jsonMode);
     }
+    const fullUrl = buildUrl2(url, options.baseUrl);
+    const tokenKind = resolveTokenKind(fullUrl);
+    if (tokenKind === "main") {
+      const accessToken = await getAccessToken();
+      if (!accessToken) {
+        spinner.fail("Not authenticated");
+        fail("Not authenticated. Please run: wukong-cli auth login", jsonMode);
+      }
+    }
     const context = {
       method,
-      fullUrl: buildUrl2(url, options.baseUrl),
+      fullUrl,
       data: parsed.data,
       headers: parseHeaders(options.headers),
       params: options.params,
@@ -2769,7 +2842,7 @@ async function executeRequest(method, url, options) {
       spinner
     };
     warnOnPageQueryEnvelope(context);
-    const result = context.fullUrl.includes("/yst-") ? await sendWithYstToken(context) : await sendWithMainToken(context);
+    const result = tokenKind === "yst" ? await sendWithYstToken(context) : await sendWithMainToken(context);
     if (looksLikeHtml(result.data)) {
       spinner.fail("Unexpected HTML response");
       fail(describeHtmlResponse(), jsonMode, null, 2);
@@ -3041,6 +3114,8 @@ function reportSwitch(name, previous) {
   console.log(chalk9.dim(`  Environment: ${config.displayName}`));
   console.log(chalk9.dim(`  API Base:    ${config.apiBaseUrl}`));
   console.log(chalk9.dim(`  Auth Base:   ${config.authBaseUrl}`));
+  console.log(chalk9.dim(`  YOS Base:    ${config.yosBaseUrl}  ${chalk9.dim("(main token)")}`));
+  console.log(chalk9.dim(`  SRM Base:    ${config.srmBaseUrl}  ${chalk9.dim("(YST token)")}`));
   console.log(chalk9.dim(`  Config:      ${getUserConfigPath()}`));
   if (previous !== name) {
     console.log(chalk9.dim(`  Previous:    ${previous}`));
@@ -3122,6 +3197,8 @@ function runCurrent(json) {
           displayName: config.displayName,
           authBaseUrl: config.authBaseUrl,
           apiBaseUrl: config.apiBaseUrl,
+          yosBaseUrl: config.yosBaseUrl,
+          srmBaseUrl: config.srmBaseUrl,
           clientId: config.clientId
         },
         null,
@@ -3134,6 +3211,8 @@ function runCurrent(json) {
   console.log(`${chalk9.bold(env)} - ${chalk9.dim(config.displayName)}`);
   console.log(chalk9.dim(`  API Base:  ${config.apiBaseUrl}`));
   console.log(chalk9.dim(`  Auth Base: ${config.authBaseUrl}`));
+  console.log(chalk9.dim(`  YOS Base:  ${config.yosBaseUrl}  (main token)`));
+  console.log(chalk9.dim(`  SRM Base:  ${config.srmBaseUrl}  (YST token)`));
   console.log(chalk9.dim(`  Client ID: ${config.clientId}`));
   console.log(chalk9.dim(`  Source:    ${SOURCE_LABEL[source]}`));
   console.log("");