uplink-cli 0.1.0-alpha.2 → 0.1.0-alpha.4

package/cli/src/subcommands/menu.ts

@@ -79,12 +79,20 @@ function colorRed(text: string) {
   return `${c.red}${text}${c.reset}`;
 }
 
+const TOKEN_DOMAIN = process.env.TUNNEL_DOMAIN || "x.uplink.spot";
+const ALIAS_DOMAIN = process.env.ALIAS_DOMAIN || "uplink.spot";
+const URL_SCHEME = (process.env.TUNNEL_URL_SCHEME || "https").toLowerCase();
+
 function colorMagenta(text: string) {
   return `${c.magenta}${text}${c.reset}`;
 }
 
+function colorWhite(text: string) {
+  return `${c.brightWhite}${text}${c.reset}`;
+}
+
 // ASCII banner with color styling
-const ASCII_UPLINK = colorCyan([
+const ASCII_UPLINK = colorWhite([
   "██╗   ██╗██████╗ ██╗     ██╗███╗   ██╗██╗  ██╗",
   "██║   ██║██╔══██╗██║     ██║████╗  ██║██║ ██╔╝",
   "██║   ██║██████╔╝██║     ██║██╔██╗ ██║█████╔╝ ",
@@ -141,6 +149,7 @@ async function inlineSelect(
         let branchColor: string;
         
         if (isSelected) {
+          // Selected: cyan highlight
           branchColor = colorCyan(branch);
           if (opt.label === "Back") {
             label = colorDim(opt.label);
@@ -148,11 +157,12 @@ async function inlineSelect(
             label = colorCyan(opt.label);
           }
         } else {
-          branchColor = colorDim(branch);
+          // Not selected: white
+          branchColor = colorWhite(branch);
           if (opt.label === "Back") {
             label = colorDim(opt.label);
           } else {
-            label = opt.label;
+            label = colorWhite(opt.label);
           }
         }
         
@@ -167,8 +177,8 @@ async function inlineSelect(
     allOptions.forEach((opt, idx) => {
       const isLast = idx === allOptions.length - 1;
       const branch = isLast ? "└─" : "├─";
-      const branchColor = idx === 0 ? colorCyan(branch) : colorDim(branch);
-      const label = idx === 0 ? colorCyan(opt.label) : (opt.label === "Back" ? colorDim(opt.label) : opt.label);
+      const branchColor = idx === 0 ? colorCyan(branch) : colorWhite(branch);
+      const label = idx === 0 ? colorCyan(opt.label) : (opt.label === "Back" ? colorDim(opt.label) : colorWhite(opt.label));
       console.log(`${branchColor} ${label}`);
     });
     
@@ -652,6 +662,137 @@ export const menuCommand = new Command("menu")
               }
             },
           },
+          {
+            label: "Set Permanent Alias",
+            action: async () => {
+              const data = await apiRequest("GET", "/v1/tunnels");
+              const tunnels = data.tunnels || [];
+              if (!tunnels.length) return "No tunnels found.";
+
+              const options: SelectOption[] = tunnels.map((t: any) => {
+                const token = truncate(t.token || "", 10);
+                const alias = t.alias ? colorGreen(t.alias) : colorDim("none");
+                const port = t.target_port ?? t.targetPort ?? "-";
+                return {
+                  label: `${token.padEnd(12)} port ${String(port).padEnd(5)} alias ${alias}`,
+                  value: t.id,
+                };
+              });
+
+              const choice = await inlineSelect("Select tunnel for alias", options, true);
+              if (choice === null) return "";
+
+              try {
+                process.stdin.setRawMode(false);
+              } catch {
+                /* ignore */
+              }
+              const aliasInput = await promptLine("Enter alias (e.g. thomas): ");
+              restoreRawMode();
+              const alias = aliasInput.trim();
+              if (!alias) return "Alias not set (empty).";
+
+              try {
+                const result = await apiRequest("POST", `/v1/tunnels/${choice.value}/alias`, {
+                  alias,
+                });
+                const aliasUrl = result.aliasUrl || `${URL_SCHEME}://${alias}.${ALIAS_DOMAIN}`;
+                const tokenUrl = result.url || `${URL_SCHEME}://${result.token}.${TOKEN_DOMAIN}`;
+                return [
+                  "✓ Alias updated",
+                  `→ Alias URL   ${aliasUrl}`,
+                  `→ Token URL   ${tokenUrl}`,
+                ].join("\n");
+              } catch (err: any) {
+                const errMsg = err?.message || String(err);
+                // Check for premium feature errors
+                if (errMsg.includes("ALIAS_NOT_ENABLED")) {
+                  try {
+                    const parsed = JSON.parse(errMsg);
+                    const userId = parsed?.error?.details?.user_id || "(check your token)";
+                    return [
+                      "",
+                      colorYellow("🔒 Permanent Aliases - Premium Feature"),
+                      "",
+                      "Permanent aliases give you stable URLs like:",
+                      `  ${colorGreen(`https://myapp.${ALIAS_DOMAIN}`)}`,
+                      "",
+                      "Instead of regenerating tokens each time.",
+                      "",
+                      "To unlock this feature:",
+                      `  → Join our Discord: ${colorCyan("https://uplink.spot")}`,
+                      `  → Share your user ID: ${colorDim(userId)}`,
+                      "",
+                      "We'll enable it for your account!",
+                      "",
+                    ].join("\n");
+                  } catch {
+                    return colorYellow("🔒 Aliases are a premium feature. Contact us at uplink.spot to upgrade.");
+                  }
+                }
+                if (errMsg.includes("ALIAS_LIMIT_REACHED")) {
+                  return colorYellow("⚠️  You've reached your alias limit. Contact us to increase it.");
+                }
+                throw err; // Re-throw other errors
+              }
+            },
+          },
+          {
+            label: "Remove Alias",
+            action: async () => {
+              const data = await apiRequest("GET", "/v1/tunnels");
+              const tunnels = (data.tunnels || []).filter((t: any) => !!t.alias);
+              if (!tunnels.length) return "No tunnels with aliases.";
+
+              const options: SelectOption[] = tunnels.map((t: any) => ({
+                label: `${truncate(t.token || "", 10).padEnd(12)} alias ${colorGreen(t.alias)}`,
+                value: t.id,
+              }));
+
+              const choice = await inlineSelect("Select tunnel to remove alias", options, true);
+              if (choice === null) return "";
+
+              await apiRequest("DELETE", `/v1/tunnels/${choice.value}/alias`);
+              return "✓ Alias removed";
+            },
+          },
+          {
+            label: "View Connected (with IPs)",
+            action: async () => {
+              try {
+                // Use the API endpoint which proxies to the relay
+                const data = await apiRequest("GET", "/v1/admin/relay-status") as { 
+                  connectedTunnels?: number; 
+                  tunnels?: Array<{ token: string; clientIp: string; targetPort: number; connectedAt: string; connectedFor: string }>;
+                  timestamp?: string;
+                  error?: string;
+                  message?: string;
+                };
+                
+                if (data.error) {
+                  return `❌ Relay error: ${data.error}${data.message ? ` - ${data.message}` : ""}`;
+                }
+                
+                if (!data.tunnels || data.tunnels.length === 0) {
+                  return "No tunnels currently connected to the relay.";
+                }
+                
+                const lines = data.tunnels.map((t) => 
+                  `${truncate(t.token, 12).padEnd(14)} ${t.clientIp.padEnd(16)} ${String(t.targetPort).padEnd(6)} ${t.connectedFor.padEnd(10)} ${truncate(t.connectedAt, 19)}`
+                );
+                
+                return [
+                  `Connected Tunnels: ${data.connectedTunnels}`,
+                  "",
+                  "Token          Client IP        Port   Uptime     Connected At",
+                  "-".repeat(75),
+                  ...lines,
+                ].join("\n");
+              } catch (err: any) {
+                return `❌ Failed to get relay status: ${err.message}`;
+              }
+            },
+          },
         ],
       });
 
@@ -668,27 +809,38 @@ export const menuCommand = new Command("menu")
             if (!tunnels || tunnels.length === 0) {
               return "No tunnels found.";
             }
-            
-            const lines = tunnels.map(
-              (t: any) => {
-                const token = t.token || "";
-                const connectedFromApi = t.connected ?? false;
-                const connectedLocal = runningClients.some((c) => c.token === token);
-                const connectionStatus = isAdmin
-                  ? (connectedFromApi ? "connected" : "disconnected")
-                  : (connectedLocal ? "connected" : "unknown");
-                
-                return `${truncate(t.id, 12)}  ${truncate(token, 10).padEnd(12)}  ${String(
+            const lines = tunnels.map((t: any) => {
+              const token = t.token || "";
+              const alias = t.alias || "-";
+              const tokenUrl = t.url || `${URL_SCHEME}://${token}.${TOKEN_DOMAIN}`;
+              const aliasUrl =
+                t.aliasUrl || (t.alias ? `${URL_SCHEME}://${t.alias}.${ALIAS_DOMAIN}` : "-");
+              const connectedFromApi = t.connected ?? false;
+              const connectedLocal = runningClients.some((c) => c.token === token);
+              const connectionStatus = isAdmin
+                ? connectedFromApi
+                  ? "connected"
+                  : "disconnected"
+                : connectedLocal
+                ? "connected"
+                : "unknown";
+
+              return [
+                `${truncate(t.id, 12)}  ${truncate(token, 10).padEnd(12)}  ${String(
                   t.target_port ?? t.targetPort ?? "-"
                 ).padEnd(5)}  ${connectionStatus.padEnd(12)}  ${truncate(
                   t.created_at ?? t.createdAt ?? "",
                   19
-                )}`;
-              }
-            );
-            return ["ID           Token         Port   Connection   Created", "-".repeat(70), ...lines].join(
-              "\n"
-            );
+                )}`,
+                `    url:   ${tokenUrl}`,
+                `    alias: ${aliasUrl} (${alias})`,
+              ].join("\n");
+            });
+            return [
+              "ID           Token         Port   Connection   Created",
+              "-".repeat(90),
+              ...lines,
+            ].join("\n\n");
           },
         },
         {
@@ -816,6 +968,71 @@ export const menuCommand = new Command("menu")
               }
             },
           },
+          {
+            label: "Grant Alias Access",
+            action: async () => {
+              try {
+                // Fetch available tokens to show users
+                const result = await apiRequest("GET", "/v1/admin/tokens");
+                const tokens = result.tokens || [];
+                
+                if (tokens.length === 0) {
+                  restoreRawMode();
+                  return "No tokens found.";
+                }
+                
+                // Build options from tokens (group by user_id)
+                const userMap = new Map<string, any>();
+                for (const t of tokens) {
+                  const userId = t.user_id || t.userId;
+                  if (userId && !userMap.has(userId)) {
+                    userMap.set(userId, t);
+                  }
+                }
+                
+                const options: SelectOption[] = Array.from(userMap.entries()).map(([userId, t]) => ({
+                  label: `${truncate(userId, 20)} ${colorDim(`${t.role || "user"} - ${t.label || "no label"}`)}`,
+                  value: userId,
+                }));
+                
+                const selected = await inlineSelect("Select user to grant alias access", options, true);
+                
+                if (selected === null) {
+                  restoreRawMode();
+                  return "";
+                }
+                
+                const userId = selected.value as string;
+                
+                // Prompt for limit
+                try {
+                  process.stdin.setRawMode(false);
+                } catch {
+                  /* ignore */
+                }
+                const limitAnswer = await promptLine("Alias limit (1-10, or -1 for unlimited, default 1): ");
+                restoreRawMode();
+                
+                const aliasLimit = limitAnswer.trim() ? parseInt(limitAnswer.trim(), 10) : 1;
+                if (isNaN(aliasLimit) || aliasLimit < -1 || aliasLimit > 100) {
+                  return "Invalid limit. Must be -1 (unlimited) or 0-100.";
+                }
+                
+                await apiRequest("POST", "/v1/admin/grant-alias", { userId, aliasLimit });
+                
+                const limitDesc = aliasLimit === -1 ? "unlimited" : String(aliasLimit);
+                return [
+                  "✓ Alias access granted",
+                  "",
+                  `→ User      ${userId}`,
+                  `→ Limit     ${limitDesc} alias(es)`,
+                ].join("\n");
+              } catch (err: any) {
+                restoreRawMode();
+                throw err;
+              }
+            },
+          },
         ],
       });
 
@@ -866,11 +1083,8 @@ export const menuCommand = new Command("menu")
       if (clients.length === 0) {
         cachedActiveTunnels = "";
       } else {
-        const domain = process.env.TUNNEL_DOMAIN || "t.uplink.spot";
-        const scheme = (process.env.TUNNEL_URL_SCHEME || "https").toLowerCase();
-        
         const tunnelLines = clients.map((client, idx) => {
-          const url = `${scheme}://${client.token}.${domain}`;
+          const url = `${URL_SCHEME}://${client.token}.${TOKEN_DOMAIN}`;
           const isLast = idx === clients.length - 1;
           const branch = isLast ? "└─" : "├─";
           return colorDim(branch) + " " + colorGreen(url) + colorDim(" → ") + `localhost:${client.port}`;
