update changelog and readme

changes to the appSourceRoot now require an extension restart

CHANGELOG.md

@@ -1,18 +1,5 @@
 # Change Log
 
-### version 1.3.2
-* Update analytics library
-* Update lodash version - security advisory https://www.npmjs.com/advisories/1523
-
-### 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.
-                // Default: localhost:5037
-                "adbSocket": "localhost:5037",
+                // Port number to connect to the local ADB (Android Debug Bridge) instance.
+                // Default: 5037
+                "adbPort": 5037,
 
                 // Automatically launch 'adb start-server' if not already started.
                 // Default: true

extension.js

@@ -12,11 +12,8 @@ const { selectTargetDevice } = require('./src/utils/device');
 
 /**
  * @param {vscode.ExtensionContext} context
- * @param {string} uid
- * @param {number} session_id
- * @param {*} vscode_props
  */
-async function createLanguageClient(context, uid, session_id, vscode_props) {
+async function createLanguageClient(context) {
   // The server is implemented in node
   let serverModule = context.asAbsolutePath(path.join('langserver', 'server.js'));
   // The debug options for the server
@@ -48,6 +45,8 @@ async function createLanguageClient(context, uid, session_id, vscode_props) {
   }
   const sourceFiles = (await vscode.workspace.findFiles(`${globSearchRoot}**/*.java`, null, 1000, null)).map(uri => uri.toString());
 
+  const mpids = analytics.getIDs(context);
+
   // Options to control the language client
   /** @type {import('vscode-languageclient').LanguageClientOptions} */
   let clientOptions = {
@@ -58,11 +57,11 @@ async function createLanguageClient(context, uid, session_id, vscode_props) {
     initializationOptions: {
         // extensionPath points to the root of the extension (the folder where this file is)
         extensionPath: context.extensionPath,
-        uid,
-        session_id,
-        vscode_props,
+        mpuid: mpids.uid,
+        mpsid: mpids.sid,
         initialSettings: config,
         sourceFiles,
+        vscodeVersion: vscode.version,
         workspaceFolders: (vscode.workspace.workspaceFolders || []).map(z => z.uri.toString()),
     },
     synchronize: {
@@ -115,18 +114,10 @@ function activate(context) {
     /* Only the logcat stuff is configured here. The debugger is launched from src/debugMain.js  */
     AndroidContentProvider.register(context, vscode.workspace);
 
-    const { uid } = analytics.getIDs(context);
-    const session_id = Math.trunc(Math.random() * Number.MAX_SAFE_INTEGER);
-    const vscode_props = {
-        appName: vscode.env.appName,
-        language: vscode.env.language,
-        shell: vscode.env.shell,
-        uiKind: vscode.env.uiKind,
-        vscode_version: vscode.version,
-    }
-    analytics.init(undefined, uid, session_id, '', package_json, vscode_props, 'extension-start');
+    const mpids = analytics.getIDs(context);
+    analytics.init(undefined, mpids.uid, mpids.sid, package_json, { vscode_version: vscode.version });
 
-    createLanguageClient(context, uid, session_id, vscode_props).then(client => {
+    createLanguageClient(context).then(client => {
         languageClient = client;
         refreshLanguageServerEnabledState();
     });
@@ -181,7 +172,6 @@ function activate(context) {
 
 // this method is called when your extension is deactivated
 function deactivate() {
-    analytics.event('extension-deactivate');
 }
 
 exports.activate = activate;

langserver/analytics.js

@@ -1,53 +1,38 @@
-const os = require('os');
-const uuid = require('uuid').v4;
-let client;
+let mp;
 /** @type {string} */
 let uid;
 /** @type {string} */
-let did = uuid();
-/** @type {number} */
-let session_id;
+let sid;
 /** @type {Map<string,[number,number]>} */
 const timeLabels = new Map();
 let session_start = Date.now();
-/** @type {string|Promise<string>} */
-let ip = '';
-let queued_events = null;
-let package_info = null;
-let vscode_info = null;
 
 /**
  * @param {string} [t] 
- * @param {string} u
- * @param {number} s
- * @param {string} ipaddr
- * @param {{name:string,version:string}} package_json
- * @param {*} vscode_props
- * @param {string} caller
+ * @param {string} [u]
+ * @param {string} [s]
+ * @param {{name:string,version:string}} [package_json]
+ * @param {*} [props]
  */
-function init(t = '94635b4642d80407accd3739fa35bed6', u, s, ipaddr, package_json, vscode_props, caller) {
-    if (client) {
+function init(t = '0cca95950055c6553804a46ce7e3df18', u, s, package_json, props) {
+    if (mp) {
         return;
     }
     try {
-        client = require('@amplitude/node').init(t);
+        mp = require('mixpanel').init(t);
     }
     catch {
         return;
     }
     uid = u;
-    session_id = s || Math.trunc(Math.random() * Number.MAX_SAFE_INTEGER);
-    ip = ipaddr || (getCurrentIP()
-        .catch(() => '')
-        .then(res => ip = res));
-    package_info = package_json;
-    vscode_info = vscode_props;
+    sid = s;
 
-    if (!caller) {
+    if (!props) {
         return;
     }
+    const os = require('os');
     const now = new Date();
-    event(caller, {
+    event(`${package_json.name}-start`, {
         extension: package_json.name,
         ext_version: package_json.version,
         arch: process.arch,
@@ -58,59 +43,30 @@ function init(t = '94635b4642d80407accd3739fa35bed6', u, s, ipaddr, package_json
         release: os.release(),
         localtime: now.toTimeString(),
         tz: now.getTimezoneOffset(),
-        ...vscode_props,
+        ...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 
  * @param {*} [properties] 
  */
 function event(eventName, properties) {
-    if (!client || !eventName || (!uid && !did) || !ip) {
-        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));
-        });
+    if (!mp) {
         return;
     }
     try {
-        client.logEvent({
-            event_type: eventName,
-            user_id: uid,
-            device_id: uid ? undefined : did,
-            app_version: package_info.version,
-            ip,
-            language: vscode_info.language,
-            os_name: process.platform,
-            os_version: os.release(),
-            session_id,
-            event_properties: {
+        if (uid) {
+            mp.track(eventName, {
+                distinct_id: uid,
+                session_id: sid,
                 session_length: Math.trunc((Date.now() - session_start) / 60e3),
                 ...properties,
-            }
-        });
+            });
+        } else {
+            mp.track(eventName, properties);
+        }
     } catch {}
 }
 
@@ -157,18 +113,29 @@ function timeEnd(label, time_unit = 'ms', additionalProps = {}) {
 function getIDs(context) {
     if (!context || !context.globalState) {
         return {
-            uid: '',
+            uid: '', sid: ''
         };
     }
+    let uuidv4 = () => {
+        try {
+            uuidv4 = require('uuid').v4;
+            return uuidv4();
+        } catch {
+            return '';
+        }
+    }
     let u = uid || (uid = context.globalState.get('mix-panel-id'));
     if (typeof u !== 'string' || u.length > 36) {
-        u = uid = uuid();
+        u = uid = uuidv4();
         context.globalState.update('mix-panel-id', u);
     }
+    let s = sid || (sid = uuidv4());
     return {
         uid: u,
+        sid: s,
     }
 }
+
 exports.init = init;
 exports.event = event;
 exports.time = time;

langserver/completions.js

@@ -370,10 +370,7 @@ async function getCompletionItems(params, liveParsers, androidLibrary) {
 
     completionRequestCount += 1;
     if ((completionRequestCount === 1) || (completionRequestCount === 5) || ((completionRequestCount % 25) === 0)) {
-        event('completion-requests', {
-            comp_req_count: completionRequestCount, // total count for this session
-            comp_req_partial_count: (completionRequestCount % 25) || 25,
-        });
+        event('completion-requests', { comp_req_count: completionRequestCount });
     }
 
     let parsed = docinfo.parsed;

langserver/method-signatures.js

@@ -41,10 +41,7 @@ async function getSignatureHelp(request, liveParsers) {
 
     methodsigRequestCount += 1;
     if ((methodsigRequestCount === 1) || (methodsigRequestCount === 5) || ((methodsigRequestCount % 25) === 0)) {
-        event('method-sig-requests', {
-            methsig_req_count: methodsigRequestCount,
-            methsig_req_partial_count: (methodsigRequestCount % 25) || 25,
-        });
+        event('method-sig-requests', { methsig_req_count: methodsigRequestCount });
     }
 
     // locate the token at the requested position

langserver/package-lock.json

@@ -1,29 +1,23 @@
 {
   "name": "langserver",
-  "version": "1.0.4",
+  "version": "1.0.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@amplitude/node": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@amplitude/node/-/node-0.3.3.tgz",
-      "integrity": "sha512-Uzg4MRAuD053Ex67Iu2lm2GovnVte1uKI3q7CXlMCYZ9ylZmAkPbTnjg9OVyD4f+IiUfgK4p3bE7r9p7jqSDLA==",
-      "requires": {
-        "@amplitude/types": "^0.3.2",
-        "tslib": "^1.9.3"
-      }
-    },
-    "@amplitude/types": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@amplitude/types/-/types-0.3.2.tgz",
-      "integrity": "sha512-7+m7nhJMFGbpsppOUsCH8f4FOFyAxgKFuXkKknU/LP2CMYVjWEIoLTKKgaJPc2c8wXaK5KPXVetb8VeiGbuaGg=="
-    },
     "@types/node": {
       "version": "13.13.4",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz",
       "integrity": "sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==",
       "dev": true
     },
+    "agent-base": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "requires": {
+        "es6-promisify": "^5.0.0"
+      }
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -85,6 +79,14 @@
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
+    "debug": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+      "requires": {
+        "ms": "^2.1.1"
+      }
+    },
     "duplexer2": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
@@ -93,6 +95,19 @@
         "readable-stream": "^2.0.2"
       }
     },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "requires": {
+        "es6-promise": "^4.0.3"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -127,6 +142,15 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
       "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
     },
+    "https-proxy-agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.0.tgz",
+      "integrity": "sha512-y4jAxNEihqvBI5F3SaO2rtsjIOnnNA8sEbuiP+UhJZJHeM2NRm6c09ax2tgqme+SgUUvjao2fJXF4h3D6Cb2HQ==",
+      "requires": {
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
+      }
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -147,10 +171,10 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "java-mti": {
-      "version": "github:adelphes/java-mti#ec164ace68267813a1ca9df18651b51e3f3f067d",
-      "from": "github:adelphes/java-mti#ec164ac",
+      "version": "github:adelphes/java-mti#d0e1e45bad4d2bba453dbcb5ad527db023f223e8",
+      "from": "github:adelphes/java-mti#d0e1e45",
       "requires": {
-        "unzipper": "0.10.11"
+        "unzipper": "^0.10.11"
       }
     },
     "listenercount": {
@@ -171,6 +195,14 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
+    "mixpanel": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/mixpanel/-/mixpanel-0.11.0.tgz",
+      "integrity": "sha512-TS7AkCmfC+vGshlCOjEcITFoFxlt5fdSEqmN+d+pTXAhE5v+jPQW2uUcn9W+Oq4NVXz+kdskU09dsm9vmNl0ig==",
+      "requires": {
+        "https-proxy-agent": "3.0.0"
+      }
+    },
     "mkdirp": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -179,6 +211,11 @@
         "minimist": "^1.2.5"
       }
     },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -242,11 +279,6 @@
       "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
       "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk="
     },
-    "tslib": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
-    },
     "unzipper": {
       "version": "0.10.11",
       "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",

langserver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langserver",
-  "version": "1.0.4",
+  "version": "1.0.3",
   "description": "Language server for Android development",
   "main": "server.js",
   "scripts": {
@@ -9,8 +9,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@amplitude/node": "^0.3.3",
-    "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",
     "vscode-languageserver-textdocument": "1.0.1",

langserver/server.js

@@ -135,7 +135,7 @@ connection.onInitialize((params) => {
     }
 
     Settings.set(startupOpts.initialSettings);
-    analytics.init(undefined, startupOpts.uid, startupOpts.session_id, '', package_json, startupOpts.vscode_props, 'langserver-start');
+    analytics.init(undefined, startupOpts.mpuid, uuidv4(), package_json, { vscode_version: startupOpts.vscodeVersion });
 
     loadCodeCompletionLibrary(startupOpts.extensionPath, Settings.codeCompletionLibraries);
 

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "android-dev-ext",
-    "version": "1.3.2",
+    "version": "1.2.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -710,9 +710,9 @@
             "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc="
         },
         "lodash": {
-            "version": "4.17.19",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-            "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+            "version": "4.17.15",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+            "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
             "dev": true
         },
         "long": {

package.json

@@ -2,7 +2,7 @@
     "name": "android-dev-ext",
     "displayName": "Android",
     "description": "Android debugging support for VS Code",
-    "version": "1.3.2",
+    "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.adbHost = adbHost || default_adb_socket.host;
-        this.adbPort = adbPort || default_adb_socket.port;
+        this.adbPort = adbPort;
     }
 
     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) 
-        // 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.connect(o.localport)
         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

@@ -6,6 +6,7 @@ const {
 // node and external modules
 const os = require('os');
 const path = require('path');
+const uuidv4 = require('uuid').v4;
 
 // our stuff
 const { ADBClient } = require('./adbclient');
@@ -110,8 +111,9 @@ class AndroidDebugSession extends DebugSession {
 
         this.terminate_reason = '';
 
+        this.session_id = uuidv4();
         this.session_start = new Date();
-        analytics.init(undefined, undefined, undefined, '', require('../package.json'), {}, 'debugger-start');
+        analytics.init();
 
         // this debugger uses one-based lines and columns
 		this.setDebuggerLinesStartAt1(true);
@@ -137,8 +139,8 @@ class AndroidDebugSession extends DebugSession {
         response.body.supportsExceptionInfoRequest = true;
         response.body.supportsHitConditionalBreakpoints = true;
 
-        this.sendResponse(response);
-    }
+		this.sendResponse(response);
+	}
 
     /**
      * @param {string} msg 
@@ -323,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
@@ -341,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
@@ -369,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);
@@ -443,28 +430,25 @@ class AndroidDebugSession extends DebugSession {
             await this.dbgr.resume();
             
             analytics.event('debug-started', {
-                dbg_start: this.session_start.toTimeString(),
+                dbg_session_id: this.session_id,
+                dbg_start: this.session_start.toLocaleTimeString(),
                 dbg_tz: this.session_start.getTimezoneOffset(),
                 dbg_kind: 'attach',
                 dbg_device_api: this.device_api_level,
                 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.');
-            }
-            if (/ADB|JDWP/.test(msg)) {
-                this.LOG('Ensure any instances of Android Studio are closed and ADB is running.');
+                this.LOG('If you are running ADB on a non-default port, also make sure the adbPort value in your launch.json is correct.');
             }
             // 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));
         }
     }
@@ -472,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
@@ -498,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
@@ -526,16 +508,9 @@ 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;
+        // set the custom ADB port - this should be changed to pass it to each ADBClient instance
+        if (typeof args.adbPort === 'number' && args.adbPort >= 0 && args.adbPort <= 65535) {
+            ADBSocket.ADBPort = args.adbPort;
         }
 
         try {
@@ -608,7 +583,8 @@ class AndroidDebugSession extends DebugSession {
             await this.dbgr.resume();
             
             analytics.event('debug-started', {
-                dbg_start: this.session_start.toTimeString(),
+                dbg_session_id: this.session_id,
+                dbg_start: this.session_start.toLocaleTimeString(),
                 dbg_tz: this.session_start.getTimezoneOffset(),
                 dbg_kind: 'debug',
                 dbg_device_api: this.device_api_level,
@@ -619,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));
         }
     }
@@ -813,8 +785,8 @@ class AndroidDebugSession extends DebugSession {
         D('disconnectRequest');
         this._isDisconnecting = true;
         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-types.js

@@ -610,16 +610,12 @@ class DebuggerBreakpoint {
         const cls = splitSourcePath(srcfpn);
         this.id = DebuggerBreakpoint.makeBreakpointID(srcfpn, linenum);
         this.srcfpn = srcfpn;
-        this.file = cls.file;
         this.qtype = cls.qtype;
         this.pkg = cls.pkg;
         this.type = cls.type;
         this.linenum = linenum;
         this.options = options;
-        // sigpattern is used to match up source files with class signatures but because
-        // kotlin allows filenames that differ from class names, we now only match up to
-        // the package level and use the source name retuned by JDWP to narrow it down futher.
-        this.sigpattern = new RegExp(`^L${cls.pkg.replace(/[.]/g, '/')}/[^/]+;$`)
+        this.sigpattern = new RegExp(`^L${cls.qtype}([$][$a-zA-Z0-9_]+)?;$`),
         this.state = initialState;     // set,notloaded,enabled,removed
         this.hitcount = 0;      // number of times this bp was hit during execution
         this.stopcount = 0;     // number of times this bp caused a break into the debugger

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);
@@ -567,15 +562,13 @@ class Debugger extends EventEmitter {
      * @param {DebuggerBreakpoint} bp 
      */
     async initialiseBreakpoint(bp) {
-        // try and load the classes in the package - if the runtime hasn't loaded it yet, this will just return a TypeNotAvailable instance
+        // try and load the class - if the runtime hasn't loaded it yet, this will just return a TypeNotAvailable instance
         let classes = await Promise.all(
             [...this.session.loadedClasses]
                 .filter(signature => bp.sigpattern.test(signature))
                 .map(signature => this.loadClassInfo(signature))
         );
-        // find classes with a matching sourcefile name
-        classes = classes.filter(c => c.src.sourcefile === bp.file);
-        const bploc = Debugger.findBreakpointLocation(classes, bp);
+        let bploc = Debugger.findBreakpointLocation(classes, bp);
         if (!bploc) {
             // we couldn't identify a matching location - either the class is not yet loaded or the
             // location doesn't correspond to any code. In case it's the former, make sure we are notified
@@ -1663,7 +1656,6 @@ class Debugger extends EventEmitter {
         let bploc = null;
         classes.find(c =>
             bp.sigpattern.test(c.type.signature)
-                && bp.file === c.src.sourcefile
                 && c.methods.find(m => {
                     const line = m.linetable.lines.find(line => line.linenum === bp.linenum);
                     if (line) {

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 value can be overriden by the adbSocket (or the deprecated adbPort) value in each debug 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)
+     * The port number to run ADB on.
+     * The value can be overriden by the adbPort value in each configuration.
      */
-    static HostPort = `:5037`;
-    static get DefaultHostPort() {
-        return `:5037`
-    }
+    static ADBPort = 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();
-    // 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);
-    }
+    const adb_start_server_args = ['-P',`${port}`,'start-server'];
     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;
 }

src/utils/source-file.js

@@ -6,16 +6,12 @@ function hasValidSourceFileExtension(s) {
 	return /\.(java|kt)$/i.test(s);
 }
 
-/**
- * @param {string} filepath 
- */
 function splitSourcePath(filepath) {
-    const m = filepath.match(/^\/([^/]+(?:\/[^/]+)*)?\/([^./]+)\.(java|kt)$/i);
+    const m = filepath.match(/^\/([^/]+(?:\/[^/]+)*)?\/([^./]+)\.(java|kt)$/);
     return {
         pkg: m[1].replace(/\/+/g, '.'),
         type: m[2],
         qtype: `${m[1]}/${m[2]}`,
-        file: `${m[2]}.${m[3]}`,
     }
 }