@xcanwin/manyoyo 5.8.9 → 5.8.10

package/lib/web/system-api-routes.js

@@ -1,114 +0,0 @@
-'use strict';
-
-function createSystemApiRoutes(deps) {
-    const {
-        req,
-        res,
-        ctx,
-        state,
-        fs,
-        os,
-        path,
-        withJsonBody,
-        sendJson,
-        expandHomeAliasPath,
-        readWebConfigSnapshot,
-        buildSafeWebConfigSnapshot,
-        restoreWebConfigSecrets,
-        parseAndValidateConfigRaw,
-        buildConfigDefaults
-    } = deps;
-
-    return [
-        {
-            method: 'GET',
-            match: currentPath => currentPath === '/api/fs/directories' ? [] : null,
-            handler: async () => {
-                const requestUrl = new URL(req.url || '/api/fs/directories', 'http://localhost');
-                const requestedPath = expandHomeAliasPath(String(requestUrl.searchParams.get('path') || '').trim() || os.homedir());
-                const requestedBasePath = expandHomeAliasPath(String(requestUrl.searchParams.get('basePath') || '').trim());
-                const realPath = fs.realpathSync(requestedPath);
-                if (!fs.statSync(realPath).isDirectory()) {
-                    sendJson(res, 400, { error: `目录不存在: ${realPath}` });
-                    return;
-                }
-
-                let realBasePath = '';
-                if (requestedBasePath) {
-                    realBasePath = fs.realpathSync(requestedBasePath);
-                    if (!fs.statSync(realBasePath).isDirectory()) {
-                        sendJson(res, 400, { error: `basePath 不是目录: ${realBasePath}` });
-                        return;
-                    }
-                    const relativeToBase = path.relative(realBasePath, realPath);
-                    if (relativeToBase.startsWith('..') || path.isAbsolute(relativeToBase)) {
-                        sendJson(res, 400, { error: '目录超出 basePath 范围' });
-                        return;
-                    }
-                }
-
-                const parentPath = realBasePath
-                    ? (realPath === realBasePath ? '' : path.dirname(realPath))
-                    : (realPath === path.parse(realPath).root ? '' : path.dirname(realPath));
-                const entries = fs.readdirSync(realPath, { withFileTypes: true })
-                    .filter(entry => entry && entry.isDirectory())
-                    .map(entry => ({
-                        name: entry.name,
-                        path: path.join(realPath, entry.name)
-                    }))
-                    .sort((a, b) => a.name.localeCompare(b.name, 'zh-CN'));
-
-                sendJson(res, 200, {
-                    currentPath: realPath,
-                    basePath: realBasePath || '',
-                    parentPath,
-                    entries
-                });
-            }
-        },
-        {
-            method: 'GET',
-            match: currentPath => currentPath === '/api/config' ? [] : null,
-            handler: async () => {
-                const snapshot = readWebConfigSnapshot(state.webConfigPath);
-                sendJson(res, 200, buildSafeWebConfigSnapshot(snapshot, ctx));
-            }
-        },
-        {
-            method: 'PUT',
-            match: currentPath => currentPath === '/api/config' ? [] : null,
-            handler: withJsonBody(async payload => {
-                const raw = typeof payload.raw === 'string' ? payload.raw : '';
-                if (!raw.trim()) {
-                    sendJson(res, 400, { error: '配置内容不能为空' });
-                    return;
-                }
-
-                const currentSnapshot = readWebConfigSnapshot(state.webConfigPath);
-                let finalRaw = raw;
-                let parsed = null;
-                try {
-                    finalRaw = restoreWebConfigSecrets(raw, currentSnapshot);
-                    parsed = parseAndValidateConfigRaw(finalRaw);
-                } catch (e) {
-                    sendJson(res, 400, { error: '配置格式错误', detail: e.message || '解析失败' });
-                    return;
-                }
-
-                const savePath = path.resolve(state.webConfigPath);
-                fs.mkdirSync(path.dirname(savePath), { recursive: true });
-                fs.writeFileSync(savePath, finalRaw, 'utf-8');
-
-                sendJson(res, 200, {
-                    saved: true,
-                    path: savePath,
-                    defaults: buildConfigDefaults(ctx, parsed)
-                });
-            })
-        }
-    ];
-}
-
-module.exports = {
-    createSystemApiRoutes
-};

