tabminal 2.0.10 → 2.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabminal",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "A modern, persistent web terminal with multi-tab support and real-time system monitoring.",
   "type": "module",
   "bin": {

package/src/server.mjs

@@ -275,6 +275,14 @@ app.use(router.allowedMethods());
 
 const httpServer = createServer(app.callback());
 const wss = new WebSocketServer({ noServer: true, verifyClient });
+const httpConnections = new Set();
+
+httpServer.on('connection', (socket) => {
+    httpConnections.add(socket);
+    socket.on('close', () => {
+        httpConnections.delete(socket);
+    });
+});
 
 httpServer.on('upgrade', (request, socket, head) => {
     const url = new URL(request.url, `http://${request.headers.host}`);
@@ -370,6 +378,9 @@ function shutdown(signal) {
     isShuttingDown = true;
     console.log(`Shutting down (${signal})...`);
     clearInterval(heartbeatInterval);
+    for (const socket of wss.clients) {
+        socket.terminate();
+    }
     wss.close();
     terminalManager.dispose();
 
@@ -382,6 +393,11 @@ function shutdown(signal) {
         clearTimeout(forceExitTimer);
         process.exit(0);
     });
+    httpServer.closeIdleConnections?.();
+    httpServer.closeAllConnections?.();
+    for (const socket of httpConnections) {
+        socket.destroy();
+    }
 }
 
 process.on('SIGINT', () => shutdown('SIGINT'));

package/src/terminal-manager.mjs

@@ -9,13 +9,12 @@ import * as persistence from './persistence.mjs';
 import { config } from './config.mjs';
 
 function resolveShell() {
-    if (process.platform === 'win32') {
-        return process.env.COMSPEC || 'cmd.exe';
-    }
-    // config.shell has already handled process.env.SHELL and TABMINAL_SHELL via config.mjs
     if (config.shell) {
         return config.shell;
     }
+    if (process.platform === 'win32') {
+        return process.env.COMSPEC || 'cmd.exe';
+    }
     // Try to use Homebrew installed bash if available (newer version)
     if (fs.existsSync('/opt/homebrew/bin/bash')) {
         return '/opt/homebrew/bin/bash';
@@ -60,7 +59,12 @@ export class TerminalManager {
 
         // Inject shell tools
         const shellToolsPath = path.join(process.cwd(), 'shell');
-        env.PATH = `${shellToolsPath}:${env.PATH}`;
+        const pathDelimiter = path.delimiter;
+        const pathKey = Object.keys(env).find((key) => key.toLowerCase() === 'path') || 'PATH';
+        const existingPath = env[pathKey];
+        env[pathKey] = existingPath
+            ? `${shellToolsPath}${pathDelimiter}${existingPath}`
+            : shellToolsPath;
 
         let args = [];
         let initFilePath = null;
@@ -151,14 +155,17 @@ precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
 
         let ptyProcess;
         try {
-            ptyProcess = pty.spawn(shell, args, {
+            const ptyOptions = {
                 name: 'xterm-256color',
                 cols: cols,
                 rows: rows,
                 cwd: initialCwd,
-                env: env,
-                encoding: 'utf8'
-            });
+                env: env
+            };
+            if (process.platform !== 'win32') {
+                ptyOptions.encoding = 'utf8';
+            }
+            ptyProcess = pty.spawn(shell, args, ptyOptions);
         } catch (err) {
             const spawnInfo = {
                 shell,
@@ -295,7 +302,11 @@ precmd_functions+=(_tabminal_zsh_apply_prompt_marker)
         this.disposing = true;
         for (const session of this.sessions.values()) {
             try {
-                session.pty.kill('SIGHUP');
+                if (process.platform === 'win32') {
+                    session.pty.kill();
+                } else {
+                    session.pty.kill('SIGHUP');
+                }
             } catch {
                 // ignore
             }