termbeam 1.8.1 → 1.10.0

package/src/server.js

@@ -15,6 +15,7 @@ const { setupRoutes, cleanupUploadedFiles } = require('./routes');
 const { setupWebSocket } = require('./websocket');
 const { startTunnel, cleanupTunnel, findDevtunnel } = require('./tunnel');
 const { createPreviewProxy } = require('./preview');
+const { writeConnectionConfig, removeConnectionConfig } = require('./resume');
 
 // --- Helpers ---
 function getLocalIP() {
@@ -85,10 +86,30 @@ function createTermBeamServer(overrides = {}) {
     sessions.shutdown();
     cleanupUploadedFiles();
     cleanupTunnel();
+    removeConnectionConfig();
     server.close();
     wss.close();
   }
 
+  // Shutdown endpoint for --force (loopback only)
+  app.post('/api/shutdown', auth.middleware, (req, res) => {
+    const remoteAddress = req.socket && req.socket.remoteAddress;
+    if (
+      remoteAddress !== '127.0.0.1' &&
+      remoteAddress !== '::1' &&
+      remoteAddress !== '::ffff:127.0.0.1'
+    ) {
+      res.status(403).json({ error: 'Shutdown is only available from localhost' });
+      return;
+    }
+    res.json({ ok: true });
+    console.log('\n[termbeam] Shutdown requested by another instance. Goodbye!');
+    setTimeout(() => {
+      shutdown();
+      process.exit(0);
+    }, 100);
+  });
+
   async function start() {
     // If tunnel mode is on but devtunnel is missing, offer to install it
     if (config.useTunnel && !findDevtunnel()) {
@@ -134,8 +155,27 @@ function createTermBeamServer(overrides = {}) {
 
     return new Promise((resolve) => {
       server.listen(config.port, config.host, async () => {
+        const actualPort = server.address().port;
         const ip = getLocalIP();
-        const localUrl = `http://${ip}:${config.port}`;
+        const localUrl = `http://${ip}:${actualPort}`;
+
+        // Save connection info for `termbeam resume` auto-discovery
+        try {
+          const connHost =
+            config.host === '0.0.0.0' ||
+            config.host === '127.0.0.1' ||
+            config.host === '::' ||
+            config.host === '::1'
+              ? 'localhost'
+              : config.host;
+          writeConnectionConfig({
+            port: actualPort,
+            host: connHost,
+            password: config.password || null,
+          });
+        } catch {
+          /* non-critical — resume will fall back to defaults */
+        }
 
         const defaultId = sessions.create({
           name: path.basename(config.cwd),
@@ -170,7 +210,7 @@ function createTermBeamServer(overrides = {}) {
         console.log('');
         const isLanReachable =
           config.host === '0.0.0.0' || config.host === '::' || config.host === ip;
-        state.shareBaseUrl = isLanReachable ? localUrl : `http://localhost:${config.port}`;
+        state.shareBaseUrl = isLanReachable ? localUrl : `http://localhost:${actualPort}`;
         const gn = '\x1b[38;5;114m'; // green
         const _dm = '\x1b[2m'; // dim
 
@@ -178,7 +218,7 @@ function createTermBeamServer(overrides = {}) {
 
         let publicUrl = null;
         if (config.useTunnel) {
-          const tunnel = await startTunnel(config.port, {
+          const tunnel = await startTunnel(actualPort, {
             persisted: config.persistedTunnel,
             anonymous: config.publicTunnel,
           });
@@ -203,12 +243,12 @@ function createTermBeamServer(overrides = {}) {
         if (publicUrl) {
           console.log(`  Public:   ${bl}${publicUrl}${rs}`);
         }
-        console.log(`  Local:    http://localhost:${config.port}`);
+        console.log(`  Local:    http://localhost:${actualPort}`);
         if (isLanReachable) {
           console.log(`  LAN:      ${localUrl}`);
         }
 
-        const qrUrl = publicUrl || (isLanReachable ? localUrl : `http://localhost:${config.port}`);
+        const qrUrl = publicUrl || (isLanReachable ? localUrl : `http://localhost:${actualPort}`);
         const qrDisplayUrl = qrUrl; // clean URL shown in console text
         const qrCodeUrl = config.password ? `${qrUrl}?ott=${auth.generateShareToken()}` : qrUrl;
         console.log('');
@@ -223,7 +263,7 @@ function createTermBeamServer(overrides = {}) {
         if (config.password) process.stdout.write(`  Password: ${gn}${config.password}${rs}\n`);
         console.log('');
 
-        resolve({ url: `http://localhost:${config.port}`, defaultId });
+        resolve({ url: `http://localhost:${actualPort}`, defaultId });
       });
     });
   }

package/src/sessions.js

@@ -136,7 +136,7 @@ class SessionManager {
       cols,
       rows,
       cwd,
-      env: { ...process.env, TERM: 'xterm-256color' },
+      env: { ...process.env, TERM: 'xterm-256color', TERMBEAM_SESSION: '1' },
     });
 
     // Send initial command once the shell is ready