termdock 1.4.248 → 1.4.250

package/dist/server/routes/android.js

@@ -0,0 +1,205 @@
+import { Router } from 'express';
+import { connectDevice, disconnectDevice, listDevices, resolveAdbBinary } from '../android/adb.js';
+import { createScrcpySession, resolveScrcpyBinaries } from '../android/scrcpy.js';
+const router = Router();
+const SERIAL_PATTERN = /^[0-9a-zA-Z_.:\-]{1,128}$/;
+/** 逐帧/逐控件的诊断日志默认关闭，需要时 TERMDOCK_ANDROID_DEBUG=1 打开。 */
+const DEBUG_ANDROID = process.env.TERMDOCK_ANDROID_DEBUG === '1';
+export function isValidAndroidSerial(serial) {
+    return SERIAL_PATTERN.test(serial);
+}
+router.get('/devices', async (_req, res) => {
+    try {
+        const devices = await listDevices();
+        let scrcpyVersion = null;
+        const adbAvailable = resolveAdbBinary() !== null;
+        try {
+            scrcpyVersion = (await resolveScrcpyBinaries()).version;
+        }
+        catch {
+            scrcpyVersion = null;
+        }
+        res.json({ adbAvailable, scrcpyVersion, devices });
+    }
+    catch (error) {
+        res.status(503).json({ error: error instanceof Error ? error.message : 'ADB_UNAVAILABLE', code: 'ADB_UNAVAILABLE' });
+    }
+});
+router.post('/connect', async (req, res) => {
+    const address = typeof req.body?.address === 'string' ? req.body.address : '';
+    try {
+        const result = await connectDevice(address);
+        res.json({ ok: true, serial: result.serial, output: result.output });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'ADB_CONNECT_FAILED';
+        res.status(400).json({ error: message, code: message });
+    }
+});
+router.post('/disconnect', async (req, res) => {
+    const address = typeof req.body?.address === 'string' ? req.body.address : '';
+    try {
+        res.json({ ok: true, output: await disconnectDevice(address) });
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : 'ADB_DISCONNECT_FAILED';
+        res.status(400).json({ error: message, code: message });
+    }
+});
+export default router;
+function clampInt(value, min, max, fallback) {
+    if (typeof value !== 'number' || !Number.isFinite(value))
+        return fallback;
+    return Math.max(min, Math.min(max, Math.round(value)));
+}
+/** 加密隧道打开 `/api/android/:serial/ws` 后的桥接：视频帧下发、控制消息回写。 */
+export function handleAndroidWebSocket(socket, serial, _clientId, requested = {}) {
+    if (!isValidAndroidSerial(serial)) {
+        socket.close(4400, 'INVALID_SERIAL');
+        return;
+    }
+    // 网络差时客户端可主动降码率/分辨率；这里对入参做边界收敛。
+    const quality = {
+        maxSize: clampInt(requested.maxSize, 360, 2160, 1600),
+        videoBitRate: clampInt(requested.bitRate, 300_000, 30_000_000, 8_000_000),
+        maxFps: clampInt(requested.maxFps, 0, 60, 0),
+    };
+    let closed = false;
+    let inflight = 0;
+    let seq = 0;
+    let sent = 0;
+    let acked = 0;
+    let controlCount = 0;
+    let lastAckAt = 0;
+    let lastFrameAt = Date.now();
+    let videoPaused = false;
+    let androidSendSkipLogged = false;
+    let session = null;
+    // 客户端 ack 丢失时不能让视频永久暂停：超时视为丢包并恢复。
+    const flowTimer = setInterval(() => {
+        if (videoPaused && Date.now() - Math.max(lastAckAt, lastFrameAt) > 3000) {
+            if (DEBUG_ANDROID)
+                console.log(`[android] flow resume after ack timeout serial=${serial} inflight=${inflight} sent=${sent} acked=${acked}`);
+            videoPaused = false;
+            session?.resumeVideo();
+        }
+    }, 1000);
+    const statsTimer = DEBUG_ANDROID ? setInterval(() => {
+        if (sent > 0)
+            console.log(`[android] stats serial=${serial} sent=${sent} acked=${acked} inflight=${inflight} controls=${controlCount} paused=${videoPaused}`);
+    }, 10_000) : null;
+    const FRAME_WINDOW = 3;
+    const send = (payload) => {
+        if (closed || socket.readyState !== 1) {
+            if (!androidSendSkipLogged) {
+                androidSendSkipLogged = true;
+                console.log(`[android] send skipped serial=${serial} closed=${closed} readyState=${socket.readyState} type=${String(payload.type)}`);
+            }
+            return;
+        }
+        try {
+            socket.send(JSON.stringify(payload));
+        }
+        catch (error) {
+            console.log(`[android] send failed serial=${serial} type=${String(payload.type)} ${error instanceof Error ? error.message : 'unknown'}`);
+        }
+    };
+    const shutdown = (reason) => {
+        if (closed)
+            return;
+        closed = true;
+        clearInterval(flowTimer);
+        if (statsTimer)
+            clearInterval(statsTimer);
+        if (DEBUG_ANDROID)
+            console.log(`[android] session end serial=${serial} sent=${sent} acked=${acked} reason=${reason ?? 'ok'}`);
+        if (reason)
+            send({ type: 'error', message: reason });
+        try {
+            session?.stop();
+        }
+        catch { /* ignore */ }
+        session = null;
+        try {
+            socket.close(1000, reason ? 'error' : 'closed');
+        }
+        catch { /* ignore */ }
+    };
+    socket.on('close', () => { closed = true; clearInterval(flowTimer); if (statsTimer)
+        clearInterval(statsTimer); void session?.stop(); session = null; });
+    socket.on('error', () => { closed = true; clearInterval(flowTimer); if (statsTimer)
+        clearInterval(statsTimer); void session?.stop(); session = null; });
+    session = createScrcpySession(serial, {
+        onHeader: header => { send({ type: 'header', ...header }); },
+        onFrame: frame => {
+            if (closed)
+                return;
+            // 不丢任何帧：客户端慢时暂停视频 socket，用反压换低延迟。
+            inflight++;
+            if (DEBUG_ANDROID && (sent < 12 || frame.keyFrame))
+                console.log(`[android] send frame #${sent} serial=${serial} config=${frame.config} key=${frame.keyFrame} bytes=${frame.data.length}`);
+            sent++;
+            lastFrameAt = Date.now();
+            send({
+                type: 'frame', seq: ++seq, config: frame.config, key: frame.keyFrame,
+                pts: frame.pts.toString(), data: frame.data.toString('base64'),
+            });
+            if (!videoPaused && inflight >= FRAME_WINDOW) {
+                videoPaused = true;
+                session?.pauseVideo();
+            }
+        },
+        onError: error => shutdown(error.message || 'SCRCPY_ERROR'),
+        onClose: () => { if (!closed) {
+            send({ type: 'closed' });
+            closed = true;
+            try {
+                socket.close(1000, 'closed');
+            }
+            catch { /* ignore */ }
+        } },
+    }, quality);
+    void session.start().catch(error => shutdown(error instanceof Error ? error.message : 'SCRCPY_START_FAILED'));
+    socket.on('message', raw => {
+        if (closed || !session)
+            return;
+        let message;
+        try {
+            message = JSON.parse(typeof raw === 'string' ? raw : raw.toString('utf8'));
+        }
+        catch {
+            return;
+        }
+        switch (message.type) {
+            case 'control': {
+                if (typeof message.data !== 'string' || message.data.length > 64 * 1024)
+                    return;
+                const bytes = Buffer.from(message.data, 'base64');
+                const ok = session.sendControl(bytes);
+                if (DEBUG_ANDROID && controlCount++ < 8) {
+                    const detail = bytes[0] === 2 && bytes.length >= 32
+                        ? ` touch action=${bytes[1]} x=${bytes.readUInt32BE(10)} y=${bytes.readUInt32BE(14)} size=${bytes.readUInt16BE(18)}x${bytes.readUInt16BE(20)}`
+                        : ` type=${bytes[0]}`;
+                    console.log(`[android] control #${controlCount} serial=${serial} bytes=${bytes.length} written=${ok}${detail}`);
+                }
+                break;
+            }
+            case 'ack': {
+                if (typeof message.seq === 'number') {
+                    inflight = Math.max(0, inflight - 1);
+                    acked++;
+                    lastAckAt = Date.now();
+                    if (videoPaused && inflight < FRAME_WINDOW) {
+                        videoPaused = false;
+                        session?.resumeVideo();
+                    }
+                }
+                break;
+            }
+            case 'ping':
+                send({ type: 'pong' });
+                break;
+            default: break;
+        }
+    });
+}

