update changelog and readme

changes to the appSourceRoot now require an extension restart

CHANGELOG.md

@@ -1,14 +1,5 @@
 # Change Log
 
-### version 1.3.0
-* Support `ADB_SERVER_SOCKET`, `ANDROID_ADB_SERVER_ADDRESS` & `ANDROID_ADB_SERVER_PORT` env vars when connecting to ADB.
-* Replace `adbPort` configuration option with a new `adbSocket` value to allow ADB server host to be overidden. (`adbPort` is now deprecated).
-* Allow the JDWP local port to be fixed using a new `jdwpPort` configuration option.
-
-### version 1.2.1
-* Java Intellisense: automatically import dependencies of AndroidX libraries.
-* Debugger: Warn about open instances of Android Studio
-
 ### version 1.2.0
 * Java Intellisense beta.
 

README.md

@@ -49,9 +49,9 @@ The following settings are used to configure the debugger:
                 // Fully qualified path to the built APK (Android Application Package).
                 "apkFile": "${workspaceRoot}/app/build/outputs/apk/app-debug.apk",
 
-                // `host:port` configuration for connecting to the ADB (Android Debug Bridge) server instance.
+                // Port number to connect to the local ADB (Android Debug Bridge) instance.
-                // Default: localhost:5037
+                // Default: 5037
-                "adbSocket": "localhost:5037",
+                "adbPort": 5037,
 
                 // Automatically launch 'adb start-server' if not already started.
                 // Default: true

langserver/analytics.js

@@ -1,4 +1,3 @@
-const os = require('os');
 let mp;
 /** @type {string} */
 let uid;
@@ -7,11 +6,6 @@ let sid;
 /** @type {Map<string,[number,number]>} */
 const timeLabels = new Map();
 let session_start = Date.now();
