Merging from develop

Carbon.Core/.msbuild/Protocol.props

@@ -7,6 +7,6 @@
 			carbon that forces the users to update all the compontents at the
 			same time, like updating core and hooks in one shot.
 		-->
-		<CarbonProtocol>2024.02.01.0</CarbonProtocol>
+		<CarbonProtocol>2024.03.07.0</CarbonProtocol>
 	</PropertyGroup>
 </Project>

Carbon.Core/.msbuild/References.props

@@ -13,6 +13,8 @@
 		<Reference Include="System.Xml" />
 		<Reference Include="System" />
 
+		<PackageReference Include="Lib.Harmony" Version="2.3.1.1" />
+
 		<!-- Carbon API -->
 		<ProjectReference Include="$(SolutionDir)\Carbon.Components\Carbon.SDK\Carbon.SDK.csproj" Private="false" Condition="!$(Product.Contains('Carbon.SDK')) and !$(Product.Contains('Carbon.Compiler'))" />
 

Carbon.Core/Carbon/Carbon.csproj

@@ -17,7 +17,10 @@
 	<Import Project="$(SolutionDir)\.msbuild\AssemblyName.props" />
 
 	<ItemGroup>
-		<PackageReference Include="Lib.Harmony" Version="2.2.2" />
+		<PackageReference Include="Mono.Cecil" Version="0.11.5" />
+		<PackageReference Include="MonoMod.Backports" Version="1.1.0" />
+		<PackageReference Include="MonoMod.Core" Version="1.1.0" />
+		<PackageReference Include="MonoMod.Utils" Version="25.0.4" />
 		<ProjectReference Include="$(SolutionDir)\Carbon.Components\Carbon.Common\Carbon.Common.csproj" Private="false" />
 		<ProjectReference Include="$(SolutionDir)\Carbon.Components\Carbon.Common.Client\Carbon.Common.Client.csproj" />
 	</ItemGroup>

Carbon.Core/Carbon/src/Community.cs

@@ -138,6 +138,8 @@ public override void Initialize()
 
 		if (IsInitialized) return;
 
+		Compat.Init();
+
 		HookCaller.Caller = new HookCallerInternal();
 
 		LoadConfig();
