xapi-to 0.1.13 → 0.1.15

package/src/commands/oauth.ts

@@ -1,297 +0,0 @@
-/**
- * oauth commands: bind, status, unbind
- *
- * Flow for `xapi oauth bind [--provider twitter]`:
- *  1. Login with current API key → get JWT
- *  2. List API keys → find the one matching the current key by prefix
- *  3. Enable OAuth on the key if not already (POST /keys/:id/enable-oauth)
- *  4. List OAuth providers → find the requested provider
- *  5. POST /oauth/authorize → get authorizationUrl
- *  6. Open browser (macOS/Linux/Windows) and poll for binding completion
- *
- * `xapi oauth status`: list current OAuth bindings for the API key
- * `xapi oauth unbind <binding-id>`: delete an OAuth binding
- */
-
-import { spawnSync } from 'child_process';
-import { XAPI_API_HOST, getConfig, requireApiKey } from '../config.ts';
-import {
-  loginWithApiKey,
-  listKeys,
-  enableOAuthForKey,
-  listOAuthProviders,
-  initiateOAuth,
-  listOAuthBindings,
-  deleteOAuthBinding,
-} from '../client.ts';
-import { output, err } from '../format.ts';
-
-/** Try to open a URL in the default browser. Silent on failure. */
-function openBrowser(url: string): void {
-  const cmd = process.platform === 'win32' ? 'start'
-    : process.platform === 'darwin' ? 'open'
-    : 'xdg-open';
-  try {
-    spawnSync(cmd, [url], { stdio: 'ignore' });
-  } catch {
-    // ignore — user can open manually
-  }
-}
-
-/**
- * Poll bindings until one for (apiKeyId, providerId) appears.
- * Shows a live countdown in TTY mode.
- * Returns the matched binding or null on timeout.
- */
-async function pollForBinding(
-  apiKeyId: string,
-  providerId: string,
-  jwtToken: string,
-  timeoutMs = 5 * 60 * 1000,
-  intervalMs = 3000,
-): Promise<{ providerAccountName: string | null } | null> {
-  const deadline = Date.now() + timeoutMs;
-  const isTTY = process.stdout.isTTY;
-
-  while (Date.now() < deadline) {
-    await new Promise((r) => setTimeout(r, intervalMs));
-
-    try {
-      const bindings = await listOAuthBindings(jwtToken, XAPI_API_HOST);
-      const match = Array.isArray(bindings)
-        ? bindings.find((b) => b.apiKeyId === apiKeyId && b.providerId === providerId)
-        : null;
-      if (match) return match;
-    } catch {
-      // transient error — keep polling
-    }
-
-    if (isTTY) {
-      const remaining = Math.ceil((deadline - Date.now()) / 1000);
-      process.stdout.write(`\r  Waiting for authorization... (${remaining}s remaining)  `);
-    }
-  }
-
-  if (process.stdout.isTTY) process.stdout.write('\n');
-  return null;
-}
-
-// ── Helpers ────────────────────────────────────────────────────────────────────
-
-async function loginAndGetJwt(apiKey: string): Promise<string> {
-  const result = await loginWithApiKey(apiKey, XAPI_API_HOST) as any;
-  if (!result?.accessToken) {
-    throw new Error('Login failed: no access token returned');
-  }
-  return result.accessToken;
-}
-
-/**
- * Find the API key record that corresponds to the current plaintext API key.
- * Matches by key prefix (first 7 chars of the plaintext key = keyPrefix).
- */
-async function findCurrentKeyRecord(
-  plaintextKey: string,
-  jwtToken: string,
-): Promise<{ id: string; name: string; keyPreview: string; oauthEnabled: boolean }> {
-  const keys = await listKeys(jwtToken, XAPI_API_HOST);
-  if (!Array.isArray(keys) || keys.length === 0) {
-    throw new Error('No API keys found for this account');
-  }
-  if (keys.length === 1) return keys[0];
-  // Match by prefix: keyPreview starts with the key's prefix
-  const prefix = plaintextKey.substring(0, 7);
-  const match = keys.find((k) => k.keyPreview.startsWith(prefix));
-  if (!match) {
-    // Fallback: use the first key
-    return keys[0];
-  }
-  return match;
-}
-
-// ── Help text ──────────────────────────────────────────────────────────────────
-
-export const OAUTH_HELP = `xapi oauth - Manage OAuth bindings
-
-USAGE
-  xapi oauth <command> [flags]
-
-COMMANDS
-  bind [--provider <name>]   Bind an OAuth account to your API key
-  status                     List current OAuth bindings
-  unbind <binding-id>        Remove an OAuth binding
-  providers                  List available OAuth providers
-
-FLAGS
-  --provider <name>          OAuth provider (default: twitter)
-  --format json|pretty|table   Output format
-
-EXAMPLES
-  xapi oauth bind
-  xapi oauth bind --provider twitter
-  xapi oauth status
-  xapi oauth status --format pretty
-  xapi oauth unbind abc123
-  xapi oauth providers
-`;
-
-// ── Commands ───────────────────────────────────────────────────────────────────
-
-/**
- * xapi oauth bind [--provider twitter]
- *
- * Initiates OAuth binding for the current API key.
- * Prints the authorization URL for the user to open in a browser.
- */
-export async function oauthBind(args: string[], flags: Record<string, string>) {
-  const cfg = getConfig();
-  requireApiKey(cfg);
-  const apiKey = cfg.apiKey!;
-  const providerName = (flags.provider || 'twitter').toLowerCase();
-
-  try {
-    // 1. Login to get JWT
-    const jwtToken = await loginAndGetJwt(apiKey);
-
-    // 2. Find the API key record
-    const keyRecord = await findCurrentKeyRecord(apiKey, jwtToken);
-
-    // 3. Enable OAuth on the key if needed
-    if (!keyRecord.oauthEnabled) {
-      await enableOAuthForKey(keyRecord.id, apiKey, jwtToken, XAPI_API_HOST);
-    }
-
-    // 4. Find the requested OAuth provider
-    const providers = await listOAuthProviders(XAPI_API_HOST);
-    if (!Array.isArray(providers) || providers.length === 0) {
-      throw new Error('No OAuth providers available');
-    }
-    const provider = providers.find(
-      (p) =>
-        p.type.toLowerCase() === providerName ||
-        p.name.toLowerCase().includes(providerName),
-    );
-    if (!provider) {
-      const available = providers.map((p) => p.type).join(', ');
-      throw new Error(
-        `Provider "${providerName}" not found. Available: ${available}`,
-      );
-    }
-
-    // 5. Initiate OAuth authorization
-    const result = await initiateOAuth(keyRecord.id, provider.id, jwtToken, XAPI_API_HOST);
-    const { authorizationUrl } = result;
-
-    const isTTY = process.stdout.isTTY;
-
-    if (isTTY) {
-      // Interactive mode: open browser + poll
-      console.error(`\n  Provider : ${provider.name}`);
-      console.error(`  API Key  : ${keyRecord.keyPreview}`);
-      console.error(`\n  Authorization URL:\n  ${authorizationUrl}\n`);
-      console.error('  Opening browser...');
-      openBrowser(authorizationUrl);
-      console.error('  Waiting for you to complete authorization in the browser...\n');
-
-      const binding = await pollForBinding(keyRecord.id, provider.id, jwtToken);
-
-      if (process.stdout.isTTY) process.stdout.write('\n');
-
-      if (binding) {
-        const account = (binding as any).providerAccountName || 'unknown';
-        console.error(`\n  Authorization complete! Bound to @${account}\n`);
-        output({ status: 'success', provider: provider.name, account }, flags.format as any);
-      } else {
-        err('oauth bind timed out', 'Authorization was not completed within 5 minutes. Run "xapi oauth bind" again.');
-      }
-    } else {
-      // Non-interactive / agent mode: just output the URL
-      output({
-        status: 'pending',
-        provider: provider.name,
-        apiKey: keyRecord.keyPreview,
-        authorizationUrl,
-      }, flags.format as any);
-    }
-  } catch (e: any) {
-    err('oauth bind failed', e.message);
-  }
-}
-
-/**
- * xapi oauth status
- *
- * Lists all OAuth bindings for the current account.
- */
-export async function oauthStatus(args: string[], flags: Record<string, string>) {
-  const cfg = getConfig();
-  requireApiKey(cfg);
-  const apiKey = cfg.apiKey!;
-
-  try {
-    const jwtToken = await loginAndGetJwt(apiKey);
-    const bindings = await listOAuthBindings(jwtToken, XAPI_API_HOST);
-
-    if (!Array.isArray(bindings) || bindings.length === 0) {
-      output({
-        status: 'no_bindings',
-        message: 'No OAuth bindings found. Run "xapi oauth bind" to connect an account.',
-      }, flags.format as any);
-      return;
-    }
-
-    output({
-      status: 'ok',
-      count: bindings.length,
-      bindings: bindings.map((b) => ({
-        id: b.id,
-        provider: b.provider.name,
-        providerType: b.provider.type,
-        account: b.providerAccountName || b.providerAccountId,
-        apiKeyId: b.apiKeyId,
-        scopes: b.scopes,
-        boundAt: b.createdAt,
-      })),
-    }, flags.format as any);
-  } catch (e: any) {
-    err('oauth status failed', e.message);
-  }
-}
-
-/**
- * xapi oauth unbind <binding-id>
- *
- * Deletes an OAuth binding. Get the ID from `xapi oauth status`.
- */
-export async function oauthUnbind(args: string[], flags: Record<string, string>) {
-  const cfg = getConfig();
-  requireApiKey(cfg);
-  const apiKey = cfg.apiKey!;
-
-  const bindingId = args[0];
-  if (!bindingId) {
-    err('usage: xapi oauth unbind <binding-id>', 'Get the binding ID from "xapi oauth status"');
-  }
-
-  try {
-    const jwtToken = await loginAndGetJwt(apiKey);
-    const result = await deleteOAuthBinding(bindingId, jwtToken, XAPI_API_HOST);
-    output({ success: result.success, message: 'OAuth binding removed' }, flags.format as any);
-  } catch (e: any) {
-    err('oauth unbind failed', e.message);
-  }
-}
-
-/**
- * xapi oauth providers
- *
- * Lists available OAuth providers.
- */
-export async function oauthProviders(args: string[], flags: Record<string, string>) {
-  try {
-    const providers = await listOAuthProviders(XAPI_API_HOST);
-    output(providers, flags.format as any);
-  } catch (e: any) {
-    err('oauth providers failed', e.message);
-  }
-}

