JonatanRek/FakeDeck
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes And Update

Browse Source
This commit is contained in:
Václav Španinger 2024-09-12 12:54:56 -07:00
parent ef59ca9945
commit 87a4f569c0
6 changed files with 161 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FakeDeckUI/FakeDeck/ButtonType/HelldiversTwoMacro.cs
View File

@ -1,6 +1,7 @@
using FakeeDeck.Class; using FakeeDeck.Class;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -83,7 +84,7 @@ namespace FakeeDeck.ButtonType
foreach (var key in stratogems[stratogem]) foreach (var key in stratogems[stratogem])
{ {
KeyboardMacro.SendKey(key); KeyboardMacro.SendKey(key);
Console.WriteLine(key); Debug.WriteLine(key);
} }
return true; return true;
} }

13
FakeDeckUI/FakeDeck/Class/AutoUpdateHelper.cs
View File

@ -2,20 +2,26 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO;
using System.Linq; using System.Linq;
using System.Net;
using System.Net.Http.Json; using System.Net.Http.Json;
using System.Reflection;
using System.Text; using System.Text;
using System.Text.Json; using System.Text.Json;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows;
namespace FakeeDeck.Class namespace FakeeDeck.Class
{ {
internal class AutoUpdateHelper public class AutoUpdateHelper
{ {
public AutoUpdateHelper() { public AutoUpdateHelper() {
AutoUpdater.ParseUpdateInfoEvent += AutoUpdaterOnParseUpdateInfoEvent; AutoUpdater.ParseUpdateInfoEvent += AutoUpdaterOnParseUpdateInfoEvent;
AutoUpdater.Synchronous = true; AutoUpdater.Synchronous = true;
AutoUpdater.ShowRemindLaterButton = false; AutoUpdater.ShowRemindLaterButton = false;
AutoUpdater.ReportErrors = Debugger.IsAttached;
AutoUpdater.HttpUserAgent = ("FakeDeck-v" + Assembly.GetExecutingAssembly().GetName().Version);
AutoUpdater.Start("https://api.github.com/repos/ravibpatel/AutoUpdater.NET/releases/latest"); AutoUpdater.Start("https://api.github.com/repos/ravibpatel/AutoUpdater.NET/releases/latest");
} }
private void AutoUpdaterOnParseUpdateInfoEvent(ParseUpdateInfoEventArgs args) private void AutoUpdaterOnParseUpdateInfoEvent(ParseUpdateInfoEventArgs args)
@ -23,11 +29,10 @@ namespace FakeeDeck.Class
JsonElement json = JsonDocument.Parse(args.RemoteData).RootElement; JsonElement json = JsonDocument.Parse(args.RemoteData).RootElement;
args.UpdateInfo = new UpdateInfoEventArgs args.UpdateInfo = new UpdateInfoEventArgs
{ {
CurrentVersion = json.GetProperty("tag_name").ToString().TrimStart('v'), CurrentVersion = json.GetProperty("tag_name").ToString().TrimStart('v')+ ".0",
DownloadURL = json.GetProperty("zipball_url").ToString(), DownloadURL = json.GetProperty("zipball_url").ToString(),
}; };
Debug.WriteLine("calling Updater");
Debug.WriteLine(json.ToString());
} }
} }
} }

114
FakeDeckUI/FakeDeck/Class/FakeDeckMain.cs
View File

