GarpBot/cs2-WeaponPaints
1
0
Fork 0
mirror of https://github.com/Nereziel/cs2-WeaponPaints.git synced 2026-03-10 00:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Factory patten when opening connection mysql

Browse Source
This commit is contained in:
Eduardo Leonardo Rosa da Silva
2025-10-29 15:32:42 -03:00
parent 76bcb5bb85
commit 53fadf564d
2 changed files with 168 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Database.cs
View File

@@ -2,19 +2,20 @@
namespace WeaponPaints namespace WeaponPaints
{ {
public class Database public class Database
{ {
private readonly IDatabaseConnection _connection; private readonly Func<IDatabaseConnection> _connectionFactory;
public Database(IDatabaseConnection connection) public Database(Func<IDatabaseConnection> connectionFactory)
{ {
_connection = connection; _connectionFactory = connectionFactory;
} }
public async Task<IDatabaseConnection> GetConnectionAsync() public async Task<IDatabaseConnection> GetConnectionAsync()
{ {
await _connection.OpenAsync(); var connection = _connectionFactory();
return _connection; await connection.OpenAsync();
} return connection;
} }
}
} }

294
WeaponPaints.cs
View File

@@ -13,173 +13,173 @@ namespace WeaponPaints;
[MinimumApiVersion(338)] [MinimumApiVersion(338)]
public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig> public partial class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
{ {
internal static WeaponPaints Instance { get; private set; } = new(); internal static WeaponPaints Instance { get; private set; } = new();
public WeaponPaintsConfig Config { get; set; } = new(); public WeaponPaintsConfig Config { get; set; } = new();
private static WeaponPaintsConfig _config { get; set; } = new(); private static WeaponPaintsConfig _config { get; set; } = new();
public override string ModuleAuthor => "Nereziel & daffyy"; public override string ModuleAuthor => "Nereziel & daffyy";
public override string ModuleDescription => "Skin, gloves, agents and knife selector, standalone and web-based"; public override string ModuleDescription => "Skin, gloves, agents and knife selector, standalone and web-based";
public override string ModuleName => "WeaponPaints"; public override string ModuleName => "WeaponPaints";
public override string ModuleVersion => "3.2a"; public override string ModuleVersion => "3.2a";
public override void Load(bool hotReload) public override void Load(bool hotReload)
{ {
// Hardcoded hotfix needs to be changed later (Not needed 17.09.2025) // Hardcoded hotfix needs to be changed later (Not needed 17.09.2025)
//if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) //if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Patch.PerformPatch("0F 85 ? ? ? ? 31 C0 B9 ? ? ? ? BA ? ? ? ? 66 0F EF C0 31 F6 31 FF 48 C7 45 ? ? ? ? ? 48 C7 45 ? ? ? ? ? 48 C7 45 ? ? ? ? ? 48 C7 45 ? ? ? ? ? 0F 29 45 ? 48 C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? 66 89 45 ? E8 ? ? ? ? 41 89 C5 85 C0 0F 8E", "90 90 90 90 90 90"); // Patch.PerformPatch("0F 85 ? ? ? ? 31 C0 B9 ? ? ? ? BA ? ? ? ? 66 0F EF C0 31 F6 31 FF 48 C7 45 ? ? ? ? ? 48 C7 45 ? ? ? ? ? 48 C7 45 ? ? ? ? ? 48 C7 45 ? ? ? ? ? 0F 29 45 ? 48 C7 45 ? ? ? ? ? C7 45 ? ? ? ? ? 66 89 45 ? E8 ? ? ? ? 41 89 C5 85 C0 0F 8E", "90 90 90 90 90 90");
//else //else
// Patch.PerformPatch("74 ? 48 8D 0D ? ? ? ? FF 15 ? ? ? ? EB ? BA", "EB"); // Patch.PerformPatch("74 ? 48 8D 0D ? ? ? ? FF 15 ? ? ? ? EB ? BA", "EB");
Instance = this; Instance = this;
if (hotReload) if (hotReload)
{ {
OnMapStart(string.Empty); OnMapStart(string.Empty);
GPlayerWeaponsInfo.Clear(); GPlayerWeaponsInfo.Clear();
GPlayersKnife.Clear(); GPlayersKnife.Clear();
GPlayersGlove.Clear(); GPlayersGlove.Clear();
GPlayersAgent.Clear(); GPlayersAgent.Clear();
GPlayersPin.Clear(); GPlayersPin.Clear();
GPlayersMusic.Clear(); GPlayersMusic.Clear();
foreach (var player in Enumerable foreach (var player in Enumerable
.OfType<CCSPlayerController>(Utilities.GetPlayers().TakeWhile(_ => WeaponSync != null)) .OfType<CCSPlayerController>(Utilities.GetPlayers().TakeWhile(_ => WeaponSync != null))
.Where(player => player.IsValid && .Where(player => player.IsValid &&
!string.IsNullOrEmpty(player.IpAddress) && player is !string.IsNullOrEmpty(player.IpAddress) && player is
{ IsBot: false, Connected: PlayerConnectedState.PlayerConnected })) { IsBot: false, Connected: PlayerConnectedState.PlayerConnected }))
{ {
var playerInfo = new PlayerInfo var playerInfo = new PlayerInfo
{ {
UserId = player.UserId, UserId = player.UserId,
Slot = player.Slot, Slot = player.Slot,
Index = (int)player.Index, Index = (int)player.Index,
SteamId = player?.SteamID.ToString(), SteamId = player?.SteamID.ToString(),
Name = player?.PlayerName, Name = player?.PlayerName,
IpAddress = player?.IpAddress?.Split(":")[0] IpAddress = player?.IpAddress?.Split(":")[0]
}; };
_ = Task.Run(async () => _ = Task.Run(async () =>
{ {
if (WeaponSync != null) await WeaponSync.GetPlayerData(playerInfo); if (WeaponSync != null) await WeaponSync.GetPlayerData(playerInfo);
}); });
} }
} }
Utility.LoadSkinsFromFile(ModuleDirectory + $"/data/skins_{_config.SkinsLanguage}.json", Logger); Utility.LoadSkinsFromFile(ModuleDirectory + $"/data/skins_{_config.SkinsLanguage}.json", Logger);
Utility.LoadGlovesFromFile(ModuleDirectory + $"/data/gloves_{_config.SkinsLanguage}.json", Logger); Utility.LoadGlovesFromFile(ModuleDirectory + $"/data/gloves_{_config.SkinsLanguage}.json", Logger);
Utility.LoadAgentsFromFile(ModuleDirectory + $"/data/agents_{_config.SkinsLanguage}.json", Logger); Utility.LoadAgentsFromFile(ModuleDirectory + $"/data/agents_{_config.SkinsLanguage}.json", Logger);
Utility.LoadMusicFromFile(ModuleDirectory + $"/data/music_{_config.SkinsLanguage}.json", Logger); Utility.LoadMusicFromFile(ModuleDirectory + $"/data/music_{_config.SkinsLanguage}.json", Logger);
Utility.LoadPinsFromFile(ModuleDirectory + $"/data/collectibles_{_config.SkinsLanguage}.json", Logger); Utility.LoadPinsFromFile(ModuleDirectory + $"/data/collectibles_{_config.SkinsLanguage}.json", Logger);
RegisterListeners(); RegisterListeners();
} }
public void OnConfigParsed(WeaponPaintsConfig config) public void OnConfigParsed(WeaponPaintsConfig config)
{ {
Config = config; Config = config;
_config = config; _config = config;
// Validar configurações de banco de dados // Validar configurações de banco de dados
if (config.DatabaseType.ToLower() == "mysql") if (config.DatabaseType.ToLower() == "mysql")
{ {
if (config.DatabaseHost.Length < 1 || config.DatabaseName.Length < 1 || config.DatabaseUser.Length < 1) if (config.DatabaseHost.Length < 1 || config.DatabaseName.Length < 1 || config.DatabaseUser.Length < 1)
{ {
Logger.LogError("You need to setup MySQL Database credentials in \"configs/plugins/WeaponPaints/WeaponPaints.json\"!"); Logger.LogError("You need to setup MySQL Database credentials in \"configs/plugins/WeaponPaints/WeaponPaints.json\"!");
Unload(false); Unload(false);
return; return;
} }
} }
else if (config.DatabaseType.ToLower() == "sqlite") else if (config.DatabaseType.ToLower() == "sqlite")
{ {
if (string.IsNullOrEmpty(config.DatabasePath)) if (string.IsNullOrEmpty(config.DatabasePath))
{ {
Logger.LogError("You need to setup SQLite Database path in \"configs/plugins/WeaponPaints/WeaponPaints.json\"!"); Logger.LogError("You need to setup SQLite Database path in \"configs/plugins/WeaponPaints/WeaponPaints.json\"!");
Unload(false); Unload(false);
return; return;
} }
} }
else else
{ {
Logger.LogError("Invalid DatabaseType. Use 'mysql' or 'sqlite'."); Logger.LogError("Invalid DatabaseType. Use 'mysql' or 'sqlite'.");
Unload(false); Unload(false);
return; return;
} }
if (!File.Exists(Path.GetDirectoryName(Path.GetDirectoryName(ModuleDirectory)) + "/gamedata/weaponpaints.json")) if (!File.Exists(Path.GetDirectoryName(Path.GetDirectoryName(ModuleDirectory)) + "/gamedata/weaponpaints.json"))
{ {
Logger.LogError("You need to upload \"weaponpaints.json\" to \"gamedata directory\"!"); Logger.LogError("You need to upload \"weaponpaints.json\" to \"gamedata directory\"!");
Unload(false); Unload(false);
return; return;
} }
// Criar conexão baseada no tipo de banco // Criar factory de conexão baseada no tipo de banco
IDatabaseConnection connection; Func<IDatabaseConnection> connectionFactory;
if (config.DatabaseType.ToLower() == "mysql") if (config.DatabaseType.ToLower() == "mysql")
{ {
var builder = new MySqlConnectionStringBuilder var builder = new MySqlConnectionStringBuilder
{ {
Server = config.DatabaseHost, Server = config.DatabaseHost,
UserID = config.DatabaseUser, UserID = config.DatabaseUser,
Password = config.DatabasePassword, Password = config.DatabasePassword,
Database = config.DatabaseName, Database = config.DatabaseName,
Port = (uint)config.DatabasePort, Port = (uint)config.DatabasePort,
Pooling = true, Pooling = true,
MaximumPoolSize = 640, MaximumPoolSize = 640,
}; };
connection = new MySQLConnection(builder.ConnectionString, Logger); connectionFactory = () => new MySQLConnection(builder.ConnectionString, Logger);
} }
else // SQLite else // SQLite
{ {
// Garantir que o diretório existe // Garantir que o diretório existe
var dbPath = Path.GetFullPath(config.DatabasePath); var dbPath = Path.GetFullPath(config.DatabasePath);
var dbDirectory = Path.GetDirectoryName(dbPath); var dbDirectory = Path.GetDirectoryName(dbPath);
if (!string.IsNullOrEmpty(dbDirectory) && !Directory.Exists(dbDirectory)) if (!string.IsNullOrEmpty(dbDirectory) && !Directory.Exists(dbDirectory))
{ {
Directory.CreateDirectory(dbDirectory); Directory.CreateDirectory(dbDirectory);
} }
var connectionString = $"Data Source={dbPath}"; var connectionString = $"Data Source={dbPath}";
Logger.LogInformation($"[WeaponPaints] SQLite database path: {dbPath}"); Logger.LogInformation($"[WeaponPaints] SQLite database path: {dbPath}");
connection = new SQLiteConnection(connectionString, Logger); connectionFactory = () => new SQLiteConnection(connectionString, Logger);
} }
Database = new Database(connection); Database = new Database(connectionFactory);
Utility.Config = config; Utility.Config = config;
Task.Run(async () => await Utility.CheckDatabaseTables()); Task.Run(async () => await Utility.CheckDatabaseTables());
_localizer = Localizer; _localizer = Localizer;
Utility.ShowAd(ModuleVersion); Utility.ShowAd(ModuleVersion);
Task.Run(async () => await Utility.CheckVersion(ModuleVersion, Logger)); Task.Run(async () => await Utility.CheckVersion(ModuleVersion, Logger));
} }
public override void OnAllPluginsLoaded(bool hotReload) public override void OnAllPluginsLoaded(bool hotReload)
{ {
try try
{ {
MenuApi = MenuCapability.Get(); MenuApi = MenuCapability.Get();
if (Config.Additional.KnifeEnabled) if (Config.Additional.KnifeEnabled)
SetupKnifeMenu(); SetupKnifeMenu();
if (Config.Additional.SkinEnabled) if (Config.Additional.SkinEnabled)
SetupSkinsMenu(); SetupSkinsMenu();
if (Config.Additional.GloveEnabled) if (Config.Additional.GloveEnabled)
SetupGlovesMenu(); SetupGlovesMenu();
if (Config.Additional.AgentEnabled) if (Config.Additional.AgentEnabled)
SetupAgentsMenu(); SetupAgentsMenu();
if (Config.Additional.MusicEnabled) if (Config.Additional.MusicEnabled)
SetupMusicMenu(); SetupMusicMenu();
if (Config.Additional.PinsEnabled) if (Config.Additional.PinsEnabled)
SetupPinsMenu(); SetupPinsMenu();
RegisterCommands(); RegisterCommands();
} }
catch (Exception) catch (Exception)
{ {
MenuApi = null; MenuApi = null;
Logger.LogError("Error while loading required plugins"); Logger.LogError("Error while loading required plugins");
throw; throw;
} }
} }
} }