@zrhsh/wukong-cli 0.4.25 → 0.4.27

package/README.md

@@ -154,7 +154,7 @@ Wukong CLI 使用智能配置，内置默认值：
 ### 配置文件位置
 
 ```bash
-~/wukong-cli.json  # 用户主目录
+~/.wukong-cli/wukong-cli.json  # 用户主目录
 ```
 
 ### 初始化配置

package/dist/cli.js

@@ -2463,6 +2463,48 @@ import ora4 from "ora";
 import chalk6 from "chalk";
 init_oceanet();
 init_config_file_error();
+
+// src/core/http/request-body.ts
+init_esm_shims();
+function parseRequestBody(raw) {
+  if (!raw.trim()) {
+    return {};
+  }
+  try {
+    return { data: JSON.parse(raw) };
+  } catch (error2) {
+    return { error: error2 instanceof Error ? error2.message : String(error2) };
+  }
+}
+function detectPageQueryEnvelope(body) {
+  if (!isPlainObject(body)) {
+    return null;
+  }
+  const hasPagingField = typeof body.current === "number" || typeof body.size === "number";
+  if (!hasPagingField) {
+    return null;
+  }
+  const envelope = body.param;
+  if (isPlainObject(envelope) && isPlainObject(envelope.param)) {
+    return null;
+  }
+  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'
+  };
+}
+
+// src/commands/http.ts
+function fail(message, jsonMode, errorCode = null) {
+  if (jsonMode) {
+    process.stderr.write(
+      JSON.stringify({ error: { code: errorCode, message } }, null, 2) + "\n"
+    );
+  } else {
+    console.error(chalk6.red(message));
+  }
+  process.exit(1);
+}
 function fixGitBashPath(url) {
   if (url.includes(":") && !url.startsWith("http")) {
     const oceanetIndex = url.indexOf("/oceanet-");
@@ -2503,138 +2545,158 @@ function parseParams(params) {
   }
   return `?${searchParams.toString()}`;
 }
+function warnOnPageQueryEnvelope(context) {
+  if (!["POST", "PUT", "PATCH"].includes(context.method.toUpperCase())) {
+    return;
+  }
+  const issue = detectPageQueryEnvelope(context.data);
+  if (!issue) {
+    return;
+  }
+  if (context.jsonMode) {
+    process.stderr.write(JSON.stringify({ warning: issue }, null, 2) + "\n");
+    return;
+  }
+  console.error("");
+  console.error(chalk6.yellow(`[WARNING] ${issue.message}`));
+  console.error("");
+}
+async function sendWithYstToken(context) {
+  const ystAccessToken = await getYstAccessToken();
+  if (!ystAccessToken) {
+    fail("YST token not found. Please re-login: wukong-cli auth login", context.jsonMode);
+  }
+  context.spinner.text = `${context.method} ${chalk6.cyan(context.fullUrl)} (using YST token)`;
+  const fetchOptions = {
+    method: context.method.toUpperCase(),
+    headers: {
+      "Authorization": `Bearer ${ystAccessToken}`,
+      "Content-Type": "application/json",
+      ...context.headers
+    }
+  };
+  if (context.data !== void 0) {
+    fetchOptions.body = JSON.stringify(context.data);
+  }
+  const finalUrl = context.fullUrl + parseParams(context.params);
+  const startTime = Date.now();
+  let response;
+  try {
+    response = await fetch(finalUrl, fetchOptions);
+  } catch (fetchError) {
+    const detail = JSON.stringify(fetchError.cause) || fetchError.message;
+    throw new Error(`Request failed: ${finalUrl}
+  ${detail}`);
+  }
+  const duration = Date.now() - startTime;
+  if (!response.ok) {
+    const errText = await response.text().catch(() => "");
+    throw new ApiError(
+      response.status,
+      `HTTP ${response.status}: ${errText.substring(0, 200)}`
+    );
+  }
+  const body = await response.json();
+  getApiErrorHandler().handle(body);
+  return { data: unwrapResponse(body), duration, tokenKind: "yst" };
+}
+async function sendWithMainToken(context) {
+  const client = getClient();
+  context.spinner.text = `${context.method} ${chalk6.cyan(context.fullUrl)}`;
+  const startTime = Date.now();
+  let payload;
+  switch (context.method.toUpperCase()) {
+    case "GET":
+      payload = await client.get(context.fullUrl + parseParams(context.params));
+      break;
+    case "POST":
+      payload = await client.post(context.fullUrl, context.data, context.headers);
+      break;
+    case "PUT":
+      payload = await client.put(context.fullUrl, context.data, context.headers);
+      break;
+    case "DELETE":
+      payload = await client.delete(context.fullUrl);
+      break;
+    case "PATCH":
+      payload = await client.patch(context.fullUrl, context.data, context.headers);
+      break;
+    default:
+      throw new Error(`Unsupported method: ${context.method}`);
+  }
+  return { data: payload, duration: Date.now() - startTime, tokenKind: "main" };
+}
+function renderResult(result, jsonMode) {
+  if (jsonMode) {
+    process.stdout.write(JSON.stringify(result.data, null, 2) + "\n");
+    return;
+  }
+  console.log("");
+  console.log(chalk6.dim("Token:"), result.tokenKind === "yst" ? "YST" : "main");
+  console.log(chalk6.dim("Duration:"), `${result.duration}ms`);
+  console.log("");
+  console.log(chalk6.dim("Response:"));
+  console.log(JSON.stringify(result.data, null, 2));
+}
+function handleError(error2, jsonMode) {
+  if (error2 instanceof ConfigFileError) {
+    return fail(`Configuration Error
+${error2.toUserMessage()}`, jsonMode);
+  }
+  if (error2 instanceof ApiError) {
+    return fail(`API Error (code: ${error2.code}): ${error2.message}`, jsonMode, error2.code);
+  }
+  return fail(error2 instanceof Error ? error2.message : String(error2), jsonMode);
+}
 async function executeRequest(method, url, options) {
-  const spinner = ora4("Sending request...").start();
+  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");
-      console.error(chalk6.red("Please run: wukong-cli auth login"));
-      process.exit(1);
-    }
-    const fullUrl = buildUrl2(url, options.baseUrl);
-    const customHeaders = parseHeaders(options.headers);
-    const requestData = options.data ? JSON.parse(options.data) : void 0;
-    const isYstRequest = fullUrl.includes("/yst-");
-    if (isYstRequest) {
-      const ystAccessToken = await getYstAccessToken();
-      if (!ystAccessToken) {
-        spinner.fail("YST token not available");
-        console.error(chalk6.red("YST token not found. Please re-login: wukong-cli auth login"));
-        process.exit(1);
-      }
-      spinner.text = `${method} ${chalk6.cyan(fullUrl)} (using YST token)`;
-      const startTime2 = Date.now();
-      const fetchOptions = {
-        method: method.toUpperCase(),
-        headers: {
-          "Authorization": `Bearer ${ystAccessToken}`,
-          "Content-Type": "application/json",
-          ...customHeaders
-        }
-      };
-      if (requestData) {
-        fetchOptions.body = JSON.stringify(requestData);
-      }
-      const finalUrl = fullUrl + parseParams(options.params);
-      let response;
-      try {
-        response = await fetch(finalUrl, fetchOptions);
-      } catch (fetchError) {
-        spinner.fail(`Request failed`);
-        console.error(chalk6.red(`URL: ${finalUrl}`));
-        console.error(chalk6.red(`Error: ${JSON.stringify(fetchError.cause) || fetchError.message}`));
-        process.exit(1);
-      }
-      const duration2 = Date.now() - startTime2;
-      if (!response.ok) {
-        const errText = await response.text().catch(() => "");
-        spinner.fail(`Request failed (${response.status})`);
-        console.error(chalk6.red(`HTTP ${response.status}: ${errText.substring(0, 200)}`));
-        process.exit(1);
-      }
-      const body = await response.json();
-      getApiErrorHandler().handle(body);
-      const data2 = unwrapResponse(body);
-      spinner.succeed("Response received");
-      console.log("");
-      console.log(chalk6.dim("Status:"), `${response.status} ${response.statusText}`);
-      console.log(chalk6.dim("Token:"), "YST");
-      console.log(chalk6.dim("Duration:"), `${duration2}ms`);
-      console.log("");
-      console.log(chalk6.dim("Response:"));
-      console.log(JSON.stringify(data2, null, 2));
-      return;
-    }
-    const client = getClient();
-    spinner.text = `${method} ${chalk6.cyan(fullUrl)}`;
-    const startTime = Date.now();
-    let data;
-    switch (method.toUpperCase()) {
-      case "GET":
-        const getUrl = fullUrl + parseParams(options.params);
-        data = await client.get(getUrl);
-        break;
-      case "POST":
-        data = await client.post(fullUrl, requestData, customHeaders);
-        break;
-      case "PUT":
-        data = await client.put(fullUrl, requestData, customHeaders);
-        break;
-      case "DELETE":
-        data = await client.delete(fullUrl);
-        break;
-      case "PATCH":
-        data = await client.patch(fullUrl, requestData, customHeaders);
-        break;
-      default:
-        throw new Error(`Unsupported method: ${method}`);
-    }
-    const duration = Date.now() - startTime;
-    spinner.succeed("Response received");
-    console.log("");
-    console.log(chalk6.dim("Status:"), "200 OK");
-    console.log("");
-    console.log(chalk6.dim("Response:"));
-    console.log(JSON.stringify(data, null, 2));
+      fail("Not authenticated. Please run: wukong-cli auth login", jsonMode);
+    }
+    const parsed = parseRequestBody(options.data ?? "");
+    if (parsed.error) {
+      spinner.fail("Invalid request body");
+      const received = (options.data ?? "").replace(/\s+/g, " ").trim();
+      fail(`Invalid JSON in -d: ${parsed.error}
+  Received: ${received}`, jsonMode);
+    }
+    const context = {
+      method,
+      fullUrl: buildUrl2(url, options.baseUrl),
+      data: parsed.data,
+      headers: parseHeaders(options.headers),
+      params: options.params,
+      jsonMode,
+      spinner
+    };
+    warnOnPageQueryEnvelope(context);
+    const result = context.fullUrl.includes("/yst-") ? await sendWithYstToken(context) : await sendWithMainToken(context);
+    spinner.succeed(`Response received (${result.duration}ms)`);
+    renderResult(result, jsonMode);
   } catch (error2) {
     spinner.fail("Request failed");
-    if (error2 instanceof ConfigFileError) {
-      console.log("");
-      console.log(chalk6.red(`[ERROR] Configuration Error`));
-      console.log("");
-      console.log(chalk6.red(error2.toUserMessage()));
-      console.log("");
-      process.exit(1);
-    }
-    if (error2 instanceof ApiError) {
-      console.log("");
-      console.log(chalk6.red(`API Error (code: ${error2.code})`));
-      console.log(chalk6.red(error2.message));
-      console.log("");
-      process.exit(1);
-    }
-    if (error2 instanceof Error) {
-      console.error(chalk6.red(error2.message));
-    }
-    process.exit(1);
+    handleError(error2, jsonMode);
   }
 }
 var httpCommand = new Command2("http");
 httpCommand.description("HTTP commands for making API requests");
