yetangitu/ya-webadb
1
0
Fork 0
mirror of https://github.com/yume-chan/ya-webadb.git synced 2025-10-04 10:19:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(adb): handle old response of reverse:forward:<local>;<remote> command before Android 8

Browse source 
ref #410
This commit is contained in:
Simon Chan 2022-05-01 08:16:40 +08:00
parent d0a8257a2d
commit 919baa7992
No known key found for this signature in database
GPG key ID: A8B69F750B9BCEDD
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libraries/adb/src/commands/reverse.ts
View file

@ -4,7 +4,7 @@ import { AutoDisposable } from '@yume-chan/event';
import Struct from '@yume-chan/struct';
import type { Adb } from "../adb.js";
import type { AdbIncomingSocketHandler, AdbSocket } from '../socket/index.js';
import { AdbBufferedStream } from '../stream/index.js';
import { AdbBufferedStream, BufferedStreamEndedError } from '../stream/index.js';
import { decodeUtf8 } from "../utils/index.js";
export interface AdbForwardListener {
@ -90,10 +90,25 @@ export class AdbReverseCommand extends AutoDisposable {
const stream = await this.sendRequest(`reverse:forward:${deviceAddress};tcp:${localPort}`);
// `tcp:0` tells the device to pick an available port.
// However, device will response with the selected port for all `tcp:` requests.
// Begin with Android 8, device will respond with the selected port for all `tcp:` requests.
if (deviceAddress.startsWith('tcp:')) {
const response = await AdbReverseStringResponse.deserialize(stream);
deviceAddress = `tcp:${Number.parseInt(response.content!, 10)}`;
let length: number | undefined;
try {
length = Number.parseInt(decodeUtf8(await stream.read(4)), 16);
} catch (e) {
if (!(e instanceof BufferedStreamEndedError)) {
throw e;
}
// Device before Android 8 doesn't have this response.
// (the stream is closed now)
// Can be safely ignored.
}
if (length !== undefined) {
const port = decodeUtf8(await stream.read(length!));
deviceAddress = `tcp:${Number.parseInt(port, 10)}`;
}
}
this.localPortToHandler.set(localPort, handler);