Fix Default endpoint for openshock

# Conflicts:
#	CShocker/Devices/Additional/ApiHttpClient.cs

.idea/.idea.CShocker/.idea/riderPublish.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="LocationsWithSilentDeleteHolder">
+    <option name="locations">
+      <list>
+        <option value="$PROJECT_DIR$/CShocker/bin/Release/net9.0/win-x64" />
+        <option value="$PROJECT_DIR$/CShocker/bin/Release/net9.0/linux-x64/publish" />
+        <option value="$PROJECT_DIR$/CShocker/bin/Release/net9.0/win-x64/publish" />
+      </list>
+    </option>
+  </component>
+</project>

CShocker.sln.DotSettings

@@ -0,0 +1,5 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Caixianlin/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Petrainer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=rftransmit/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Xianlin/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

CShocker.sln.DotSettings.user

@@ -0,0 +1,7 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CGlax_005CRiderProjects_005CGlaxLogger_005CGlaxLogger_005Cbin_005CDebug_005Cnet7_002E0_005CGlaxLogger_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpClient_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc439425da351c75ac7d966a1cc8324b51a9c471865af79d2f2f3fcb65e392_003FHttpClient_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F2c8e7ca976f350cba9836d5565dac56b11e0b56656fa786460eb1395857a6fa_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
+  &lt;Assembly Path="C:\Users\Glax\RiderProjects\GlaxLogger\GlaxLogger\bin\Debug\net7.0\GlaxLogger.dll" /&gt;&#xD;
+&lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>

CShocker/CShocker.csproj

@@ -1,20 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Authors>Glax</Authors>
         <RepositoryUrl>https://github.com/C9Glax/CShocker</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Version>1.3.0</Version>
+        <Version>3.1.0</Version>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <LangVersion>latestmajor</LangVersion>
+        <PackageProjectUrl>https://github.com/C9Glax/CShocker</PackageProjectUrl>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-      <PackageReference Include="System.IO.Ports" Version="8.0.0" />
-      <PackageReference Include="System.Management" Version="8.0.0" />
+      <PackageReference Include="System.IO.Ports" Version="9.0.1" />
+      <PackageReference Include="System.Management" Version="9.0.1" />
     </ItemGroup>
     
     <PropertyGroup>

CShocker/Devices/APIs/OpenShockHttp.cs

@@ -0,0 +1,37 @@
+using CShocker.Devices.Abstract;
+using CShocker.Devices.Additional;
+using CShocker.Shockers;
+using CShocker.Shockers.Abstract;
+using Microsoft.Extensions.Logging;
+
+namespace CShocker.Devices.APIs;
+
+public class OpenShockHttp : OpenShockApi
+{
+    protected override void ControlInternal(ControlAction action, Shocker shocker, int intensity, int duration)
+    {
+        if (shocker is not OpenShockShocker openShockShocker)
+        {
+            this.Logger?.Log(LogLevel.Warning, $"Shocker {shocker} is not {typeof(OpenShockShocker).FullName}");
+            return;
+        }
+
+        string json = "{" +
+                      "  \"shocks\": [" +
+                      "    {" +
+                      $"      \"id\": \"{openShockShocker.ID}\"," +
+                      $"      \"type\": \"{Enum.GetName(action)}\"," +
+                      $"      \"intensity\": {intensity}," +
+                      $"      \"duration\": {duration}" +
+                      "    }" +
+                      "  ]," +
+                      "  \"customName\": \"CShocker\"" +
+                      "}";
+        
+        ApiHttpClient.MakeAPICall(HttpMethod.Post, $"{Endpoint}/2/shockers/control", json, this.Logger, new ValueTuple<string, string>("OpenShockToken", ApiKey));
+    }
+
+    public OpenShockHttp(string apiKey, string? endpoint = null, ILogger? logger = null) : base(DeviceApi.OpenShockHttp, apiKey, endpoint??DefaultEndpoint, logger)
+    {
+    }
+}

CShocker/Devices/APIs/OpenShockSerial.cs

@@ -0,0 +1,58 @@
+using System.IO.Ports;
+using CShocker.Devices.Abstract;
+using CShocker.Devices.Additional;
+using CShocker.Shockers;
+using CShocker.Shockers.Abstract;
+using Microsoft.Extensions.Logging;
+
+namespace CShocker.Devices.APIs;
+
+public class OpenShockSerial : OpenShockApi
+{
+    private const int BaudRate = 115200;
+    public SerialPortInfo SerialPortI;
+    private readonly SerialPort _serialPort;
+    
+    public OpenShockSerial(SerialPortInfo serialPortI, string apiKey, string? endpoint = null, ILogger? logger = null) : base(DeviceApi.OpenShockSerial, apiKey, endpoint??DefaultEndpoint, logger)
+    {
+        this.SerialPortI = serialPortI;
+        this._serialPort = new SerialPort(serialPortI.PortName, BaudRate);
+        try
+        {
+            this._serialPort.Open();
+        }
+        catch (Exception e)
+        {
+            this.Logger?.Log(LogLevel.Error, e.Message);
+            throw;
+        }
+    }
+
+    protected override void ControlInternal(ControlAction action, Shocker shocker, int intensity, int duration)
+    {
+        if (shocker is not OpenShockShocker openShockShocker)
+        {
+            this.Logger?.Log(LogLevel.Warning, $"Shocker {shocker} is not {typeof(OpenShockShocker).FullName}");
+            return;
+        }
+        string json = "rftransmit {" +
+                        $"\"model\":\"{Enum.GetName(openShockShocker.Model)!.ToLower()}\"," +
+                        $"\"id\":{openShockShocker.RfId}," +
+                        $"\"type\":\"{ControlActionToString(action)}\"," +
+                        $"\"intensity\":{intensity}," +
+                        $"\"durationMs\":{duration}" +
+                      "}";
+        _serialPort.WriteLine(json);
+    }
+    
+    private static string ControlActionToString(ControlAction action)
+    {
+        return action switch
+        {
+            ControlAction.Beep => "sound",
+            ControlAction.Vibrate => "vibrate",
+            ControlAction.Shock => "shock",
+            _ => "stop"
+        };
+    }
+}

CShocker/Devices/APIs/PiShockHttp.cs

@@ -0,0 +1,52 @@
+using CShocker.Devices.Abstract;
+using CShocker.Devices.Additional;
+using CShocker.Shockers;
+using CShocker.Shockers.Abstract;
+using Microsoft.Extensions.Logging;
+
+namespace CShocker.Devices.APIs;
+
+public class PiShockHttp : PiShockApi
+{
+    // ReSharper disable thrice MemberCanBePrivate.Global -> Exposed
+    public readonly string Username, Endpoint, ApiKey;
+
+    public PiShockHttp(string apiKey, string username, string endpoint = "https://do.pishock.com/api/apioperate", ILogger? logger = null) : base(DeviceApi.PiShockHttp, logger)
+    {
+        this.Username = username;
+        this.Endpoint = endpoint;
+        this.ApiKey = apiKey;
+    }
+
+    protected override void ControlInternal(ControlAction action, Shocker shocker, int intensity, int duration)
+    {
+        if (shocker is not PiShockShocker piShockShocker)
+        {
+            this.Logger?.Log(LogLevel.Warning, $"Shocker {shocker} is not {typeof(OpenShockShocker).FullName}");
+            return;
+        }
+
+        string json = "{" +
+                      $"\"Username\":\"{Username}\"," +
+                      "\"Name\":\"CShocker\"," +
+                      $"\"Code\":\"{piShockShocker.Code}\"," +
+                      $"\"Intensity\":\"{intensity}\"," +
+                      $"\"Duration\":\"{duration / 1000}\"," + //duration is in seconds no ms
+                      $"\"Apikey\":\"{ApiKey}\"," +
+                      $"\"Op\":\"{ControlActionToByte(action)}\"" +
+                      "}";
+
+        ApiHttpClient.MakeAPICall(HttpMethod.Post, $"{Endpoint}", json, this.Logger);
+    }
+    
+    private byte ControlActionToByte(ControlAction action)
+    {
+        return action switch
+        {
+            ControlAction.Beep => 2,
+            ControlAction.Vibrate => 1,
+            ControlAction.Shock => 0,
+            _ => 2
+        };
+    }
+}

