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

Merge pull request #318 from gnh1201/dev

Browse Source 
Improve logging and async handling in ResourceServer
This commit is contained in:
Namhyeon Go 2025-08-17 23:33:35 +09:00 committed by GitHub
commit df393ed251
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
WelsonJS.Toolkit/WelsonJS.Launcher/ResourceServer.cs
View File

@ -44,13 +44,17 @@ namespace WelsonJS.Launcher
public ResourceServer(string prefix, string resourceName, ICompatibleLogger logger = null)
{
_logger = logger;
_logger = logger ?? new TraceLogger();
_prefix = prefix;
_listener = new HttpListener();
_resourceName = resourceName;
// Fetch a blob config from Internet
FetchBlobConfig();
// Fetch a blob config from Internet (safe fire-and-forget with logging)
_ = FetchBlobConfig().ContinueWith(t =>
{
if (t.IsFaulted)
_logger?.Error($"FetchBlobConfig failed: {t.Exception}");
}, TaskScheduler.Default);
// Add resource tools
_tools.Add(new ResourceTools.Completion(this, _httpClient));
@ -164,26 +168,27 @@ namespace WelsonJS.Launcher
try
{
using (var client = new HttpClient())
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url);
var ua = context?.Request?.UserAgent;
if (!string.IsNullOrEmpty(ua))
{
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, url);
request.Headers.UserAgent.ParseAdd(context.Request.UserAgent);
HttpResponseMessage response = await client.SendAsync(request);
if (!response.IsSuccessStatusCode)
{
_logger?.Error($"Failed to serve blob. URL: {url}, Status: {response.StatusCode}");
return false;
}
data = await response.Content.ReadAsByteArrayAsync();
mimeType = response.Content.Headers.ContentType?.MediaType ?? _defaultMimeType;
ServeResource(context, data, mimeType);
_ = TrySaveCachedBlob(path, data, mimeType);
return true;
request.Headers.UserAgent.ParseAdd(ua);
}
HttpResponseMessage response = await _httpClient.SendAsync(request);
if (!response.IsSuccessStatusCode)
{
_logger?.Error($"Failed to serve blob. URL: {url}, Status: {response.StatusCode}");
return false;
}
data = await response.Content.ReadAsByteArrayAsync();
mimeType = response.Content.Headers.ContentType?.MediaType ?? _defaultMimeType;
ServeResource(context, data, mimeType);
_ = TrySaveCachedBlob(path, data, mimeType);
return true;
}
catch (Exception ex)
{
@ -430,24 +435,29 @@ namespace WelsonJS.Launcher
}
}
private async void FetchBlobConfig()
private async Task FetchBlobConfig()
{
try
{
string url = Program.GetAppConfig("BlobConfigUrl");
var response = await _httpClient.GetStreamAsync(url);
var serializer = new XmlSerializer(typeof(BlobConfig));
using (var reader = new StreamReader(response))
if (string.IsNullOrWhiteSpace(url))
{
_blobConfig = (BlobConfig)serializer.Deserialize(reader);
_logger?.Warn("BlobConfigUrl is not configured.");
return;
}
_blobConfig?.Compile();
using (var response = await _httpClient.GetStreamAsync(url).ConfigureAwait(false))
using (var reader = new StreamReader(response))
{
var serializer = new XmlSerializer(typeof(BlobConfig));
var cfg = (BlobConfig)serializer.Deserialize(reader);
cfg?.Compile();
_blobConfig = cfg;
}
}
catch (Exception ex)
{
_logger?.Error($"Failed to fetch a blob config. Exception: {ex.Message}");
_logger?.Error($"Failed to fetch a blob config. Exception: {ex}");
}
}
}

18
WelsonJS.Toolkit/WelsonJS.Launcher/TraceLogger.cs
View File

@ -12,6 +12,24 @@ namespace WelsonJS.Launcher
{
public class TraceLogger : ICompatibleLogger
{
private static readonly string _logFileName;
static TraceLogger()
{
try
{
_logFileName = (typeof(TraceLogger).Namespace ?? "WelsonJS.Launcher") + ".log";
Trace.Listeners.Add(new TextWriterTraceListener(_logFileName));
}
catch (System.Exception ex)
{
// Fallback when the process cannot write to the working directory
Trace.Listeners.Add(new ConsoleTraceListener());
Trace.TraceWarning($"TraceLogger: failed to initialize file listener '{_logFileName}'. Falling back to ConsoleTraceListener. Error: {ex.Message}");
}
Trace.AutoFlush = true;
}
public void Info(string message) => Trace.TraceInformation(message);
public void Warn(string message) => Trace.TraceWarning(message);
public void Error(string message) => Trace.TraceError(message);