@ -1,21 +1,39 @@
using System; using System.Diagnostics;
using System.Collections.Generic; using System.Net;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using YamlDotNet.Serialization.NamingConventions;
using YamlDotNet.Serialization;
using System.Diagnostics;
using System.IO;
using System.Text.Json;
using System.Reflection; using System.Reflection;
using FakeeDeck.ButtonType; using System.Reflection.PortableExecutable;
using YamlDotNet.Serialization; using System.Text;
using System.Text.Json;
namespace FakeeDeck.Class namespace FakeeDeck.Class
{ {
internal class FakeDeckMain internal class FakeDeckMain
{ {
public static string pageHeader =
"<!DOCTYPE>" +
"<html>" +
" <head>" +
" <title>HttpListener Example</title>" +
" <link href=\"https://yarnpkg.com/en/package/normalize.css\" rel=\"stylesheet\">" +
" <link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css\" rel=\"stylesheet\">" +
" <link href=\"https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css\" rel=\"stylesheet\">" +
" </head>" +
" <body>" +
" <div class=\"d-flex flex-wrap\">" +
" <div class=\"m-2\">" +
" <p style=\"margin-bottom: 0px; width: 150px;height: 150px;background-color: aquamarine;\" >Page Views: {0}</p>" +
" </div>";
public static string pageFooter =
" <div class=\"m-2\">" +
" <button style=\"width: 150px;height: 150px;background-color: aquamarine;\" onclick=\"!document.fullscreenElement ? document.documentElement.requestFullscreen() : document.exitFullscreen();\">" +
" <i class=\"fa-solid fa-maximize\"></i>" +
" </button>" +
" </div>" +
" </div>" +
" <script src=\"StaticFiles/app.js\"></script>" +
" </body>" +
"</html>";
public string pageData = "";
public FakeDeckMain(YamlHelper yaml) public FakeDeckMain(YamlHelper yaml)
{ {
HttpServer server = new HttpServer(yaml.getData().GetProperty("server").GetProperty("port").ToString()); HttpServer server = new HttpServer(yaml.getData().GetProperty("server").GetProperty("port").ToString());
@ -25,10 +43,13 @@ namespace FakeeDeck.Class
Debug.WriteLine("PAGE: " + item.GetProperty("page")); Debug.WriteLine("PAGE: " + item.GetProperty("page"));
foreach (JsonElement button in item.GetProperty("buttons").EnumerateArray()) foreach (JsonElement button in item.GetProperty("buttons").EnumerateArray())
{ {
server.pageData += AbstractionHelper.getButtonVisual(button); pageData += AbstractionHelper.getButtonVisual(button);
} }
} }
server.addRoute(servViewResponseAsync, "GET", "/");
server.addRoute(servButtonResponseAsync, "POST", "/button/");
/*foreach (var stratogem in HelldiversTwoMacro.stratogems) /*foreach (var stratogem in HelldiversTwoMacro.stratogems)
{ {
server.pageData += HelldiversTwoMacro.getButton(stratogem.Key); server.pageData += HelldiversTwoMacro.getButton(stratogem.Key);
@ -41,5 +62,72 @@ namespace FakeeDeck.Class
server.serv(); server.serv();
} }
private static void callButtonAction(string module, Dictionary<string, string> postParams)
{
string cleanClass = "FakeeDeck.ButtonType." + module.Trim('/');
Type? buttonClass = Type.GetType(cleanClass, true);
if (buttonClass is null)
return;
MethodInfo? method = buttonClass.GetMethod("invokeAction");
if (method is null)
return;
ParameterInfo[] pars = method.GetParameters();
List<object> parameters = new List<object>();
foreach (ParameterInfo p in pars)
{
if (p == null)
{
continue;
}
if (p.Name != null && postParams.ContainsKey(p.Name))
{
parameters.Insert(p.Position, postParams[p.Name]);
}
else if (p.IsOptional && p.DefaultValue != null)
{
parameters.Insert(p.Position, p.DefaultValue);
}
}
_ = method.Invoke(null, [.. parameters]).ToString();
}
private async Task servViewResponseAsync(HttpListenerRequest req, HttpListenerResponse resp)
{
string disableSubmit = false ? "disabled" : "";
byte[] data = Encoding.UTF8.GetBytes(string.Format(pageHeader + this.pageData + pageFooter, 0, disableSubmit));
resp.ContentType = "text/html";
resp.ContentEncoding = Encoding.UTF8;
resp.ContentLength64 = data.LongLength;
await resp.OutputStream.WriteAsync(data, 0, data.Length);
}
private async Task servButtonResponseAsync(HttpListenerRequest req, HttpListenerResponse resp, Dictionary<string, string> postParams)
{
try
{
string module = req.Url.AbsolutePath.Replace("/button", "");
Console.WriteLine("Call module " + module);
callButtonAction(module, postParams);
resp.StatusCode = (int)HttpStatusCode.OK;
}
catch (Exception ex)
{
byte[] errorData = Encoding.UTF8.GetBytes(ex.Message);
resp.ContentType = "text/html";
resp.ContentEncoding = Encoding.UTF8;
resp.ContentLength64 = errorData.LongLength;
resp.StatusCode = (int)HttpStatusCode.InternalServerError;
await resp.OutputStream.WriteAsync(errorData, 0, errorData.Length);
}
}
} }
} }

168
FakeDeckUI/FakeDeck/Class/HttpServer.cs
View File

@ -18,6 +18,8 @@ using System.Xml.Linq;
using System.Reflection; using System.Reflection;
using System.Text.Json; using System.Text.Json;
using System.Collections; using System.Collections;
using System.Diagnostics;
using System.Text.RegularExpressions;
namespace FakeeDeck.Class namespace FakeeDeck.Class
{ {
@ -95,36 +97,21 @@ namespace FakeeDeck.Class
{".xpi", "application/x-xpinstall"}, {".xpi", "application/x-xpinstall"},
{".zip", "application/zip"}, {".zip", "application/zip"},
}; };
private Dictionary<string, Dictionary<string, Delegate>> routes = new Dictionary<string, Dictionary<string, Delegate>>();
public static HttpListener listener; public static HttpListener listener;
public static int pageViews = 0; public static int pageViews = 0;
public static int requestCount = 0; public static int requestCount = 0;
public static string pageHeader =
"<!DOCTYPE>" + public void addRoute(Delegate callback, string method = "GET", string route = "/")
"<html>" + {
" <head>" + if (!routes.ContainsKey(method))
" <title>HttpListener Example</title>" + {
" <link href=\"https://yarnpkg.com/en/package/normalize.css\" rel=\"stylesheet\">" + routes.Add(method, new Dictionary<string, Delegate>());
" <link href=\"https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css\" rel=\"stylesheet\">" + }
" <link href=\"https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css\" rel=\"stylesheet\">" +
" </head>" + routes[method].Add(route, callback);
" <body>" + }
" <div class=\"d-flex flex-wrap\">" +
" <div class=\"m-2\">" +
" <p style=\"margin-bottom: 0px; width: 150px;height: 150px;background-color: aquamarine;\" >Page Views: {0}</p>" +
" </div>";
public static string pageFooter =
" <div class=\"m-2\">" +
" <button style=\"width: 150px;height: 150px;background-color: aquamarine;\" onclick=\"!document.fullscreenElement ? document.documentElement.requestFullscreen() : document.exitFullscreen();\">" +
" <i class=\"fa-solid fa-maximize\"></i>" +
" </button>" +
" </div>" +
" </div>" +
" <script src=\"StaticFiles/app.js\"></script>" +
" </body>" +
"</html>";
public string pageData = "";
private Dictionary<string, Dictionary<string, Action>> routes;
public async Task HandleIncomingConnections() public async Task HandleIncomingConnections()
{ {
bool runServer = true; bool runServer = true;
@ -140,61 +127,45 @@ namespace FakeeDeck.Class
HttpListenerResponse resp = ctx.Response; HttpListenerResponse resp = ctx.Response;
// Print out some info about the request // Print out some info about the request
Console.WriteLine("Request #: {0}", ++requestCount); /*Debug.WriteLine("Request #: {0}", ++requestCount);
Console.WriteLine(req.Url.ToString()); Debug.WriteLine(req.Url.ToString());
Console.WriteLine(req.HttpMethod); Debug.WriteLine(req.HttpMethod);
Console.WriteLine(req.UserHostName); Debug.WriteLine(req.UserHostName);
Console.WriteLine(req.UserAgent); Debug.WriteLine(req.UserAgent);*/
Console.WriteLine();
if (req.HttpMethod == "POST") if (req.HttpMethod == "GET" && req.Url.AbsolutePath.Contains("."))
{ {
//Parse Port Parameters await servFileResponseAsync(req, resp);
Dictionary<string, string> postParams = parsePostRequestParameters(req); }
// If `shutdown` url requested w/ POST, then shutdown the server after serving the page else
if (req.Url.AbsolutePath == "/shutdown") {
bool isMatch = false;
foreach (var route in routes[req.HttpMethod])
{ {
Console.WriteLine("Shutdown requested"); isMatch = Regex.IsMatch(req.Url.AbsolutePath, route.Key, RegexOptions.IgnoreCase);
runServer = false; if (isMatch)
{
Debug.WriteLine(route.Key);
Delegate gelegate = route.Value;
if (req.HttpMethod == "POST")
{
Dictionary<string, string> postParams = parsePostRequestParameters(req);
gelegate.DynamicInvoke([req, resp, postParams]);
}
else
{
gelegate.DynamicInvoke([req, resp]);
}
}
} }
else if (req.Url.AbsolutePath.StartsWith("/button"))
if (!isMatch)
{ {
try resp.StatusCode = (int)HttpStatusCode.NotFound;
{ await resp.OutputStream.FlushAsync();
string module = req.Url.AbsolutePath.Replace("/button", "");
Console.WriteLine("Call module " + module);
callButtonAction(module, postParams);
resp.StatusCode = (int)HttpStatusCode.OK;
}
catch (Exception ex)
{
byte[] errorData = Encoding.UTF8.GetBytes(ex.Message);
resp.ContentType = "text/html";
resp.ContentEncoding = Encoding.UTF8;
resp.ContentLength64 = errorData.LongLength;
resp.StatusCode = (int)HttpStatusCode.InternalServerError;
await resp.OutputStream.WriteAsync(errorData, 0, errorData.Length);
}
finally
{
resp.Close();
}
continue;
} }
} }
else if (req.HttpMethod == "GET") resp.Close();
{
if (req.Url.AbsolutePath.Contains("."))
{
await servFileResponseAsync(req, resp);
}
else
{
await servViewResponseAsync(req, resp);
}
resp.Close();
continue;
}
} }
} }
@ -215,50 +186,13 @@ namespace FakeeDeck.Class
listener.Close(); listener.Close();
} }
private static void callButtonAction(string module, Dictionary<string, string> postParams)
{
string cleanClass = "FakeeDeck.ButtonType." + module.Trim('/');
Type? buttonClass = Type.GetType(cleanClass, true);
if (buttonClass is null)
return;
MethodInfo? method = buttonClass.GetMethod("invokeAction");
if (method is null)
return;
ParameterInfo[] pars = method.GetParameters();
List<object> parameters = new List<object>();
foreach (ParameterInfo p in pars)
{
if (p == null)
{
continue;
}
if (p.Name != null && postParams.ContainsKey(p.Name))
{
parameters.Insert(p.Position, postParams[p.Name]);
}
else if (p.IsOptional && p.DefaultValue != null)
{
parameters.Insert(p.Position, p.DefaultValue);
}
}
_ = method.Invoke(null, [.. parameters]).ToString();
}
private static async Task servFileResponseAsync(HttpListenerRequest req, HttpListenerResponse resp) private static async Task servFileResponseAsync(HttpListenerRequest req, HttpListenerResponse resp)
{ {
string filename = Path.Combine("./", req.Url.AbsolutePath.Substring(1)); string filename = Path.Combine("./", req.Url.AbsolutePath.Substring(1));
if (!File.Exists(filename)) if (!File.Exists(filename))
{ {
resp.StatusCode = (int)HttpStatusCode.NotFound; resp.StatusCode = (int)HttpStatusCode.NotFound;
resp.Close(); return;
} }
try try
@ -292,16 +226,6 @@ namespace FakeeDeck.Class
} }
} }
private async Task servViewResponseAsync(HttpListenerRequest req, HttpListenerResponse resp)
{
string disableSubmit = false ? "disabled" : "";
byte[] data = Encoding.UTF8.GetBytes(string.Format(pageHeader + this.pageData + pageFooter, pageViews, disableSubmit));
resp.ContentType = "text/html";
resp.ContentEncoding = Encoding.UTF8;
resp.ContentLength64 = data.LongLength;
await resp.OutputStream.WriteAsync(data, 0, data.Length);
}
private static Dictionary<string, string> parsePostRequestParameters(HttpListenerRequest req) private static Dictionary<string, string> parsePostRequestParameters(HttpListenerRequest req)
{ {
Dictionary<string, string> postParams = new Dictionary<string, string>(); Dictionary<string, string> postParams = new Dictionary<string, string>();

3
FakeDeckUI/FakeDeck/MainWindow.xaml.cs
View File

@ -16,6 +16,7 @@ using static QRCoder.QRCodeGenerator;
using static System.Runtime.CompilerServices.RuntimeHelpers; using static System.Runtime.CompilerServices.RuntimeHelpers;
using System.Drawing; using System.Drawing;
using Color = System.Drawing.Color; using Color = System.Drawing.Color;
using AutoUpdaterDotNET;
namespace FakeDeck namespace FakeDeck
{ {
@ -39,7 +40,7 @@ namespace FakeDeck
QRCodeData qrCodeData = qrCodeGenerator.CreateQrCode(qrCodePayload.ToString(), 0); QRCodeData qrCodeData = qrCodeGenerator.CreateQrCode(qrCodePayload.ToString(), 0);
QRCode qrCode = new QRCode(qrCodeData); QRCode qrCode = new QRCode(qrCodeData);
qr_code.Source = GeneralHelper.BitmapToImageSource(qrCode.GetGraphic(20, Color.Black, Color.White, false)); qr_code.Source = GeneralHelper.BitmapToImageSource(qrCode.GetGraphic(20, Color.Black, Color.White, false));
AutoUpdateHelper updater = new AutoUpdateHelper(); AutoUpdateHelper updater = new AutoUpdateHelper();
} }
} }

