@yume-chan/adb 2.0.1 → 2.1.0
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.md +12 -0
- package/README.md +2 -2
- package/esm/adb.d.ts +2 -2
- package/esm/adb.d.ts.map +1 -1
- package/esm/adb.js +2 -0
- package/esm/adb.js.map +1 -1
- package/esm/banner.d.ts +2 -2
- package/esm/banner.d.ts.map +1 -1
- package/esm/banner.js.map +1 -1
- package/esm/commands/subprocess/none/service.d.ts +1 -1
- package/esm/commands/subprocess/none/service.d.ts.map +1 -1
- package/esm/commands/subprocess/none/service.js +3 -1
- package/esm/commands/subprocess/none/service.js.map +1 -1
- package/esm/commands/subprocess/none/spawner.d.ts +4 -4
- package/esm/commands/subprocess/none/spawner.d.ts.map +1 -1
- package/esm/commands/subprocess/none/spawner.js.map +1 -1
- package/esm/commands/subprocess/shell/service.d.ts +1 -1
- package/esm/commands/subprocess/shell/service.d.ts.map +1 -1
- package/esm/commands/subprocess/shell/spawner.d.ts +4 -4
- package/esm/commands/subprocess/shell/spawner.d.ts.map +1 -1
- package/esm/commands/subprocess/shell/spawner.js.map +1 -1
- package/esm/daemon/auth.d.ts +1 -1
- package/esm/daemon/auth.d.ts.map +1 -1
- package/esm/daemon/auth.js.map +1 -1
- package/esm/daemon/crypto.d.ts +2 -2
- package/esm/daemon/crypto.d.ts.map +1 -1
- package/esm/daemon/crypto.js.map +1 -1
- package/esm/daemon/transport.d.ts +2 -2
- package/esm/daemon/transport.d.ts.map +1 -1
- package/esm/daemon/transport.js.map +1 -1
- package/esm/server/client.d.ts +10 -4
- package/esm/server/client.d.ts.map +1 -1
- package/esm/server/client.js +18 -6
- package/esm/server/client.js.map +1 -1
- package/esm/server/observer.d.ts +6 -1
- package/esm/server/observer.d.ts.map +1 -1
- package/esm/server/observer.js +31 -8
- package/esm/server/observer.js.map +1 -1
- package/esm/server/transport.d.ts +2 -2
- package/esm/server/transport.d.ts.map +1 -1
- package/esm/server/transport.js.map +1 -1
- package/esm/utils/base64.d.ts +2 -2
- package/esm/utils/base64.d.ts.map +1 -1
- package/package.json +7 -7
- package/src/adb.ts +5 -3
- package/src/banner.ts +2 -2
- package/src/commands/subprocess/none/service.ts +5 -2
- package/src/commands/subprocess/none/spawner.ts +5 -5
- package/src/commands/subprocess/shell/service.ts +1 -1
- package/src/commands/subprocess/shell/spawner.ts +5 -5
- package/src/commands/sync/response.ts +1 -1
- package/src/daemon/auth.ts +1 -1
- package/src/daemon/crypto.ts +7 -2
- package/src/daemon/transport.ts +2 -2
- package/src/server/client.ts +30 -8
- package/src/server/observer.ts +62 -15
- package/src/server/transport.ts +1 -1
- package/src/utils/base64.ts +2 -2
- package/tsconfig.build.tsbuildinfo +1 -1
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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"}
|
package/esm/server/observer.d.ts
CHANGED
|
@@ -4,6 +4,11 @@ export declare class AdbServerDeviceObserverOwner {
|
|
|
4
4
|
#private;
|
|
5
5
|
current: readonly AdbServerClient.Device[];
|
|
6
6
|
constructor(client: AdbServerClient);
|
|
7
|
-
createObserver(options?:
|
|
7
|
+
createObserver(options?: AdbServerDeviceObserverOwner.Options): Promise<AdbServerClient.DeviceObserver>;
|
|
8
|
+
}
|
|
9
|
+
export declare namespace AdbServerDeviceObserverOwner {
|
|
10
|
+
interface Options extends AdbServerClient.ServerConnectionOptions {
|
|
11
|
+
includeStates?: readonly AdbServerClient.ConnectionState[];
|
|
12
|
+
}
|
|
8
13
|
}
|
|
9
14
|
//# sourceMappingURL=observer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observer.d.ts","sourceRoot":"","sources":["../../src/server/observer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,wBAAgB,eAAe,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,QAM3D;
|
|
1
|
+
{"version":3,"file":"observer.d.ts","sourceRoot":"","sources":["../../src/server/observer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,wBAAgB,eAAe,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,QAM3D;AAiBD,qBAAa,4BAA4B;;IACrC,OAAO,EAAE,SAAS,eAAe,CAAC,MAAM,EAAE,CAAM;gBAOpC,MAAM,EAAE,eAAe;IA8F7B,cAAc,CAChB,OAAO,CAAC,EAAE,4BAA4B,CAAC,OAAO,GAC/C,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC;CA8E7C;AAED,yBAAiB,4BAA4B,CAAC;IAC1C,UAAiB,OAAQ,SAAQ,eAAe,CAAC,uBAAuB;QACpE,aAAa,CAAC,EAAE,SAAS,eAAe,CAAC,eAAe,EAAE,CAAC;KAC9D;CACJ"}
|
package/esm/server/observer.js
CHANGED
|
@@ -8,6 +8,9 @@ export function unorderedRemove(array, index) {
|
|
|
8
8
|
array[index] = array[array.length - 1];
|
|
9
9
|
array.length -= 1;
|
|
10
10
|
}
|
|
11
|
+
function filterDeviceStates(devices, states) {
|
|
12
|
+
return devices.filter((device) => states.includes(device.state));
|
|
13
|
+
}
|
|
11
14
|
export class AdbServerDeviceObserverOwner {
|
|
12
15
|
current = [];
|
|
13
16
|
#client;
|
|
@@ -32,16 +35,23 @@ export class AdbServerDeviceObserverOwner {
|
|
|
32
35
|
this.current = next;
|
|
33
36
|
if (added.length) {
|
|
34
37
|
for (const observer of this.#observers) {
|
|
35
|
-
observer.
|
|
38
|
+
const filtered = filterDeviceStates(added, observer.includeStates);
|
|
39
|
+
if (filtered.length) {
|
|
40
|
+
observer.onDeviceAdd.fire(filtered);
|
|
41
|
+
}
|
|
36
42
|
}
|
|
37
43
|
}
|
|
38
44
|
if (removed.length) {
|
|
39
45
|
for (const observer of this.#observers) {
|
|
40
|
-
observer.
|
|
46
|
+
const filtered = filterDeviceStates(added, observer.includeStates);
|
|
47
|
+
if (filtered.length) {
|
|
48
|
+
observer.onDeviceRemove.fire(removed);
|
|
49
|
+
}
|
|
41
50
|
}
|
|
42
51
|
}
|
|
43
52
|
for (const observer of this.#observers) {
|
|
44
|
-
|
|
53
|
+
const filtered = filterDeviceStates(this.current, observer.includeStates);
|
|
54
|
+
observer.onListChange.fire(filtered);
|
|
45
55
|
}
|
|
46
56
|
}
|
|
47
57
|
async #receiveLoop(stream) {
|
|
@@ -75,16 +85,30 @@ export class AdbServerDeviceObserverOwner {
|
|
|
75
85
|
}
|
|
76
86
|
async createObserver(options) {
|
|
77
87
|
options?.signal?.throwIfAborted();
|
|
88
|
+
let current = [];
|
|
78
89
|
const onDeviceAdd = new EventEmitter();
|
|
79
90
|
const onDeviceRemove = new EventEmitter();
|
|
80
91
|
const onListChange = new StickyEventEmitter();
|
|
81
92
|
const onError = new StickyEventEmitter();
|
|
82
|
-
const
|
|
93
|
+
const includeStates = options?.includeStates ?? [
|
|
94
|
+
"device",
|
|
95
|
+
"unauthorized",
|
|
96
|
+
];
|
|
97
|
+
const observer = {
|
|
98
|
+
includeStates,
|
|
99
|
+
onDeviceAdd,
|
|
100
|
+
onDeviceRemove,
|
|
101
|
+
onListChange,
|
|
102
|
+
onError,
|
|
103
|
+
};
|
|
83
104
|
// Register `observer` before `#connect`.
|
|
84
105
|
// So `#handleObserverStop` knows if there is any observer.
|
|
85
106
|
this.#observers.push(observer);
|
|
107
|
+
// Read the filtered `current` value from `onListChange` event
|
|
108
|
+
onListChange.event((value) => (current = value));
|
|
86
109
|
let stream;
|
|
87
110
|
if (!this.#stream) {
|
|
111
|
+
// `#connect` will initialize `onListChange` and `current`
|
|
88
112
|
this.#stream = this.#connect();
|
|
89
113
|
try {
|
|
90
114
|
stream = await this.#stream;
|
|
@@ -96,7 +120,8 @@ export class AdbServerDeviceObserverOwner {
|
|
|
96
120
|
}
|
|
97
121
|
else {
|
|
98
122
|
stream = await this.#stream;
|
|
99
|
-
onListChange
|
|
123
|
+
// Initialize `onListChange` and `current` ourselves
|
|
124
|
+
onListChange.fire(filterDeviceStates(this.current, includeStates));
|
|
100
125
|
}
|
|
101
126
|
const ref = new Ref(options);
|
|
102
127
|
const stop = async () => {
|
|
@@ -111,15 +136,13 @@ export class AdbServerDeviceObserverOwner {
|
|
|
111
136
|
}
|
|
112
137
|
options.signal.addEventListener("abort", () => void stop());
|
|
113
138
|
}
|
|
114
|
-
// eslint-disable-next-line @typescript-eslint/no-this-alias
|
|
115
|
-
const _this = this;
|
|
116
139
|
return {
|
|
117
140
|
onDeviceAdd: onDeviceAdd.event,
|
|
118
141
|
onDeviceRemove: onDeviceRemove.event,
|
|
119
142
|
onListChange: onListChange.event,
|
|
120
143
|
onError: onError.event,
|
|
121
144
|
get current() {
|
|
122
|
-
return
|
|
145
|
+
return current;
|
|
123
146
|
},
|
|
124
147
|
stop,
|
|
125
148
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observer.js","sourceRoot":"","sources":["../../src/server/observer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,MAAM,UAAU,eAAe,CAAI,KAAU,EAAE,KAAa;IACxD,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACrC,OAAO;IACX,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAE,CAAC;IACxC,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;AACtB,CAAC;AAED,MAAM,OAAO,4BAA4B;IACrC,OAAO,GAAsC,EAAE,CAAC;IAEvC,OAAO,CAAkB;
|
|
1
|
+
{"version":3,"file":"observer.js","sourceRoot":"","sources":["../../src/server/observer.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import type { AdbIncomingSocketHandler, AdbSocket, AdbTransport } from "../adb.j
|
|
|
2
2
|
import type { AdbBanner } from "../banner.js";
|
|
3
3
|
import { AdbFeature } from "../features.js";
|
|
4
4
|
import type { AdbServerClient } from "./client.js";
|
|
5
|
-
export declare const ADB_SERVER_DEFAULT_FEATURES: AdbFeature[];
|
|
5
|
+
export declare const ADB_SERVER_DEFAULT_FEATURES: readonly AdbFeature[];
|
|
6
6
|
export declare class AdbServerTransport implements AdbTransport {
|
|
7
7
|
#private;
|
|
8
8
|
readonly serial: string;
|
|
@@ -10,7 +10,7 @@ export declare class AdbServerTransport implements AdbTransport {
|
|
|
10
10
|
readonly maxPayloadSize: number;
|
|
11
11
|
readonly banner: AdbBanner;
|
|
12
12
|
get disconnected(): Promise<void>;
|
|
13
|
-
get clientFeatures(): AdbFeature[];
|
|
13
|
+
get clientFeatures(): readonly AdbFeature[];
|
|
14
14
|
constructor(client: AdbServerClient, serial: string, banner: AdbBanner, transportId: bigint, disconnected: Promise<void>);
|
|
15
15
|
connect(service: string): Promise<AdbSocket>;
|
|
16
16
|
addReverseTunnel(handler: AdbIncomingSocketHandler, address?: string): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,wBAAwB,EACxB,SAAS,EACT,YAAY,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,2BAA2B,
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,wBAAwB,EACxB,SAAS,EACT,YAAY,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,2BAA2B,uBAoBP,CAAC;AAElC,qBAAa,kBAAmB,YAAW,YAAY;;IAGnD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAmB;IAElD,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAM3B,IAAI,YAAY,kBAEf;IAED,IAAI,cAAc,0BAIjB;gBAIG,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC;IAUzB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAS5C,gBAAgB,CAClB,OAAO,EAAE,wBAAwB,EACjC,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC;IAIZ,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQnD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,MAAM,CAAC,MAAM,2BAA2B,GAAG,eAAe,CAAC,CAAC,GAAG,EAAE,CAC7D;IACI,UAAU,CAAC,OAAO;IAClB,UAAU,CAAC,GAAG;IACd,UAAU,CAAC,MAAM;IACjB,UAAU,CAAC,MAAM;IACjB,UAAU,CAAC,cAAc;IACzB,MAAM;IACN,UAAU,CAAC,GAAG;IACd,yFAAyF;IACzF,gCAAgC;IAChC,8BAA8B;IAC9B,UAAU,CAAC,OAAO;IAClB,eAAe;IACf,WAAW;IACX,UAAU,CAAC,aAAa;IACxB,oBAAoB;IACpB,iBAAiB;IACjB,kBAAkB;IAClB,0BAA0B;
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQnD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,MAAM,CAAC,MAAM,2BAA2B,GAAG,eAAe,CAAC,CAAC,GAAG,EAAE,CAC7D;IACI,UAAU,CAAC,OAAO;IAClB,UAAU,CAAC,GAAG;IACd,UAAU,CAAC,MAAM;IACjB,UAAU,CAAC,MAAM;IACjB,UAAU,CAAC,cAAc;IACzB,MAAM;IACN,UAAU,CAAC,GAAG;IACd,yFAAyF;IACzF,gCAAgC;IAChC,8BAA8B;IAC9B,UAAU,CAAC,OAAO;IAClB,eAAe;IACf,WAAW;IACX,UAAU,CAAC,aAAa;IACxB,oBAAoB;IACpB,iBAAiB;IACjB,kBAAkB;IAClB,0BAA0B;CACJ,CAAC,EAAE,CAAC;AAElC,MAAM,OAAO,kBAAkB;IAC3B,OAAO,CAAkB;IAEhB,MAAM,CAAS;IAEf,WAAW,CAAS;IAEpB,cAAc,GAAW,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IAEzC,MAAM,CAAY;IAE3B,QAAQ,GAAgB,EAAE,CAAC;IAE3B,OAAO,GAAG,IAAI,eAAe,EAAQ,CAAC;IACtC,aAAa,CAAgB;IAC7B,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,IAAI,cAAc;QACd,kEAAkE;QAClE,8CAA8C;QAC9C,OAAO,2BAA2B,CAAC;IACvC,CAAC;IAED,yDAAyD;IACzD,YACI,MAAuB,EACvB,MAAc,EACd,MAAiB,EACjB,WAAmB,EACnB,YAA2B;QAE3B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAE/B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAe;QACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CACpD,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EACjC,OAAO,CACV,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,OAAiC,EACjC,OAAgB;QAEhB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAe;QACrC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,KAAK;QACP,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjC,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACJ"}
|
package/esm/utils/base64.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export declare function calculateBase64EncodedLength(inputLength: number): [outp
|
|
|
11
11
|
* @param input The input buffer
|
|
12
12
|
* @returns The encoded output buffer
|
|
13
13
|
*/
|
|
14
|
-
export declare function encodeBase64(input: Uint8Array): Uint8Array
|
|
14
|
+
export declare function encodeBase64(input: Uint8Array): Uint8Array<ArrayBuffer>;
|
|
15
15
|
/**
|
|
16
16
|
* Encode the given input into base64 and write it to the output buffer.
|
|
17
17
|
*
|
|
@@ -24,5 +24,5 @@ export declare function encodeBase64(input: Uint8Array): Uint8Array;
|
|
|
24
24
|
* @returns The number of bytes written to the output buffer
|
|
25
25
|
*/
|
|
26
26
|
export declare function encodeBase64(input: Uint8Array, output: Uint8Array): number;
|
|
27
|
-
export declare function decodeBase64(input: string): Uint8Array
|
|
27
|
+
export declare function decodeBase64(input: string): Uint8Array<ArrayBuffer>;
|
|
28
28
|
//# sourceMappingURL=base64.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base64.d.ts","sourceRoot":"","sources":["../../src/utils/base64.ts"],"names":[],"mappings":"AA6BA;;;;;GAKG;AACH,wBAAgB,4BAA4B,CACxC,WAAW,EAAE,MAAM,GACpB,CAAC,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAI/C;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"base64.d.ts","sourceRoot":"","sources":["../../src/utils/base64.ts"],"names":[],"mappings":"AA6BA;;;;;GAKG;AACH,wBAAgB,4BAA4B,CACxC,WAAW,EAAE,MAAM,GACpB,CAAC,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAI/C;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;AACzE;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;AA4O5E,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,CA4DnE"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yume-chan/adb",
|
|
3
|
-
"version": "2.0
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "TypeScript implementation of Android Debug Bridge (ADB) protocol.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"adb",
|
|
@@ -26,16 +26,16 @@
|
|
|
26
26
|
"types": "esm/index.d.ts",
|
|
27
27
|
"sideEffects": false,
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@yume-chan/async": "^4.
|
|
29
|
+
"@yume-chan/async": "^4.1.3",
|
|
30
30
|
"@yume-chan/event": "^2.0.0",
|
|
31
|
-
"@yume-chan/
|
|
32
|
-
"@yume-chan/
|
|
33
|
-
"@yume-chan/
|
|
31
|
+
"@yume-chan/stream-extra": "^2.1.0",
|
|
32
|
+
"@yume-chan/struct": "^2.0.1",
|
|
33
|
+
"@yume-chan/no-data-view": "^2.0.0"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@types/node": "^
|
|
36
|
+
"@types/node": "^24.0.1",
|
|
37
37
|
"prettier": "^3.5.3",
|
|
38
|
-
"typescript": "^5.8.
|
|
38
|
+
"typescript": "^5.8.3",
|
|
39
39
|
"@yume-chan/eslint-config": "^1.0.0",
|
|
40
40
|
"@yume-chan/test-runner": "^1.0.0",
|
|
41
41
|
"@yume-chan/tsconfig": "^1.0.0"
|
package/src/adb.ts
CHANGED
|
@@ -132,7 +132,7 @@ export class Adb implements Closeable {
|
|
|
132
132
|
}
|
|
133
133
|
|
|
134
134
|
rm(
|
|
135
|
-
filenames: string | string[],
|
|
135
|
+
filenames: string | readonly string[],
|
|
136
136
|
options?: { recursive?: boolean; force?: boolean },
|
|
137
137
|
): Promise<string> {
|
|
138
138
|
const args = ["rm"];
|
|
@@ -144,10 +144,12 @@ export class Adb implements Closeable {
|
|
|
144
144
|
}
|
|
145
145
|
if (Array.isArray(filenames)) {
|
|
146
146
|
for (const filename of filenames) {
|
|
147
|
-
|
|
147
|
+
// https://github.com/microsoft/typescript/issues/17002
|
|
148
|
+
args.push(escapeArg(filename as string));
|
|
148
149
|
}
|
|
149
150
|
} else {
|
|
150
|
-
|
|
151
|
+
// https://github.com/microsoft/typescript/issues/17002
|
|
152
|
+
args.push(escapeArg(filenames as string));
|
|
151
153
|
}
|
|
152
154
|
// https://android.googlesource.com/platform/packages/modules/adb/+/1a0fb8846d4e6b671c8aa7f137a8c21d7b248716/client/adb_install.cpp#984
|
|
153
155
|
args.push("</dev/null");
|
package/src/banner.ts
CHANGED
|
@@ -66,7 +66,7 @@ export class AdbBanner {
|
|
|
66
66
|
return this.#device;
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
-
readonly #features: AdbFeature[] = [];
|
|
69
|
+
readonly #features: readonly AdbFeature[] = [];
|
|
70
70
|
get features() {
|
|
71
71
|
return this.#features;
|
|
72
72
|
}
|
|
@@ -75,7 +75,7 @@ export class AdbBanner {
|
|
|
75
75
|
product: string | undefined,
|
|
76
76
|
model: string | undefined,
|
|
77
77
|
device: string | undefined,
|
|
78
|
-
features: AdbFeature[],
|
|
78
|
+
features: readonly AdbFeature[],
|
|
79
79
|
) {
|
|
80
80
|
this.#product = product;
|
|
81
81
|
this.#model = model;
|
|
@@ -28,7 +28,9 @@ export class AdbNoneProtocolSubprocessService extends AdbNoneProtocolSpawner {
|
|
|
28
28
|
this.#adb = adb;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
async pty(
|
|
31
|
+
async pty(
|
|
32
|
+
command?: string | readonly string[],
|
|
33
|
+
): Promise<AdbNoneProtocolPtyProcess> {
|
|
32
34
|
if (command === undefined) {
|
|
33
35
|
command = "";
|
|
34
36
|
} else if (Array.isArray(command)) {
|
|
@@ -36,7 +38,8 @@ export class AdbNoneProtocolSubprocessService extends AdbNoneProtocolSpawner {
|
|
|
36
38
|
}
|
|
37
39
|
|
|
38
40
|
return new AdbNoneProtocolPtyProcess(
|
|
39
|
-
|
|
41
|
+
// https://github.com/microsoft/typescript/issues/17002
|
|
42
|
+
await this.#adb.createSocket(`shell:${command as string}`),
|
|
40
43
|
);
|
|
41
44
|
}
|
|
42
45
|
}
|
|
@@ -28,13 +28,13 @@ export interface AdbNoneProtocolProcess {
|
|
|
28
28
|
|
|
29
29
|
export class AdbNoneProtocolSpawner {
|
|
30
30
|
readonly #spawn: (
|
|
31
|
-
command: string[],
|
|
31
|
+
command: readonly string[],
|
|
32
32
|
signal: AbortSignal | undefined,
|
|
33
33
|
) => Promise<AdbNoneProtocolProcess>;
|
|
34
34
|
|
|
35
35
|
constructor(
|
|
36
36
|
spawn: (
|
|
37
|
-
command: string[],
|
|
37
|
+
command: readonly string[],
|
|
38
38
|
signal: AbortSignal | undefined,
|
|
39
39
|
) => Promise<AdbNoneProtocolProcess>,
|
|
40
40
|
) {
|
|
@@ -42,7 +42,7 @@ export class AdbNoneProtocolSpawner {
|
|
|
42
42
|
}
|
|
43
43
|
|
|
44
44
|
spawn(
|
|
45
|
-
command: string | string[],
|
|
45
|
+
command: string | readonly string[],
|
|
46
46
|
signal?: AbortSignal,
|
|
47
47
|
): Promise<AdbNoneProtocolProcess> {
|
|
48
48
|
signal?.throwIfAborted();
|
|
@@ -54,12 +54,12 @@ export class AdbNoneProtocolSpawner {
|
|
|
54
54
|
return this.#spawn(command, signal);
|
|
55
55
|
}
|
|
56
56
|
|
|
57
|
-
async spawnWait(command: string | string[]): Promise<Uint8Array> {
|
|
57
|
+
async spawnWait(command: string | readonly string[]): Promise<Uint8Array> {
|
|
58
58
|
const process = await this.spawn(command);
|
|
59
59
|
return await process.output.pipeThrough(new ConcatBufferStream());
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
async spawnWaitText(command: string | string[]): Promise<string> {
|
|
62
|
+
async spawnWaitText(command: string | readonly string[]): Promise<string> {
|
|
63
63
|
const process = await this.spawn(command);
|
|
64
64
|
return await process.output
|
|
65
65
|
.pipeThrough(new TextDecoderStream())
|
|
@@ -32,7 +32,7 @@ export class AdbShellProtocolSubprocessService extends AdbShellProtocolSpawner {
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
async pty(options?: {
|
|
35
|
-
command?: string | string[] | undefined;
|
|
35
|
+
command?: string | readonly string[] | undefined;
|
|
36
36
|
terminalType?: string;
|
|
37
37
|
}): Promise<AdbShellProtocolPtyProcess> {
|
|
38
38
|
let service = "shell,v2,pty";
|
|
@@ -26,13 +26,13 @@ export interface AdbShellProtocolProcess {
|
|
|
26
26
|
|
|
27
27
|
export class AdbShellProtocolSpawner {
|
|
28
28
|
readonly #spawn: (
|
|
29
|
-
command: string[],
|
|
29
|
+
command: readonly string[],
|
|
30
30
|
signal: AbortSignal | undefined,
|
|
31
31
|
) => Promise<AdbShellProtocolProcess>;
|
|
32
32
|
|
|
33
33
|
constructor(
|
|
34
34
|
spawn: (
|
|
35
|
-
command: string[],
|
|
35
|
+
command: readonly string[],
|
|
36
36
|
signal: AbortSignal | undefined,
|
|
37
37
|
) => Promise<AdbShellProtocolProcess>,
|
|
38
38
|
) {
|
|
@@ -40,7 +40,7 @@ export class AdbShellProtocolSpawner {
|
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
spawn(
|
|
43
|
-
command: string | string[],
|
|
43
|
+
command: string | readonly string[],
|
|
44
44
|
signal?: AbortSignal,
|
|
45
45
|
): Promise<AdbShellProtocolProcess> {
|
|
46
46
|
signal?.throwIfAborted();
|
|
@@ -53,7 +53,7 @@ export class AdbShellProtocolSpawner {
|
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
async spawnWait(
|
|
56
|
-
command: string | string[],
|
|
56
|
+
command: string | readonly string[],
|
|
57
57
|
): Promise<AdbShellProtocolSpawner.WaitResult<Uint8Array>> {
|
|
58
58
|
const process = await this.spawn(command);
|
|
59
59
|
const [stdout, stderr, exitCode] = await Promise.all([
|
|
@@ -65,7 +65,7 @@ export class AdbShellProtocolSpawner {
|
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
async spawnWaitText(
|
|
68
|
-
command: string | string[],
|
|
68
|
+
command: string | readonly string[],
|
|
69
69
|
): Promise<AdbShellProtocolSpawner.WaitResult<string>> {
|
|
70
70
|
const process = await this.spawn(command);
|
|
71
71
|
const [stdout, stderr, exitCode] = await Promise.all([
|
|
@@ -4,7 +4,7 @@ import { decodeUtf8, string, struct, u32 } from "@yume-chan/struct";
|
|
|
4
4
|
|
|
5
5
|
import { unreachable } from "../../utils/no-op.js";
|
|
6
6
|
|
|
7
|
-
function encodeAsciiUnchecked(value: string): Uint8Array {
|
|
7
|
+
function encodeAsciiUnchecked(value: string): Uint8Array<ArrayBuffer> {
|
|
8
8
|
const result = new Uint8Array(value.length);
|
|
9
9
|
for (let i = 0; i < value.length; i += 1) {
|
|
10
10
|
result[i] = value.charCodeAt(i);
|
package/src/daemon/auth.ts
CHANGED
|
@@ -139,7 +139,7 @@ export const AdbPublicKeyAuthenticator: AdbAuthenticator = async function* (
|
|
|
139
139
|
};
|
|
140
140
|
};
|
|
141
141
|
|
|
142
|
-
export const ADB_DEFAULT_AUTHENTICATORS: AdbAuthenticator[] = [
|
|
142
|
+
export const ADB_DEFAULT_AUTHENTICATORS: readonly AdbAuthenticator[] = [
|
|
143
143
|
AdbSignatureAuthenticator,
|
|
144
144
|
AdbPublicKeyAuthenticator,
|
|
145
145
|
];
|
package/src/daemon/crypto.ts
CHANGED
|
@@ -140,7 +140,9 @@ export function adbGetPublicKeySize() {
|
|
|
140
140
|
return 4 + 4 + ModulusLengthInBytes + ModulusLengthInBytes + 4;
|
|
141
141
|
}
|
|
142
142
|
|
|
143
|
-
export function adbGeneratePublicKey(
|
|
143
|
+
export function adbGeneratePublicKey(
|
|
144
|
+
privateKey: Uint8Array,
|
|
145
|
+
): Uint8Array<ArrayBuffer>;
|
|
144
146
|
export function adbGeneratePublicKey(
|
|
145
147
|
privateKey: Uint8Array,
|
|
146
148
|
output: Uint8Array,
|
|
@@ -287,7 +289,10 @@ export const SHA1_DIGEST_INFO = new Uint8Array([
|
|
|
287
289
|
// encrypt the given data with its private key)
|
|
288
290
|
// However SubtileCrypto.encrypt() doesn't accept 'RSASSA-PKCS1-v1_5' algorithm
|
|
289
291
|
// So we need to implement the encryption by ourself
|
|
290
|
-
export function rsaSign(
|
|
292
|
+
export function rsaSign(
|
|
293
|
+
privateKey: Uint8Array,
|
|
294
|
+
data: Uint8Array,
|
|
295
|
+
): Uint8Array<ArrayBuffer> {
|
|
291
296
|
const [n, d] = rsaParsePrivateKey(privateKey);
|
|
292
297
|
|
|
293
298
|
// PKCS#1 padding
|
package/src/daemon/transport.ts
CHANGED
|
@@ -49,7 +49,7 @@ export const ADB_DAEMON_DEFAULT_FEATURES = /* #__PURE__ */ (() =>
|
|
|
49
49
|
"sendrecv_v2_zstd",
|
|
50
50
|
"sendrecv_v2_dry_run_send",
|
|
51
51
|
AdbFeature.DelayedAck,
|
|
52
|
-
] as AdbFeature[])();
|
|
52
|
+
] as readonly AdbFeature[])();
|
|
53
53
|
export const ADB_DAEMON_DEFAULT_INITIAL_PAYLOAD_SIZE = 32 * 1024 * 1024;
|
|
54
54
|
|
|
55
55
|
export type AdbDaemonConnection = ReadableWritablePair<
|
|
@@ -61,7 +61,7 @@ export interface AdbDaemonAuthenticationOptions {
|
|
|
61
61
|
serial: string;
|
|
62
62
|
connection: AdbDaemonConnection;
|
|
63
63
|
credentialStore: AdbCredentialStore;
|
|
64
|
-
authenticators?: AdbAuthenticator[];
|
|
64
|
+
authenticators?: readonly AdbAuthenticator[];
|
|
65
65
|
features?: readonly AdbFeature[];
|
|
66
66
|
|
|
67
67
|
/**
|
package/src/server/client.ts
CHANGED
|
@@ -12,6 +12,7 @@ import type {
|
|
|
12
12
|
import { AbortController } from "@yume-chan/stream-extra";
|
|
13
13
|
|
|
14
14
|
import type { AdbIncomingSocketHandler, AdbSocket, Closeable } from "../adb.js";
|
|
15
|
+
import { Adb } from "../adb.js";
|
|
15
16
|
import { AdbBanner } from "../banner.js";
|
|
16
17
|
import type { DeviceObserver as DeviceObserverBase } from "../device-observer.js";
|
|
17
18
|
import type { AdbFeature } from "../features.js";
|
|
@@ -36,7 +37,13 @@ export class AdbServerClient {
|
|
|
36
37
|
static UnauthorizedError = _UnauthorizedError;
|
|
37
38
|
static AlreadyConnectedError = _AlreadyConnectedError;
|
|
38
39
|
|
|
39
|
-
static parseDeviceList(
|
|
40
|
+
static parseDeviceList(
|
|
41
|
+
value: string,
|
|
42
|
+
includeStates: readonly AdbServerClient.ConnectionState[] = [
|
|
43
|
+
"device",
|
|
44
|
+
"unauthorized",
|
|
45
|
+
],
|
|
46
|
+
): AdbServerClient.Device[] {
|
|
40
47
|
const devices: AdbServerClient.Device[] = [];
|
|
41
48
|
for (const line of value.split("\n")) {
|
|
42
49
|
if (!line) {
|
|
@@ -45,8 +52,8 @@ export class AdbServerClient {
|
|
|
45
52
|
|
|
46
53
|
const parts = line.split(" ").filter(Boolean);
|
|
47
54
|
const serial = parts[0]!;
|
|
48
|
-
const
|
|
49
|
-
if (
|
|
55
|
+
const state = parts[1]! as AdbServerClient.ConnectionState;
|
|
56
|
+
if (!includeStates.includes(state)) {
|
|
50
57
|
continue;
|
|
51
58
|
}
|
|
52
59
|
|
|
@@ -76,7 +83,8 @@ export class AdbServerClient {
|
|
|
76
83
|
}
|
|
77
84
|
devices.push({
|
|
78
85
|
serial,
|
|
79
|
-
|
|
86
|
+
state,
|
|
87
|
+
authenticating: state === "unauthorized",
|
|
80
88
|
product,
|
|
81
89
|
model,
|
|
82
90
|
device,
|
|
@@ -192,11 +200,16 @@ export class AdbServerClient {
|
|
|
192
200
|
*
|
|
193
201
|
* Equivalent ADB Command: `adb devices -l`
|
|
194
202
|
*/
|
|
195
|
-
async getDevices(
|
|
203
|
+
async getDevices(
|
|
204
|
+
includeStates: readonly AdbServerClient.ConnectionState[] = [
|
|
205
|
+
"device",
|
|
206
|
+
"unauthorized",
|
|
207
|
+
],
|
|
208
|
+
): Promise<AdbServerClient.Device[]> {
|
|
196
209
|
const connection = await this.createConnection("host:devices-l");
|
|
197
210
|
try {
|
|
198
211
|
const response = await connection.readString();
|
|
199
|
-
return AdbServerClient.parseDeviceList(response);
|
|
212
|
+
return AdbServerClient.parseDeviceList(response, includeStates);
|
|
200
213
|
} finally {
|
|
201
214
|
await connection.dispose();
|
|
202
215
|
}
|
|
@@ -206,7 +219,7 @@ export class AdbServerClient {
|
|
|
206
219
|
* Monitors device list changes.
|
|
207
220
|
*/
|
|
208
221
|
async trackDevices(
|
|
209
|
-
options?:
|
|
222
|
+
options?: AdbServerDeviceObserverOwner.Options,
|
|
210
223
|
): Promise<AdbServerClient.DeviceObserver> {
|
|
211
224
|
return this.#observerOwner.createObserver(options);
|
|
212
225
|
}
|
|
@@ -236,7 +249,7 @@ export class AdbServerClient {
|
|
|
236
249
|
*/
|
|
237
250
|
async getDeviceFeatures(
|
|
238
251
|
device: AdbServerClient.DeviceSelector,
|
|
239
|
-
): Promise<{ transportId: bigint; features: AdbFeature[] }> {
|
|
252
|
+
): Promise<{ transportId: bigint; features: readonly AdbFeature[] }> {
|
|
240
253
|
// On paper, `host:features` is a host service (device features are cached in host),
|
|
241
254
|
// so it shouldn't use `createDeviceConnection`,
|
|
242
255
|
// which is used to forward the service to the device.
|
|
@@ -462,6 +475,11 @@ export class AdbServerClient {
|
|
|
462
475
|
|
|
463
476
|
return transport;
|
|
464
477
|
}
|
|
478
|
+
|
|
479
|
+
async createAdb(device: AdbServerClient.DeviceSelector) {
|
|
480
|
+
const transport = await this.createTransport(device);
|
|
481
|
+
return new Adb(transport);
|
|
482
|
+
}
|
|
465
483
|
}
|
|
466
484
|
|
|
467
485
|
export async function raceSignal<T>(
|
|
@@ -536,8 +554,12 @@ export namespace AdbServerClient {
|
|
|
536
554
|
| { tcp: true }
|
|
537
555
|
| undefined;
|
|
538
556
|
|
|
557
|
+
export type ConnectionState = "unauthorized" | "offline" | "device";
|
|
558
|
+
|
|
539
559
|
export interface Device {
|
|
540
560
|
serial: string;
|
|
561
|
+
state: ConnectionState;
|
|
562
|
+
/** @deprecated Use {@link state} instead */
|
|
541
563
|
authenticating: boolean;
|
|
542
564
|
product?: string | undefined;
|
|
543
565
|
model?: string | undefined;
|