package/dist/server/routes/terminal.js

@@ -24,7 +24,7 @@ import { getPtyHostManager } from '../ptyhost/manager.js';
 import { pathValidator } from '../utils/pathValidator.js';
 import { TERMINAL, TMUX } from '../config.js';
 import { localAccessManager } from '../utils/localAccess.js';
-import { normalizeLocalAccessName, getLocaleSetting, setLocaleSetting, getContextDraftHeightSetting, setContextDraftHeightSetting, getAutoRenameAgentsSetting, setAutoRenameAgentsSetting, getAutoRenameNamerSetting, setAutoRenameNamerSetting, getAutoRenameModelsSetting, setAutoRenameModelsSetting, getAutoRenameIntervalMinutesSetting, setAutoRenameIntervalMinutesSetting, getAutoRenamePromptPreferenceSetting, setAutoRenamePromptPreferenceSetting, getAutoRenamePromptPayloadCharsSetting, setAutoRenamePromptPayloadCharsSetting, getNewSessionAgentSlugSetting, setNewSessionAgentSlugSetting, getRunningSessionButtonEnabledSetting, getCollaborationPanelsSetting, setCollaborationPanelSetting, getCollaborationFloatingGroupIdSetting, setCollaborationFloatingGroupIdSetting, getServiceSwitcherExpandedSetting, setServiceSwitcherExpandedSetting, setRunningSessionButtonEnabledSetting, getFileSortModesSetting, setFileSortModesSetting, setFileSortModeSetting, getNestedGitScanRootsSetting, setNestedGitScanRootSetting, getPinnedExplorerRootsSetting, setPinnedExplorerRootsSetting, setPinnedExplorerRootSetting, watchPinnedExplorerRootsSetting, } from '../utils/settings.js';
+import { normalizeLocalAccessName, getLocaleSetting, setLocaleSetting, getContextDraftHeightSetting, setContextDraftHeightSetting, getAutoRenameAgentsSetting, setAutoRenameAgentsSetting, getAutoRenameNamerSetting, setAutoRenameNamerSetting, getAutoRenameModelsSetting, setAutoRenameModelsSetting, getAutoRenameIntervalMinutesSetting, setAutoRenameIntervalMinutesSetting, getAutoRenamePromptPreferenceSetting, setAutoRenamePromptPreferenceSetting, getAutoRenamePromptPayloadCharsSetting, setAutoRenamePromptPayloadCharsSetting, getNewSessionAgentSlugSetting, setNewSessionAgentSlugSetting, getRunningSessionButtonEnabledSetting, getCollaborationPanelsSetting, setCollaborationPanelSetting, getAndroidPanelSetting, setAndroidPanelSetting, normalizeAndroidPanel, getCollaborationFloatingGroupIdSetting, setCollaborationFloatingGroupIdSetting, getServiceSwitcherExpandedSetting, setServiceSwitcherExpandedSetting, setRunningSessionButtonEnabledSetting, getFileSortModesSetting, setFileSortModesSetting, setFileSortModeSetting, getNestedGitScanRootsSetting, setNestedGitScanRootSetting, getPinnedExplorerRootsSetting, setPinnedExplorerRootsSetting, setPinnedExplorerRootSetting, watchPinnedExplorerRootsSetting, } from '../utils/settings.js';
 import { loadContextDraft, saveContextDraft } from '../utils/contextDraft.js';
 import { getOnboardingServerUrl } from '../onboardingServer.js';
 import { inspectLinuxInotifyUsage, isWatchResourceExhaustion } from '../utils/fileWatchPolicy.js';
