Finished base of the new messaging system

Author: TwoTenPvP

MLAPI-Editor/NetworkingManagerEditor.cs

@@ -13,9 +13,6 @@ public class NetworkingManagerEditor : Editor
     private SerializedProperty LogLevelProperty;
     private SerializedProperty NetworkConfigProperty;
 
-
-
-
     private ReorderableList networkPrefabsList;
     private ReorderableList channelsList;
     private ReorderableList messageTypesList;
@@ -84,6 +81,7 @@ private void OnEnable()
             EditorGUI.LabelField(rect, "NetworkedPrefabs (Auto Sorted)");
         };
 
+        /*
         messageTypesList = new ReorderableList(serializedObject, serializedObject.FindProperty("NetworkConfig").FindPropertyRelative("MessageTypes"), true, true, true, true);
         messageTypesList.drawElementCallback = (Rect rect, int index, bool isActive, bool isFocused) =>
         {
@@ -110,6 +108,7 @@ private void OnEnable()
         messageTypesList.drawHeaderCallback = (Rect rect) => {
             EditorGUI.LabelField(rect, "MessageTypes (Auto Sorted)");
         };
+        */
 
 
         channelsList = new ReorderableList(serializedObject, serializedObject.FindProperty("NetworkConfig").FindPropertyRelative("Channels"), true, true, true, true);

MLAPI/Data/AttributeMessageMode.cs

@@ -1,4 +1,9 @@
-namespace MLAPI.Data
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices.ComTypes;
+using MLAPI.NetworkingManagerComponents.Binary;
+
+namespace MLAPI.Data
 {
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
     public enum AttributeMessageMode
@@ -7,5 +12,52 @@ public enum AttributeMessageMode
         WovenFourByte,
         WovenEightByte
     }
+    
+    public delegate void RpcDelegate(uint clientId, BitReader reader);
+
+    public class ReflectionMehtod
+    {
+        public MethodInfo method;
+        public Type[] parameterTypes;
+        public object[] parameterRefs;
+        
+        public ReflectionMehtod(MethodInfo methodInfo)
+        {
+            method = methodInfo;
+            ParameterInfo[] parameters = methodInfo.GetParameters();
+            parameterTypes = new Type[parameters.Length];
+            parameterRefs = new object[parameters.Length];
+            
+            for (int i = 0; i < parameters.Length; i++)
+            {
+                parameterTypes[i] = parameters[i].ParameterType;
+            }
+        }
+
+        public void Invoke(object instance, BitReader reader)
+        {
+            for (int i = 0; i < parameterTypes.Length; i++)
+            {
+                //TODO: BitReader ReadType
+                parameterRefs[i] = reader.ReadObject(parameterTypes[i]);
+            }
+            
+            method.Invoke(instance, parameterRefs);
+        }
+    }
+
+    public class ServerRPC : Attribute
+    {
+        public bool RequireOwnership = true;
+        internal ReflectionMehtod reflectionMethod;
+        internal RpcDelegate rpcDelegate;
+    }
+    
+    public class ClientRPC : Attribute
+    {
+        internal ReflectionMehtod reflectionMethod;
+        internal RpcDelegate rpcDelegate;
+    }
+    
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
 }

MLAPI/Data/MLAPIConstants.cs

@@ -0,0 +1,23 @@
+namespace MLAPI.Data
+{
+    public static class MLAPIConstants
+    {
+        public const string MLAPI_PROTOCOL_VERSION = "2.0.0";
+        
+        public const ushort MLAPI_CONNECTION_REQUEST = 0;
+        public const ushort MLAPI_CONNECTION_APPROVED = 1;
+        public const ushort MLAPI_ADD_OBJECT = 2;
+        public const ushort MLAPI_CLIENT_DISCONNECT = 3;
+        public const ushort MLAPI_DESTROY_OBJECT = 4;
+        public const ushort MLAPI_SWITCH_SCENE = 5;
+        public const ushort MLAPI_SPAWN_POOL_OBJECT = 6;
+        public const ushort MLAPI_DESTROY_POOL_OBJECT = 7;
+        public const ushort MLAPI_CHANGE_OWNER = 8;
+        public const ushort MLAPI_ADD_OBJECTS = 9;
+        public const ushort MLAPI_TIME_SYNC = 10;
+        public const ushort MLAPI_NETWORKED_VAR_DELTA = 11;
+        public const ushort MLAPI_NETWORKED_VAR_UPDATE = 12;
+        public const ushort MLAPI_SERVER_RPC = 13;
+        public const ushort MLAPI_CLIENT_RPC = 14;
+    }
+}

