V 1.1.0 Update to .net9.0 standard

CS2GSI/CS2GSI.cs

@@ -13,8 +13,14 @@ public class CS2GSI
     private readonly ILogger? _logger;
     public bool IsRunning => this._gsiServer.IsRunning;
     public CS2GameState? CurrentGameState => _lastLocalGameState;
+    
+    private const string DebugDirectory = "Debug";
+    public static string StatesDirectory => Path.Join(DebugDirectory, "States");
+    public static string MessagesDirectory => Path.Join(DebugDirectory, "Messages");
+    public static string EventsDirectory => Path.Join(DebugDirectory, "Messages");
+    public static bool DebugEnabled = false;
 
-    public CS2GSI(ILogger? logger = null)
+    public CS2GSI(ILogger? logger = null, bool debugEnabled = false)
     {
         this._logger = logger;
         this._logger?.Log(LogLevel.Information, Resources.Installing_GSI_File);
@@ -28,7 +34,9 @@ public class CS2GSI
             this._logger?.Log(LogLevel.Critical, Resources.Installing_GSI_File_Failed);
             return;
         }
-        this._gsiServer = new GSIServer(3000, logger);
+
+        DebugEnabled = debugEnabled;
+        this._gsiServer = GSIServer.Create(3000, logger);
         this._gsiServer.OnMessage += GsiServerOnOnMessage;
     }
 
@@ -37,18 +45,32 @@ public class CS2GSI
         JObject jsonObject = JObject.Parse(messageJson);
         CS2GameState newState = CS2GameState.ParseFromJObject(jsonObject);
         this._logger?.Log(LogLevel.Debug, $"{Resources.Received_State}:\n{newState.ToString()}");
-#if DEBUG
+
-        long time = DateTime.Now.ToFileTime();
+        double time = DateTime.UtcNow.Subtract(
-        Directory.CreateDirectory("states");
+            new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)
-        File.WriteAllText(Path.Join("states", $"{time}.json"), JsonConvert.SerializeObject(newState, Formatting.Indented, new Newtonsoft.Json.Converters.StringEnumConverter()));
+        ).TotalMilliseconds;
-        Directory.CreateDirectory("messages");
+        string timeString = $"{time:N0}.json";
-        File.WriteAllText(Path.Join("messages", $"{time}.json"), messageJson);
+
-#endif
+        if (DebugEnabled)
+        {
+            Directory.CreateDirectory(StatesDirectory);
+            Directory.CreateDirectory(MessagesDirectory);
+            File.WriteAllText(Path.Join(StatesDirectory, timeString),
+                JsonConvert.SerializeObject(newState, Formatting.Indented, new Newtonsoft.Json.Converters.StringEnumConverter()));
+            File.WriteAllText(Path.Join(MessagesDirectory, timeString), messageJson);
+        }
 
         if (_lastLocalGameState is not null && _allGameStates.Count > 0)
         {
             List<ValueTuple<CS2Event, CS2EventArgs>> generatedEvents = CS2EventGenerator.GenerateEvents(_lastLocalGameState, newState, _allGameStates.Last());
             this._logger?.Log(LogLevel.Information, $"Generated {generatedEvents.Count} event{(generatedEvents.Count > 1 ? 's' : null)}:\n- {string.Join("\n- ", generatedEvents)}");
+            if (DebugEnabled)
+            {
+                Directory.CreateDirectory(EventsDirectory);
+                File.WriteAllText(Path.Join(StatesDirectory, EventsDirectory), 
+                    JsonConvert.SerializeObject(generatedEvents, Formatting.Indented, new Newtonsoft.Json.Converters.StringEnumConverter()));
+            }
+                
             InvokeEvents(generatedEvents);
         }
         this._lastLocalGameState = newState.UpdateGameStateForLocal(_lastLocalGameState);
@@ -68,7 +90,7 @@ public class CS2GSI
         GetEventHandlerForEvent(cs2Event.Item1)?.Invoke(cs2Event.Item2);
     }
     
-    public CS2EventHandler? GetEventHandlerForEvent(CS2Event cs2Event)
+    private CS2EventHandler? GetEventHandlerForEvent(CS2Event cs2Event)
     {
         return cs2Event switch
         {
@@ -97,15 +119,13 @@ public class CS2GSI
             CS2Event.OnBombPlanted => this.OnBombPlanted,
             CS2Event.OnBombDefused => this.OnBombDefused,
             CS2Event.OnBombExploded => this.OnBombExploded,
-            CS2Event.AnyEvent => this.AnyEvent,
+            CS2Event.AnyEvent => this.OnAnyEvent,
-            CS2Event.AnyMessage => this.AnyMessage,
+            CS2Event.AnyMessage => this.OnAnyMessage,
             CS2Event.OnActivityChange => this.OnActivityChange,
             _ => throw new ArgumentException(Resources.Unknown_Event, nameof(cs2Event))
         };
     }
     
-    
-    
     public delegate void CS2EventHandler(CS2EventArgs eventArgs);
 
     public event CS2EventHandler? OnKill,
@@ -133,8 +153,7 @@ public class CS2GSI
         OnBombPlanted,
         OnBombDefused,
         OnBombExploded,
-        AnyEvent,
+        OnAnyEvent,
-        AnyMessage,
+        OnAnyMessage,
         OnActivityChange;
-
 }

CS2GSI/CS2GSI.csproj

@@ -1,14 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <Version>1.0.8</Version>
+        <Version>1.1.0</Version>
         <Title>CS2GSI</Title>
         <Authors>Glax</Authors>
         <RepositoryUrl>https://github.com/C9Glax/CS2GSI</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
+        <PackageProjectUrl>https://github.com/C9Glax/CS2GSI</PackageProjectUrl>
+        <PackageLicenseUrl></PackageLicenseUrl>
+        <TargetFrameworks>net8.0;net9.0;net7.0</TargetFrameworks>
+        <LangVersion>latestmajor</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

CS2GSI/GSIServer.cs

@@ -8,14 +8,24 @@ namespace CS2GSI;
 
 internal class GSIServer
 {
+    public static GSIServer? Instance { get; private set; }
     private HttpListener HttpListener { get; init; }
-    internal delegate void OnMessageEventHandler(string content);
-    internal event OnMessageEventHandler? OnMessage;
     private bool _keepRunning = true;
     internal bool IsRunning { get; private set; }
     private ILogger? logger;
+    
+    internal delegate void OnMessageEventHandler(string content);
+    internal event OnMessageEventHandler? OnMessage;
 
-    internal GSIServer(int port, ILogger? logger = null)
+    public static GSIServer Create(int port, ILogger? logger = null)
+    {
+        Instance = new GSIServer(port, logger);
+        return Instance;
+    }
+
+    private GSIServer(){}
+
+    private GSIServer(int port, ILogger? logger = null)
     {
         this.logger = logger;
         string prefix = $"http://127.0.0.1:{port}/";

README.md

@@ -4,7 +4,7 @@
 [![Github](https://img.shields.io/badge/Github-8A2BE2)](https://github.com/C9Glax/CS2GSI)
 [![GitHub Release](https://img.shields.io/github/v/release/c9glax/CS2GSI)](https://github.com/C9Glax/CS2GSI/releases/latest)
 
-
+## .net7.0, .net8.0, .net9.0
 
 
 ## Example Usage
@@ -51,4 +51,5 @@ All Events with IDs here: https://github.com/C9Glax/CS2GSI/blob/master/CS2GSI/CS
 * `OnBombDefused`
 * `OnBombExploded`
 * `AnyEvent`
-* `AnyMessage`
+* `AnyMessage`
+* `OnActivityChange` (_string_) Activity

TestApp/TestApp.csproj

@@ -2,9 +2,10 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+        <LangVersion>latestmajor</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>