Fixes gitpod-io/gitpod#14248

gitpod-io · Nov 9, 2022 · d3dcc93 · d3dcc93
1 parent 38cac59
commit d3dcc93
Showing 1 changed file with 18 additions and 29 deletions.
diff --git a/extensions/gitpod-web/src/extension.ts b/extensions/gitpod-web/src/extension.ts
@@ -313,35 +313,24 @@ async function registerPorts(context: GitpodExtensionContext): Promise<void> {
 	}
 
 	context.subscriptions.push(observePortsStatus());
-	context.subscriptions.push(vscode.commands.registerCommand('gitpod.resolveExternalPort', (portNumber: number) => {
-		// eslint-disable-next-line no-async-promise-executor
-		return new Promise<string>(async (resolve, reject) => {
-			try {
-				const tryResolve = () => {
-					const port = portMap.get(portNumber);
-					const exposed = port?.status?.exposed;
-					if (exposed) {
-						resolve(exposed.url);
-						return true;
-					}
-					return false;
-				};
-				if (!tryResolve()) {
-					const listenerWebview = portViewProvider.onDidChangePorts(element => {
-						if (element === portViewProvider.portMap && tryResolve()) {
-							listenerWebview?.dispose();
-						}
-					});
-					const request = new ExposePortRequest();
-					request.setPort(portNumber);
-					await util.promisify(context.supervisor.control.exposePort.bind(context.supervisor.control, request, context.supervisor.metadata, {
-						deadline: Date.now() + context.supervisor.deadlines.normal
-					}))();
-				}
-			} catch (e) {
-				reject(e);
-			}
-		});
+	context.subscriptions.push(vscode.commands.registerCommand('gitpod.resolveExternalPort', async (portNumber: number) => {
+		const port = portMap.get(portNumber);
+		const exposed = port?.status?.exposed;
+		if (exposed) {
+			return exposed.url;
+		}
+
+		const request = new ExposePortRequest();
+		request.setPort(portNumber);
+		await util.promisify(context.supervisor.control.exposePort.bind(context.supervisor.control, request, context.supervisor.metadata, {
+			deadline: Date.now() + context.supervisor.deadlines.normal
+		}))();
+
+		// Just construct the port url, maybe we can add an api as to get the port url template
+		const externalUrl = new URL(context.info.getWorkspaceUrl());
+		externalUrl.hostname = `${portNumber}-${externalUrl.hostname}`;
+
+		return externalUrl.toString();
 	}));
 	context.subscriptions.push(vscode.commands.registerCommand('gitpod.ports.makePrivate', ({ port }: PortItem) => {
 		context.fireAnalyticsEvent({