termdock 1.4.266 → 1.4.268

package/dist/server/android/scrcpy.js

@@ -4,6 +4,7 @@ import net from 'node:net';
 import { delimiter, dirname, join } from 'node:path';
 import { randomInt } from 'node:crypto';
 import { adbSearchPath, resolveAdbBinary } from './adb.js';
+import { LiveBitrateChannel, inspectLiveBitrate, resolveBundledPreviewServer, bitrateOverlayPath, bitrateOverlayRemote } from './liveBitrate.js';
 const DEVICE_NAME_LENGTH = 64;
 const VIDEO_HEADER_LENGTH = 12;
 const FRAME_HEADER_LENGTH = 12;
@@ -131,6 +132,7 @@ export class ScrcpySession {
     events;
     options;
     scid = randomInt(1, 0x7fffffff);
+    bitrateChannel = null;
     child = null;
     server = null;
     videoSocket = null;
@@ -172,7 +174,7 @@ export class ScrcpySession {
             return;
         this.started = true;
         try {
-            const { serverJar, version } = await resolveScrcpyBinaries();
+            const { serverJar, version } = await resolveBundledPreviewServer() ?? await resolveScrcpyBinaries();
             this.protocol = Number.parseInt(version.split('.')[0] ?? '0', 10) >= 4 ? 'session' : 'legacy';
             const remoteJar = remoteJarPath(version);
             await runAdbCapture(['-s', this.serial, 'push', serverJar, remoteJar], 60_000);
@@ -184,10 +186,45 @@ export class ScrcpySession {
                 server.listen(0, '127.0.0.1', () => { this.port = server.address().port; resolve(); });
             });
             await runAdbCapture(['-s', this.serial, 'reverse', `localabstract:scrcpy_${scidHex(this.scid)}`, `tcp:${this.port}`], 15_000);
+            let liveBitrate = false;
+            let bitrateFailure = await inspectLiveBitrate(serverJar, version);
+            let bitrateStage = 'BITRATE_LISTEN_FAILED';
+            const reportBitrate = (ready, detail) => {
+                if (this.stopped)
+                    return;
+                const diagnostic = detail ? `${detail}; scrcpy=${version}; device=${this.serial}` : undefined;
+                if (diagnostic)
+                    console.warn('[android] ' + diagnostic);
+                this.events.onBitrateSupport?.(ready, diagnostic);
+            };
+            if (!bitrateFailure) {
+                try {
+                    this.bitrateChannel = new LiveBitrateChannel(reportBitrate);
+                    const port = await this.bitrateChannel.listen();
+                    bitrateStage = 'BITRATE_PUSH_FAILED';
+                    await runAdbCapture(['-s', this.serial, 'push', bitrateOverlayPath, bitrateOverlayRemote]);
+                    bitrateStage = 'BITRATE_TUNNEL_FAILED';
+                    await runAdbCapture(['-s', this.serial, 'reverse', `localabstract:termdock_bitrate_${scidHex(this.scid)}`, `tcp:${port}`]);
+                    liveBitrate = true;
+                }
+                catch (error) {
+                    bitrateFailure = `${bitrateStage}: ${String(error)}`;
+                    this.bitrateChannel?.close();
+                    this.bitrateChannel = null;
+                }
+            }
+            if (!liveBitrate)
+                reportBitrate(false, bitrateFailure ?? 'BITRATE_UNAVAILABLE');
+            if (this.stopped) {
+                this.bitrateChannel?.close();
+                this.server?.close();
+                await Promise.allSettled(['scrcpy_', 'termdock_bitrate_'].map(prefix => runAdbCapture(['-s', this.serial, 'reverse', '--remove', `localabstract:${prefix}${scidHex(this.scid)}`], 8000)));
+                return;
+            }
             const args = [
                 '-s', this.serial, 'shell',
-                `CLASSPATH=${remoteJar}`,
-                'app_process', '/',
+                `CLASSPATH=${liveBitrate ? bitrateOverlayRemote + ":" : ""}${remoteJar}`,
+                'app_process', ...(liveBitrate ? [`-Dtermdock.bitrate=termdock_bitrate_${scidHex(this.scid)}`] : []), '/',
                 'com.genymobile.scrcpy.Server', version,
                 `scid=${this.scid.toString(16)}`,
                 'log_level=info',
@@ -246,7 +283,7 @@ export class ScrcpySession {
     readVideo(chunk) {
         if (this.stopped)
             return;
-        this.videoBuffer = Buffer.concat([this.videoBuffer, chunk]);
+        this.videoBuffer = this.videoBuffer.length ? Buffer.concat([this.videoBuffer, chunk]) : chunk;
         if (this.videoStage === 'meta') {
             if (this.videoBuffer.length < DEVICE_NAME_LENGTH)
                 return;
@@ -310,7 +347,7 @@ export class ScrcpySession {
             const size = this.videoBuffer.readUInt32BE(8);
             if (this.videoBuffer.length < FRAME_HEADER_LENGTH + size)
                 break;
-            const payload = Buffer.from(this.videoBuffer.subarray(FRAME_HEADER_LENGTH, FRAME_HEADER_LENGTH + size));
+            const payload = this.videoBuffer.subarray(FRAME_HEADER_LENGTH, FRAME_HEADER_LENGTH + size);
             this.videoBuffer = this.videoBuffer.subarray(FRAME_HEADER_LENGTH + size);
             const session = this.protocol === 'session';
             const config = session ? ((ptsFlags >> 62n) & 1n) === 1n : ((ptsFlags >> 63n) & 1n) === 1n;
@@ -375,11 +412,16 @@ export class ScrcpySession {
             return false;
         }
     }
+    get bitrateFailure() { return this.bitrateChannel?.lastFailure; }
+    setBitrate(value) {
+        return this.bitrateChannel?.setBitrate(value) ?? Promise.resolve(false);
+    }
     async stop() {
         if (this.stopped)
             return;
         this.stopped = true;
         activeSessions.delete(this);
+        this.bitrateChannel?.close();
         const child = this.child;
         this.child = null;
         try {
@@ -407,6 +449,10 @@ export class ScrcpySession {
             await runAdbCapture(['-s', this.serial, 'reverse', '--remove', `localabstract:scrcpy_${scidHex(this.scid)}`], 8000);
         }
         catch { /* reverse 可能已随进程退出被清理 */ }
+        try {
+            await runAdbCapture(['-s', this.serial, 'reverse', '--remove', `localabstract:termdock_bitrate_${scidHex(this.scid)}`], 8000);
+        }
+        catch { /* optional channel */ }
         this.events.onClose();
     }
 }

package/dist/server/cli.js

@@ -527,7 +527,7 @@ function printRunningState(state) {
     if (state.lanUrl)
         console.log(`  ${c.dim('LAN:')}  ${c.cyan(state.lanUrl)} ${state.localAccessStatus ? c.dim(`(${state.localAccessStatus})`) : ''}`);
     if (state.onboardingUrl)
-        console.log(`  ${c.dim('Setup:')} ${c.cyan(state.onboardingUrl)} ${c.dim('(open this on your phone to download the CA certificate)')}`);
+        console.log(`  ${c.dim('CA certificate:')} ${c.cyan(state.onboardingUrl)} ${c.dim('(open this on your phone to download the CA certificate)')}`);
     if (state.localAccessReason)
         console.log(`  ${c.dim('LAN note:')} ${state.localAccessReason}`);
     console.log(`  ${c.dim('Log:')}  ${state.logFile}`);

package/dist/server/entry.js

@@ -752,7 +752,7 @@ export function startServer(options = {}) {
                 if (state.status === 'active') {
                     console.log(`LAN access: ${state.url}`);
                     if (onboardingUrl)
-                        console.log(`Mobile setup: ${onboardingUrl} (open this on your phone to download the CA certificate)`);
+                        console.log(`CA certificate: ${onboardingUrl} (open this on your phone to download the CA certificate)`);
                 }
                 else {
                     console.log(`LAN access: ${state.status}${state.reason ? ` (${state.reason})` : ''}`);

package/dist/server/federation/runtime.js

@@ -604,7 +604,7 @@ export async function createFederationRuntime(app, directory, handlers, options
                         if (item.android) {
                             if (!full(subjectId))
                                 throw new Error('AUTHORIZATION_DENIED');
-                            if (!['control', 'ack', 'ping'].includes(data?.type))
+                            if (!['control', 'ack', 'ping', 'bitrate'].includes(data?.type))
                                 throw new Error('ACTION_NOT_ALLOWED');
                         }
                         else if (item.sessionId) {

package/dist/server/onboardingServer.js

@@ -24,7 +24,6 @@ export function startOnboardingServer(options) {
         res.setHeader('Content-Disposition', 'attachment; filename="rootCA.pem"');
         res.send(fs.readFileSync(options.caCertPath));
     });
-    app.get('/', (_req, res) => res.redirect('/onboarding'));
     const server = createServer(app);
     server.on('error', (error) => {
         console.warn('[onboarding] HTTP setup server failed:', error);
@@ -33,7 +32,7 @@ export function startOnboardingServer(options) {
         const address = server.address();
         const port = address?.port ?? null;
         const host = getLanIPv4Addresses()[0] ?? 'localhost';
-        activeUrl = port ? `http://${host}:${port}/onboarding` : null;
+        activeUrl = port ? `http://${host}:${port}/ca` : null;
     });
     server.listen(0, '0.0.0.0');
     activeServer = server;

package/dist/server/routes/android.js

@@ -185,6 +185,7 @@ export function handleAndroidWebSocket(socket, serial, _clientId, requested = {}
     socket.on('error', () => { closed = true; clearInterval(flowTimer); if (statsTimer)
         clearInterval(statsTimer); void session?.stop(); session = null; });
     session = createScrcpySession(serial, {
+        onBitrateSupport: (supported, detail) => send({ type: 'bitrate-support', supported, detail }),
         onHeader: header => { send({ type: 'header', ...header }); },
         onFrame: frame => {
             if (closed)
@@ -226,6 +227,16 @@ export function handleAndroidWebSocket(socket, serial, _clientId, requested = {}
             return;
         }
         switch (message.type) {
+            case 'bitrate': {
+                if (typeof message.requestId !== 'number' || !Number.isSafeInteger(message.requestId)
+                    || typeof message.bitRate !== 'number' || !Number.isInteger(message.bitRate)
+                    || message.bitRate < 300_000 || message.bitRate > 30_000_000)
+                    return;
+                const requestId = message.requestId, bitRate = message.bitRate;
+                const current = session;
+                void current.setBitrate(bitRate).then(applied => send({ type: 'bitrate-result', requestId, bitRate, applied, detail: current.bitrateFailure }));
+                break;
+            }
             case 'control': {
                 if (typeof message.data !== 'string' || message.data.length > 64 * 1024)
                     return;

package/dist/server/routes/filesystem.js

@@ -2289,23 +2289,37 @@ async function getBranchDiffPayload(workspaceRoot, repoRoot, baseBranch, options
         return { available: false, workspaceRoot, repoRoot, baseBranch: trimmedBase, error: 'Invalid target branch name' };
     }
     const includeUncommitted = options?.includeUncommitted ?? true;
-    let baseRef = trimmedBase.includes('/') ? trimmedBase : `origin/${trimmedBase}`;
-    if (trimmedBase.includes('/')) {
-        await execGit(['rev-parse', '--verify', '--quiet', baseRef], repoRoot, signal);
-    }
-    else {
+    const remotes = (await execGit(['remote'], repoRoot, signal)).split('\n').filter(Boolean);
+    const remoteBase = trimmedBase.replace(/^refs\/remotes\//, '');
+    // Match configured remotes, not arbitrary slashes in local branch names.
+    const baseRemote = remotes.sort((a, b) => b.length - a.length)
+        .find((remote) => remoteBase.startsWith(`${remote}/`))
+        ?? (!trimmedBase.includes('/') && remotes.includes('origin') ? 'origin' : null);
+    let baseRef = trimmedBase;
+    if (baseRemote) {
+        const remoteBranch = remoteBase.startsWith(`${baseRemote}/`)
+            ? remoteBase.slice(baseRemote.length + 1)
+            : trimmedBase;
+        baseRef = `${baseRemote}/${remoteBranch}`;
+        const trackingRef = `refs/remotes/${baseRef}`;
         try {
-            await execGit(['fetch', 'origin', trimmedBase, '--no-tags'], repoRoot, signal, GIT_ROUTE_TIMEOUT_MS);
+            // Explicitly update the selected tracking ref even with a narrow fetch
+            // refspec, and accept a baseline that was force-pushed on the remote.
+            await execGit(['fetch', '--no-tags', '--', baseRemote, `+refs/heads/${remoteBranch}:${trackingRef}`], repoRoot, signal, GIT_ROUTE_TIMEOUT_MS);
         }
         catch (error) {
-            const localRef = await execGit(['rev-parse', '--verify', '--quiet', trimmedBase], repoRoot, signal)
-                .then(() => trimmedBase)
-                .catch(() => null);
-            if (!localRef)
+            if (signal.aborted)
                 throw error;
-            baseRef = localRef;
+            return {
+                available: false, workspaceRoot, repoRoot, baseBranch: trimmedBase, baseRef,
+                error: `Failed to refresh baseline ${baseRef}. Check remote access and retry. No comparison was generated from a stale local baseline.`,
+            };
         }
     }
+    // Keep the display/audit key stable, but use the full namespace for Git so
+    // a same-named local branch cannot shadow the refreshed tracking ref.
+    const baseGitRef = baseRemote ? `refs/remotes/${baseRef}` : baseRef;
+    await execGit(['rev-parse', '--verify', '--quiet', `${baseGitRef}^{commit}`], repoRoot, signal);
     let compareHead = 'HEAD';
     if (hasRequestedHead) {
         compareHead = requestedHead.includes('/') ? requestedHead : requestedHead;
@@ -2317,11 +2331,11 @@ async function getBranchDiffPayload(workspaceRoot, repoRoot, baseBranch, options
     // instead of two overlapping per-file diffs concatenated together.
     // Falls back to the concatenated form when there is no merge base.
     const mergeBase = includeWorkingTree
-        ? await execGit(['merge-base', baseRef, compareHead], repoRoot, signal)
+        ? await execGit(['merge-base', baseGitRef, compareHead], repoRoot, signal)
             .then((result) => result.trim() || null)
             .catch(() => null)
         : null;
-    const diffBase = mergeBase ?? `${baseRef}...${compareHead}`;
+    const diffBase = mergeBase ?? `${baseGitRef}...${compareHead}`;
     const fetchSeparateWorktreeDiff = includeWorkingTree && !mergeBase;
     const [currentBranch, headRef, statResult, nameResult, workingNameResult, logResult, diffResult, workingDiffResult] = await Promise.all([
         execGit(['branch', '--show-current'], repoRoot, signal).catch(emptyOnNonAbortGitError),
@@ -2329,7 +2343,7 @@ async function getBranchDiffPayload(workspaceRoot, repoRoot, baseBranch, options
         execGitLimited(['diff', diffBase, '--stat'], repoRoot, MAX_BRANCH_DIFF_STAT_BYTES, false, signal),
         execGitLimited(['diff', '--name-only', diffBase], repoRoot, MAX_BRANCH_DIFF_NAME_BYTES, false, signal),
         fetchSeparateWorktreeDiff ? execGitLimited(['diff', '--name-only', 'HEAD'], repoRoot, MAX_BRANCH_DIFF_NAME_BYTES, false, signal) : Promise.resolve({ stdout: '', truncated: false }),
-        execGitLimited(['log', `${baseRef}..${compareHead}`, '--oneline', '--no-merges'], repoRoot, MAX_BRANCH_DIFF_LOG_BYTES, false, signal),
+        execGitLimited(['log', `${baseGitRef}..${compareHead}`, '--oneline', '--no-merges'], repoRoot, MAX_BRANCH_DIFF_LOG_BYTES, false, signal),
         execGitLimited(['diff', diffBase], repoRoot, MAX_BRANCH_DIFF_BYTES, false, signal),
         fetchSeparateWorktreeDiff ? execGitLimited(['diff', 'HEAD'], repoRoot, MAX_BRANCH_DIFF_BYTES, false, signal) : Promise.resolve({ stdout: '', truncated: false }),
     ]);
@@ -2347,7 +2361,7 @@ async function getBranchDiffPayload(workspaceRoot, repoRoot, baseBranch, options
         ...workingNameResult.stdout.split('\n').map((line) => line.trim()).filter(Boolean),
         ...untrackedResult.files,
     ]));
-    const hunks = await annotateBranchDiffHunks(repoRoot, baseRef, parseBranchDiffHunks(diff), signal);
+    const hunks = await annotateBranchDiffHunks(repoRoot, baseGitRef, parseBranchDiffHunks(diff), signal);
     const commits = logResult.stdout.split('\n').map((line) => line.trim()).filter(Boolean);
     const fingerprint = buildChangeAuditFingerprint([
         repoRoot,

package/dist/server/routes/onboarding.js

@@ -1,112 +1,13 @@
 import express from 'express';
 import fs from 'fs';
-import QRCode from 'qrcode';
 import { localAccessManager } from '../utils/localAccess.js';
 function sendCaCertificate(res, caCertPath) {
     res.setHeader('Content-Type', 'application/x-x509-ca-cert');
     res.setHeader('Content-Disposition', 'attachment; filename="rootCA.pem"');
     res.send(fs.readFileSync(caCertPath));
 }
-function escapeHtml(value) {
-    return value
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#39;');
-}
-function createQrCards(items) {
-    return items.map((item) => `
-      <div class="qr-card">
-        ${item.qr ? `<div class="qr"><img src="${item.qr}" alt="QR code for ${escapeHtml(item.url)}" /></div>` : ''}
-        <div>
-          <div class="label">${escapeHtml(item.label)} · ${escapeHtml(item.address)}</div>
-          <code>${escapeHtml(item.url)}</code>
-        </div>
-      </div>`).join('');
-}
-function createPage(caAvailable, qrItems, targetUrl) {
-    const state = localAccessManager.getState();
-    const url = escapeHtml(targetUrl ?? state.url);
-    const fallbackUrl = escapeHtml(state.fallbackUrl);
-    const status = escapeHtml(state.status);
-    const reason = state.reason ? escapeHtml(state.reason) : '';
-    const caButton = caAvailable
-        ? '<a class="button" href="/onboarding/ca.crt">Download CA certificate</a>'
-        : '<div class="warn">CA file is not configured. Start Termdock with --https-ca &lt;path&gt; to enable certificate download.</div>';
-    return `<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>Termdock Local Access</title>
-  <style>
-    body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; background: #100F0F; color: #CECDC3; }
-    main { max-width: 720px; margin: 0 auto; padding: 32px 20px 48px; }
-    .card { border: 1px solid rgba(255,255,255,.12); border-radius: 20px; background: rgba(255,255,255,.05); padding: 20px; }
-    h1 { font-size: 28px; margin: 0 0 8px; }
-    h2 { font-size: 18px; margin: 24px 0 8px; }
-    p, li { color: rgba(255,255,255,.78); line-height: 1.6; }
-    code { word-break: break-all; color: #4385BE; }
-    .button { display: inline-flex; margin: 12px 0; padding: 12px 16px; border-radius: 999px; background: #879A39; color: #100F0F; font-weight: 700; text-decoration: none; }
-    .warn { margin: 12px 0; padding: 12px; border-radius: 12px; background: rgba(208, 162, 21, .15); color: #D0A215; }
-    .muted { color: rgba(255,255,255,.55); font-size: 13px; }
-    .qr { display: inline-block; margin: 12px 0; padding: 10px; border-radius: 16px; background: #fff; }
-    .qr img { display: block; width: 160px; height: 160px; }
-    .qr-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(220px, 1fr)); gap: 14px; margin: 14px 0; }
-    .qr-card { border: 1px solid rgba(255,255,255,.1); border-radius: 16px; padding: 12px; background: rgba(255,255,255,.04); }
-    .label { margin: 4px 0 6px; font-weight: 700; color: rgba(255,255,255,.86); }
-  </style>
-</head>
-<body>
-  <main>
-    <div class="card">
-      <h1>Termdock Local Access</h1>
-      <p>Scan one of these QR codes to open an IP fallback address on your phone:</p>
-      <div class="qr-grid">${createQrCards(qrItems)}</div>
-      <p>Install the local CA on your phone first, then open:</p>
-      <p><code>${url}</code></p>
-      <p class="muted">If mDNS does not resolve on your Wi‑Fi, use this IP fallback after installing the CA: <code>${fallbackUrl}</code></p>
-      <p class="muted">Status: ${status}${reason ? ` · ${reason}` : ''}</p>
-      ${caButton}
-      <p class="muted">Short link: <code>/ca</code> (same certificate download)</p>
-      <h2>iPhone / iPad</h2>
-      <ol>
-        <li>Tap “Download CA certificate”.</li>
-        <li>Open Settings and install the downloaded profile.</li>
-        <li>Go to Settings → General → About → Certificate Trust Settings, then fully trust the CA.</li>
-        <li>Return to <code>${url}</code>.</li>
-      </ol>
-      <h2>Android</h2>
-      <ol>
-        <li>Tap “Download CA certificate”.</li>
-        <li>Install it as a CA certificate from system security settings.</li>
-        <li>Return to <code>${url}</code>.</li>
-      </ol>
-    </div>
-  </main>
-</body>
-</html>`;
-}
 export function createOnboardingRouter(options = {}) {
     const router = express.Router();
-    router.get('/', async (_req, res) => {
-        const caAvailable = Boolean(options.caCertPath && fs.existsSync(options.caCertPath));
-        const state = localAccessManager.getState();
-        const targetUrl = state.hostname
-            ? `${state.httpsEnabled ? 'https' : 'http'}://${state.hostname}:${options.port ?? 9834}`
-            : state.url;
-        const qrItems = await Promise.all(state.interfaces.map(async (entry) => {
-            const url = `${state.httpsEnabled ? 'https' : 'http'}://${entry.address}:${options.port ?? 9834}`;
-            const qr = await QRCode.toDataURL(url, {
-                margin: 1,
-                width: 160,
-                errorCorrectionLevel: 'M',
-            }).catch(() => null);
-            return { label: `${entry.label} (${entry.name})`, address: entry.address, url, qr };
-        }));
-        res.type('html').send(createPage(caAvailable, qrItems, targetUrl));
-    });
     router.get('/status', (_req, res) => {
         const state = localAccessManager.getState();
         res.json({

package/dist/server/utils/localAccess.js

@@ -58,7 +58,7 @@ function buildState(setting, options, status, reason) {
         fallbackHostname,
         url: `${options.scheme}://${hostname}:${options.port}`,
         fallbackUrl: `${options.scheme}://${fallbackHostname}:${options.port}`,
-        onboardingUrl: onboardingHost ? `http://${onboardingHost}:${options.onboardingPort ?? options.port}/onboarding` : null,
+        onboardingUrl: onboardingHost ? `http://${onboardingHost}:${options.onboardingPort ?? options.port}/ca` : null,
         status,
         reason,
         httpsEnabled: options.scheme === 'https',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.266",
+  "version": "1.4.268",
   "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.266",
+  "version": "1.4.268",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-K4KyYJuVoQDpZsBM8ZX1Rw3MddOxAzVdp/cPm0iGZz0=",
-  "serverBundleHash": "sha256-OzEmGLQ2089pXmDouFuQcJQt6ZHuQfArddq3xlvkjrU=",
-  "clientBundleHash": "sha256-SM1viL4lDEGX0IJs/ltbippjKurPa5ahbqiu8hL2BcQ=",
+  "serverBundleHash": "sha256-5s4aavmMB1RPNhkzWZM9dGKt9Uys6E0bSvz6Qk5lhJc=",
+  "clientBundleHash": "sha256-UyN8TKeB+T8JHqNVB42eXm1EprZNw/7bvxOx7aS9AC4=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }

package/scripts/android-bitrate/CaptureReset.java

@@ -0,0 +1,86 @@
+// Based on scrcpy 3.3.4 CaptureReset, Copyright Genymobile.
+// SPDX-License-Identifier: Apache-2.0
+// Termdock addition: a separate, session-scoped bitrate control socket.
+package com.genymobile.scrcpy.video;
+
+import android.media.MediaCodec;
+import android.net.LocalSocket;
+import android.net.LocalSocketAddress;
+import android.os.Bundle;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class CaptureReset implements SurfaceCapture.CaptureListener {
+    private final AtomicBoolean reset = new AtomicBoolean();
+    private MediaCodec runningMediaCodec;
+    private int bitrate;
+    private boolean started;
+
+    public boolean consumeReset() { return reset.getAndSet(false); }
+
+    public synchronized void reset() {
+        reset.set(true);
+        if (runningMediaCodec != null) {
+            try { runningMediaCodec.signalEndOfInputStream(); }
+            catch (IllegalStateException ignored) { }
+        }
+    }
+
+    public synchronized void setRunningMediaCodec(MediaCodec codec) {
+        runningMediaCodec = codec;
+        // Reapply after an actual rotation/reset, without causing one ourselves.
+        if (codec != null && bitrate > 0) applyBitrate(bitrate);
+        String name = System.getProperty("termdock.bitrate");
+        if (codec != null && !started && name != null) {
+            started = true;
+            Thread thread = new Thread(() -> serve(name), "termdock-bitrate");
+            thread.setDaemon(true);
+            thread.start();
+        }
+    }
+
+    private synchronized String applyBitrate(int value) {
+        if (runningMediaCodec == null) return "Encoder temporarily unavailable during reset";
+        if (value < 300000 || value > 30000000) return "Bitrate outside supported request range";
+        try {
+            Bundle params = new Bundle();
+            params.putInt(MediaCodec.PARAMETER_KEY_VIDEO_BITRATE, value);
+            runningMediaCodec.setParameters(params);
+            bitrate = value;
+            return null;
+        } catch (IllegalArgumentException | IllegalStateException error) {
+            String diagnostic = error instanceof MediaCodec.CodecException
+                    ? ((MediaCodec.CodecException) error).getDiagnosticInfo() : error.getClass().getSimpleName();
+            return diagnostic + ": " + error.getMessage();
+        }
+    }
+
+    private void serve(String name) {
+        try (LocalSocket socket = new LocalSocket()) {
+            socket.connect(new LocalSocketAddress(name));
+            DataInputStream input = new DataInputStream(socket.getInputStream());
+            DataOutputStream output = new DataOutputStream(socket.getOutputStream());
+            output.writeInt(0x54444232); // TDB2: rejection includes length-prefixed UTF-8 diagnostic
+            output.flush();
+            while (true) {
+                int requested = input.readInt();
+                String failure = applyBitrate(requested);
+                output.writeInt(failure == null ? requested : 0);
+                if (failure != null) {
+                    byte[] detail = failure.substring(0, Math.min(512, failure.length())).getBytes(StandardCharsets.UTF_8);
+                    output.writeInt(detail.length);
+                    output.write(detail);
+                }
+                output.flush();
+            }
+        } catch (IOException ignored) {
+            // A bitrate-channel failure must never tear down video/control.
+        }
+    }
+
+    @Override
+    public void onInvalidated() { reset(); }
+}