xapi-to 0.1.15 → 0.1.16

package/README.md

@@ -140,6 +140,7 @@ Config is stored at `~/.xapi/config.json`.
 | `twitter.user_by_screen_name` | Get user profile by username |
 | `twitter.user_by_screen_names` | Batch get user profiles by usernames |
 | `twitter.user_tweets` | Get tweets from a user |
+| `twitter.user_tweets_and_replies` | Get tweets and replies from a user |
 | `twitter.user_media` | Get media posts from a user |
 | `twitter.following` | Get user following list |
 | `twitter.followers` | Get user followers |

package/dist/index.js

@@ -24,12 +24,46 @@ function output(data, format) {
     console.log(JSON.stringify(data, null, 2));
     return;
   }
-  if (fmt === "table" && Array.isArray(data)) {
-    printTable(data);
-    return;
+  if (fmt === "table") {
+    const rows = tableRows(data);
+    if (rows) {
+      printTable(rows);
+      return;
+    }
   }
   console.log(JSON.stringify(data, null, 2));
 }
+function tableRows(data) {
+  if (Array.isArray(data)) return normalizeRows(data, "value");
+  if (!data || typeof data !== "object") return null;
+  const obj = data;
+  const preferredKeys = ["items", "actions", "results", "services", "categories", "bindings", "providers"];
+  for (const key of preferredKeys) {
+    const value = obj[key];
+    if (Array.isArray(value)) return normalizeRows(value, singularKey(key));
+  }
+  const firstArray = Object.entries(obj).find(([, value]) => Array.isArray(value));
+  return firstArray ? normalizeRows(firstArray[1], singularKey(firstArray[0])) : null;
+}
+function normalizeRows(rows, primitiveKey) {
+  return rows.map((row) => {
+    if (row && typeof row === "object" && !Array.isArray(row)) {
+      return row;
+    }
+    return { [primitiveKey]: row };
+  });
+}
+function singularKey(key) {
+  if (key === "categories") return "category";
+  if (key.endsWith("ies")) return `${key.slice(0, -3)}y`;
+  if (key.endsWith("s")) return key.slice(0, -1);
+  return "value";
+}
+function formatCell(value) {
+  if (value === null || value === void 0) return "";
+  if (typeof value === "object") return JSON.stringify(value);
+  return String(value);
+}
 function printTable(rows) {
   if (rows.length === 0) {
     console.log("(empty)");
@@ -37,14 +71,14 @@ function printTable(rows) {
   }
   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)))