@@ -964,6 +1178,7 @@ export const menuCommand = new Command("menu")
         let branchColor: string;
         
         if (isSelected) {
+          // Selected: cyan highlight
           branchColor = colorCyan(branch);
           if (cleanLabel.toLowerCase().includes("exit")) {
             label = colorDim(cleanLabel);
@@ -975,7 +1190,8 @@ export const menuCommand = new Command("menu")
             label = colorCyan(cleanLabel);
           }
         } else {
-          branchColor = colorDim(branch);
+          // Not selected: white text
+          branchColor = colorWhite(branch);
           if (cleanLabel.toLowerCase().includes("exit")) {
             label = colorDim(cleanLabel);
           } else if (cleanLabel.toLowerCase().includes("stop all") || cleanLabel.toLowerCase().includes("kill")) {
@@ -983,7 +1199,7 @@ export const menuCommand = new Command("menu")
           } else if (cleanLabel.toLowerCase().includes("get started")) {
             label = colorGreen(cleanLabel);
           } else {
-            label = cleanLabel;
+            label = colorWhite(cleanLabel);
           }
         }
         

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uplink-cli",
-  "version": "0.1.0-alpha.2",
+  "version": "0.1.0-alpha.4",
   "description": "Localhost to public URL in seconds. No signup forms, no browser - everything in your terminal.",
   "keywords": [
     "tunnel",