termdock 1.4.335 → 1.4.336

package/dist/server/android/liveBitrate.js

@@ -4,7 +4,7 @@ import net from 'node:net';
 import { fileURLToPath } from 'node:url';
 // The overlay implements a private scrcpy ABI: never load it into an unverified server.
 const SUPPORTED_SERVER_SHA256 = '8588238c9a5a00aa542906b6ec7e6d5541d9ffb9b5d0f6e1bc0e365e2303079e';
-const OVERLAY_SHA256 = '19eee1787a564bd2996a6443613aaa4700185838d4e42fe59d1d08ca6b12e828';
+const OVERLAY_SHA256 = 'f8eb6275ed255eba00c53146e874d22fe1e5766a466ba03d42a3b07df4f99d63';
 export const bitrateOverlayPath = fileURLToPath(new URL('../../../scripts/android-bitrate/bitrate.jar', import.meta.url));
 export const bitrateOverlayRemote = '/data/local/tmp/termdock-bitrate-' + OVERLAY_SHA256.slice(0, 16) + '.jar';
 export const bundledPreviewServerPath = fileURLToPath(new URL('../../../scripts/android-bitrate/scrcpy-server-v3.3.4', import.meta.url));
@@ -57,6 +57,8 @@ export class LiveBitrateChannel {
     onReady;
     server = net.createServer(socket => this.accept(socket));
     socket = null;
+    forwardPort = null;
+    retryTimer = null;
     buffer = Buffer.alloc(0);
     ready = false;
     diagnosticProtocol = false;
@@ -72,9 +74,26 @@ export class LiveBitrateChannel {
             this.server.once('error', reject);
             this.server.listen(0, '127.0.0.1', resolve);
         });
-        this.handshakeTimer = setTimeout(() => this.close('BITRATE_HANDSHAKE_TIMEOUT: no extension handshake within 15s'), 15000);
+        this.startHandshakeTimeout();
         return this.server.address().port;
     }
