Create WinchConsole program, move relevant shared files to WinchCommo…

…n project
DREDGE-Mods · Dec 26, 2023 · bd71508 · bd71508
1 parent bbba7e8
commit bd71508
Show file tree

Hide file tree

Showing 19 changed files with 325 additions and 42 deletions.
diff --git a/Winch.sln b/Winch.sln
@@ -11,6 +11,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DisasterButton", "Winch.Exa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExampleItems", "Winch.Examples\ExampleItems\ExampleItems.csproj", "{C112288E-E993-44F3-B7B0-FB4BD37F18EA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinchConsole", "WinchConsole\WinchConsole.csproj", "{D5CFABA9-FA58-474F-A394-E197BDF38FDD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinchCommon", "WinchCommon\WinchCommon.csproj", "{EF5F69E6-FD4D-4314-B187-A89D00BF9355}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -33,6 +37,14 @@ Global
 		{C112288E-E993-44F3-B7B0-FB4BD37F18EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C112288E-E993-44F3-B7B0-FB4BD37F18EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C112288E-E993-44F3-B7B0-FB4BD37F18EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5CFABA9-FA58-474F-A394-E197BDF38FDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5CFABA9-FA58-474F-A394-E197BDF38FDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5CFABA9-FA58-474F-A394-E197BDF38FDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5CFABA9-FA58-474F-A394-E197BDF38FDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF5F69E6-FD4D-4314-B187-A89D00BF9355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF5F69E6-FD4D-4314-B187-A89D00BF9355}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF5F69E6-FD4D-4314-B187-A89D00BF9355}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF5F69E6-FD4D-4314-B187-A89D00BF9355}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Winch/Core/WinchCore.cs b/Winch/Core/WinchCore.cs
