@yume-chan/adb 0.0.22 → 0.0.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.json +18 -0
- package/CHANGELOG.md +10 -1
- package/esm/adb.d.ts +4 -1
- package/esm/adb.d.ts.map +1 -1
- package/esm/adb.js +9 -2
- package/esm/adb.js.map +1 -1
- package/esm/banner.d.ts.map +1 -1
- package/esm/banner.js +1 -0
- package/esm/banner.js.map +1 -1
- package/esm/commands/reverse.js +1 -1
- package/esm/commands/reverse.js.map +1 -1
- package/esm/commands/subprocess/protocols/shell.d.ts.map +1 -1
- package/esm/commands/subprocess/protocols/shell.js +15 -69
- package/esm/commands/subprocess/protocols/shell.js.map +1 -1
- package/esm/commands/subprocess/utils.js +1 -1
- package/esm/commands/subprocess/utils.js.map +1 -1
- package/esm/commands/sync/sync.d.ts.map +1 -1
- package/esm/commands/sync/sync.js +5 -6
- package/esm/commands/sync/sync.js.map +1 -1
- package/esm/daemon/dispatcher.d.ts +7 -0
- package/esm/daemon/dispatcher.d.ts.map +1 -1
- package/esm/daemon/dispatcher.js +57 -12
- package/esm/daemon/dispatcher.js.map +1 -1
- package/esm/daemon/socket.d.ts +1 -1
- package/esm/daemon/socket.d.ts.map +1 -1
- package/esm/daemon/socket.js +36 -8
- package/esm/daemon/socket.js.map +1 -1
- package/esm/daemon/transport.d.ts +26 -2
- package/esm/daemon/transport.d.ts.map +1 -1
- package/esm/daemon/transport.js +53 -25
- package/esm/daemon/transport.js.map +1 -1
- package/esm/features.d.ts +2 -1
- package/esm/features.d.ts.map +1 -1
- package/esm/features.js +2 -1
- package/esm/features.js.map +1 -1
- package/esm/server/client.d.ts +2 -0
- package/esm/server/client.d.ts.map +1 -1
- package/esm/server/client.js +82 -50
- package/esm/server/client.js.map +1 -1
- package/esm/server/transport.d.ts +3 -0
- package/esm/server/transport.d.ts.map +1 -1
- package/esm/server/transport.js +26 -0
- package/esm/server/transport.js.map +1 -1
- package/package.json +13 -13
- package/src/adb.ts +15 -2
- package/src/banner.ts +1 -0
- package/src/commands/reverse.ts +2 -2
- package/src/commands/subprocess/protocols/shell.ts +22 -97
- package/src/commands/subprocess/utils.ts +1 -1
- package/src/commands/sync/sync.ts +5 -6
- package/src/daemon/dispatcher.ts +90 -14
- package/src/daemon/socket.ts +47 -16
- package/src/daemon/transport.ts +82 -24
- package/src/features.ts +2 -1
- package/src/server/client.ts +87 -51
- package/src/server/transport.ts +28 -0
- package/tsconfig.build.tsbuildinfo +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/daemon/socket.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/daemon/socket.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAER,UAAU,EAEV,cAAc,EACd,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAG3D,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kCACb,SAAQ,mBAAmB;IAC3B,UAAU,EAAE,mBAAmB,CAAC;IAEhC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC;AAED,qBAAa,yBACT,YAAW,mBAAmB,EAAE,SAAS,EAAE,UAAU;;IAIrD,QAAQ,CAAC,OAAO,EAAG,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAG,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAG,OAAO,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAG,MAAM,CAAC;IAI1B,IAAI,QAAQ,+BAEX;IAGD,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IAK1D,IAAI,MAAM,kBAET;IAGD,IAAI,MAAM,oBAET;gBAaW,OAAO,EAAE,kCAAkC;IA4DjD,OAAO,CAAC,IAAI,EAAE,UAAU;IAiBvB,GAAG,CAAC,KAAK,EAAE,MAAM;IAKlB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB5B,OAAO;CASV;AAED;;;;;;;GAOG;AACH,qBAAa,eAAgB,YAAW,mBAAmB,EAAE,SAAS;;IAGlE,IAAI,OAAO,IAAI,MAAM,CAEpB;IACD,IAAI,QAAQ,IAAI,MAAM,CAErB;IACD,IAAI,YAAY,IAAI,OAAO,CAE1B;IACD,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,QAAQ,IAAI,cAAc,CAAC,UAAU,CAAC,CAEzC;IACD,IAAI,QAAQ,IAAI,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAErD;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1B;gBAEW,UAAU,EAAE,yBAAyB;IAIjD,KAAK;CAGR"}
|
package/esm/daemon/socket.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { PromiseResolver } from "@yume-chan/async";
|
|
2
2
|
import { ConsumableWritableStream, PushReadableStream, } from "@yume-chan/stream-extra";
|
|
3
|
-
import { raceSignal } from "../server/index.js";
|
|
4
3
|
import { AdbCommand } from "./packet.js";
|
|
5
4
|
export class AdbDaemonSocketController {
|
|
6
5
|
#dispatcher;
|
|
@@ -13,7 +12,6 @@ export class AdbDaemonSocketController {
|
|
|
13
12
|
get readable() {
|
|
14
13
|
return this.#readable;
|
|
15
14
|
}
|
|
16
|
-
#writePromise;
|
|
17
15
|
#writableController;
|
|
18
16
|
writable;
|
|
19
17
|
#closed = false;
|
|
@@ -25,6 +23,16 @@ export class AdbDaemonSocketController {
|
|
|
25
23
|
get socket() {
|
|
26
24
|
return this.#socket;
|
|
27
25
|
}
|
|
26
|
+
#availableWriteBytesChanged;
|
|
27
|
+
/**
|
|
28
|
+
* When delayed ack is disabled, can be `Infinity` if the socket is ready to write.
|
|
29
|
+
* Exactly one packet can be written no matter how large it is. Or `-1` if the socket
|
|
30
|
+
* is waiting for ack.
|
|
31
|
+
*
|
|
32
|
+
* When delayed ack is enabled, a non-negative finite number indicates the number of
|
|
33
|
+
* bytes that can be written to the socket before receiving an ack.
|
|
34
|
+
*/
|
|
35
|
+
#availableWriteBytes = 0;
|
|
28
36
|
constructor(options) {
|
|
29
37
|
this.#dispatcher = options.dispatcher;
|
|
30
38
|
this.localId = options.localId;
|
|
@@ -42,15 +50,33 @@ export class AdbDaemonSocketController {
|
|
|
42
50
|
const size = data.length;
|
|
43
51
|
const chunkSize = this.#dispatcher.options.maxPayloadSize;
|
|
44
52
|
for (let start = 0, end = chunkSize; start < size; start = end, end += chunkSize) {
|
|
45
|
-
|
|
46
|
-
await this.#
|
|
47
|
-
// Wait for ack packet
|
|
48
|
-
await raceSignal(() => this.#writePromise.promise, controller.signal);
|
|
53
|
+
const chunk = data.subarray(start, end);
|
|
54
|
+
await this.#writeChunk(chunk, controller.signal);
|
|
49
55
|
}
|
|
50
56
|
},
|
|
51
57
|
});
|
|
52
58
|
this.#socket = new AdbDaemonSocket(this);
|
|
53
59
|
}
|
|
60
|
+
async #writeChunk(data, signal) {
|
|
61
|
+
const length = data.byteLength;
|
|
62
|
+
while (this.#availableWriteBytes < length) {
|
|
63
|
+
// Only one lock is required because Web Streams API guarantees
|
|
64
|
+
// that `write` is not reentrant.
|
|
65
|
+
const resolver = new PromiseResolver();
|
|
66
|
+
signal.addEventListener("abort", () => {
|
|
67
|
+
resolver.reject(signal.reason);
|
|
68
|
+
});
|
|
69
|
+
this.#availableWriteBytesChanged = resolver;
|
|
70
|
+
await resolver.promise;
|
|
71
|
+
}
|
|
72
|
+
if (this.#availableWriteBytes === Infinity) {
|
|
73
|
+
this.#availableWriteBytes = -1;
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
this.#availableWriteBytes -= length;
|
|
77
|
+
}
|
|
78
|
+
await this.#dispatcher.sendPacket(AdbCommand.Write, this.localId, this.remoteId, data);
|
|
79
|
+
}
|
|
54
80
|
async enqueue(data) {
|
|
55
81
|
// Consumers can `cancel` the `readable` if they are not interested in future data.
|
|
56
82
|
// Throw away the data if that happens.
|
|
@@ -67,14 +93,16 @@ export class AdbDaemonSocketController {
|
|
|
67
93
|
throw e;
|
|
68
94
|
}
|
|
69
95
|
}
|
|
70
|
-
ack() {
|
|
71
|
-
this.#
|
|
96
|
+
ack(bytes) {
|
|
97
|
+
this.#availableWriteBytes += bytes;
|
|
98
|
+
this.#availableWriteBytesChanged?.resolve();
|
|
72
99
|
}
|
|
73
100
|
async close() {
|
|
74
101
|
if (this.#closed) {
|
|
75
102
|
return;
|
|
76
103
|
}
|
|
77
104
|
this.#closed = true;
|
|
105
|
+
this.#availableWriteBytesChanged?.reject(new Error("Socket closed"));
|
|
78
106
|
try {
|
|
79
107
|
this.#writableController.error(new Error("Socket closed"));
|
|
80
108
|
}
|
package/esm/daemon/socket.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../src/daemon/socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../src/daemon/socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,15 +2,28 @@ import type { Consumable, ReadableWritablePair } from "@yume-chan/stream-extra";
|
|
|
2
2
|
import type { ValueOrPromise } from "@yume-chan/struct";
|
|
3
3
|
import type { AdbIncomingSocketHandler, AdbSocket, AdbTransport } from "../adb.js";
|
|
4
4
|
import { AdbBanner } from "../banner.js";
|
|
5
|
+
import { AdbFeature } from "../features.js";
|
|
5
6
|
import type { AdbAuthenticator, AdbCredentialStore } from "./auth.js";
|
|
6
7
|
import type { AdbPacketData, AdbPacketInit } from "./packet.js";
|
|
7
8
|
export declare const ADB_DAEMON_VERSION_OMIT_CHECKSUM = 16777217;
|
|
9
|
+
export declare const ADB_DAEMON_DEFAULT_FEATURES: AdbFeature[];
|
|
10
|
+
export declare const ADB_DAEMON_DEFAULT_INITIAL_PAYLOAD_SIZE: number;
|
|
8
11
|
export type AdbDaemonConnection = ReadableWritablePair<AdbPacketData, Consumable<AdbPacketInit>>;
|
|
9
12
|
interface AdbDaemonAuthenticationOptions {
|
|
10
13
|
serial: string;
|
|
11
14
|
connection: AdbDaemonConnection;
|
|
12
15
|
credentialStore: AdbCredentialStore;
|
|
13
16
|
authenticators?: AdbAuthenticator[];
|
|
17
|
+
features?: readonly AdbFeature[];
|
|
18
|
+
/**
|
|
19
|
+
* The number of bytes the device can send before receiving an ack packet.
|
|
20
|
+
*
|
|
21
|
+
* Set to 0 or any negative value to disable delayed ack in handshake.
|
|
22
|
+
* Otherwise the value must be in the range of unsigned 32-bit integer.
|
|
23
|
+
*
|
|
24
|
+
* Delayed ack requires Android 14, this option is ignored on older versions.
|
|
25
|
+
*/
|
|
26
|
+
initialDelayedAckBytes?: number;
|
|
14
27
|
/**
|
|
15
28
|
* Whether to preserve the connection open after the `AdbDaemonTransport` is closed.
|
|
16
29
|
*/
|
|
@@ -23,6 +36,16 @@ interface AdbDaemonSocketConnectorConstructionOptions {
|
|
|
23
36
|
version: number;
|
|
24
37
|
maxPayloadSize: number;
|
|
25
38
|
banner: string;
|
|
39
|
+
features?: readonly AdbFeature[];
|
|
40
|
+
/**
|
|
41
|
+
* The number of bytes the device can send before receiving an ack packet.
|
|
42
|
+
*
|
|
43
|
+
* Set to 0 or any negative value to disable delayed ack in handshake.
|
|
44
|
+
* Otherwise the value must be in the range of unsigned 32-bit integer.
|
|
45
|
+
*
|
|
46
|
+
* Delayed ack requires Android 14, this option is ignored on older versions.
|
|
47
|
+
*/
|
|
48
|
+
initialDelayedAckBytes?: number;
|
|
26
49
|
/**
|
|
27
50
|
* Whether to preserve the connection open after the `AdbDaemonTransport` is closed.
|
|
28
51
|
*/
|
|
@@ -39,14 +62,15 @@ export declare class AdbDaemonTransport implements AdbTransport {
|
|
|
39
62
|
* on the same connection. Because every time the device receives a `CNXN` packet,
|
|
40
63
|
* it resets all internal state, and starts a new authentication process.
|
|
41
64
|
*/
|
|
42
|
-
static authenticate({ serial, connection, credentialStore, authenticators, ...options }: AdbDaemonAuthenticationOptions): Promise<AdbDaemonTransport>;
|
|
65
|
+
static authenticate({ serial, connection, credentialStore, authenticators, features, initialDelayedAckBytes, ...options }: AdbDaemonAuthenticationOptions): Promise<AdbDaemonTransport>;
|
|
43
66
|
get connection(): AdbDaemonConnection;
|
|
44
67
|
get serial(): string;
|
|
45
68
|
get protocolVersion(): number;
|
|
46
69
|
get maxPayloadSize(): number;
|
|
47
70
|
get banner(): AdbBanner;
|
|
48
71
|
get disconnected(): Promise<void>;
|
|
49
|
-
|
|
72
|
+
get clientFeatures(): readonly AdbFeature[];
|
|
73
|
+
constructor({ serial, connection, version, banner, features, initialDelayedAckBytes, ...options }: AdbDaemonSocketConnectorConstructionOptions);
|
|
50
74
|
connect(service: string): ValueOrPromise<AdbSocket>;
|
|
51
75
|
addReverseTunnel(handler: AdbIncomingSocketHandler, address?: string): string;
|
|
52
76
|
removeReverseTunnel(address: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/daemon/transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAMhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGxD,OAAO,KAAK,EACR,wBAAwB,EACxB,SAAS,EACT,YAAY,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/daemon/transport.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAMhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGxD,OAAO,KAAK,EACR,wBAAwB,EACxB,SAAS,EACT,YAAY,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAMtE,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGhE,eAAO,MAAM,gCAAgC,WAAa,CAAC;AAG3D,eAAO,MAAM,2BAA2B,cAoBvB,CAAC;AAClB,eAAO,MAAM,uCAAuC,QAAmB,CAAC;AAExE,MAAM,MAAM,mBAAmB,GAAG,oBAAoB,CAClD,aAAa,EACb,UAAU,CAAC,aAAa,CAAC,CAC5B,CAAC;AAEF,UAAU,8BAA8B;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,mBAAmB,CAAC;IAChC,eAAe,EAAE,kBAAkB,CAAC;IACpC,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IACjC;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC;AAED,UAAU,2CAA2C;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,mBAAmB,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IACjC;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACvC;AAED,qBAAa,kBAAmB,YAAW,YAAY;;IACnD;;;;;;;OAOG;WACU,YAAY,CAAC,EACtB,MAAM,EACN,UAAU,EACV,eAAe,EACf,cAA2C,EAC3C,QAAsC,EACtC,sBAAgE,EAChE,GAAG,OAAO,EACb,EAAE,8BAA8B,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAqH/D,IAAI,UAAU,wBAEb;IAKD,IAAI,MAAM,WAET;IAGD,IAAI,eAAe,WAElB;IAED,IAAI,cAAc,WAEjB;IAGD,IAAI,MAAM,cAET;IAED,IAAI,YAAY,kBAEf;IAGD,IAAI,cAAc,0BAEjB;gBAEW,EACR,MAAM,EACN,UAAU,EACV,OAAO,EACP,MAAM,EACN,QAAsC,EACtC,sBAAgE,EAChE,GAAG,OAAO,EACb,EAAE,2CAA2C;IAwC9C,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC;IAInD,gBAAgB,CACZ,OAAO,EAAE,wBAAwB,EACjC,OAAO,CAAC,EAAE,MAAM,GACjB,MAAM;IAST,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAI1C,mBAAmB,IAAI,IAAI;IAI3B,KAAK,IAAI,cAAc,CAAC,IAAI,CAAC;CAGhC"}
|
package/esm/daemon/transport.js
CHANGED
|
@@ -7,6 +7,30 @@ import { ADB_DEFAULT_AUTHENTICATORS, AdbAuthenticationProcessor, } from "./auth.
|
|
|
7
7
|
import { AdbPacketDispatcher } from "./dispatcher.js";
|
|
8
8
|
import { AdbCommand, calculateChecksum } from "./packet.js";
|
|
9
9
|
export const ADB_DAEMON_VERSION_OMIT_CHECKSUM = 0x01000001;
|
|
10
|
+
// https://android.googlesource.com/platform/packages/modules/adb/+/79010dc6d5ca7490c493df800d4421730f5466ca/transport.cpp#1252
|
|
11
|
+
// There are some other feature constants, but some of them are only used by ADB server, not devices (daemons).
|
|
12
|
+
export const ADB_DAEMON_DEFAULT_FEATURES = [
|
|
13
|
+
AdbFeature.ShellV2,
|
|
14
|
+
AdbFeature.Cmd,
|
|
15
|
+
AdbFeature.StatV2,
|
|
16
|
+
AdbFeature.ListV2,
|
|
17
|
+
AdbFeature.FixedPushMkdir,
|
|
18
|
+
"apex",
|
|
19
|
+
AdbFeature.Abb,
|
|
20
|
+
// only tells the client the symlink timestamp issue in `adb push --sync` has been fixed.
|
|
21
|
+
// No special handling required.
|
|
22
|
+
"fixed_push_symlink_timestamp",
|
|
23
|
+
AdbFeature.AbbExec,
|
|
24
|
+
"remount_shell",
|
|
25
|
+
"track_app",
|
|
26
|
+
AdbFeature.SendReceiveV2,
|
|
27
|
+
"sendrecv_v2_brotli",
|
|
28
|
+
"sendrecv_v2_lz4",
|
|
29
|
+
"sendrecv_v2_zstd",
|
|
30
|
+
"sendrecv_v2_dry_run_send",
|
|
31
|
+
AdbFeature.DelayedAck,
|
|
32
|
+
];
|
|
33
|
+
export const ADB_DAEMON_DEFAULT_INITIAL_PAYLOAD_SIZE = 32 * 1024 * 1024;
|
|
10
34
|
export class AdbDaemonTransport {
|
|
11
35
|
/**
|
|
12
36
|
* Authenticates the connection and creates an `AdbDaemonTransport` instance
|
|
@@ -16,7 +40,7 @@ export class AdbDaemonTransport {
|
|
|
16
40
|
* on the same connection. Because every time the device receives a `CNXN` packet,
|
|
17
41
|
* it resets all internal state, and starts a new authentication process.
|
|
18
42
|
*/
|
|
19
|
-
static async authenticate({ serial, connection, credentialStore, authenticators = ADB_DEFAULT_AUTHENTICATORS, ...options }) {
|
|
43
|
+
static async authenticate({ serial, connection, credentialStore, authenticators = ADB_DEFAULT_AUTHENTICATORS, features = ADB_DAEMON_DEFAULT_FEATURES, initialDelayedAckBytes = ADB_DAEMON_DEFAULT_INITIAL_PAYLOAD_SIZE, ...options }) {
|
|
20
44
|
// Initially, set to highest-supported version and payload size.
|
|
21
45
|
let version = 0x01000001;
|
|
22
46
|
// Android 4: 4K, Android 7: 256K, Android 9: 1M
|
|
@@ -69,37 +93,22 @@ export class AdbDaemonTransport {
|
|
|
69
93
|
init.magic = init.command ^ 0xffffffff;
|
|
70
94
|
await ConsumableWritableStream.write(writer, init);
|
|
71
95
|
}
|
|
96
|
+
const actualFeatures = features.slice();
|
|
97
|
+
if (initialDelayedAckBytes <= 0) {
|
|
98
|
+
const index = features.indexOf(AdbFeature.DelayedAck);
|
|
99
|
+
if (index !== -1) {
|
|
100
|
+
actualFeatures.splice(index, 1);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
72
103
|
let banner;
|
|
73
104
|
try {
|
|
74
|
-
// https://android.googlesource.com/platform/packages/modules/adb/+/79010dc6d5ca7490c493df800d4421730f5466ca/transport.cpp#1252
|
|
75
|
-
// There are some other feature constants, but some of them are only used by ADB server, not devices (daemons).
|
|
76
|
-
const features = [
|
|
77
|
-
AdbFeature.ShellV2,
|
|
78
|
-
AdbFeature.Cmd,
|
|
79
|
-
AdbFeature.StatV2,
|
|
80
|
-
AdbFeature.ListV2,
|
|
81
|
-
AdbFeature.FixedPushMkdir,
|
|
82
|
-
"apex",
|
|
83
|
-
AdbFeature.Abb,
|
|
84
|
-
// only tells the client the symlink timestamp issue in `adb push --sync` has been fixed.
|
|
85
|
-
// No special handling required.
|
|
86
|
-
"fixed_push_symlink_timestamp",
|
|
87
|
-
AdbFeature.AbbExec,
|
|
88
|
-
"remount_shell",
|
|
89
|
-
"track_app",
|
|
90
|
-
AdbFeature.SendReceiveV2,
|
|
91
|
-
"sendrecv_v2_brotli",
|
|
92
|
-
"sendrecv_v2_lz4",
|
|
93
|
-
"sendrecv_v2_zstd",
|
|
94
|
-
"sendrecv_v2_dry_run_send",
|
|
95
|
-
].join(",");
|
|
96
105
|
await sendPacket({
|
|
97
106
|
command: AdbCommand.Connect,
|
|
98
107
|
arg0: version,
|
|
99
108
|
arg1: maxPayloadSize,
|
|
100
109
|
// The terminating `;` is required in formal definition
|
|
101
110
|
// But ADB daemon (all versions) can still work without it
|
|
102
|
-
payload: encodeUtf8(`host::features=${
|
|
111
|
+
payload: encodeUtf8(`host::features=${actualFeatures.join(",")}`),
|
|
103
112
|
});
|
|
104
113
|
banner = await resolver.promise;
|
|
105
114
|
}
|
|
@@ -117,6 +126,8 @@ export class AdbDaemonTransport {
|
|
|
117
126
|
version,
|
|
118
127
|
maxPayloadSize,
|
|
119
128
|
banner,
|
|
129
|
+
features: actualFeatures,
|
|
130
|
+
initialDelayedAckBytes,
|
|
120
131
|
...options,
|
|
121
132
|
});
|
|
122
133
|
}
|
|
@@ -143,10 +154,26 @@ export class AdbDaemonTransport {
|
|
|
143
154
|
get disconnected() {
|
|
144
155
|
return this.#dispatcher.disconnected;
|
|
145
156
|
}
|
|
146
|
-
|
|
157
|
+
#clientFeatures;
|
|
158
|
+
get clientFeatures() {
|
|
159
|
+
return this.#clientFeatures;
|
|
160
|
+
}
|
|
161
|
+
constructor({ serial, connection, version, banner, features = ADB_DAEMON_DEFAULT_FEATURES, initialDelayedAckBytes = ADB_DAEMON_DEFAULT_INITIAL_PAYLOAD_SIZE, ...options }) {
|
|
147
162
|
this.#serial = serial;
|
|
148
163
|
this.#connection = connection;
|
|
149
164
|
this.#banner = AdbBanner.parse(banner);
|
|
165
|
+
this.#clientFeatures = features;
|
|
166
|
+
if (features.includes(AdbFeature.DelayedAck)) {
|
|
167
|
+
if (initialDelayedAckBytes <= 0) {
|
|
168
|
+
throw new Error("`initialDelayedAckBytes` must be greater than 0 when DelayedAck feature is enabled.");
|
|
169
|
+
}
|
|
170
|
+
if (!this.#banner.features.includes(AdbFeature.DelayedAck)) {
|
|
171
|
+
initialDelayedAckBytes = 0;
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
else {
|
|
175
|
+
initialDelayedAckBytes = 0;
|
|
176
|
+
}
|
|
150
177
|
let calculateChecksum;
|
|
151
178
|
let appendNullToServiceString;
|
|
152
179
|
if (version >= ADB_DAEMON_VERSION_OMIT_CHECKSUM) {
|
|
@@ -160,6 +187,7 @@ export class AdbDaemonTransport {
|
|
|
160
187
|
this.#dispatcher = new AdbPacketDispatcher(connection, {
|
|
161
188
|
calculateChecksum,
|
|
162
189
|
appendNullToServiceString,
|
|
190
|
+
initialDelayedAckBytes,
|
|
163
191
|
...options,
|
|
164
192
|
});
|
|
165
193
|
this.#protocolVersion = version;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/daemon/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EACH,eAAe,EACf,wBAAwB,EACxB,cAAc,GACjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAO3D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG5C,OAAO,EACH,0BAA0B,EAC1B,0BAA0B,GAC7B,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE5D,MAAM,CAAC,MAAM,gCAAgC,GAAG,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/daemon/transport.ts"],"names":[],"mappings":"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"}
|
package/esm/features.d.ts
CHANGED
package/esm/features.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"features.d.ts","sourceRoot":"","sources":["../src/features.ts"],"names":[],"mappings":"AAEA,oBAAY,UAAU;IAClB,OAAO,aAAa;IACpB,GAAG,QAAQ;IACX,MAAM,YAAY;IAClB,MAAM,UAAU;IAChB,cAAc,qBAAqB;IACnC,GAAG,QAAQ;IACX,OAAO,aAAa;IACpB,aAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"features.d.ts","sourceRoot":"","sources":["../src/features.ts"],"names":[],"mappings":"AAEA,oBAAY,UAAU;IAClB,OAAO,aAAa;IACpB,GAAG,QAAQ;IACX,MAAM,YAAY;IAClB,MAAM,UAAU;IAChB,cAAc,qBAAqB;IACnC,GAAG,QAAQ;IACX,OAAO,aAAa;IACpB,aAAa,gBAAgB;IAC7B,UAAU,gBAAgB;CAC7B"}
|
package/esm/features.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// The order follows
|
|
2
|
-
// https://android.
|
|
2
|
+
// https://cs.android.com/android/platform/superproject/+/master:packages/modules/adb/transport.cpp;l=77;drc=6d14d35d0241f6fee145f8e54ffd77252e8d29fd
|
|
3
3
|
export var AdbFeature;
|
|
4
4
|
(function (AdbFeature) {
|
|
5
5
|
AdbFeature["ShellV2"] = "shell_v2";
|
|
@@ -10,5 +10,6 @@ export var AdbFeature;
|
|
|
10
10
|
AdbFeature["Abb"] = "abb";
|
|
11
11
|
AdbFeature["AbbExec"] = "abb_exec";
|
|
12
12
|
AdbFeature["SendReceiveV2"] = "sendrecv_v2";
|
|
13
|
+
AdbFeature["DelayedAck"] = "delayed_ack";
|
|
13
14
|
})(AdbFeature || (AdbFeature = {}));
|
|
14
15
|
//# sourceMappingURL=features.js.map
|
package/esm/features.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"features.js","sourceRoot":"","sources":["../src/features.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB
|
|
1
|
+
{"version":3,"file":"features.js","sourceRoot":"","sources":["../src/features.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,qJAAqJ;AACrJ,MAAM,CAAN,IAAY,UAUX;AAVD,WAAY,UAAU;IAClB,kCAAoB,CAAA;IACpB,yBAAW,CAAA;IACX,gCAAkB,CAAA;IAClB,8BAAgB,CAAA;IAChB,iDAAmC,CAAA;IACnC,yBAAW,CAAA;IACX,kCAAoB,CAAA;IACpB,2CAA6B,CAAA;IAC7B,wCAA0B,CAAA;AAC9B,CAAC,EAVW,UAAU,KAAV,UAAU,QAUrB"}
|
package/esm/server/client.d.ts
CHANGED
|
@@ -48,7 +48,9 @@ export declare class AdbServerClient {
|
|
|
48
48
|
validateVersion(): Promise<void>;
|
|
49
49
|
killServer(): Promise<void>;
|
|
50
50
|
getServerFeatures(): Promise<AdbFeature[]>;
|
|
51
|
+
parseDeviceList(value: string): AdbServerDevice[];
|
|
51
52
|
getDevices(): Promise<AdbServerDevice[]>;
|
|
53
|
+
trackDevices(callback: (devices: AdbServerDevice[]) => void): Promise<() => void>;
|
|
52
54
|
formatDeviceService(device: AdbServerDeviceSelector, command: string): string;
|
|
53
55
|
/**
|
|
54
56
|
* Gets the features supported by the device.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACR,WAAW,EACX,oBAAoB,EACpB,2BAA2B,EAC9B,MAAM,yBAAyB,CAAC;AAMjC,OAAO,KAAK,EACR,kBAAkB,EAClB,aAAa,EACb,cAAc,EACjB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
|
package/esm/server/client.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// cspell:ignore tport
|
|
2
2
|
import { PromiseResolver } from "@yume-chan/async";
|
|
3
3
|
import { BufferedReadableStream, UnwrapConsumableStream, WrapWritableStream, } from "@yume-chan/stream-extra";
|
|
4
|
-
import { BigIntFieldType, SyncPromise, decodeUtf8, encodeUtf8, } from "@yume-chan/struct";
|
|
4
|
+
import { BigIntFieldType, EMPTY_UINT8_ARRAY, SyncPromise, decodeUtf8, encodeUtf8, } from "@yume-chan/struct";
|
|
5
5
|
import { AdbBanner } from "../banner.js";
|
|
6
|
-
import { NOOP, hexToNumber, numberToHex } from "../utils/index.js";
|
|
6
|
+
import { NOOP, hexToNumber, numberToHex, unreachable } from "../utils/index.js";
|
|
7
7
|
import { AdbServerTransport } from "./transport.js";
|
|
8
8
|
export class AdbServerClient {
|
|
9
9
|
static VERSION = 41;
|
|
@@ -15,7 +15,12 @@ export class AdbServerClient {
|
|
|
15
15
|
return SyncPromise.try(() => stream.readExactly(4))
|
|
16
16
|
.then((buffer) => {
|
|
17
17
|
const length = hexToNumber(buffer);
|
|
18
|
-
|
|
18
|
+
if (length === 0) {
|
|
19
|
+
return EMPTY_UINT8_ARRAY;
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
return stream.readExactly(length);
|
|
23
|
+
}
|
|
19
24
|
})
|
|
20
25
|
.then((valueBuffer) => {
|
|
21
26
|
return decodeUtf8(valueBuffer);
|
|
@@ -110,61 +115,86 @@ export class AdbServerClient {
|
|
|
110
115
|
readable.cancel().catch(NOOP);
|
|
111
116
|
}
|
|
112
117
|
}
|
|
118
|
+
parseDeviceList(value) {
|
|
119
|
+
const devices = [];
|
|
120
|
+
for (const line of value.split("\n")) {
|
|
121
|
+
if (!line) {
|
|
122
|
+
continue;
|
|
123
|
+
}
|
|
124
|
+
const parts = line.split(" ").filter(Boolean);
|
|
125
|
+
const serial = parts[0];
|
|
126
|
+
const status = parts[1];
|
|
127
|
+
if (status !== "device") {
|
|
128
|
+
continue;
|
|
129
|
+
}
|
|
130
|
+
let product;
|
|
131
|
+
let model;
|
|
132
|
+
let device;
|
|
133
|
+
let transportId;
|
|
134
|
+
for (let i = 2; i < parts.length; i += 1) {
|
|
135
|
+
const [key, value] = parts[i].split(":");
|
|
136
|
+
switch (key) {
|
|
137
|
+
case "product":
|
|
138
|
+
product = value;
|
|
139
|
+
break;
|
|
140
|
+
case "model":
|
|
141
|
+
model = value;
|
|
142
|
+
break;
|
|
143
|
+
case "device":
|
|
144
|
+
device = value;
|
|
145
|
+
break;
|
|
146
|
+
case "transport_id":
|
|
147
|
+
transportId = BigInt(value);
|
|
148
|
+
break;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
if (!transportId) {
|
|
152
|
+
throw new Error(`No transport id for device ${serial}`);
|
|
153
|
+
}
|
|
154
|
+
devices.push({
|
|
155
|
+
serial,
|
|
156
|
+
product,
|
|
157
|
+
model,
|
|
158
|
+
device,
|
|
159
|
+
transportId,
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
return devices;
|
|
163
|
+
}
|
|
113
164
|
async getDevices() {
|
|
114
165
|
const connection = await this.connect("host:devices-l");
|
|
115
166
|
const readable = new BufferedReadableStream(connection.readable);
|
|
116
167
|
try {
|
|
117
|
-
const devices = [];
|
|
118
168
|
const response = await AdbServerClient.readString(readable);
|
|
119
|
-
|
|
120
|
-
if (!line) {
|
|
121
|
-
continue;
|
|
122
|
-
}
|
|
123
|
-
const parts = line.split(" ").filter(Boolean);
|
|
124
|
-
const serial = parts[0];
|
|
125
|
-
const status = parts[1];
|
|
126
|
-
if (status !== "device") {
|
|
127
|
-
continue;
|
|
128
|
-
}
|
|
129
|
-
let product;
|
|
130
|
-
let model;
|
|
131
|
-
let device;
|
|
132
|
-
let transportId;
|
|
133
|
-
for (let i = 2; i < parts.length; i += 1) {
|
|
134
|
-
const [key, value] = parts[i].split(":");
|
|
135
|
-
switch (key) {
|
|
136
|
-
case "product":
|
|
137
|
-
product = value;
|
|
138
|
-
break;
|
|
139
|
-
case "model":
|
|
140
|
-
model = value;
|
|
141
|
-
break;
|
|
142
|
-
case "device":
|
|
143
|
-
device = value;
|
|
144
|
-
break;
|
|
145
|
-
case "transport_id":
|
|
146
|
-
transportId = BigInt(value);
|
|
147
|
-
break;
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
if (!transportId) {
|
|
151
|
-
throw new Error(`No transport id for device ${serial}`);
|
|
152
|
-
}
|
|
153
|
-
devices.push({
|
|
154
|
-
serial,
|
|
155
|
-
product,
|
|
156
|
-
model,
|
|
157
|
-
device,
|
|
158
|
-
transportId,
|
|
159
|
-
});
|
|
160
|
-
}
|
|
161
|
-
return devices;
|
|
169
|
+
return this.parseDeviceList(response);
|
|
162
170
|
}
|
|
163
171
|
finally {
|
|
164
172
|
connection.writable.close().catch(NOOP);
|
|
165
173
|
readable.cancel().catch(NOOP);
|
|
166
174
|
}
|
|
167
175
|
}
|
|
176
|
+
async trackDevices(callback) {
|
|
177
|
+
const connection = await this.connect("host:track-devices-l");
|
|
178
|
+
const readable = new BufferedReadableStream(connection.readable);
|
|
179
|
+
let running = true;
|
|
180
|
+
(async () => {
|
|
181
|
+
try {
|
|
182
|
+
while (running) {
|
|
183
|
+
const response = await AdbServerClient.readString(readable);
|
|
184
|
+
const devices = this.parseDeviceList(response);
|
|
185
|
+
callback(devices);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
catch {
|
|
189
|
+
// ignore
|
|
190
|
+
}
|
|
191
|
+
})().catch(unreachable);
|
|
192
|
+
return () => {
|
|
193
|
+
running = false;
|
|
194
|
+
readable.cancel().catch(NOOP);
|
|
195
|
+
Promise.resolve(connection.close()).catch(NOOP);
|
|
196
|
+
};
|
|
197
|
+
}
|
|
168
198
|
formatDeviceService(device, command) {
|
|
169
199
|
if (!device) {
|
|
170
200
|
return `host:${command}`;
|
|
@@ -307,9 +337,11 @@ export class AdbServerClient {
|
|
|
307
337
|
// `waitFor` can't use `connectDevice`, because the device
|
|
308
338
|
// might not be available yet.
|
|
309
339
|
const service = this.formatDeviceService(device, `wait-for-${type}-${state}`);
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
await
|
|
340
|
+
const socket = await this.connect(service, options);
|
|
341
|
+
const readable = new BufferedReadableStream(socket.readable);
|
|
342
|
+
await AdbServerClient.readOkay(readable);
|
|
343
|
+
await readable.cancel();
|
|
344
|
+
await socket.close();
|
|
313
345
|
}
|
|
314
346
|
async createTransport(device) {
|
|
315
347
|
const { transportId, features } = await this.getDeviceFeatures(device);
|
package/esm/server/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
|