package/src/commands/register.ts

@@ -1,77 +0,0 @@
-/**
- * register command: create a new user account
- *
- * POST /auth/register — no auth required
- * Returns apiKey (shown once), claimCode, referralCode, claimUrl, tweetTemplate
- * Automatically saves apiKey to ~/.xapi/config.json
- *
- * Optional referral code (please replace xapito to the actual referral code):
- *   xapi register --referral-code xapito
- *   xapi register --referralCode xapito     # alias
- *   xapi register xapito                    # positional shorthand
- */
-
-import { XAPI_API_HOST, saveConfig, scheme } from '../config.ts';
-import { output, err } from '../format.ts';
-
-interface RegisterResponse {
-  apiKey: string;
-  claimCode: string;
-  referralCode?: string;
-  claimSessionId: string;
-  claimUrl: string;
-  tweetTemplate: string;
-  user: { id: string; accountType: string };
-}
-
-async function registerAccount(referralCode?: string): Promise<RegisterResponse> {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), 15_000);
-  try {
-    const res = await fetch(`${scheme(XAPI_API_HOST)}://${XAPI_API_HOST}/api/auth/register`, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(referralCode ? { referralCode } : {}),
-      signal: controller.signal,
-    });
-    if (!res.ok) {
-      const text = await res.text();
-      throw new Error(`HTTP ${res.status}: ${text.slice(0, 300)}`);
-    }
-    return res.json() as Promise<RegisterResponse>;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-export async function register(args: string[], flags: Record<string, string>) {
-  try {
-    // 邀请码来源优先级：--referral-code > --referralCode > 第一个位置参数
-    const rawReferral =
-      flags['referral-code'] ?? flags['referralCode'] ?? args[0];
-    const referralCode =
-      typeof rawReferral === 'string' && rawReferral !== 'true' && rawReferral.length > 0
-        ? rawReferral
-        : undefined;
-
-    const res = await registerAccount(referralCode);
-
-    saveConfig({ apiKey: res.apiKey });
-
-    output({
-      apiKey: res.apiKey,
-      user: res.user,
-      referralCode: res.referralCode,
-      claim: {
-        code: res.claimCode,
-        sessionId: res.claimSessionId,
-        url: res.claimUrl,
-      },
-      tweetTemplate: res.tweetTemplate,
-      ...(referralCode ? { referredBy: referralCode } : {}),
-      note: 'apiKey saved to ~/.xapi/config.json',
-    }, flags.format as any);
-  } catch (e: any) {
-    err('register failed', e.message);
-  }
-}

