Return port number or zero otherwise in forward command

DeviceFarmer · Jun 13, 2023 · d483403 · d483403
1 parent 0a11b3b
commit d483403
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/adb/DeviceClient.ts b/src/adb/DeviceClient.ts
@@ -161,7 +161,7 @@ export default class DeviceClient {
    *   `jdwp:<process pid>`
    * @returns true
    */
-  public forward(local: string, remote: string): Bluebird<boolean> {
+  public forward(local: string, remote: string): Bluebird<number> {
     return this.connection().then((conn) => new ForwardCommand(conn).execute(this.serial, local, remote));
   }
 

diff --git a/src/adb/command/host-serial/forward.ts b/src/adb/command/host-serial/forward.ts
@@ -2,16 +2,18 @@ import Command from '../../command';
 import Protocol from '../../protocol';
 import Bluebird from 'bluebird';
 
-export default class ForwardCommand extends Command<boolean> {
-  execute(serial: string, local: string, remote: string): Bluebird<boolean> {
+export default class ForwardCommand extends Command<number> {
+  execute(serial: string, local: string, remote: string): Bluebird<number> {
     this._send(`host-serial:${serial}:forward:${local};${remote}`);
     return this.parser.readAscii(4).then((reply) => {
       switch (reply) {
         case Protocol.OKAY:
           return this.parser.readAscii(4).then((reply) => {
             switch (reply) {
               case Protocol.OKAY:
-                return true;
+                return this.parser.readValue().then((buffer) => {
+                  return Number(buffer.toString());
+                }).catch(_ => 0);
               case Protocol.FAIL:
                 return this.parser.readError();
               default: