1.2

.github/workflows/dotnet.yml

@@ -10,14 +10,14 @@ on:
       PluginVersion:
         description: 'Plugin Version'
         required: true
-        default: 'v1.0.0'
+        default: '1.0.0'
 
 env:
   PLUGIN_NAME: Sessions
   DOTNET_VERSION: 8.0.x
   PATH_PLUGIN: addons/counterstrikesharp/plugins/
   START_VERSION: 1.0.0
-  USE_V_VERSION: true
+  USE_V_VERSION: false
 
 jobs:
   version:

.gitignore

@@ -4,4 +4,6 @@ compiled/
 *.sln
 .vs/
 DataBaseService.cs
-SqlExample.cs
+SqlExample.cs
+1.1/
+.vscode/

Config.cs

@@ -1,31 +1,30 @@
 using CounterStrikeSharp.API.Core;
 using System.Text.Json.Serialization;
 
-namespace Core
+namespace Sessions;
+
+public class CoreConfig : BasePluginConfig
 {
-    public class CoreConfig : BasePluginConfig
-    {
-        public override int Version { get; set; } = 1;
+    public override int Version { get; set; } = 1;
 
-        [JsonPropertyName("DatabaseType")]
-        public string DatabaseType { get; set; } = "postgres";
+    [JsonPropertyName("DatabaseType")]
+    public string DatabaseType { get; set; } = "postgres";
 
-		[JsonPropertyName("DatabaseHost")]
-		public string DatabaseHost { get; set; } = "";
+    [JsonPropertyName("DatabaseHost")]
+    public string DatabaseHost { get; set; } = "";
 
-		[JsonPropertyName("DatabasePort")]
-		public int DatabasePort { get; set; } = 5432;
+    [JsonPropertyName("DatabasePort")]
+    public int DatabasePort { get; set; } = 5432;
 
-        [JsonPropertyName("DatabaseUser")]
-        public string DatabaseUser { get; set; } = "";
+    [JsonPropertyName("DatabaseUser")]
+    public string DatabaseUser { get; set; } = "";
 
-        [JsonPropertyName("DatabasePassword")]
-        public string DatabasePassword { get; set; } = "";
+    [JsonPropertyName("DatabasePassword")]
+    public string DatabasePassword { get; set; } = "";
 
-        [JsonPropertyName("DatabaseName")]
-        public string DatabaseName { get; set; } = "";
+    [JsonPropertyName("DatabaseName")]
+    public string DatabaseName { get; set; } = "";
 
-        [JsonPropertyName("DatabaseKeepAlive")]
-        public int DatabaseKeepAlive { get; set; } = 30;
-    }
+    [JsonPropertyName("DatabaseKeepAlive")]
+    public int DatabaseKeepAlive { get; set; } = 30;
 }

IDatabase.cs

@@ -0,0 +1,57 @@
+using Microsoft.Extensions.Logging;
+
+namespace Sessions;
+
+public interface IDatabase
+{
+    string BuildConnectionString(CoreConfig config);
+
+    Task<ServerSQL> GetServerAsync(string serverIp, ushort serverPort);
+    Task<MapSQL> GetMapAsync(string mapName);
+    Task<PlayerSQL> GetPlayerAsync(ulong steamId);
+    Task<SessionSQL> GetSessionAsync(int playerId, int serverId, int mapId, string ip);
+
+    void CreateTablesAsync();
+    void UpdateSessionsBulkAsync(int[] sessionIds);
+    void UpdateSeenAsync(int playerId);
+}
+
+public interface IDatabaseFactory
+{
+    IDatabase Database { get; }
+}
+
+public class DatabaseFactory : IDatabaseFactory
+{
+    private readonly IDatabase _database;
+    private readonly ILogger _logger;
+
+    public DatabaseFactory(CoreConfig config)
+    {
+        CheckConfig(config);
+
+        var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
+        _logger = loggerFactory.CreateLogger<DatabaseFactory>();
+
+        _database = config.DatabaseType switch
+        {
+            "postgres" => new PostgresService(config, _logger),
+            "mysql" => new SqlService(config, _logger),
+            _ => throw new InvalidOperationException("Database type is not supported"),
+        };
+    }
+
+    public IDatabase Database => _database;
+
+    private static void CheckConfig(CoreConfig config)
+    {
+        if (string.IsNullOrWhiteSpace(config.DatabaseType) ||
+            string.IsNullOrWhiteSpace(config.DatabaseHost) ||
+            string.IsNullOrWhiteSpace(config.DatabaseUser) ||
+            string.IsNullOrWhiteSpace(config.DatabaseName) ||
+            config.DatabasePort == 0)
+        {
+            throw new InvalidOperationException("Database is not set in the configuration file");
+        }
+    }
+}

IDatabaseQueries.cs

@@ -0,0 +1,77 @@
+namespace Sessions;
+
+public interface IDatabaseQueries
+{
+    string CreateServers { get; }
+    string CreateMaps { get; }
+    string CreatePlayers { get; }
+    string CreateSessions { get; }
+
+    string SelectServer { get; }
+    string InsertServer { get; }
+
+    string SelectMap { get; }
+    string InsertMap { get; }
+
+    string SelectPlayer { get; }
+    string InsertPlayer { get; }
+
+    string InsertSession { get; }
+    string UpdateSession { get; }
+    string UpdateSeen { get; }
+}
+
+public abstract class Queries : IDatabaseQueries
+{
+    public abstract string CreateServers { get; }
+    public abstract string CreateMaps { get; }
+    public abstract string CreatePlayers { get; }
+    public abstract string CreateSessions { get; }
+
+    public abstract string SelectServer { get; }
+    public abstract string InsertServer { get; }
+
+    public abstract string SelectMap { get; }
+    public abstract string InsertMap { get; }
+
+    public abstract string SelectPlayer { get; }
+    public abstract string InsertPlayer { get; }
+
+    public abstract string InsertSession { get; }
+    public abstract string UpdateSession { get; }
+    public abstract string UpdateSeen { get; }
+
+    public IEnumerable<string> GetCreateQueries()
+    {
+        yield return CreateServers;
+        yield return CreateMaps;
+        yield return CreatePlayers;
+        yield return CreateSessions;
+    }
+}
+
+public class ServerSQL()
+{
+    public int Id { get; set; }
+
+    public MapSQL? Map { get; set; }
+}
+
+public class MapSQL()
+{
+    public short Id { get; set; }
+}
+
+public class PlayerSQL()
+{
+    public int Id { get; set; }
+    public DateTime FirstSeen { get; set; }
+    public DateTime LastSeen { get; set; }
+
+    public SessionSQL? Session { get; set; }
+}
+
+public class SessionSQL()
+{
+    public int Id { get; set; }
+}

Ip.cs

@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 using CounterStrikeSharp.API.Core;
 
-namespace Core;
+namespace Sessions;
 
 public class Ip
 {