@@ -2,17 +2,15 @@
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Reflection;
-using System.Text.RegularExpressions;
-using UnityEngine.Profiling.Memory.Experimental;
-using Winch.Config;
 using Winch.Logging;
 using Winch.Util;
 
 namespace Winch.Core
 {
-    public class WinchCore
+	public class WinchCore
     {
         public static Logger Log = new Logger();
 
@@ -22,6 +20,18 @@ public class WinchCore
 
 		public static void Main()
         {
+			Log.Info("Starting console");
+			try
+			{
+				Process.Start(Path.Combine(WinchInstallLocation, "WinchConsole.exe"));
+			}
+			catch (Exception e)
+			{
+				Log.Error($"Could not start console : {e}");
+			}
+
+			AppDomain.CurrentDomain.ProcessExit += new EventHandler(OnProcessExit);
+
 			try
 			{
 				string metaPath = Path.Combine(WinchInstallLocation, "mod_meta.json");
@@ -67,5 +77,10 @@ public static void Main()
 
             Log.Debug("Harmony Patching complete.");
         }
+
+		public static void OnProcessExit(object sender, EventArgs e)
+		{
+			Log.Debug("DREDGE application exited");
+		}
     }
 }
diff --git a/Winch/Logging/LogSocket.cs b/Winch/Logging/LogSocket.cs
@@ -12,7 +12,6 @@ public class LogSocket
 		private Socket _socket;
 		private readonly int _port;
 		private readonly Logger _logger;
-		private const string IP = "127.0.0.1";
 
 		public LogSocket(Logger logger, int port)
 		{
@@ -30,14 +29,15 @@ public void WriteToSocket(LogMessage logMessage)
 
 			if (!_socket.Connected)
 			{
-				var endPoint = new IPEndPoint(IPAddress.Parse(IP), _port); try
+				var endPoint = new IPEndPoint(IPAddress.Parse(Constants.IP), _port); 
+				try
 				{
 					_socket?.Connect(endPoint);
 				}
 				catch (Exception ex)
 				{
 					_socket = null;
-					_logger.Error($"Could not connect to console at {IP}:{_port} - {ex}");
+					_logger.Error($"Could not connect to console at {Constants.IP}:{_port} - {ex}");
 				}
 			}
 

diff --git a/Winch/Logging/Logger.cs b/Winch/Logging/Logger.cs
@@ -7,12 +7,7 @@
 
 namespace Winch.Logging
 {
-    enum LogLevel
-    {
-        UNITY = 0, DEBUG = 1, INFO = 2, WARN = 3, ERROR = 4
-    }
-
-    public class Logger
+	public class Logger
     {
         private LogFile? _log;
         private LogFile? _latestLog;
@@ -73,7 +68,7 @@ private void Log(LogLevel level, string message, string source)
         {
 			_logSocket?.WriteToSocket(new LogMessage()
 			{
-				Level = level.ToString(),
+				Level = level,
 				Message = message,
 				Source = source
 			});

diff --git a/Winch/Winch.csproj b/Winch/Winch.csproj
@@ -16,21 +16,6 @@
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<Compile Update="Properties\Resources.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>Resources.resx</DependentUpon>
-		</Compile>
-	</ItemGroup>
-
-	<ItemGroup>
-		<EmbeddedResource Update="Properties\Resources.resx">
-			<Generator>ResXFileCodeGenerator</Generator>
-			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-	</ItemGroup>
-
 	<ItemGroup>
 	  <None Include="mod_meta.json">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -49,4 +34,9 @@
 		<Copy SourceFiles="@(DLLs)" DestinationFolder="$(OutputPath)" />
 	</Target>
 
+	<ItemGroup>
+		<ProjectReference Include="..\WinchCommon\WinchCommon.csproj">
+		</ProjectReference>
+	</ItemGroup>
+
 </Project>
diff --git a/Winch/mod_meta.json b/Winch/mod_meta.json
@@ -2,5 +2,5 @@
 	"Name": "Winch",
 	"Author": "Hacktix",
 	"ModGUID": "hacktix.winch",
-	"Version": "0.3.0"
+	"Version": "0.4.0"
 }
diff --git a/Winch/Config/DefaultConfig.json → WinchCommon/Config/DefaultConfig.json b/Winch/Config/DefaultConfig.json → WinchCommon/Config/DefaultConfig.json
diff --git a/Winch/Config/JSONConfig.cs → WinchCommon/Config/JSONConfig.cs b/Winch/Config/JSONConfig.cs → WinchCommon/Config/JSONConfig.cs
diff --git a/Winch/Config/ModConfig.cs → WinchCommon/Config/ModConfig.cs b/Winch/Config/ModConfig.cs → WinchCommon/Config/ModConfig.cs
@@ -1,11 +1,8 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using Winch.Core;
+using System.Reflection;
 
 namespace Winch.Config
 {
-    public class ModConfig : JSONConfig
+	public class ModConfig : JSONConfig
     {
         private static Dictionary<string, string> DefaultConfigs = new Dictionary<string, string>();
         private static Dictionary<string, ModConfig> Instances = new Dictionary<string, ModConfig>();
@@ -18,7 +15,7 @@ private static string GetDefaultConfig(string modName)
         {
             if(!DefaultConfigs.ContainsKey(modName))
             {
-                WinchCore.Log.Error($"No 'DefaultConfig' attribute found in mod_meta.json for {modName}!");
+                //WinchCore.Log.Error($"No 'DefaultConfig' attribute found in mod_meta.json for {modName}!");
                 throw new KeyNotFoundException($"No 'DefaultConfig' attribute found in mod_meta.json for {modName}!");
             }
             return DefaultConfigs[modName];

diff --git a/Winch/Config/WinchConfig.cs → WinchCommon/Config/WinchConfig.cs b/Winch/Config/WinchConfig.cs → WinchCommon/Config/WinchConfig.cs
@@ -7,7 +7,7 @@ public class WinchConfig : JSONConfig
     {
         private static readonly string WinchConfigPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "WinchConfig.json");
 
-        private WinchConfig() : base(WinchConfigPath, Properties.Resources.DefaultConfig) { }
+        private WinchConfig() : base(WinchConfigPath, WinchCommon.Properties.Resources.DefaultConfig) { }
 
         private static WinchConfig? _instance;
         public static WinchConfig Instance
@@ -22,7 +22,19 @@ public static WinchConfig Instance
 
         public static new T? GetProperty<T>(string key, T defaultValue)
         {
-            return ((JSONConfig)Instance).GetProperty(key, defaultValue);
+			try
+			{
+				return ((JSONConfig)Instance).GetProperty(key, defaultValue);
+			}
+			catch
+			{
+				return defaultValue;
+			}
         }
+
+		public static new void SetProperty<T>(string key, T value)
+		{
+			((JSONConfig)Instance).SetProperty(key, value);
+		}
     }
 }
diff --git a/WinchCommon/Constants.cs b/WinchCommon/Constants.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Winch;
+
+public static class Constants
+{
+	public const string IP = "127.0.0.1";
+}
diff --git a/WinchCommon/LogLevel.cs b/WinchCommon/LogLevel.cs
@@ -0,0 +1,6 @@
+namespace Winch;
+
+public enum LogLevel
+{
+	UNITY = 0, DEBUG = 1, INFO = 2, WARN = 3, ERROR = 4
+}
diff --git a/Winch/Logging/LogMessage.cs → WinchCommon/Logging/LogMessage.cs b/Winch/Logging/LogMessage.cs → WinchCommon/Logging/LogMessage.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using WinchCommon;
 
 namespace Winch.Logging
 {
@@ -8,7 +9,7 @@ public class LogMessage
 		public string Source { get; set; }
 
 		[JsonProperty("level")]
-		public string Level { get; set; }
+		public LogLevel Level { get; set; }
 
 		[JsonProperty("message")]
 		public string Message { get; set; }

diff --git a/Winch/Properties/Resources.Designer.cs → WinchCommon/Properties/Resources.Designer.cs b/Winch/Properties/Resources.Designer.cs → WinchCommon/Properties/Resources.Designer.cs
diff --git a/Winch/Properties/Resources.resx → WinchCommon/Properties/Resources.resx b/Winch/Properties/Resources.resx → WinchCommon/Properties/Resources.resx
diff --git a/WinchCommon/WinchCommon.csproj b/WinchCommon/WinchCommon.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+		<LangVersion>11</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>