package/lib/web/terminal-session.js

@@ -1,205 +0,0 @@
-'use strict';
-
-function createWebTerminalHelpers(options = {}) {
-    const WebSocket = options.WebSocket;
-    const spawn = options.spawn;
-    const forceKillMs = Number.isInteger(options.forceKillMs) ? options.forceKillMs : 2000;
-    const defaultCols = Number.isInteger(options.defaultCols) ? options.defaultCols : 120;
-    const defaultRows = Number.isInteger(options.defaultRows) ? options.defaultRows : 36;
-    const minCols = Number.isInteger(options.minCols) ? options.minCols : 40;
-    const minRows = Number.isInteger(options.minRows) ? options.minRows : 12;
-
-    function toPositiveInt(value, fallback) {
-        const parsed = Number.parseInt(value, 10);
-        if (!Number.isFinite(parsed) || parsed <= 0) {
-            return fallback;
-        }
-        return parsed;
-    }
-
-    function getUpgradeStatusText(statusCode) {
-        if (statusCode === 400) return 'Bad Request';
-        if (statusCode === 401) return 'Unauthorized';
-        if (statusCode === 404) return 'Not Found';
-        if (statusCode === 429) return 'Too Many Requests';
-        if (statusCode === 500) return 'Internal Server Error';
-        return 'Error';
-    }
-
-    function sendTerminalEvent(ws, type, payload = {}) {
-        if (!ws || ws.readyState !== WebSocket.OPEN) {
-            return;
-        }
-        ws.send(JSON.stringify({ type, ...payload }));
-    }
-
-    function spawnWebTerminalProcess(ctx, containerName, cols, rows) {
-        const terminalBootstrap = [
-            'MANYOYO_WEB_BASHRC="$(mktemp /tmp/manyoyo-web-bashrc.XXXXXX 2>/dev/null || mktemp)"',
-            'cat > "$MANYOYO_WEB_BASHRC" <<\'EOF_MANYOYO_RC\'',
-            'if [ -f /etc/bash.bashrc ]; then',
-            '    . /etc/bash.bashrc',
-            'fi',
-            'if [ -f ~/.bashrc ]; then',
-            '    . ~/.bashrc',
-            'fi',
-            'if [ -n "${MANYOYO_TERM_COLS:-}" ] && [ -n "${MANYOYO_TERM_ROWS:-}" ]; then',
-            '    COLUMNS="$MANYOYO_TERM_COLS"',
-            '    LINES="$MANYOYO_TERM_ROWS"',
-            '    export COLUMNS LINES',
-            '    stty cols "$MANYOYO_TERM_COLS" rows "$MANYOYO_TERM_ROWS" >/dev/null 2>&1 || true',
-            'fi',
-            'EOF_MANYOYO_RC',
-            'chmod 600 "$MANYOYO_WEB_BASHRC" >/dev/null 2>&1 || true',
-            'if command -v script >/dev/null 2>&1; then',
-            '  exec script -qefc "/bin/bash --rcfile $MANYOYO_WEB_BASHRC -i" /dev/null;',
-            'fi;',
-            'if command -v python3 >/dev/null 2>&1; then',
-            '  exec python3 -c \'import os, pty; pty.spawn(["/bin/bash","--rcfile",os.environ.get("MANYOYO_WEB_BASHRC","/dev/null"),"-i"])\';',
-            'fi;',
-            'if command -v python >/dev/null 2>&1; then',
-            '  exec python -c \'import os, pty; pty.spawn(["/bin/bash","--rcfile",os.environ.get("MANYOYO_WEB_BASHRC","/dev/null"),"-i"])\';',
-            'fi;',
-            'echo "[manyoyo] 容器内未找到 script/python，终端将降级为非 TTY 模式" >&2;',
-            'exec /bin/bash --rcfile "$MANYOYO_WEB_BASHRC" -i'
-        ].join('\n');
-
-        const termValue = process.env.TERM && process.env.TERM !== 'dumb' ? process.env.TERM : 'xterm-256color';
-        const colorTermValue = process.env.COLORTERM || 'truecolor';
-        const dockerExecArgs = [
-            'exec',
-            '-i',
-            '-e', `TERM=${termValue}`,
-            '-e', `COLORTERM=${colorTermValue}`,
-            '-e', `MANYOYO_TERM_COLS=${String(cols)}`,
-            '-e', `MANYOYO_TERM_ROWS=${String(rows)}`,
-            containerName,
-            '/bin/bash',
-            '-lc',
-            terminalBootstrap
-        ];
-
-        return spawn(ctx.dockerCmd, dockerExecArgs, { stdio: ['pipe', 'pipe', 'pipe'] });
-    }
-
-    return {
-        normalizeTerminalSize(cols, rows) {
-            return {
-                cols: Math.max(minCols, toPositiveInt(cols, defaultCols)),
-                rows: Math.max(minRows, toPositiveInt(rows, defaultRows))
-            };
-        },
-        sendWebSocketUpgradeError(socket, statusCode, message) {
-            const body = String(message || getUpgradeStatusText(statusCode));
-            const reason = getUpgradeStatusText(statusCode);
-            if (!socket.destroyed) {
-                socket.write(
-                    `HTTP/1.1 ${statusCode} ${reason}\r\n` +
-                    'Content-Type: text/plain; charset=utf-8\r\n' +
-                    'Connection: close\r\n' +
-                    `Content-Length: ${Buffer.byteLength(body, 'utf-8')}\r\n` +
-                    '\r\n' +
-                    body
-                );
-            }
-            socket.destroy();
-        },
-        bindTerminalWebSocket(ctx, state, ws, containerName, cols, rows) {
-            const sessionId = `${containerName}-${Date.now()}-${Math.random().toString(16).slice(2, 8)}`;
-            const ptyProcess = spawnWebTerminalProcess(ctx, containerName, cols, rows);
-            const session = {
-                id: sessionId,
-                containerName,
-                ptyProcess,
-                closing: false
-            };
-
-            state.terminalSessions.set(sessionId, session);
-            sendTerminalEvent(ws, 'status', {
-                phase: 'ready',
-                sessionId,
-                containerName,
-                cols,
-                rows
-            });
-
-            const cleanup = () => {
-                if (session.closing) {
-                    return;
-                }
-                session.closing = true;
-                state.terminalSessions.delete(sessionId);
-                if (ptyProcess && !ptyProcess.killed) {
-                    ptyProcess.kill('SIGTERM');
-                    setTimeout(() => {
-                        if (!ptyProcess.killed) {
-                            ptyProcess.kill('SIGKILL');
-                        }
-                    }, forceKillMs);
-                }
-            };
-
-            ptyProcess.stdout.on('data', chunk => {
-                sendTerminalEvent(ws, 'output', { data: chunk.toString('utf-8') });
-            });
-
-            ptyProcess.stderr.on('data', chunk => {
-                sendTerminalEvent(ws, 'output', { data: chunk.toString('utf-8') });
-            });
-
-            ptyProcess.on('error', err => {
-                sendTerminalEvent(ws, 'error', {
-                    error: err && err.message ? err.message : '终端进程启动失败'
-                });
-            });
-
-            ptyProcess.on('close', (code, signal) => {
-                sendTerminalEvent(ws, 'status', {
-                    phase: 'closed',
-                    code: typeof code === 'number' ? code : null,
-                    signal: signal || null
-                });
-                cleanup();
-                if (ws.readyState === WebSocket.OPEN) {
-                    ws.close();
-                }
-            });
-
-            ws.on('message', raw => {
-                let payload = null;
-                try {
-                    payload = JSON.parse(raw.toString('utf-8'));
-                } catch {
-                    payload = {
-                        type: 'input',
-                        data: raw.toString('utf-8')
-                    };
-                }
-                if (!payload || typeof payload !== 'object') {
-                    return;
-                }
-
-                if (payload.type === 'input' && typeof payload.data === 'string' && payload.data.length) {
-                    ptyProcess.stdin.write(payload.data);
-                    return;
-                }
-
-                if (payload.type === 'resize') {
-                    return;
-                }
-
-                if (payload.type === 'close') {
-                    ws.close();
-                }
-            });
-
-            ws.on('close', cleanup);
-            ws.on('error', cleanup);
-        },
-        cleanupWebRuntimeState() {}
-    };
-}
-
-module.exports = {
-    createWebTerminalHelpers
-};

