Improve async module

Author: FabianTerhorst

api/AltV.Net.Async/AsyncModule.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.Loader;
 using System.Threading.Tasks;
 using AltV.Net.Async.Events;
 using AltV.Net.Elements.Entities;
@@ -67,13 +68,13 @@ private readonly Dictionary<string, HashSet<ServerEventAsyncDelegate>> serverEve
             =
             new Dictionary<string, HashSet<ServerEventAsyncDelegate>>();
 
-        public AsyncModule(IServer server, CSharpNativeResource cSharpNativeResource,
+        public AsyncModule(IServer server, AssemblyLoadContext assemblyLoadContext, CSharpNativeResource cSharpNativeResource,
             IBaseBaseObjectPool baseBaseObjectPool, IBaseEntityPool baseEntityPool, IEntityPool<IPlayer> playerPool,
             IEntityPool<IVehicle> vehiclePool,
             IBaseObjectPool<IBlip> blipPool,
             IBaseObjectPool<ICheckpoint> checkpointPool,
             IBaseObjectPool<IVoiceChannel> voiceChannelPool,
-            IBaseObjectPool<IColShape> colShapePool) : base(server, cSharpNativeResource, baseBaseObjectPool,
+            IBaseObjectPool<IColShape> colShapePool) : base(server, assemblyLoadContext, cSharpNativeResource, baseBaseObjectPool,
             baseEntityPool, playerPool, vehiclePool, blipPool,
             checkpointPool, voiceChannelPool, colShapePool)
         {
@@ -174,7 +175,9 @@ public override void OnVehicleRemoveEvent(IVehicle vehicle)
                     @delegate(vehicle)));
         }
 
-        //TODO: we could write mvalues to own onion struct in cpp to better share it but we would need to execute at least getorcreate entity when it contains a entity type in main thread
+        //TODO: we could write mvalue's to own onion struct in cpp to better share it but we would need to execute at least getorcreate entity when it contains a entity type in main thread
+        //TODO: or lock entities dictionary so entity can't get removed until thread got it from dictionary
+        //TODO: lock dictionary for async maybe as well for use cases like this
         public override void OnClientEventEvent(IPlayer player, string name, ref MValueArray args, MValue[] mValues,
             object[] objects)
         {

api/AltV.Net.Async/AsyncResource.cs

@@ -1,3 +1,4 @@
+using System.Runtime.Loader;
 using AltV.Net.Async.Elements.Pools;
 using AltV.Net.Elements.Entities;
 
@@ -42,22 +43,25 @@ public override IBaseObjectPool<IBlip> GetBlipPool(IBaseObjectFactory<IBlip> bli
             return new AsyncBlipPool(blipFactory);
         }
 
-        public override IBaseObjectPool<ICheckpoint> GetCheckpointPool(IBaseObjectFactory<ICheckpoint> checkpointFactory)
+        public override IBaseObjectPool<ICheckpoint> GetCheckpointPool(
+            IBaseObjectFactory<ICheckpoint> checkpointFactory)
         {
             return new AsyncCheckpointPool(checkpointFactory);
         }
 
-        public override IBaseObjectPool<IVoiceChannel> GetVoiceChannelPool(IBaseObjectFactory<IVoiceChannel> voiceChannelFactory)
+        public override IBaseObjectPool<IVoiceChannel> GetVoiceChannelPool(
+            IBaseObjectFactory<IVoiceChannel> voiceChannelFactory)
         {
             return new AsyncVoiceChannelPool(voiceChannelFactory);
         }
-        
+
         public override IBaseObjectPool<IColShape> GetColShapePool(IBaseObjectFactory<IColShape> colShapeFactory)
         {
             return new AsyncColShapePool(colShapeFactory);
         }
 
-        public override Module GetModule(IServer server, CSharpNativeResource cSharpNativeResource,
+        public override Module GetModule(IServer server, AssemblyLoadContext assemblyLoadContext,
+            CSharpNativeResource cSharpNativeResource,
             IBaseBaseObjectPool baseBaseObjectPool,
             IBaseEntityPool baseEntityPool,
             IEntityPool<IPlayer> playerPool,
@@ -67,7 +71,8 @@ public override Module GetModule(IServer server, CSharpNativeResource cSharpNati
             IBaseObjectPool<IVoiceChannel> voiceChannelPool,
             IBaseObjectPool<IColShape> colShapePool)
         {
-            return new AsyncModule(server, cSharpNativeResource, baseBaseObjectPool, baseEntityPool, playerPool,
+            return new AsyncModule(server, assemblyLoadContext, cSharpNativeResource, baseBaseObjectPool,
+                baseEntityPool, playerPool,
                 vehiclePool, blipPool, checkpointPool, voiceChannelPool, colShapePool);
         }
     }