π OpenHands: AI-Driven Development
Fix VS Code URL for remote access (#8191)
Xingyao Wang0fc86b406313
diff --git a/frontend/src/components/features/conversation-panel/conversation-card.tsx b/frontend/src/components/features/conversation-panel/conversation-card.tsxindex 6ca9c801ea..26569ff088 100644--- a/frontend/src/components/features/conversation-panel/conversation-card.tsx+++ b/frontend/src/components/features/conversation-panel/conversation-card.tsx@@ -16,6 +16,7 @@ import { BaseModal } from "../../shared/modals/base-modal/base-modal";import { RootState } from "#/store";import { I18nKey } from "#/i18n/declaration";import { selectSystemMessage } from "#/state/chat-slice";+import { transformVSCodeUrl } from "#/utils/vscode-url-helper";interface ConversationCardProps {onClick?: () => void;@@ -117,7 +118,10 @@ export function ConversationCard({const data = await response.json();if (data.vscode_url) {- window.open(data.vscode_url, "_blank");+ const transformedUrl = transformVSCodeUrl(data.vscode_url);+ if (transformedUrl) {+ window.open(transformedUrl, "_blank");+ }}// VS Code URL not available} catch (error) {diff --git a/frontend/src/routes/conversation.tsx b/frontend/src/routes/conversation.tsxindex cf449a5f1d..fdc53053b5 100644--- a/frontend/src/routes/conversation.tsx+++ b/frontend/src/routes/conversation.tsx@@ -40,6 +40,7 @@ import { clearFiles, clearInitialPrompt } from "#/state/initial-query-slice";import { RootState } from "#/store";import { displayErrorToast } from "#/utils/custom-toast-handlers";import { useDocumentTitleFromState } from "#/hooks/use-document-title-from-state";+import { transformVSCodeUrl } from "#/utils/vscode-url-helper";function AppContent() {useConversationConfig();@@ -159,7 +160,12 @@ function AppContent() {);const data = await response.json();if (data.vscode_url) {- window.open(data.vscode_url, "_blank");+ const transformedUrl = transformVSCodeUrl(+ data.vscode_url,+ );+ if (transformedUrl) {+ window.open(transformedUrl, "_blank");+ }}} catch (err) {// Silently handle the errordiff --git a/frontend/src/routes/vscode-tab.tsx b/frontend/src/routes/vscode-tab.tsxindex d1b75a3bd2..af172c9f1a 100644--- a/frontend/src/routes/vscode-tab.tsx+++ b/frontend/src/routes/vscode-tab.tsx@@ -5,6 +5,7 @@ import { useConversation } from "#/context/conversation-context";import { I18nKey } from "#/i18n/declaration";import { RootState } from "#/store";import { RUNTIME_INACTIVE_STATES } from "#/types/agent-state";+import { transformVSCodeUrl } from "#/utils/vscode-url-helper";function VSCodeTab() {const { t } = useTranslation();@@ -27,7 +28,8 @@ function VSCodeTab() {const data = await response.json();if (data.vscode_url) {- setVsCodeUrl(data.vscode_url);+ const transformedUrl = transformVSCodeUrl(data.vscode_url);+ setVsCodeUrl(transformedUrl);} else {setError(t(I18nKey.VSCODE$URL_NOT_AVAILABLE));}diff --git a/frontend/src/utils/__tests__/vscode-url-helper.test.ts b/frontend/src/utils/__tests__/vscode-url-helper.test.tsnew file mode 100644index 0000000000..c85804089b--- /dev/null+++ b/frontend/src/utils/__tests__/vscode-url-helper.test.ts@@ -0,0 +1,61 @@+import { describe, it, expect, beforeEach, afterEach } from "vitest";+import { transformVSCodeUrl } from "../vscode-url-helper";++describe("transformVSCodeUrl", () => {+ const originalWindowLocation = window.location;++ beforeEach(() => {+ // Mock window.location+ Object.defineProperty(window, "location", {+ value: {+ hostname: "example.com",+ },+ writable: true,+ });+ });++ afterEach(() => {+ // Restore window.location+ Object.defineProperty(window, "location", {+ value: originalWindowLocation,+ writable: true,+ });+ });++ it("should return null if input is null", () => {+ expect(transformVSCodeUrl(null)).toBeNull();+ });++ it("should replace localhost with current hostname when they differ", () => {+ const input = "http://localhost:8080/?tkn=abc123&folder=/workspace";+ const expected = "http://example.com:8080/?tkn=abc123&folder=/workspace";++ expect(transformVSCodeUrl(input)).toBe(expected);+ });++ it("should not modify URL if hostname is not localhost", () => {+ const input = "http://otherhost:8080/?tkn=abc123&folder=/workspace";++ expect(transformVSCodeUrl(input)).toBe(input);+ });++ it("should not modify URL if current hostname is also localhost", () => {+ // Change the mocked hostname to localhost+ Object.defineProperty(window, "location", {+ value: {+ hostname: "localhost",+ },+ writable: true,+ });++ const input = "http://localhost:8080/?tkn=abc123&folder=/workspace";++ expect(transformVSCodeUrl(input)).toBe(input);+ });++ it("should handle invalid URLs gracefully", () => {+ const input = "not-a-valid-url";++ expect(transformVSCodeUrl(input)).toBe(input);+ });+});diff --git a/frontend/src/utils/vscode-url-helper.ts b/frontend/src/utils/vscode-url-helper.tsnew file mode 100644index 0000000000..5c81a360b9--- /dev/null+++ b/frontend/src/utils/vscode-url-helper.ts@@ -0,0 +1,31 @@+/**+ * Helper function to transform VS Code URLs+ *+ * This function checks if a VS Code URL points to localhost and replaces it with+ * the current window's hostname if they don't match.+ *+ * @param vsCodeUrl The original VS Code URL from the backend+ * @returns The transformed URL with the correct hostname+ */+export function transformVSCodeUrl(vsCodeUrl: string | null): string | null {+ if (!vsCodeUrl) return null;++ try {+ const url = new URL(vsCodeUrl);++ // Check if the URL points to localhost+ if (+ url.hostname === "localhost" &&+ window.location.hostname !== "localhost"+ ) {+ // Replace localhost with the current hostname+ url.hostname = window.location.hostname;+ return url.toString();+ }++ return vsCodeUrl;+ } catch (error) {+ // Silently handle the error and return the original URL+ return vsCodeUrl;+ }+}