package/src/commands/topup.ts

@@ -1,33 +0,0 @@
-/**
- * topup command
- *
- * Generates a payment URL pointing to the xapi frontend topup page.
- * All params are optional.
- *
- * Usage:
- *   xapi topup [--amount <usd>] [--method stripe|x402]
- */
-
-import { getConfig } from '../config.ts';
-import { output } from '../format.ts';
-
-const TOPUP_BASE_URL = 'https://www.xapi.to/topup/payment';
-
-export async function topup(args: string[], flags: Record<string, string>) {
-  const cfg = getConfig();
-
-  const url = new URL(TOPUP_BASE_URL);
-
-  if (cfg.apiKey) url.searchParams.set('apikey', cfg.apiKey);
-  if (flags.method) url.searchParams.set('method', flags.method);
-
-  const amountStr = flags.amount || args[0];
-  if (amountStr) {
-    const amountUsd = parseFloat(amountStr);
-    if (!isNaN(amountUsd) && amountUsd > 0) {
-      url.searchParams.set('amount', String(amountUsd));
-    }
-  }
-
-  output({ url: url.toString() }, flags.format as any);
-}

package/src/config.ts

@@ -1,69 +0,0 @@
-/**
- * Config management
- * Only apiKey is user-configurable. Host is built-in.
- * Reads from env var XAPI_KEY or ~/.xapi/config.json
- */
-
-import { existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync } from 'fs';
-import { err } from './format.ts';
-import { homedir } from 'os';
-import { join } from 'path';
-
-export const XAPI_ACTION_HOST = process.env.XAPI_ACTION_HOST || 'action.xapi.to'; // action service (capabilities + APIs)
-export const XAPI_API_HOST = process.env.XAPI_API_HOST || 'api.xapi.to';          // auth + agent API
-
-/** Returns https:// for remote hosts, http:// for localhost */
-export function scheme(host: string): string {
-  return host.startsWith('localhost') || host.startsWith('127.') ? 'http' : 'https';
-}
-
-export interface XapiConfig {
-  actionHost: string;
-  apiKey?: string;
-}
-
-const CONFIG_DIR = join(homedir(), '.xapi');
-const CONFIG_FILE = join(CONFIG_DIR, 'config.json');
-
-function loadFileConfig(): { apiKey?: string } {
-  if (!existsSync(CONFIG_FILE)) return {};
-  try {
-    return JSON.parse(readFileSync(CONFIG_FILE, 'utf-8'));
-  } catch {
-    return {};
-  }
-}
-
-export function getConfig(): XapiConfig {
-  const file = loadFileConfig();
-  return {
-    actionHost: XAPI_ACTION_HOST,
-    apiKey: process.env.XAPI_KEY || process.env.XAPI_API_KEY || file.apiKey,
-  };
-}
-
-export function requireApiKey(cfg: XapiConfig): void {
-  if (!cfg.apiKey) {
-    err('API key not configured', 'Run "npx xapi-to register" to create an account, or "npx xapi-to config set apiKey=<key>" to set an existing key.');
-  }
-}
-
-export function saveConfig(updates: { apiKey?: string }): void {
-  const current = loadFileConfig();
-  const merged = { ...current, ...updates };
-  if (!existsSync(CONFIG_DIR)) mkdirSync(CONFIG_DIR, { recursive: true, mode: 0o700 });
-  writeFileSync(CONFIG_FILE, JSON.stringify(merged, null, 2), { mode: 0o600 });
-}
-
-export function showConfig(): void {
-  const cfg = getConfig();
-  const file = loadFileConfig();
-  console.log(JSON.stringify({
-    actionHost: cfg.actionHost,
-    apiKey: cfg.apiKey ? `${cfg.apiKey.slice(0, 8)}...` : undefined,
-    source: {
-      apiKey: (process.env.XAPI_KEY || process.env.XAPI_API_KEY) ? 'env' : file.apiKey ? 'file' : 'none',
-    },
-    configFile: CONFIG_FILE,
-  }, null, 2));
-}