-httpCommand.command("get <url>").description("Send GET request (uses configured base URL or override with -b)").option("-b, --base-url <url>", "Override base URL").option("-H, --header <key:value>", "Custom header (can be used multiple times)", []).action(async (url, options) => {
+httpCommand.command("get <url>").description("Send GET request (uses configured base URL or override with -b)").option("-b, --base-url <url>", "Override base URL").option("-H, --header <key:value>", "Custom header (can be used multiple times)", []).option("--json", "Print only the response body as JSON").action(async (url, options) => {
   await executeRequest("GET", url, options);
 });
-httpCommand.command("post <url>").description("Send POST request with JSON data").option("-b, --base-url <url>", "Override base URL").option("-H, --header <key:value>", "Custom header (can be used multiple times)", []).option("-d, --data <json>", "Request body as JSON string").action(async (url, options) => {
+httpCommand.command("post <url>").description("Send POST request with JSON data").option("-b, --base-url <url>", "Override base URL").option("-H, --header <key:value>", "Custom header (can be used multiple times)", []).option("-d, --data <json>", "Request body as JSON string").option("--json", "Print only the response body as JSON").action(async (url, options) => {
   await executeRequest("POST", url, options);
 });
-httpCommand.command("put <url>").description("Send PUT request with JSON data").option("-b, --base-url <url>", "Override base URL").option("-H, --header <key:value>", "Custom header (can be used multiple times)", []).option("-d, --data <json>", "Request body as JSON string").action(async (url, options) => {
+httpCommand.command("put <url>").description("Send PUT request with JSON data").option("-b, --base-url <url>", "Override base URL").option("-H, --header <key:value>", "Custom header (can be used multiple times)", []).option("-d, --data <json>", "Request body as JSON string").option("--json", "Print only the response body as JSON").action(async (url, options) => {
   await executeRequest("PUT", url, options);
 });
-httpCommand.command("patch <url>").description("Send PATCH request with JSON data").option("-b, --base-url <url>", "Override base URL").option("-H, --header <key:value>", "Custom header (can be used multiple times)", []).option("-d, --data <json>", "Request body as JSON string").action(async (url, options) => {
+httpCommand.command("patch <url>").description("Send PATCH request with JSON data").option("-b, --base-url <url>", "Override base URL").option("-H, --header <key:value>", "Custom header (can be used multiple times)", []).option("-d, --data <json>", "Request body as JSON string").option("--json", "Print only the response body as JSON").action(async (url, options) => {
   await executeRequest("PATCH", url, options);
 });
-httpCommand.command("delete <url>").description("Send DELETE request").option("-b, --base-url <url>", "Override base URL").option("-H, --header <key:value>", "Custom header (can be used multiple times)", []).action(async (url, options) => {
+httpCommand.command("delete <url>").description("Send DELETE request").option("-b, --base-url <url>", "Override base URL").option("-H, --header <key:value>", "Custom header (can be used multiple times)", []).option("--json", "Print only the response body as JSON").action(async (url, options) => {
   await executeRequest("DELETE", url, options);
 });
 
@@ -3120,7 +3182,7 @@ async function runUpdateCommand({
 }
 var updateCommand = new Command5("update").description("Update wukong-cli to the latest npm version").action(async () => {
   const exitCode = await runUpdateCommand({
-    currentVersion: "0.4.25",
+    currentVersion: "0.4.27",
     versionProvider: new NpmVersionProvider(
       "@zrhsh/wukong-cli",
       "https://registry.npmjs.org"
@@ -3135,7 +3197,7 @@ var updateCommand = new Command5("update").description("Update wukong-cli to the
 
 // src/cli.ts
 var program = new Command6();
-program.name("wukong-cli").description("Wukong CLI - TypeScript implementation").version("0.4.25").option("--debug", "Enable debug mode (show HTTP requests)").hook("preAction", (thisCommand) => {
+program.name("wukong-cli").description("Wukong CLI - TypeScript implementation").version("0.4.27").option("--debug", "Enable debug mode (show HTTP requests)").hook("preAction", (thisCommand) => {
   const options = thisCommand.opts();
   if (options.debug === true) {
     setDebugMode(true, true);
@@ -3154,7 +3216,7 @@ if (process.argv.length === 2) {
 program.parse();
 setImmediate(() => {
   try {
-    const versionChecker = getVersionChecker("0.4.25");
+    const versionChecker = getVersionChecker("0.4.27");
     const notifier = new ConsoleNotifier();
     versionChecker.checkInBackground(notifier).catch(() => {
     });