CShocker/Devices/APIs/PiShockSerial.cs

@@ -1,18 +1,26 @@
-using CShocker.Ranges;
+using System.IO.Ports;
+using CShocker.Devices.Abstract;
+using CShocker.Devices.Additional;
 using CShocker.Shockers.Abstract;
 using Microsoft.Extensions.Logging;
 
-namespace CShocker.Shockers.APIS;
+namespace CShocker.Devices.APIs;
 
-public class PiShockSerial : SerialShocker
+public class PiShockSerial : PiShockApi
 {
     private const int BaudRate = 115200;
-    public PiShockSerial(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, SerialPortInfo serialPortI, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, serialPortI, BaudRate, ShockerApi.PiShockSerial, logger)
+    // ReSharper disable once MemberCanBePrivate.Global -> Exposed
+    public readonly SerialPortInfo SerialPortI;
+    private readonly SerialPort _serialPort;
+    
+    public PiShockSerial(DeviceApi apiType, SerialPortInfo serialPortI, ILogger? logger = null) : base(apiType, logger)
     {
+        this.SerialPortI = serialPortI;
+        this._serialPort = new SerialPort(this.SerialPortI.PortName, BaudRate);
         throw new NotImplementedException();
     }
     
-    protected override void ControlInternal(ControlAction action, string shockerId, int intensity, int duration)
+    protected override void ControlInternal(ControlAction action, Shocker shocker, int intensity, int duration)
     {
         string json = "{" +
                       "\"cmd\": \"operate\"," +
@@ -23,7 +31,7 @@ public class PiShockSerial : SerialShocker
                         $"\"id\": " +
                         "}" +
                       "}";
-        serialPort.WriteLine(json);
+        _serialPort.WriteLine(json);
     }
 
     private static string ControlActionToOp(ControlAction action)

CShocker/Devices/Abstract/Api.cs

@@ -0,0 +1,100 @@
+using CShocker.Devices.Additional;
+using CShocker.Ranges;
+using CShocker.Shockers.Abstract;
+using Microsoft.Extensions.Logging;
+
+namespace CShocker.Devices.Abstract;
+
+public abstract class Api : IDisposable
+{
+    // ReSharper disable 4 times MemberCanBePrivate.Global -> Exposed
+    protected ILogger? Logger;
+    public readonly DeviceApi ApiType;
+    private Queue<DateTime> order = new();
+    private Dictionary<DateTime, Task> tasks = new();
+    // ReSharper disable once PrivateFieldCanBeConvertedToLocalVariable
+    private const short CommandDelay = 50;
+    internal readonly IntegerRange ValidIntensityRange, ValidDurationRange;
+    
+    internal void Control(ControlAction action, int intensity, int duration, params Shocker[] shockers)
+    {
+        bool enqueueItem = true;
+        if (!ValidIntensityRange.IsValueWithinLimits(intensity))
+        {
+            this.Logger?.Log(LogLevel.Information, $"Value not within allowed {nameof(intensity)}-Range ({ValidIntensityRange.RangeString()}): {intensity}");
+            enqueueItem = false;
+        }
+        if (!ValidDurationRange.IsValueWithinLimits(duration))
+        {
+            this.Logger?.Log(LogLevel.Information, $"Value not within allowed {nameof(duration)}-Range ({ValidIntensityRange.RangeString()}): {duration}");
+            enqueueItem = false;
+        }
+        if (!enqueueItem)
+        {
+            this.Logger?.Log(LogLevel.Information, "Doing nothing.");
+            return;
+        }
+        foreach (Shocker shocker in shockers)
+        {
+            this.Logger?.Log(LogLevel.Debug, $"Enqueueing {action} Intensity: {intensity} Duration: {duration}\nShocker:\n{shocker}");
+            ValueTuple<ControlAction, Shocker, int, int> tuple = new(action, shocker, intensity, duration);
+            DateTime now = DateTime.Now;
+            Task t = new (() => ExecuteTask(now, tuple));
+            order.Enqueue(now);
+            tasks.Add(now, t);
+            t.Start();
+        }
+    }
+    
+    protected abstract void ControlInternal(ControlAction action, Shocker shocker, int intensity, int duration);
+
+    protected Api(DeviceApi apiType, IntegerRange validIntensityRange, IntegerRange validDurationRange, ILogger? logger = null)
+    {
+        this.ApiType = apiType;
+        this.Logger = logger;
+        this.ValidIntensityRange = validIntensityRange;
+        this.ValidDurationRange = validDurationRange;
+    }
+
+    private void ExecuteTask(DateTime when, ValueTuple<ControlAction, Shocker, int, int> tuple)
+    {
+        while (order.First() != when)
+            Thread.Sleep(CommandDelay);
+        this.Logger?.Log(LogLevel.Information, $"Executing: {Enum.GetName(tuple.Item1)} Intensity: {tuple.Item3} Duration: {tuple.Item4}\nShocker:\n{tuple.Item2}");
+        ControlInternal(tuple.Item1, tuple.Item2, tuple.Item3, tuple.Item4);
+        Thread.Sleep(tuple.Item4);
+        tasks.Remove(when);
+        order.Dequeue();
+    }
+
+    public void SetLogger(ILogger? logger)
+    {
+        this.Logger = logger;
+    }
+
+    public override string ToString()
+    {
+        return $"ShockerType: {Enum.GetName(typeof(DeviceApi), this.ApiType)}\n\r";
+    }
+
+    public override bool Equals(object? obj)
+    {
+        return obj is Api d && Equals(d);
+    }
+
+    protected bool Equals(Api other)
+    {
+        return ApiType == other.ApiType;
+    }
+
+    public override int GetHashCode()
+    {
+        return ApiType.GetHashCode();
+    }
+
+    public void Dispose()
+    {
+        foreach ((DateTime when, Task? task) in tasks)
+            task?.Dispose();
+    }
+}

CShocker/Devices/Abstract/OpenShockApi.cs

@@ -0,0 +1,79 @@
+using CShocker.Devices.Additional;
+using CShocker.Ranges;
+using CShocker.Shockers;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
+
+namespace CShocker.Devices.Abstract;
+
+public abstract class OpenShockApi : Api
+{
+    // ReSharper disable twice MemberCanBeProtected.Global -> Exposed
+    public string Endpoint { get; init; }
+    public string ApiKey { get; init; }
+    public const string DefaultEndpoint = "https://api.openshock.app";
+
+    // ReSharper disable once PublicConstructorInAbstractClass -> Exposed
+    public OpenShockApi(DeviceApi apiType, string apiKey, string endpoint = DefaultEndpoint, ILogger? logger = null) : base(apiType, new IntegerRange(0, 100), new IntegerRange(300, 30000), logger)
+    {
+        this.Endpoint = endpoint;
+        this.ApiKey = apiKey;
+    }
+
+    public override bool Equals(object? obj)
+    {
+        return obj is OpenShockApi osd && Equals(osd);
+    }
+
+    private bool Equals(OpenShockApi other)
+    {
+        return base.Equals(other) && Endpoint.Equals(other.Endpoint) && ApiKey.Equals(other.ApiKey);
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(Endpoint, ApiKey);
+    }
+
+    public IEnumerable<OpenShockShocker> GetShockers()
+    {
+        return GetShockers(this.ApiKey, this, this.Endpoint, this.Logger);
+    }
+
+    // ReSharper disable once MemberCanBePrivate.Global
+    public static IEnumerable<OpenShockShocker> GetShockers(string apiKey, OpenShockApi api, string apiEndpoint = DefaultEndpoint, ILogger? logger = null)
+    {
+        List<OpenShockShocker> shockers = new();
+        
+        HttpResponseMessage ownResponse = ApiHttpClient.MakeAPICall(HttpMethod.Get, $"{apiEndpoint}/1/shockers/own", null, logger, new ValueTuple<string, string>("OpenShockToken", apiKey));
+        if (!ownResponse.IsSuccessStatusCode)
+            return shockers;
+        
+        StreamReader ownShockerStreamReader = new(ownResponse.Content.ReadAsStream());
+        string ownShockerJson = ownShockerStreamReader.ReadToEnd();
+        logger?.Log(LogLevel.Debug,ownShockerJson);
+        JObject ownShockerListJObj = JObject.Parse(ownShockerJson);
+        shockers.AddRange(ownShockerListJObj.SelectTokens("$.data..shockers[*]").Select(t =>
+            new OpenShockShocker(
+                api,
+            t["name"]!.Value<string>()!, t["id"]!.Value<string>()!, t["rfId"]!.Value<short>(),
+            Enum.Parse<OpenShockShocker.OpenShockModel>(t["model"]!.Value<string>()!),
+            t["createdOn"]!.ToObject<DateTime>(), t["isPaused"]!.Value<bool>())));
+        
+        HttpResponseMessage sharedResponse = ApiHttpClient.MakeAPICall(HttpMethod.Get, $"{apiEndpoint}/1/shockers/shared", null, logger, new ValueTuple<string, string>("OpenShockToken", apiKey));
+        if (!sharedResponse.IsSuccessStatusCode)
+            return shockers;
+        
+        StreamReader sharedShockerStreamReader = new(sharedResponse.Content.ReadAsStream());
+        string sharedShockerJson = sharedShockerStreamReader.ReadToEnd();
+        logger?.Log(LogLevel.Debug, sharedShockerJson);
+        JObject sharedShockerListJObj = JObject.Parse(sharedShockerJson);
+        shockers.AddRange(sharedShockerListJObj.SelectTokens("$.data..shockers[*]").Select(t =>
+            new OpenShockShocker(
+                api, 
+                t["name"]!.Value<string>()!, t["id"]!.Value<string>()!, t["rfId"]!.Value<short>(),
+                Enum.Parse<OpenShockShocker.OpenShockModel>(t["model"]!.Value<string>()!),
+                t["createdOn"]!.ToObject<DateTime>(), t["isPaused"]!.Value<bool>())));
+        return shockers;
+    }
+}

CShocker/Devices/Abstract/PiShockApi.cs

@@ -0,0 +1,12 @@
+using CShocker.Devices.Additional;
+using CShocker.Ranges;
+using Microsoft.Extensions.Logging;
+
+namespace CShocker.Devices.Abstract;
+
+public abstract class PiShockApi : Api
+{
+    protected PiShockApi(DeviceApi apiType, ILogger? logger = null) : base(apiType, new IntegerRange(0, 100), new IntegerRange(1000, 15000), logger)
+    {
+    }
+}

CShocker/Devices/Abstract/SerialPortInfo.cs

@@ -0,0 +1,26 @@
+namespace CShocker.Devices.Abstract;
+
+public readonly struct SerialPortInfo
+{
+    // ReSharper disable thrice MemberCanBePrivate.Global -> Exposed
+    public readonly string? PortName, Description, Manufacturer, DeviceID;
+
+    public SerialPortInfo(string? portName, string? description, string? manufacturer, string? deviceID)
+    {
+        this.PortName = portName;
+        this.Description = description;
+        this.Manufacturer = manufacturer;
+        this.DeviceID = deviceID;
+    }
+
+    public override string ToString()
+    {
+        return $"{string.Join("\n\t",
+            $"{GetType().Name}",
+            $"PortName: {PortName}",
+            $"Description: {Description}",
+            $"Manufacturer: {Manufacturer}",
+            $"DeviceID: {DeviceID}")}" +
+               $"\n\r";
+    }
+}

