termites 1.0.35 → 1.0.37

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "termites",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "Local multi-terminal manager with web interface",
-  "main": "index.js",
+  "main": "server.js",
   "scripts": {
-    "start": "node index.js",
-    "server": "node server.js"
+    "start": "node server.js"
   },
   "bin": {
     "termites": "bin/termites.js"

package/server.js

@@ -25,8 +25,21 @@ function saveConfig(config) {
     fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
 }
 
-function hashPassword(password) {
-    return crypto.createHash('sha256').update(password).digest('hex');
+// Use scrypt for secure password hashing
+const SCRYPT_SALT_LENGTH = 16;
+const SCRYPT_KEY_LENGTH = 64;
+
+function hashPassword(password, salt) {
+    salt = salt || crypto.randomBytes(SCRYPT_SALT_LENGTH).toString('hex');
+    const hash = crypto.scryptSync(password, salt, SCRYPT_KEY_LENGTH).toString('hex');
+    return `${salt}:${hash}`;
+}
+
+function verifyPassword(password, storedHash) {
+    const [salt, hash] = storedHash.split(':');
+    if (!salt || !hash) return false;
+    const newHash = crypto.scryptSync(password, salt, SCRYPT_KEY_LENGTH).toString('hex');
+    return crypto.timingSafeEqual(Buffer.from(hash, 'hex'), Buffer.from(newHash, 'hex'));
 }
 
 class TermitesServer {
@@ -385,7 +398,7 @@ class TermitesServer {
             req.on('end', () => {
                 try {
                     const { password } = JSON.parse(body);
-                    if (hashPassword(password) === this.config.passwordHash) {
+                    if (verifyPassword(password, this.config.passwordHash)) {
                         res.writeHead(200, {
                             'Content-Type': 'application/json',
                             'Set-Cookie': `session=${this.sessionToken}; Path=/; HttpOnly; SameSite=Strict`
@@ -1095,6 +1108,9 @@ class TermitesServer {
             };
 
             toolbar.querySelectorAll('button').forEach(btn => {
+                // Skip hist button, it has its own handler
+                if (btn.id === 'hist-btn') return;
+
                 let repeatInterval = null;
                 const isArrowKey = ['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(btn.dataset.key);
 
@@ -1143,6 +1159,13 @@ class TermitesServer {
 
                     if (data && ws?.readyState === WebSocket.OPEN && selectedClientId) {
                         ws.send(JSON.stringify({ type: 'input', clientId: selectedClientId, text: data }));
+                        // Reset modifiers after sending (for non-modifier keys)
+                        if (!btn.dataset.mod) {
+                            modifiers.ctrl = false;
+                            modifiers.alt = false;
+                            if (window.ctrlTimeout) { clearTimeout(window.ctrlTimeout); window.ctrlTimeout = null; }
+                            toolbar.querySelectorAll('.mod-btn').forEach(b => b.classList.remove('active'));
+                        }
                     }
                 };
 
@@ -1150,17 +1173,10 @@ class TermitesServer {
                     e.preventDefault();
                     e.stopPropagation();
                     sendKey();
-                    // For arrow keys, start repeating after initial press
-                    if (isArrowKey && !btn.dataset.mod) {
+                    // For arrow keys, start repeating after initial press (but not with modifiers)
+                    if (isArrowKey && !btn.dataset.mod && !modifiers.ctrl && !modifiers.alt) {
                         repeatInterval = setInterval(sendKey, 100);
                     }
-                    // Reset modifiers after use (except for arrow keys during repeat)
-                    if (!isArrowKey) {
-                        modifiers.ctrl = false;
-                        modifiers.alt = false;
-                        if (window.ctrlTimeout) { clearTimeout(window.ctrlTimeout); window.ctrlTimeout = null; }
-                        toolbar.querySelectorAll('.mod-btn').forEach(b => b.classList.remove('active'));
-                    }
                 };
 
                 const stopRepeat = () => {
@@ -1168,13 +1184,6 @@ class TermitesServer {
                         clearInterval(repeatInterval);
                         repeatInterval = null;
                     }
-                    // Reset modifiers after arrow key release
-                    if (isArrowKey) {
-                        modifiers.ctrl = false;
-                        modifiers.alt = false;
-                        if (window.ctrlTimeout) { clearTimeout(window.ctrlTimeout); window.ctrlTimeout = null; }
-                        toolbar.querySelectorAll('.mod-btn').forEach(b => b.classList.remove('active'));
-                    }
                     term.focus();
                 };
 

package/index.js

@@ -1,472 +0,0 @@
-#!/usr/bin/env node
-const http = require('http');
-const os = require('os');
-const WebSocket = require('ws');
-
-const PORT = process.env.PORT || 6789;
-const SHELL = process.env.SHELL || '/bin/bash';
-
-function getSystemInfo() {
-    const username = os.userInfo().username;
-    const hostname = os.hostname();
-    const cwd = process.cwd().replace(os.homedir(), '~');
-    return { username, hostname, cwd };
-}
-
-class WebTerminalServer {
-    constructor(port) {
-        this.port = port;
-        this.pty = null;
-        this.outputBuffer = [];
-        this.clients = new Set();
-        this.isRunning = false;
-        this.systemInfo = getSystemInfo();
-
-        this.startServer();
-    }
-
-    startServer() {
-        this.httpServer = http.createServer((req, res) => {
-            this.handleHttpRequest(req, res);
-        });
-
-        this.wss = new WebSocket.Server({ server: this.httpServer });
-
-        this.wss.on('connection', (ws) => {
-            console.log('新的 WebSocket 连接');
-            this.clients.add(ws);
-
-            ws.send(JSON.stringify({
-                type: 'status',
-                isRunning: this.isRunning,
-                systemInfo: this.systemInfo
-            }));
-
-            this.outputBuffer.forEach(data => {
-                ws.send(JSON.stringify({ type: 'output', data }));
-            });
-
-            ws.on('message', (message) => {
-                try {
-                    const data = JSON.parse(message);
-                    this.handleClientMessage(data);
-                } catch (e) {
-                    console.error('解析消息失败:', e);
-                }
-            });
-
-            ws.on('close', () => {
-                this.clients.delete(ws);
-            });
-        });
-
-        this.httpServer.listen(this.port, () => {
-            console.log(`Web Terminal 启动: http://localhost:${this.port}`);
-            // 自动启动终端
-            this.startTerminal();
-        });
-    }
-
-    handleClientMessage(data) {
-        switch (data.type) {
-            case 'start':
-                this.startTerminal();
-                break;
-            case 'stop':
-                this.stopTerminal();
-                break;
-            case 'input':
-                if (this.pty) this.pty.write(data.text);
-                break;
-            case 'resize':
-                if (this.pty) this.pty.resize(data.cols, data.rows);
-                break;
-        }
-    }
-
-    broadcast(data) {
-        const msg = JSON.stringify(data);
-        this.clients.forEach(c => {
-            if (c.readyState === WebSocket.OPEN) c.send(msg);
-        });
-    }
-
-    startTerminal() {
-        if (this.isRunning) return;
-
-        const pty = require('node-pty');
-        this.pty = pty.spawn(SHELL, ['-l'], {
-            name: 'xterm-256color',
-            cols: 120,
-            rows: 40,
-            cwd: process.cwd(),
-            env: process.env
-        });
-
-        this.isRunning = true;
-        this.broadcast({ type: 'started' });
-
-        this.pty.onData((data) => {
-            this.outputBuffer.push(data);
-            if (this.outputBuffer.length > 1000) {
-                this.outputBuffer = this.outputBuffer.slice(-500);
-            }
-            this.broadcast({ type: 'output', data });
-        });
-
-        this.pty.onExit(() => {
-            this.isRunning = false;
-            this.pty = null;
-            this.broadcast({ type: 'stopped' });
-        });
-    }
-
-    stopTerminal() {
-        if (this.pty) {
-            this.pty.kill();
-            this.pty = null;
-            this.isRunning = false;
-            this.broadcast({ type: 'stopped' });
-        }
-    }
-
-    handleHttpRequest(req, res) {
-        if (req.url === '/' || req.url === '/index.html') {
-            res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-            res.end(this.getHtmlPage());
-        } else {
-            res.writeHead(404);
-            res.end('Not Found');
-        }
-    }
-
-    getHtmlPage() {
-        return `<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Web Terminal</title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@5.3.0/css/xterm.css">
-    <style>
-        * { margin: 0; padding: 0; box-sizing: border-box; }
-        body { height: 100vh; display: flex; flex-direction: column; transition: background 0.3s; }
-        .header {
-            padding: 8px 16px;
-            display: flex; justify-content: space-between; align-items: center;
-            border-bottom: 1px solid; font-family: monospace; transition: all 0.3s;
-        }
-        .header-left { display: flex; align-items: center; gap: 12px; }
-        .path-info { font-size: 14px; }
-        .path-info .user { font-weight: bold; color: var(--user-color, #859900); }
-        .path-info .host { color: var(--host-color, #859900); }
-        .path-info .sep { color: var(--sep-color, #657b83); }
-        .path-info .path { color: var(--path-color, #268bd2); }
-        .status.running { background: var(--status-running, #859900); color: #fff; }
-        .status.stopped { background: var(--status-stopped, #dc322f); color: #fff; }
-        .status { padding: 3px 10px; border-radius: 10px; font-size: 11px; }
-        #terminal-container { flex: 1; padding: 5px; transition: background 0.3s; }
-        .xterm { height: 100%; }
-        .settings-btn {
-            background: none; border: 1px solid; padding: 4px 10px;
-            border-radius: 4px; cursor: pointer; font-size: 12px;
-            font-family: monospace; transition: all 0.2s;
-        }
-        .settings-btn:hover { opacity: 0.8; }
-        .settings-panel {
-            position: fixed; top: 0; right: -320px; width: 300px; height: 100%;
-            padding: 20px; box-shadow: -2px 0 10px rgba(0,0,0,0.2);
-            transition: right 0.3s; z-index: 100; overflow-y: auto;
-        }
-        .settings-panel.open { right: 0; }
-        .settings-panel h3 { margin-bottom: 20px; font-size: 16px; }
-        .setting-group { margin-bottom: 20px; }
-        .setting-group label { display: block; margin-bottom: 8px; font-size: 13px; font-weight: bold; }
-        .setting-group select, .setting-group input {
-            width: 100%; padding: 8px; border: 1px solid; border-radius: 4px;
-            font-size: 13px; background: inherit; color: inherit;
-        }
-        .close-btn {
-            position: absolute; top: 15px; right: 15px; background: none;
-            border: none; font-size: 20px; cursor: pointer; color: inherit;
-        }
-        .overlay {
-            position: fixed; top: 0; left: 0; width: 100%; height: 100%;
-            background: rgba(0,0,0,0.3); z-index: 99; display: none;
-        }
-        .overlay.open { display: block; }
-    </style>
-</head>
-<body>
-    <div class="overlay" id="overlay"></div>
-    <div class="settings-panel" id="settings-panel">
-        <button class="close-btn" id="close-settings">&times;</button>
-        <h3>设置</h3>
-        <div class="setting-group">
-            <label>主题</label>
-            <select id="theme-select">
-                <option value="solarized-light">Solarized Light</option>
-                <option value="solarized-dark">Solarized Dark</option>
-                <option value="monokai">Monokai</option>
-                <option value="dracula">Dracula</option>
-                <option value="nord">Nord</option>
-                <option value="github-dark">GitHub Dark</option>
-            </select>
-        </div>
-        <div class="setting-group">
-            <label>字体</label>
-            <select id="font-select">
-                <option value="Monaco, Menlo, monospace">Monaco</option>
-                <option value="'Fira Code', monospace">Fira Code</option>
-                <option value="'JetBrains Mono', monospace">JetBrains Mono</option>
-                <option value="'Source Code Pro', monospace">Source Code Pro</option>
-                <option value="Consolas, monospace">Consolas</option>
-                <option value="'Courier New', monospace">Courier New</option>
-            </select>
-        </div>
-        <div class="setting-group">
-            <label>字体大小</label>
-            <input type="range" id="font-size" min="10" max="24" value="14">
-            <span id="font-size-value">14px</span>
-        </div>
-    </div>
-    <div class="header">
-        <div class="header-left">
-            <span id="path-info" class="path-info"></span>
-            <span id="status" class="status stopped">已停止</span>
-        </div>
-        <button class="settings-btn" id="settings-btn">⚙ 设置</button>
-    </div>
-    <div id="terminal-container"></div>
-
-    <script src="https://cdn.jsdelivr.net/npm/xterm@5.3.0/lib/xterm.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.8.0/lib/xterm-addon-fit.min.js"></script>
-    <script>
-        let ws, term, fitAddon, isRunning = false;
-
-        const themes = {
-            'solarized-light': {
-                background: '#fdf6e3', foreground: '#657b83', cursor: '#657b83',
-                cursorAccent: '#fdf6e3', selectionBackground: '#93a1a1',
-                black: '#073642', red: '#dc322f', green: '#859900', yellow: '#b58900',
-                blue: '#268bd2', magenta: '#d33682', cyan: '#2aa198', white: '#eee8d5',
-                brightBlack: '#002b36', brightRed: '#cb4b16', brightGreen: '#586e75',
-                brightYellow: '#657b83', brightBlue: '#839496', brightMagenta: '#6c71c4',
-                brightCyan: '#93a1a1', brightWhite: '#fdf6e3',
-                headerBg: '#eee8d5', headerBorder: '#93a1a1', userColor: '#859900',
-                hostColor: '#859900', sepColor: '#657b83', pathColor: '#268bd2',
-                statusRunning: '#859900', statusStopped: '#dc322f'
-            },
-            'solarized-dark': {
-                background: '#002b36', foreground: '#839496', cursor: '#839496',
-                cursorAccent: '#002b36', selectionBackground: '#073642',
-                black: '#073642', red: '#dc322f', green: '#859900', yellow: '#b58900',
-                blue: '#268bd2', magenta: '#d33682', cyan: '#2aa198', white: '#eee8d5',
-                brightBlack: '#002b36', brightRed: '#cb4b16', brightGreen: '#586e75',
-                brightYellow: '#657b83', brightBlue: '#839496', brightMagenta: '#6c71c4',
-                brightCyan: '#93a1a1', brightWhite: '#fdf6e3',
-                headerBg: '#073642', headerBorder: '#586e75', userColor: '#859900',
-                hostColor: '#859900', sepColor: '#839496', pathColor: '#268bd2',
-                statusRunning: '#859900', statusStopped: '#dc322f'
-            },
-            'monokai': {
-                background: '#272822', foreground: '#f8f8f2', cursor: '#f8f8f2',
-                cursorAccent: '#272822', selectionBackground: '#49483e',
-                black: '#272822', red: '#f92672', green: '#a6e22e', yellow: '#f4bf75',
-                blue: '#66d9ef', magenta: '#ae81ff', cyan: '#a1efe4', white: '#f8f8f2',
-                brightBlack: '#75715e', brightRed: '#f92672', brightGreen: '#a6e22e',
-                brightYellow: '#f4bf75', brightBlue: '#66d9ef', brightMagenta: '#ae81ff',
-                brightCyan: '#a1efe4', brightWhite: '#f9f8f5',
-                headerBg: '#1e1f1c', headerBorder: '#49483e', userColor: '#a6e22e',
-                hostColor: '#a6e22e', sepColor: '#f8f8f2', pathColor: '#66d9ef',
-                statusRunning: '#a6e22e', statusStopped: '#f92672'
-            },
-            'dracula': {
-                background: '#282a36', foreground: '#f8f8f2', cursor: '#f8f8f2',
-                cursorAccent: '#282a36', selectionBackground: '#44475a',
-                black: '#21222c', red: '#ff5555', green: '#50fa7b', yellow: '#f1fa8c',
-                blue: '#bd93f9', magenta: '#ff79c6', cyan: '#8be9fd', white: '#f8f8f2',
-                brightBlack: '#6272a4', brightRed: '#ff6e6e', brightGreen: '#69ff94',
-                brightYellow: '#ffffa5', brightBlue: '#d6acff', brightMagenta: '#ff92df',
-                brightCyan: '#a4ffff', brightWhite: '#ffffff',
-                headerBg: '#21222c', headerBorder: '#44475a', userColor: '#50fa7b',
-                hostColor: '#50fa7b', sepColor: '#f8f8f2', pathColor: '#bd93f9',
-                statusRunning: '#50fa7b', statusStopped: '#ff5555'
-            },
-            'nord': {
-                background: '#2e3440', foreground: '#d8dee9', cursor: '#d8dee9',
-                cursorAccent: '#2e3440', selectionBackground: '#434c5e',
-                black: '#3b4252', red: '#bf616a', green: '#a3be8c', yellow: '#ebcb8b',
-                blue: '#81a1c1', magenta: '#b48ead', cyan: '#88c0d0', white: '#e5e9f0',
-                brightBlack: '#4c566a', brightRed: '#bf616a', brightGreen: '#a3be8c',
-                brightYellow: '#ebcb8b', brightBlue: '#81a1c1', brightMagenta: '#b48ead',
-                brightCyan: '#8fbcbb', brightWhite: '#eceff4',
-                headerBg: '#3b4252', headerBorder: '#4c566a', userColor: '#a3be8c',
-                hostColor: '#a3be8c', sepColor: '#d8dee9', pathColor: '#81a1c1',
-                statusRunning: '#a3be8c', statusStopped: '#bf616a'
-            },
-            'github-dark': {
-                background: '#0d1117', foreground: '#c9d1d9', cursor: '#c9d1d9',
-                cursorAccent: '#0d1117', selectionBackground: '#3b5070',
-                black: '#0d1117', red: '#ff7b72', green: '#7ee787', yellow: '#d29922',
-                blue: '#79c0ff', magenta: '#d2a8ff', cyan: '#a5d6ff', white: '#c9d1d9',
-                brightBlack: '#484f58', brightRed: '#ffa198', brightGreen: '#aff5b4',
-                brightYellow: '#e3b341', brightBlue: '#a5d6ff', brightMagenta: '#d2a8ff',
-                brightCyan: '#b6e3ff', brightWhite: '#f0f6fc',
-                headerBg: '#161b22', headerBorder: '#30363d', userColor: '#7ee787',
-                hostColor: '#7ee787', sepColor: '#c9d1d9', pathColor: '#79c0ff',
-                statusRunning: '#7ee787', statusStopped: '#ff7b72'
-            }
-        };
-
-        let currentTheme = 'solarized-light';
-        let currentFont = 'Monaco, Menlo, monospace';
-        let currentFontSize = 14;
-
-        function loadSettings() {
-            const saved = localStorage.getItem('webterm-settings');
-            if (saved) {
-                const s = JSON.parse(saved);
-                currentTheme = s.theme || currentTheme;
-                currentFont = s.font || currentFont;
-                currentFontSize = s.fontSize || currentFontSize;
-            }
-            document.getElementById('theme-select').value = currentTheme;
-            document.getElementById('font-select').value = currentFont;
-            document.getElementById('font-size').value = currentFontSize;
-            document.getElementById('font-size-value').textContent = currentFontSize + 'px';
-        }
-
-        function saveSettings() {
-            localStorage.setItem('webterm-settings', JSON.stringify({
-                theme: currentTheme, font: currentFont, fontSize: currentFontSize
-            }));
-        }
-
-        function applyTheme(themeName) {
-            const t = themes[themeName];
-            if (!t) return;
-            currentTheme = themeName;
-            document.body.style.background = t.background;
-            document.getElementById('terminal-container').style.background = t.background;
-            const header = document.querySelector('.header');
-            header.style.background = t.headerBg;
-            header.style.borderColor = t.headerBorder;
-            header.style.color = t.foreground;
-            document.querySelector('.settings-btn').style.borderColor = t.foreground;
-            document.querySelector('.settings-btn').style.color = t.foreground;
-            const panel = document.getElementById('settings-panel');
-            panel.style.background = t.headerBg;
-            panel.style.color = t.foreground;
-            const style = document.documentElement.style;
-            style.setProperty('--user-color', t.userColor);
-            style.setProperty('--host-color', t.hostColor);
-            style.setProperty('--sep-color', t.sepColor);
-            style.setProperty('--path-color', t.pathColor);
-            style.setProperty('--status-running', t.statusRunning);
-            style.setProperty('--status-stopped', t.statusStopped);
-            if (term) {
-                term.options.theme = t;
-            }
-            saveSettings();
-        }
-
-        function applyFont(font) {
-            currentFont = font;
-            if (term) {
-                term.options.fontFamily = font;
-                fitAddon.fit();
-            }
-            saveSettings();
-        }
-
-        function applyFontSize(size) {
-            currentFontSize = size;
-            document.getElementById('font-size-value').textContent = size + 'px';
-            if (term) {
-                term.options.fontSize = size;
-                fitAddon.fit();
-            }
-            saveSettings();
-        }
-
-        function setupSettings() {
-            const btn = document.getElementById('settings-btn');
-            const panel = document.getElementById('settings-panel');
-            const overlay = document.getElementById('overlay');
-            const closeBtn = document.getElementById('close-settings');
-
-            btn.onclick = () => { panel.classList.add('open'); overlay.classList.add('open'); };
-            closeBtn.onclick = () => { panel.classList.remove('open'); overlay.classList.remove('open'); };
-            overlay.onclick = () => { panel.classList.remove('open'); overlay.classList.remove('open'); };
-
-            document.getElementById('theme-select').onchange = e => applyTheme(e.target.value);
-            document.getElementById('font-select').onchange = e => applyFont(e.target.value);
-            document.getElementById('font-size').oninput = e => applyFontSize(parseInt(e.target.value));
-        }
-
-        function init() {
-            loadSettings();
-            setupSettings();
-
-            term = new Terminal({
-                theme: themes[currentTheme], fontFamily: currentFont,
-                fontSize: currentFontSize, cursorBlink: true
-            });
-            fitAddon = new FitAddon.FitAddon();
-            term.loadAddon(fitAddon);
-            term.open(document.getElementById('terminal-container'));
-            fitAddon.fit();
-
-            term.onData(data => {
-                if (ws?.readyState === WebSocket.OPEN) {
-                    ws.send(JSON.stringify({ type: 'input', text: data }));
-                }
-            });
-
-            window.addEventListener('resize', () => {
-                fitAddon.fit();
-                if (ws?.readyState === WebSocket.OPEN) {
-                    ws.send(JSON.stringify({ type: 'resize', cols: term.cols, rows: term.rows }));
-                }
-            });
-
-            connect();
-            applyTheme(currentTheme);
-        }
-
-        function connect() {
-            ws = new WebSocket('ws://' + location.host);
-            ws.onopen = () => {
-                ws.send(JSON.stringify({ type: 'resize', cols: term.cols, rows: term.rows }));
-            };
-            ws.onmessage = e => {
-                const d = JSON.parse(e.data);
-                if (d.type === 'output') term.write(d.data);
-                else if (d.type === 'status' || d.type === 'started' || d.type === 'stopped') {
-                    isRunning = d.type === 'started' || (d.type === 'status' && d.isRunning);
-                    document.getElementById('status').textContent = isRunning ? '运行中' : '已停止';
-                    document.getElementById('status').className = 'status ' + (isRunning ? 'running' : 'stopped');
-                    if (d.systemInfo) {
-                        const i = d.systemInfo;
-                        document.getElementById('path-info').innerHTML =
-                            '<span class="user">' + i.username + '</span>' +
-                            '<span class="sep">@</span><span class="host">' + i.hostname + '</span>' +
-                            '<span class="sep">:</span><span class="path">' + i.cwd + '</span>';
-                    }
-                }
-            };
-            ws.onclose = () => setTimeout(connect, 3000);
-        }
-
-        init();
-    </script>
-</body>
-</html>`;
-    }
-}
-
-new WebTerminalServer(PORT);
-
-process.on('SIGINT', () => process.exit(0));
-process.on('SIGTERM', () => process.exit(0));