@@ -6164,6 +6164,7 @@ async function getSettingsPayload() {
         newSessionAgentSlug: getNewSessionAgentSlugSetting(),
         runningSessionButtonEnabled: getRunningSessionButtonEnabledSetting(),
         collaborationPanels: getCollaborationPanelsSetting(),
+        androidPanel: getAndroidPanelSetting(),
         collaborationFloatingGroupId: getCollaborationFloatingGroupIdSetting(),
         serviceSwitcherExpanded: getServiceSwitcherExpandedSetting(),
         fileSortModes: getFileSortModesSetting(),
@@ -6287,6 +6288,17 @@ router.put('/settings', async (req, res) => {
         }
         setNewSessionAgentSlugSetting(slug);
     }
+    if (body.androidPanel && typeof body.androidPanel === 'object') {
+        // 与现有设置合并后再校验：允许只更新部分字段（如仅切开关）。
+        const merged = normalizeAndroidPanel({ ...getAndroidPanelSetting(), ...body.androidPanel });
+        setAndroidPanelSetting({
+            enabled: merged.enabled,
+            quality: merged.quality,
+            activePresetId: merged.activePresetId,
+            presets: merged.presets,
+            deviceSerial: merged.deviceSerial,
+        });
+    }
     if (body.collaborationPanel && typeof body.collaborationPanel.clientId === 'string') {
         setCollaborationPanelSetting(body.collaborationPanel.clientId, body.collaborationPanel.state);
     }

package/dist/server/utils/apiAccess.js

@@ -22,6 +22,8 @@ export function apiAccessGate(localToken) {
             // Preview capabilities perform scoped, session-bound authentication themselves.
             if (['GET', 'HEAD'].includes(req.method) && /^\/terminal\/fs\/preview\//.test(path))
                 return true;
-            return isTrustedLocalRequest(req, localToken) && (/^\/(?:terminal|local)(?:\/|$)/.test(path) || path === '/diagnostics/runtime');
+            // 本机 CLI/Agent 用 0600 token 直连 /android 与 terminal 同级:都直通本机
+            // 进程，且这个 bypass 仅限 loopback 且不带 origin。
+            return isTrustedLocalRequest(req, localToken) && (/^\/(?:terminal|local|android)(?:\/|$)/.test(path) || path === '/diagnostics/runtime');
         } });
 }