package/lib/web/upgrade-handler.js

@@ -1,94 +0,0 @@
-'use strict';
-
-function createWebUpgradeHandler(options = {}) {
-    const formatUrlHost = options.formatUrlHost || (host => host);
-    const sendWebSocketUpgradeError = options.sendWebSocketUpgradeError || (() => {});
-    const getWebAuthSession = options.getWebAuthSession || (() => null);
-    const parseWebSessionKey = options.parseWebSessionKey || (() => ({ containerName: '', agentId: '' }));
-    const decodeSessionName = options.decodeSessionName || (value => value);
-    const safeContainerNamePattern = options.safeContainerNamePattern || /^[A-Za-z0-9_.-]+$/;
-    const normalizeTerminalSize = options.normalizeTerminalSize || ((cols, rows) => ({ cols, rows }));
-    const ensureWebContainer = options.ensureWebContainer || (async () => {});
-    const maxTerminalSessions = Number.isInteger(options.maxTerminalSessions) ? options.maxTerminalSessions : 20;
-
-    return function handleWebUpgradeRequest(req, socket, head, wsServer, ctx, state, listenPort) {
-        const fallbackHost = `${formatUrlHost(ctx.serverHost)}:${ctx.serverPort}`;
-        let url;
-        try {
-            url = new URL(req.url || '/', `http://${req.headers.host || fallbackHost}`);
-        } catch {
-            sendWebSocketUpgradeError(socket, 400, 'Invalid URL');
-            return;
-        }
-
-        const terminalMatch = url.pathname.match(/^\/api\/sessions\/([^/]+)\/terminal\/ws$/);
-        if (!terminalMatch) {
-            socket.destroy();
-            return;
-        }
-
-        const requestOrigin = req.headers.origin;
-        if (requestOrigin) {
-            const allowedOrigins = new Set();
-            const hostHeader = req.headers.host || '';
-            if (hostHeader) {
-                allowedOrigins.add(`http://${hostHeader}`);
-                allowedOrigins.add(`https://${hostHeader}`);
-            }
-            if (ctx.serverHost !== '0.0.0.0') {
-                allowedOrigins.add(`http://${formatUrlHost(ctx.serverHost)}:${listenPort}`);
-                if (ctx.serverHost === '127.0.0.1') {
-                    allowedOrigins.add(`http://localhost:${listenPort}`);
-                }
-            }
-            if (allowedOrigins.size > 0 && !allowedOrigins.has(requestOrigin)) {
-                sendWebSocketUpgradeError(socket, 403, 'Forbidden');
-                return;
-            }
-        }
-
-        const authSession = getWebAuthSession(state, req);
-        if (!authSession) {
-            sendWebSocketUpgradeError(socket, 401, 'UNAUTHORIZED');
-            return;
-        }
-
-        const sessionRef = parseWebSessionKey(decodeSessionName(terminalMatch[1]));
-        if (!ctx.isValidContainerName(sessionRef.containerName)) {
-            sendWebSocketUpgradeError(socket, 400, `containerName 非法: ${sessionRef.containerName}`);
-            return;
-        }
-        if (!safeContainerNamePattern.test(sessionRef.agentId)) {
-            sendWebSocketUpgradeError(socket, 400, `agentId 非法: ${sessionRef.agentId}`);
-            return;
-        }
-
-        if (state.terminalSessions.size >= maxTerminalSessions) {
-            sendWebSocketUpgradeError(socket, 429, 'TERMINAL_LIMIT_REACHED');
-            return;
-        }
-
-        const { cols, rows } = normalizeTerminalSize(
-            url.searchParams.get('cols'),
-            url.searchParams.get('rows')
-        );
-
-        ensureWebContainer(ctx, state, sessionRef.containerName)
-            .then(() => {
-                wsServer.handleUpgrade(req, socket, head, ws => {
-                    wsServer.emit('connection', ws, req, {
-                        containerName: sessionRef.containerName,
-                        cols,
-                        rows
-                    });
-                });
-            })
-            .catch(error => {
-                sendWebSocketUpgradeError(socket, 500, error && error.message ? error.message : '终端创建失败');
-            });
-    };
-}
-
-module.exports = {
-    createWebUpgradeHandler
-};