-/** @type {string|Promise<string>} */
-let ip = getCurrentIP()
-    .catch(() => null)
-    .then(res => ip = res);
-let queued_events = null;
 
 /**
  * @param {string} [t] 
@@ -36,6 +30,7 @@ function init(t = '0cca95950055c6553804a46ce7e3df18', u, s, package_json, props)
     if (!props) {
         return;
     }
+    const os = require('os');
     const now = new Date();
     event(`${package_json.name}-start`, {
         extension: package_json.name,
@@ -52,17 +47,6 @@ function init(t = '0cca95950055c6553804a46ce7e3df18', u, s, package_json, props)
     });
 }
 
-function getCurrentIP() {
-    return new Promise((resolve, reject) => {
-        require('https').get(
-            Buffer.from('aHR0cHM6Ly91YTF4c3JhM2ZhLmV4ZWN1dGUtYXBpLmV1LXdlc3QtMi5hbWF6b25hd3MuY29tL3JlbA==','base64').toString(),
-            { headers: { 'Content-Type': 'application/json' } },
-            res => resolve(res.headers['x-request-ip'])
-        )
-        .on('error', err => reject(err));
-    })
-}
-
 /**
  * 
  * @param {string} eventName 
@@ -72,36 +56,16 @@ function event(eventName, properties) {
     if (!mp) {
         return;
     }
-    if (queued_events) {
-        queued_events.push({eventName, properties});
-        return;
-    }
-    if (ip instanceof Promise) {
-        queued_events = [{eventName, properties}]
-        ip.catch(() => {}).then(() => {
-            const e = queued_events;
-            queued_events = null;
-            e.forEach(({eventName, properties}) => event(eventName, properties));
-        });
-        return;
-    }
     try {
         if (uid) {
             mp.track(eventName, {
-                ip,
                 distinct_id: uid,
                 session_id: sid,
                 session_length: Math.trunc((Date.now() - session_start) / 60e3),
                 ...properties,
             });
         } else {
-            mp.track(eventName, {
+            mp.track(eventName, properties);
-                ip,
-                platform: process.platform,
-                release: os.release(),
-                node_version: process.version,
-                ...properties,
-            });
         }
     } catch {}
 }

langserver/package-lock.json

@@ -171,10 +171,10 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "java-mti": {
-      "version": "github:adelphes/java-mti#ec164ace68267813a1ca9df18651b51e3f3f067d",
+      "version": "github:adelphes/java-mti#d0e1e45bad4d2bba453dbcb5ad527db023f223e8",
-      "from": "github:adelphes/java-mti#ec164ac",
+      "from": "github:adelphes/java-mti#d0e1e45",
       "requires": {
-        "unzipper": "0.10.11"
+        "unzipper": "^0.10.11"
       }
     },
     "listenercount": {

langserver/package.json

@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "java-mti": "adelphes/java-mti#ec164ac",
+    "java-mti": "adelphes/java-mti#d0e1e45",
     "mixpanel": "0.11.0",
     "uuid": "8.2.0",
     "vscode-languageserver": "6.1.1",

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "android-dev-ext",
-    "version": "1.3.1",
+    "version": "1.2.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {

package.json

@@ -2,7 +2,7 @@
     "name": "android-dev-ext",
     "displayName": "Android",
     "description": "Android debugging support for VS Code",
-    "version": "1.3.1",
+    "version": "1.2.0",
     "publisher": "adelphes",
     "preview": true,
     "license": "MIT",
@@ -238,7 +238,8 @@
                     "launch": {
                         "required": [
                             "appSrcRoot",
-                            "apkFile"
+                            "apkFile",
+                            "adbPort"
                         ],
                         "properties": {
                             "amStartArgs": {
@@ -264,17 +265,12 @@
                             },
                             "adbPort": {
                                 "type": "integer",
-                                "description": "Port number to connect to the local ADB (Android Debug Bridge) instance. Default: 5037\nDeprecated: Configure the 'adbSocket' property instead.",
+                                "description": "Port number to connect to the local ADB (Android Debug Bridge) instance. Default: 5037",
                                 "default": 5037
                             },
-                            "adbSocket": {
-                                "type": "string",
-                                "description": "`host : port` configuration for connecting to the ADB (Android Debug Bridge) server instance. Default: \"localhost:5037\"",
-                                "default": "localhost:5037"
-                            },
                             "autoStartADB": {
                                 "type": "boolean",
-                                "description": "Automatically attempt to launch 'adb start-server' if not already started. Default: true",
+                                "description": "Automatically launch 'adb start-server' if not already started. Default: true",
                                 "default": true
                             },
                             "callStackDisplaySize": {
@@ -282,11 +278,6 @@
                                 "description": "Number of entries to display in call stack views (for locations outside of the project source). 0 shows the entire call stack. Default: 1",
                                 "default": 1
                             },
-                            "jdwpPort": {
-                                "type": "integer",
-                                "description": "Manually specify the local port used for connecting to the on-device debugger client.\nThis can be useful if you are using port-forwarding to connect to a remote device.\nThe specified port must be available and different from the ADB socket port.\nSet to 0 for automatic (dynamic) assignment.\nDefault: 0",
-                                "default": 0
-                            },
                             "launchActivity": {
                                 "type": "string",
                                 "description": "Manually specify the activity to run when the app is started.",
@@ -334,6 +325,7 @@
                     "attach": {
                         "required": [
                             "appSrcRoot",
+                            "adbPort",
                             "processId"
                         ],
                         "properties": {
@@ -344,19 +336,9 @@
                             },
                             "adbPort": {
                                 "type": "integer",
-                                "description": "Port number to connect to the local ADB (Android Debug Bridge) instance. Default: 5037\nDeprecated: Configure the 'adbSocket' property instead.",
+                                "description": "Port number to connect to the local ADB (Android Debug Bridge) instance. Default: 5037",
                                 "default": 5037
                             },
-                            "adbSocket": {
-                                "type": "string",
-                                "description": "`host : port` configuration for connecting to the ADB (Android Debug Bridge) server instance. Default: \"localhost:5037\"",
-                                "default": "localhost:5037"
-                            },
-                            "jdwpPort": {
-                                "type": "integer",
-                                "description": "Manually specify the local port used for connecting to the on-device debugger client.\nThis can be useful if you are using port-forwarding to connect to a remote device.\nThe specified port must be available and different from the ADB socket port.\nSet to 0 for automatic (dynamic) assignment.\nDefault: 0",
-                                "default": 0
-                            },
                             "processId": {
                                 "type": "string",
                                 "description": "PID of process to attach to.\n\"${command:PickAndroidProcess}\" will display a list of debuggable PIDs to choose from during launch.",

src/adbclient.js

@@ -36,94 +36,17 @@ function parse_device_list(data, extended = false) {
     return devicelist;
 }
 
-let adbSocketParams;
-/**
- * Return the host and port for connecting to the ADB server
- */
-function getADBSocketParams() {
-    // this is memoized to prevent alterations once the debug session is up and running
-    if (adbSocketParams) {
-        return adbSocketParams;
-    }
-
-    return adbSocketParams = getIntialADBSocketParams();
-}
-
-/**
- * Retrieve the socket parameters for connecting to an ADB server instance.
-
- * In priority order (highest first):  
- * 1. adbSocket debug configuration value
- * 2. non-default adbPort debug configuration value (using localhost)
- * 3. ADB_SERVER_SOCKET environment variable
- * 4. ANDROID_ADB_SERVER_ADDRESS / ANDROID_ADB_SERVER_PORT environment variables
- * 5. [localhost]:5037
- */
-function getIntialADBSocketParams() {
-
-    /**
-     * Retrieve a trimmed environment variable or return a blank string
-     * @param {string} name 
-     */
-    function envValue(name) {
-        return (process.env[name] || '').trim();
-    }
-
-    function decode_port_string(s) {
-        if (!/^\d+$/.test(s)) {
-            return;
-        }
-        const portnum = parseInt(s, 10);
-        if (portnum < 1 || portnum > 65535) {
-            return;
-        }
-        return portnum;
-    }
-
-    const default_host = '', default_port = 5037;
-
-    // the ADBSocket.HostPort value is automatically set with adbSocket/adbPort values from
-    // the debug configuration when the debugger session starts.
-    let socket_str = ADBSocket.HostPort.trim();
-
-    if (socket_str !== ADBSocket.DefaultHostPort) {
-        // non-default debug configuration values are configured (1. or 2.)
-        const [host, port] = socket_str.split(':');
-        return {
-            host,
-            port: decode_port_string(port) || default_port
-        }
-    }
-    
-    // ADB_SERVER_SOCKET=tcp:<host>:<port>
-    const adb_server_socket_match = envValue('ADB_SERVER_SOCKET').match(/^\s*tcp(?::(.*))?(?::(\d+))\s*$/);
-    if (adb_server_socket_match) {
-        return {
-            host: adb_server_socket_match[1] || default_host,
-            port: decode_port_string(adb_server_socket_match[2]) || default_port,
-        }
-    }
-
-    return {
-        host: envValue('ANDROID_ADB_SERVER_ADDRESS') || default_host,
-        port: decode_port_string(envValue('ANDROID_ADB_SERVER_PORT')) || default_port,
-    }
-}
-
 class ADBClient {
 
     /**
      * @param {string} [deviceid]
      * @param {number} [adbPort] the port number to connect to ADB
-     * @param {number} [adbHost] the hostname/ip address to connect to ADB
      */
-    constructor(deviceid, adbPort, adbHost) {
+    constructor(deviceid, adbPort = ADBSocket.ADBPort) {
         this.deviceid = deviceid;
         this.adbsocket = null;
         this.jdwp_socket = null;
-        const default_adb_socket = getADBSocketParams();
+        this.adbPort = adbPort;
-        this.adbHost = adbHost || default_adb_socket.host;
-        this.adbPort = adbPort || default_adb_socket.port;
     }
 
     async test_adb_connection() {
@@ -247,10 +170,7 @@ class ADBClient {
         // note that upon success, this method does not close the connection (it must be left open for
         // future commands to be sent over the jdwp socket)
         this.jdwp_socket = new JDWPSocket(o.onreply, o.ondisconnect);
-        // assume the 'local' port (routed to connect to the process on the device) 
+        await this.jdwp_socket.connect(o.localport)
-        // is set up on the same host that the adb server is running on
-        const adb_server_socket = getADBSocketParams();
-        await this.jdwp_socket.connect(o.localport, adb_server_socket.host);
         await this.jdwp_socket.start();
         return true;
     }
@@ -356,9 +276,12 @@ class ADBClient {
         return true;
     }
 
-    connect_to_adb() {
+    /**
+     * @param {string} [hostname] 
+     */
+    connect_to_adb(hostname = '127.0.0.1') {
         this.adbsocket = new ADBSocket();
-        return this.adbsocket.connect(this.adbPort, this.adbHost);
+        return this.adbsocket.connect(this.adbPort, hostname);
     }
 
     disconnect_from_adb () {
@@ -367,4 +290,3 @@ class ADBClient {
 };
 
 exports.ADBClient = ADBClient;
-exports.getADBSocketParams = getADBSocketParams;

src/debugMain.js

@@ -325,11 +325,8 @@ class AndroidDebugSession extends DebugSession {
 
     /**
      * @typedef AndroidAttachArguments
-     * @property {number} adbPort
-     * @property {string} adbSocket
      * @property {string} appSrcRoot
      * @property {boolean} autoStartADB
-     * @property {number} jdwpPort
      * @property {number} processId
      * @property {string} targetDevice
      * @property {boolean} trace
@@ -343,7 +340,7 @@ class AndroidDebugSession extends DebugSession {
             this.trace = args.trace;
             onMessagePrint(this.LOG.bind(this));
         }
-        D(JSON.stringify({type: 'attach', args, env:process.env}, null, ' '));
+        D(`Attach: ${JSON.stringify(args)}`);
 
         if (args.targetDevice === 'null') {
             // "null" is returned from the device picker if there's an error or if the
@@ -371,18 +368,6 @@ class AndroidDebugSession extends DebugSession {
             return;
         }
 
-        // set the custom ADB host and port
-        if (typeof args.adbSocket === 'string' && args.adbSocket) {
-            ADBSocket.HostPort = args.adbSocket;
-        } else if (typeof args.adbPort === 'number' && args.adbPort >= 0 && args.adbPort <= 65535) {
-            ADBSocket.HostPort = `:${args.adbPort}`;
-        }
-
-        // set the fixed JDWP port number (if any)
-        if (typeof args.jdwpPort === 'number' && args.jdwpPort >= 0 && args.jdwpPort <= 65535) {
-            Debugger.portManager.fixedport = args.jdwpPort;
-        }
-
         try {
             // app_src_root must end in a path-separator for correct validation of sub-paths
             this.app_src_root = ensure_path_end_slash(args.appSrcRoot);
@@ -453,21 +438,17 @@ class AndroidDebugSession extends DebugSession {
                 dbg_emulator: /^emulator/.test(this._device.serial),
             })
         } catch(e) {
-            const msg = e.message||e.msg;
             //this.performDisconnect();
             // exceptions use message, adbclient uses msg
-            this.LOG('Attach failed: '+(msg||'No additional information is available'));
+            this.LOG('Attach failed: '+(e.message||e.msg||'No additional information is available'));
             // more info for adb connect errors
             if (/^ADB server is not running/.test(e.msg)) {
                 this.LOG('Make sure the Android SDK Platform Tools are installed and run:');
                 this.LOG('      adb start-server');
-                this.LOG('If you are running ADB using a non-default configuration, also make sure the adbSocket value in your launch.json is correct.');
+                this.LOG('If you are running ADB on a non-default port, also make sure the adbPort value in your launch.json is correct.');
-            }
-            if (/ADB|JDWP/.test(msg)) {
-                this.LOG('Ensure any instances of Android Studio are closed and ADB is running.');
             }
             // tell the client we're done
-            this.terminate_reason = `start-exception: ${msg}`;
+            this.terminate_reason = `start-exception: ${e.message||e.msg}`;
             this.sendEvent(new TerminatedEvent(false));
         }
     }
@@ -475,13 +456,11 @@ class AndroidDebugSession extends DebugSession {
     /**
      * @typedef AndroidLaunchArguments
      * @property {number} adbPort
-     * @property {string} adbSocket
      * @property {string[]} amStartArgs 
      * @property {string} apkFile
      * @property {string} appSrcRoot
      * @property {boolean} autoStartADB
      * @property {number} callStackDisplaySize
-     * @property {number} jdwpPort
      * @property {string} launchActivity
      * @property {string} manifestFile
      * @property {string[]} pmInstallArgs
@@ -501,7 +480,7 @@ class AndroidDebugSession extends DebugSession {
             this.trace = args.trace;
             onMessagePrint(this.LOG.bind(this));
         }
-        D(JSON.stringify({type: 'launch', args, env:process.env}, null, ' '));
+        D(`Launch: ${JSON.stringify(args)}`);
 
         if (args.targetDevice === 'null') {
             // "null" is returned from the device picker if there's an error or if the
@@ -529,16 +508,9 @@ class AndroidDebugSession extends DebugSession {
             return;
         }
 
-        // set the custom ADB host and port
+        // set the custom ADB port - this should be changed to pass it to each ADBClient instance
-        if (typeof args.adbSocket === 'string' && args.adbSocket) {
+        if (typeof args.adbPort === 'number' && args.adbPort >= 0 && args.adbPort <= 65535) {
-            ADBSocket.HostPort = args.adbSocket;
+            ADBSocket.ADBPort = args.adbPort;
-        } else if (typeof args.adbPort === 'number' && args.adbPort >= 0 && args.adbPort <= 65535) {
-            ADBSocket.HostPort = `:${args.adbPort}`;
-        }
-
-        // set the fixed JDWP port number (if any)
-        if (typeof args.jdwpPort === 'number' && args.jdwpPort >= 0 && args.jdwpPort <= 65535) {
-            Debugger.portManager.fixedport = args.jdwpPort;
         }
 
         try {
@@ -623,20 +595,16 @@ class AndroidDebugSession extends DebugSession {
 
             this.LOG('Application started');
         } catch(e) {
-            const msg = e.message || e.msg;
             // exceptions use message, adbclient uses msg
-            this.LOG('Launch failed: '+(msg || 'No additional information is available'));
+            this.LOG('Launch failed: '+(e.message||e.msg||'No additional information is available'));
             // more info for adb connect errors
             if (/^ADB server is not running/.test(e.msg)) {
                 this.LOG('Make sure the Android SDK Platform Tools are installed and run:');
                 this.LOG('      adb start-server');
                 this.LOG('If you are running ADB on a non-default port, also make sure the adbPort value in your launch.json is correct.');
             }
-            if (/ADB|JDWP/.test(msg)) {
-                this.LOG('Ensure any instances of Android Studio are closed.');
-            }
             // tell the client we're done
-            this.terminate_reason = `start-exception: ${msg}`;
+            this.terminate_reason = `start-exception: ${e.message||e.msg}`;
             this.sendEvent(new TerminatedEvent(false));
         }
     }
@@ -819,7 +787,6 @@ class AndroidDebugSession extends DebugSession {
         analytics.event('debug-end', {
             dbg_session_id: this.session_id,
             dbg_elapsed: Math.trunc((Date.now() - this.session_start.getTime())/1e3),
-            dbg_kind: this.debug_mode,
             dbg_term_reason: this.terminate_reason,
         });
         if (this.debuggerAttached) {

src/debugger.js

@@ -52,14 +52,9 @@ class Debugger extends EventEmitter {
 
     static portManager = {
         portrange: { lowest: 31000, highest: 31099 },
-        fixedport: 0,
         inuseports: new Set(),
         debuggers: {},
         reserveport: function () {
-            if (this.fixedport > 0 && this.fixedport < 65536) {
-                this.inuseports.add(this.fixedport);
-                return this.fixedport;
-            }
             // choose a random port to use each time
             for (let i = 0; i < 10000; i++) {
                 const portidx = this.portrange.lowest + ((Math.random() * 100) | 0);

src/sockets/adbsocket.js

@@ -7,17 +7,10 @@ const AndroidSocket = require('./androidsocket');
 class ADBSocket extends AndroidSocket {
 
     /**
-     * The host and port number to run ADB commands on, in 'host:port' format (host part is optional).
+     * The port number to run ADB on.
-     * The value can be overriden by the adbSocket (or the deprecated adbPort) value in each debug configuration.
+     * The value can be overriden by the adbPort value in each configuration.
-     * 
-     * The default host value is left blank as this is the simplest way to
-     * specify "connect to the local machine" without explicitly specifying 
-     * 'localhost' or '127.0.0.1' (which may be mapped to something else)
      */
-    static HostPort = `:5037`;
+    static ADBPort = 5037;
-    static get DefaultHostPort() {
-        return `:5037`
-    }
 
     constructor() {
         super('ADBSocket');
@@ -25,14 +18,13 @@ class ADBSocket extends AndroidSocket {
 
     /**
      * Reads and checks the reply from an ADB command
-     * @param {string} command
      * @param {boolean} [throw_on_fail] true if the function should throw on non-OKAY status
      */
-    async read_adb_status(command, throw_on_fail = true) {
+    async read_adb_status(throw_on_fail = true) {
         // read back the status
         const status = await this.read_bytes(4, 'latin1')
         if (status !== 'OKAY' && throw_on_fail) {
-            throw new Error(`ADB command '${command}' failed. Status: '${status}'`);
+            throw new Error(`ADB command failed. Status: '${status}'`);
         }
         return status;
     }
@@ -65,7 +57,7 @@ class ADBSocket extends AndroidSocket {
      */
     async cmd_and_status(command) {
         await this.write_adb_command(command);
-        return this.read_adb_status(command);
+        return this.read_adb_status();
     }
 
     /**
@@ -112,7 +104,7 @@ class ADBSocket extends AndroidSocket {
         await this.write_bytes(done_and_mtime);
 
         // read the final status and any error message
-        const result = await this.read_adb_status('sync:', false);
+        const result = await this.read_adb_status(false);
         const failmsg = await this.read_le_length_data('latin1');
         
         // finish the transfer mode

src/utils/android.js

@@ -1,7 +1,8 @@
 const fs = require('fs');
 const path = require('path');
 
-const { ADBClient, getADBSocketParams } = require('../adbclient');
+const { ADBClient } = require('../adbclient');
+const ADBSocket = require('../sockets/adbsocket');
 const { LOG } = require('../utils/print');
 
 function getAndroidSDKFolder() {
@@ -40,21 +41,19 @@ function getADBPathName() {
     return path.join(android_sdk, 'platform-tools', /^win/.test(process.platform)?'adb.exe':'adb');    
 }
 
-function startADBServer() {    
+/**
+ * @param {number} port 
+ */
+function startADBServer(port) {
+    if (typeof port !== 'number' || port <= 0 || port >= 65536) {
+        return false;
+    }
+    
     const adb_exe_path = getADBPathName();
     if (!adb_exe_path) {
         return false;
     }
-    const adb_socket = getADBSocketParams();
+    const adb_start_server_args = ['-P',`${port}`,'start-server'];
-    // don't try and start ADB if the server is on a remote host
-    if (!/^(localhost|127\.\d+\.\d+\.\d+)?$/.test(adb_socket.host)) {
-        LOG(`Cannot launch adb server on remote host ${adb_socket.host}:${adb_socket.port}`);
-        return;
-    }
-    const adb_start_server_args = ['-P',`${adb_socket.port}`,'start-server'];
-    if (adb_socket.host) {
-        adb_start_server_args.unshift(`-H`, adb_socket.host);
-    }
     try {
         LOG([adb_exe_path, ...adb_start_server_args].join(' '));
         const stdout = require('child_process').execFileSync(adb_exe_path, adb_start_server_args, {
@@ -74,7 +73,7 @@ async function checkADBStarted(auto_start) {
     const err = await new ADBClient().test_adb_connection();
     // if adb is not running, see if we can start it ourselves using ANDROID_HOME (and a sensible port number)
     if (err && auto_start) {
-        return startADBServer();
+        return startADBServer(ADBSocket.ADBPort);
     }
     return !err;
 }