Merge pull request kkevsekk1#13 from wilinz/master

增加手动连接ADB命令和手动关闭连接命令，修复若干BUG

Author: aaron

README.md

@@ -56,6 +56,8 @@
 * 停止服务(Stop Server)： 停止插件服务
 * 开始监听ADB设备(Start track adb devices): 开启后会自动连接ADB设备
 * 停止监听ADB设备(Stop track adb devices)
+* 手动连接ADB设备(Manually connect adb device)
+* 手动关闭设备连接(Manually disconnect device)
 * 打开文档(Open Document)： 打开Auto.js开发文档
 * 显示服务端二维码(Show qr code): 显示服务端二维码，之后可用客户端扫码连接
 * 显示服务端ip地址(Show server address)

package.json

@@ -20,6 +20,8 @@
     "onCommand:extension.stopAllServer",
     "onCommand:extension.startTrackADBDevices",
     "onCommand:extension.stopTrackADBDevices",
+    "onCommand:extension.manuallyConnectADB",
+    "onCommand:extension.manuallyDisconnect",
     "onCommand:extension.showQrCode",
     "onCommand:extension.showServerAddress",
     "onCommand:extension.openDocument",
@@ -126,6 +128,16 @@
         "title": "停止监听ADB设备(Stop track adb devices)",
         "category": "Auto.js autoxjs"
       },