CShocker/Devices/Additional/ApiHttpClient.cs

@@ -0,0 +1,66 @@
+using System.Diagnostics;
+using System.Net.Http.Headers;
+using System.Reflection;
+using System.Text;
+using Microsoft.Extensions.Logging;
+
+namespace CShocker.Devices.Additional;
+
+public static class ApiHttpClient
+{
+    private static readonly ProductInfoHeaderValue UserAgent = GetUserAgent();
+
+    private static ProductInfoHeaderValue GetUserAgent()
+    {
+        Assembly assembly = Assembly.GetExecutingAssembly();
+        FileVersionInfo fvi;
+        if (assembly.Location == String.Empty)
+        {
+            DirectoryInfo dir = new (AppContext.BaseDirectory);
+            FileInfo? f = dir.GetFiles("*.exe").FirstOrDefault();
+            if (f is null)
+                return new("CShocker", "Release");
+            fvi = FileVersionInfo.GetVersionInfo(f.FullName);
+        }
+        else
+        {
+            fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
+        }
+        return new (fvi.ProductName ?? fvi.FileName, fvi.ProductVersion);
+    }
+    
+    internal static HttpResponseMessage MakeAPICall(HttpMethod method, string uri, string? jsonContent, ILogger? logger = null, params ValueTuple<string, string>[] customHeaders)
+    {
+        HttpRequestMessage request = new (method, uri)
+        {
+            Headers =
+            {
+                UserAgent = { UserAgent },
+                Accept = { new MediaTypeWithQualityHeaderValue("application/json") },
+                
+            }
+        };
+        if (jsonContent is not null && jsonContent.Length > 0)
+            request.Content = new ByteArrayContent(Encoding.UTF8.GetBytes(jsonContent))
+            {
+                Headers = { ContentType = MediaTypeHeaderValue.Parse("application/json") }
+            };
+        foreach ((string, string) customHeader in customHeaders)
+            request.Headers.Add(customHeader.Item1, customHeader.Item2);
+        logger?.Log(LogLevel.Debug, string.Join("\n\t",
+                "Request:",
+                $"\u251c\u2500\u2500 URI: {request.RequestUri}",
+                $"\u251c\u2500\u2510 Headers: {string.Concat(request.Headers.Select(h => $"\n\t\u2502 {(request.Headers.Last().Key.Equals(h.Key) ? "\u2514" : "\u251c")} {h.Key}: {string.Join(", ", h.Value)}"))}", 
+                $"\u2514\u2500\u2500 Content: {request.Content?.ReadAsStringAsync().Result}"));
+
+        HttpClient httpClient = new();
+        HttpResponseMessage response = httpClient.Send(request);
+        logger?.Log(!response.IsSuccessStatusCode ? LogLevel.Error : LogLevel.Debug, string.Join("\n\t",
+            "Response:",
+            $"\u251c\u2500\u2500 URI: {request.RequestUri}",
+            $"\u251c\u2500\u2510 Headers: {string.Concat(response.Headers.Select(h => $"\n\t\u2502 {(response.Headers.Last().Key.Equals(h.Key) ? "\u2514" : "\u251c")} {h.Key}: {string.Join(", ", h.Value)}"))}", 
+            $"\u2514\u2500\u2500 Content: {response.Content.ReadAsStringAsync().Result}"));
+        httpClient.Dispose();
+        return response;
+    }
+}

