Use asExternalUri For Server Url

This allows for automatic port forwarding of trace-server api calls when using remote. Signed-off-by: Will Yang <[email protected]>
eclipse-cdt-cloud · Aug 11, 2023 · 8857562 · 8857562
1 parent ed43a6f
commit 8857562
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/vscode-trace-extension/src/extension.ts b/vscode-trace-extension/src/extension.ts
@@ -50,11 +50,22 @@ export function activate(context: vscode.ExtensionContext): ExternalAPI {
         }
     }));
 
+    const updateUris = async (): Promise<void> => {
+        const baseUri = vscode.Uri.parse(getTraceServerUrl());
+        const extUri = await vscode.env.asExternalUri(baseUri);
+        const extUriString = extUri.toString();
+
+        tracesProvider.updateTraceServerUrl(extUriString);
+        myAnalysisProvider.updateTraceServerUrl(extUriString);
+        TraceViewerPanel.updateTraceServerUrl(extUriString);
+    };
+
     const analysisProvider = new AnalysisProvider();
     // TODO: For now, a different command opens traces from file explorer. Remove when we have a proper trace finder
     const fileOpenHandler = fileHandler(analysisProvider);
     context.subscriptions.push(vscode.commands.registerCommand('traces.openTraceFile', async file => {
         await startTraceServerIfAvailable();
+        await updateUris();
         if (await isUp()) {
             fileOpenHandler(context, file);
         }
@@ -67,14 +78,7 @@ export function activate(context: vscode.ExtensionContext): ExternalAPI {
         }
 
         if (e.affectsConfiguration('trace-compass.traceserver.url')) {
-            const newUrl = getTraceServerUrl();
-
-            // Signal the change to the `Opened traces` and `Available views` webview
-            tracesProvider.updateTraceServerUrl(newUrl);
-            myAnalysisProvider.updateTraceServerUrl(newUrl);
-
-            // Signal the change to all trace panels
-            TraceViewerPanel.updateTraceServerUrl(newUrl);
+            updateUris();
         }
     }));
 
@@ -115,6 +119,7 @@ export function activate(context: vscode.ExtensionContext): ExternalAPI {
 
     context.subscriptions.push(vscode.commands.registerCommand('openedTraces.openTraceFolder', async () => {
         await startTraceServerIfAvailable();
+        await updateUris();
         if (await isUp()) {
             fileOpenHandler(context, undefined);
         }
@@ -126,6 +131,7 @@ export function activate(context: vscode.ExtensionContext): ExternalAPI {
 
     context.subscriptions.push(vscode.commands.registerCommand('serverStatus.started', () => {
         serverStatusService.render(true);
+        updateUris();
         if (tracesProvider) {
             tracesProvider.postMessagetoWebview(VSCODE_MESSAGES.TRACE_SERVER_STARTED, undefined);
         }