🔨 优化脚本注入路径为同源，修复github加速在启用脚本的情况下出现异常

Author: rmbadmin

ref/SteamClient

@@ -30,6 +30,12 @@ public HttpLocalRequestMiddleware(
     /// <returns></returns>
     public async Task InvokeAsync(HttpContext context, RequestDelegate next)
     {
+        if (TryGetInjectScriptLocalId(context.Request.Path, out var injectScriptLid))
+        {
+            await HandleScriptRequestAsync(context, injectScriptLid);
+            return;
+        }
+
         if (HttpMethods.IsOptions(context.Request.Method) && context.Request.Headers.ContainsKey("Access-Control-Request-Private-Network"))
         {
             // https://wicg.github.io/private-network-access/
@@ -60,34 +66,50 @@ public async Task InvokeAsync(HttpContext context, RequestDelegate next)
                     await HandleHttpRequestAsync(context);
                     return;
                 default: //默认处理脚本匹配
-                    if (!int.TryParse(context.Request.Path.Value?.Trim('/'), out var lid) && lid <= 0)
-                    {
-                        await Handle404NotFoundAsync(context);
-                        return;
-                    }
-                    // TODO: Scripts
-                    if (reverseProxyConfig.TryGetScriptContent(lid, out string? content))
-                    {
-                        if (string.IsNullOrEmpty(content))
-                        {
-                            await Handle404NotFoundAsync(context);
-                            return;
-                        }
-                        context.Response.Headers.ContentType = "text/javascript;charset=UTF-8";
-                        await context.Response.WriteAsync(content);
-                        return;
-                    }
-                    else
+                    if (!int.TryParse(context.Request.Path.Value?.Trim('/'), out var lid) || lid <= 0)
                     {
                         await Handle404NotFoundAsync(context);
                         return;
                     }
+                    await HandleScriptRequestAsync(context, lid);
+                    return;
             }
         }
 
         await next(context);
     }
 
+    static bool TryGetInjectScriptLocalId(PathString path, out int localId)
+    {
+        localId = default;
+        var pathValue = path.Value;
+        if (string.IsNullOrEmpty(pathValue))
+            return false;
+
+        var prefix = IReverseProxyService.Constants.InjectScriptPathPrefix;
+        if (!pathValue.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+            return false;
+
+        var idPart = pathValue[prefix.Length..];
+        if (!idPart.EndsWith(".js", StringComparison.OrdinalIgnoreCase))
+            return false;
+
+        idPart = idPart[..^3];
+        return int.TryParse(idPart, out localId) && localId > 0;
+    }
+
+    async Task HandleScriptRequestAsync(HttpContext context, int lid)
+    {
+        if (reverseProxyConfig.TryGetScriptContent(lid, out var content) && !string.IsNullOrEmpty(content))
+        {
+            context.Response.Headers.ContentType = "application/javascript;charset=UTF-8";
+            await context.Response.WriteAsync(content);
+            return;
+        }
+
+        await Handle404NotFoundAsync(context);
+    }
+
     /// <summary>
     /// 处理脚本所需要的 HTTP 请求
     /// </summary>

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/HttpServer/Middleware/HttpLocalRequestMiddleware.cs

@@ -350,8 +350,8 @@ async Task WriteAsync(Stream bodyCoreWriter)
                         //                        var html_start_string = encoding.GetString(html_start.Span);
                         //#endif
                         await bodyCoreWriter.WriteAsync(html_start);
-                        ReadOnlyMemory<byte> script_xml_start = "<script type=\"text/javascript\" src=\"https://local.steampp.net/"u8.ToArray();
-                        ReadOnlyMemory<byte> script_xml_end = "\"></script>"u8.ToArray();
+                        var script_xml_start = Encoding.ASCII.GetBytes($"<script type=\"text/javascript\" src=\"{IReverseProxyService.Constants.InjectScriptPathPrefix}");
+                        ReadOnlyMemory<byte> script_xml_end = ".js\"></script>"u8.ToArray();
                         foreach (var script in scripts)
                         {
                             await bodyCoreWriter.WriteAsync(script_xml_start);

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/HttpServer/Middleware/HttpReverseProxyMiddleware.cs

@@ -34,6 +34,11 @@ static class Constants
 
         public const string LocalDomain = "local.steampp.net";
 
+        /// <summary>
+        /// 同源脚本注入路径前缀，避免使用外域 script src 造成页面脚本 publicPath 污染。
+        /// </summary>
+        public const string InjectScriptPathPrefix = "/WattToolkit_Inject/";
+
         public static IPAddress DefaultProxyIp => IPAddress.Any;
     }
 

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services/IReverseProxyService.Constants.cs

@@ -414,7 +414,7 @@ async Task RunLoadBadges()
         HandleBadges:
             Badges.Clear();
             Badges.Add(badges!);
-            await RefreshPrivateGameAppIds(steam_id);
+            //await RefreshPrivateGameAppIds(steam_id);
             TotalCardsRemaining = 0;
             TotalCardsAvgPrice = 0;
 

src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/ViewModels/IdleCardPageViewModel.cs

@@ -32,8 +32,8 @@ public void TestFindScriptInjectInsertPosition()
         Assert.That(position, Is.GreaterThan(0));
 
         var html_start = buffer[..position];
-        var script_xml_start = "<script type=\"text/javascript\" src=\"https://local.steampp.net/"u8.ToArray();
-        var script_xml_end = "\"></script>"u8.ToArray();
+        var script_xml_start = "<script type=\"text/javascript\" src=\"/.watt-toolkit-inject/"u8.ToArray();
+        var script_xml_end = ".js\"></script>"u8.ToArray();
 
         using var s = new MemoryStream();
         s.Write(html_start);