From 98e73b237218b68e9aceff050c904ab77c5497e6 Mon Sep 17 00:00:00 2001 From: "Namhyeon, Go" Date: Tue, 22 Apr 2025 21:26:42 +0900 Subject: [PATCH 1/2] Fix bug when use the devtools protocol with the remote allow origins (Fix WebSocket error) --- WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs | 6 ++++-- WelsonJS.Toolkit/WelsonJS.Launcher/editor.html | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs b/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs index cb51fca..59be1ba 100644 --- a/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs +++ b/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs @@ -150,9 +150,11 @@ namespace WelsonJS.Launcher } public static void OpenWebBrowser(string url) { + Uri resourceServerUri = new Uri(GetAppConfig("ResourceServerPrefix")); + Uri devToolsUri = new Uri(GetAppConfig("DevToolsPrefix")); + string userDataDir = Path.Combine(GetAppDataPath(), "EdgeUserProfile"); - string remoteAllowOrigins = GetAppConfig("ResourceServerPrefix"); - int remoteDebuggingPort = new Uri(GetAppConfig("DevToolsPrefix")).Port; + string remoteAllowOrigins = $"{resourceServerUri.Scheme}://{resourceServerUri.Host}:{resourceServerUri.Port}"; string[] arguments = { $"\"{url}\"", $"--remote-debugging-port={remoteDebuggingPort}", diff --git a/WelsonJS.Toolkit/WelsonJS.Launcher/editor.html b/WelsonJS.Toolkit/WelsonJS.Launcher/editor.html index 71b5b9e..54b97d2 100644 --- a/WelsonJS.Toolkit/WelsonJS.Launcher/editor.html +++ b/WelsonJS.Toolkit/WelsonJS.Launcher/editor.html @@ -395,7 +395,7 @@ if (response.id == 3) { const responseContent = response.result.result.value; - appendTextToEditor(responseContent); + appendTextToEditor("/*\n" + responseContent + "\n*/"); pushPromptMessage("assistant", responseContent); socket.close(); From eae2795bbf3504eab34671fd250cb4f1fdcd10f5 Mon Sep 17 00:00:00 2001 From: "Namhyeon, Go" Date: Tue, 22 Apr 2025 21:27:23 +0900 Subject: [PATCH 2/2] Update Program.cs --- WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs b/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs index 59be1ba..c29f702 100644 --- a/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs +++ b/WelsonJS.Toolkit/WelsonJS.Launcher/Program.cs @@ -155,6 +155,7 @@ namespace WelsonJS.Launcher string userDataDir = Path.Combine(GetAppDataPath(), "EdgeUserProfile"); string remoteAllowOrigins = $"{resourceServerUri.Scheme}://{resourceServerUri.Host}:{resourceServerUri.Port}"; + int remoteDebuggingPort = devToolsUri.Port; string[] arguments = { $"\"{url}\"", $"--remote-debugging-port={remoteDebuggingPort}",