@yume-chan/adb 3.0.0-beta.0 → 3.0.0-beta.1

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.
Files changed (19) hide show
  1. package/esm/server/client.d.ts +4 -3
  2. package/esm/server/client.d.ts.map +1 -1
  3. package/esm/server/client.js +13 -12
  4. package/esm/server/client.js.map +1 -1
  5. package/esm/service/subprocess/none/spawner.d.ts.map +1 -1
  6. package/esm/service/subprocess/none/spawner.js +10 -5
  7. package/esm/service/subprocess/none/spawner.js.map +1 -1
  8. package/esm/service/subprocess/shell/process.d.ts.map +1 -1
  9. package/esm/service/subprocess/shell/process.js +7 -9
  10. package/esm/service/subprocess/shell/process.js.map +1 -1
  11. package/esm/service/subprocess/shell/spawner.d.ts.map +1 -1
  12. package/esm/service/subprocess/shell/spawner.js +16 -11
  13. package/esm/service/subprocess/shell/spawner.js.map +1 -1
  14. package/package.json +7 -7
  15. package/src/server/client.ts +18 -11
  16. package/src/service/subprocess/none/spawner.ts +9 -5
  17. package/src/service/subprocess/shell/process.ts +7 -10
  18. package/src/service/subprocess/shell/spawner.ts +15 -11
  19. package/yume-chan-adb-3.0.0-beta.0.tgz +0 -0
