feat: simplify listeners code

roflmuffin · Oct 14, 2023 · 82495fa · 82495fa
1 parent c99845d
commit 82495fa
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 176 deletions.
diff --git a/managed/CounterStrikeSharp.API/Core/Attributes/ListenerNameAttribute.cs b/managed/CounterStrikeSharp.API/Core/Attributes/ListenerNameAttribute.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace CounterStrikeSharp.API.Core.Attributes;
+
+[AttributeUsage(AttributeTargets.Delegate, Inherited = false)]
+public class ListenerNameAttribute : Attribute
+{
+    public string Name { get; init; }
+
+    public ListenerNameAttribute(string name)
+    {
+        Name = name;
+    }
+}
diff --git a/...ore/Attributes/ConsoleCommandAttribute.cs → ...s/Registration/ConsoleCommandAttribute.cs b/...ore/Attributes/ConsoleCommandAttribute.cs → ...s/Registration/ConsoleCommandAttribute.cs
@@ -1,7 +1,6 @@
 using System;
-using CounterStrikeSharp.API.Modules.Events;
 
-namespace CounterStrikeSharp.API.Core.Attributes;
+namespace CounterStrikeSharp.API.Core.Attributes.Registration;
 
 [AttributeUsage(AttributeTargets.Method)]
 public class ConsoleCommandAttribute : Attribute

diff --git a/...e/Attributes/GameEventHandlerAttribute.cs → ...Registration/GameEventHandlerAttribute.cs b/...e/Attributes/GameEventHandlerAttribute.cs → ...Registration/GameEventHandlerAttribute.cs
@@ -1,7 +1,6 @@
 using System;
-using CounterStrikeSharp.API.Modules.Events;
 
-namespace CounterStrikeSharp.API.Core.Attributes;
+namespace CounterStrikeSharp.API.Core.Attributes.Registration;
 
 [AttributeUsage(AttributeTargets.Method)]
 public class GameEventHandlerAttribute : Attribute

diff --git a/managed/CounterStrikeSharp.API/Core/BasePlugin.cs b/managed/CounterStrikeSharp.API/Core/BasePlugin.cs
@@ -18,10 +18,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Runtime.Loader;
 using CounterStrikeSharp.API.Core.Attributes;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Events;
 using CounterStrikeSharp.API.Modules.Listeners;
@@ -187,41 +189,38 @@ public void UnhookConVarChange(ConVar convar, ConVar.ConVarChangedCallback handl
                 CommandHandlers.Remove(handler);
             }
         }*/
