xapi-to 0.1.13 → 0.1.14

package/package.json

@@ -1,25 +1,30 @@
 {
   "name": "xapi-to",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Agent-friendly CLI for xapi - discover and call capabilities and APIs",
   "type": "module",
   "bin": {
-    "xapi": "src/index.ts"
+    "xapi": "dist/index.js",
+    "xapi-to": "dist/index.js"
   },
   "files": [
-    "src",
-    "!src/tests",
+    "dist",
     "README.md"
   ],
   "scripts": {
-    "start": "bun run src/index.ts",
+    "build": "tsup src/index.ts --format esm --target node18 --clean --out-dir dist --tsconfig tsconfig.build.json",
+    "start": "node dist/index.js",
     "dev": "XAPI_ACTION_HOST=localhost:3003 bun run src/index.ts",
+    "prepublishOnly": "npm run build",
     "test": "bun test src/tests"
   },
-  "devDependencies": {
-    "@types/bun": "latest"
+  "engines": {
+    "node": ">=18"
   },
-  "peerDependencies": {
-    "typescript": "^5"
+  "devDependencies": {
+    "@types/bun": "^1.3.9",
+    "@types/node": "^18",
+    "tsup": "^8.5.1",
+    "typescript": "^6.0.3"
   }
 }

package/src/client.ts

@@ -1,265 +0,0 @@
-/**
- * HTTP client - thin wrapper around fetch with timeout/retry
- */
-
-import { scheme } from './config.ts';
-
-const DEFAULT_TIMEOUT_MS = 30_000;
-const EXECUTE_TIMEOUT_MS = 60_000;
-
-export interface ClientOptions {
-  actionHost: string;
-  apiKey?: string;
-}
-
-export async function request<T>(
-  url: string,
-  options: RequestInit,
-  timeoutMs = DEFAULT_TIMEOUT_MS,
-): Promise<T> {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const res = await fetch(url, { ...options, signal: controller.signal });
-    if (!res.ok) {
-      const text = await res.text();
-      throw new Error(`HTTP ${res.status}: ${text.slice(0, 300)}`);
-    }
-    const body = await res.json() as T;
-    // Detect business-level auth errors (HTTP 200 but unauthorized)
-    if (body && typeof body === 'object' && 'success' in body && (body as any).success === false) {
-      const data = (body as any).data;
-      if (data?.statusCode === 401 || data?.error === 'Unauthorized') {
-        throw new Error(
-          'Authentication failed: ' + (data.message || 'Invalid or missing API key')
-          + '. Run "npx xapi-to config set apiKey=<key>" to update your key.',
-        );
-      }
-      if (data?.error === 'OAuth Required' || (data?.statusCode === 403 && data?.message?.includes('OAuth'))) {
-        throw new Error(
-          (data.message || 'OAuth authorization required')
-          + '. Run "xapi oauth bind" to connect your account.',
-        );
-      }
-    }
-    return body;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-function headers(apiKey?: string): Record<string, string> {
-  const h: Record<string, string> = { 'Content-Type': 'application/json' };
-  if (apiKey) h['XAPI-Key'] = apiKey;
-  return h;
-}
-
-function baseUrl(opts: ClientOptions): string {
-  return `${scheme(opts.actionHost)}://${opts.actionHost}`;
-}
-
-// ── Actions (unified: capabilities + APIs) ───────────────────────────────────
-
-export async function actionList(
-  opts: ClientOptions,
-  params: { page?: number; page_size?: number; category?: string; source?: string; service_id?: string } = {},
-) {
-  const url = new URL(`${baseUrl(opts)}/v1/actions`);
-  if (params.page) url.searchParams.set('page', String(params.page));
-  if (params.page_size) url.searchParams.set('page_size', String(params.page_size));
-  if (params.category) url.searchParams.set('category', params.category);
-  if (params.source) url.searchParams.set('source', params.source);
-  if (params.service_id) url.searchParams.set('service_id', params.service_id);
-  return request<{ actions: unknown[]; pagination: unknown }>(
-    url.toString(),
-    { method: 'GET', headers: headers(opts.apiKey) },
-  );
-}
-
-export async function actionSearch(
-  query: string,
-  opts: ClientOptions,
-  params: { category?: string; source?: string; page?: number; page_size?: number } = {},
-) {
-  const url = new URL(`${baseUrl(opts)}/v1/actions/search`);
-  url.searchParams.set('q', query);
-  if (params.category) url.searchParams.set('category', params.category);
-  if (params.source) url.searchParams.set('source', params.source);
-  if (params.page) url.searchParams.set('page', String(params.page));
-  if (params.page_size) url.searchParams.set('page_size', String(params.page_size));
-  return request<{ results: unknown[]; query: string; pagination: unknown }>(
-    url.toString(),
-    { method: 'GET', headers: headers(opts.apiKey) },
-  );
-}
-
-export async function actionCategories(opts: ClientOptions, params: { source?: string } = {}) {
-  const url = new URL(`${baseUrl(opts)}/v1/actions/categories`);
-  if (params.source) url.searchParams.set('source', params.source);
-  return request<{ categories: string[]; total: number }>(
-    url.toString(),
-    { method: 'GET', headers: headers(opts.apiKey) },
-  );
-}
-
-export async function actionGet(id: string, opts: ClientOptions) {
-  return request<unknown[]>(
-    `${baseUrl(opts)}/v1/actions/${encodeURIComponent(id)}`,
-    { method: 'GET', headers: headers(opts.apiKey) },
-  );
-}
-
-export async function actionBatch(ids: string[], opts: ClientOptions) {
-  return request<{ actions: unknown[]; missing_ids: string[] }>(
-    `${baseUrl(opts)}/v1/actions/batch`,
-    {
-      method: 'POST',
-      headers: headers(opts.apiKey),
-      body: JSON.stringify({ ids }),
-    },
-  );
-}
-
-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, ...(httpMethod ? { method: httpMethod } : {}), input }),
-    },
-    EXECUTE_TIMEOUT_MS,
-  );
-}
-
-export async function actionServices(
-  opts: ClientOptions,
-  params: { page?: number; page_size?: number; category?: string } = {},
-) {
-  const url = new URL(`${baseUrl(opts)}/v1/actions/services`);
-  if (params.page) url.searchParams.set('page', String(params.page));
-  if (params.page_size) url.searchParams.set('page_size', String(params.page_size));
-  if (params.category) url.searchParams.set('category', params.category);
-  return request<{ services: unknown[]; pagination: unknown }>(
-    url.toString(),
-    { method: 'GET', headers: headers(opts.apiKey) },
-  );
-}
-
-export async function healthCheck(opts: ClientOptions) {
-  return request<unknown>(
-    `${baseUrl(opts)}/health`,
-    { method: 'GET', headers: headers(opts.apiKey) },
-    5_000,
-  );
-}
-
-// ── Auth ──────────────────────────────────────────────────────────────────────
-
-export async function loginWithApiKey(apiKey: string, apiHost: string) {
-  return request<{ accessToken: string; user: unknown }>(
-    `${scheme(apiHost)}://${apiHost}/api/auth/login/apikey`,
-    {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ apiKey }),
-    },
-  );
-}
-
-// ── OAuth ──────────────────────────────────────────────────────────────────────
-
-function jwtHeaders(jwtToken: string): Record<string, string> {
-  return { 'Content-Type': 'application/json', Authorization: `Bearer ${jwtToken}` };
-}
-
-export async function listKeys(jwtToken: string, apiHost: string) {
-  return request<Array<{
-    id: string;
-    name: string;
-    keyPreview: string;
-    oauthEnabled: boolean;
-    createdAt: string;
-  }>>(
-    `${scheme(apiHost)}://${apiHost}/api/keys`,
-    { method: 'GET', headers: jwtHeaders(jwtToken) },
-  );
-}
-
-export async function enableOAuthForKey(
-  keyId: string,
-  plaintextKey: string,
-  jwtToken: string,
-  apiHost: string,
-) {
-  return request<{ success: boolean; message: string }>(
-    `${scheme(apiHost)}://${apiHost}/api/keys/${keyId}/enable-oauth`,
-    {
-      method: 'POST',
-      headers: jwtHeaders(jwtToken),
-      body: JSON.stringify({ plaintextKey }),
-    },
-  );
-}
-
-export async function listOAuthProviders(apiHost: string) {
-  return request<Array<{
-    id: string;
-    name: string;
-    type: string;
-    grantType: string;
-    defaultScopes: string;
-  }>>(
-    `${scheme(apiHost)}://${apiHost}/api/oauth/providers`,
-    { method: 'GET', headers: { 'Content-Type': 'application/json' } },
-  );
-}
-
-export async function initiateOAuth(
-  apiKeyId: string,
-  providerId: string,
-  jwtToken: string,
-  apiHost: string,
-) {
-  return request<{ authorizationUrl: string; state: string }>(
-    `${scheme(apiHost)}://${apiHost}/api/oauth/authorize`,
-    {
-      method: 'POST',
-      headers: jwtHeaders(jwtToken),
-      body: JSON.stringify({ apiKeyId, providerId }),
-    },
-  );
-}
-
-export async function listOAuthBindings(jwtToken: string, apiHost: string) {
-  return request<Array<{
-    id: string;
-    apiKeyId: string;
-    providerId: string;
-    providerAccountId: string;
-    providerAccountName: string | null;
-    scopes: string;
-    createdAt: string;
-    updatedAt: string;
-    provider: { id: string; name: string; type: string };
-  }>>(
-    `${scheme(apiHost)}://${apiHost}/api/oauth/bindings`,
-    { method: 'GET', headers: jwtHeaders(jwtToken) },
-  );
-}
-
-export async function deleteOAuthBinding(
-  bindingId: string,
-  jwtToken: string,
-  apiHost: string,
-) {
-  return request<{ success: boolean }>(
-    `${scheme(apiHost)}://${apiHost}/api/oauth/bindings/${bindingId}`,
-    { method: 'DELETE', headers: jwtHeaders(jwtToken) },
-  );
-}