@@ -219,7 +221,7 @@ public override void Uninitialize()
 #if WIN
 			try
 			{
-				if (IsConfigReady && Config.ShowConsoleInfo && ServerConsole.Instance != null && ServerConsole.Instance.input != null)
+				if (IsConfigReady && Config.Misc.ShowConsoleInfo && ServerConsole.Instance != null && ServerConsole.Instance.input != null)
 				{
 					ServerConsole.Instance.input.statusText = new string[3];
 				}

Carbon.Core/Carbon/src/Hooks/HookCallerInternal.cs

@@ -184,16 +184,7 @@ public override object CallHook<T>(T hookable, uint hookId, BindingFlags flags,
 
 				Carbon.Logger.Warn($" {hookable.Name} hook '{readableHook}' took longer than 100ms [{afterHookTime:0}ms]{(hookable.HasGCCollected ? " [GC]" : string.Empty)}");
 
-				if (Analytic.Enabled)
-				{
-					Analytic.Include("name",
-						$"{readableHook} ({basePlugin.Name} v{basePlugin.Version} by {basePlugin.Author})");
-					Analytic.Include("time", $"{afterHookTime.RoundUpToNearestCount(50)}ms");
-					Analytic.Include("memory", $"{ByteEx.Format(totalMemory, shortName: true).ToLower()}");
-					Analytic.Include("fires", $"{cachedHook.TimesFired}");
-					Analytic.Include("hasgc", hookable.HasGCCollected);
-					Analytic.Send("plugin_time_warn");
-				}
+				Analytics.plugin_time_warn(readableHook, basePlugin, afterHookTime, totalMemory, cachedHook, hookable);
 			}
 
 			HookCaller.ConflictCheck(conflicts, ref result, hookId);
@@ -236,24 +227,24 @@ public override object CallHook<T>(T hookable, uint hookId, BindingFlags flags,
 			HookCaller.ConflictCheck(conflicts, ref result, hookId);
 			FrameDispose(false, args, ref conflicts);
 
-			static object DoCall(T hookable, uint hookId, CachedHook hook, object[] args, ref bool hasRescaledBuffer)
+			static object DoCall(T hookable, uint hookId, CachedHook cachedHook, object[] args, ref bool hasRescaledBuffer)
 			{
 				if (args != null)
 				{
-					var actualLength = hook.Parameters.Length;
+					var actualLength = cachedHook.Parameters.Length;
 
 					if (actualLength != args.Length)
 					{
-						args = HookCaller.Caller.RescaleBuffer(args, actualLength, hook);
+						args = HookCaller.Caller.RescaleBuffer(args, actualLength, cachedHook);
 						hasRescaledBuffer = true;
 					}
 					else
 					{
-						HookCaller.Caller.ProcessDefaults(args, hook);
+						HookCaller.Caller.ProcessDefaults(args, cachedHook);
 					}
 				}
 
-				if (args == null || SequenceEqual(hook.Parameters, args))
+				if (args == null || SequenceEqual(cachedHook.Parameters, args))
 				{
 #if DEBUG
 					Profiler.StartHookCall(hookable, hookId);
@@ -265,7 +256,7 @@ static object DoCall(T hookable, uint hookId, CachedHook hook, object[] args, re
 
 					try
 					{
-						result2 = hook.Method.Invoke(hookable, args);
+						result2 = cachedHook.Method.Invoke(hookable, args);
 					}
 					catch (Exception ex)
 					{
@@ -282,11 +273,11 @@ static object DoCall(T hookable, uint hookId, CachedHook hook, object[] args, re
 					var afterMemory = hookable.TotalMemoryUsed;
 					var totalMemory = afterMemory - beforeMemory;
 
-					if (hook != null)
+					if (cachedHook != null)
 					{
-						hook.HookTime += afterHookTime;
-						hook.MemoryUsage += totalMemory;
-						hook.Tick();
+						cachedHook.HookTime += afterHookTime;
+						cachedHook.MemoryUsage += totalMemory;
+						cachedHook.Tick();
 					}
 
 					if (afterHookTime > 100)
@@ -296,16 +287,7 @@ static object DoCall(T hookable, uint hookId, CachedHook hook, object[] args, re
 							var readableHook = HookStringPool.GetOrAdd(hookId);
 							Carbon.Logger.Warn($" {hookable.Name} hook '{readableHook}' took longer than 100ms [{afterHookTime:0}ms]{(hookable.HasGCCollected ? " [GC]" : string.Empty)}");
 
-							if (Analytic.Enabled)
-							{
-								Analytic.Include("name",
-									$"{readableHook} ({basePlugin.Name} v{basePlugin.Version} by {basePlugin.Author})");
-								Analytic.Include("time", $"{afterHookTime.RoundUpToNearestCount(50)}ms");
-								Analytic.Include("memory", $"{ByteEx.Format(totalMemory, shortName: true).ToLower()}");
-								Analytic.Include("fires", $"{hook.TimesFired}");
-								Analytic.Include("hasgc", hookable.HasGCCollected);
-								Analytic.Send("plugin_time_warn");
-							}
+							Analytics.plugin_time_warn(readableHook, basePlugin, afterHookTime, totalMemory, cachedHook, hookable);
 						}
 					}
 

Carbon.Core/Carbon/src/Hooks/Structs.cs

@@ -31,6 +31,6 @@ public Subscription(string id, string sub)
 
 public struct TaskStatus
 {
-	public int Static, Patch, Dynamic;
-	public int Total { get => (Static + Patch + Dynamic); }
+	public int Static, Patch, Dynamic, Metadata;
+	public int Total { get => (Static + Patch + Dynamic + Metadata); }
 }

Carbon.Core/Carbon/src/Jobs/ScriptCompilationThread.cs

@@ -323,7 +323,7 @@ public override void ThreadFunction()
 
 			try
 			{
-				conditionals.AddRange(Community.Runtime.Config.ConditionalCompilationSymbols);
+				conditionals.AddRange(Community.Runtime.Config.Debugging.ConditionalCompilationSymbols);
 			}
 			catch (Exception ex)
 			{
@@ -350,9 +350,9 @@ public override void ThreadFunction()
 			string pdb_filename =
 #if DEBUG
 				Debugger.IsAttached
-					? (string.IsNullOrEmpty(Community.Runtime.Config.ScriptDebuggingOrigin)
+					? (string.IsNullOrEmpty(Community.Runtime.Config.Debugging.ScriptDebuggingOrigin)
 						? InitialSource.ContextFilePath
-						: Path.Combine(Community.Runtime.Config.ScriptDebuggingOrigin, InitialSource.ContextFileName))
+						: Path.Combine(Community.Runtime.Config.Debugging.ScriptDebuggingOrigin, InitialSource.ContextFileName))
 					: InitialSource.ContextFileName;
 #else
 				InitialSource.ContextFileName;
@@ -508,7 +508,7 @@ public override void ThreadFunction()
 				{
 					var hash = HookStringPool.GetOrAdd(method.Name);
 
-					if (Community.Runtime.HookManager.IsHookLoaded(method.Name))
+					if (Community.Runtime.HookManager.IsHook(method.Name))
 					{
 						if (!hooks.Contains(hash)) hooks.Add(hash);
 					}
@@ -537,12 +537,7 @@ public override void ThreadFunction()
 		}
 		catch (Exception ex)
 		{
-			if (Analytic.Enabled)
-			{
-				Analytic.Include("file", $"{InitialSource.ContextFilePath}");
-				Analytic.Include("stacktrace", $"({ex.Message}) {ex.StackTrace}");
-				Analytic.Send("plugin_native_compile_fail");
-			}
+			Analytics.plugin_native_compile_fail(InitialSource, ex);
 
 			System.Console.WriteLine($"Threading compilation failed for '{InitialSource.ContextFilePath}': {ex}");
 		}

Carbon.Core/Carbon/src/Loaders/ScriptLoader.cs

@@ -72,8 +72,8 @@ public static void LoadAll(IEnumerable<string> except = null)
 	{
 		var config = Community.Runtime.Config;
 		var extensionPlugins = OsEx.Folder.GetFilesWithExtension(Defines.GetExtensionsFolder(), "cs");
-		var plugins = OsEx.Folder.GetFilesWithExtension(Defines.GetScriptFolder(), "cs", option: config.ScriptWatcherOption);
-		var zipPlugins = OsEx.Folder.GetFilesWithExtension(Defines.GetScriptFolder(), "cszip", option: config.ScriptWatcherOption);
+		var plugins = OsEx.Folder.GetFilesWithExtension(Defines.GetScriptFolder(), "cs", option: config.Watchers.ScriptWatcherOption);
+		var zipPlugins = OsEx.Folder.GetFilesWithExtension(Defines.GetScriptFolder(), "cszip", option: config.Watchers.ScriptWatcherOption);
 
 		ExecuteProcess(Community.Runtime.ScriptProcessor, false, extensionPlugins, plugins);
 		ExecuteProcess(Community.Runtime.ZipScriptProcessor, false, zipPlugins);
@@ -410,7 +410,7 @@ public IEnumerator Compile()
 
 				if (type.GetCustomAttribute(typeof(InfoAttribute), true) is not InfoAttribute info) continue;
 
-				if (!IsExtension && firstPlugin && Community.Runtime.Config.FileNameCheck && !BypassFileNameChecks)
+				if (!IsExtension && firstPlugin && Community.Runtime.Config.Watchers.FileNameCheck && !BypassFileNameChecks)
 				{
 					var name = Path.GetFileNameWithoutExtension(InitialSource.FilePath).ToLower().Replace(" ", "").Replace(".", "").Replace("-", "");
 

Carbon.Core/Carbon/src/Managers/PatchManager.cs

@@ -29,6 +29,7 @@ public sealed class PatchManager : CarbonBehaviour, IPatchManager, IDisposable
 	internal List<HookEx> _patches { get; set; }
 	internal List<HookEx> _staticHooks { get; set; }
 	internal List<HookEx> _dynamicHooks { get; set; }
+	internal List<HookEx> _metadataHooks { get; set; }
 
 	// TODO --------------------------------------------------------------------
 	// Allows patch uninstallation on the correct order and should be replaced
@@ -72,6 +73,13 @@ public void Enqueue(string identifier)
 		"Carbon.Hooks.Oxide.dll",
 	};
 
+	private static readonly string[] WarnExclusions =
+	{
+		"IOnServerCommand",
+		"IOnRunCommandLine",
+		"SingleCharCmdPrefix [patch]"
+	};
+
 	private void Awake()
 	{
 		Logger.Log($"Initializing {this}..");
@@ -81,6 +89,7 @@ private void Awake()
 		_installed = new List<HookEx>();
 		_patches = new List<HookEx>();
 		_staticHooks = new List<HookEx>();
+		_metadataHooks = new List<HookEx>();
 		_subscribers = new List<Subscription>();
 		_workQueue = new Queue<string>();
 
@@ -340,9 +349,12 @@ private void Update()
 #if !(STAGING || AUX01 || AUX02)
 				if (!hasValidChecksum)
 				{
-					Logger.Warn($"Checksum validation failed for '{hook.TargetType}.{hook.TargetMethod}' [{hook.HookFullName}]");
-					Logger.Debug($"live:{checksum} | expected:{hook.Checksum}");
-					hook.SetStatus(HookState.Warning, "Invalid checksum");
+					if (!WarnExclusions.Contains(hook.HookFullName))
+					{
+						Logger.Warn($"Checksum validation failed for '{hook.TargetType}.{hook.TargetMethod}' [{hook.HookFullName}]");
+						Logger.Debug($"live:{checksum} | expected:{hook.Checksum}");
+						hook.SetStatus(HookState.Warning, "Invalid checksum");
+					}
 				}
 #endif
 			}
@@ -433,6 +445,10 @@ private TaskStatus LoadHooks(IEnumerable<TypeInfo> types)
 
 				if (hook.Options.HasFlag(HookFlags.MetadataOnly))
 				{
+					hook.SetStatus(HookState.Inactive);
+					retvar.Metadata++;
+					_metadataHooks.Add(hook);
+					HookStringPool.GetOrAdd(hook.HookName);
 					continue;
 				}
 
@@ -472,11 +488,6 @@ private TaskStatus LoadHooks(IEnumerable<TypeInfo> types)
 			}
 		}
 
-		foreach(var internalHook in HookCaller.InternalHooks)
-		{
-			HookStringPool.GetOrAdd(internalHook);
-		}
-
 		sw.Stop();
 		return retvar;
 	}
@@ -494,6 +505,9 @@ private IEnumerable<HookEx> GetHookDependantTree(HookEx hook)
 	private IEnumerable<HookEx> LoadedHooks
 	{ get => _patches.Concat(_dynamicHooks).Concat(_staticHooks).Where(x => x.IsLoaded); }
 
+	private IEnumerable<HookEx> Hooks
+	{ get => _patches.Concat(_dynamicHooks).Concat(_staticHooks).Concat(_metadataHooks); }
+
 	private IEnumerable<HookEx> GetHookByName(string name)
 		=> LoadedHooks.Where(x => x.HookName == name) ?? null;
 
@@ -503,10 +517,24 @@ private IEnumerable<HookEx> GetHookByFullName(string name)
 	private HookEx GetHookById(string identifier)
 		=> LoadedHooks.FirstOrDefault(x => x.Identifier == identifier) ?? null;
 
+	private IEnumerable<HookEx> GetHookByNameAll(string name)
+		=> Hooks.Where(x => x.HookName == name) ?? null;
+
+	private IEnumerable<HookEx> GetHookByFullNameAll(string name)
+		=> Hooks.Where(x => x.HookFullName == name) ?? null;
+
+	private HookEx GetHookByIdAll(string identifier)
+		=> Hooks.FirstOrDefault(x => x.Identifier == identifier) ?? null;
 
 	internal bool IsHookLoaded(HookEx hook)
 		=> LoadedHooks.Any(x => x.HookFullName == hook.HookFullName && x.TargetType == hook.TargetType && x.TargetMethod == hook.TargetMethod && (x.TargetMethodArgs?.SequenceEqual(hook.TargetMethodArgs) ?? true));
 
+	public bool IsHook(string hookName)
+	{
+		var hooks = GetHookByNameAll(hookName);
+		return hooks.Any();
+	}
+
 	public bool IsHookLoaded(string hookName)
 	{
 		var hooks = GetHookByName(hookName);

Carbon.Core/Carbon/src/Processors/ScriptProcessor.cs

@@ -18,7 +18,7 @@ namespace Carbon.Managers;
 public class ScriptProcessor : BaseProcessor, IScriptProcessor
 {
 	public override string Name => "Script Processor";
-	public override bool EnableWatcher => !Community.IsConfigReady || Community.Runtime.Config.ScriptWatchers;
+	public override bool EnableWatcher => !Community.IsConfigReady || Community.Runtime.Config.Watchers.ScriptWatchers;
 	public override string Folder => Defines.GetScriptFolder();
 	public override string Extension => ".cs";
 	public override Type IndexedType => typeof(Script);
@@ -34,7 +34,7 @@ public override void Start()
 
 		base.Start();
 
-		IncludeSubdirectories = Community.Runtime.Config.ScriptWatcherOption == SearchOption.AllDirectories;
+		IncludeSubdirectories = Community.Runtime.Config.Watchers.ScriptWatcherOption == SearchOption.AllDirectories;
 	}
 
 	public bool AllPendingScriptsComplete()

Carbon.Core/Carbon/src/Processors/ZipDevScriptProcessor.cs

@@ -22,7 +22,7 @@ namespace Carbon.Managers;
 public class ZipDevScriptProcessor : BaseProcessor, IZipDevScriptProcessor
 {
 	public override string Name => "ZipDebugScript Processor";
-	public override bool EnableWatcher => !Community.IsConfigReady || Community.Runtime.Config.ScriptWatchers;
+	public override bool EnableWatcher => !Community.IsConfigReady || Community.Runtime.Config.Watchers.ZipScriptWatchers;
 	public override string Folder => Defines.GetZipDevFolder();
 	public override string Extension => ".cs";
 	public override Type IndexedType => typeof(ZipDevScript);

Carbon.Core/Carbon/src/Processors/ZipScriptProcessor.cs

@@ -21,7 +21,7 @@ namespace Carbon.Managers;
 public class ZipScriptProcessor : BaseProcessor, IZipScriptProcessor
 {
 	public override string Name => "ZipScript Processor";
-	public override bool EnableWatcher => !Community.IsConfigReady || Community.Runtime.Config.ScriptWatchers;
+	public override bool EnableWatcher => !Community.IsConfigReady || Community.Runtime.Config.Watchers.ZipScriptWatchers;
 	public override string Folder => Defines.GetScriptFolder();
 	public override string Extension => ".cszip";
 	public override Type IndexedType => typeof(ZipScript);
@@ -36,7 +36,7 @@ public override void Start()
 
 		base.Start();
 
-		IncludeSubdirectories = Community.Runtime.Config.ScriptWatcherOption == SearchOption.AllDirectories;
+		IncludeSubdirectories = Community.Runtime.Config.Watchers.ScriptWatcherOption == SearchOption.AllDirectories;
 	}
 
 	public bool AllPendingScriptsComplete()

Tools/Build/win/build.bat

@@ -76,5 +76,5 @@ echo "%BUILD_TARGET%" | findstr /C:"Unix" >NUL && (
 
 if "%2" NEQ "--no-archive" (
 	echo ** Create the compressed archive 'Carbon.%TOS%.%TAG%.zip'
-	powershell -Command "Compress-Archive -Update -Path '%BUILD_ROOT%\Release\.tmp\%BUILD_TARGET%\*' -DestinationPath '%BUILD_ROOT%\Release\Carbon.%TOS%.%TAG%.zip'"
+	pwsh -Command "Compress-Archive -Update -Path '%BUILD_ROOT%\Release\.tmp\%BUILD_TARGET%\*' -DestinationPath '%BUILD_ROOT%\Release\Carbon.%TOS%.%TAG%.zip'"
 )