+      {
+        "command": "extension.manuallyConnectADB",
+        "title": "手动连接ADB设备(Manually connect adb device)",
+        "category": "Auto.js autoxjs"
+      },
+      {
+        "command": "extension.manuallyDisconnect",
+        "title": "手动关闭设备连接(Manually disconnect device)",
+        "category": "Auto.js autoxjs"
+      },
       {
         "command": "extension.run",
         "title": "运行脚本(Run)",

src/autojs-debug.ts

@@ -6,8 +6,11 @@ import * as url from 'url';
 import * as fs from 'fs'
 import { Project, ProjectObserser } from './project';
 import * as vscode from "vscode";
-import Adb, { DeviceClient } from '@devicefarmer/adbkit';
+import Adb, { DeviceClient, Forward } from '@devicefarmer/adbkit';
 import Tracker from '@devicefarmer/adbkit/dist/src/adb/tracker';
+import ADBDevice from '@devicefarmer/adbkit/dist/src/Device';
+import internal from "stream";
+import buffer from "buffer";
 
 const DEBUG = false;
 
@@ -22,14 +25,16 @@ const HANDSHAKE_TIMEOUT = 10 * 1000;
 
 export class Device extends EventEmitter {
   public name: string;
-  public address: string;
+  public type: string;
+  public id: string;
   private connection: ws.connection;
-  private attached: boolean = false;
+  public attached: boolean = false;
   public projectObserser: ProjectObserser;
 
-  constructor(connection: ws.connection, address: string) {
+  constructor(connection: ws.connection, type: string, id: string) {
     super();
-    this.address = address
+    this.type = type
+    this.id = id
     this.connection = connection;
     this.read(this.connection);
     this.on('data:hello', data => {
@@ -51,6 +56,14 @@ export class Device extends EventEmitter {
     }, HANDSHAKE_TIMEOUT);
   }
 
+  close() {
+    let message_id = `${Date.now()}_${Math.random()}`;
+    let closeMessage = JSON.stringify({ message_id, data: "close", debug: false, type: 'close' })
+    this.connection.sendUTF(closeMessage);
+    this.connection.close();
+    this.connection = null;
+  }
+
   send(type: string, data: any): void {
     let message_id = `${Date.now()}_${Math.random()}`;
     console.log(data);
@@ -85,9 +98,9 @@ export class Device extends EventEmitter {
 
   public toString = (): string => {
     if (!this.name) {
-      return `Device (${this.address})`;
+      return `Device (${this.type}: ${this.id})`;
     }
-    return `Device ${this.name}(${this.address})`;
+    return `Device ${this.name}(${this.type}: ${this.id})`;
   }
 
   private read(connection: ws.connection) {
@@ -116,7 +129,7 @@ export class Device extends EventEmitter {
 export class AutoJsDebugServer extends EventEmitter {
   public isHttpServerStarted = false
   private httpServer: http.Server;
-  private adbClient = Adb.createClient()
+  public adbClient = Adb.createClient()
   private tracker: Tracker
   private port: number;
   public devices: Array<Device> = [];
@@ -148,18 +161,24 @@ export class AutoJsDebugServer extends EventEmitter {
         response.end();
       }
     });
-    var wsServer = new ws.server({ httpServer: this.httpServer });
+    let wsServer = new ws.server({ httpServer: this.httpServer });
     wsServer.on('request', request => {
       let connection = request.accept();
       if (!connection) {
         return;
       }
-      this.newDevice(connection, connection.remoteAddress)
+      this.newDevice(connection, "tcp", connection.socket.remoteAddress + ":" + connection.socket.remotePort)
     })
   }
 
-  private newDevice(connection: ws.connection, address: string) {
-    let device = new Device(connection, address);
+  getDeviceById(id: string): Device {
+    return this.devices.find((value) => {
+      return value.id == id
+    })
+  }
+
+  private newDevice(connection: ws.connection, type: string, id: string) {
+    let device = new Device(connection, type, id);
     logDebug(connection.state, "--->status")
     device.on("attach", (device) => {
       this.attachDevice(device);
@@ -169,6 +188,12 @@ export class AutoJsDebugServer extends EventEmitter {
     })
   }
 
+  async adbShell(device: DeviceClient, command: string): Promise<string> {
+    let duplex: internal.Duplex = await device.shell(command)
+    let brandBuf: buffer.Buffer = await Adb.util.readAll(duplex)
+    return brandBuf.toString()
+  }
+
   private connectAutoxjsByADB(port: Number, deviceId: string) {
     let autoJsDebugServer = this
     let url = `ws://localhost:${port}/`
@@ -183,11 +208,9 @@ export class AutoJsDebugServer extends EventEmitter {
 
     client.on('connect', function (connection) {
       console.log("connected to " + url)
-      autoJsDebugServer.newDevice(connection, "ADB: " + deviceId)
+      autoJsDebugServer.newDevice(connection, "adb", deviceId)
     });
-
-    //下面不能加'echo-protocol'，否则会报Can`t connect due to "Sec-WebSocket-Protocol header"的错。因为服务器没有返回对应协议规定的信息
-    client.connect(url); //, 'echo-protocol');
+    client.connect(url);
   }
 
   listen(): void {
@@ -208,31 +231,40 @@ export class AutoJsDebugServer extends EventEmitter {
     });
   }
 
+
+  async listADBDevices(): Promise<ADBDevice[]> {
+    return this.adbClient.listDevices();
+  }
+
   async trackADBDevices() {
     let thisServer = this
+    let devices = await thisServer.adbClient.listDevices()
+    for (let device0 of devices) {
+      await thisServer.connectDevice(device0.id)
+    }
     if (this.tracker) {
       this.emit("adb:tracking_started");
       return
     }
-    let devices = await thisServer.adbClient.listDevices()
-    for (let device0 of devices) {
-      const device = thisServer.adbClient.getDevice(device0.id)
-      await thisServer.connectDevice(device, device0.id)
-    }
     try {
       let tracker = await thisServer.adbClient.trackDevices()
-      this.tracker = tracker
+      thisServer.tracker = tracker
       tracker.on('add', async function (device0) {
         console.log("adb device " + device0.id + " added")
         const device = thisServer.adbClient.getDevice(device0.id)
         await device.waitForDevice()
-        await thisServer.connectDevice(device, device0.id)
+        await thisServer.connectDevice(device0.id, device)
       })
       tracker.on('remove', function (device) {
         console.log("adb device " + device.id + " removed")
+        let wsDevice = thisServer.getDeviceById(device.id)
+        if (wsDevice) {
+          wsDevice.close()
+        }
+
       })
       tracker.on('end', function () {
-        tracker=undefined
+        thisServer.tracker = undefined
         console.log('ADB Tracking stopped')
         thisServer.emit("adb:tracking_stop")
       })
@@ -245,22 +277,36 @@ export class AutoJsDebugServer extends EventEmitter {
     this.emit("adb:tracking_start");
   }
 
-  private async connectDevice(device: DeviceClient, id: string) {
-    let forwarded = await device.forward(`tcp:0`, `tcp:9317`)
-    if (forwarded) {
-      let forwards = await device.listForwards()
-      if (forwards.length > 0) {
-        let forward = forwards[0]
-        console.log(`forward ${id}: ${forwards.toString()}`)
-        let port = Number(forward.local.replace("tcp:", ""))
-        this.connectAutoxjsByADB(port, id)
+  async connectDevice(id: string, device: DeviceClient = undefined) {
+    if (!device) device = this.adbClient.getDevice(id)
+    let wsDevice = this.getDeviceById(id)
+    if (wsDevice && wsDevice.attached) return
+    let forwards: Forward[] = await this.listForwards(device, id)
+    if (forwards.length == 0) {
+      let forwarded = await device.forward(`tcp:0`, `tcp:9317`)
+      if (forwarded) {
+        forwards = await this.listForwards(device, id)
       }
     }
+    if (forwards.length > 0) {
+      let forward = forwards[0]
+      console.log(`forward ${id}: local -> ${forward.local}, remote -> ${forward.remote}`)
+      let port = Number(forward.local.replace("tcp:", ""))
+      this.connectAutoxjsByADB(port, id)
+    }
+  }
+
+  private async listForwards(device: DeviceClient, id: string): Promise<Forward[]> {
+    let forwards: Forward[] = await device.listForwards()
+    return forwards.filter((forward) => {
+      return forward.serial == id && forward.remote == "tcp:9317"
+    })
   }
 
   stopTrackADBDevices() {
     if (this.tracker) {
       this.tracker.end()
+      this.tracker = undefined
     }
   }
 
@@ -314,6 +360,9 @@ export class AutoJsDebugServer extends EventEmitter {
       channel.dispose();
     });
     this.logChannels.clear();
+    this.devices.forEach((device) => {
+      device.close()
+    })
   }
 
   /** 获取本地IP */

src/extension.ts

@@ -255,6 +255,31 @@ class Extension {
     server.stopTrackADBDevices()
   }
 
+  async manuallyConnectADB() {
+    let devices = await server.listADBDevices()
+    let names = await Promise.all(devices.map(async (device) => {
+      let adbDevice = server.adbClient.getDevice(device.id)
+      let brand = await server.adbShell(adbDevice, "getprop ro.product.brand")
+      let model = await server.adbShell(adbDevice, "getprop ro.product.model")
+      return `${brand} ${model}: ${device.id}`
+    }));
+    vscode.window.showQuickPick(names)
+      .then(name => {
+        let device = devices[names.indexOf(name)]
+        server.connectDevice(device.id)
+      });
+  }
+
+  manuallyDisconnect() {
+    let devices = server.devices
+    let names = devices.map((device) => { return device.name + ": " + device.id })
+    vscode.window.showQuickPick(names)
+      .then(name => {
+        let device = devices[names.indexOf(name)]
+        server.getDeviceById(device.id).close()
+      });
+  }
+
   run(url?) {
     this.runOrRerun('run', url);
   }
@@ -415,13 +440,13 @@ class Extension {
   saveProject(url?) {
     this.sendProjectCommand("save_project", url);
   }
-};
+}
 
 
 let _context: any;
 let extension = new Extension();
 const commands = ['startAllServer', 'stopAllServer', 'startServer', 'stopServer', 'startTrackADBDevices',
-  'stopTrackADBDevices', 'showServerAddress', 'showQrCode', 'openDocument', 'run', 'runOnDevice',
+  'stopTrackADBDevices', 'manuallyConnectADB', 'manuallyDisconnect', 'showServerAddress', 'showQrCode', 'openDocument', 'run', 'runOnDevice',
   'stop', 'stopAll', 'rerun', 'save', 'saveToDevice', 'newProject', 'runProject', 'saveProject'];
 
 export function activate(context: vscode.ExtensionContext) {