airterm 1.0.0 → 1.0.2

package/dist/cli.js

@@ -83,7 +83,7 @@ function resetAll() {
 }
 
 // src/components/Welcome.tsx
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { Box as Box2, Text as Text2 } from "ink";
 import TextInput from "ink-text-input";
 
@@ -94,10 +94,50 @@ function Header() {
   return /* @__PURE__ */ jsx(Box, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ jsx(Box, { borderStyle: "round", paddingX: 2, children: /* @__PURE__ */ jsx(Text, { bold: true, color: "cyan", children: "AirTerm" }) }) });
 }
 
+// src/lib/api.ts
+var API_BASE = process.env.AIRCLAW_API_URL || "https://app.airclaw.com";
+async function redeemCode(code) {
+  const res = await fetch(`${API_BASE}/api/airterm/redeem`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ code })
+  });
+  const data = await res.json();
+  if (!res.ok) {
+    return { error: data.error || `HTTP ${res.status}` };
+  }
+  return data;
+}
+function isRedeemError(result) {
+  return "error" in result;
+}
+async function downloadKey(url) {
+  const res = await fetch(url);
+  if (!res.ok) {
+    throw new Error(`Failed to download key: HTTP ${res.status}`);
+  }
+  return await res.text();
+}
+async function fetchInfo() {
+  try {
+    const res = await fetch(`${API_BASE}/api/airterm/info`);
+    if (!res.ok) return null;
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+
 // src/components/Welcome.tsx
-import { jsx as jsx2, jsxs } from "react/jsx-runtime";
+import { Fragment, jsx as jsx2, jsxs } from "react/jsx-runtime";
 function Welcome({ onSubmitCode }) {
   const [code, setCode] = useState("");
+  const [phone, setPhone] = useState(null);
+  useEffect(() => {
+    fetchInfo().then((info) => {
+      if (info?.phone) setPhone(info.phone);
+    });
+  }, []);
   return /* @__PURE__ */ jsxs(Box2, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx2(Header, {}),
     /* @__PURE__ */ jsx2(Box2, { marginBottom: 1, children: /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "No saved connections." }) }),
@@ -117,11 +157,14 @@ function Welcome({ onSubmitCode }) {
         }
       )
     ] }),
-    /* @__PURE__ */ jsx2(Box2, { marginTop: 1, children: /* @__PURE__ */ jsxs(Text2, { dimColor: true, children: [
-      "Don't have one? Text your AirClaw:",
-      "\n",
-      "\u2192 sms:+14156058331&body=Give%20me%20terminal%20access"
-    ] }) })
+    /* @__PURE__ */ jsx2(Box2, { marginTop: 1, flexDirection: "column", children: phone ? /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "Don't have one? Text your AirClaw:" }),
+      /* @__PURE__ */ jsxs(Text2, { color: "cyan", children: [
+        "\u2192 sms:",
+        phone,
+        "&body=Give%20me%20terminal%20access"
+      ] })
+    ] }) : /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "Don't have one? Text your AirClaw and ask for terminal access." }) })
   ] });
 }
 
@@ -232,53 +275,32 @@ function SelectMachine({
 }
 
 // src/components/Connecting.tsx
-import { useEffect, useState as useState4 } from "react";
+import { useEffect as useEffect2, useState as useState4 } from "react";
 import { Box as Box5, Text as Text5, useApp as useApp2 } from "ink";
 import Spinner from "ink-spinner";
 
-// src/lib/api.ts
-var API_BASE = process.env.AIRCLAW_API_URL || "https://app.airclaw.com";
-async function redeemCode(code) {
-  const res = await fetch(`${API_BASE}/api/airterm/redeem`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ code })
-  });
-  const data = await res.json();
-  if (!res.ok) {
-    return { error: data.error || `HTTP ${res.status}` };
-  }
-  return data;
-}
-function isRedeemError(result) {
-  return "error" in result;
-}
-async function downloadKey(url) {
-  const res = await fetch(url);
-  if (!res.ok) {
-    throw new Error(`Failed to download key: HTTP ${res.status}`);
-  }
-  return await res.text();
-}
-
 // src/lib/ssh.ts
 import { spawnSync } from "child_process";
 function connectSSH(conn) {
-  const result = spawnSync(
-    "ssh",
-    [
-      "-i",
-      conn.keyPath,
-      "-p",
-      String(conn.port),
+  const needsTls = conn.hostname.endsWith(".fly.dev");
+  const args = [
+    "-i",
+    conn.keyPath,
+    "-p",
+    String(conn.port),
+    "-o",
+    "StrictHostKeyChecking=accept-new",
+    "-o",
+    "UserKnownHostsFile=~/.airterm/known_hosts"
+  ];
+  if (needsTls) {
+    args.push(
       "-o",
-      "StrictHostKeyChecking=accept-new",
-      "-o",
-      "UserKnownHostsFile=~/.airterm/known_hosts",
-      `${conn.username}@${conn.hostname}`
-    ],
-    { stdio: "inherit" }
-  );
+      `ProxyCommand openssl s_client -connect %h:%p -quiet 2>/dev/null`
+    );
+  }
+  args.push(`${conn.username}@${conn.hostname}`);
+  const result = spawnSync("ssh", args, { stdio: "inherit" });
   return result.status ?? 1;
 }
 
@@ -289,7 +311,7 @@ function Connecting({ code, connection, onError }) {
     code ? "Redeeming access code..." : "Connecting..."
   );
   const { exit } = useApp2();
-  useEffect(() => {
+  useEffect2(() => {
     let cancelled = false;
     async function run() {
       let conn = connection;
@@ -438,10 +460,14 @@ function App({ initialCode: initialCode2, initialScreen: initialScreen2 }) {
 
 // src/cli.tsx
 import { jsx as jsx8 } from "react/jsx-runtime";
+if (process.argv.includes("-h")) {
+  process.argv[process.argv.indexOf("-h")] = "--help";
+}
+if (process.argv.includes("-v")) {
+  process.argv[process.argv.indexOf("-v")] = "--version";
+}
 var cli = meow(
   `
-  AirTerm \u2014 SSH into your AirClaw machine
-
   Usage:
     airterm              Connect to your machine
     airterm <code>       Redeem an access code and connect
@@ -485,14 +511,14 @@ if (command === "add") {
   } else {
     initialScreen = "add";
   }
-} else if (command === "list") {
+} else if (command === "list" || command === "ls") {
   const connections = getConnections();
   if (connections.length === 0) {
     console.log("No saved connections. Run `airterm add` to set up.");
     process.exit(0);
   }
   initialScreen = "list";
-} else if (command && !["add", "list", "help", "reset"].includes(command)) {
+} else if (command && !["add", "list", "ls", "help", "reset"].includes(command)) {
   if (/^[A-Za-z0-9_-]{10,}$/.test(command)) {
     initialCode = command;
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airterm",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "SSH into your AirClaw machine",
   "type": "module",
   "bin": {