xapi-to 0.1.10 → 0.1.12

package/README.md

@@ -25,7 +25,7 @@ xapi register
 xapi config set apiKey=sk-xxx
 
 # 3. Or via env var
-export XAPI_API_KEY=sk-xxx
+export XAPI_KEY=sk-xxx
 
 # 4. Verify connectivity
 xapi config health
@@ -76,7 +76,7 @@ xapi oauth providers                                 # list available providers
 
 ```bash
 xapi register                                        # create account, saves apiKey automatically
-xapi balance                                         # show xToken balance
+xapi balance                                         # show USD balance
 xapi topup                                           # generate payment URL
 xapi topup --method stripe --amount 10               # stripe, $10
 xapi topup --method x402                             # x402 (USDC on Base)
@@ -119,7 +119,7 @@ xapi list --format table                             # human-readable table
 
 | Variable | Description |
 |---|---|
-| `XAPI_API_KEY` | API key (overrides config file) |
+| `XAPI_KEY` | API key (overrides config file) |
 | `XAPI_ACTION_HOST` | Action service host (default: `action.xapi.to`) |
 | `XAPI_OUTPUT` | Default output format (`json`\|`pretty`\|`table`) |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xapi-to",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Agent-friendly CLI for xapi - discover and call capabilities and APIs",
   "type": "module",
   "bin": {

package/src/client.ts

@@ -124,13 +124,14 @@ export async function actionCall(
   actionId: string,
   input: Record<string, unknown>,
   opts: ClientOptions,
+  httpMethod?: string,
 ) {
   return request<unknown>(
     `${baseUrl(opts)}/v1/actions/execute`,
     {
       method: 'POST',
       headers: headers(opts.apiKey),
-      body: JSON.stringify({ action_id: actionId, input }),
+      body: JSON.stringify({ action_id: actionId, ...(httpMethod ? { method: httpMethod } : {}), input }),
     },
     EXECUTE_TIMEOUT_MS,
   );

package/src/codegen.ts

@@ -13,6 +13,7 @@ export interface CodegenParams {
   actionId: string;
   input: Record<string, unknown>;
   actionHost: string;
+  method?: string;
 }
 
 interface ResolvedTarget {
@@ -109,8 +110,8 @@ function baseUrl(actionHost: string): string {
   return `${scheme(actionHost)}://${actionHost}/v1/actions/execute`;
 }
 
