gnh1201/welsonjs
1
0
Fork 0
mirror of https://github.com/gnh1201/welsonjs.git synced 2025-12-13 02:53:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #312 from gnh1201/revert-311-dev

Browse Source 
Revert "Update WebSocketManager.cs (Urgent)"
This commit is contained in:
Namhyeon Go 2025-08-14 03:35:26 +09:00 committed by GitHub
commit 309217994e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
WelsonJS.Toolkit/WelsonJS.Launcher/WebSocketManager.cs
View File

@ -1,9 +1,10 @@
// WebSocketManager.cs // WebSocketManager.cs
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: 2025 Catswords OSS and WelsonJS Contributors // SPDX-FileCopyrightText: 2025 Catswords OSS and WelsonJS Contributors
// https://github.com/gnh1201/welsonjs // https://github.com/gnh1201/welsonjs
// //
using System; using System;
using System.Buffers;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.IO; using System.IO;
using System.Net.WebSockets; using System.Net.WebSockets;
@ -145,38 +146,45 @@ namespace WelsonJS.Launcher
await entry.IoLock.WaitAsync(token); await entry.IoLock.WaitAsync(token);
try try
{ {
// Send message // Send message (single-frame; can be split if needed)
await sock.SendAsync(new ArraySegment<byte>(sendBuf), WebSocketMessageType.Text, true, token); await sock.SendAsync(new ArraySegment<byte>(sendBuf), WebSocketMessageType.Text, true, token);
// Receive message until EndOfMessage // Receive message until EndOfMessage is reached
byte[] buffer = new byte[8192]; var buffer = ArrayPool<byte>.Shared.Rent(8192);
using (var ms = new MemoryStream()) try
{ {
while (true) using (var ms = new MemoryStream())
{ {
var res = await sock.ReceiveAsync(new ArraySegment<byte>(buffer), token); while (true)
if (res.MessageType == WebSocketMessageType.Close)
{ {
// Server requested closure var res = await sock.ReceiveAsync(new ArraySegment<byte>(buffer), token);
try { await sock.CloseAsync(WebSocketCloseStatus.NormalClosure, "Closing as requested by server", token); } catch { }
throw new WebSocketException($"WebSocket closed by server: {sock.CloseStatus} {sock.CloseStatusDescription}"); if (res.MessageType == WebSocketMessageType.Close)
{
// Server requested closure
try { await sock.CloseAsync(WebSocketCloseStatus.NormalClosure, "Closing as requested by server", token); } catch { }
throw new WebSocketException($"WebSocket closed by server: {sock.CloseStatus} {sock.CloseStatusDescription}");
}
if (res.Count > 0)
{
ms.Write(buffer, 0, res.Count);
if (ms.Length > maxMessageBytes)
throw new InvalidOperationException($"Received message exceeds limit ({maxMessageBytes} bytes).");
}
if (res.EndOfMessage)
break;
} }
if (res.Count > 0) // Convert UTF-8 encoded text message to string
{ return Encoding.UTF8.GetString(ms.ToArray());
ms.Write(buffer, 0, res.Count);
if (ms.Length > maxMessageBytes)
throw new InvalidOperationException($"Received message exceeds limit ({maxMessageBytes} bytes).");
}
if (res.EndOfMessage)
break;
} }
}
// Convert UTF-8 encoded text message to string finally
return Encoding.UTF8.GetString(ms.ToArray()); {
ArrayPool<byte>.Shared.Return(buffer);
} }
} }
finally finally