intial work

Author: andysterland

package-lock.json

@@ -126,6 +126,7 @@
     "@types/node": "^10.5.2",
     "@types/shelljs": "^0.8.0",
     "@types/ws": "^6.0.1",
+    "@types/applicationinsights": "^0.20.0",
     "shelljs": "^0.8.2",
     "ts-node": "^7.0.1",
     "tslint": "^5.11.0",

package.json

@@ -12,6 +12,7 @@ interface IPackageInfo {
 }
 
 const debuggerType: string = 'devtools-for-chrome';
+const defaultUrl: string = 'about:blank';
 let telemetryReporter: TelemetryReporter;
 
 export function activate(context: vscode.ExtensionContext) {
@@ -31,7 +32,7 @@ export function activate(context: vscode.ExtensionContext) {
     }));
 
     context.subscriptions.push(vscode.commands.registerCommand('devtools-for-chrome.attach', async () => {
-        attach(context, /* viaConfig= */ false);
+        attach(context, /* viaConfig= */ false, defaultUrl);
     }));
 
     vscode.debug.registerDebugConfigurationProvider(debuggerType, {
@@ -46,18 +47,11 @@ export function activate(context: vscode.ExtensionContext) {
 
         resolveDebugConfiguration(folder: vscode.WorkspaceFolder | undefined, config: vscode.DebugConfiguration, token?: vscode.CancellationToken): vscode.ProviderResult<vscode.DebugConfiguration> {
             if (config && config.type == debuggerType) {
+                let targetUri: string = utils.getUrlFromConfig(folder, config);
                 if (config.request && config.request.localeCompare('attach', 'en', { sensitivity: 'base' }) == 0) {
-                    attach(context, /* viaConfig= */ true);
-                } else {
-                    let launchUri: string = '';
-                    if (folder.uri.scheme == 'file') {
-                        const baseUrl: string = config.file || config.url;
-                        const replacedUri: string = baseUrl.replace('${workspaceFolder}', folder.uri.path);
-                        launchUri = utils.pathToFileURL(replacedUri);
-                    } else {
-                        launchUri = config.url;
-                    }
-                    launch(context, launchUri, config.chromePath);
+                    attach(context, /* viaConfig= */ true, defaultUrl);
+                } else if (config.request && config.request.localeCompare('launch', 'en', { sensitivity: 'base' }) == 0) {
+                    launch(context, targetUri, config.chromePath);
                 }
             } else {
                 vscode.window.showErrorMessage('No supported launch config was found.');
@@ -84,21 +78,21 @@ async function launch(context: vscode.ExtensionContext, launchUrl?: string, chro
             return;
         }
 
-        utils.launchLocalChrome(pathToChrome, port, 'about:blank');
+        utils.launchLocalChrome(pathToChrome, port, defaultUrl);
     }
 
     const target = JSON.parse(await utils.getURL(`http://${hostname}:${port}/json/new?${launchUrl}`));
 
     if (!target || !target.webSocketDebuggerUrl || target.webSocketDebuggerUrl == '') {
         vscode.window.showErrorMessage(`Could not find the launched Chrome tab: (${launchUrl}).`);
         telemetryReporter.sendTelemetryEvent('launch/error/tab_not_found', telemetryProps);
-        attach(context, viaConfig);
+        attach(context, viaConfig, defaultUrl);
     } else {
         DevToolsPanel.createOrShow(context, target.webSocketDebuggerUrl);
     }
 }
 
-async function attach(context: vscode.ExtensionContext, viaConfig: boolean) {
+async function attach(context: vscode.ExtensionContext, viaConfig: boolean, targetUrl: string) {
     const telemetryProps = { viaConfig: `${viaConfig}` };
     telemetryReporter.sendTelemetryEvent('attach', telemetryProps);
 
@@ -111,14 +105,34 @@ async function attach(context: vscode.ExtensionContext, viaConfig: boolean) {
 
         responseArray.forEach(i => {
             i = utils.fixRemoteUrl(hostname, port, i);
-            items.push({ label: i.title, description: i.url, detail: i.webSocketDebuggerUrl });
+            items.push({ 
+                label: i.title, 
+                description: i.url, 
+                detail: i.webSocketDebuggerUrl 
+            });
         });
 
-        vscode.window.showQuickPick(items).then((selection) => {
-            if (selection) {
-                DevToolsPanel.createOrShow(context, selection.detail as string);
+        let targetUrl: string = '';
+        let targetMatch:boolean = false;
+        if (typeof targetUrl === 'string' && targetUrl.length > 0 && targetUrl != defaultUrl) {
+            const matches = items.filter(i => i.description == defaultUrl);
+            if(matches && matches.length > 0 ){
+                targetUrl = matches[0].description;
+                targetMatch = true;
+            } else {
+                vscode.window.showErrorMessage(`Couldn't attach to ${targetUrl}.`);
             }
-        });
+        } 
+
+        if(targetMatch){ 
+            DevToolsPanel.createOrShow(context, targetUrl as string);
+        } else {
+            vscode.window.showQuickPick(items).then((selection) => {
+                if (selection) {
+                    DevToolsPanel.createOrShow(context, selection.detail as string);
+                }
+            });
+        }
     } else {
         telemetryReporter.sendTelemetryEvent('attach/error/no_json_array', telemetryProps);
     }
@@ -331,10 +345,10 @@ class DevToolsPanel {
     private _getDevtoolsState() {
         const allPrefsKey = 'devtools-preferences';
         const allPrefs: any = this._context.workspaceState.get(allPrefsKey) ||
-        {
-            uiTheme: '"dark"',
-            screencastEnabled: false
-        };
+            {
+                uiTheme: '"dark"',
+                screencastEnabled: false
+            };
         this._panel.webview.postMessage(`preferences:${JSON.stringify(allPrefs)}`);
     }
 
@@ -359,7 +373,7 @@ class DevToolsPanel {
             content = '';
         }
 
-        this._panel.webview.postMessage(`setUrl:${JSON.stringify({id: request.id, content})}`);
+        this._panel.webview.postMessage(`setUrl:${JSON.stringify({ id: request.id, content })}`);
     }
 
     private _update() {

src/extension.ts

@@ -6,6 +6,7 @@ import * as net from 'net';
 import * as os from 'os';
 import * as path from 'path';
 import * as url from 'url';
+import * as vscode from 'vscode';
 
 export function getURL(aUrl: string, options: https.RequestOptions = {}): Promise<string> {
     return new Promise((resolve, reject) => {
@@ -140,4 +141,18 @@ export function forceForwardSlashes(aUrl: string): string {
     return aUrl
         .replace(/\\\//g, '/') // Replace \/ (unnecessarily escaped forward slash)
         .replace(/\\/g, '/');
+}
+
+export function getUrlFromConfig(folder: vscode.WorkspaceFolder, config: vscode.DebugConfiguration): string {
+    let outUrlString:string = '';
+
+    if (config.file) {
+        outUrlString = config.file;
+        outUrlString = outUrlString.replace('${workspaceFolder}', folder.uri.path);
+        outUrlString = pathToFileURL(outUrlString);
+    } else if(config.url){
+        outUrlString = config.url;
+    }
+
+    return outUrlString;
 }