termbeam 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termbeam",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Beam your terminal to any device — mobile-optimized web terminal with multi-session support",
   "main": "src/server.js",
   "bin": {

package/src/cli.js

@@ -1,4 +1,5 @@
 const os = require('os');
+const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const log = require('./logger');
@@ -76,7 +77,10 @@ function getWindowsAncestors(startPid, maxDepth = 4) {
       if (cols.length <= Math.max(nameIdx, pidIdx, ppidIdx)) continue;
       const pid = parseInt(cols[pidIdx], 10);
       if (Number.isFinite(pid)) {
-        processes.set(pid, { name: cols[nameIdx].trim().toLowerCase(), ppid: parseInt(cols[ppidIdx], 10) });
+        processes.set(pid, {
+          name: cols[nameIdx].trim().toLowerCase(),
+          ppid: parseInt(cols[ppidIdx], 10),
+        });
       }
     }
 
@@ -97,6 +101,47 @@ function getWindowsAncestors(startPid, maxDepth = 4) {
   return names;
 }
 
+/**
+ * Check if a process name is a known Unix shell by comparing against
+ * /etc/shells entries and a hardcoded fallback list.
+ */
+function isKnownShell(name) {
+  if (!name || name.includes(' ')) return false;
+  const basename = path.basename(name);
+  const knownNames = new Set([
+    'sh',
+    'bash',
+    'zsh',
+    'fish',
+    'dash',
+    'ksh',
+    'csh',
+    'tcsh',
+    'ash',
+    'mksh',
+    'elvish',
+    'nu',
+    'pwsh',
+    'xonsh',
+    'ion',
+  ]);
+  if (knownNames.has(basename)) return true;
+
+  // Check against /etc/shells
+  try {
+    const content = fs.readFileSync('/etc/shells', 'utf8');
+    for (const line of content.split('\n')) {
+      const entry = line.trim();
+      if (entry && !entry.startsWith('#')) {
+        if (entry === name || path.basename(entry) === basename) return true;
+      }
+    }
+  } catch {
+    // /etc/shells not available — rely on knownNames
+  }
+  return false;
+}
+
 function getDefaultShell() {
   const { execFileSync } = require('child_process');
   const ppid = process.ppid;
@@ -137,8 +182,14 @@ function getDefaultShell() {
     const comm = result.trim();
     if (comm) {
       const shell = comm.startsWith('-') ? comm.slice(1) : comm;
-      log.debug(`Detected parent shell: ${shell}`);
-      return shell;
+      log.debug(`Detected parent process: ${shell}`);
+      // Validate it's a real shell by checking against /etc/shells and common names.
+      // When run via npx, the parent is "node" or "npm exec ..." — not a shell.
+      if (isKnownShell(shell)) {
+        log.debug(`Using detected shell: ${shell}`);
+        return shell;
+      }
+      log.debug(`Parent process "${shell}" is not a known shell, falling back`);
     }
   } catch (err) {
     log.debug(`Could not detect parent shell: ${err.message}`);
@@ -157,10 +208,16 @@ function parseArgs() {
   // Resolve log level early (env + args) so shell detection logs are visible
   let logLevel = process.env.TERMBEAM_LOG_LEVEL || 'info';
   for (const arg of process.argv.slice(2)) {
-    if (arg.startsWith('--log-level=')) { logLevel = arg.split('=')[1]; break; }
+    if (arg.startsWith('--log-level=')) {
+      logLevel = arg.split('=')[1];
+      break;
+    }
   }
   for (let i = 2; i < process.argv.length; i++) {
-    if (process.argv[i] === '--log-level' && process.argv[i + 1]) { logLevel = process.argv[i + 1]; break; }
+    if (process.argv[i] === '--log-level' && process.argv[i + 1]) {
+      logLevel = process.argv[i + 1];
+      break;
+    }
   }
   log.setLevel(logLevel);
 
@@ -227,7 +284,19 @@ function parseArgs() {
   const { getVersion } = require('./version');
   const version = getVersion();
 
-  return { port, host, password, useTunnel, persistedTunnel, shell, shellArgs, cwd, defaultShell, version, logLevel };
+  return {
+    port,
+    host,
+    password,
+    useTunnel,
+    persistedTunnel,
+    shell,
+    shellArgs,
+    cwd,
+    defaultShell,
+    version,
+    logLevel,
+  };
 }
 
-module.exports = { parseArgs, printHelp };
+module.exports = { parseArgs, printHelp, isKnownShell };