package/src/codegen.ts

@@ -1,307 +0,0 @@
-/**
- * Code snippet generation for API actions.
- *
- * Generates executable code in curl, Python, JavaScript, TypeScript, and Go
- * that calls the xapi action execute endpoint.
- */
-
-import { scheme } from './config.ts';
-
-// ── Types ────────────────────────────────────────────────────────────────────
-
-export interface CodegenParams {
-  actionId: string;
-  input: Record<string, unknown>;
-  actionHost: string;
-  method?: string;
-}
-
-interface ResolvedTarget {
-  lang: string;
-  lib: string;
-}
-
-// ── Target resolution ────────────────────────────────────────────────────────
-
-const TARGET_MAP: Record<string, ResolvedTarget> = {
-  'curl':                { lang: 'curl',       lib: 'curl' },
-  'python':              { lang: 'python',     lib: 'requests' },
-  'py':                  { lang: 'python',     lib: 'requests' },
-  'python.requests':     { lang: 'python',     lib: 'requests' },
-  'python.httpx':        { lang: 'python',     lib: 'httpx' },
-  'py.requests':         { lang: 'python',     lib: 'requests' },
-  'py.httpx':            { lang: 'python',     lib: 'httpx' },
-  'javascript':          { lang: 'javascript', lib: 'fetch' },
-  'js':                  { lang: 'javascript', lib: 'fetch' },
-  'javascript.fetch':    { lang: 'javascript', lib: 'fetch' },
-  'javascript.axios':    { lang: 'javascript', lib: 'axios' },
-  'js.fetch':            { lang: 'javascript', lib: 'fetch' },
-  'js.axios':            { lang: 'javascript', lib: 'axios' },
-  'typescript':          { lang: 'typescript', lib: 'fetch' },
-  'ts':                  { lang: 'typescript', lib: 'fetch' },
-  'typescript.fetch':    { lang: 'typescript', lib: 'fetch' },
-  'ts.fetch':            { lang: 'typescript', lib: 'fetch' },
-  'go':                  { lang: 'go',         lib: 'net/http' },
-};
-
-const SUPPORTED_TARGETS = [
-  'curl',
-  'python (py) [.requests, .httpx]',
-  'javascript (js) [.fetch, .axios]',
-  'typescript (ts) [.fetch]',
-  'go [net/http]',
-];
-
-export function resolveTarget(raw: string): ResolvedTarget {
-  const target = TARGET_MAP[raw.toLowerCase()];
-  if (!target) {
-    throw new Error(
-      `unknown --code target: "${raw}". Supported: ${SUPPORTED_TARGETS.join(', ')}`,
-    );
-  }
-  return target;
-}
-
-// ── Default input builder ────────────────────────────────────────────────────
-
-interface InputSchema {
-  properties?: Record<string, { type?: string; default?: unknown }>;
-  required?: string[];
-}
-
-function typeDefault(type: string): unknown {
-  switch (type) {
-    case 'string': return '';
-    case 'number': case 'integer': return 0;
-    case 'boolean': return false;
-    case 'object': return {};
-    case 'array': return [];
-    default: return '';
-  }
-}
-
-export function buildDefaultInput(schema: InputSchema): Record<string, unknown> {
-  if (!schema.properties) return {};
-  const result: Record<string, unknown> = {};
-  for (const [key, prop] of Object.entries(schema.properties)) {
-    if (prop.default !== undefined) {
-      // Clone reference types to avoid shared mutation
-      const val = prop.default;
-      result[key] = (typeof val === 'object' && val !== null) ? JSON.parse(JSON.stringify(val)) : val;
-    } else {
-      result[key] = typeDefault(prop.type ?? 'string');
-    }
-  }
-  return result;
-}
-
-// ── Code generators ──────────────────────────────────────────────────────────
-
-const SAFE_HOST_PATTERN = /^[a-zA-Z0-9._\-]+(:\d{1,5})?$/;
-
-function validateHost(host: string): void {
-  if (!SAFE_HOST_PATTERN.test(host)) {
-    throw new Error(`invalid actionHost: "${host}" — must be a valid hostname with optional port`);
-  }
-}
-
-function baseUrl(actionHost: string): string {
-  validateHost(actionHost);
-  return `${scheme(actionHost)}://${actionHost}/v1/actions/execute`;
-}
-
-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 */
-function indent(text: string, spaces: number): string {
-  const pad = ' '.repeat(spaces);
-  const lines = text.split('\n');
-  return lines.map((line, i) => (i === 0 ? line : pad + line)).join('\n');
-}
-
-/** Escape single quotes for POSIX shell single-quoted strings */
-function shellEscape(s: string): string {
-  return s.replace(/'/g, "'\\''");
-}
-
-function genCurl(params: CodegenParams): string {
-  const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input, params.method);
-  return [
-    '# Set XAPI_KEY env var or replace with your key',
-    `curl -X POST '${shellEscape(url)}' \\`,
-    `  -H 'Content-Type: application/json' \\`,
-    `  -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, ...(params.method ? { method: params.method } : {}), input: params.input };
-  return [
-    `# pip install ${lib}`,
-    '# Set XAPI_KEY env var or replace with your key',
-    'import os',
-    `import ${lib}`,
-    '',
-    `resp = ${lib}.post(`,
-    `    "${url}",`,
-    `    headers={`,
-    `        "Content-Type": "application/json",`,
-    `        "XAPI-Key": os.environ["XAPI_KEY"],`,
-    `    },`,
-    `    json=${indent(pythonDict(payload), 4)},`,
-    `)`,
-    'print(resp.json())',
-  ].join('\n');
-}
-
-function genJavaScriptFetch(params: CodegenParams): string {
-  const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input, params.method);
-  return [
-    '// 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_KEY,`,
-    `  },`,
-    `  body: JSON.stringify(${indent(body, 2)}),`,
-    `});`,
-    'console.log(await resp.json());',
-  ].join('\n');
-}
-
-function genJavaScriptAxios(params: CodegenParams): string {
-  const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input, params.method);
-  return [
-    '// npm install axios',
-    '// Set XAPI_KEY env var or replace with your key',
-    'import axios from "axios";',
-    '',
-    `const resp = await axios.post(`,
-    `  "${url}",`,
-    `  ${indent(body, 2)},`,
-    `  {`,
-    `    headers: {`,
-    `      "Content-Type": "application/json",`,
-    `      "XAPI-Key": process.env.XAPI_KEY,`,
-    `    },`,
-    `  },`,
-    `);`,
-    'console.log(resp.data);',
-  ].join('\n');
-}
-
-function genTypescriptFetch(params: CodegenParams): string {
-  const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input, params.method);
-  return [
-    '// 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_KEY!,`,
-    `  },`,
-    `  body: JSON.stringify(${indent(body, 2)}),`,
-    `});`,
-    'const data: unknown = await resp.json();',
-    'console.log(data);',
-  ].join('\n');
-}
-
-function genGo(params: CodegenParams): string {
-  const url = baseUrl(params.actionHost);
-  const body = jsonBody(params.actionId, params.input, params.method);
-  const escaped = body.replace(/`/g, '` + "`" + `');
-  return [
-    '// Set XAPI_KEY env var or replace with your key',
-    'package main',
-    '',
-    'import (',
-    '\t"fmt"',
-    '\t"io"',
-    '\t"net/http"',
-    '\t"os"',
-    '\t"strings"',
-    ')',
-    '',
-    'func main() {',
-    `\tbody := \`${escaped}\``,
-    `\treq, err := http.NewRequest("POST", "${url}", strings.NewReader(body))`,
-    '\tif err != nil {',
-    '\t\tpanic(err)',
-    '\t}',
-    '\treq.Header.Set("Content-Type", "application/json")',
-    '\treq.Header.Set("XAPI-Key", os.Getenv("XAPI_KEY"))',
-    '',
-    '\tresp, err := http.DefaultClient.Do(req)',
-    '\tif err != nil {',
-    '\t\tpanic(err)',
-    '\t}',
-    '\tdefer resp.Body.Close()',
-    '',
-    '\tresult, err := io.ReadAll(resp.Body)',
-    '\tif err != nil {',
-    '\t\tpanic(err)',
-    '\t}',
-    '\tfmt.Println(string(result))',
-    '}',
-  ].join('\n');
-}
-
-// ── Python dict formatter ────────────────────────────────────────────────────
-
-function pythonDict(obj: unknown, depth = 0): string {
-  const pad = '    '.repeat(depth);
-  const inner = '    '.repeat(depth + 1);
-
-  if (obj === null || obj === undefined) return 'None';
-  if (typeof obj === 'boolean') return obj ? 'True' : 'False';
-  if (typeof obj === 'number') return String(obj);
-  if (typeof obj === 'string') return JSON.stringify(obj);
-
-  if (Array.isArray(obj)) {
-    if (obj.length === 0) return '[]';
-    const items = obj.map(v => `${inner}${pythonDict(v, depth + 1)}`);
-    return `[\n${items.join(',\n')}\n${pad}]`;
-  }
-
-  if (typeof obj === 'object') {
-    const entries = Object.entries(obj as Record<string, unknown>);
-    if (entries.length === 0) return '{}';
-    const items = entries.map(
-      ([k, v]) => `${inner}${JSON.stringify(k)}: ${pythonDict(v, depth + 1)}`,
-    );
-    return `{\n${items.join(',\n')}\n${pad}}`;
-  }
-
-  return String(obj);
-}
-
-// ── Main entry point ─────────────────────────────────────────────────────────
-
-type Generator = (params: CodegenParams) => string;
-
-const GENERATORS: Record<string, Record<string, Generator>> = {
-  curl:       { curl: genCurl },
-  python:     { requests: p => genPython('requests', p), httpx: p => genPython('httpx', p) },
-  javascript: { fetch: genJavaScriptFetch, axios: genJavaScriptAxios },
-  typescript: { fetch: genTypescriptFetch },
-  go:         { 'net/http': genGo },
-};
-
-export function generateCode(target: string, params: CodegenParams): { lang: string; lib: string; code: string } {
-  const { lang, lib } = resolveTarget(target);
-  const generator = GENERATORS[lang]?.[lib];
-  if (!generator) {
-    throw new Error(`no generator for ${lang}.${lib}`);
-  }
-  return { lang, lib, code: generator(params) };
-}