gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2025-10-27 02:51:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor WebSocket communication logic

Browse Source 
Replaces manual WebSocket send/receive code with a single call to _wsManager.SendAndReceiveAsync for improved clarity and maintainability. Updates comments for better readability and removes redundant exception handling for OperationCanceledException.
This commit is contained in:
Namhyeon Go 2025-08-14 04:43:13 +09:00
parent 6893eadd04
commit 2068cdfeb3
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
WelsonJS.Toolkit/WelsonJS.Launcher/ResourceTools/ChromiumDevTools.cs
View File

@ -55,7 +55,7 @@ namespace WelsonJS.Launcher.ResourceTools
if (endpoint.StartsWith("page/", StringComparison.OrdinalIgnoreCase)) if (endpoint.StartsWith("page/", StringComparison.OrdinalIgnoreCase))
{ {
// 기본 구성 // read the variable
string baseUrl = Program.GetAppConfig("ChromiumDevToolsPrefix"); string baseUrl = Program.GetAppConfig("ChromiumDevToolsPrefix");
if (!Uri.TryCreate(baseUrl, UriKind.Absolute, out Uri uri)) if (!Uri.TryCreate(baseUrl, UriKind.Absolute, out Uri uri))
{ {
@ -66,7 +66,7 @@ namespace WelsonJS.Launcher.ResourceTools
string hostname = uri.Host; string hostname = uri.Host;
int port = uri.Port; int port = uri.Port;
// 포트 덮어쓰기: ?port=1234 // override the port number: ?port=1234
string portQuery = context.Request.QueryString["port"]; string portQuery = context.Request.QueryString["port"];
if (!string.IsNullOrEmpty(portQuery)) if (!string.IsNullOrEmpty(portQuery))
{ {
@ -74,48 +74,28 @@ namespace WelsonJS.Launcher.ResourceTools
if (parsedPort > 0) port = parsedPort; if (parsedPort > 0) port = parsedPort;
} }
// 타임아웃 처리 // set timeout
int timeout = 5; int timeout = 5;
string timeoutConfig = Program.GetAppConfig("ChromiumDevToolsTimeout"); string timeoutConfig = Program.GetAppConfig("ChromiumDevToolsTimeout");
if (!string.IsNullOrEmpty(timeoutConfig)) if (!string.IsNullOrEmpty(timeoutConfig))
int.TryParse(timeoutConfig, out timeout); int.TryParse(timeoutConfig, out timeout);
// 경로 // targeted WebSocket path
string wsPath = "devtools/" + endpoint; string wsPath = "devtools/" + endpoint;
// 본문 읽기 // read the body messsage
string postBody; string postBody;
using (var reader = new StreamReader(context.Request.InputStream, context.Request.ContentEncoding)) using (var reader = new StreamReader(context.Request.InputStream, context.Request.ContentEncoding))
{
postBody = await reader.ReadToEndAsync(); postBody = await reader.ReadToEndAsync();
ClientWebSocket ws;
try
{
ws = await _wsManager.GetOrCreateAsync(hostname, port, wsPath);
}
catch (Exception ex)
{
Server.ServeResource(context, $"<error>WebSocket connection failed: {EscapeXml(ex.Message)}</error>", "application/xml", 502);
return;
} }
// try to communicate
try try
{ {
var sendBuffer = Encoding.UTF8.GetBytes(postBody); string response = await _wsManager.SendAndReceiveAsync(hostname, port, wsPath, postBody, timeout);
var sendToken = timeout == 0 ? CancellationToken.None : new CancellationTokenSource(TimeSpan.FromSeconds(timeout)).Token;
await ws.SendAsync(new ArraySegment<byte>(sendBuffer), WebSocketMessageType.Text, true, sendToken);
var recvBuffer = new byte[4096];
var recvToken = timeout == 0 ? CancellationToken.None : new CancellationTokenSource(TimeSpan.FromSeconds(timeout)).Token;
var result = await ws.ReceiveAsync(new ArraySegment<byte>(recvBuffer), recvToken);
string response = Encoding.UTF8.GetString(recvBuffer, 0, result.Count);
Server.ServeResource(context, response, "application/json", 200); Server.ServeResource(context, response, "application/json", 200);
} }
catch (OperationCanceledException)
{
Server.ServeResource(context, "<error>Timeout occurred</error>", "application/xml", 504);
}
catch (Exception ex) catch (Exception ex)
{ {
_wsManager.Remove(hostname, port, wsPath); _wsManager.Remove(hostname, port, wsPath);