-
-        private void AddListener<T>(string name, Listeners.SourceEventHandler<T> handler,
-            Action<T, ScriptContext> input = null, Action<T, ScriptContext> output = null) where T : EventArgs, new()
+        
+        // Adds global listener, e.g. OnTick, OnClientConnect
+        protected void RegisterListener<T>(T handler) where T : Delegate
         {
-            var wrappedHandler = new Action<ScriptContext>(context =>
+            var listenerName = typeof(T).GetCustomAttribute<ListenerNameAttribute>()?.Name;
+            if (string.IsNullOrEmpty(listenerName))
             {
-                var eventArgs = new T();
-
-                // Before crossing the border, gets all the correct data from the context
-                input?.Invoke(eventArgs, context);
+                throw new Exception("Listener of type T is invalid and does not have a name attribute");
+            }
+
+            var parameterTypes = typeof(T).GetMethod("Invoke").GetParameters().Select(p => p.ParameterType).ToArray();
 
-                // Invoke the actual event.
-                handler?.Invoke(eventArgs);
+            Console.WriteLine($"Registering listener for {listenerName} with {parameterTypes.Length}");
+
+            var wrappedHandler = new Action<ScriptContext>(context =>
+            {
+                var args = new object[parameterTypes.Length];
+                for (int i = 0; i < parameterTypes.Length; i++)
+                {
+                    args[i] = context.GetArgument(parameterTypes[i], i);
+                }
 
-                // After crossing the border, puts all the correct "return" data back onto the context
-                output?.Invoke(eventArgs, context);
+                handler.DynamicInvoke(args);
             });
+
+            var subscriber = new CallbackSubscriber(handler, wrappedHandler, () => { RemoveListener(listenerName, handler); });
 
-            var subscriber = new CallbackSubscriber(handler, wrappedHandler, () => { RemoveListener(name, handler); });
-
-            NativeAPI.AddListener(name, subscriber.GetInputArgument());
+            NativeAPI.AddListener(listenerName, subscriber.GetInputArgument());
             Listeners[handler] = subscriber;
         }
 
-        public void RemoveListener<T>(string name, Listeners.SourceEventHandler<T> handler)
-            where T : EventArgs, new()
-        {
-            if (!Listeners.TryGetValue(handler, out var subscriber)) return;
-
-            NativeAPI.RemoveListener(name, subscriber.GetInputArgument());
-            FunctionReference.Remove(subscriber.GetReferenceIdentifier());
-            Listeners.Remove(handler);
-        }
-
-        public void RemoveListener(string name, Delegate handler)
+        protected void RemoveListener(string name, Delegate handler)
         {
             if (!Listeners.TryGetValue(handler, out var subscriber)) return;
 
@@ -236,95 +235,7 @@ public Timer AddTimer(float interval, Action callback, TimerFlags? flags = null)
             Timers.Add(timer);
             return timer;
         }
-
-        public event Listeners.SourceEventHandler<Listeners.PlayerConnectArgs> OnClientConnect
-        {
-            add => AddListener("OnClientConnect", value,
-                (args, context) =>
-                {
-                    args.PlayerIndex = context.GetArgument<int>(0);
-                    args.Name = context.GetArgument<string>(1);
-                    args.Address = context.GetArgument<string>(2);
-                }
-            );
-            remove => RemoveListener("OnClientConnect", value);
-        }
-
-        public event Listeners.SourceEventHandler<Listeners.PlayerArgs> OnClientConnected
-        {
-            add => AddListener("OnClientConnected", value,
-                (args, context) => args.PlayerSlot = context.GetArgument<int>(0));
-            remove => RemoveListener("OnClientConnected", value);
-        }
-
-        public event Listeners.SourceEventHandler<Listeners.PlayerArgs> OnClientDisconnect
-        {
-            add => AddListener("OnClientDisconnect", value,
-                (args, context) => args.PlayerSlot = context.GetArgument<int>(0));
-            remove => RemoveListener("OnClientDisconnect", value);
-        }
-
-        public event Listeners.SourceEventHandler<Listeners.MapStartArgs> OnMapStart
-        {
-            add => AddListener("OnMapStart", value,
-                (args, context) => args.MapName = context.GetArgument<string>(0));
-            remove => RemoveListener("OnMapStart", value);
-        }
-
-        public event Listeners.SourceEventHandler<EventArgs> OnTick
-        {
-            add => AddListener("OnTick", value);
-            remove => RemoveListener("OnTick", value);
-        }
-
-        public event Listeners.SourceEventHandler<EventArgs> OnMapEnd
-        {
-            add => AddListener("OnMapEnd", value);
-            remove => RemoveListener("OnMapEnd", value);
-        }
-
-        public event Listeners.SourceEventHandler<Listeners.PlayerArgs> OnClientDisconnectPost
-        {
-            add => AddListener("OnClientDisconnectPost", value,
-                (args, context) => args.PlayerSlot = context.GetArgument<int>(0));
-            remove => RemoveListener("OnClientDisconnectPost", value);
-        }
-
-        public event Listeners.SourceEventHandler<Listeners.PlayerArgs> OnClientPutInServer
-        {
-            add => AddListener("OnClientPutInServer", value,
-                (args, context) => args.PlayerSlot = context.GetArgument<int>(0));
-            remove => RemoveListener("OnClientPutInServer", value);
-        }
-
-        public event Listeners.SourceEventHandler<Listeners.EntityArgs> OnEntityCreated
-        {
-            add => AddListener("OnEntityCreated", value,
-                (args, context) =>
-                {
-                    args.EntityIndex = context.GetArgument<int>(0);
-                    args.Classname = context.GetArgument<string>(1);
-                });
-            remove => RemoveListener("OnEntityCreated", value);
-        }
-
-        public event Listeners.SourceEventHandler<Listeners.EntityArgs> OnEntitySpawned
-        {
-            add => AddListener("OnEntitySpawned", value,
-                (args, context) =>
-                {
-                    args.EntityIndex = context.GetArgument<int>(0);
-                    args.Classname = context.GetArgument<string>(1);
-                });
-            remove => RemoveListener("OnEntitySpawned", value);
-        }
-
-        public event Listeners.SourceEventHandler<Listeners.EntityArgs> OnEntityDeleted
-        {
-            add => AddListener("OnEntityDeleted", value,
-                (args, context) => { args.EntityIndex = context.GetArgument<int>(0); });
-            remove => RemoveListener("OnEntityDeleted", value);
-        }
+
 
         public void RegisterAllAttributes(object instance)
         {

diff --git a/managed/CounterStrikeSharp.API/Core/Listeners.g.cs b/managed/CounterStrikeSharp.API/Core/Listeners.g.cs
@@ -0,0 +1,33 @@
+
+using System;
+using CounterStrikeSharp.API.Core.Attributes;
+
+namespace CounterStrikeSharp.API.Core
+{
+    public partial class Listeners {
+
+        [ListenerName("OnTick")]
+        public delegate void OnTick();
+
+        [ListenerName("OnMapStart")]
+        public delegate void OnMapStart(string mapName);
+
+        [ListenerName("OnMapEnd")]
+        public delegate void OnMapEnd();
+
+        [ListenerName("OnClientConnect")]
+        public delegate void OnClientConnect(int index, string name, string ipAddress);
+
+        [ListenerName("OnClientConnected")]
+        public delegate void OnClientConnected(int index);
+
+        [ListenerName("OnClientPutInServer")]
+        public delegate void OnClientPutInServer(int index);
+
+        [ListenerName("OnClientDisconnect")]
+        public delegate void OnClientDisconnect(int index);
+
+        [ListenerName("OnClientDisconnectPost")]
+        public delegate void OnClientDisconnectPost(int index);
+    }
+}
diff --git a/managed/CounterStrikeSharp.API/Modules/Listeners/Listeners.cs b/managed/CounterStrikeSharp.API/Modules/Listeners/Listeners.cs
diff --git a/managed/TestPlugin/TestPlugin.cs b/managed/TestPlugin/TestPlugin.cs
@@ -19,6 +19,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Events;
 using CounterStrikeSharp.API.Modules.Memory;
@@ -43,10 +44,16 @@ public override void Load(bool hotReload)
             {
                 Log($"{@event.Userid}, {@event.X},{@event.Y},{@event.Z}");
             });
-
+            
             // Hook global listeners defined by CounterStrikeSharp
-            OnMapStart += args => { Log($"Map {args.MapName} has started!"); };
-            OnClientConnect += args => { Log($"Client {args.Name} from {args.Address} has connected!"); };
+            RegisterListener<Listeners.OnMapStart>(mapName =>
+            {
+                Log($"Map {mapName} has started!");
+            });
+            RegisterListener<Listeners.OnClientConnect>((index, name, ip) =>
+            {
+                Log($"Client {name} from {ip} has connected!");
+            });
 
             // You can use `ModuleDirectory` to get the directory of the plugin (for storing config files, saving database files etc.)
             File.WriteAllText(Path.Join(ModuleDirectory, "example.txt"),

diff --git a/src/scripting/listeners/general.yaml b/src/scripting/listeners/general.yaml
@@ -0,0 +1,3 @@
+OnTick:
+OnMapStart: mapName:string
+OnMapEnd:
diff --git a/src/scripting/listeners/players.yaml b/src/scripting/listeners/players.yaml
@@ -0,0 +1,5 @@
+OnClientConnect: index:int, name:string, ipAddress:string
+OnClientConnected: index:int
+OnClientPutInServer: index:int
+OnClientDisconnect: index:int
+OnClientDisconnectPost: index:int
diff --git a/tooling/CodeGen.Natives/Program.cs b/tooling/CodeGen.Natives/Program.cs
@@ -24,6 +24,7 @@ static void Main(string[] args)
         {
             Generators.GenerateNatives();
             Generators.GenerateGameEvents();
+            Generators.GenerateListeners();
         }
     }
 }