MLAPI/Data/NetworkConfig.cs

@@ -45,14 +45,6 @@ public class NetworkConfig
         [HideInInspector]
         public List<Channel> Channels = new List<Channel>();
         /// <summary>
-        /// Registered MessageTypes
-        /// </summary>
-        [HideInInspector]
-        public List<MessageType> MessageTypes = new List<MessageType>();
-        internal HashSet<ushort> PassthroughMessageHashSet = new HashSet<ushort>();
-        internal HashSet<string> EncryptedChannelsHashSet = new HashSet<string>();
-        internal List<string> EncryptedChannels = new List<string>();
-        /// <summary>
         /// A list of SceneNames that can be used during networked games.
         /// </summary>
         [HideInInspector]
@@ -73,7 +65,7 @@ public class NetworkConfig
         /// <summary>
         /// The size of the receive message buffer. This is the max message size.
         /// </summary>
-        public int MessageBufferSize = 65535;
+        public int MessageBufferSize = 1024;
         /// <summary>
         /// Amount of times per second the receive queue is emptied and all messages inside are processed.
         /// </summary>
@@ -142,10 +134,6 @@ public class NetworkConfig
         [TextArea]
         public string RSAPublicKey = "<RSAKeyValue><Modulus>vBEvOQki/EftWOgwh4G8/nFRvcDJLylc8P7Dhz5m/hpkkNtAMzizNKYUrGbs7sYWlEuMYBOWrzkIDGOMoOsYc9uCi+8EcmNoHDlIhK5yNfZUexYBF551VbvZ625LSBR7kmBxkyo4IPuA09fYCHeUFm3prt4h6aTD0Hjc7ZsJHUU=</Modulus><Exponent>EQ==</Exponent></RSAKeyValue>"; //CHANGE THESE FOR PRODUCTION!
         /// <summary>
-        /// Wheter or not to allow any type of passthrough messages
-        /// </summary>
-        public bool AllowPassthroughMessages = true;
-        /// <summary>
         /// Wheter or not to enable scene switching
         /// </summary>
         public bool EnableSceneSwitching = true;
@@ -156,11 +144,10 @@ public class NetworkConfig
         /// <summary>
         /// Decides how many bytes to use for Attribute messaging. Leave this to 2 bytes unless you are facing hash collisions
         /// </summary>
-        public AttributeMessageMode AttributeMessageMode = AttributeMessageMode.Disabled;
+        public AttributeMessageMode AttributeMessageMode = AttributeMessageMode.WovenTwoByte;
 
         private void Sort()
         {
-            MessageTypes = MessageTypes.OrderBy(x => x.Name).ToList();
             Channels = Channels.OrderBy(x => x.Name).ToList();
             NetworkedPrefabs = NetworkedPrefabs.OrderBy(x => x.name).ToList();
             RegisteredScenes.Sort();
@@ -186,13 +173,6 @@ public string ToBase64()
                     writer.WriteBits((byte)config.Channels[i].Type, 5);
                 }
 
