Changed access-types

OpenCS2hock/CS2MessageHandler.cs

@@ -2,26 +2,34 @@
 
 namespace OpenCS2hock;
 
-public class CS2MessageHandler
+internal class CS2MessageHandler
 {
-    public delegate void CS2EventHandler();
-    public event CS2EventHandler? OnKill;
-    public event CS2EventHandler? OnDeath;
-    public event CS2EventHandler? OnRoundStart;
-    public event CS2EventHandler? OnRoundEnd;
-    public event CS2EventHandler? OnRoundWin;
-    public event CS2EventHandler? OnRoundLoss;
+    internal delegate void CS2EventHandler();
+    internal event CS2EventHandler? OnKill;
+    internal event CS2EventHandler? OnDeath;
+    internal event CS2EventHandler? OnRoundStart;
+    internal event CS2EventHandler? OnRoundEnd;
+    internal event CS2EventHandler? OnRoundWin;
+    internal event CS2EventHandler? OnRoundLoss;
 
-    public void HandleCS2Message(string message)
+    internal void HandleCS2Message(string message, string mySteamId)
     {
         JObject messageJson = JObject.Parse(message);
+        string? steamId = messageJson.SelectToken("player.steamid", false)?.Value<string>();
+        if (steamId is null || steamId != mySteamId)
+        {
+            Console.WriteLine("Not my steamid");
+            return;
+        }
         
         RoundState currentRoundState = ParseRoundStateFromString(messageJson.SelectToken("round.phase", false)?.Value<string>());
         RoundState previousRoundState = ParseRoundStateFromString(messageJson.SelectToken("previously.round.phase", false)?.Value<string>());
-        if(previousRoundState == RoundState.FreezeTime && currentRoundState == RoundState.Live)
+        if(previousRoundState == RoundState.Over && currentRoundState == RoundState.Live)
             OnRoundStart?.Invoke();
         if(previousRoundState == RoundState.Live && currentRoundState == RoundState.FreezeTime)
             OnRoundEnd?.Invoke();
+        if(previousRoundState == RoundState.Live && currentRoundState == RoundState.Over)
+            OnRoundEnd?.Invoke();
             
         Team playerTeam = ParseTeamFromString(messageJson.SelectToken("player.team", false)?.Value<string>());
         Team winnerTeam = ParseTeamFromString(messageJson.SelectToken("round.win_team", false)?.Value<string>());
@@ -47,6 +55,7 @@ public class CS2MessageHandler
         {
             "live" => RoundState.Live,
             "freezetime" => RoundState.FreezeTime,
+            "over" => RoundState.Over,
             _ => RoundState.Unknown
         };
     }
@@ -61,7 +70,7 @@ public class CS2MessageHandler
         };
     }
     
-    private enum RoundState {FreezeTime, Live, Unknown}
+    private enum RoundState {FreezeTime, Live, Over, Unknown}
     
     private enum Team {T, CT, None}
 }

OpenCS2hock/ConfiguredInteger.cs

@@ -1,16 +1,16 @@
 namespace OpenCS2hock;
 
