@sharnix/agent 1.0.7 → 1.0.9

package/index.js

@@ -10,7 +10,7 @@ const { randomBytes, createHash } = require('crypto');
 
 const RELAY_BASE = (process.env.SHARNIX_URL || 'https://relay.sharnix.com').replace(/\/$/, '');
 const WS_BASE = RELAY_BASE.replace(/^http/, 'ws');
-const API_KEY = process.env.SHARNIX_API_KEY || '';
+let API_KEY = process.env.SHARNIX_API_KEY || process.env.SHARNIX_KEY || '';
 
 // ── Config persistence (declared early so dispatch below can rely on it) ──────
 const CONFIG_DIR = path.join(os.homedir(), '.sharnix');
@@ -34,10 +34,10 @@ if (has('--help') || has('-h')) {
   sharnix — tunnel your local app through Sharnix
 
   Usage:
-    npx @sharnix/agent setup               First-time setup on your local machine
-    npx @sharnix/agent setup --print-url   Print auth URL and exit (for remote/agent use)
-    npx @sharnix/agent --port <port>       Tunnel a local port
-    SHARNIX_API_KEY=shx_... npx @sharnix/agent --port 3000
+    npx @sharnix/agent --port <port>            Tunnel a local port (auto-runs setup if no key)
+    npx @sharnix/agent --port <port> --share    Tunnel and print a share link on connect
+    npx @sharnix/agent setup                    Re-run setup explicitly (writes MCP config too)
+    npx @sharnix/agent setup --print-url        Print auth URL and exit (legacy non-blocking mode)
 
   Options:
     --port, -p <n>    Local port to forward (default: 3000)
@@ -47,23 +47,17 @@ if (has('--help') || has('-h')) {
     --help, -h        Show this message
 
   Environment:
-    SHARNIX_API_KEY   API key from relay.sharnix.com/app/settings
-    SHARNIX_URL       Override relay base URL
+    SHARNIX_API_KEY   API key (also: SHARNIX_KEY). If unset and ~/.sharnix/key.json
+                      doesn't exist, the CLI will start the device flow automatically.
+    SHARNIX_URL       Override relay base URL (default: https://relay.sharnix.com)
 `);
   process.exit(0);
 }
 
-// ── Setup command (device-flow bootstrap, no API key required) ────────────────
+// ── Dispatch ──────────────────────────────────────────────────────────────────
 if (args[0] === 'setup') {
   runSetup(has('--print-url')).catch((err) => { console.error(`\n  Error: ${err.message}\n`); process.exit(1); });
 } else {
-  if (!API_KEY) {
-    console.error('\n  Error: SHARNIX_API_KEY is not set.\n');
-    console.error('  On your local machine:  npx @sharnix/agent setup');
-    console.error('  On a remote machine:    SHARNIX_API_KEY=shx_... npx @sharnix/agent --port 3000');
-    console.error('\n  Get your key from relay.sharnix.com/app/settings → API Keys\n');
-    process.exit(1);
-  }
   if (isNaN(port) || port < 1 || port > 65535) {
     console.error(`\n  Error: invalid port "${get('--port') || get('-p')}"\n`);
     process.exit(1);
@@ -181,18 +175,37 @@ function connect() {
 }
 
 async function createShareLink() {
+  let orgs;
   try {
-    const orgs = await api('GET', '/api/v1/orgs');
-    if (!orgs.length) return;
-    const orgSlug = creds.orgSlug || orgs[0].slug;
-    const result = await api('POST', `/api/v1/orgs/${orgSlug}/tunnels/${tunnelId}/links`, {
-      permission: 'read-only',
-      label: label || 'Shared via agent',
-    });
-    console.log(`  Share link  : ${result.url}`);
-    console.log(`  Permission  : read-only\n`);
+    orgs = await api('GET', '/api/v1/orgs');
   } catch (err) {
     console.error(`  Could not create share link: ${err.message}`);
+    return;
+  }
+  if (!orgs.length) return;
+  const orgSlug = creds.orgSlug || orgs[0].slug;
+
+  // The relay inserts the tunnel row from an async handler triggered by our WS REGISTER.
+  // The HTTP POST below can arrive before that insert completes, yielding tunnel_not_found.
+  // Retry briefly on that specific error; surface any other error immediately.
+  const delays = [400, 800, 1500, 2500];
+  for (let attempt = 0; ; attempt++) {
+    try {
+      const result = await api('POST', `/api/v1/orgs/${orgSlug}/tunnels/${tunnelId}/links`, {
+        permission: 'read-only',
+        label: label || 'Shared via agent',
+      });
+      console.log(`  Share link  : ${result.url}`);
+      console.log(`  Permission  : read-only\n`);
+      return;
+    } catch (err) {
+      if (err.message === 'tunnel_not_found' && attempt < delays.length) {
+        await new Promise((r) => setTimeout(r, delays[attempt]));
+        continue;
+      }
+      console.error(`  Could not create share link: ${err.message}`);
+      return;
+    }
   }
 }
 
@@ -266,70 +279,116 @@ process.on('SIGINT', () => {
   process.exit(0);
 });
 
-// ── Tunnel main ───────────────────────────────────────────────────────────────
-function main() {
-  console.log(`\n  Sharnix Agent  →  localhost:${port}\n`);
-  bootstrap()
-    .then((c) => { creds = c; connect(); })
-    .catch((err) => { console.error(`\n  Error: ${err.message}\n`); process.exit(1); });
+// ── Key resolution + headless detection ──────────────────────────────────────
+function resolveApiKey() {
+  if (API_KEY) return API_KEY;
+  for (const name of ['key.json', 'sharnix-key.json']) {
+    const data = loadJson(path.join(CONFIG_DIR, name));
+    if (data?.apiKey) return data.apiKey;
+  }
+  return null;
 }
 
-// ── Setup: device-flow bootstrap ─────────────────────────────────────────────
-async function runSetup(printUrlOnly = false) {
-  const { spawn } = require('child_process');
-
-  console.log('\n  Sharnix Setup\n');
+function isHeadlessEnv() {
+  if (!process.stdout.isTTY) return true;
+  if (process.env.SSH_CLIENT || process.env.SSH_TTY || process.env.SSH_CONNECTION) return true;
+  if (process.env.CI) return true;
+  if (process.platform === 'linux' && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY) return true;
+  return false;
+}
 
-  // Start device flow
-  process.stdout.write('  Starting setup…');
+// Device-flow bootstrap — returns the API key without writing MCP config.
+// Shared by both auto-bootstrap (main path) and the explicit `setup` command.
+async function obtainKeyViaDeviceFlow() {
   const r = await fetch(`${RELAY_BASE}/api/v1/setup-cli`, { method: 'POST' });
-  if (!r.ok) throw new Error('Could not reach relay.sharnix.com. Check your internet connection.');
+  if (!r.ok) throw new Error(`Could not reach ${RELAY_BASE}. Check your connection.`);
   const { code, authUrl } = await r.json();
-  process.stdout.write(' done\n\n');
 
-  if (printUrlOnly) {
-    // Non-blocking mode for agents running on remote machines
-    console.log('  Authorization URL (open this in your browser):\n');
-    console.log(`  ${authUrl}\n`);
-    console.log('  After authorizing, run the tunnel with:');
-    console.log(`  SHARNIX_API_KEY=<your-key> npx @sharnix/agent --port 3000\n`);
-    console.log('  Your key will be shown on the authorization page after you click "Authorize".\n');
-    process.exit(0);
-  }
+  const headless = isHeadlessEnv();
 
-  console.log('  Opening your browser to authorize…');
-  console.log(`  URL: ${authUrl}\n`);
+  console.log('\n  ──────────────────────────────────────────────────────────');
+  console.log('  No Sharnix key found — let\'s set one up. (10-second flow.)');
+  console.log('  ──────────────────────────────────────────────────────────\n');
+  console.log('  Open this URL in any browser to authorize (your phone works fine):\n');
+  console.log(`    ${authUrl}\n`);
 
-  // Open browser cross-platform
-  try {
-    if (process.platform === 'win32') {
-      spawn('cmd', ['/c', 'start', '', authUrl], { detached: true, stdio: 'ignore' });
-    } else {
-      const cmd = process.platform === 'darwin' ? 'open' : 'xdg-open';
-      spawn(cmd, [authUrl], { detached: true, stdio: 'ignore' });
-    }
-  } catch {}
+  if (!headless) {
+    try {
+      const { spawn } = require('child_process');
+      if (process.platform === 'win32') {
+        spawn('cmd', ['/c', 'start', '', authUrl], { detached: true, stdio: 'ignore' });
+      } else {
+        const cmd = process.platform === 'darwin' ? 'open' : 'xdg-open';
+        spawn(cmd, [authUrl], { detached: true, stdio: 'ignore' });
+      }
+    } catch {}
+  }
 
-  // Poll until authorized
-  process.stdout.write('  Waiting for browser authorization');
-  let apiKey = null;
+  process.stdout.write('  Waiting for authorization');
   const deadline = Date.now() + 10 * 60 * 1000;
   while (Date.now() < deadline) {
-    await new Promise((r) => setTimeout(r, 2000));
+    await new Promise((r) => setTimeout(r, 3000));
     process.stdout.write('.');
     const poll = await fetch(`${RELAY_BASE}/api/v1/setup-cli/${code}`);
     if (!poll.ok) { process.stdout.write('\n'); throw new Error('Setup session expired.'); }
     const data = await poll.json();
-    if (data.done) { apiKey = data.key; break; }
+    if (data.done) { process.stdout.write(' ✓\n'); return data.key; }
   }
   process.stdout.write('\n');
-  if (!apiKey) throw new Error('Setup timed out. Run npx @sharnix/agent setup again.');
+  throw new Error('Setup timed out after 10 minutes.');
+}
 
-  console.log('\n  API key received!\n');
+function saveKeyToDisk(apiKey) {
+  saveJson(path.join(CONFIG_DIR, 'key.json'), { apiKey, createdAt: new Date().toISOString() });
+}
+
+// ── Tunnel main ───────────────────────────────────────────────────────────────
+async function main() {
+  console.log(`\n  Sharnix Agent  →  localhost:${port}`);
+
+  // Resolve a key, or trigger device flow inline if none.
+  API_KEY = resolveApiKey();
+  if (!API_KEY) {
+    try {
+      API_KEY = await obtainKeyViaDeviceFlow();
+      saveKeyToDisk(API_KEY);
+      console.log(`  ✓ Key saved to ${path.join(CONFIG_DIR, 'key.json')}\n`);
+    } catch (err) {
+      console.error(`\n  Error: ${err.message}\n`);
+      process.exit(1);
+    }
+  }
+
+  try {
+    creds = await bootstrap();
+    connect();
+  } catch (err) {
+    console.error(`\n  Error: ${err.message}\n`);
+    process.exit(1);
+  }
+}
 
-  // Save key to ~/.sharnix/config.json
-  if (!fs.existsSync(CONFIG_DIR)) fs.mkdirSync(CONFIG_DIR, { recursive: true });
-  saveJson(path.join(CONFIG_DIR, 'sharnix-key.json'), { apiKey, createdAt: new Date().toISOString() });
+// ── Setup: explicit `setup` subcommand — bootstrap + MCP config write ────────
+async function runSetup(printUrlOnly = false) {
+  console.log('\n  Sharnix Setup\n');
+
+  if (printUrlOnly) {
+    // Legacy non-blocking mode — start device flow, print URL, exit.
+    process.stdout.write('  Starting setup…');
+    const r = await fetch(`${RELAY_BASE}/api/v1/setup-cli`, { method: 'POST' });
+    if (!r.ok) throw new Error('Could not reach relay.sharnix.com. Check your internet connection.');
+    const { authUrl } = await r.json();
+    process.stdout.write(' done\n\n');
+    console.log('  Authorization URL (open this in your browser):\n');
+    console.log(`  ${authUrl}\n`);
+    console.log('  After authorizing, just run the tunnel — the CLI will read the saved key:');
+    console.log('    npx @sharnix/agent --port 3000\n');
+    process.exit(0);
+  }
+
+  const apiKey = await obtainKeyViaDeviceFlow();
+  console.log('\n  API key received!\n');
+  saveKeyToDisk(apiKey);
 
   // Detect and write MCP configs
   const mcpBlock = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sharnix/agent",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Tunnel your local app through Sharnix — share previews with one command",
   "keywords": ["tunnel", "preview", "sharing", "localhost", "sharnix"],
   "homepage": "https://relay.sharnix.com",