CShocker/Devices/Additional/ApiJsonConverter.cs

@@ -0,0 +1,44 @@
+using CShocker.Devices.Abstract;
+using CShocker.Devices.APIs;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace CShocker.Devices.Additional;
+
+public class ApiJsonConverter : JsonConverter
+{
+    public override bool CanConvert(Type objectType)
+    {
+        return (objectType == typeof(Api));
+    }
+
+    public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+    {
+        JObject jo = JObject.Load(reader);
+        DeviceApi apiType = (DeviceApi)jo.SelectToken("ApiType")!.Value<byte>();
+        
+        switch (apiType)
+        {
+            case DeviceApi.OpenShockHttp:
+                return jo.ToObject<OpenShockHttp>()!;
+            case DeviceApi.OpenShockSerial:
+                return jo.ToObject<OpenShockSerial>()!;
+            case DeviceApi.PiShockHttp:
+                return jo.ToObject<PiShockHttp>()!;
+            case DeviceApi.PiShockSerial:
+                return jo.ToObject<PiShockSerial>()!;
+            default:
+                throw new Exception();
+        }
+    }
+
+    public override bool CanWrite => false;
+
+    /// <summary>
+    /// Don't call this
+    /// </summary>
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+    {
+        throw new Exception("Dont call this");
+    }
+}

CShocker/Devices/Additional/ControlActionEnum.cs

@@ -1,9 +1,9 @@
-namespace CShocker.Shockers;
+namespace CShocker.Devices.Additional;
 
 public enum ControlAction
 {
     Beep,
     Vibrate,
     Shock,
-    Nothing
+    Stop
 }

CShocker/Devices/Additional/DeviceApiEnum.cs

@@ -1,6 +1,6 @@
-namespace CShocker.Shockers.Abstract;
+namespace CShocker.Devices.Additional;
 