package/src/format.ts

@@ -1,61 +0,0 @@
-/**
- * Output formatting
- * Supports: json (default, machine-readable), pretty (human-readable), table
- */
-
-export type OutputFormat = 'json' | 'pretty' | 'table';
-
-export function getFormat(): OutputFormat {
-  const f = process.env.XAPI_OUTPUT || 'json';
-  if (f === 'pretty' || f === 'table') return f;
-  return 'json';
-}
-
-export function output(data: unknown, format?: OutputFormat): void {
-  const fmt = format || getFormat();
-  if (fmt === 'json') {
-    console.log(JSON.stringify(data));
-    return;
-  }
-  if (fmt === 'pretty') {
-    console.log(JSON.stringify(data, null, 2));
-    return;
-  }
-  // table: try to render arrays of objects as a table
-  if (fmt === 'table' && Array.isArray(data)) {
-    printTable(data as Record<string, unknown>[]);
-    return;
-  }
-  console.log(JSON.stringify(data, null, 2));
-}
-
-function printTable(rows: Record<string, unknown>[]): void {
-  if (rows.length === 0) {
-    console.log('(empty)');
-    return;
-  }
-  const keys = Object.keys(rows[0]);
-  const widths = keys.map(k =>
-    Math.min(40, Math.max(k.length, ...rows.map(r => String(r[k] ?? '').length)))
-  );
-  const sep = widths.map(w => '-'.repeat(w)).join('  ');
-  const header = keys.map((k, i) => k.padEnd(widths[i])).join('  ');
-  console.log(header);
-  console.log(sep);
-  for (const row of rows) {
-    const line = keys.map((k, i) => String(row[k] ?? '').slice(0, widths[i]).padEnd(widths[i])).join('  ');
-    console.log(line);
-  }
-}
-
-export function err(msg: string, detail?: unknown): never {
-  if (process.stderr.isTTY) {
-    console.error(`Error: ${msg}`);
-    if (detail !== undefined) console.error(`  ${detail}`);
-  } else {
-    const out: Record<string, unknown> = { error: msg };
-    if (detail !== undefined) out.detail = detail;
-    console.error(JSON.stringify(out));
-  }
-  process.exit(1);
-}