package/esm/server/client.d.ts CHANGED
@@ -28,8 +28,8 @@ export declare class AdbServerClient {
28
28
  /**
29
29
  * `adb version`
30
30
  */
31
- getVersion(): Promise<number>;
32
- validateVersion(minimalVersion: number): Promise<void>;
31
+ getVersion(options?: AdbServerClient.ServerConnectionOptions): Promise<number>;
32
+ validateVersion(minimalVersion: number, options?: AdbServerClient.ServerConnectionOptions): Promise<void>;
33
33
  /**
34
34
  * `adb kill-server`
35
35
  */
@@ -67,9 +67,10 @@ export declare class AdbServerClient {
67
67
  * Creates a connection that will forward the service to device.
68
68
  * @param device The device selector
69
69
  * @param service The service to forward
70
+ * @param options The server connection options
70
71
  * @returns An `AdbServerClient.Socket` that can be used to communicate with the service
71
72
  */
72
- createDeviceConnection(device: AdbServerClient.DeviceSelector, service: string): Promise<AdbServerClient.Socket>;
73
+ createDeviceConnection(device: AdbServerClient.DeviceSelector, service: string, options?: AdbServerClient.ServerConnectionOptions): Promise<AdbServerClient.Socket>;
73
74
  /**
74
75
  * Wait for a device to be connected or disconnected.
75
76
  *
package/esm/server/client.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,oBAAoB,EACvB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAEhC,OAAO,KAAK,EAAE,cAAc,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EACH,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,IAAI,sBAAsB,EAC/C,YAAY,IAAI,aAAa,EAC7B,iBAAiB,IAAI,kBAAkB,EAC1C,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AA2BpD;;GAEG;AACH,qBAAa,eAAe;;IAExB,MAAM,CAAC,eAAe,oIAWX;IAEX,MAAM,CAAC,YAAY,uBAAiB;IACpC,MAAM,CAAC,iBAAiB,4BAAsB;IAC9C,MAAM,CAAC,qBAAqB,gCAA0B;IAEtD,MAAM,CAAC,eAAe,CAClB,KAAK,EAAE,MAAM,EACb,aAAa,GAAE,SAAS,eAAe,CAAC,eAAe,EAGtD,GACF,eAAe,CAAC,MAAM,EAAE;IA4D3B,MAAM,CAAC,mBAAmB,CACtB,MAAM,EAAE,eAAe,CAAC,cAAc,EACtC,OAAO,EAAE,MAAM;IAoBnB,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC,eAAe,CAAC;IAEpD,QAAQ,CAAC,QAAQ,mBAA8B;IAC/C,QAAQ,CAAC,IAAI,eAA0B;gBAG3B,SAAS,EAAE,eAAe,CAAC,eAAe;IAIhD,gBAAgB,CAClB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,eAAe,CAAC,uBAAuB,GAClD,OAAO,CAAC,uBAAuB,CAAC;IAcnC;;OAEG;IACG,UAAU,CACZ,OAAO,CAAC,EAAE,eAAe,CAAC,uBAAuB,GAClD,OAAO,CAAC,MAAM,CAAC;IAWZ,eAAe,CACjB,cAAc,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,eAAe,CAAC,uBAAuB;IAUrD;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAUhD;;;;OAIG;IACG,UAAU,CACZ,aAAa,GAAE,SAAS,eAAe,CAAC,eAAe,EAGtD,GACF,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;IAUpC;;OAEG;IACG,YAAY,CACd,OAAO,CAAC,EAAE,4BAA4B,CAAC,OAAO,GAC/C,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC;IAI1C;;OAEG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,cAAc,GAAG,SAAS;IAaxE;;;;;;OAMG;IACG,iBAAiB,CACnB,MAAM,EAAE,eAAe,CAAC,cAAc,GACvC,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,SAAS,UAAU,EAAE,CAAA;KAAE,CAAC;IAgCpE;;;;;;OAMG;IACG,sBAAsB,CACxB,MAAM,EAAE,eAAe,CAAC,cAAc,EACtC,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,eAAe,CAAC,uBAAuB,GAClD,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;IAqFlC;;;;;;;;;OASG;IACG,OAAO,CACT,MAAM,EAAE,eAAe,CAAC,cAAc,EACtC,KAAK,EAAE,QAAQ,GAAG,YAAY,EAC9B,OAAO,CAAC,EAAE,eAAe,CAAC,uBAAuB,GAClD,OAAO,CAAC,IAAI,CAAC;IAQV,iBAAiB,CACnB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,eAAe,CAAC,uBAAuB,GAClD,OAAO,CAAC,IAAI,CAAC;IA6BhB;;OAEG;IACG,eAAe,CACjB,MAAM,EAAE,eAAe,CAAC,cAAc,GACvC,OAAO,CAAC,kBAAkB,CAAC;IAmCxB,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,cAAc;CAIzD;AAED,yBAAiB,eAAe,CAAC;IAC7B,UAAiB,uBAAuB;QACpC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC5B,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;KACpC;IAED,UAAiB,gBACb,SACI,oBAAoB,CAAC,UAAU,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC,EAC7D,SAAS;QACb,IAAI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;KACpC;IAED,UAAiB,eAAe;QAC5B,OAAO,CACH,OAAO,CAAC,EAAE,uBAAuB,GAClC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QAEtC,gBAAgB,CACZ,OAAO,EAAE,GAAG,CAAC,qBAAqB,EAClC,OAAO,CAAC,EAAE,MAAM,GACjB,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAE5B,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAE7D,mBAAmB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;KACjD;IAED,UAAiB,MAAO,SAAQ,GAAG,CAAC,MAAM;QACtC,WAAW,EAAE,MAAM,CAAC;KACvB;IAED;;OAEG;IACH,KAAY,cAAc,GACpB;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,GACvB;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAClB;QAAE,GAAG,EAAE,IAAI,CAAA;KAAE,GACb;QAAE,GAAG,EAAE,IAAI,CAAA;KAAE,GACb,SAAS,CAAC;IAEhB,KAAY,eAAe,GACvB,CAAC,OAAO,eAAe,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;IAErD,UAAiB,MAAM;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,eAAe,CAAC;QACvB,4CAA4C;QAC5C,cAAc,EAAE,OAAO,CAAC;QACxB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,WAAW,EAAE,MAAM,CAAC;KACvB;IAED,UAAiB,cAAe,SAAQ,kBAAkB,CAAC,MAAM,CAAC;QAC9D,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;KACzB;IAED,KAAY,YAAY,GAAG,aAAa,CAAC;IACzC,KAAY,iBAAiB,GAAG,kBAAkB,CAAC;IACnD,KAAY,qBAAqB,GAAG,sBAAsB,CAAC;CAC9D"}
package/esm/server/client.js CHANGED
@@ -137,8 +137,8 @@ export class AdbServerClient {
137
137
  /**
138
138
  * `adb version`
139
139
  */
140
- async getVersion() {
141
- const connection = await this.createConnection("host:version");
140
+ async getVersion(options) {
141
+ const connection = await this.createConnection("host:version", options);
142
142
  try {
143
143
  const length = hexToNumber(await connection.readExactly(4));
144
144
  const version = hexToNumber(await connection.readExactly(length));
@@ -148,8 +148,8 @@ export class AdbServerClient {
148
148
  await connection.dispose();
149
149
  }
150
150
  }
151
- async validateVersion(minimalVersion) {
152
- const version = await this.getVersion();
151
+ async validateVersion(minimalVersion, options) {
152
+ const version = await this.getVersion(options);
153
153
  if (version < minimalVersion) {
154
154
  throw new Error(`adb server version (${version}) doesn't match this client (${minimalVersion})`);
155
155
  }
@@ -252,13 +252,14 @@ export class AdbServerClient {
252
252
  * Creates a connection that will forward the service to device.
253
253
  * @param device The device selector
254
254
  * @param service The service to forward
255
+ * @param options The server connection options
255
256
  * @returns An `AdbServerClient.Socket` that can be used to communicate with the service
256
257
  */
257
- async createDeviceConnection(device, service) {
258
+ async createDeviceConnection(device, service, options) {
258
259
  let switchService;
259
260
  let transportId;
260
261
  if (!device) {
261
- await this.validateVersion(41);
262
+ await this.validateVersion(41, options);
262
263
  switchService = `host:tport:any`;
263
264
  }
264
265
  else if ("transportId" in device) {
@@ -266,21 +267,21 @@ export class AdbServerClient {
266
267
  transportId = device.transportId;
267
268
  }
268
269
  else if ("serial" in device) {
269
- await this.validateVersion(41);
270
+ await this.validateVersion(41, options);
270
271
  switchService = `host:tport:serial:${device.serial}`;
271
272
  }
272
273
  else if ("usb" in device) {
273
- await this.validateVersion(41);
274
+ await this.validateVersion(41, options);
274
275
  switchService = `host:tport:usb`;
275
276
  }
276
277
  else if ("tcp" in device) {
277
- await this.validateVersion(41);
278
+ await this.validateVersion(41, options);
278
279
  switchService = `host:tport:local`;
279
280
  }
280
281
  else {
281
282
  throw new TypeError("Invalid device selector");
282
283
  }
283
- const connection = await this.createConnection(switchService);
284
+ const connection = await this.createConnection(switchService, options);
284
285
  try {
285
286
  await connection.writeString(service);
286
287
  if (transportId === undefined) {
@@ -344,12 +345,12 @@ export class AdbServerClient {
344
345
  */
345
346
  async waitFor(device, state, options) {
346
347
  if (state === "disconnect") {
347
- await this.validateVersion(41);
348
+ await this.validateVersion(41, options);
348
349
  }
349
350
  return this.#waitForUnchecked(device, state, options);
350
351
  }
351
352
  async waitForDisconnect(transportId, options) {
352
- const serverVersion = await this.getVersion();
353
+ const serverVersion = await this.getVersion(options);
353
354
  if (serverVersion >= 41) {
354
355
  return this.#waitForUnchecked({ transportId }, "disconnect", options);
355
356
  }
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":"AAAA,sBAAsB;AAItB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAMhE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAG1D,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EACH,YAAY,EACZ,gBAAgB,EAChB,qBAAqB,IAAI,sBAAsB,EAC/C,YAAY,IAAI,aAAa,EAC7B,iBAAiB,IAAI,kBAAkB,GAC1C,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,4BAA4B,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,MAAM,cAAc,GAAG,gBAAgB,CAAC;AACxC,MAAM,SAAS,GAAG,UAAU,CAAC;AAC7B,MAAM,QAAQ,GAAG,SAAS,CAAC;AAC3B,MAAM,UAAU,GAAG,WAAW,CAAC;AAE/B,SAAS,mBAAmB,CAIxB,IAAY,EACZ,GAAW,EACX,GAAW,EACX,QAAmB;IAEnB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;IAC7C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACf,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,EAAE,SAAkB,CAAU,CAAC;QAC9C,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC;QACpD,CAAC;IACL,CAAC;IACD,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,GAAG,CAAM,CAAU,CAAC;AAC1E,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,eAAe;IACxB,wHAAwH;IACxH,MAAM,CAAC,eAAe,GAAG;QACrB,SAAS;QACT,YAAY;QACZ,QAAQ;QACR,MAAM;QACN,UAAU;QACV,QAAQ;QACR,UAAU;QACV,cAAc;QACd,aAAa;QACb,UAAU;KACJ,CAAC;IAEX,MAAM,CAAC,YAAY,GAAG,aAAa,CAAC;IACpC,MAAM,CAAC,iBAAiB,GAAG,kBAAkB,CAAC;IAC9C,MAAM,CAAC,qBAAqB,GAAG,sBAAsB,CAAC;IAEtD,MAAM,CAAC,eAAe,CAClB,KAAa,EACb,gBAA4D;QACxD,QAAQ;QACR,cAAc;KACjB;QAED,MAAM,OAAO,GAA6B,EAAE,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,SAAS;YACb,CAAC;YAED,yDAAyD;YAEzD,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;YACtB,IAAI,KAAa,CAAC;YAElB,mBAAmB;YACnB,wCAAwC;YACxC,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;YAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAElC,wBAAwB;YACxB,IAAI,MAA0B,CAAC;YAC/B,wCAAwC;YACxC,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;YAEhE,uBAAuB;YACvB,IAAI,KAAyB,CAAC;YAC9B,wCAAwC;YACxC,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;YAE9D,yBAAyB;YACzB,IAAI,OAA2B,CAAC;YAChC,wCAAwC;YACxC,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;YAElE,IAAI,KAAsC,CAAC;YAC3C,GAAG,CAAC;gBACA,mBAAmB;gBACnB,uCAAuC;gBACvC,gEAAgE;gBAChE,6CAA6C;gBAC7C,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YACvD,CAAC,QAAQ,CAAC,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAE3D,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjC,SAAS;YACb,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAE7C,OAAO,CAAC,IAAI,CAAC;gBACT,MAAM;gBACN,KAAK;gBACL,cAAc,EAAE,KAAK,KAAK,cAAc;gBACxC,OAAO;gBACP,KAAK;gBACL,MAAM;gBACN,WAAW;aACd,CAAC,CAAC;QACP,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,MAAM,CAAC,mBAAmB,CACtB,MAAsC,EACtC,OAAe;QAEf,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,QAAQ,OAAO,EAAE,CAAC;QAC7B,CAAC;QACD,IAAI,aAAa,IAAI,MAAM,EAAE,CAAC;YAC1B,OAAO,qBAAqB,MAAM,CAAC,WAAW,IAAI,OAAO,EAAE,CAAC;QAChE,CAAC;QACD,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;YACrB,OAAO,eAAe,MAAM,CAAC,MAAM,IAAI,OAAO,EAAE,CAAC;QACrD,CAAC;QACD,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YAClB,OAAO,YAAY,OAAO,EAAE,CAAC;QACjC,CAAC;QACD,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YAClB,OAAO,cAAc,OAAO,EAAE,CAAC;QACnC,CAAC;QACD,MAAM,IAAI,SAAS,CAAC,yBAAyB,CAAC,CAAC;IACnD,CAAC;IAEQ,SAAS,CAAkC;IAE3C,QAAQ,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IAC9B,cAAc,GAAG,IAAI,4BAA4B,CAAC,IAAI,CAAC,CAAC;IAEjE,YAAY,SAA0C;QAClD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,OAAe,EACf,OAAiD;QAEjD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACzD,MAAM,cAAc,GAAG,IAAI,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAE/D,IAAI,CAAC;YACD,MAAM,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC1C,MAAM,cAAc,CAAC,QAAQ,EAAE,CAAC;YAChC,OAAO,cAAc,CAAC;QAC1B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,cAAc,CAAC,OAAO,EAAE,CAAC;YAC/B,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU,CACZ,OAAiD;QAEjD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACxE,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5D,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YAClE,OAAO,OAAO,CAAC;QACnB,CAAC;gBAAS,CAAC;YACP,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,cAAsB,EACtB,OAAiD;QAEjD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,OAAO,GAAG,cAAc,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACX,uBAAuB,OAAO,gCAAgC,cAAc,GAAG,CAClF,CAAC;QACN,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,UAAU;QACZ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC5D,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB;QACnB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;QACrE,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;YAC/C,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAiB,CAAC;QAC/C,CAAC;gBAAS,CAAC;YACP,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CACZ,gBAA4D;QACxD,QAAQ;QACR,cAAc;KACjB;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QACjE,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;YAC/C,OAAO,eAAe,CAAC,eAAe,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QACpE,CAAC;gBAAS,CAAC;YACP,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CACd,OAA8C;QAE9C,OAAO,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,MAAkD;QACpE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAC1C,MAAM,KAAK,SAAS;YAChB,CAAC,CAAC,wBAAwB;YAC1B,CAAC,CAAC,eAAe,CAAC,mBAAmB,CAAC,MAAM,EAAE,WAAW,CAAC,CACjE,CAAC;QACF,IAAI,CAAC;YACD,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;QAClC,CAAC;gBAAS,CAAC;YACP,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,iBAAiB,CACnB,MAAsC;QAEtC,oFAAoF;QACpF,gDAAgD;QAChD,sDAAsD;QACtD,EAAE;QACF,2DAA2D;QAC3D,EAAE;QACF,sFAAsF;QACtF,mFAAmF;QACnF,EAAE;QACF,4FAA4F;QAC5F,gEAAgE;QAChE,EAAE;QACF,yFAAyF;QACzF,yFAAyF;QACzF,kEAAkE;QAClE,6CAA6C;QAC7C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAChD,MAAM,EACN,eAAe,CAClB,CAAC;QACF,yFAAyF;QACzF,MAAM,cAAc,GAAG,IAAI,uBAAuB,CAAC,UAAU,CAAC,CAAC;QAC/D,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,CAAC;YACzD,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAiB,CAAC;YAC3D,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC;QAC7D,CAAC;gBAAS,CAAC;YACP,MAAM,cAAc,CAAC,OAAO,EAAE,CAAC;QACnC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,sBAAsB,CACxB,MAAsC,EACtC,OAAe,EACf,OAAiD;QAEjD,IAAI,aAAqB,CAAC;QAC1B,IAAI,WAA+B,CAAC;QACpC,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YACxC,aAAa,GAAG,gBAAgB,CAAC;QACrC,CAAC;aAAM,IAAI,aAAa,IAAI,MAAM,EAAE,CAAC;YACjC,aAAa,GAAG,qBAAqB,MAAM,CAAC,WAAW,EAAE,CAAC;YAC1D,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACrC,CAAC;aAAM,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YACxC,aAAa,GAAG,qBAAqB,MAAM,CAAC,MAAM,EAAE,CAAC;QACzD,CAAC;aAAM,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YACxC,aAAa,GAAG,gBAAgB,CAAC;QACrC,CAAC;aAAM,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YACxC,aAAa,GAAG,kBAAkB,CAAC;QACvC,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAEvE,IAAI,CAAC;YACD,MAAM,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAEtC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC5B,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC9C,WAAW,GAAG,qBAAqB,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,UAAU,CAAC,QAAQ,EAAE,CAAC;YAE5B,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;YAEpC,OAAO;gBACH,WAAW;gBACX,OAAO;gBACP,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,IAAI,MAAM;oBACN,OAAO,MAAM,CAAC,MAAM,CAAC;gBACzB,CAAC;gBACD,KAAK,CAAC,KAAK;oBACP,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;gBACzB,CAAC;aACJ,CAAC;QACN,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;YAC3B,MAAM,CAAC,CAAC;QACZ,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CACnB,MAAsC,EACtC,KAA8B,EAC9B,OAAiD;QAEjD,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC,MAAM,IAAI,aAAa,IAAI,MAAM,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;YAC3D,IAAI,GAAG,KAAK,CAAC;QACjB,CAAC;aAAM,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,GAAG,KAAK,CAAC;QACjB,CAAC;aAAM,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,GAAG,OAAO,CAAC;QACnB,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACnD,CAAC;QAED,0DAA0D;QAC1D,8BAA8B;QAC9B,MAAM,OAAO,GAAG,eAAe,CAAC,mBAAmB,CAC/C,MAAM,EACN,YAAY,IAAI,IAAI,KAAK,EAAE,CAC9B,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACjE,IAAI,CAAC;YACD,MAAM,UAAU,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC;gBAAS,CAAC;YACP,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,OAAO,CACT,MAAsC,EACtC,KAA8B,EAC9B,OAAiD;QAEjD,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;YACzB,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5C,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,iBAAiB,CACnB,WAAmB,EACnB,OAAiD;QAEjD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,aAAa,IAAI,EAAE,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,iBAAiB,CACzB,EAAE,WAAW,EAAE,EACf,YAAY,EACZ,OAAO,CACV,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YAClD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACzC,QAAQ,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE;oBAChC,IACI,OAAO,CAAC,IAAI,CACR,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,WAAW,CACjD,EACH,CAAC;wBACC,QAAQ,CAAC,KAAK,EAAE,CAAC;wBACjB,OAAO,EAAE,CAAC;oBACd,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACjB,MAAM,CAAC,CAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,eAAe,CACjB,MAAsC;QAEtC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAEvE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CACrB,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,WAAW,CACjD,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,SAAS,CACxB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,OAAO,EACb,IAAI,EAAE,KAAK,EACX,IAAI,EAAE,MAAM,EACZ,QAAQ,CACX,CAAC;QAEF,MAAM,mBAAmB,GAAG,IAAI,eAAe,EAAE,CAAC;QAClD,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE;YACrD,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,mBAAmB,CAAC,MAAM;SACrC,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,kBAAkB,CACpC,IAAI,EACJ,IAAI,EAAE,MAAM,IAAI,EAAE,EAClB,MAAM,EACN,WAAW,EACX,YAAY,CACf,CAAC;QAEF,KAAK,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,CAAC;QAEvE,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAsC;QAClD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACrD,OAAO,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IAC9B,CAAC"}
package/esm/service/subprocess/none/spawner.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/none/spawner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,cAAc,EACd,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxD,MAAM,WAAW,sBAAsB;IACnC,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAEzD;;OAEG;IACH,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,sBAAsB,GAAG,CACjC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACnC,MAAM,CAAC,EAAE,WAAW,KACnB,OAAO,CAAC,sBAAsB,CAAC,GAChC,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AAElD,wBAAgB,sBAAsB,CAClC,KAAK,EAAE,CACH,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,MAAM,EAAE,WAAW,GAAG,SAAS,KAC9B,OAAO,CAAC,sBAAsB,CAAC,GACrC,sBAAsB,CAuCxB"}
1
+ {"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/none/spawner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,cAAc,EACd,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxD,MAAM,WAAW,sBAAsB;IACnC,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAEzD;;OAEG;IACH,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,sBAAsB,GAAG,CACjC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACnC,MAAM,CAAC,EAAE,WAAW,KACnB,OAAO,CAAC,sBAAsB,CAAC,GAChC,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AAElD,wBAAgB,sBAAsB,CAClC,KAAK,EAAE,CACH,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,MAAM,EAAE,WAAW,GAAG,SAAS,KAC9B,OAAO,CAAC,sBAAsB,CAAC,GACrC,sBAAsB,CA2CxB"}
package/esm/service/subprocess/none/spawner.js CHANGED
@@ -9,11 +9,16 @@ export function adbNoneProtocolSpawner(spawn) {
9
9
  const processPromise = spawn(command, signal);
10
10
  processPromise.wait = (options) => {
11
11
  const waitPromise = processPromise.then(async (process) => {
12
- const [, output] = await Promise.all([
13
- options?.stdin?.pipeTo(process.stdin),
14
- process.output.pipeThrough(new ToArrayStream()),
15
- ]);
16
- return output;
12
+ try {
13
+ const [, output] = await Promise.all([
14
+ options?.stdin?.pipeTo(process.stdin),
15
+ process.output.pipeThrough(new ToArrayStream()),
16
+ ]);
17
+ return output;
18
+ }
19
+ finally {
20
+ await process.kill();
21
+ }
17
22
  });
18
23
  return createLazyPromise(async () => {
19
24
  const chunks = await waitPromise;
package/esm/service/subprocess/none/spawner.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../../../src/service/subprocess/none/spawner.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,aAAa,GAChB,MAAM,aAAa,CAAC;AAqBrB,MAAM,UAAU,sBAAsB,CAClC,KAGoC;IAEpC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACvB,MAAM,EAAE,cAAc,EAAE,CAAC;QAEzB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,CACxB,OAAO,EACP,MAAM,CAEuC,CAAC;QAElD,cAAc,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtD,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACjC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;oBACrC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;iBAClD,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,OAAO,iBAAiB,CACpB,KAAK,IAAI,EAAE;gBACP,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;gBACjC,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC,EACD;gBACI,KAAK,CAAC,QAAQ;oBACV,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;oBACjC,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBACrC,CAAC;aACJ,CACJ,CAAC;QACN,CAAC,CAAC;QAEF,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../../../src/service/subprocess/none/spawner.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,aAAa,GAChB,MAAM,aAAa,CAAC;AAqBrB,MAAM,UAAU,sBAAsB,CAClC,KAGoC;IAEpC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACvB,MAAM,EAAE,cAAc,EAAE,CAAC;QAEzB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,CACxB,OAAO,EACP,MAAM,CAEuC,CAAC;QAElD,cAAc,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtD,IAAI,CAAC;oBACD,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;wBACjC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;wBACrC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;qBAClD,CAAC,CAAC;oBACH,OAAO,MAAM,CAAC;gBAClB,CAAC;wBAAS,CAAC;oBACP,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzB,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,iBAAiB,CACpB,KAAK,IAAI,EAAE;gBACP,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;gBACjC,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC,EACD;gBACI,KAAK,CAAC,QAAQ;oBACV,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;oBACjC,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBACrC,CAAC;aACJ,CACJ,CAAC;QACN,CAAC,CAAC;QAEF,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAC;AACN,CAAC"}
package/esm/service/subprocess/shell/process.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/process.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EACR,WAAW,EAEX,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,eAAe,EAGf,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAG3C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAE5D,qBAAa,2BAA4B,YAAW,uBAAuB;;IAKvE,IAAI,KAAK,iEAER;IAGD,IAAI,MAAM,gDAET;IAGD,IAAI,MAAM,gDAET;IAGD,IAAI,MAAM,oBAET;gBAEW,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAsFpD,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC;CAGjC"}
1
+ {"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/process.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EACR,WAAW,EAEX,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,eAAe,EAGf,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAG3C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAE5D,qBAAa,2BAA4B,YAAW,uBAAuB;;IAKvE,IAAI,KAAK,iEAER;IAGD,IAAI,MAAM,gDAET;IAGD,IAAI,MAAM,gDAET;IAGD,IAAI,MAAM,oBAET;gBAEW,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAmFpD,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC;CAGjC"}
package/esm/service/subprocess/shell/process.js CHANGED
@@ -65,15 +65,13 @@ export class AdbShellProtocolProcessImpl {
65
65
  // If `exited` has already settled, this will be a no-op
66
66
  exited.reject(e);
67
67
  });
68
- if (signal) {
69
- // `signal` won't affect `this.stdout` and `this.stderr`
70
- // So remaining data can still be read
71
- // (call `controller.error` will discard all pending data)
72
- signal.addEventListener("abort", () => {
73
- exited.reject(signal.reason);
74
- this.#socket.close();
75
- });
76
- }
68
+ // `signal` won't affect `this.stdout` and `this.stderr`
69
+ // So remaining data can still be read
70
+ // (call `controller.error` will discard all pending data)
71
+ signal?.addEventListener("abort", () => {
72
+ exited.reject(signal.reason);
73
+ this.#socket.close();
74
+ });
77
75
  this.#writer = this.#socket.writable.getWriter();
78
76
  this.#stdin = new MaybeConsumable.WritableStream({
79
77
  write: (chunk) => this.#writer.write(AdbShellProtocolPacket.serialize({
package/esm/service/subprocess/shell/process.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"process.js","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/process.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"process.js","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/process.ts"],"names":[],"mappings":"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"}
package/esm/service/subprocess/shell/spawner.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/spawner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,cAAc,EACd,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxD,MAAM,WAAW,uBAAuB;IACpC,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAEzD,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IACzC,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,uBAAuB,GAAG,CAClC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACnC,MAAM,CAAC,EAAE,WAAW,KACnB,OAAO,CAAC,uBAAuB,CAAC,GACjC,oBAAoB,CAAC,IAAI,CACrB,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,EAC9C,uBAAuB,CAAC,UAAU,CAAC,MAAM,CAAC,CAC7C,CAAC;AAEN,yBAAiB,uBAAuB,CAAC;IACrC,UAAiB,UAAU,CAAC,CAAC;QACzB,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,EAAE,CAAC,CAAC;QACV,QAAQ,EAAE,MAAM,CAAC;KACpB;CACJ;AAED,wBAAgB,uBAAuB,CACnC,KAAK,EAAE,CACH,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,MAAM,EAAE,WAAW,GAAG,SAAS,KAC9B,OAAO,CAAC,uBAAuB,CAAC,GACtC,uBAAuB,CA0DzB"}
1
+ {"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/spawner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,cAAc,EACd,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxD,MAAM,WAAW,uBAAuB;IACpC,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAEzD,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IACzC,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,uBAAuB,GAAG,CAClC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACnC,MAAM,CAAC,EAAE,WAAW,KACnB,OAAO,CAAC,uBAAuB,CAAC,GACjC,oBAAoB,CAAC,IAAI,CACrB,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,EAC9C,uBAAuB,CAAC,UAAU,CAAC,MAAM,CAAC,CAC7C,CAAC;AAEN,yBAAiB,uBAAuB,CAAC;IACrC,UAAiB,UAAU,CAAC,CAAC;QACzB,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,EAAE,CAAC,CAAC;QACV,QAAQ,EAAE,MAAM,CAAC;KACpB;CACJ;AAED,wBAAgB,uBAAuB,CACnC,KAAK,EAAE,CACH,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,MAAM,EAAE,WAAW,GAAG,SAAS,KAC9B,OAAO,CAAC,uBAAuB,CAAC,GACtC,uBAAuB,CA8DzB"}
package/esm/service/subprocess/shell/spawner.js CHANGED
@@ -9,17 +9,22 @@ export function adbShellProtocolSpawner(spawn) {
9
9
  const processPromise = spawn(command, signal);
10
10
  processPromise.wait = (options) => {
11
11
  const waitPromise = processPromise.then(async (process) => {
12
- const [, stdout, stderr, exitCode] = await Promise.all([
13
- options?.stdin?.pipeTo(process.stdin),
14
- process.stdout.pipeThrough(new ToArrayStream()),
15
- process.stderr.pipeThrough(new ToArrayStream()),
16
- process.exited,
17
- ]);
18
- return {
19
- stdout,
20
- stderr,
21
- exitCode,
22
- };
12
+ try {
13
+ const [, stdout, stderr, exitCode] = await Promise.all([
14
+ options?.stdin?.pipeTo(process.stdin),
15
+ process.stdout.pipeThrough(new ToArrayStream()),
16
+ process.stderr.pipeThrough(new ToArrayStream()),
17
+ process.exited,
18
+ ]);
19
+ return {
20
+ stdout,
21
+ stderr,
22
+ exitCode,
23
+ };
24
+ }
25
+ finally {
26
+ await process.kill();
27
+ }
23
28
  });
24
29
  return createLazyPromise(async () => {
25
30
  const { stdout, stderr, exitCode } = await waitPromise;
package/esm/service/subprocess/shell/spawner.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/spawner.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,aAAa,GAChB,MAAM,aAAa,CAAC;AA8BrB,MAAM,UAAU,uBAAuB,CACnC,KAGqC;IAErC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACvB,MAAM,EAAE,cAAc,EAAE,CAAC;QAEzB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,CACxB,OAAO,EACP,MAAM,CAKL,CAAC;QAEN,cAAc,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtD,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACnD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;oBACrC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;oBAC/C,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;oBAC/C,OAAO,CAAC,MAAM;iBACjB,CAAC,CAAC;gBACH,OAAO;oBACH,MAAM;oBACN,MAAM;oBACN,QAAQ;iBACgD,CAAC;YACjE,CAAC,CAAC,CAAC;YAEH,OAAO,iBAAiB,CACpB,KAAK,IAAI,EAAE;gBACP,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,WAAW,CAAC;gBAEvD,OAAO;oBACH,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;oBACjC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;oBACjC,QAAQ;iBACX,CAAC;YACN,CAAC,EACD;gBACI,KAAK,CAAC,QAAQ;oBACV,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,WAAW,CAAC;oBAEvD,OAAO;wBACH,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;wBACjC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;wBACjC,QAAQ;qBACX,CAAC;gBACN,CAAC;aACJ,CACJ,CAAC;QACN,CAAC,CAAC;QAEF,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/spawner.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,aAAa,GAChB,MAAM,aAAa,CAAC;AA8BrB,MAAM,UAAU,uBAAuB,CACnC,KAGqC;IAErC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACvB,MAAM,EAAE,cAAc,EAAE,CAAC;QAEzB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,CACxB,OAAO,EACP,MAAM,CAKL,CAAC;QAEN,cAAc,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtD,IAAI,CAAC;oBACD,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;wBACnD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;wBACrC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;wBAC/C,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;wBAC/C,OAAO,CAAC,MAAM;qBACjB,CAAC,CAAC;oBACH,OAAO;wBACH,MAAM;wBACN,MAAM;wBACN,QAAQ;qBACgD,CAAC;gBACjE,CAAC;wBAAS,CAAC;oBACP,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzB,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,iBAAiB,CACpB,KAAK,IAAI,EAAE;gBACP,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,WAAW,CAAC;gBAEvD,OAAO;oBACH,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;oBACjC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;oBACjC,QAAQ;iBACX,CAAC;YACN,CAAC,EACD;gBACI,KAAK,CAAC,QAAQ;oBACV,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,WAAW,CAAC;oBAEvD,OAAO;wBACH,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;wBACjC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;wBACjC,QAAQ;qBACX,CAAC;gBACN,CAAC;aACJ,CACJ,CAAC;QACN,CAAC,CAAC;QAEF,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAC;AACN,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yume-chan/adb",
3
- "version": "3.0.0-beta.0",
3
+ "version": "3.0.0-beta.1",
4
4
  "description": "TypeScript implementation of Android Debug Bridge (ADB) protocol.",
5
5
  "keywords": [
6
6
  "adb",
@@ -27,14 +27,14 @@
27
27
  "sideEffects": false,
28
28
  "dependencies": {
29
29
  "@yume-chan/async": "^4.1.3",
30
- "@yume-chan/event": "3.0.0-beta.0",
31
- "@yume-chan/no-data-view": "3.0.0-beta.0",
32
- "@yume-chan/stream-extra": "3.0.0-beta.0",
33
- "@yume-chan/struct": "3.0.0-beta.0"
30
+ "@yume-chan/event": "3.0.0-beta.1",
31
+ "@yume-chan/no-data-view": "3.0.0-beta.1",
32
+ "@yume-chan/struct": "3.0.0-beta.1",
33
+ "@yume-chan/stream-extra": "3.0.0-beta.1"
34
34
  },
35
35
  "devDependencies": {
36
- "@types/node": "^26.0.0",
37
- "prettier": "^3.8.4",
36
+ "@types/node": "^26.1.1",
37
+ "prettier": "^3.9.6",
38
38
  "typescript": "^6.0.3",
39
39
  "@yume-chan/eslint-config": "^1.0.0",
40
40
  "@yume-chan/test-runner": "^1.0.0",
package/src/server/client.ts CHANGED
@@ -193,8 +193,10 @@ export class AdbServerClient {
193
193
  /**
194
194
  * `adb version`
195
195
  */
196
- async getVersion(): Promise<number> {
197
- const connection = await this.createConnection("host:version");
196
+ async getVersion(
197
+ options?: AdbServerClient.ServerConnectionOptions,
198
+ ): Promise<number> {
199
+ const connection = await this.createConnection("host:version", options);
198
200
  try {
199
201
  const length = hexToNumber(await connection.readExactly(4));
200
202
  const version = hexToNumber(await connection.readExactly(length));
@@ -204,8 +206,11 @@ export class AdbServerClient {
204
206
  }
205
207
  }
206
208
 
207
- async validateVersion(minimalVersion: number) {
208
- const version = await this.getVersion();
209
+ async validateVersion(
210
+ minimalVersion: number,
211
+ options?: AdbServerClient.ServerConnectionOptions,
212
+ ) {
213
+ const version = await this.getVersion(options);
209
214
  if (version < minimalVersion) {
210
215
  throw new Error(
211
216
  `adb server version (${version}) doesn't match this client (${minimalVersion})`,
@@ -324,34 +329,36 @@ export class AdbServerClient {
324
329
  * Creates a connection that will forward the service to device.
325
330
  * @param device The device selector
326
331
  * @param service The service to forward
332
+ * @param options The server connection options
327
333
  * @returns An `AdbServerClient.Socket` that can be used to communicate with the service
328
334
  */
329
335
  async createDeviceConnection(
330
336
  device: AdbServerClient.DeviceSelector,
331
337
  service: string,
338
+ options?: AdbServerClient.ServerConnectionOptions,
332
339
  ): Promise<AdbServerClient.Socket> {
333
340
  let switchService: string;
334
341
  let transportId: bigint | undefined;
335
342
  if (!device) {
336
- await this.validateVersion(41);
343
+ await this.validateVersion(41, options);
337
344
  switchService = `host:tport:any`;
338
345
  } else if ("transportId" in device) {
339
346
  switchService = `host:transport-id:${device.transportId}`;
340
347
  transportId = device.transportId;
341
348
  } else if ("serial" in device) {
342
- await this.validateVersion(41);
349
+ await this.validateVersion(41, options);
343
350
  switchService = `host:tport:serial:${device.serial}`;
344
351
  } else if ("usb" in device) {
345
- await this.validateVersion(41);
352
+ await this.validateVersion(41, options);
346
353
  switchService = `host:tport:usb`;
347
354
  } else if ("tcp" in device) {
348
- await this.validateVersion(41);
355
+ await this.validateVersion(41, options);
349
356
  switchService = `host:tport:local`;
350
357
  } else {
351
358
  throw new TypeError("Invalid device selector");
352
359
  }
353
360
 
354
- const connection = await this.createConnection(switchService);
361
+ const connection = await this.createConnection(switchService, options);
355
362
 
356
363
  try {
357
364
  await connection.writeString(service);
@@ -430,7 +437,7 @@ export class AdbServerClient {
430
437
  options?: AdbServerClient.ServerConnectionOptions,
431
438
  ): Promise<void> {
432
439
  if (state === "disconnect") {
433
- await this.validateVersion(41);
440
+ await this.validateVersion(41, options);
434
441
  }
435
442
 
436
443
  return this.#waitForUnchecked(device, state, options);
@@ -440,7 +447,7 @@ export class AdbServerClient {
440
447
  transportId: bigint,
441
448
  options?: AdbServerClient.ServerConnectionOptions,
442
449
  ): Promise<void> {
443
- const serverVersion = await this.getVersion();
450
+ const serverVersion = await this.getVersion(options);
444
451
  if (serverVersion >= 41) {
445
452
  return this.#waitForUnchecked(
446
453
  { transportId },
package/src/service/subprocess/none/spawner.ts CHANGED
@@ -55,11 +55,15 @@ export function adbNoneProtocolSpawner(
55
55
 
56
56
  processPromise.wait = (options) => {
57
57
  const waitPromise = processPromise.then(async (process) => {
58
- const [, output] = await Promise.all([
59
- options?.stdin?.pipeTo(process.stdin),
60
- process.output.pipeThrough(new ToArrayStream()),
61
- ]);
62
- return output;
58
+ try {
59
+ const [, output] = await Promise.all([
60
+ options?.stdin?.pipeTo(process.stdin),
61
+ process.output.pipeThrough(new ToArrayStream()),
62
+ ]);
63
+ return output;
64
+ } finally {
65
+ await process.kill();
66
+ }
63
67
  });
64
68
 
65
69
  return createLazyPromise(
package/src/service/subprocess/shell/process.ts CHANGED
@@ -98,16 +98,13 @@ export class AdbShellProtocolProcessImpl implements AdbShellProtocolProcess {
98
98
  },
99
99
  );
100
100
 
101
- if (signal) {
102
- // `signal` won't affect `this.stdout` and `this.stderr`
103
- // So remaining data can still be read
104
- // (call `controller.error` will discard all pending data)
105
-
106
- signal.addEventListener("abort", () => {
107
- exited.reject(signal.reason);
108
- this.#socket.close();
109
- });
110
- }
101
+ // `signal` won't affect `this.stdout` and `this.stderr`
102
+ // So remaining data can still be read
103
+ // (call `controller.error` will discard all pending data)
104
+ signal?.addEventListener("abort", () => {
105
+ exited.reject(signal.reason);
106
+ this.#socket.close();
107
+ });
111
108
 
112
109
  this.#writer = this.#socket.writable.getWriter();
113
110
  this.#stdin = new MaybeConsumable.WritableStream<Uint8Array>({
package/src/service/subprocess/shell/spawner.ts CHANGED
@@ -67,17 +67,21 @@ export function adbShellProtocolSpawner(
67
67
 
68
68
  processPromise.wait = (options) => {
69
69
  const waitPromise = processPromise.then(async (process) => {
70
- const [, stdout, stderr, exitCode] = await Promise.all([
71
- options?.stdin?.pipeTo(process.stdin),
72
- process.stdout.pipeThrough(new ToArrayStream()),
73
- process.stderr.pipeThrough(new ToArrayStream()),
74
- process.exited,
75
- ]);
76
- return {
77
- stdout,
78
- stderr,
79
- exitCode,
80
- } satisfies AdbShellProtocolSpawner.WaitResult<Uint8Array[]>;
70
+ try {
71
+ const [, stdout, stderr, exitCode] = await Promise.all([
72
+ options?.stdin?.pipeTo(process.stdin),
73
+ process.stdout.pipeThrough(new ToArrayStream()),
74
+ process.stderr.pipeThrough(new ToArrayStream()),
75
+ process.exited,
76
+ ]);
77
+ return {
78
+ stdout,
79
+ stderr,
80
+ exitCode,
81
+ } satisfies AdbShellProtocolSpawner.WaitResult<Uint8Array[]>;
82
+ } finally {
83
+ await process.kill();
84
+ }
81
85
  });
82
86
 
83
87
  return createLazyPromise(
package/yume-chan-adb-3.0.0-beta.0.tgz DELETED
Binary file