termbeam 1.2.5 → 1.2.7

package/README.md

@@ -91,7 +91,7 @@ termbeam --persisted-tunnel
 termbeam --no-tunnel
 ```
 
-Requires the [Dev Tunnels CLI](https://learn.microsoft.com/en-us/azure/developer/dev-tunnels/get-started):
+If the [Dev Tunnels CLI](https://learn.microsoft.com/en-us/azure/developer/dev-tunnels/get-started) is not installed, TermBeam will offer to install it for you automatically. You can also install it manually:
 
 - **Windows:** `winget install Microsoft.devtunnel`
 - **macOS:** `brew install --cask devtunnel`
@@ -110,7 +110,7 @@ termbeam --host 127.0.0.1        # restrict to localhost (default: 0.0.0.0)
 | Flag                  | Description                                          | Default        |
 | --------------------- | ---------------------------------------------------- | -------------- |
 | `--password <pw>`     | Set access password (also accepts `--password=<pw>`) | Auto-generated |
-| `--no-password`       | Disable password                                     | —              |
+| `--no-password`       | Disable password (cannot combine with `--public`)    | —              |
 | `--generate-password` | Auto-generate a secure password                      | On             |
 | `--tunnel`            | Create an ephemeral devtunnel URL (private)          | On             |
 | `--no-tunnel`         | Disable tunnel (LAN-only)                            | —              |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termbeam",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "Beam your terminal to any device — mobile-optimized web terminal with multi-session support",
   "main": "src/server.js",
   "bin": {
@@ -9,8 +9,8 @@
   "scripts": {
     "start": "node bin/termbeam.js",
     "dev": "node bin/termbeam.js --generate-password",
-    "test": "node -e \"require('child_process').execFileSync(process.execPath,['--test',...require('fs').readdirSync('test').filter(f=>f.endsWith('.test.js')&&!f.startsWith('e2e-')).map(f=>'test/'+f)],{stdio:'inherit'})\"",
-    "test:coverage": "c8 --exclude=src/tunnel.js --reporter=text --reporter=lcov --reporter=json-summary --reporter=json node -e \"require('child_process').execFileSync(process.execPath,['--test','--test-reporter=spec','--test-reporter-destination=stdout',...require('fs').readdirSync('test').filter(f=>f.endsWith('.test.js')&&!f.startsWith('e2e-')).map(f=>'test/'+f)],{stdio:'inherit'})\"",
+    "test": "node -e \"require('child_process').execFileSync(process.execPath,['--test',...require('fs').readdirSync('test').filter(f=>f.endsWith('.test.js')&&!f.startsWith('e2e-')&&f!=='devtunnel-install.test.js').map(f=>'test/'+f)],{stdio:'inherit'})\"",
+    "test:coverage": "c8 --exclude=src/tunnel.js --reporter=text --reporter=lcov --reporter=json-summary --reporter=json node -e \"require('child_process').execFileSync(process.execPath,['--test','--test-reporter=spec','--test-reporter-destination=stdout',...require('fs').readdirSync('test').filter(f=>f.endsWith('.test.js')&&!f.startsWith('e2e-')&&f!=='devtunnel-install.test.js').map(f=>'test/'+f)],{stdio:'inherit'})\"",
     "prepare": "husky",
     "format": "prettier --write .",
     "lint": "node --check src/*.js bin/*.js",

package/src/cli.js

@@ -230,7 +230,7 @@ function parseArgs() {
   let useTunnel = true;
   let noTunnel = false;
   let persistedTunnel = false;
-  let anonymousTunnel = false;
+  let publicTunnel = false;
   let explicitPassword = !!password;
 
   const args = process.argv.slice(2);
@@ -248,7 +248,7 @@ function parseArgs() {
       useTunnel = true;
       persistedTunnel = true;
     } else if (args[i] === '--public') {
-      anonymousTunnel = true;
+      publicTunnel = true;
     } else if (args[i].startsWith('--password=')) {
       password = args[i].split('=')[1];
       explicitPassword = true;
@@ -285,8 +285,22 @@ function parseArgs() {
   if (noTunnel) useTunnel = false;
 
   // --public requires a tunnel
-  if (anonymousTunnel && !useTunnel) {
-    console.error('Error: --public requires a tunnel. Remove --no-tunnel or remove --public.');
+  if (publicTunnel && !useTunnel) {
+    const rd = '\x1b[31m';
+    const rs = '\x1b[0m';
+    console.error(
+      `${rd}Error: --public requires a tunnel. Remove --no-tunnel or remove --public.${rs}`,
+    );
+    process.exit(1);
+  }
+
+  // --public requires password authentication
+  if (publicTunnel && !password) {
+    const rd = '\x1b[31m';
+    const rs = '\x1b[0m';
+    console.error(
+      `${rd}Error: Public tunnels require password authentication. Remove --no-password or remove --public.${rs}`,
+    );
     process.exit(1);
   }
 
@@ -302,7 +316,7 @@ function parseArgs() {
     password,
     useTunnel,
     persistedTunnel,
-    anonymousTunnel,
+    publicTunnel,
     shell,
     shellArgs,
     cwd,

package/src/devtunnel-install.js

@@ -0,0 +1,141 @@
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const readline = require('readline');
+const { execSync, execFileSync } = require('child_process');
+const log = require('./logger');
+
+const INSTALL_DIR = path.join(os.homedir(), 'bin');
+
+function getInstallDir() {
+  return INSTALL_DIR;
+}
+
+function getBinaryName() {
+  return process.platform === 'win32' ? 'devtunnel.exe' : 'devtunnel';
+}
+
+function promptUser(question) {
+  if (!process.stdin.isTTY) {
+    return Promise.resolve('');
+  }
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve(answer.trim().toLowerCase());
+    });
+  });
+}
+
+const yellow = (s) => `\x1b[33m${s}\x1b[0m`;
+const cyan = (s) => `\x1b[36m${s}\x1b[0m`;
+const green = (s) => `\x1b[32m${s}\x1b[0m`;
+const bold = (s) => `\x1b[1m${s}\x1b[0m`;
+
+async function promptInstall() {
+  if (
+    process.platform !== 'darwin' &&
+    process.platform !== 'linux' &&
+    process.platform !== 'win32'
+  ) {
+    log.error(`Unsupported platform: ${process.platform}/${process.arch}`);
+    return null;
+  }
+
+  process.stderr.write('\n');
+  process.stderr.write(`  ${yellow('⚠')}  ${bold('DevTunnel CLI is not installed.')}\n`);
+  process.stderr.write(`  ${cyan('TermBeam uses tunnels by default for remote access.')}\n`);
+  process.stderr.write('\n');
+  const answer = await promptUser(`  Would you like me to install it for you? ${bold('(y/n)')} `);
+  if (answer !== 'y') {
+    log.info('Skipping DevTunnel install.');
+    return null;
+  }
+
+  return installDevtunnel();
+}
+
+async function installDevtunnel() {
+  try {
+    const platform = process.platform;
+
+    if (platform === 'darwin') {
+      log.info('Installing devtunnel via brew...');
+      execSync('brew install --cask devtunnel', { stdio: 'inherit', timeout: 120000 });
+    } else if (platform === 'linux') {
+      log.info('Installing devtunnel via official install script...');
+      execSync('curl -sL https://aka.ms/DevTunnelCliInstall | bash', {
+        stdio: 'inherit',
+        timeout: 120000,
+      });
+    } else if (platform === 'win32') {
+      log.info('Installing devtunnel via winget...');
+      execSync(
+        'winget install Microsoft.devtunnel --accept-source-agreements --accept-package-agreements',
+        {
+          stdio: 'inherit',
+          timeout: 120000,
+        },
+      );
+    }
+
+    // Find the installed binary
+    const found = findInstalledBinary();
+    if (found) {
+      log.info(`${green('✔')} DevTunnel CLI installed and verified successfully.`);
+      return found;
+    }
+
+    log.error('DevTunnel was installed but could not be found on PATH.');
+    return null;
+  } catch (err) {
+    log.error(`DevTunnel install failed: ${err.message}`);
+    return null;
+  }
+}
+
+function findInstalledBinary() {
+  // Check PATH first
+  try {
+    execSync('devtunnel --version', { stdio: 'pipe', timeout: 10000 });
+    return 'devtunnel';
+  } catch {}
+
+  // On Windows, winget modifies PATH but the current process won't see it.
+  // Use 'where' to find it via the system PATH registry.
+  if (process.platform === 'win32') {
+    try {
+      const wherePath = execSync('where devtunnel.exe', {
+        encoding: 'utf-8',
+        stdio: 'pipe',
+        timeout: 10000,
+      })
+        .trim()
+        .split(/\r?\n/)[0];
+      if (wherePath && fs.existsSync(wherePath)) return wherePath;
+    } catch {}
+
+    const candidates = [
+      path.join(process.env.LOCALAPPDATA || '', 'Microsoft', 'WinGet', 'Links', 'devtunnel.exe'),
+      path.join(process.env.LOCALAPPDATA || '', 'Microsoft', 'WindowsApps', 'devtunnel.exe'),
+      path.join(process.env.PROGRAMFILES || '', 'Microsoft', 'devtunnel', 'devtunnel.exe'),
+    ];
+    for (const p of candidates) {
+      if (fs.existsSync(p)) return p;
+    }
+  }
+
+  // Check ~/bin (where the Linux install script puts it)
+  const homeBin = path.join(os.homedir(), 'bin', getBinaryName());
+  if (fs.existsSync(homeBin)) {
+    try {
+      execFileSync(homeBin, ['--version'], { stdio: 'pipe', timeout: 10000 });
+      return homeBin;
+    } catch {}
+  }
+
+  return null;
+}
+
+module.exports = { installDevtunnel, promptInstall, getInstallDir };

package/src/server.js

@@ -27,10 +27,10 @@ function getLocalIP() {
   return '127.0.0.1';
 }
 
-function confirmAnonymousTunnel() {
+function confirmPublicTunnel() {
   const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
-    rl.question('  Do you want to continue with anonymous access? (y/N): ', (answer) => {
+    rl.question('  Do you want to continue with public access? (y/N): ', (answer) => {
       rl.close();
       resolve(answer.trim().toLowerCase() === 'y');
     });
@@ -90,31 +90,28 @@ function createTermBeamServer(overrides = {}) {
   }
 
   async function start() {
-    // Fail early if tunnel mode is on but devtunnel CLI is not installed
+    // If tunnel mode is on but devtunnel is missing, offer to install it
     if (config.useTunnel && !findDevtunnel()) {
-      log.error('❌ devtunnel CLI is not installed.');
-      log.error('');
-      log.error('  TermBeam uses tunnels by default for remote access.');
-      log.error('  Install the Azure Dev Tunnels CLI, or use --no-tunnel for LAN-only mode.');
-      log.error('');
-      log.error('  Install it:');
-      log.error('    Windows:  winget install Microsoft.devtunnel');
-      log.error(
-        '             or: Invoke-WebRequest -Uri https://aka.ms/TunnelsCliDownload/win-x64 -OutFile devtunnel.exe',
-      );
-      log.error('    macOS:    brew install --cask devtunnel');
-      log.error('    Linux:    curl -sL https://aka.ms/DevTunnelCliInstall | bash');
-      log.error('');
-      log.error('  Then restart your terminal and try again.');
-      log.error(
-        '  Docs: https://learn.microsoft.com/en-us/azure/developer/dev-tunnels/get-started',
-      );
-      log.error('');
-      process.exit(1);
+      const { promptInstall } = require('./devtunnel-install');
+      const installed = await promptInstall();
+      if (!installed) {
+        log.error('❌ DevTunnel CLI is not available.');
+        log.error('');
+        log.error('  Use --no-tunnel for LAN-only mode, or install manually:');
+        log.error('    Windows:  winget install Microsoft.devtunnel');
+        log.error('    macOS:    brew install --cask devtunnel');
+        log.error('    Linux:    curl -sL https://aka.ms/DevTunnelCliInstall | bash');
+        log.error('');
+        log.error(
+          '  Docs: https://learn.microsoft.com/en-us/azure/developer/dev-tunnels/get-started',
+        );
+        log.error('');
+        process.exit(1);
+      }
     }
 
-    // Warn and require consent for anonymous tunnel access
-    if (config.useTunnel && config.anonymousTunnel) {
+    // Warn and require consent for public tunnel access
+    if (config.useTunnel && config.publicTunnel) {
       const rd = '\x1b[31m';
       const yl = '\x1b[33m';
       const rs = '\x1b[0m';
@@ -126,7 +123,7 @@ function createTermBeamServer(overrides = {}) {
       console.log(`  ${yl}No Microsoft login will be required to reach the tunnel.${rs}`);
       console.log(`  ${yl}Only the TermBeam password will protect your terminal.${rs}`);
       console.log('');
-      const confirmed = await confirmAnonymousTunnel();
+      const confirmed = await confirmPublicTunnel();
       if (!confirmed) {
         console.log('');
         console.log('  Aborted. Restart without --public for private access.');
@@ -181,7 +178,7 @@ function createTermBeamServer(overrides = {}) {
         if (config.useTunnel) {
           const tunnel = await startTunnel(config.port, {
             persisted: config.persistedTunnel,
-            anonymous: config.anonymousTunnel,
+            anonymous: config.publicTunnel,
           });
           if (tunnel) {
             publicUrl = tunnel.url;

package/src/tunnel.js

@@ -3,6 +3,7 @@ const path = require('path');
 const fs = require('fs');
 const os = require('os');
 const log = require('./logger');
+const { promptInstall } = require('./devtunnel-install');
 
 const TUNNEL_CONFIG_DIR = path.join(os.homedir(), '.termbeam');
 const TUNNEL_CONFIG_PATH = path.join(TUNNEL_CONFIG_DIR, 'tunnel.json');
@@ -33,6 +34,19 @@ function findDevtunnel() {
     }
   }
 
+  // Check ~/bin (where the Linux install script places it)
+  const homeBin = path.join(
+    os.homedir(),
+    'bin',
+    process.platform === 'win32' ? 'devtunnel.exe' : 'devtunnel',
+  );
+  if (fs.existsSync(homeBin)) {
+    try {
+      execFileSync(homeBin, ['--version'], { stdio: 'pipe' });
+      return homeBin;
+    } catch {}
+  }
+
   return null;
 }
 
@@ -85,22 +99,18 @@ let isPersisted = false;
 
 async function startTunnel(port, options = {}) {
   // Check if devtunnel CLI is installed
-  const found = findDevtunnel();
+  let found = findDevtunnel();
   if (!found) {
-    log.error('❌ devtunnel CLI is not installed.');
-    log.error('');
-    log.error('  TermBeam uses tunnels by default for remote access.');
-    log.error('  Install the Azure Dev Tunnels CLI, or use --no-tunnel for LAN-only mode.');
+    found = await promptInstall();
+  }
+  if (!found) {
+    log.error('❌ DevTunnel CLI is not available.');
     log.error('');
-    log.error('  Install it:');
+    log.error('  Use --no-tunnel for LAN-only mode, or install manually:');
     log.error('    Windows:  winget install Microsoft.devtunnel');
-    log.error(
-      '             or: Invoke-WebRequest -Uri https://aka.ms/TunnelsCliDownload/win-x64 -OutFile devtunnel.exe',
-    );
     log.error('    macOS:    brew install --cask devtunnel');
     log.error('    Linux:    curl -sL https://aka.ms/DevTunnelCliInstall | bash');
     log.error('');
-    log.error('  Then restart your terminal and try again.');
     log.error('  Docs: https://learn.microsoft.com/en-us/azure/developer/dev-tunnels/get-started');
     log.error('');
     return null;