-public class ConfiguredInteger
+internal class ConfiguredInteger
 {
     private readonly int _min, _max;
 
-    public ConfiguredInteger(int min = 0, int max = 50)
+    internal ConfiguredInteger(int min = 0, int max = 50)
     {
         this._min = min;
         this._max = max;
     }
 
-    public int GetValue()
+    internal int GetValue()
     {
         return Random.Shared.Next(_min, _max);
     }

OpenCS2hock/GSIServer.cs

@@ -3,16 +3,16 @@ using System.Text;
 
 namespace OpenCS2hock;
 
-public class GSIServer
+internal class GSIServer
 {
     private HttpListener HttpListener { get; init; }
-    public delegate void OnMessageEventHandler(string content);
-    public event OnMessageEventHandler? OnMessage;
+    internal delegate void OnMessageEventHandler(string content);
+    internal event OnMessageEventHandler? OnMessage;
 
     private bool _keepRunning = true;
-    public bool IsRunning { get; private set; }
+    internal bool IsRunning { get; private set; }
 
-    public GSIServer(int port)
+    internal GSIServer(int port)
     {
         HttpListener = new HttpListener();
         HttpListener.Prefixes.Add($"http://127.0.0.1:{port}/");

OpenCS2hock/Installer.cs

@@ -5,7 +5,7 @@ namespace OpenCS2hock;
 
 public static class Installer
 {
-     public static Settings GetSettings(string? path = null)
+     internal static Settings GetSettings(string? path = null)
      {
           string settingsFilePath = path ?? "config.json";
           if (!File.Exists(settingsFilePath))
@@ -14,7 +14,7 @@ public static class Installer
           return JsonConvert.DeserializeObject<Settings>(File.ReadAllText(settingsFilePath));
      }
 
-     public static List<Shocker> GetShockers(Settings settings)
+     internal static List<Shocker> GetShockers(Settings settings)
      {
           List<Shocker> shockers = new();
           shockers.Add(new OpenShock(settings.OpenShockSettings.Endpoint, settings.OpenShockSettings.ApiKey,
@@ -24,13 +24,13 @@ public static class Installer
           return shockers;
      }
      
-     public static void InstallGsi()
+     internal static void InstallGsi()
      {
           string installLocation = Path.Combine(GetInstallDirectory(), "game\\csgo\\cfg\\gamestate_integration_opencs2hock.cfg");
           File.WriteAllText(installLocation, Resources.GSI_CFG_Content);
      }
-     
-     public static string GetInstallDirectory(int appId = 730)
+
+     private static string GetInstallDirectory(int appId = 730)
      {
           string steamInstallation =
 #pragma warning disable CA1416 //Registry only available on Windows

OpenCS2hock/OpenCS2hock.cs

@@ -64,6 +64,6 @@ public class OpenCS2hock
         Directory.CreateDirectory(Path.Combine(Environment.CurrentDirectory, "CS2Events"));
         string fileName = Path.Combine(Environment.CurrentDirectory, "CS2Events" ,$"{DateTime.Now.ToLongTimeString().Replace(':','.')}.json");
         File.WriteAllText(fileName, content);
-        _cs2MessageHandler.HandleCS2Message(content);
+        _cs2MessageHandler.HandleCS2Message(content, _settings.SteamId);
     }
 }

OpenCS2hock/OpenShock.cs

@@ -3,7 +3,7 @@ using System.Text;
 
 namespace OpenCS2hock;
 
-public class OpenShock : Shocker
+internal class OpenShock : Shocker
 {
     protected override void ControlInternal(ControlAction action, string shockerId, int intensity, int duration)
     {
@@ -23,7 +23,7 @@ public class OpenShock : Shocker
         };
         request.Headers.Add("OpenShockToken", ApiKey);
         HttpResponseMessage response = this.HttpClient.Send(request);
-        Console.WriteLine(response.StatusCode);
+        Console.WriteLine($"{request.RequestUri} response: {response.StatusCode}");
     }
 
     private byte ControlActionToByte(ControlAction action)
@@ -37,7 +37,7 @@ public class OpenShock : Shocker
         };
     }
 
-    public OpenShock(string endpoint, string apiKey, string[] shockerIds, ConfiguredInteger intensity, ConfiguredInteger duration) : base(endpoint, apiKey, shockerIds, intensity, duration)
+    internal OpenShock(string endpoint, string apiKey, string[] shockerIds, ConfiguredInteger intensity, ConfiguredInteger duration) : base(endpoint, apiKey, shockerIds, intensity, duration)
     {
         
     }

OpenCS2hock/Settings.cs

@@ -4,6 +4,7 @@ namespace OpenCS2hock;
 
 public struct Settings
 {
+    public string SteamId = "";
     public OpenShockSettings OpenShockSettings = new()
     {
         Endpoint = "https://api.shocklink.net",
@@ -13,8 +14,8 @@ public struct Settings
 
     public Range IntensityRange = new ()
     {
-        Min = 0,
-        Max = 50
+        Min = 20,
+        Max = 60
     };
 
     public Range DurationRange = new()
@@ -43,7 +44,7 @@ public struct Settings
         return JsonConvert.SerializeObject(this, Formatting.Indented);
     }
 
-    public static Shocker.ControlAction StringToAction(string str)
+    internal static Shocker.ControlAction StringToAction(string str)
     {
         return str.ToLower() switch
         {

OpenCS2hock/Shocker.cs

@@ -1,15 +1,15 @@
 namespace OpenCS2hock;
 
-public abstract class Shocker
+internal abstract class Shocker
 {
     protected readonly HttpClient HttpClient;
     protected readonly string ApiKey,Endpoint;
     private readonly string[] _shockerIds;
     private readonly ConfiguredInteger _intensity, _duration;
 
-    public enum ControlAction { Beep, Vibrate, Shock, Nothing }
+    internal enum ControlAction { Beep, Vibrate, Shock, Nothing }
 
-    public void Control(ControlAction action, string? shockerId = null)
+    internal void Control(ControlAction action, string? shockerId = null)
     {
         int intensity = _intensity.GetValue();
         int duration = _duration.GetValue();

OpenCS2hock/gamestate_integration_opencs2hock.cfg

@@ -1,9 +1,9 @@
 "OpenCS2hock"
 {
 "uri" "http://127.0.0.1:3000"
-"timeout" "5.0"
-"buffer"  "0.1"
-"throttle" "0.5"
+"timeout" "2.0"
+"buffer"  "0.0"
+"throttle" "0.1"
 "heartbeat" "60.0"
 "output"
     {