-function jsonBody(actionId: string, input: Record<string, unknown>): string {
-  return JSON.stringify({ action_id: actionId, input }, null, 2);
+function jsonBody(actionId: string, input: Record<string, unknown>, method?: string): string {
+  return JSON.stringify({ action_id: actionId, ...(method ? { method } : {}), input }, null, 2);
 }
 
 /** Re-indent a multi-line string so continuation lines are aligned */
@@ -127,22 +128,22 @@ function shellEscape(s: string): string {
 
 function genCurl(params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input);
+  const body = jsonBody(params.actionId, params.input, params.method);
   return [
-    '# Set XAPI_API_KEY env var or replace with your key',
+    '# Set XAPI_KEY env var or replace with your key',
     `curl -X POST '${shellEscape(url)}' \\`,
     `  -H 'Content-Type: application/json' \\`,
-    `  -H "XAPI-Key: \${XAPI_API_KEY}" \\`,
+    `  -H "XAPI-Key: \${XAPI_KEY}" \\`,
     `  -d '${shellEscape(body)}'`,
   ].join('\n');
 }
 
 function genPython(lib: 'requests' | 'httpx', params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const payload = { action_id: params.actionId, input: params.input };
+  const payload = { action_id: params.actionId, ...(params.method ? { method: params.method } : {}), input: params.input };
   return [
     `# pip install ${lib}`,
-    '# Set XAPI_API_KEY env var or replace with your key',
+    '# Set XAPI_KEY env var or replace with your key',
     'import os',
     `import ${lib}`,
     '',
@@ -150,7 +151,7 @@ function genPython(lib: 'requests' | 'httpx', params: CodegenParams): string {
     `    "${url}",`,
     `    headers={`,
     `        "Content-Type": "application/json",`,
-    `        "XAPI-Key": os.environ["XAPI_API_KEY"],`,
+    `        "XAPI-Key": os.environ["XAPI_KEY"],`,
     `    },`,
     `    json=${indent(pythonDict(payload), 4)},`,
     `)`,
@@ -160,14 +161,14 @@ function genPython(lib: 'requests' | 'httpx', params: CodegenParams): string {
 
 function genJavaScriptFetch(params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input);
+  const body = jsonBody(params.actionId, params.input, params.method);
   return [
-    '// Set XAPI_API_KEY env var or replace with your key',
+    '// Set XAPI_KEY env var or replace with your key',
     `const resp = await fetch("${url}", {`,
     `  method: "POST",`,
     `  headers: {`,
     `    "Content-Type": "application/json",`,
-    `    "XAPI-Key": process.env.XAPI_API_KEY,`,
+    `    "XAPI-Key": process.env.XAPI_KEY,`,
     `  },`,
     `  body: JSON.stringify(${indent(body, 2)}),`,
     `});`,
@@ -177,10 +178,10 @@ function genJavaScriptFetch(params: CodegenParams): string {
 
 function genJavaScriptAxios(params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input);
+  const body = jsonBody(params.actionId, params.input, params.method);
   return [
     '// npm install axios',
-    '// Set XAPI_API_KEY env var or replace with your key',
+    '// Set XAPI_KEY env var or replace with your key',
     'import axios from "axios";',
     '',
     `const resp = await axios.post(`,
@@ -189,7 +190,7 @@ function genJavaScriptAxios(params: CodegenParams): string {
     `  {`,
     `    headers: {`,
     `      "Content-Type": "application/json",`,
-    `      "XAPI-Key": process.env.XAPI_API_KEY,`,
+    `      "XAPI-Key": process.env.XAPI_KEY,`,
     `    },`,
     `  },`,
     `);`,
@@ -199,14 +200,14 @@ function genJavaScriptAxios(params: CodegenParams): string {
 
 function genTypescriptFetch(params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input);
+  const body = jsonBody(params.actionId, params.input, params.method);
   return [
-    '// Set XAPI_API_KEY env var or replace with your key',
+    '// Set XAPI_KEY env var or replace with your key',
     `const resp: Response = await fetch("${url}", {`,
     `  method: "POST",`,
     `  headers: {`,
     `    "Content-Type": "application/json",`,
-    `    "XAPI-Key": process.env.XAPI_API_KEY!,`,
+    `    "XAPI-Key": process.env.XAPI_KEY!,`,
     `  },`,
     `  body: JSON.stringify(${indent(body, 2)}),`,
     `});`,
@@ -217,10 +218,10 @@ function genTypescriptFetch(params: CodegenParams): string {
 
 function genGo(params: CodegenParams): string {
   const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input);
+  const body = jsonBody(params.actionId, params.input, params.method);
   const escaped = body.replace(/`/g, '` + "`" + `');
   return [
-    '// Set XAPI_API_KEY env var or replace with your key',
+    '// Set XAPI_KEY env var or replace with your key',
     'package main',
     '',
     'import (',
@@ -238,7 +239,7 @@ function genGo(params: CodegenParams): string {
     '\t\tpanic(err)',
     '\t}',
     '\treq.Header.Set("Content-Type", "application/json")',
-    '\treq.Header.Set("XAPI-Key", os.Getenv("XAPI_API_KEY"))',
+    '\treq.Header.Set("XAPI-Key", os.Getenv("XAPI_KEY"))',
     '',
     '\tresp, err := http.DefaultClient.Do(req)',
     '\tif err != nil {',

package/src/commands/action.ts

@@ -278,8 +278,8 @@ export async function actionGet(args: string[], flags: Record<string, string>) {
         );
       }
       const action = filtered[0] as any;
-      const input = buildDefaultInput(action.input ?? {});
-      const result = generateCode(flags.code, { actionId: id, input, actionHost: cfg.actionHost });
+      const { method: _schemaMethod, ...cleanCodeInput } = buildDefaultInput(action.input ?? {});
+      const result = generateCode(flags.code, { actionId: id, input: cleanCodeInput, actionHost: cfg.actionHost, method: action.method });
       outputCode(result, flags);
       return;
     }
@@ -303,20 +303,24 @@ export async function actionCall(args: string[], flags: Record<string, string>)
     } catch {
       err('--input must be valid JSON');
     }
+    if (typeof input !== 'object' || input === null || Array.isArray(input)) {
+      err('--input must be a JSON object');
+    }
   }
-  if (flags.method) {
-    input = { ...input, method: flags.method.toUpperCase() };
-  }
+  // method 作为独立参数传递，兼容 input 内的 method
+  const { method: inputMethod, ...cleanInput } = input;
+  const method = flags.method?.toUpperCase()
+    || (typeof inputMethod === 'string' ? inputMethod.toUpperCase() : undefined);
 
   if (flags.code) {
-    const result = generateCode(flags.code, { actionId: id, input, actionHost: cfg.actionHost });
+    const result = generateCode(flags.code, { actionId: id, input: cleanInput, actionHost: cfg.actionHost, method });
     outputCode(result, flags);
     return;
   }
 
   requireApiKey(cfg);
   try {
-    const res = await client.actionCall(id, input, cfg);
+    const res = await client.actionCall(id, cleanInput, cfg, method);
     output(res, flags.format as any);
   } catch (e: any) {
     err('call failed', e.message);

package/src/commands/balance.ts

@@ -1,6 +1,6 @@
 /**
  * balance command
- * Fetches xTokenBalance from GET /auth/me
+ * Fetches balance from GET /auth/me
  */
 
 import { getConfig, requireApiKey, XAPI_API_HOST, scheme } from '../config.ts';
@@ -20,12 +20,12 @@ export async function balance(args: string[], flags: Record<string, string>) {
   }
 
   try {
-    const me = await request<{ xTokenBalance: string; accountType: string; tier: string }>(
+    const me = await request<{ balance: string; accountType: string; tier: string }>(
       `${scheme(XAPI_API_HOST)}://${XAPI_API_HOST}/api/auth/me`,
       { method: 'GET', headers: { Authorization: `Bearer ${token!}` } },
     );
     output({
-      balance: me.xTokenBalance,
+      balance: me.balance,
       accountType: me.accountType,
       tier: me.tier,
     }, flags.format as any);

package/src/config.ts

@@ -1,7 +1,7 @@
 /**
  * Config management
  * Only apiKey is user-configurable. Host is built-in.
- * Reads from env var XAPI_API_KEY or ~/.xapi/config.json
+ * Reads from env var XAPI_KEY or ~/.xapi/config.json
  */
 
 import { existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync } from 'fs';
@@ -38,7 +38,7 @@ export function getConfig(): XapiConfig {
   const file = loadFileConfig();
   return {
     actionHost: XAPI_ACTION_HOST,
-    apiKey: process.env.XAPI_API_KEY || file.apiKey,
+    apiKey: process.env.XAPI_KEY || process.env.XAPI_API_KEY || file.apiKey,
   };
 }
 
@@ -62,7 +62,7 @@ export function showConfig(): void {
     actionHost: cfg.actionHost,
     apiKey: cfg.apiKey ? `${cfg.apiKey.slice(0, 8)}...` : undefined,
     source: {
-      apiKey: process.env.XAPI_API_KEY ? 'env' : file.apiKey ? 'file' : 'none',
+      apiKey: (process.env.XAPI_KEY || process.env.XAPI_API_KEY) ? 'env' : file.apiKey ? 'file' : 'none',
     },
     configFile: CONFIG_FILE,
   }, null, 2));

package/src/index.ts

@@ -12,14 +12,14 @@
  *
  *   xapi config show
  *   xapi config set apiKey=<key>
- *   xapi config health
+ *   xapi health
  *
  * Global flags:
  *   --format json|pretty|table   output format (default: json)
  *   --help                       show help
  *
  * Env vars:
- *   XAPI_API_KEY       API key
+ *   XAPI_KEY       API key
  *   XAPI_ACTION_HOST   Action service host (default: action.xapi.to)
  *   XAPI_OUTPUT        default output format (json|pretty|table)
  */
@@ -88,6 +88,7 @@ COMMANDS
   get <id> [--method GET|POST|...]   Get action schema (filter by HTTP method)
     --code <target>                  Generate code snippet (curl, py, js, ts, go)
   call <id> --input '{"key":"val"}'  Execute an action
+    --method GET|POST|...            Override HTTP method
     --code <target>                  Generate code snippet instead of executing
     Variants: python.requests, python.httpx, javascript.fetch, javascript.axios
 
@@ -100,16 +101,17 @@ COMMANDS
   balance                           Show current account balance
   topup [--amount <usd>] [--method stripe|x402]   Generate payment URL
 
+  health                            Check backend connectivity
+
   config show                       Show current config
   config set apiKey=<key>           Save API key to ~/.xapi/config.json
-  config health                     Check backend connectivity
 
 GLOBAL FLAGS
   --format json|pretty|table        Output format (default: json)
   --help                            Show help (use with a command for details, e.g. xapi get --help)
 
 ENV VARS
-  XAPI_API_KEY       API key (header: XAPI-Key)
+  XAPI_KEY       API key (header: XAPI-Key)
   XAPI_ACTION_HOST   Action service host (default: action.xapi.to)
   XAPI_OUTPUT        Default output format
 
@@ -126,7 +128,7 @@ EXAMPLES
   xapi categories
   xapi services --format table
   xapi config set apiKey=xapi_abc123
-  xapi config health
+  xapi health
 `;
 
 // ── Router ────────────────────────────────────────────────────────────────────
@@ -176,6 +178,7 @@ async function main() {
     case 'register':   return regCmds.register(rest, flags);
     case 'balance':    return balanceCmds.balance(rest, flags);
     case 'topup':      return topupCmds.topup(rest, flags);
+    case 'health':     return cfgCmds.configHealth(rest, flags);
 
     // ── Config commands ──
     case 'config': {
@@ -183,7 +186,6 @@ async function main() {
       switch (subCmd) {
         case 'show':   return cfgCmds.configShow(subRest, flags);
         case 'set':    return cfgCmds.configSet(subRest, flags);
-        case 'health': return cfgCmds.configHealth(subRest, flags);
         default:
           console.error(JSON.stringify({ error: `unknown config command: ${subCmd}` }));
           process.exit(1);