+    (k) => Math.min(40, Math.max(k.length, ...rows.map((r) => formatCell(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("  ");
+    const line = keys.map((k, i) => formatCell(row[k]).slice(0, widths[i]).padEnd(widths[i])).join("  ");
     console.log(line);
   }
 }
@@ -118,10 +152,17 @@ async function request(url, options, timeoutMs = DEFAULT_TIMEOUT_MS) {
   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 text2 = await res.text();
+      throw new Error(`HTTP ${res.status}: ${text2.slice(0, 300)}`);
+    }
+    if (res.status === 204) {
+      return void 0;
     }
-    const body = await res.json();
+    const text = await res.text();
+    if (!text.trim()) {
+      return void 0;
+    }
+    const body = JSON.parse(text);
     if (body && typeof body === "object" && "success" in body && body.success === false) {
       const data = body.data;
       if (data?.statusCode === 401 || data?.error === "Unauthorized") {
@@ -249,13 +290,15 @@ async function listOAuthProviders(apiHost) {
     { method: "GET", headers: { "Content-Type": "application/json" } }
   );
 }
-async function initiateOAuth(apiKeyId, providerId, jwtToken, apiHost) {
+async function initiateOAuth(apiKeyId, providerId, jwtToken, apiHost, scopes) {
+  const body = { apiKeyId, providerId };
+  if (scopes) body.scopes = scopes;
   return request(
     `${scheme(apiHost)}://${apiHost}/api/oauth/authorize`,
     {
       method: "POST",
       headers: jwtHeaders(jwtToken),
-      body: JSON.stringify({ apiKeyId, providerId })
+      body: JSON.stringify(body)
     }
   );
 }
@@ -266,10 +309,11 @@ async function listOAuthBindings(jwtToken, apiHost) {
   );
 }
 async function deleteOAuthBinding(bindingId, jwtToken, apiHost) {
-  return request(
+  const result = await request(
     `${scheme(apiHost)}://${apiHost}/api/oauth/bindings/${bindingId}`,
     { method: "DELETE", headers: jwtHeaders(jwtToken) }
   );
+  return result ?? { success: true };
 }
 
 // src/codegen.ts
@@ -659,6 +703,7 @@ function getSource(flags) {
 async function actionList2(args, flags) {
   showHelpIfRequested(flags, LIST_HELP);
   const cfg = getConfig();
+  const fmt = flags.format || getFormat();
   try {
     const res = await actionList(cfg, {
       source: getSource(flags),
@@ -668,7 +713,7 @@ async function actionList2(args, flags) {
       service_id: flags["service-id"]
     });
     const actions = res.actions || [];
-    if (flags.format === "table") {
+    if (fmt === "table") {
       output(actions.map((a) => ({
         id: a.id,
         method: a.method ?? "",
@@ -690,6 +735,7 @@ async function actionSearch2(args, flags) {
   const query = args[0];
   if (!query) err("usage: xapi-to search <query>");
   const cfg = getConfig();
+  const fmt = flags.format || getFormat();
   try {
     const res = await actionSearch(query, cfg, {
       source: getSource(flags),
@@ -698,7 +744,7 @@ async function actionSearch2(args, flags) {
       page_size: flags["page-size"] ? parseInt(flags["page-size"]) : void 0
     });
     const results = res.results || [];
-    if (flags.format === "table") {
+    if (fmt === "table") {
       output(results.map((a) => ({
         id: a.id,
         method: a.method ?? "",
@@ -717,9 +763,10 @@ async function actionSearch2(args, flags) {
 }
 async function actionCategories2(args, flags) {
   const cfg = getConfig();
+  const fmt = flags.format || getFormat();
   try {
     const res = await actionCategories(cfg, { source: getSource(flags) });
-    if (flags.format === "table") {
+    if (fmt === "table") {
       output(res.categories.map((c) => ({ category: c })), "table");
     } else {
       output(res, flags.format);
@@ -730,6 +777,7 @@ async function actionCategories2(args, flags) {
 }
 async function actionServices2(args, flags) {
   const cfg = getConfig();
+  const fmt = flags.format || getFormat();
   try {
     const res = await actionServices(cfg, {
       page: flags.page ? parseInt(flags.page) : void 0,
@@ -737,7 +785,7 @@ async function actionServices2(args, flags) {
       category: flags.category
     });
     const services = res.services || [];
-    if (flags.format === "table") {
+    if (fmt === "table") {
       output(services.map((s) => ({
         id: s.id,
         name: s.name ?? "",
@@ -895,6 +943,11 @@ async function registerAccount(referralCode) {
 }
 async function register(args, flags) {
   try {
+    const cfg = getConfig();
+    const force = flags.force === "true" || flags.force === "1" || flags.force === "yes";
+    if (cfg.apiKey && !force) {
+      err("register would overwrite existing apiKey", 'Run "xapi-to register --force" to create a new account and replace the saved key.');
+    }
     const rawReferral = flags["referral-code"] ?? flags["referralCode"] ?? args[0];
     const referralCode = typeof rawReferral === "string" && rawReferral !== "true" && rawReferral.length > 0 ? rawReferral : void 0;
     const res = await registerAccount(referralCode);
@@ -910,7 +963,7 @@ async function register(args, flags) {
       },
       tweetTemplate: res.tweetTemplate,
       ...referralCode ? { referredBy: referralCode } : {},
-      note: "apiKey saved to ~/.xapi/config.json"
+      note: force && cfg.apiKey ? "apiKey replaced in ~/.xapi/config.json" : "apiKey saved to ~/.xapi/config.json"
     }, flags.format);
   } catch (e) {
     err("register failed", e.message);
@@ -967,7 +1020,8 @@ __export(oauth_exports, {
   oauthBind: () => oauthBind,
   oauthProviders: () => oauthProviders,
   oauthStatus: () => oauthStatus,
-  oauthUnbind: () => oauthUnbind
+  oauthUnbind: () => oauthUnbind,
+  pollForBinding: () => pollForBinding
 });
 import { spawnSync } from "child_process";
 function openBrowser(url) {
@@ -977,14 +1031,22 @@ function openBrowser(url) {
   } catch {
   }
 }
-async function pollForBinding(apiKeyId, providerId, jwtToken, timeoutMs = 5 * 60 * 1e3, intervalMs = 3e3) {
+function bindingChangedAfter(binding, startedAtMs, existingBindingIds) {
+  const changedAt = Date.parse(binding.updatedAt || binding.createdAt || "");
+  if (!Number.isFinite(changedAt)) return !existingBindingIds.has(binding.id);
+  return changedAt >= startedAtMs;
+}
+async function pollForBinding(apiKeyId, providerId, jwtToken, startedAt, existingBindingIds = /* @__PURE__ */ new Set(), timeoutMs = 5 * 60 * 1e3, intervalMs = 3e3) {
   const deadline = Date.now() + timeoutMs;
   const isTTY = process.stdout.isTTY;
+  const startedAtMs = startedAt.getTime() - 5e3;
   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;
+      const match = Array.isArray(bindings) ? bindings.find(
+        (b) => b.apiKeyId === apiKeyId && b.providerId === providerId && bindingChangedAfter(b, startedAtMs, existingBindingIds)
+      ) : null;
       if (match) return match;
     } catch {
     }
@@ -1012,10 +1074,105 @@ async function findCurrentKeyRecord(plaintextKey, jwtToken) {
   const prefix = plaintextKey.substring(0, 7);
   const match = keys.find((k) => k.keyPreview.startsWith(prefix));
   if (!match) {
-    return keys[0];
+    throw new Error(
+      `Current API key (${prefix}...) was not found in your account keys. Run "xapi-to config set apiKey=<key>" with a valid key before binding OAuth.`
+    );
   }
   return match;
 }
+function resolveScopeDefs(provider) {
+  if (Array.isArray(provider.scopeDefinitions) && provider.scopeDefinitions.length > 0) {
+    return provider.scopeDefinitions;
+  }
+  const raw = (provider.defaultScopes || "").split(/[\s,]+/).filter(Boolean);
+  return raw.map((s) => ({
+    scope: s,
+    label: s,
+    description: "",
+    required: false,
+    category: ""
+  }));
+}
+async function selectScopesInteractive(provider) {
+  const defs = resolveScopeDefs(provider);
+  if (defs.length === 0) return "";
+  const required = defs.filter((d) => d.required);
+  const optional = defs.filter((d) => !d.required);
+  const selected = new Set(defs.map((d) => d.scope));
+  if (optional.length === 0) {
+    return required.map((d) => d.scope).join(" ");
+  }
+  const out = process.stderr;
+  let cursor = 0;
+  const hint = "  \u2191\u2193 navigate \xB7 space toggle \xB7 a all \xB7 n none \xB7 enter confirm";
+  const buildFrame = () => {
+    const lines = [];
+    for (const d of required) {
+      const desc = d.description ? ` \u2014 ${d.description}` : "";
+      lines.push(`    \x1B[2m[*] ${d.label}${desc} (required)\x1B[0m`);
+    }
+    for (let i = 0; i < optional.length; i++) {
+      const d = optional[i];
+      const ptr = cursor === i ? " \x1B[36m\u276F\x1B[0m" : "  ";
+      const chk = selected.has(d.scope) ? "\x1B[32m\u2714\x1B[0m" : " ";
+      const desc = d.description ? ` \x1B[2m\u2014 ${d.description}\x1B[0m` : "";
+      lines.push(`  ${ptr} [${chk}] ${d.label}${desc}`);
+    }
+    lines.push(`\x1B[2m${hint}\x1B[0m`);
+    return lines.join("\n");
+  };
+  out.write("\n  Scopes:\n");
+  out.write("\x1B[s");
+  out.write("\x1B[?25l");
+  out.write(buildFrame());
+  const redraw = () => {
+    out.write("\x1B[u");
+    out.write("\x1B[J");
+    out.write(buildFrame());
+  };
+  return new Promise((resolve) => {
+    const { stdin } = process;
+    const wasRaw = stdin.isRaw;
+    stdin.setRawMode(true);
+    stdin.resume();
+    const finish = (result) => {
+      stdin.removeListener("data", onData);
+      stdin.setRawMode(wasRaw ?? false);
+      stdin.pause();
+      out.write("\x1B[?25h");
+      out.write("\n");
+      resolve(result);
+    };
+    const onData = (buf) => {
+      const key = buf.toString();
+      if (key === "\r" || key === "\n") {
+        finish(Array.from(selected).join(" "));
+        return;
+      }
+      if (key === "") {
+        finish("");
+        process.exit(130);
+      }
+      if (key === "\x1B[A" || key === "k") {
+        cursor = (cursor - 1 + optional.length) % optional.length;
+      } else if (key === "\x1B[B" || key === "j") {
+        cursor = (cursor + 1) % optional.length;
+      } else if (key === " ") {
+        const scope = optional[cursor].scope;
+        if (selected.has(scope)) selected.delete(scope);
+        else selected.add(scope);
+      } else if (key === "a") {
+        for (const d of optional) selected.add(d.scope);
+      } else if (key === "n") {
+        for (const d of optional) selected.delete(d.scope);
+      } else {
+        return;
+      }
+      redraw();
+    };
+    stdin.on("data", onData);
+  });
+}
 var OAUTH_HELP = `xapi-to oauth - Manage OAuth bindings
 
 USAGE
@@ -1029,11 +1186,13 @@ COMMANDS
 
 FLAGS
   --provider <name>          OAuth provider (default: twitter)
+  --scopes <scopes>          Space-separated scopes (skips interactive selection)
   --format json|pretty|table   Output format
 
 EXAMPLES
   xapi-to oauth bind
   xapi-to oauth bind --provider twitter
+  xapi-to oauth bind --scopes "tweet.read users.read"
   xapi-to oauth status
   xapi-to oauth status --format pretty
   xapi-to oauth unbind abc123
@@ -1063,13 +1222,49 @@ async function oauthBind(args, flags) {
         `Provider "${providerName}" not found. Available: ${available}`
       );
     }
-    const result = await initiateOAuth(keyRecord.id, provider.id, jwtToken, XAPI_API_HOST);
+    let scopes;
+    let headerPrinted = false;
+    const isTTY = Boolean(
+      process.stdout.isTTY && process.stdin.isTTY && typeof process.stdin.setRawMode === "function"
+    );
+    if (flags.scopes) {
+      scopes = flags.scopes;
+    } else if (isTTY) {
+      const defs = resolveScopeDefs(provider);
+      if (defs.length > 0) {
+        console.error(`
+  Provider : ${provider.name}`);
+        console.error(`  API Key  : ${keyRecord.keyPreview}`);
+        headerPrinted = true;
+        scopes = await selectScopesInteractive(provider) || void 0;
+      }
+    }
+    const existingBindingIds = /* @__PURE__ */ new Set();
+    if (isTTY) {
+      try {
+        const existingBindings = await listOAuthBindings(jwtToken, XAPI_API_HOST);
+        if (Array.isArray(existingBindings)) {
+          for (const binding of existingBindings) {
+            if (binding.apiKeyId === keyRecord.id && binding.providerId === provider.id) {
+              existingBindingIds.add(binding.id);
+            }
+          }
+        }
+      } catch {
+      }
+    }
+    const authorizationStartedAt = /* @__PURE__ */ new Date();
+    const result = await initiateOAuth(keyRecord.id, provider.id, jwtToken, XAPI_API_HOST, scopes);
     const { authorizationUrl } = result;
-    const isTTY = process.stdout.isTTY;
     if (isTTY) {
-      console.error(`
+      if (!headerPrinted) {
+        console.error(`
   Provider : ${provider.name}`);
-      console.error(`  API Key  : ${keyRecord.keyPreview}`);
+        console.error(`  API Key  : ${keyRecord.keyPreview}`);
+      }
+      if (scopes) {
+        console.error(`  Scopes   : ${scopes}`);
+      }
       console.error(`
   Authorization URL:
   ${authorizationUrl}
@@ -1077,14 +1272,20 @@ async function oauthBind(args, flags) {
       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);
+      const binding = await pollForBinding(
+        keyRecord.id,
+        provider.id,
+        jwtToken,
+        authorizationStartedAt,
+        existingBindingIds
+      );
       if (process.stdout.isTTY) process.stdout.write("\n");
       if (binding) {
         const account = binding.providerAccountName || "unknown";
         console.error(`
   Authorization complete! Bound to @${account}
 `);
-        output({ status: "success", provider: provider.name, account }, flags.format);
+        output({ status: "success", provider: provider.name, account, scopes }, flags.format);
       } else {
         err("oauth bind timed out", 'Authorization was not completed within 5 minutes. Run "xapi-to oauth bind" again.');
       }
@@ -1093,7 +1294,8 @@ async function oauthBind(args, flags) {
         status: "pending",
         provider: provider.name,
         apiKey: keyRecord.keyPreview,
-        authorizationUrl
+        authorizationUrl,
+        scopes
       }, flags.format);
     }
   } catch (e) {
@@ -1216,6 +1418,7 @@ COMMANDS
 
   register [referral-code]          Create a new user account (apiKey saved automatically)
     --referral-code <code>          Register with an inviter's referral code (also: --referralCode, or as positional arg)
+    --force                         Replace an existing saved apiKey
   balance                           Show current account balance
   topup [--amount <usd>] [--method stripe|x402]   Generate payment URL
 

package/package.json

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