1. 添加心跳检测

2. 设备断开连接后关闭日志通道

Author: wilinz

CHANGELOG.md

@@ -4,7 +4,9 @@ All notable changes to the "auto-js-vscodeext-fixed" extension will be documente
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
-
+### 1.109.0
+- 添加心跳检测（需要Autox.js 6.2.9 版本以上才会启用）
+- 设备断开连接后关闭日志通道
 
 ### 1.108.0
 

package.json

@@ -2,7 +2,7 @@
   "name": "auto-js-vsce-fixed",
   "displayName": "Auto.js-Autox.js-VSCodeExt",
   "description": "用于在pc上vscode中开发autoxjs的自动化脚本的插件。兼容autojs 和autoxjs,增加功能：usb方式adb进行连接; 右键【文件夹】保存项目到设备;右键【js文件】运行;js文件中点击右上角运行; 结合webpack自动编译，js自动运行到手机",
-  "version": "1.108.0",
+  "version": "1.109.0",
   "publisher": "aaroncheng",
   "icon": "logo.png",
   "repository": {

src/autojs-debug.ts

@@ -11,7 +11,7 @@ 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";
-
+import { _context } from "./extension";
 const DEBUG = false;
 
 function logDebug(message?: any, ...optionalParams: any[]) {
@@ -42,11 +42,26 @@ export class Device extends EventEmitter {
       this.attached = true;
       this.name = data['device_name'];
       let message_id = `${Date.now()}_${Math.random()}`;
-      var returnData = JSON.stringify({ message_id, data: "连接成功", debug: true, type: 'hello' })
-      logDebug("返回消息：", returnData)
+      let appVersionCode = data['app_version_code']
+      // @ts-ignore
+      let extensionVersion = _context.extension.packageJSON.version
+      let returnData
+      if (appVersionCode >= 629) {
+        returnData = JSON.stringify({ message_id, data: "ok", version: extensionVersion, debug: DEBUG, type: 'hello' })
+      } else {
+        returnData = JSON.stringify({ message_id, data: "连接成功", debug: DEBUG, type: 'hello' })
+      }
+      logDebug("return data: ", returnData)
       this.connection.sendUTF(returnData);
       this.emit("attach", this);
     });
+    this.on('data:ping', data => {
+      logDebug("on client ping: ", data);
+      let message_id = `${Date.now()}_${Math.random()}`;
+      var returnData = JSON.stringify({ type: 'pong', data: data })
+      logDebug("pong: ", returnData)
+      this.connection.sendUTF(returnData);
+    })
     setTimeout(() => {
       if (!this.attached) {
         console.log("handshake timeout");
@@ -161,7 +176,7 @@ export class AutoJsDebugServer extends EventEmitter {
         response.end();
       }
     });
-    let wsServer = new ws.server({ httpServer: this.httpServer });
+    let wsServer = new ws.server({ httpServer: this.httpServer, keepalive: true, keepaliveInterval: 10000 });
     wsServer.on('request', request => {
       let connection = request.accept();
       if (!connection) {
@@ -180,16 +195,18 @@ export class AutoJsDebugServer extends EventEmitter {
   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);
-      this.emit('new_device', device);
-      let logChannel = this.newLogChannel(device);
-      logChannel.appendLine(`Device connected: ${device}`);
-    })
+    device
+      .on("attach", (device) => {
+        this.attachDevice(device);
+        this.emit('new_device', device);
+        let logChannel = this.newLogChannel(device);
+        logChannel.appendLine(`Device connected: ${device}`);
+      })
   }
 
   async adbShell(device: DeviceClient, command: string): Promise<string> {
     let duplex: internal.Duplex = await device.shell(command)
+    // @ts-ignore
     let brandBuf: buffer.Buffer = await Adb.util.readAll(duplex)
     return brandBuf.toString()
   }
@@ -415,25 +432,27 @@ export class AutoJsDebugServer extends EventEmitter {
     this.devices.splice(this.devices.indexOf(device), 1);
     console.log("detachDevice: " + device);
     vscode.window.showInformationMessage(`Device disconnected: ${device}`)
-    this.getLogChannel(device).appendLine(`Device disconnected: ${device}`);
+    var logChannel = this.getLogChannel(device)
+    logChannel.dispose();
+    this.logChannels.delete(device.toString())
   }
 
   /** 创建设备日志打印通道 */
   private newLogChannel(device: Device): vscode.OutputChannel {
-    let channelName = `${device}`;
-    let logChannel = this.logChannels.get(channelName);
-    if (!logChannel) {
-      logChannel = vscode.window.createOutputChannel(channelName);
-      this.logChannels.set(channelName, logChannel);
-    }
+    let channelName = device.toString();
+    // let logChannel = this.logChannels.get(channelName);
+    // if (!logChannel) {
+    let logChannel = vscode.window.createOutputChannel(channelName);
+    this.logChannels.set(channelName, logChannel);
+    // }
     logChannel.show(true);
     // console.log("创建日志通道" + channelName)
     return logChannel;
   }
 
   /** 获取设备日志打印通道 */
   private getLogChannel(device: Device): vscode.OutputChannel {
-    let channelName = `${device}`;
+    let channelName = device.toString();
     // console.log("获取日志通道：" + channelName);
     return this.logChannels.get(channelName);
   }

src/extension.ts

@@ -443,7 +443,7 @@ class Extension {
 }
 
 
-let _context: any;
+export let _context: vscode.ExtensionContext;
 let extension = new Extension();
 const commands = ['startAllServer', 'stopAllServer', 'startServer', 'stopServer', 'startTrackADBDevices',
   'stopTrackADBDevices', 'manuallyConnectADB', 'manuallyDisconnect', 'showServerAddress', 'showQrCode', 'openDocument', 'run', 'runOnDevice',
@@ -455,6 +455,8 @@ export function activate(context: vscode.ExtensionContext) {
     let action: Function = extension[command];
     context.subscriptions.push(vscode.commands.registerCommand('extension.' + command, action.bind(extension)));
     _context = context;
+    // @ts-ignore
+    console.log(context.extension.packageJSON.version)
   })
 }