+    connectForward(port) {
+        if (this.closed)
+            return;
+        if (!Number.isInteger(port) || port < 1 || port > 65535)
+            throw new Error('BITRATE_FORWARD_INVALID_PORT');
+        this.forwardPort = port;
+        this.startHandshakeTimeout();
+        this.dialForward();
+    }
+    startHandshakeTimeout() {
+        this.handshakeTimer = setTimeout(() => this.close('BITRATE_HANDSHAKE_TIMEOUT: no extension handshake within 15s'), 15000);
+    }
+    dialForward() {
+        this.retryTimer = null;
+        if (!this.closed && this.forwardPort !== null)
+            this.accept(net.connect({ host: '127.0.0.1', port: this.forwardPort }));
+    }
     accept(socket) {
         if (this.socket || this.closed) {
             socket.destroy();
@@ -82,9 +101,24 @@ export class LiveBitrateChannel {
         }
         this.socket = socket;
         socket.setNoDelay(true);
-        socket.on('error', error => this.close(`BITRATE_CHANNEL_ERROR: ${error.message}`));
-        socket.on('close', () => this.close('BITRATE_CHANNEL_CLOSED: device closed the bitrate channel'));
+        const disconnected = (detail) => {
+            if (this.socket !== socket || this.closed)
+                return;
+            if (this.forwardPort !== null && !this.ready) {
+                // ADB may accept TCP before the device-side abstract socket is listening.
+                this.socket = null;
+                this.buffer = Buffer.alloc(0);
+                socket.destroy();
+                this.retryTimer = setTimeout(() => this.dialForward(), 100);
+            }
+            else
+                this.close(detail);
+        };
+        socket.on('error', error => disconnected(`BITRATE_CHANNEL_ERROR: ${error.message}`));
+        socket.on('close', () => disconnected('BITRATE_CHANNEL_CLOSED: device closed the bitrate channel'));
         socket.on('data', chunk => {
+            if (this.socket !== socket || this.closed)
+                return;
             this.buffer = Buffer.concat([this.buffer, chunk]);
             while (this.buffer.length >= 4 && !this.closed) {
                 const value = this.buffer.readUInt32BE();
@@ -148,6 +182,8 @@ export class LiveBitrateChannel {
         this.lastFailure = detail;
         if (this.handshakeTimer)
             clearTimeout(this.handshakeTimer);
+        if (this.retryTimer)
+            clearTimeout(this.retryTimer);
         if (this.pending) {
             clearTimeout(this.pending.timer);
             this.pending.resolve(false);

package/dist/server/android/scrcpy.js

@@ -135,6 +135,7 @@ export class ScrcpySession {
     // Network ADB can acknowledge reverse rules without carrying their data.
     tunnelForward;
     forwardPort = 0;
+    bitrateForwardPort = 0;
     connectionAbort = new AbortController();
     scid = randomInt(1, 0x7fffffff);
     bitrateChannel = null;
@@ -217,11 +218,19 @@ export class ScrcpySession {
             if (!bitrateFailure) {
                 try {
                     this.bitrateChannel = new LiveBitrateChannel(reportBitrate);
-                    const port = await this.bitrateChannel.listen();
+                    const port = this.tunnelForward ? 0 : 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}`]);
+                    if (this.tunnelForward) {
+                        const assigned = Number(await runAdbCapture(['-s', this.serial, 'forward', 'tcp:0', `localabstract:termdock_bitrate_${scidHex(this.scid)}`]));
+                        if (!Number.isInteger(assigned) || assigned < 1 || assigned > 65535)
+                            throw new Error('BITRATE_FORWARD_INVALID_PORT');
+                        this.bitrateForwardPort = assigned;
+                    }
+                    else {
+                        await runAdbCapture(['-s', this.serial, 'reverse', `localabstract:termdock_bitrate_${scidHex(this.scid)}`, `tcp:${port}`]);
+                    }
                     liveBitrate = true;
                 }
                 catch (error) {
@@ -242,7 +251,7 @@ export class ScrcpySession {
             const args = [
                 '-s', this.serial, 'shell',
                 `CLASSPATH=${liveBitrate ? bitrateOverlayRemote + ":" : ""}${remoteJar}`,
-                'app_process', ...(liveBitrate ? [`-Dtermdock.bitrate=termdock_bitrate_${scidHex(this.scid)}`] : []), '/',
+                'app_process', ...(liveBitrate ? [`-Dtermdock.bitrate=termdock_bitrate_${scidHex(this.scid)}`, ...(this.tunnelForward ? ['-Dtermdock.bitrateForward=true'] : [])] : []), '/',
                 'com.genymobile.scrcpy.Server', version,
                 `scid=${this.scid.toString(16)}`,
                 'log_level=info',
@@ -262,6 +271,8 @@ export class ScrcpySession {
             void headerReady.catch(() => { });
             const child = spawn(adbBinary(), args, { stdio: ['ignore', 'pipe', 'pipe'], env: { ...process.env, PATH: adbSearchPath() } });
             this.child = child;
+            if (liveBitrate && this.tunnelForward)
+                this.bitrateChannel?.connectForward(this.bitrateForwardPort);
             child.stdout?.on('data', chunk => this.log(String(chunk).replace(/^\[server\]\s*/, '')));
             child.stderr?.on('data', chunk => this.log(String(chunk)));
             child.on('error', error => this.fail(error instanceof Error ? error : new Error('SCRCPY_SPAWN_FAILED')));
@@ -444,9 +455,10 @@ export class ScrcpySession {
         return this.bitrateChannel?.setBitrate(value) ?? Promise.resolve(false);
     }
     async removeForward() {
-        const port = this.forwardPort;
+        const ports = [this.forwardPort, this.bitrateForwardPort].filter(port => port > 0);
         this.forwardPort = 0;
-        if (port) {
+        this.bitrateForwardPort = 0;
+        for (const port of ports) {
             try {
                 await runAdbCapture(['-s', this.serial, 'forward', '--remove', `tcp:${port}`], 8000);
             }

package/package.json

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

package/runtime-manifest.json

@@ -1,12 +1,12 @@
 {
   "schemaVersion": 1,
   "packageName": "termdock",
-  "version": "1.4.335",
+  "version": "1.4.336",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-oaGYi/P5ob8sd6VnNBOwshKozjhdV+hYiCmLAsn5x00=",
-  "serverBundleHash": "sha256-oP7hnH+0kNAIOiaQqS+7gVZR8blwiKXULzIZ8eQYCOE=",
+  "serverBundleHash": "sha256-KvJEGINN1M45Zs/oNpJTb+vlpFCr0C8rKqS2Flp7+tI=",
   "clientBundleHash": "sha256-5AO8soGCDDxFlZjr8zTeNxVLFL4bw+MXYLTu2kdyLs0=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"

package/scripts/android-bitrate/CaptureReset.java

@@ -5,6 +5,7 @@ package com.genymobile.scrcpy.video;
 
 import android.media.MediaCodec;
 import android.net.LocalSocket;
+import android.net.LocalServerSocket;
 import android.net.LocalSocketAddress;
 import android.os.Bundle;
 import java.io.DataInputStream;
@@ -59,28 +60,41 @@ public class CaptureReset implements SurfaceCapture.CaptureListener {
     }
 
     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);
+        try {
+            if (Boolean.getBoolean("termdock.bitrateForward")) {
+                try (LocalServerSocket server = new LocalServerSocket(name);
+                     LocalSocket socket = server.accept()) {
+                    exchange(socket);
+                }
+            } else {
+                try (LocalSocket socket = new LocalSocket()) {
+                    socket.connect(new LocalSocketAddress(name));
+                    exchange(socket);
                 }
-                output.flush();
             }
         } catch (IOException ignored) {
             // A bitrate-channel failure must never tear down video/control.
         }
     }
 
+    private void exchange(LocalSocket socket) throws IOException {
+        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();
+        }
+    }
+
     @Override
     public void onInvalidated() { reset(); }
 }

package/scripts/android-bitrate/README.md

@@ -1,10 +1,10 @@
 # scrcpy live bitrate extension
 
-Termdock loads this 3 KB Android DEX overlay before the bundled, verified scrcpy 3.3.4 server
+Termdock loads this small Android DEX overlay before the bundled, verified scrcpy 3.3.4 server
 for preview sessions only. The host scrcpy version no longer gates automatic quality. Recording uses the unmodified scrcpy executable/server.
 
 CaptureReset.java preserves scrcpy 3.3.4's existing ABI and reset behavior,
-adding a session-scoped ADB reverse socket. The running hardware encoder receives
+adding a session-scoped ADB socket. The running hardware encoder receives
 MediaCodec.PARAMETER_KEY_VIDEO_BITRATE via setParameters, under the same lock
 used to clear the codec before stop/reset. There is no transcoding, frame polling,
 forced keyframe, video reset, resolution change or new video connection.
@@ -30,9 +30,11 @@ quality with a diagnostic. Rejections and channel failures also preserve video.
 Network ADB preview sessions use `adb forward` for video and control; USB
 sessions retain `adb reverse`. The forward connector waits for the scrcpy dummy
 byte before opening control and removes only its own allocated TCP rule on stop.
-The optional bitrate channel still uses a separate reverse rule. If reverse rules
-register but carry no data, its handshake times out with a diagnostic; preview
-continues at the configured bitrate.
+The optional bitrate channel uses its own forward rule for network devices; its
+device-side listener accepts the host connection after the encoder starts. USB
+retains its separate reverse rule. Early forward TCP accepts are retried until
+the TDB handshake arrives, within the existing 15-second limit. Bitrate failures
+remain isolated from video/control, and stop removes both session-owned rules.
 
 Extend the allowlist only after verifying the CaptureReset ABI and real-device
 behavior. No global scrcpy installation is modified.
@@ -52,13 +54,17 @@ configuration packet.
 
 Mac server and iPhone preview rendering were also verified with network
 PTP-AN00 / Android 16 and Pixel 9 / Android 15 using forward video. On those cloud
-routes, reverse registration succeeded without carrying data: bitrate handshakes
-timed out while preview stayed alive. Physical identity properties matched across
+routes, reverse registration succeeded without carrying data; this motivated
+using forward for both video and the separate bitrate channel. Physical identity properties matched across
 the PTP IPv4/IPv6 routes; option grouping and selected-route preservation are
-covered by tests. These observations do not establish live bitrate support on
-those devices or full native input/recording acceptance.
+covered by tests. Full native input/recording acceptance remains outside these observations.
+The Pixel 9 forward bitrate channel was verified on the Mac server: all four
+1.8 → 6 → 0.9 → 4 Mbps requests received matching ACKs in 35–37 ms, with one
+video header and the same scrcpy process throughout a 20-second session. Both
+forward rules were removed on stop. API acceptance does not establish exact
+vendor output bandwidth.
 
-Diagnostics distinguish version/build, missing/corrupt extension, ADB push/reverse,
+Diagnostics distinguish version/build, missing/corrupt extension, ADB push/tunnel,
 15s handshake timeout, 2.5s device ACK timeout, 4s client confirmation timeout,
 channel/protocol failure and device codec rejection. Detailed reasons travel over
 the existing encrypted stream and appear in an expandable warning. Intentional