-                writer.WriteUShort((ushort)config.MessageTypes.Count);
-                for (int i = 0; i < config.MessageTypes.Count; i++)
-                {
-                    writer.WriteString(config.MessageTypes[i].Name);
-                    writer.WriteBool(config.MessageTypes[i].Passthrough);
-                }
-
                 writer.WriteUShort((ushort)config.RegisteredScenes.Count);
                 for (int i = 0; i < config.RegisteredScenes.Count; i++)
                 {
@@ -220,7 +200,6 @@ public string ToBase64()
                 writer.WriteBool(config.HandleObjectSpawning);
                 writer.WriteBool(config.EnableEncryption);
                 writer.WriteBool(config.SignKeyExchange);
-                writer.WriteBool(config.AllowPassthroughMessages);
                 writer.WriteBool(config.EnableSceneSwitching);
                 writer.WriteBool(config.EnableTimeResync);
                 writer.WriteBits((byte)config.AttributeMessageMode, 3);
@@ -256,18 +235,6 @@ public void FromBase64(string base64, bool createDummyObject = false)
                     config.Channels.Add(channel);
                 }
 
-                ushort messageTypeCount = reader.ReadUShort();
-                config.MessageTypes.Clear();
-                for (int i = 0; i < messageTypeCount; i++)
-                {
-                    MessageType messageType = new MessageType()
-                    {
-                        Name = reader.ReadString(),
-                        Passthrough = reader.ReadBool()
-                    };
-                    config.MessageTypes.Add(messageType);
-                }
-
                 ushort sceneCount = reader.ReadUShort();
                 config.RegisteredScenes.Clear();
                 for (int i = 0; i < sceneCount; i++)
@@ -310,7 +277,6 @@ public void FromBase64(string base64, bool createDummyObject = false)
                 config.HandleObjectSpawning = reader.ReadBool();
                 config.EnableEncryption = reader.ReadBool();
                 config.SignKeyExchange = reader.ReadBool();
-                config.AllowPassthroughMessages = reader.ReadBool();
                 config.EnableSceneSwitching = reader.ReadBool();
                 config.EnableTimeResync = reader.ReadBool();
                 config.AttributeMessageMode = (AttributeMessageMode)reader.ReadBits(3);
@@ -333,19 +299,15 @@ public ulong GetConfig(bool cache = true)
             using (BitWriter writer = BitWriter.Get())
             {
                 writer.WriteUShort(ProtocolVersion);
+                writer.WriteString(MLAPIConstants.MLAPI_PROTOCOL_VERSION);
+                
                 for (int i = 0; i < Channels.Count; i++)
                 {
                     writer.WriteString(Channels[i].Name);
                     writer.WriteByte((byte)Channels[i].Type);
                     if (EnableEncryption)
                         writer.WriteBool(Channels[i].Encrypted);
                 }
-                for (int i = 0; i < MessageTypes.Count; i++)
-                {
-                    writer.WriteString(MessageTypes[i].Name);
-                    if (AllowPassthroughMessages)
-                        writer.WriteBool(MessageTypes[i].Passthrough);
-                }
                 if (EnableSceneSwitching)
                 {
                     for (int i = 0; i < RegisteredScenes.Count; i++)
@@ -362,7 +324,6 @@ public ulong GetConfig(bool cache = true)
                 }
                 writer.WriteBool(HandleObjectSpawning);
                 writer.WriteBool(EnableEncryption);
-                writer.WriteBool(AllowPassthroughMessages);
                 writer.WriteBool(EnableSceneSwitching);
                 writer.WriteBool(SignKeyExchange);
                 writer.WriteBits((byte)AttributeMessageMode, 3);

MLAPI/MLAPI.csproj

@@ -90,6 +90,7 @@
     <Compile Include="Attributes\TargetRpc.cs" />
     <Compile Include="Data\Channel.cs" />
     <Compile Include="Data\AttributeMessageMode.cs" />
+    <Compile Include="Data\MLAPIConstants.cs" />
     <Compile Include="Data\NetworkedCollections\NetworkedDictionary.cs" />
     <Compile Include="Data\NetworkedCollections\NetworkedList.cs" />
     <Compile Include="Data\NetworkedVar.cs" />