termbeam 1.12.2 → 1.12.3

package/bin/termbeam.js

@@ -3,19 +3,19 @@
 // Dispatch subcommands before loading the server
 const subcommand = (process.argv[2] || '').toLowerCase();
 if (subcommand === 'service') {
-  const { run } = require('../src/service');
+  const { run } = require('../src/cli/service');
   run(process.argv.slice(3)).catch((err) => {
     console.error(err.message);
     process.exit(1);
   });
 } else if (subcommand === 'resume' || subcommand === 'attach') {
-  const { resume } = require('../src/resume');
+  const { resume } = require('../src/cli/resume');
   resume(process.argv.slice(3)).catch((err) => {
     console.error(err.message);
     process.exit(1);
   });
 } else if (subcommand === 'list') {
-  const { list } = require('../src/resume');
+  const { list } = require('../src/cli/resume');
   list().catch((err) => {
     console.error(err.message);
     process.exit(1);
@@ -29,10 +29,10 @@ if (subcommand === 'service') {
     process.exit(1);
   }
 
-  const { createTermBeamServer } = require('../src/server.js');
+  const { createTermBeamServer } = require('../src/server');
   const { parseArgs } = require('../src/cli');
-  const { runInteractiveSetup } = require('../src/interactive');
-  const { readConnectionConfig } = require('../src/resume');
+  const { runInteractiveSetup } = require('../src/cli/interactive');
+  const { readConnectionConfig } = require('../src/cli/resume');
   const http = require('http');
 
   function httpPost(url, headers) {

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "termbeam",
-  "version": "1.12.2",
+  "version": "1.12.3",
   "description": "Beam your terminal to any device — mobile-optimized web terminal with multi-session support",
-  "main": "src/server.js",
+  "main": "src/server/index.js",
   "bin": {
     "termbeam": "./bin/termbeam.js"
   },
   "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-')&&f!=='devtunnel-install.test.js').map(f=>'test/'+f)],{stdio:'inherit'})\"",
-    "test:coverage": "c8 --exclude=src/tunnel.js --exclude=src/devtunnel-install.js --exclude=test --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'})\"",
+    "test": "node -e \"const{execFileSync:r}=require('child_process'),{readdirSync:d,statSync:s}=require('fs'),{join:j}=require('path');function f(p){let a=[];for(const e of d(p)){const c=j(p,e);s(c).isDirectory()?a.push(...f(c)):e.endsWith('.test.js')&&!e.startsWith('e2e-')&&e!=='devtunnel-install.test.js'&&a.push(c)}return a}r(process.execPath,['--test',...f('test')],{stdio:'inherit'})\"",
+    "test:coverage": "c8 --exclude=src/tunnel/ --exclude=test --reporter=text --reporter=lcov --reporter=json-summary --reporter=json node -e \"const{execFileSync:r}=require('child_process'),{readdirSync:d,statSync:s}=require('fs'),{join:j}=require('path');function f(p){let a=[];for(const e of d(p)){const c=j(p,e);s(c).isDirectory()?a.push(...f(c)):e.endsWith('.test.js')&&!e.startsWith('e2e-')&&e!=='devtunnel-install.test.js'&&a.push(c)}return a}r(process.execPath,['--test','--test-reporter=spec','--test-reporter-destination=stdout',...f('test')],{stdio:'inherit'})\"",
     "prepare": "husky",
     "format": "prettier --write .",
-    "lint": "node --check src/*.js bin/*.js",
-    "build:frontend": "cd frontend && npm ci && npm run build",
+    "lint": "node --check src/server/*.js src/cli/*.js src/tunnel/*.js src/utils/*.js bin/*.js",
+    "build:frontend": "cd src/frontend && npm ci && npm run build",
     "prepublishOnly": "npm run build:frontend && npm test",
     "postinstall": "node -e \"try{const p=require('path'),fs=require('fs'),r=require.resolve('node-pty/package.json'),d=p.join(p.dirname(r),'prebuilds');if(fs.existsSync(d)){for(const a of fs.readdirSync(d)){const s=p.join(d,a,'spawn-helper');try{fs.chmodSync(s,0o755)}catch{}}}}catch{}\""
   },
@@ -52,8 +52,11 @@
   },
   "files": [
     "bin/",
-    "src/",
-    "public-react/",
+    "src/server/",
+    "src/cli/",
+    "src/tunnel/",
+    "src/utils/",
+    "public/",
     "LICENSE",
     "README.md"
   ],

package/src/{cli.js → cli/index.js}

@@ -2,7 +2,7 @@ const os = require('os');
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
-const log = require('./logger');
+const log = require('../utils/logger');
 
 function printHelp() {
   console.log(`
@@ -280,7 +280,7 @@ function parseArgs() {
       printHelp();
       process.exit(0);
     } else if (args[i] === '--version' || args[i] === '-v') {
-      const { getVersion } = require('./version');
+      const { getVersion } = require('../utils/version');
       console.log(`termbeam v${getVersion()}`);
       process.exit(0);
     } else if (args[i] === '--generate-password') {
@@ -353,7 +353,7 @@ function parseArgs() {
   const shell = filteredArgs[0] || defaultShell;
   const shellArgs = filteredArgs.slice(1);
 
-  const { getVersion } = require('./version');
+  const { getVersion } = require('../utils/version');
   const version = getVersion();
 
   return {

package/src/{service.js → cli/service.js}

@@ -90,7 +90,7 @@ function buildArgs(config) {
 }
 
 function generateEcosystem(config) {
-  const entry = require.resolve('../bin/termbeam.js');
+  const entry = require.resolve('../../bin/termbeam.js');
   const args = buildArgs(config);
   const env = {};
   if (config.cwd) env.TERMBEAM_CWD = config.cwd;

package/src/{auth.js → server/auth.js}

@@ -1,5 +1,5 @@
 const crypto = require('crypto');
-const log = require('./logger');
+const log = require('../utils/logger');
 
 const LOGIN_HTML = `<!DOCTYPE html>
 <html lang="en">

package/src/{server.js → server/index.js}

@@ -8,15 +8,15 @@ const http = require('http');
 const { WebSocketServer } = require('ws');
 const QRCode = require('qrcode');
 
-const { parseArgs } = require('./cli');
+const { parseArgs } = require('../cli');
 const { createAuth } = require('./auth');
 const { SessionManager } = require('./sessions');
 const { setupRoutes, cleanupUploadedFiles } = require('./routes');
 const { setupWebSocket } = require('./websocket');
-const { startTunnel, cleanupTunnel, findDevtunnel } = require('./tunnel');
+const { startTunnel, cleanupTunnel, findDevtunnel } = require('../tunnel');
 const { createPreviewProxy } = require('./preview');
-const { writeConnectionConfig, removeConnectionConfig } = require('./resume');
-const { checkForUpdate, detectInstallMethod } = require('./update-check');
+const { writeConnectionConfig, removeConnectionConfig } = require('../cli/resume');
+const { checkForUpdate, detectInstallMethod } = require('../utils/update-check');
 
 // --- Helpers ---
 function getLocalIP() {
@@ -47,7 +47,7 @@ function confirmPublicTunnel() {
  */
 function createTermBeamServer(overrides = {}) {
   const config = overrides.config || parseArgs();
-  const log = require('./logger');
+  const log = require('../utils/logger');
   if (config.logLevel) log.setLevel(config.logLevel);
   const auth = createAuth(config.password);
   const sessions = new SessionManager();
@@ -118,7 +118,7 @@ function createTermBeamServer(overrides = {}) {
   async function start() {
     // If tunnel mode is on but devtunnel is missing, offer to install it
     if (config.useTunnel && !findDevtunnel()) {
-      const { promptInstall } = require('./devtunnel-install');
+      const { promptInstall } = require('../tunnel/install');
       const installed = await promptInstall();
       if (!installed) {
         log.error('❌ DevTunnel CLI is not available.');

package/src/{preview.js → server/preview.js}

@@ -1,6 +1,6 @@
 const http = require('http');
 const express = require('express');
-const log = require('./logger');
+const log = require('../utils/logger');
 
 const PROXY_TIMEOUT = 10_000;
 

package/src/{routes.js → server/routes.js}

@@ -3,12 +3,11 @@ const os = require('os');
 const fs = require('fs');
 const crypto = require('crypto');
 const express = require('express');
-const { detectShells } = require('./shells');
-const log = require('./logger');
+const { detectShells } = require('../utils/shells');
+const log = require('../utils/logger');
 const rateLimit = require('express-rate-limit');
 
-const REACT_DIR = path.join(__dirname, '..', 'public-react');
-const PUBLIC_DIR = path.join(__dirname, '..', 'public');
+const PUBLIC_DIR = path.join(__dirname, '..', '..', 'public');
 const uploadedFiles = new Map(); // id -> filepath
 
 const IMAGE_SIGNATURES = [
@@ -54,8 +53,7 @@ function setupRoutes(app, { auth, sessions, config, state }) {
       res.status(429).json({ error: 'Too many requests, please try again later.' }),
   });
 
-  // Serve static files — React build first, then public for shared assets (icons, manifest)
-  app.use(express.static(REACT_DIR, { index: false }));
+  // Serve static files
   app.use(express.static(PUBLIC_DIR, { index: false }));
 
   // Login page
@@ -85,13 +83,13 @@ function setupRoutes(app, { auth, sessions, config, state }) {
 
   // Version API
   app.get('/api/version', (_req, res) => {
-    const { getVersion } = require('./version');
+    const { getVersion } = require('../utils/version');
     res.json({ version: getVersion() });
   });
 
   // Update check API
   app.get('/api/update-check', apiRateLimit, auth.middleware, async (req, res) => {
-    const { checkForUpdate, detectInstallMethod } = require('./update-check');
+    const { checkForUpdate, detectInstallMethod } = require('../utils/update-check');
     const force = req.query.force === 'true';
 
     try {
@@ -138,10 +136,10 @@ function setupRoutes(app, { auth, sessions, config, state }) {
 
   // Pages — always serve React SPA
   app.get('/', pageRateLimit, autoLogin, auth.middleware, (_req, res) =>
-    res.sendFile('index.html', { root: REACT_DIR }),
+    res.sendFile('index.html', { root: PUBLIC_DIR }),
   );
   app.get('/terminal', pageRateLimit, autoLogin, auth.middleware, (_req, res) =>
-    res.sendFile('index.html', { root: REACT_DIR }),
+    res.sendFile('index.html', { root: PUBLIC_DIR }),
   );
 
   // Share token — generates a temporary share token for the share button

package/src/{sessions.js → server/sessions.js}

@@ -2,8 +2,8 @@ const crypto = require('crypto');
 const path = require('path');
 const { exec } = require('child_process');
 const pty = require('node-pty');
-const log = require('./logger');
-const { getGitInfo } = require('./git');
+const log = require('../utils/logger');
+const { getGitInfo } = require('../utils/git');
 
 // Cache git info per session to avoid blocking the event loop on every list() call.
 // lsof + git commands take ~200-500ms and block WebSocket traffic, causing

package/src/{websocket.js → server/websocket.js}

@@ -1,4 +1,4 @@
-const log = require('./logger');
+const log = require('../utils/logger');
 
 const ACTIVE_THRESHOLD = 60000; // 60 seconds
 

package/src/{tunnel.js → tunnel/index.js}

@@ -2,8 +2,8 @@ const { execSync, execFileSync, spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
-const log = require('./logger');
-const { promptInstall } = require('./devtunnel-install');
+const log = require('../utils/logger');
+const { promptInstall } = require('./install');
 
 const TUNNEL_CONFIG_DIR = path.join(os.homedir(), '.termbeam');
 const TUNNEL_CONFIG_PATH = path.join(TUNNEL_CONFIG_DIR, 'tunnel.json');

package/src/{devtunnel-install.js → tunnel/install.js}

@@ -3,7 +3,7 @@ const path = require('path');
 const os = require('os');
 const readline = require('readline');
 const { execSync, execFileSync } = require('child_process');
-const log = require('./logger');
+const log = require('../utils/logger');
 
 const INSTALL_DIR = path.join(os.homedir(), 'bin');
 

package/src/{version.js → utils/version.js}

@@ -2,7 +2,7 @@ const path = require('path');
 const { execSync } = require('child_process');
 
 function getVersion() {
-  const pkg = require(path.join(__dirname, '..', 'package.json'));
+  const pkg = require(path.join(__dirname, '..', '..', 'package.json'));
   const base = pkg.version;
 
   // If installed via npm (global or npx), use the package version as-is
@@ -14,7 +14,7 @@ function getVersion() {
   // This avoids drift between package.json and tagged releases.
   try {
     const gitDesc = execSync('git describe --tags --always --dirty', {
-      cwd: path.join(__dirname, '..'),
+      cwd: path.join(__dirname, '..', '..'),
       encoding: 'utf-8',
       stdio: ['pipe', 'pipe', 'pipe'],
     }).trim();