glax/CShock
1
0
Fork 0
Code Releases Wiki Activity

Compare commits

base: glax:dea3268cea4db9e3204d6c1ee04dbe21db684861
Branches Tags
glax:master
...
compare: glax:e255caeb647684c00b18c03a84e07b49c5776bca
Branches Tags
glax:master

2 Commits
dea3268cea ... e255caeb64

Author SHA1 Message Date
glax
e255caeb64 LOL APIKEY 2024-01-28 19:26:42 +01:00
glax
8dc8af3792 Logging 2024-01-28 18:35:37 +01:00
2 changed files with 9 additions and 6 deletions
Show Stats Expand all files Collapse all files

11
CShocker/Shockers/APIS/OpenShockHttp.cs
View File

@ -26,7 +26,8 @@ public class OpenShockHttp : HttpShocker
StreamReader deviceStreamReader = new(responseDevices.Content.ReadAsStream()); StreamReader deviceStreamReader = new(responseDevices.Content.ReadAsStream());
string deviceJson = deviceStreamReader.ReadToEnd(); string deviceJson = deviceStreamReader.ReadToEnd();
this.Logger?.Log(LogLevel.Debug, $"{requestDevices.RequestUri} response: {responseDevices.StatusCode}\n{deviceJson}"); this.Logger?.Log(!responseDevices.IsSuccessStatusCode ? LogLevel.Critical : LogLevel.Debug,
$"{requestDevices.RequestUri} response: {responseDevices.StatusCode}\n{deviceJson}");
JObject deviceListJObj = JObject.Parse(deviceJson); JObject deviceListJObj = JObject.Parse(deviceJson);
List<string> deviceIds = new(); List<string> deviceIds = new();
deviceIds.AddRange(deviceListJObj["data"]!.Children()["id"].Values<string>()!); deviceIds.AddRange(deviceListJObj["data"]!.Children()["id"].Values<string>()!);
@ -48,7 +49,8 @@ public class OpenShockHttp : HttpShocker
StreamReader shockerStreamReader = new(response.Content.ReadAsStream()); StreamReader shockerStreamReader = new(response.Content.ReadAsStream());
string shockerJson = shockerStreamReader.ReadToEnd(); string shockerJson = shockerStreamReader.ReadToEnd();
this.Logger?.Log(LogLevel.Debug, $"{requestShockers.RequestUri} response: {response.StatusCode}\n{shockerJson}"); this.Logger?.Log(!response.IsSuccessStatusCode ? LogLevel.Critical : LogLevel.Debug,
$"{requestShockers.RequestUri} response: {response.StatusCode}\n{shockerJson}");
JObject shockerListJObj = JObject.Parse(shockerJson); JObject shockerListJObj = JObject.Parse(shockerJson);
shockerIds.AddRange(shockerListJObj["data"]!.Children()["id"].Values<string>()!); shockerIds.AddRange(shockerListJObj["data"]!.Children()["id"].Values<string>()!);
@ -78,9 +80,10 @@ public class OpenShockHttp : HttpShocker
"}", Encoding.UTF8, new MediaTypeHeaderValue("application/json")) "}", Encoding.UTF8, new MediaTypeHeaderValue("application/json"))
}; };
request.Headers.Add("OpenShockToken", ApiKey); request.Headers.Add("OpenShockToken", ApiKey);
this.Logger?.Log(LogLevel.Trace, $"Request-Content: {request.Content}"); this.Logger?.Log(LogLevel.Debug, $"Request-Content: {request.Content}");
HttpResponseMessage response = HttpClient.Send(request); HttpResponseMessage response = HttpClient.Send(request);
this.Logger?.Log(LogLevel.Debug, $"{request.RequestUri} response: {response.StatusCode}"); this.Logger?.Log(!response.IsSuccessStatusCode ? LogLevel.Critical : LogLevel.Debug,
$"{request.RequestUri} response: {response.StatusCode}");
} }
private byte ControlActionToByte(ControlAction action) private byte ControlActionToByte(ControlAction action)

4
TestApp/Program.cs
View File

@ -7,7 +7,7 @@ using TestApp;
Logger logger = new (LogLevel.Trace); Logger logger = new (LogLevel.Trace);
#pragma warning disable CA1416 #pragma warning disable CA1416
List<SerialShocker.SerialPortInfo> serialPorts = SerialShocker.GetSerialPorts(); List<SerialDevice.SerialPortInfo> serialPorts = SerialDevice.GetSerialPorts();
if (serialPorts.Count < 1) if (serialPorts.Count < 1)
return; return;
@ -25,5 +25,5 @@ while (!int.TryParse(selectedPortStr, out selectedPort) || selectedPort < 0 || s
} }
OpenShockSerial shockSerial = new (new Dictionary<string, OpenShockSerial.ShockerModel>(), new IntensityRange(30,50), new DurationRange(1000,1000), serialPorts[selectedPort], logger); OpenShockSerial shockSerial = new (new Dictionary<string, OpenShockSerial.ShockerModel>(), new IntensityRange(30,50), new DurationRange(1000,1000), serialPorts[selectedPort], logger);
Dictionary<string, OpenShockSerial.ShockerModel> shockers = shockSerial.GetShockers("https://api.shocklink.net", "kTXWKQN6dTm3LHy62Pzulf20mh0JLQiLd0zwKJcqNa9MFM0bWXfnf1O3Gzmhgd5o"); Dictionary<string, OpenShockSerial.ShockerModel> shockers = shockSerial.GetShockers("https://api.shocklink.net", "LOLAPIKEY");
Console.ReadKey(); Console.ReadKey();