Cleanup (DH-18086-2)

Author: bmingles

src/controllers/ExtensionController.ts

@@ -348,24 +348,22 @@ export class ExtensionController implements Disposable {
       const workerInfo = await this._serverManager?.getWorkerInfo(
         url as WorkerURL
       );
-
-      const dhc = await this._coreJsApiCache.get(url);
-
-      const clientUrl = workerInfo == null ? url : workerInfo.grpcUrl;
       const envoyPrefix = workerInfo?.envoyPrefix;
+      const urlStr = String(workerInfo?.grpcUrl ?? url).replace(/\/$/, '');
 
-      const headers: { [key: string]: string } =
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        envoyPrefix == null ? {} : { 'envoy-prefix': envoyPrefix };
+      const headers =
+        envoyPrefix == null
+          ? undefined
+          : // eslint-disable-next-line @typescript-eslint/naming-convention
+            { 'envoy-prefix': envoyPrefix };
 
-      const client = new dhc.CoreClient(
-        clientUrl.toString().replace(/\/$/, ''),
-        {
-          debug: false, // Set `debug` to true to see debug logs for gRPC transport
-          headers,
-          transportFactory: NodeHttp2gRPCTransport.factory,
-        }
-      ) as CoreUnauthenticatedClient;
+      const dhc = await this._coreJsApiCache.get(url);
+
+      const client = new dhc.CoreClient(urlStr, {
+        debug: false, // Set `debug` to true to see debug logs for gRPC transport
+        headers,
+        transportFactory: NodeHttp2gRPCTransport.factory,
+      }) as CoreUnauthenticatedClient;
 
       // Attach a dispose method so that client caches can dispose of the client
       return Object.assign(client, {