Use Http-API to get RF-IDs for OpenShockSerial

CShocker.sln.DotSettings

@@ -1,4 +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></wpf:ResourceDictionary>
+	<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/CShocker.csproj

@@ -7,7 +7,7 @@
         <Authors>Glax</Authors>
         <RepositoryUrl>https://github.com/C9Glax/CShocker</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Version>1.3.2</Version>
+        <Version>1.3.3</Version>
     </PropertyGroup>
 
     <ItemGroup>

CShocker/Shockers/APIS/OpenShockSerial.cs

@@ -1,7 +1,8 @@
-using System.Text.RegularExpressions;
+using System.Net.Http.Headers;
 using CShocker.Ranges;
 using CShocker.Shockers.Abstract;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
 
 namespace CShocker.Shockers.APIS;
 
@@ -27,27 +28,60 @@ public class OpenShockSerial : SerialShocker
         SerialPort.WriteLine(json);
     }
 
-    public Dictionary<string, ShockerModel> GetShockers()
+    public Dictionary<string, ShockerModel> GetShockers(string apiEndpoint, string apiKey)
     {
-        Dictionary<string, ShockerModel> ret = new();
+        HttpClient httpClient = new();
-        Regex shockerRex = new (@".*FetchDeviceInfo\(\): \[GatewayConnectionManager\]   \[[a-z0-9\-]+\] rf=([0-9]{1,5}) model=([0,1])");
+        HttpRequestMessage requestDevices = new (HttpMethod.Get, $"{apiEndpoint}/2/devices")
-        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);
+            Headers =
-            Match match = shockerRex.Match(line);
+            {
-            if (match.Success)
+                UserAgent = { new ProductInfoHeaderValue("CShocker", "1") },
-                ret.Add(match.Groups[1].Value, Enum.Parse<ShockerModel>(match.Groups[2].Value));
+                Accept = { new MediaTypeWithQualityHeaderValue("application/json") }
-        }
+            }
-        this.Logger?.Log(LogLevel.Debug, $"Shockers found: \n\t{string.Join("\n\t", ret)}");
+        };
+        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>()!);
 
-        return ret;
+        Dictionary<string, ShockerModel> models = new();
+        foreach (string deviceId in deviceIds)
+        {
+            HttpRequestMessage requestShockers = new (HttpMethod.Get, $"{apiEndpoint}/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);
+            for (int i = 0; i < shockerListJObj["data"]!.Children().Count(); i++)
+            {
+                models.Add(
+                    shockerListJObj["data"]![i]!["rfId"]!.Value<int>().ToString(),
+                    Enum.Parse<ShockerModel>(shockerListJObj["data"]![i]!["model"]!.Value<string>()!)
+                    );
+            }
+        }
+
+        return models;
     }
 
     public enum ShockerModel : byte
     {
-        Caixianlin = 0,
+        CaiXianlin = 0,
         Petrainer = 1
     }
     

TestApp/Program.cs

@@ -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);
-Dictionary<string, OpenShockSerial.ShockerModel> shockers = shockSerial.GetShockers();
+Dictionary<string, OpenShockSerial.ShockerModel> shockers = shockSerial.GetShockers("https://api.shocklink.net", "kTXWKQN6dTm3LHy62Pzulf20mh0JLQiLd0zwKJcqNa9MFM0bWXfnf1O3Gzmhgd5o");
 Console.ReadKey();