Accessor Changes, GSIServer Instantiated
This commit is contained in:
parent
386c211de5
commit
8371f119d5
@ -13,8 +13,14 @@ public class CS2GSI
|
|||||||
private readonly ILogger? _logger;
|
private readonly ILogger? _logger;
|
||||||
public bool IsRunning => this._gsiServer.IsRunning;
|
public bool IsRunning => this._gsiServer.IsRunning;
|
||||||
public CS2GameState? CurrentGameState => _lastLocalGameState;
|
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 = logger;
|
||||||
this._logger?.Log(LogLevel.Information, Resources.Installing_GSI_File);
|
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);
|
this._logger?.Log(LogLevel.Critical, Resources.Installing_GSI_File_Failed);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this._gsiServer = new GSIServer(3000, logger);
|
|
||||||
|
DebugEnabled = debugEnabled;
|
||||||
|
this._gsiServer = GSIServer.Create(3000, logger);
|
||||||
this._gsiServer.OnMessage += GsiServerOnOnMessage;
|
this._gsiServer.OnMessage += GsiServerOnOnMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -37,18 +45,32 @@ public class CS2GSI
|
|||||||
JObject jsonObject = JObject.Parse(messageJson);
|
JObject jsonObject = JObject.Parse(messageJson);
|
||||||
CS2GameState newState = CS2GameState.ParseFromJObject(jsonObject);
|
CS2GameState newState = CS2GameState.ParseFromJObject(jsonObject);
|
||||||
this._logger?.Log(LogLevel.Debug, $"{Resources.Received_State}:\n{newState.ToString()}");
|
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)
|
if (_lastLocalGameState is not null && _allGameStates.Count > 0)
|
||||||
{
|
{
|
||||||
List<ValueTuple<CS2Event, CS2EventArgs>> generatedEvents = CS2EventGenerator.GenerateEvents(_lastLocalGameState, newState, _allGameStates.Last());
|
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)}");
|
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);
|
InvokeEvents(generatedEvents);
|
||||||
}
|
}
|
||||||
this._lastLocalGameState = newState.UpdateGameStateForLocal(_lastLocalGameState);
|
this._lastLocalGameState = newState.UpdateGameStateForLocal(_lastLocalGameState);
|
||||||
@ -68,7 +90,7 @@ public class CS2GSI
|
|||||||
GetEventHandlerForEvent(cs2Event.Item1)?.Invoke(cs2Event.Item2);
|
GetEventHandlerForEvent(cs2Event.Item1)?.Invoke(cs2Event.Item2);
|
||||||
}
|
}
|
||||||
|
|
||||||
public CS2EventHandler? GetEventHandlerForEvent(CS2Event cs2Event)
|
private CS2EventHandler? GetEventHandlerForEvent(CS2Event cs2Event)
|
||||||
{
|
{
|
||||||
return cs2Event switch
|
return cs2Event switch
|
||||||
{
|
{
|
||||||
@ -97,15 +119,13 @@ public class CS2GSI
|
|||||||
CS2Event.OnBombPlanted => this.OnBombPlanted,
|
CS2Event.OnBombPlanted => this.OnBombPlanted,
|
||||||
CS2Event.OnBombDefused => this.OnBombDefused,
|
CS2Event.OnBombDefused => this.OnBombDefused,
|
||||||
CS2Event.OnBombExploded => this.OnBombExploded,
|
CS2Event.OnBombExploded => this.OnBombExploded,
|
||||||
CS2Event.AnyEvent => this.AnyEvent,
|
CS2Event.AnyEvent => this.OnAnyEvent,
|
||||||
CS2Event.AnyMessage => this.AnyMessage,
|
CS2Event.AnyMessage => this.OnAnyMessage,
|
||||||
CS2Event.OnActivityChange => this.OnActivityChange,
|
CS2Event.OnActivityChange => this.OnActivityChange,
|
||||||
_ => throw new ArgumentException(Resources.Unknown_Event, nameof(cs2Event))
|
_ => throw new ArgumentException(Resources.Unknown_Event, nameof(cs2Event))
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public delegate void CS2EventHandler(CS2EventArgs eventArgs);
|
public delegate void CS2EventHandler(CS2EventArgs eventArgs);
|
||||||
|
|
||||||
public event CS2EventHandler? OnKill,
|
public event CS2EventHandler? OnKill,
|
||||||
@ -133,8 +153,7 @@ public class CS2GSI
|
|||||||
OnBombPlanted,
|
OnBombPlanted,
|
||||||
OnBombDefused,
|
OnBombDefused,
|
||||||
OnBombExploded,
|
OnBombExploded,
|
||||||
AnyEvent,
|
OnAnyEvent,
|
||||||
AnyMessage,
|
OnAnyMessage,
|
||||||
OnActivityChange;
|
OnActivityChange;
|
||||||
|
|
||||||
}
|
}
|
@ -8,14 +8,24 @@ namespace CS2GSI;
|
|||||||
|
|
||||||
internal class GSIServer
|
internal class GSIServer
|
||||||
{
|
{
|
||||||
|
public static GSIServer? Instance { get; private set; }
|
||||||
private HttpListener HttpListener { get; init; }
|
private HttpListener HttpListener { get; init; }
|
||||||
internal delegate void OnMessageEventHandler(string content);
|
|
||||||
internal event OnMessageEventHandler? OnMessage;
|
|
||||||
private bool _keepRunning = true;
|
private bool _keepRunning = true;
|
||||||
internal bool IsRunning { get; private set; }
|
internal bool IsRunning { get; private set; }
|
||||||
private ILogger? logger;
|
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;
|
this.logger = logger;
|
||||||
string prefix = $"http://127.0.0.1:{port}/";
|
string prefix = $"http://127.0.0.1:{port}/";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user