package/dist/server/utils/settings.js

@@ -82,6 +82,46 @@ export function normalizeNestedGitScanRoots(value) {
         .filter(([rootPath, enabled]) => enabled === true && isAbsoluteFilePath(rootPath))
         .slice(-500));
 }
+function normalizeAndroidQuality(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return null;
+    const item = value;
+    if (item.id !== 'low' && item.id !== 'medium' && item.id !== 'high' && item.id !== 'custom')
+        return null;
+    const maxSize = typeof item.maxSize === 'number' ? Math.max(360, Math.min(2160, Math.round(item.maxSize))) : 1080;
+    const bitRate = typeof item.bitRate === 'number' ? Math.max(300_000, Math.min(30_000_000, Math.round(item.bitRate))) : 4_000_000;
+    const maxFps = typeof item.maxFps === 'number' ? Math.max(0, Math.min(60, Math.round(item.maxFps))) : 30;
+    return { id: item.id, maxSize, bitRate, maxFps };
+}
+export function normalizeAndroidPanel(value) {
+    const raw = value && typeof value === 'object' && !Array.isArray(value) ? value : {};
+    const enabled = raw.enabled !== false;
+    const quality = normalizeAndroidQuality(raw.quality);
+    const presets = [];
+    if (Array.isArray(raw.presets)) {
+        const seen = new Set();
+        for (const entry of raw.presets.slice(0, 12)) {
+            if (!entry || typeof entry !== 'object' || Array.isArray(entry))
+                continue;
+            const item = entry;
+            if (typeof item.id !== 'string' || !/^[a-z0-9-]{1,40}$/.test(item.id) || seen.has(item.id))
+                continue;
+            const name = typeof item.name === 'string' ? item.name.trim().slice(0, 40) : '';
+            if (!name)
+                continue;
+            const values = normalizeAndroidQuality({ ...item, id: 'custom' });
+            if (!values)
+                continue;
+            seen.add(item.id);
+            presets.push({ id: item.id, name, maxSize: values.maxSize, bitRate: values.bitRate, maxFps: values.maxFps });
+        }
+    }
+    const activePresetId = typeof raw.activePresetId === 'string' && presets.some(preset => preset.id === raw.activePresetId)
+        ? raw.activePresetId
+        : null;
+    const deviceSerial = typeof raw.deviceSerial === 'string' && /^[0-9a-zA-Z_.:\-]{1,128}$/.test(raw.deviceSerial) ? raw.deviceSerial : null;
+    return { enabled, quality, activePresetId, presets, deviceSerial };
+}
 export function normalizePinnedExplorerRoots(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value))
         return {};