8
FakeeDeck.sln
View File

@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 17
VisualStudioVersion = 17.11.35219.272 VisualStudioVersion = 17.11.35219.272
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakeeDeck", "FakeeDeck\FakeeDeck.csproj", "{D8C79B08-1920-426A-9138-CF0C8BAE0EF7}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakeDeck", "FakeDeckUI\FakeDeck\FakeDeck.csproj", "{D04AFC99-A929-4336-BD2C-1D49D149DB18}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeDeck", "FakeDeckUI\FakeDeck\FakeDeck.csproj", "{D04AFC99-A929-4336-BD2C-1D49D149DB18}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -13,10 +11,6 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D8C79B08-1920-426A-9138-CF0C8BAE0EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D8C79B08-1920-426A-9138-CF0C8BAE0EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D8C79B08-1920-426A-9138-CF0C8BAE0EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D8C79B08-1920-426A-9138-CF0C8BAE0EF7}.Release|Any CPU.Build.0 = Release|Any CPU
{D04AFC99-A929-4336-BD2C-1D49D149DB18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D04AFC99-A929-4336-BD2C-1D49D149DB18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D04AFC99-A929-4336-BD2C-1D49D149DB18}.Debug|Any CPU.Build.0 = Debug|Any CPU {D04AFC99-A929-4336-BD2C-1D49D149DB18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D04AFC99-A929-4336-BD2C-1D49D149DB18}.Release|Any CPU.ActiveCfg = Release|Any CPU {D04AFC99-A929-4336-BD2C-1D49D149DB18}.Release|Any CPU.ActiveCfg = Release|Any CPU