-public enum ShockerApi : byte
+public enum DeviceApi : byte
 {
     OpenShockHttp = 0,
     OpenShockSerial = 1,

CShocker/Devices/Additional/SerialHelper.cs

@@ -0,0 +1,47 @@
+using System.Management;
+using System.Runtime.Versioning;
+using CShocker.Devices.Abstract;
+using Microsoft.Win32;
+
+namespace CShocker.Devices.Additional;
+
+public static class SerialHelper
+{
+    [SupportedOSPlatform("windows")]
+    public static List<SerialPortInfo> GetSerialPorts()
+    {
+        List<SerialPortInfo> ret = new();
+        using (ManagementClass entity = new("Win32_PnPEntity"))
+        {
+            // ReSharper disable once InconsistentNaming
+            const string CUR_CTRL = "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\";
+
+            foreach (ManagementObject instance in entity.GetInstances())
+            {
+                object oGuid;
+                oGuid = instance.GetPropertyValue("ClassGuid");
+                if (oGuid == null || oGuid.ToString()?.ToUpper().Equals("{4D36E978-E325-11CE-BFC1-08002BE10318}") is false)
+                    continue; // Skip all devices except device class "PORTS"
+
+                string? caption  = instance.GetPropertyValue("Caption")?.ToString();
+                string? manufacturer = instance.GetPropertyValue("Manufacturer")?.ToString();
+                string? deviceID = instance.GetPropertyValue("PnpDeviceID")?.ToString();
+                string regEnum  = CUR_CTRL + "Enum\\" + deviceID + "\\Device Parameters";
+                string? portName = Registry.GetValue(regEnum, "PortName", "")?.ToString();
+
+                int? s32Pos = caption?.IndexOf(" (COM");
+                if (s32Pos > 0) // remove COM port from description
+                    caption = caption?.Substring(0, (int)s32Pos);
+                
+                ret.Add(new SerialPortInfo(
+                    portName,
+                    caption,
+                    manufacturer,
+                    deviceID));
+            }
+        }
+
+        return ret;
+    }
+
+}

CShocker/Ranges/DurationRange.cs

@@ -1,9 +0,0 @@
-namespace CShocker.Ranges;
-
-public class DurationRange : RandomIntegerRange
-{
-    public DurationRange(short min, short max) : base(min ,max , 0, 30000)
-    {
-        
-    }
-}

CShocker/Ranges/IntegerRange.cs

@@ -0,0 +1,28 @@
+namespace CShocker.Ranges;
+
+public readonly struct IntegerRange
+{
+    // ReSharper disable twice MemberCanBePrivate.Global -> Exposed
+    public readonly int Min, Max;
+
+    public IntegerRange(int min, int max)
+    {
+        this.Min = min;
+        this.Max = max;
+    }
+
+    public bool IsValueWithinLimits(int value)
+    {
+        return value >= this.Min && value <= this.Max;
+    }
+
+    public int RandomValueWithinLimits()
+    {
+        return Random.Shared.Next(this.Min, this.Max);
+    }
+
+    internal string RangeString()
+    {
+        return $"{this.Min}-{this.Max}";
+    }
+}

CShocker/Ranges/IntensityRange.cs

@@ -1,9 +0,0 @@
-namespace CShocker.Ranges;
-
-public class IntensityRange : RandomIntegerRange
-{
-    public IntensityRange(short min, short max) : base(min , max, 0, 100)
-    {
-        
-    }
-}

CShocker/Ranges/RandomIntegerRange.cs

@@ -1,27 +0,0 @@
-namespace CShocker.Ranges;
-
-public abstract class RandomIntegerRange
-{
-    public short Min, Max;
-    internal RandomIntegerRange(short min, short max, short minLimit, short maxLimit)
-    {
-        if (max - min < 0)
-            throw new ArgumentException("Min has to be less or equal Max");
-        if (min < minLimit || min > maxLimit)
-            throw new ArgumentOutOfRangeException(nameof(min), $"Min has to be withing Range {minLimit}-{maxLimit}");
-        if (max < minLimit || max > maxLimit)
-            throw new ArgumentOutOfRangeException(nameof(max), $"Max has to be withing Range {minLimit}-{maxLimit}");
-        this.Min = min;
-        this.Max = max;
-    }
-
-    public int GetRandomRangeValue()
-    {
-        return Random.Shared.Next(this.Min, this.Max);
-    }
-
-    public override string ToString()
-    {
-        return $"Min: {Min} Max: {Max}";
-    }
-}

CShocker/Shockers/APIS/OpenShockHttp.cs

@@ -1,96 +0,0 @@
-using System.Net.Http.Headers;
-using System.Text;
-using CShocker.Ranges;
-using CShocker.Shockers.Abstract;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json.Linq;
-
-namespace CShocker.Shockers.APIS;
-
-public class OpenShockHttp : HttpShocker
-{
-
-    public List<string> GetShockers()
-    {
-        HttpRequestMessage requestDevices = new (HttpMethod.Get, $"{Endpoint}/2/devices")
-        {
-            Headers =
-            {
-                UserAgent = { new ProductInfoHeaderValue("CShocker", "1") },
-                Accept = { new MediaTypeWithQualityHeaderValue("application/json") }
-            }
-        };
-        requestDevices.Headers.Add("OpenShockToken", ApiKey);
-        HttpResponseMessage responseDevices = HttpClient.Send(requestDevices);
-        
-        StreamReader deviceStreamReader = new(responseDevices.Content.ReadAsStream());
-        string deviceJson = deviceStreamReader.ReadToEnd();
-        this.Logger?.Log(LogLevel.Debug, $"{requestDevices.RequestUri} response: {responseDevices.StatusCode}\n{deviceJson}");
-        JObject deviceListJObj = JObject.Parse(deviceJson);
-        List<string> deviceIds = new();
-        deviceIds.AddRange(deviceListJObj["data"]!.Children()["id"].Values<string>()!);
-
-        List<string> shockerIds = new();
-        foreach (string deviceId in deviceIds)
-        {
-            HttpRequestMessage requestShockers = new (HttpMethod.Get, $"{Endpoint}/2/devices/{deviceId}/shockers")
-            {
-                Headers =
-                {
-                    UserAgent = { new ProductInfoHeaderValue("CShocker", "1") },
-                    Accept = { new MediaTypeWithQualityHeaderValue("application/json") }
-                }
-            };
-            requestShockers.Headers.Add("OpenShockToken", ApiKey);
-            HttpResponseMessage response = HttpClient.Send(requestShockers);
-        
-            StreamReader shockerStreamReader = new(response.Content.ReadAsStream());
-            string shockerJson = shockerStreamReader.ReadToEnd();
-            this.Logger?.Log(LogLevel.Debug, $"{requestShockers.RequestUri} response: {response.StatusCode}\n{shockerJson}");
-            JObject shockerListJObj = JObject.Parse(shockerJson);
-            shockerIds.AddRange(shockerListJObj["data"]!.Children()["id"].Values<string>()!);
-            
-        }
-        return shockerIds;
-    }
-    
-    protected override void ControlInternal(ControlAction action, string shockerId, int intensity, int duration)
-    {
-        HttpRequestMessage request = new (HttpMethod.Post, $"{Endpoint}/1/shockers/control")
-        {
-            Headers =
-            {
-                UserAgent = { new ProductInfoHeaderValue("CShocker", "1") },
-                Accept = { new MediaTypeWithQualityHeaderValue("application/json") }
-            },
-            Content = new StringContent("{ shocks: ["+
-                                            "{ "+
-                                                $"\"id\": \"{shockerId}\"," +
-                                                $"\"type\": {ControlActionToByte(action)},"+
-                                                $"\"intensity\": {intensity},"+
-                                                $"\"duration\": {duration}"+
-                                            "}" +
-                                            "]," +
-                                            "customName: CShocker" +
-                                        "}", Encoding.UTF8, new MediaTypeHeaderValue("application/json"))
-        };
-        request.Headers.Add("OpenShockToken", ApiKey);
-        HttpResponseMessage response = HttpClient.Send(request);
-        this.Logger?.Log(LogLevel.Debug, $"{request.RequestUri} response: {response.StatusCode}");
-    }
-
-    private byte ControlActionToByte(ControlAction action)
-    {
-        return action switch
-        {
-            ControlAction.Beep => 3,
-            ControlAction.Vibrate => 2,
-            ControlAction.Shock => 1,
-            _ => 0
-        };
-    }
-
-    public OpenShockHttp(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string apiKey, string endpoint = "https://api.shocklink.net", ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, apiKey, endpoint, ShockerApi.OpenShockHttp, logger)
-    {
-    }
-}

CShocker/Shockers/APIS/OpenShockSerial.cs

@@ -1,63 +0,0 @@
-using System.Text.RegularExpressions;
-using CShocker.Ranges;
-using CShocker.Shockers.Abstract;
-using Microsoft.Extensions.Logging;
-
-namespace CShocker.Shockers.APIS;
-
-public class OpenShockSerial : SerialShocker
-{
-    public readonly Dictionary<string, ShockerModel> Model;
-    private const int BaudRate = 115200;
-    public OpenShockSerial(Dictionary<string, ShockerModel> shockerIds, IntensityRange intensityRange, DurationRange durationRange, SerialPortInfo serialPortI, ILogger? logger = null) : base(shockerIds.Keys.ToList(), intensityRange, durationRange, serialPortI, BaudRate, ShockerApi.OpenShockSerial, logger)
-    {
-        this.Model = shockerIds;
-    }
-
-    protected override void ControlInternal(ControlAction action, string shockerId, int intensity, int duration)
-    {
-        string json = "{" +
-                        $"\"model\":\"{Enum.GetName(Model[shockerId])!.ToLower()}\"," +
-                        $"\"id\":{shockerId}," +
-                        $"\"type\":\"{ControlActionToString(action)}\"," +
-                        $"\"intensity\":{intensity}," +
-                        $"\"durationMs\":{duration}" +
-                      "}";
-        serialPort.WriteLine(json);
-    }
-
-    public Dictionary<string, ShockerModel> GetShockers()
-    {
-        Dictionary<string, ShockerModel> ret = new();
-        Regex shockerRex = new (@".*FetchDeviceInfo\(\): \[GatewayConnectionManager\]   \[[a-z0-9\-]+\] rf=([0-9]{1,5}) model=([0,1])");
-        this.Logger?.Log(LogLevel.Debug, "Restart");
-        serialPort.WriteLine("restart");
-        while (serialPort.ReadLine() is { } line && !line.Contains("Successfully verified auth token"))
-        {
-            this.Logger?.Log(LogLevel.Trace, line);
-            Match match = shockerRex.Match(line);
-            if (match.Success)
-                ret.Add(match.Groups[1].Value, Enum.Parse<ShockerModel>(match.Groups[2].Value));
-        }
-        this.Logger?.Log(LogLevel.Debug, $"Shockers found: \n\t{string.Join("\n\t", ret)}");
-
-        return ret;
-    }
-
-    public enum ShockerModel : byte
-    {
-        Caixianlin = 0,
-        Petrainer = 1
-    }
-    
-    private string ControlActionToString(ControlAction action)
-    {
-        return action switch
-        {
-            ControlAction.Beep => "sound",
-            ControlAction.Vibrate => "vibrate",
-            ControlAction.Shock => "shock",
-            _ => "stop"
-        };
-    }
-}

CShocker/Shockers/APIS/PiShockHttp.cs

@@ -1,51 +0,0 @@
-using System.Net.Http.Headers;
-using System.Text;
-using CShocker.Ranges;
-using CShocker.Shockers.Abstract;
-using Microsoft.Extensions.Logging;
-
-namespace CShocker.Shockers.APIS;
-
-public class PiShockHttp : HttpShocker
-{
-    public String Username, ShareCode;
-    public PiShockHttp(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string apiKey, string username, string shareCode, string endpoint = "https://do.pishock.com/api/apioperate", ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, apiKey, endpoint, ShockerApi.PiShockHttp, logger)
-    {
-        this.Username = username;
-        this.ShareCode = shareCode;
-    }
-
-    protected override void ControlInternal(ControlAction action, string shockerId, int intensity, int duration)
-    {
-        HttpRequestMessage request = new (HttpMethod.Post, $"{Endpoint}")
-        {
-            Headers =
-            {
-                UserAgent = { new ProductInfoHeaderValue("CShocker", "1") },
-                Accept = { new MediaTypeWithQualityHeaderValue("text/plain") }
-            },
-            Content = new StringContent("{" +
-                                            $"\"Username\":\"{Username}\"," +
-                                            "\"Name\":\"CShocker\"," +
-                                            $"\"Code\":\"{ShareCode}\"," +
-                                            $"\"Intensity\":\"{intensity}\"," +
-                                            $"\"Duration\":\"{duration/1000}\"," + //duration is in seconds no ms
-                                            $"\"Apikey\":\"{ApiKey}\"," +
-                                            $"\"Op\":\"{ControlActionToByte(action)}\"" +
-                                        "}", Encoding.UTF8, new MediaTypeHeaderValue("application/json"))
-        };
-        HttpResponseMessage response = HttpClient.Send(request);
-        this.Logger?.Log(LogLevel.Debug, $"{request.RequestUri} response: {response.StatusCode} {response.Content.ReadAsStringAsync()}");
-    }
-    
-    private byte ControlActionToByte(ControlAction action)
-    {
-        return action switch
-        {
-            ControlAction.Beep => 2,
-            ControlAction.Vibrate => 1,
-            ControlAction.Shock => 0,
-            _ => 2
-        };
-    }
-}

CShocker/Shockers/Abstract/HttpShocker.cs

@@ -1,24 +0,0 @@
-using CShocker.Ranges;
-using Microsoft.Extensions.Logging;
-
-namespace CShocker.Shockers.Abstract;
-
-public abstract class HttpShocker : Shocker
-{
-    protected readonly HttpClient HttpClient = new();
-    public string Endpoint { get; init; }
-    public string ApiKey { get; init; }
-
-    protected HttpShocker(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, string apiKey, string endpoint, ShockerApi apiType, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, apiType, logger)
-    {
-        Endpoint = endpoint;
-        ApiKey = apiKey;
-    }
-
-    public override string ToString()
-    {
-        return $"{base.ToString()}\n" +
-               $"Endpoint: {Endpoint}\n" +
-               $"ApiKey: {ApiKey}";
-    }
-}

CShocker/Shockers/Abstract/SerialShocker.cs

@@ -1,77 +0,0 @@
-using System.IO.Ports;
-using CShocker.Ranges;
-using Microsoft.Extensions.Logging;
-using System.Management;
-using System.Runtime.Versioning;
-using Microsoft.Win32;
-
-namespace CShocker.Shockers.Abstract;
-
-public abstract class SerialShocker : Shocker
-{
-    public SerialPortInfo SerialPortI;
-    protected SerialPort serialPort;
-    
-    protected SerialShocker(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, SerialPortInfo serialPortI, int baudRate, ShockerApi apiType, ILogger? logger = null) : base(shockerIds, intensityRange, durationRange, apiType, logger)
-    {
-        this.SerialPortI = serialPortI;
-        this.serialPort = new SerialPort(serialPortI.PortName, baudRate);
-        this.serialPort.Open();
-    }
-
-    [SupportedOSPlatform("windows")]
-    public static List<SerialPortInfo> GetSerialPorts()
-    {
-        List<SerialPortInfo> ret = new();
-        using (ManagementClass entity = new("Win32_PnPEntity"))
-        {
-            // ReSharper disable once InconsistentNaming
-            const string CUR_CTRL = "HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\";
-
-            foreach (ManagementObject instance in entity.GetInstances())
-            {
-                object oGuid;
-                oGuid = instance.GetPropertyValue("ClassGuid");
-                if (oGuid == null || oGuid.ToString()?.ToUpper().Equals("{4D36E978-E325-11CE-BFC1-08002BE10318}") is false)
-                    continue; // Skip all devices except device class "PORTS"
-
-                string? caption  = instance.GetPropertyValue("Caption")?.ToString();
-                string? manufacturer = instance.GetPropertyValue("Manufacturer")?.ToString();
-                string? deviceID = instance.GetPropertyValue("PnpDeviceID")?.ToString();
-                string regEnum  = CUR_CTRL + "Enum\\" + deviceID + "\\Device Parameters";
-                string? portName = Registry.GetValue(regEnum, "PortName", "")?.ToString();
-
-                int s32_Pos = caption.IndexOf(" (COM");
-                if (s32_Pos > 0) // remove COM port from description
-                    caption = caption.Substring(0, s32_Pos);
-                
-                ret.Add(new SerialPortInfo(
-                    portName,
-                    caption,
-                    manufacturer,
-                    deviceID));
-            }
-        }
-
-        return ret;
-    }
-
-    public class SerialPortInfo
-    {
-        public readonly string? PortName, Description, Manufacturer, DeviceID;
-
-        public SerialPortInfo(string? portName, string? description, string? manufacturer, string? deviceID)
-        {
-            this.PortName = portName;
-            this.Description = description;
-            this.Manufacturer = manufacturer;
-            this.DeviceID = deviceID;
-        }
-
-        public override string ToString()
-        {
-            return
-                $"PortName: {PortName}\nDescription: {Description}\nManufacturer: {Manufacturer}\nDeviceID: {DeviceID}";
-        }
-    }
-}

CShocker/Shockers/Abstract/Shocker.cs

@@ -1,52 +1,25 @@
-using System.Reflection.Metadata;
-using CShocker.Ranges;
-using Microsoft.Extensions.Logging;
+using CShocker.Devices.Abstract;
+using CShocker.Devices.Additional;
 
 namespace CShocker.Shockers.Abstract;
 
-public abstract class Shocker
+public abstract class Shocker : IDisposable
 {
-    public readonly List<string> ShockerIds;
-    public readonly IntensityRange IntensityRange;
-    public readonly DurationRange DurationRange;
-    protected ILogger? Logger;
-    public readonly ShockerApi ApiType;
+    // ReSharper disable once MemberCanBePrivate.Global -> Exposed
+    public Api Api { get; }
 
-    public void Control(ControlAction action, string? shockerId = null, int? intensity = null, int? duration = null)
+    internal Shocker(Api api)
     {
-        int i = intensity ?? IntensityRange.GetRandomRangeValue();
-        int d = duration ?? DurationRange.GetRandomRangeValue();
-        this.Logger?.Log(LogLevel.Information, $"{action} {(intensity is not null ? $"Overwrite {i}" : $"{i}")} {(duration is not null ? $"Overwrite {d}" : $"{d}")}");
-        if (action is ControlAction.Nothing)
-            return;
-        if(shockerId is null)
-            foreach (string shocker in ShockerIds)
-                ControlInternal(action, shocker, i, d);
-        else
-            ControlInternal(action, shockerId, i, d);
+        this.Api = api;
     }
 
-    protected abstract void ControlInternal(ControlAction action, string shockerId, int intensity, int duration);
-
-    protected Shocker(List<string> shockerIds, IntensityRange intensityRange, DurationRange durationRange, ShockerApi apiType, ILogger? logger = null)
+    public void Control(ControlAction action, int intensity, int duration)
     {
-        this.ShockerIds = shockerIds;
-        this.IntensityRange = intensityRange;
-        this.DurationRange = durationRange;
-        this.ApiType = apiType;
-        this.Logger = logger;
+        this.Api.Control(action, intensity, duration, this);
     }
 
-    public void SetLogger(ILogger? logger)
+    public void Dispose()
     {
-        this.Logger = logger;
-    }
-
-    public override string ToString()
-    {
-        return $"ShockerType: {Enum.GetName(typeof(ShockerApi), this.ApiType)}\n" +
-               $"Shocker-IDs: {string.Join(", ", this.ShockerIds)}\n" +
-               $"IntensityRange: {IntensityRange}\n" +
-               $"DurationRange: {DurationRange}";
+        Api.Dispose();
     }
 }

CShocker/Shockers/Additional/ShockerJsonConverter.cs

@@ -0,0 +1,36 @@
+using CShocker.Shockers.Abstract;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace CShocker.Shockers.Additional;
+
+public class ShockerJsonConverter : JsonConverter
+{
+    public override bool CanConvert(Type objectType)
+    {
+        return (objectType == typeof(Shocker));
+    }
+
+    public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+    {
+        JObject jo = JObject.Load(reader);
+        if (jo.ContainsKey("Model")) //OpenShockShocker
+        {
+            return jo.ToObject<OpenShockShocker>(serializer)!;
+        }
+        else //PiShockShocker
+        {
+            return jo.ToObject<PiShockShocker>(serializer)!;
+        }
+    }
+
+    public override bool CanWrite => false;
+
+    /// <summary>
+    /// Don't call this
+    /// </summary>
+    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+    {
+        throw new NotImplementedException("Dont call this");
+    }
+}

CShocker/Shockers/OpenShockShocker.cs

@@ -0,0 +1,62 @@
+using CShocker.Devices.Abstract;
+using CShocker.Shockers.Abstract;
+
+namespace CShocker.Shockers;
+
+public class OpenShockShocker : Shocker
+{
+    // ReSharper disable thrice MemberCanBePrivate.Global -> Exposed
+    public readonly string Name, ID;
+    public readonly short RfId;
+    public readonly OpenShockModel Model;
+    public readonly DateTime CreatedOn;
+    public readonly bool IsPaused;
+
+    public OpenShockShocker(Api api, string name, string id, short rfId, OpenShockModel model, DateTime createdOn, bool isPaused) : base (api)
+    {
+        if (api is not OpenShockApi)
+            throw new Exception($"API-Type {api.GetType().FullName} is not usable with Shocker {this.GetType().FullName}");
+        this.Name = name;
+        this.ID = id;
+        this.RfId = rfId;
+        this.Model = model;
+        this.CreatedOn = createdOn;
+        this.IsPaused = isPaused;
+    }
+
+    public enum OpenShockModel : byte
+    {
+        CaiXianlin = 0,
+        Petrainer = 1
+    }
+
+    public override string ToString()
+    {
+        const int tabWidth = -12;
+        return $"\t{string.Join("\n\t",
+            $"\u251c {"Type",tabWidth}: {GetType().Name}",
+            $"\u251c {"Name",tabWidth}: {Name}",
+            $"\u251c {"ID",tabWidth}: {ID}",
+            $"\u251c {"RF-ID",tabWidth}: {RfId}",
+            $"\u251c {"Model",tabWidth}: {Enum.GetName(Model)}",
+            $"\u251c {"Created On",tabWidth}: {CreatedOn}",
+            $"\u2514 {"Paused",tabWidth}: {IsPaused}")}" +
+               $"\n\r";
+    }
+
+    public override bool Equals(object? obj)
+    {
+        return obj is OpenShockShocker oss && Equals(oss);
+
+    }
+
+    private bool Equals(OpenShockShocker other)
+    {
+        return ID == other.ID;
+    }
+
+    public override int GetHashCode()
+    {
+        return ID.GetHashCode();
+    }
+}

CShocker/Shockers/PiShockShocker.cs

@@ -0,0 +1,40 @@
+using CShocker.Devices.Abstract;
+using CShocker.Shockers.Abstract;
+
+namespace CShocker.Shockers;
+
+public class PiShockShocker : Shocker
+{
+    public readonly string Code;
+
+    public PiShockShocker(Api api, string code) : base(api)
+    {
+        if (api is not PiShockApi)
+            throw new Exception($"API-Type {api.GetType().FullName} is not usable with Shocker {this.GetType().FullName}");
+        Code = code;
+    }
+
+    public override bool Equals(object? obj)
+    {
+        return obj is PiShockShocker pss && Equals(pss);
+    }
+
+    private bool Equals(PiShockShocker other)
+    {
+        return Code == other.Code;
+    }
+
+    public override int GetHashCode()
+    {
+        return Code.GetHashCode();
+    }
+    
+    public override string ToString()
+    {
+        const int tabWidth = -5;
+        return $"{string.Join("\n\t",
+            $"\u251c {"Type",tabWidth}: {GetType().Name}",
+            $"\u2514 {"Code",tabWidth}: {Code}")}" +
+               $"\n\r";
+    }
+}

CShocker/Shockers/ShockerJsonConverter.cs

@@ -1,58 +0,0 @@
-using CShocker.Ranges;
-using CShocker.Shockers.Abstract;
-using CShocker.Shockers.APIS;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace CShocker.Shockers;
-
-public class ShockerJsonConverter : JsonConverter
-{
-    public override bool CanConvert(Type objectType)
-    {
-        return (objectType == typeof(Shocker));
-    }
-
-    public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
-    {
-        JObject jo = JObject.Load(reader);
-        ShockerApi? apiType = (ShockerApi?)jo.SelectToken("ApiType")?.Value<byte>();
-
-        switch (apiType)
-        {
-            case ShockerApi.OpenShockHttp:
-                return new OpenShockHttp(
-                    jo.SelectToken("ShockerIds")!.ToObject<List<string>>()!,
-                    jo.SelectToken("IntensityRange")!.ToObject<IntensityRange>()!,
-                    jo.SelectToken("DurationRange")!.ToObject<DurationRange>()!,
-                    jo.SelectToken("ApiKey")!.Value<string>()!,
-                    jo.SelectToken("Endpoint")!.Value<string>()!
-                );
-            case ShockerApi.OpenShockSerial:
-            case ShockerApi.PiShockHttp:
-                return new PiShockHttp(
-                    jo.SelectToken("ShockerIds")!.ToObject<List<string>>()!,
-                    jo.SelectToken("IntensityRange")!.ToObject<IntensityRange>()!,
-                    jo.SelectToken("DurationRange")!.ToObject<DurationRange>()!,
-                    jo.SelectToken("ApiKey")!.Value<string>()!,
-                    jo.SelectToken("Username")!.Value<string>()!,
-                    jo.SelectToken("ShareCode")!.Value<string>()!,
-                    jo.SelectToken("Endpoint")!.Value<string>()!
-                );
-            case ShockerApi.PiShockSerial:
-                throw new NotImplementedException();
-            default:
-                throw new Exception();
-        }
-    }
-
-    public override bool CanWrite => false;
-
-    /// <summary>
-    /// Don't call this
-    /// </summary>
-    public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
-    {
-        throw new Exception("Dont call this");
-    }
-}

README.md

@@ -1,51 +1,42 @@
 Library to interact with Shock-Collars that are remotely controllable via ESP32-Boards.
 
 [![GitHub License](https://img.shields.io/github/license/c9glax/cshocker)](https://github.com/C9Glax/CShocker)
-[![NuGet Version](https://img.shields.io/nuget/v/CShocker)](https://shields.io/badges/nu-get-version)
+[![NuGet Version](https://img.shields.io/nuget/v/CShocker)](https://www.nuget.org/packages/CShocker)
 
 # Usage
 
 ```csharp
 public static void Main(string[] args){
-    List<string> shockerIds = new();
-    IntensityRange intensityRange = new IntensityRange(30, 50);
-    DurationRange durationRange = new DurationRange(1000, 2000);
     string apiKey = ":)";
-    OpenShockHttp openShockHttp = new OpenShockHttp(shockerIds, intensityRange, durationRange, apiKey);
-    openShockHttp.ShockerIds.AddRange(openShockHttp.GetShockers());
     
-    string username = "username";
-    string shareCode = "sharecode";
-    PiShockHttp piShockHttp = new PiShockHttp(shockerIds, intensityRange, durationRange, apiKey, username, shareCode, apiUri);
+    OpenShockHttp openShockHttp = new (apiKey);
+    OpenShockShocker shocker1 = openShockHttp.GetShockers().First();
+    shocker1.Control(ControlAction.Vibrate, 20, 1000);
     
-    ControlAction action = ControlAction.Shock;
-    openShockHttp.Control(action, shockerIds.First(), 20, 1000);
-    piShockHttp.Control(action);
+    shocker1.Dispose();
+    
+    List<SerialPortInfo> serialPorts = SerialHelper.GetSerialPorts();
+    int selectedPort = 1;
+    OpenShockSerial openShockSerial = new(serialPorts[selectedPort], apiKey);
+    OpenShockShocker shocker2 = openShockSerial.GetShockers().First();
+    shocker2.Control(ControlAction.Vibrate, 20, 1000);
+    
+    shocker2.Dispose();
 }
 ```
 ## `Shocker.Control`
 ```csharp
-Control(ControlAction action, string? shockerId = null, int? intensity = null, int? duration = null)
+Control(ControlAction action, int intensity, int duration)
 ```
-If `shockerId` is `null`, all IDs will be used. If `intensity` or `duration` are `null`, a random value within the
-configured range will be used.
 
 
 ### ControlAction
-From [here](https://github.com/C9Glax/CShocker/blob/master/CShocker/Shockers/ControlAction.cs)
+From [here](https://github.com/C9Glax/CShocker/blob/master/CShocker/Devices/Additional/ControlActionEnum.cs)
 
 ## Variables
 
 ### ApiKey
 - For OpenShock (HTTP) get token [here](https://shocklink.net/#/dashboard/tokens)
-- For PiShock (HTTP) get information [here](https://apidocs.pishock.com/#header-authenticating)
-
-### ShockerIds
-List of Shocker-Ids, comma seperated.
-
-`[ "ID-1-asdasd", "ID-2-fghfgh" ]`
-
-OpenShockHttp also can retrieve IDs automatically.
 
 ### Intensity Range
 in percent
@@ -57,8 +48,9 @@ in ms
 - `0-30000` OpenShock
 - `0-15000` PiShock
 
-### Username (PiShockHttp only)
-For PiShock (HTTP) get information [here](https://apidocs.pishock.com/#header-authenticating)
+## Future
+### ~~Username (PiShockHttp only)~~
+~~For PiShock (HTTP) get information [here](https://apidocs.pishock.com/#header-authenticating)~~
 
-### Sharecode (PiShockHttp only)
-For PiShock (HTTP) get information [here](https://apidocs.pishock.com/#header-authenticating)
+### ~~Sharecode (PiShockHttp only)~~
+~~For PiShock (HTTP) get information [here](https://apidocs.pishock.com/#header-authenticating)~~

TestApp/Logger.cs

@@ -1,63 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-public class Logger : ILogger
-{
-    private LogLevel _enabledLoglevel;
-    private readonly ConsoleColor _defaultForegroundColor = Console.ForegroundColor;
-    private readonly ConsoleColor _defaultBackgroundColor = Console.BackgroundColor;
-
-    public Logger(LogLevel logLevel = LogLevel.Trace)
-    {
-        _enabledLoglevel = logLevel;
-    }
-
-    public void UpdateLogLevel(LogLevel logLevel)
-    {
-        this._enabledLoglevel = logLevel;
-    }
-    
-    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
-    {
-        if (!IsEnabled(logLevel))
-            return;
-        Console.ForegroundColor = ForegroundColorForLogLevel(logLevel);
-        Console.BackgroundColor = BackgroundColorForLogLevel(logLevel);
-        Console.Write(logLevel.ToString()[..3].ToUpper());
-        Console.ResetColor();
-        // ReSharper disable once LocalizableElement
-        Console.Write($" [{DateTime.UtcNow:HH:mm:ss.fff}] ");
-        Console.WriteLine(formatter.Invoke(state, exception));
-    }
-
-    public bool IsEnabled(LogLevel logLevel)
-    {
-        return logLevel >= _enabledLoglevel;
-    }
-
-    public IDisposable? BeginScope<TState>(TState state) where TState : notnull
-    {
-        return null;
-    }
-
-    private ConsoleColor ForegroundColorForLogLevel(LogLevel logLevel)
-    {
-        return logLevel switch
-        {
-            LogLevel.Error or LogLevel.Critical => ConsoleColor.Black,
-            LogLevel.Debug => ConsoleColor.Black,
-            LogLevel.Information => ConsoleColor.White,
-            _ => _defaultForegroundColor
-        };
-    }
-    
-    private ConsoleColor BackgroundColorForLogLevel(LogLevel logLevel)
-    {
-        return logLevel switch
-        {
-            LogLevel.Error or LogLevel.Critical => ConsoleColor.Red,
-            LogLevel.Debug => ConsoleColor.Yellow,
-            LogLevel.Information => ConsoleColor.Black,
-            _ => _defaultBackgroundColor
-        };
-    }
-}

TestApp/Program.cs

@@ -1,12 +1,38 @@
-using CShocker.Ranges;
-using CShocker.Shockers.Abstract;
-using CShocker.Shockers.APIS;
+using CShocker.Devices.Additional;
+using CShocker.Devices.APIs;
+using CShocker.Shockers;
+using GlaxLogger;
 using Microsoft.Extensions.Logging;
 
 Logger logger = new (LogLevel.Trace);
 
+Console.WriteLine("OpenShock API Key:");
+string? apiKey = Console.ReadLine();
+while(apiKey is null || apiKey.Length < 1)
+    apiKey = Console.ReadLine();
+
+
+OpenShockHttp openShockHttp = new (apiKey, logger: logger);
+foreach (OpenShockShocker shocker in openShockHttp.GetShockers())
+{
+    shocker.Control(ControlAction.Vibrate, 20, 1000);
+    shocker.Control(ControlAction.Vibrate, 20, 1000);
+    shocker.Control(ControlAction.Vibrate, 20, 1000);
+    Thread.Sleep(1100);
+}
+
+/*
+File.WriteAllText("shockers.json", JsonConvert.SerializeObject(shocker));
+OpenShockShocker deserialized = JsonConvert.DeserializeObject<OpenShockShocker>(File.ReadAllText("shockers.json"), new ApiJsonConverter())!;
+Thread.Sleep(1100); //Wait for previous to end
+deserialized.Control(ControlAction.Vibrate, 20, 1000);
+shocker.Dispose();
+deserialized.Dispose();
+*/
+
+/*
 #pragma warning disable CA1416
-List<SerialShocker.SerialPortInfo> serialPorts = SerialShocker.GetSerialPorts();
+List<SerialPortInfo> serialPorts = SerialHelper.GetSerialPorts();
 
 if (serialPorts.Count < 1)
     return;
@@ -16,13 +42,21 @@ for(int i = 0; i < serialPorts.Count; i++)
 
 Console.WriteLine($"Select Serial Port [0-{serialPorts.Count-1}]:");
 string? selectedPortStr = Console.ReadLine();
-int selectedPort = -1;
+int selectedPort;
 while (!int.TryParse(selectedPortStr, out selectedPort) || selectedPort < 0 || selectedPort > serialPorts.Count - 1)
 {
     Console.WriteLine($"Select Serial Port [0-{serialPorts.Count-1}]:");
     selectedPortStr = Console.ReadLine();
 }
 
-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();
-Console.ReadKey();
+OpenShockSerial openShockSerial = new(serialPorts[selectedPort], apiKey, logger: logger);
+OpenShockShocker shocker = openShockSerial.GetShockers().First();
+shocker.Control(ControlAction.Vibrate, 20, 1000);
+File.WriteAllText("shockers.json", JsonConvert.SerializeObject(shocker));
+OpenShockShocker deserialized = JsonConvert.DeserializeObject<OpenShockShocker>(File.ReadAllText("shockers.json"), new ApiJsonConverter())!;
+shocker.Dispose();
+deserialized.Dispose();
+*/
+
+while(!Console.KeyAvailable)
+    Thread.Sleep(100);

TestApp/TestApp.csproj

@@ -2,13 +2,18 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <LangVersion>latestmajor</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\CShocker\CShocker.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="GlaxLogger" Version="1.0.7.2" />
+    </ItemGroup>
+
 </Project>