@@ -157,6 +197,7 @@ function normalizeSettings(value) {
         newSessionAgentSlug: normalizeNewSessionAgentSlug(raw.newSessionAgentSlug),
         runningSessionButtonEnabled: raw.runningSessionButtonEnabled === true,
         collaborationPanels: normalizeCollaborationPanels(raw.collaborationPanels),
+        androidPanel: normalizeAndroidPanel(raw.androidPanel),
         collaborationFloatingGroupId: typeof raw.collaborationFloatingGroupId === 'string' && raw.collaborationFloatingGroupId.trim() ? raw.collaborationFloatingGroupId.trim() : null,
         serviceSwitcherExpanded: raw.serviceSwitcherExpanded === true,
         fileSortModes: normalizeFileSortModes(raw.fileSortModes),
@@ -626,6 +667,12 @@ export function normalizeCollaborationPanels(value, depth = 0) {
     }
     return result;
 }
+export function getAndroidPanelSetting() { return loadSettings().androidPanel; }
+export function setAndroidPanelSetting(patch) {
+    return updateSettings((settings) => {
+        settings.androidPanel = normalizeAndroidPanel({ ...settings.androidPanel, ...patch });
+    });
+}
 export function getCollaborationPanelsSetting() { return loadSettings().collaborationPanels; }
 export function setCollaborationPanelSetting(clientId, patch) {
     const normalized = normalizeCollaborationPanels({ [clientId]: patch })[clientId];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.248",
+  "version": "1.4.250",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "main": ".desktop-dist/main.js",

package/runtime-manifest.json

@@ -1,13 +1,13 @@
 {
   "schemaVersion": 1,
   "packageName": "termdock",
-  "version": "1.4.248",
+  "version": "1.4.250",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-K4KyYJuVoQDpZsBM8ZX1Rw3MddOxAzVdp/cPm0iGZz0=",
-  "serverBundleHash": "sha256-jt8V06gEQdEOQuK7k49oLE0RIfpkIZP7rDDt7Vh6E80=",
-  "clientBundleHash": "sha256-HlWxahuBEeECLIdcNzDrrsCAKMW7lnLfgnYIkXTj79s=",
+  "serverBundleHash": "sha256-1E5hCGamv5B/YzX9sMhApO31wShlVXdjYJKwfa6TkMM=",
+  "clientBundleHash": "sha256-sht1vCY8isEbGmegij8u2HwDEN/4NxU/UsNLOyKGXqs=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }