GithubStar/SteamTools
1
0
Fork 0
mirror of https://github.com/BeyondDimension/SteamTools.git synced 2026-10-22 09:36:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc

Browse Source
This commit is contained in:
Aigio Liu
2023-02-24 12:45:48 +08:00
parent 549402c7d8
commit 475e33d290
5 changed files with 38 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BD.WTTS.Client.Avalonia.App/BD.WTTS.Client.Avalonia.App.csproj
+3 -1
View File
@@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>Steam++</AssemblyName>
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
<OutputType>WinExe</OutputType>
<RootNamespace>BD.WTTS</RootNamespace>
<DefineConstants>AVALONIA;$(DefineConstants)</DefineConstants>
src/BD.WTTS.Client.Avalonia.App/Program.cs
-3
View File
@@ -32,11 +32,8 @@ static partial class Program
return 0;
}
#endif
MemoryPackFormatterProvider.Register<MemoryPackFormatters>();
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
// fix The request was aborted: Could not create SSL/TLS secure channel
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls13;
src/BD.WTTS.Client.Avalonia.App/Program/Program.OnCreateApplication.cs
+1
View File
@@ -30,6 +30,7 @@ static partial class Program
#else
FileSystem2.InitFileSystem();
#endif
Repository.DataBaseDirectory = IOPath.AppDataDirectory;
if (isTrace) StartWatchTrace.Record("FileSystem");
IApplication.InitLogDir(isTrace: isTrace);
src/BD.WTTS.Client/CommandLineHost.cs
+1 -2
View File
@@ -40,8 +40,7 @@ public abstract class CommandLineHost : IDisposable
if (Application != null) return Task.FromResult(Application);
lock (this)
{
if (_WaitForApplication == null)
_WaitForApplication = Task.Run(async () =>
_WaitForApplication ??= Task.Run(async () =>
{
while (Application == null)
{
src/BD.WTTS.Client/Services.Implementation/Accelerator/ReverseProxy/HttpServer/Middleware/HttpReverseProxyMiddleware.cs
+33 -42
View File
@@ -141,7 +141,7 @@ sealed class HttpReverseProxyMiddleware
if (IsDomain(host))
{
logger.LogWarning(
$"域名 {host} 可能已经被 DNS 污染，如果域名为本机域名，请解析为非回环 IP。");
"域名 {host} 可能已经被 DNS 污染，如果域名为本机域名，请解析为非回环 IP。", host);
domainConfig = defaultDomainConfig;
return true;
}
@@ -172,7 +172,7 @@ sealed class HttpReverseProxyMiddleware
var baseUri = new Uri(defaultValue);
var result = new Uri(baseUri, destination).ToString();
logger.LogInformation($"{defaultValue} => {result}");
logger.LogInformation("{defaultValue} => {result}", defaultValue, result);
return result;
}
@@ -208,6 +208,7 @@ sealed class HttpReverseProxyMiddleware
if (!scripts.Any_Nullable() ||
context.Request.Method != HttpMethods.Get ||
context.Response.StatusCode != StatusCodes.Status200OK ||
context.Response.ContentType == null ||
!context.Response.ContentType.Contains("text/html", StringComparison.OrdinalIgnoreCase))
{
await ResetBody();
@@ -282,7 +283,8 @@ sealed class HttpReverseProxyMiddleware
// var html_start_string = encoding.GetString(html_start.Span);
//#endif
await bodyCoreWriter.WriteAsync(html_start);
(var script_xml_start, var script_xml_end) = GetScriptXmls(encoding);
var script_xml_start = "<script type=\"text/javascript\" src=\"https://local.steampp.net/"u8.ToArray();
var script_xml_end = "\"></script>"u8.ToArray();
foreach (var script in scripts)
{
await bodyCoreWriter.WriteAsync(script_xml_start);
@@ -401,41 +403,6 @@ sealed class HttpReverseProxyMiddleware
//const int BigEndianUnicodePreambleLength = 2;
const int BigEndianUnicodePreambleFirst2Bytes = 0xFEFF;
static readonly object marksLock = new();
static readonly object scriptXmlsLock = new();
static readonly Dictionary<int, (byte[] mark_start, byte[] mark_end)> marksDict = new();
static readonly Dictionary<int, (byte[] script_xml_start, byte[] script_xml_end)> scriptXmlsDict = new();
static (byte[] mark_start, byte[] mark_end) GetMarks(Encoding encoding)
{
var codePage = encoding.CodePage;
if (marksDict.ContainsKey(codePage)) return marksDict[codePage];
lock (marksLock)
{
var mark_start = encoding.GetBytes("</");
var mark_end = encoding.GetBytes(">");
var value = (mark_start, mark_end);
marksDict.Add(codePage, value);
return value;
}
}
static (byte[] script_xml_start, byte[] script_xml_end) GetScriptXmls(Encoding encoding)
{
var codePage = encoding.CodePage;
if (scriptXmlsDict.ContainsKey(codePage)) return scriptXmlsDict[codePage];
lock (scriptXmlsLock)
{
const string scriptXmlStart = $"<script type=\"text/javascript\" src=\"https://{IReverseProxyService.LocalDomain}/";
const string scriptXmlEnd = "\"></script>";
var script_xml_start = encoding.GetBytes(scriptXmlStart);
var script_xml_end = encoding.GetBytes(scriptXmlEnd);
var value = (script_xml_start, script_xml_end);
scriptXmlsDict.Add(codePage, value);
return value;
}
}
/// <summary>
/// 查找脚本注入位置
/// </summary>
@@ -450,7 +417,8 @@ sealed class HttpReverseProxyMiddleware
buffer = buffer_.AsMemory();
// 匹配 </...> 60 47 ... 62
(var mark_start, var mark_end) = GetMarks(encoding);
var mark_start = "</"u8.ToArray();
var mark_end = ">"u8.ToArray();
if (mark_start.Length <= 0 || mark_end.Length <= 0) goto notfound;
int index_name_end = 0;
@@ -495,9 +463,10 @@ sealed class HttpReverseProxyMiddleware
var charCount = encoding.GetCharCount(bytes);
if (charCount == matchCharCount)
{
var name = encoding.GetString(bytes);
if (name.Equals("body", StringComparison.OrdinalIgnoreCase) ||
name.Equals("head", StringComparison.OrdinalIgnoreCase))
var body = "BODY"u8;
var head = "HEAD"u8;
if ((bytes.Length == body.Length && bytes.SequenceEqual(body, Utf8StringComparerOrdinalIgnoreCase.Instance)) ||
(bytes.Length == head.Length && bytes.SequenceEqual(head, Utf8StringComparerOrdinalIgnoreCase.Instance)))
{
insertPosition = index_name_start - mark_start.Length;
return true;
@@ -517,5 +486,27 @@ sealed class HttpReverseProxyMiddleware
notfound: insertPosition = -1;
return false;
}
sealed class Utf8StringComparerOrdinalIgnoreCase : IEqualityComparer<byte>
{
Utf8StringComparerOrdinalIgnoreCase() { }
public static readonly Utf8StringComparerOrdinalIgnoreCase Instance = new();
// https://www.geeksforgeeks.org/lower-case-upper-case-interesting-fact/
static byte Convert(byte b)
{
int i = b;
i &= ~32;
return (byte)i;
}
bool IEqualityComparer<byte>.Equals(byte x, byte y)
=> Convert(x) == Convert(y);
int IEqualityComparer<byte>.GetHashCode(byte obj)
=> EqualityComparer<byte>.Default.GetHashCode(Convert(obj));
}
}
#endif