used concurrency handler to make fetch call worker script

microsoft · Oct 27, 2023 · 5d9d994 · 5d9d994
1 parent b2568e6
commit 5d9d994
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 29 deletions.
diff --git a/src/web/client/WebExtensionContext.ts b/src/web/client/WebExtensionContext.ts
@@ -674,6 +674,39 @@ class WebExtensionContext implements IWebExtensionContext {
         return this._vscodeWorkspaceState.get(key);
     }
 
+    public async getWorkerScript(workerUrl : URL) : Promise<any> {
+        try {
+            this.telemetry.sendInfoTelemetry(
+                telemetryEventNames.WEB_EXTENSION_FETCH_WORKER_SCRIPT,
+                { workerUrl: workerUrl.toString() }
+            );
+
+            const response = await this.concurrencyHandler.handleRequest(
+                workerUrl
+            )
+
+            if (!response.ok) {
+                throw new Error(
+                    `Failed to fetch worker script '${workerUrl.toString()}': ${response.statusText}`
+                );
+            }
+
+            this.telemetry.sendInfoTelemetry(
+                telemetryEventNames.WEB_EXTENSION_FETCH_WORKER_SCRIPT_SUCCESS,
+                { workerUrl: workerUrl.toString() }
+            );
+
+            return await response.text();
+        } catch (error) {
+            this.telemetry.sendErrorTelemetry(
+                telemetryEventNames.WEB_EXTENSION_FETCH_WORKER_SCRIPT_FAILED,
+                this.getWorkerScript.name,
+                (error as Error)?.message,
+                error as Error
+            );
+        }
+    }
+
     public setWorker(worker: Worker) {
         this._worker = worker;
     }

diff --git a/src/web/client/extension.ts b/src/web/client/extension.ts
@@ -311,40 +311,38 @@ export function createWebWorkerInstance(
 
     const workerUrl = new URL(webworkerMain.toString());
 
-    fetch(workerUrl)
-        .then((response) => response.text())
-        .then((workerScript) => {
-            const workerBlob = new Blob([workerScript], {
-                type: "application/javascript",
-            });
+    WebExtensionContext.getWorkerScript(workerUrl)
+    .then((workerScript) => {
+        const workerBlob = new Blob([workerScript], {
+            type: "application/javascript",
+        });
 
-            const workerUrl = URL.createObjectURL(workerBlob);
+        const urlObj = URL.createObjectURL(workerBlob);
 
-            WebExtensionContext.setWorker(new Worker(workerUrl));
+        WebExtensionContext.setWorker(new Worker(urlObj));
 
-            if (WebExtensionContext.worker !== undefined) {
-                WebExtensionContext.worker.onmessage = (event) => {
-                    const { data } = event;
+        if (WebExtensionContext.worker !== undefined) {
+            WebExtensionContext.worker.onmessage = (event) => {
+                const { data } = event;
 
-                    WebExtensionContext.containerId = event.data.containerId;
+                WebExtensionContext.containerId = event.data.containerId;
 
-                    if (data.type === Constants.workerEventMessages.REMOVE_CONNECTED_USER) {
-                        WebExtensionContext.removeConnectedUserInContext(
-                            data.userId
-                        );
-                    }
-                    if (data.type === Constants.workerEventMessages.UPDATE_CONNECTED_USERS) {
-                        WebExtensionContext.updateConnectedUsersInContext(
-                            data.containerId,
-                            data.userName,
-                            data.userId,
-                            data.entityId
-                        );
-                    }
-                };
-            }
-        })
-        // TODO: add Telemetry
+                if (data.type === Constants.workerEventMessages.REMOVE_CONNECTED_USER) {
+                    WebExtensionContext.removeConnectedUserInContext(
+                        data.userId
+                    );
+                }
+                if (data.type === Constants.workerEventMessages.UPDATE_CONNECTED_USERS) {
+                    WebExtensionContext.updateConnectedUsersInContext(
+                        data.containerId,
+                        data.userName,
+                        data.userId,
+                        data.entityId
+                    );
+                }
+            };
+        }
+    });
 }
 
 export async function showSiteVisibilityDialog() {

diff --git a/src/web/client/telemetry/constants.ts b/src/web/client/telemetry/constants.ts
@@ -102,4 +102,7 @@ export enum telemetryEventNames {
     WEB_EXTENSION_FETCH_GET_OR_CREATE_SHARED_WORK_SPACE_ERROR = 'webExtensionFetchGetOrCreateSharedWorkSpaceError',
     WEB_EXTENSION_POPULATE_SHARED_WORKSPACE_SYSTEM_ERROR = 'webExtensionPopulateSharedWorkSpaceSystemError',
     WEB_EXTENSION_POPULATE_SHARED_WORKSPACE_SUCCESS = 'webExtensionPopulateSharedWorkSpaceSuccess',
+    WEB_EXTENSION_FETCH_WORKER_SCRIPT = 'webExtensionFetchWorkerScript',
+    WEB_EXTENSION_FETCH_WORKER_SCRIPT_SUCCESS = 'webExtensionFetchWorkerScriptSuccess',
+    WEB_EXTENSION_FETCH_WORKER_SCRIPT_FAILED = 'webExtensionFetchWorkerScriptFailed',
 }