Done with reducers and added per-connection formatters

Author: dedouwe26

GAIL.Networking/Container/Connection.cs

@@ -1,6 +1,7 @@
 using System.Net;
 using System.Net.Sockets;
 using GAIL.Networking.Streams;
+using GAIL.Serializing.Formatters;
 
 namespace GAIL.Networking.Server;
 
@@ -37,10 +38,16 @@ public static byte[] CreateID(IPEndPoint ip) {
     /// The user-set data.
     /// </summary>
     public object? data = null;
+    
+    /// <summary>
+    /// The formatter used to encode / decode all packets.
+    /// </summary>
+    public IFormatter? Formatter = null;
+
     /// <summary>
     /// True if this connection is closed.
     /// </summary>
-    public bool Closed { get; private set;}
+    public bool Closed { get; private set; }
     private NetworkSerializer? serializer;
     internal NetworkSerializer Serializer {
         get {

GAIL.Networking/Container/ServerContainer.cs

@@ -46,11 +46,6 @@ public static ServerContainer Create(IPEndPoint ip, bool enableLogging = false,
     /// </summary>
     public TcpListener tcpListener;
 
-    /// <summary>
-    /// The formatter used to encode / decode all packets.
-    /// </summary>
-    public IFormatter? GlobalFormatter = null; // TODO: ?? Move to connections (per-client) ??
-
     /// <summary>
     /// An event that is called when a packet is received.
     /// </summary>
@@ -159,7 +154,7 @@ public void SetLogger(Logger? logger = null) {
     public bool SendPacket(Packet packet, Connection connection) {
         if (Closed) { return false; }
         try {
-            connection.Serializer.WritePacket(packet, GlobalFormatter);
+            connection.Serializer.WritePacket(packet, connection.Formatter);
         } catch (IOException e) {
             Logger?.LogError($"Could not send packet (connection ID: {connection.ToConnectionID()}):");
             Logger?.LogException(e, Severity.Error);
@@ -214,7 +209,7 @@ public bool BroadcastPacket(Packet packet) {
     public async ValueTask<bool> SendPacketAsync(Packet packet, Connection connection) {
         if (Closed) { return false; }
         try {
-            connection.Serializer.WritePacket(packet, GlobalFormatter); // TODO?: this isnt really async.
+            connection.Serializer.WritePacket(packet, connection.Formatter); // TODO?: this isnt really async.
         } catch (IOException e) {
             Logger?.LogError($"Could not send packet (connection ID: {connection.ToConnectionID()}):");
             Logger?.LogException(e, Severity.Error);
@@ -371,7 +366,7 @@ private void ListenConnection(IAsyncResult result) {
         connections.Add(connection.ID, connection);
         OnConnect?.Invoke(this, connection);
         try {
-            if (!connection.Parser.Parse(GlobalFormatter, () => Closed || connection.Closed, p => {
+            if (!connection.Parser.Parse(connection.Formatter, () => Closed || connection.Closed, p => {
                 OnPacket?.Invoke(this, connection, p);
                 if (p is DisconnectPacket) {
                     connections.Remove(connection.ID);

GAIL.Serializing/Streams/Parser.cs

@@ -108,21 +108,17 @@ public virtual T ReadSerializable<T>(SerializableInfo info, IFormatter? formatte
     public virtual IReducer ReadReducer(ReducerInfo info, IFormatter? formatter = null) {
         if (info.Format.Length < 1) return info.Creator([]);
 
-        ISerializable[] serializables = new ISerializable[info.Format.Length];
-
         if (formatter != null) {
             uint size = ReadUInt();
             using Parser parser = new(formatter.Decode(Read(size)));
-            for (int i = 0; i < info.Format.Length; i++) {
-                serializables[i] = parser.ReadSerializable(info.Format[i], formatter);
-            }
+            return parser.ReadReducer(info, null);
         } else {
+            ISerializable[] serializables = new ISerializable[info.Format.Length];
             for (int i = 0; i < info.Format.Length; i++) {
                 serializables[i] = ReadSerializable(info.Format[i], formatter);
             }
+            return info.Creator(serializables);
         }
-
-        return info.Creator(serializables);
     }
     /// <summary>
     /// Reads a reducer from the stream.

GAIL.Serializing/Streams/Serializer.cs

@@ -78,10 +78,8 @@ public virtual void WriteReducer(IReducer reducer, IFormatter? formatter = null)
 
         if (formatter != null) {
             using Serializer serializer = new();
-            foreach (ISerializable serializable in reducer.Serialize()) {
-                serializer.WriteSerializable(serializable);
-            }
-            byte[] raw = (serializer.BaseStream as MemoryStream)!.ToArray();
+            serializer.WriteReducer(reducer, null);
+            byte[] raw = formatter.Encode((serializer.BaseStream as MemoryStream)!.ToArray());
             WriteUInt((uint)raw.Length);
             Write(raw);
         } else {

examples/Packets/Server/Program.cs

@@ -9,7 +9,7 @@ namespace examples.Packets.Server;
 
 class Program {
     private static readonly string serverName = new StyleBuilder().Foreground(Color.Blue).Text("System").ResetForeground().ToString();
-    public static void Main(string[] args) {
+    public static void Main() {
         // Registers all three packets.
         Shared.Packets.RegisterPackets();
 
@@ -29,7 +29,6 @@ public static void Main(string[] args) {
         // Stop when key pressed.
         Terminal.OnKeyPress+=async (key, ch, alt, shift, control) => {
             await server.StopAsync();
-            
         };
 
         // Don't forget to start the server.