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

ready

Browse Source
This commit is contained in:
rmbgame
2021-05-03 15:57:26 +08:00
parent 4a5cacb654
commit 19073d111a
3 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
+1 -1
View File
@@ -74,7 +74,7 @@
</ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate>
<DataTemplate>
<Border Width="450" Classes="paper" Background="{DynamicResource ThemeBrushKey}" Padding="20 10">
<Border MinWidth="450" Classes="paper" Background="{DynamicResource ThemeBrushKey}" Padding="20 10">
<DockPanel>
<Image Source="{Binding Icon}" DockPanel.Dock="Left"></Image>
<StackPanel Spacing="8" DockPanel.Dock="Right">
src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml.cs
+43 -31
View File
@@ -1,3 +1,4 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using System.Application.Services;
@@ -7,37 +8,48 @@ using System.Properties;
namespace System.Application.UI.Views.Pages
{
public class ProxyScriptManagePage : UserControl
{
public ProxyScriptManagePage()
{
InitializeComponent();
}
public class ProxyScriptManagePage : UserControl
{
public ProxyScriptManagePage()
{
InitializeComponent();
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
private void AddNewScriptButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
{
var fileDialog = new OpenFileDialog
{
Filters = new List<FileDialogFilter> {
new FileDialogFilter { Name = "JavaScript Files", Extensions = new List<string> { "js" } },
new FileDialogFilter { Name = "Text Files", Extensions = new List<string> { "txt" } },
new FileDialogFilter { Name = "All Files", Extensions = new List<string> { "*" } },
},
Title = ThisAssembly.AssemblyTrademark,
AllowMultiple = false,
};
fileDialog.ShowAsync(IDesktopAvaloniaAppService.Instance.MainWindow).ContinueWith(async (s) =>
{
if (s != null && s.Result.Length > 0)
{
await ProxyService.Current.AddNewScript(s.Result[0]);
}
});
}
}
var th = this.FindControl<UserControl>("u");
//var item = this.FindControl<Border>("item");
//th.GetObservable(UserControl.WidthProperty).Subscribe(v =>
//{
// if (v < 800)
// item.Width = 800;
// else
// item.Width = 450;
//});
}
private void AddNewScriptButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
{
var fileDialog = new OpenFileDialog
{
Filters = new List<FileDialogFilter> {
new FileDialogFilter { Name = "JavaScript Files", Extensions = new List<string> { "js" } },
new FileDialogFilter { Name = "Text Files", Extensions = new List<string> { "txt" } },
new FileDialogFilter { Name = "All Files", Extensions = new List<string> { "*" } },
},
Title = ThisAssembly.AssemblyTrademark,
AllowMultiple = false,
};
fileDialog.ShowAsync(IDesktopAvaloniaAppService.Instance.MainWindow).ContinueWith(async (s) =>
{
if (s != null && s.Result.Length > 0)
{
await ProxyService.Current.AddNewScript(s.Result[0]);
}
});
}
}
}
src/ST.Client/Services/Implementation/HttpProxyServiceImpl.cs
+15 -20
View File
@@ -62,28 +62,30 @@ namespace System.Application.Services.Implementation
proxyServer.CertificateManager.RootCertificate = proxyServer.CertificateManager.LoadRootCertificate();
}
public async Task HttpRequest(SessionEventArgs e) {
public async Task HttpRequest(SessionEventArgs e)
{
//IHttpService.Instance.SendAsync<object>();
var url = Web.HttpUtility.UrlDecode(e.HttpClient.Request.RequestUri.Query.Replace("?request=", ""));
switch (e.HttpClient.Request.Method.ToUpperInvariant())
{
case "GET":
var body =await IHttpService.Instance.GetAsync<string>(url);
e.Ok(body??"500", new List<HttpHeader>() { new HttpHeader("Access-Control-Allow-Origin", e.HttpClient.Request.Headers.GetFirstHeader("Origin")?.Value ?? "*"), new HttpHeader("Access-Control-Allow-Headers", "*") });
var body = await IHttpService.Instance.GetAsync<string>(url);
e.Ok(body ?? "500", new List<HttpHeader>() { new HttpHeader("Access-Control-Allow-Origin", e.HttpClient.Request.Headers.GetFirstHeader("Origin")?.Value ?? "*"), new HttpHeader("Access-Control-Allow-Headers", "*") });
return;
case "POST":
var requestStream = new StreamWriter(new MemoryStream());
requestStream.Write(e.HttpClient.Request.BodyString);
var send = new HttpRequestMessage {
Method= HttpMethod.Post,
Content= new StreamContent(requestStream.BaseStream),
var send = new HttpRequestMessage
{
Method = HttpMethod.Post,
Content = new StreamContent(requestStream.BaseStream),
};
send.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(e.HttpClient.Request.ContentType);
send.Content.Headers.ContentLength = e.HttpClient.Request.BodyString.Length;
var conext = await IHttpService.Instance.SendAsync<string>(url, send,null,false,new CancellationToken());
var conext = await IHttpService.Instance.SendAsync<string>(url, send, null, false, new CancellationToken());
e.Ok(conext ?? "500", new List<HttpHeader>() { new HttpHeader("Access-Control-Allow-Origin", e.HttpClient.Request.Headers.GetFirstHeader("Origin")?.Value ?? "*"), new HttpHeader("Access-Control-Allow-Headers", "*") });
return;
}
}
//e.Ok(respone, new List<HttpHeader>() { new HttpHeader("Access-Control-Allow-Origin", e.HttpClient.Request.Headers.GetFirstHeader("Origin")?.Value ?? "*") });
}
public async Task OnRequest(object sender, SessionEventArgs e)
@@ -98,8 +100,9 @@ namespace System.Application.Services.Implementation
}
if (e.HttpClient.Request.Host == "local.steampp.net")
{
if (e.HttpClient.Request.Method.ToUpperInvariant() == "OPTIONS") {
e.Ok("", new List<HttpHeader>() { new HttpHeader("Access-Control-Allow-Origin", e.HttpClient.Request.Headers.GetFirstHeader("Origin")?.Value ?? "*"),new HttpHeader("Access-Control-Allow-Headers", "*") });
if (e.HttpClient.Request.Method.ToUpperInvariant() == "OPTIONS")
{
e.Ok("", new List<HttpHeader>() { new HttpHeader("Access-Control-Allow-Origin", e.HttpClient.Request.Headers.GetFirstHeader("Origin")?.Value ?? "*"), new HttpHeader("Access-Control-Allow-Headers", "*") });
return;
}
var type = e.HttpClient.Request.Headers.GetFirstHeader("requestType")?.Value;
@@ -107,12 +110,12 @@ namespace System.Application.Services.Implementation
{
case "xhr":
await HttpRequest(e);
return;
default:
e.Ok(Scripts.FirstOrDefault(x => x.JsPathUrl == e.HttpClient.Request.RequestUri.LocalPath)?.Content ?? "404", JsHeader);
return;
}
}
}
foreach (var item in ProxyDomains)
{
@@ -375,12 +378,6 @@ namespace System.Application.Services.Implementation
//proxyServer.ServerCertificateValidationCallback += OnCertificateValidation;
//proxyServer.ClientCertificateSelectionCallback += OnCertificateSelection;
//var explicitEndPoint = new ExplicitProxyEndPoint(IPAddress.Any, 8888, true)
//{
// // 在所有https请求上使用自颁发的通用证书
// // 当代理客户端不需要证书信任时非常有用
// //GenericCertificate = new X509Certificate2(Path.Combine(AppContext.BaseDirectory, "genericcert.pfx"), "password")
//};
var explicitProxyEndPoint = new ExplicitProxyEndPoint(IPAddress.Loopback, ProxyPort, true)
{
// 通过不启用为每个http的域创建证书来优化性能
@@ -427,8 +424,6 @@ namespace System.Application.Services.Implementation
{
proxyServer.SetAsSystemHttpProxy(explicitProxyEndPoint);
proxyServer.SetAsSystemHttpsProxy(explicitProxyEndPoint);
//proxyServer.UpStreamHttpProxy = new ExternalProxy() { HostName = "localhost", Port = 26501 };
//proxyServer.UpStreamHttpsProxy = new ExternalProxy() { HostName = "localhost", Port = 26501 };
}
#endregion
#if DEBUG