Merge pull request #9 from CodeMooseUS/sourcemap_crash_fix

Forward url requests to extension to fix source map crash

Author: CodeMooseUS

CHANGELOG.md

@@ -0,0 +1,14 @@
+## 0.0.4
+* Fixed a crash due to sourcemaps - [#8](https://github.com/CodeMooseUS/vscode-devtools/issues/8)
+
+## 0.0.3
+* Fixed an issue with telemetry not updating user count correctly
+
+## 0.0.2
+* Added devtools settings persistance - [#1](https://github.com/CodeMooseUS/vscode-devtools/issues/1)
+    * Any settings that you change from within the devtools themselves will now be there next time you open the devtools.
+    * This includes changing the devtools theme which auto reloads the tools.
+* Added anonymous telemetry reporting to see which functions need implementing next based on usage.
+
+## 0.0.1
+* Initial preview release

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-devtools-for-chrome",
   "displayName": "DevTools for Chrome",
   "description": "Open the chrome devtools as a dockable webview",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "preview": true,
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "codemooseus",

src/extension.ts

@@ -257,6 +257,8 @@ class DevToolsPanel {
             return this._getDevtoolsState();
         } else if (message.substr(0, 9) === 'setState:') {
             return this._setDevtoolsState(message.substr(9));
+        } else if (message.substr(0, 7) === 'getUrl:') {
+            return this._getDevtoolsUrl(message.substr(7));
         }
 
         if (!this._socket) {
@@ -336,16 +338,30 @@ class DevToolsPanel {
         this._panel.webview.postMessage(`preferences:${JSON.stringify(allPrefs)}`);
     }
 
-    private _setDevtoolsState(state: string) {
+    private _setDevtoolsState(message: string) {
         // Parse the preference from the message and store it
-        const pref = JSON.parse(state) as { name: string, value: string };
+        const pref = JSON.parse(message) as { name: string, value: string };
 
         const allPrefsKey = 'devtools-preferences';
         const allPrefs: any = this._context.workspaceState.get(allPrefsKey) || {};
         allPrefs[pref.name] = pref.value;
         this._context.workspaceState.update(allPrefsKey, allPrefs);
     }
 
+    private async _getDevtoolsUrl(message: string) {
+        // Parse the request from the message and store it
+        const request = JSON.parse(message) as { id: number, url: string };
+
+        let content = '';
+        try {
+            content = await utils.getURL(request.url);
+        } catch (ex) {
+            content = '';
+        }
+
+        this._panel.webview.postMessage(`setUrl:${JSON.stringify({id: request.id, content})}`);
+    }
+
     private _update() {
         this._panel.webview.html = this._getHtmlForWebview();
     }

src/host/storage.ts

@@ -67,31 +67,63 @@ class ToolsWebSocket {
     }
 }
 
+class ToolsResourceLoader {
+    private _window: Window;
+    private _realLoadResource: (url: string) => Promise<string>;
+    private _urlLoadNextId: number;
+    private _urlLoadResolvers: Map<number, (url: string) => void>;
+
+    constructor(dtWindow: Window) {
+        this._window = dtWindow;
+        this._realLoadResource = (this._window as any).Runtime.loadResourcePromise;
+        this._urlLoadNextId = 0;
+        this._urlLoadResolvers = new Map();
+        (this._window as any).Runtime.loadResourcePromise = this.loadResource.bind(this);
+    }
+
+    public resolveUrlRequest(message: string) {
+        // Parse the request from the message and store it
+        const response = JSON.parse(message) as { id: number, content: string };
+
+        if (this._urlLoadResolvers.has(response.id)) {
+            this._urlLoadResolvers.get(response.id)(response.content);
+            this._urlLoadResolvers.delete(response.id);
+        }
+    }
+
+    private async loadResource(url: string): Promise<string> {
+        if (url === 'sources/module.json') {
+            // Override the paused event revealer so that hitting a bp will not switch to the sources tab
+            const content = await this._realLoadResource(url);
+            return content.replace(/{[^}]+DebuggerPausedDetailsRevealer[^}]+},/gm, '');
+        } if (url.substr(0, 7) === 'http://' || url.substr(0, 8) === 'https://') {
+            // Forward the cross domain request over to the extension
+            return new Promise((resolve: (url: string) => void, reject) => {
+                const id = this._urlLoadNextId++;
+                this._urlLoadResolvers.set(id, resolve);
+                window.parent.postMessage(`getUrl:${JSON.stringify({ id, url })}`, '*');
+            });
+        } else {
+            return this._realLoadResource(url);
+        }
+    }
+}
+
 const devToolsFrame = document.getElementById('devtools') as HTMLIFrameElement;
 devToolsFrame.onload = () => {
     const dtWindow = devToolsFrame.contentWindow;
 
     // Override the apis and websocket so that we can control them
     (dtWindow as any).InspectorFrontendHost = new ToolsHost();
     (dtWindow as any).WebSocket = ToolsWebSocket;
+    (dtWindow as any).ResourceLoaderOverride = new ToolsResourceLoader(dtWindow);
 
     // Prevent the devtools from using localStorage since it doesn't exist in data uris
     Object.defineProperty(dtWindow, 'localStorage', {
         get: function () { return undefined; },
         set: function () { }
     });
 
-    // Override the paused event revealer so that hitting a bp will not switch to the sources tab
-    const realLoadResource = (dtWindow as any).Runtime.loadResourcePromise as (url: string) => Promise<string>;
-    (dtWindow as any).Runtime.loadResourcePromise = async function (url: string): Promise<string> {
-        if (url === 'sources/module.json') {
-            const content = await realLoadResource(url);
-            return content.replace(/{[^}]+DebuggerPausedDetailsRevealer[^}]+},/gm, '');
-        } else {
-            return realLoadResource(url);
-        }
-    };
-
     // Add unhandled exception listeners for telemetry
     const reportError = function (name: string, stack: string) {
         const telemetry = {
@@ -115,5 +147,7 @@ devToolsFrame.onload = () => {
 window.addEventListener('message', (e) => {
     if (e.data.substr(0, 12) === 'preferences:') {
         (devToolsFrame.contentWindow as any).InspectorFrontendHost.fireGetStateCallback(e.data.substr(12));
+    } else if (e.data.substr(0, 7) === 'setUrl:') {
+        (devToolsFrame.contentWindow as any).ResourceLoaderOverride.resolveUrlRequest(e.data.substr(7));
     }
 });