Update FBE protocol

Ivan Shynkarenka · Ivan Shynkarenka · commit 76383b1c430a · 2022-05-19T23:52:55.000+04:00
diff --git a/README.md b/README.md
@@ -1341,9 +1341,12 @@ using System.Net;
 using System.Net.Sockets;
 using NetCoreServer;
 
+using com.chronoxor.simple;
+using com.chronoxor.simple.FBE;
+
 namespace ProtoServer
 {
-    public class SimpleProtoSessionSender : FBE.simple.Sender, FBE.simple.ISenderListener
+    public class SimpleProtoSessionSender : Sender, ISenderListener
     {
         public SimpleProtoSession Session { get; }
 
@@ -1355,14 +1358,14 @@ namespace ProtoServer
         }
     }
 
-    public class SimpleProtoSessionReceiver : FBE.simple.Receiver, FBE.simple.IReceiverListener
+    public class SimpleProtoSessionReceiver : Receiver, IReceiverListener
     {
         public SimpleProtoSession Session { get; }
 
         public SimpleProtoSessionReceiver(SimpleProtoSession session) { Session = session; }
 
-        public void OnReceive(simple.DisconnectRequest request) { Session.OnReceive(request); }
-        public void OnReceive(simple.SimpleRequest request) { Session.OnReceive(request); }
+        public void OnReceive(DisconnectRequest request) { Session.OnReceive(request); }
+        public void OnReceive(SimpleRequest request) { Session.OnReceive(request); }
     }
 
     public class SimpleProtoSession : TcpSession
@@ -1381,7 +1384,7 @@ namespace ProtoServer
             Console.WriteLine($"TCP protocol session with Id '{Id}' connected to remote address '{(Socket.RemoteEndPoint as IPEndPoint)?.Address}' and port {(Socket.RemoteEndPoint as IPEndPoint)?.Port}");
 
             // Send invite notification
-            simple.SimpleNotify notify = simple.SimpleNotify.Default;
+            SimpleNotify notify = SimpleNotify.Default;
             notify.Notification = "Hello from Simple protocol server! Please send a message or '!' to disconnect the client!";
             Sender.Send(notify);
         }
@@ -1402,32 +1405,32 @@ namespace ProtoServer
         }
 
         // Protocol handlers
-        public void OnReceive(simple.DisconnectRequest request) { Disconnect(); }
-        public void OnReceive(simple.SimpleRequest request)
+        public void OnReceive(DisconnectRequest request) { Disconnect(); }
+        public void OnReceive(SimpleRequest request)
         {
             Console.WriteLine($"Received: {request}");
 
             // Validate request
             if (string.IsNullOrEmpty(request.Message))
             {
                 // Send reject
-                simple.SimpleReject reject = simple.SimpleReject.Default;
+                SimpleReject reject = SimpleReject.Default;
                 reject.id = request.id;
                 reject.Error = "Request message is empty!";
                 Sender.Send(reject);
                 return;
             }
 
             // Send response
-            simple.SimpleResponse response = simple.SimpleResponse.Default;
+            SimpleResponse response = SimpleResponse.Default;
             response.id = request.id;
             response.Hash = (uint)request.Message.GetHashCode();
             response.Length = (uint)request.Message.Length;
             Sender.Send(response);
         }
     }
 
-    public class SimpleProtoSender : FBE.simple.Sender, FBE.simple.ISenderListener
+    public class SimpleProtoSender : Sender, ISenderListener
     {
         public SimpleProtoServer Server { get; }
 
@@ -1507,7 +1510,7 @@ namespace ProtoServer
                 }
 
                 // Multicast admin notification to all sessions
-                simple.SimpleNotify notify = simple.SimpleNotify.Default;
+                SimpleNotify notify = SimpleNotify.Default;
                 notify.Notification = "(admin) " + line;
                 server.Sender.Send(notify);
             }
@@ -1532,6 +1535,9 @@ using System.Net.Sockets;
 using System.Threading;
 using TcpClient = NetCoreServer.TcpClient;
 
+using com.chronoxor.simple;
+using com.chronoxor.simple.FBE;
+
 namespace ProtoClient
 {
     public class TcpProtoClient : TcpClient
@@ -1649,7 +1655,7 @@ namespace ProtoClient
         #endregion
     }
 
-    public class SimpleProtoClient : FBE.simple.Client, FBE.simple.ISenderListener, FBE.simple.IReceiverListener, IDisposable
+    public class SimpleProtoClient : Client, ISenderListener, IReceiverListener, IDisposable
     {
         private readonly TcpProtoClient _tcpProtoClient;
 
@@ -1780,10 +1786,10 @@ namespace ProtoClient
 
         #region Protocol handlers
 
-        private void HandleDisconnectRequest(simple.DisconnectRequest request) { Console.WriteLine($"Received: {request}"); _tcpProtoClient.DisconnectAsync(); }
-        private void HandleSimpleResponse(simple.SimpleResponse response) { Console.WriteLine($"Received: {response}"); }
-        private void HandleSimpleReject(simple.SimpleReject reject) { Console.WriteLine($"Received: {reject}"); }
-        private void HandleSimpleNotify(simple.SimpleNotify notify) { Console.WriteLine($"Received: {notify}"); }
+        private void HandleDisconnectRequest(DisconnectRequest request) { Console.WriteLine($"Received: {request}"); _tcpProtoClient.DisconnectAsync(); }
+        private void HandleSimpleResponse(SimpleResponse response) { Console.WriteLine($"Received: {response}"); }
+        private void HandleSimpleReject(SimpleReject reject) { Console.WriteLine($"Received: {reject}"); }
+        private void HandleSimpleNotify(SimpleNotify notify) { Console.WriteLine($"Received: {notify}"); }
 
         #endregion
 
@@ -1879,7 +1885,7 @@ namespace ProtoClient
                 }
 
                 // Send request to the simple protocol server
-                simple.SimpleRequest request = simple.SimpleRequest.Default;
+                SimpleRequest request = SimpleRequest.Default;
                 request.Message = line;
                 var response = client.Request(request).Result;
 
diff --git a/examples/ProtoClient/Program.cs b/examples/ProtoClient/Program.cs
@@ -3,6 +3,9 @@
 using System.Threading;
 using TcpClient = NetCoreServer.TcpClient;
 
+using com.chronoxor.simple;
+using com.chronoxor.simple.FBE;
+
 namespace ProtoClient
 {
     public class TcpProtoClient : TcpClient
@@ -120,7 +123,7 @@ protected override void Dispose(bool disposingManagedResources)
         #endregion
     }
 
-    public class SimpleProtoClient : FBE.simple.Client, FBE.simple.ISenderListener, FBE.simple.IReceiverListener, IDisposable
+    public class SimpleProtoClient : Client, ISenderListener, IReceiverListener, IDisposable
     {
         private readonly TcpProtoClient _tcpProtoClient;
 
@@ -251,10 +254,10 @@ public void OnReceived(byte[] buffer, long offset, long size)
 
         #region Protocol handlers
 
-        private void HandleDisconnectRequest(simple.DisconnectRequest request) { Console.WriteLine($"Received: {request}"); _tcpProtoClient.DisconnectAsync(); }
-        private void HandleSimpleResponse(simple.SimpleResponse response) { Console.WriteLine($"Received: {response}"); }
-        private void HandleSimpleReject(simple.SimpleReject reject) { Console.WriteLine($"Received: {reject}"); }
-        private void HandleSimpleNotify(simple.SimpleNotify notify) { Console.WriteLine($"Received: {notify}"); }
+        private void HandleDisconnectRequest(DisconnectRequest request) { Console.WriteLine($"Received: {request}"); _tcpProtoClient.DisconnectAsync(); }
+        private void HandleSimpleResponse(SimpleResponse response) { Console.WriteLine($"Received: {response}"); }
+        private void HandleSimpleReject(SimpleReject reject) { Console.WriteLine($"Received: {reject}"); }
+        private void HandleSimpleNotify(SimpleNotify notify) { Console.WriteLine($"Received: {notify}"); }
 
         #endregion
 
@@ -352,7 +355,7 @@ static void Main(string[] args)
                 }
 
                 // Send request to the simple protocol server
-                simple.SimpleRequest request = simple.SimpleRequest.Default;
+                SimpleRequest request = SimpleRequest.Default;
                 request.Message = line;
                 var response = client.Request(request).Result;
 
diff --git a/examples/ProtoServer/Program.cs b/examples/ProtoServer/Program.cs
@@ -3,9 +3,12 @@
 using System.Net.Sockets;
 using NetCoreServer;
 
+using com.chronoxor.simple;
+using com.chronoxor.simple.FBE;
+
 namespace ProtoServer
 {
-    public class SimpleProtoSessionSender : FBE.simple.Sender, FBE.simple.ISenderListener
+    public class SimpleProtoSessionSender : Sender, ISenderListener
     {
         public SimpleProtoSession Session { get; }
 
@@ -17,14 +20,14 @@ public long OnSend(byte[] buffer, long offset, long size)
         }
     }
 
-    public class SimpleProtoSessionReceiver : FBE.simple.Receiver, FBE.simple.IReceiverListener
+    public class SimpleProtoSessionReceiver : Receiver, IReceiverListener
     {
         public SimpleProtoSession Session { get; }
 
         public SimpleProtoSessionReceiver(SimpleProtoSession session) { Session = session; }
 
-        public void OnReceive(simple.DisconnectRequest request) { Session.OnReceive(request); }
-        public void OnReceive(simple.SimpleRequest request) { Session.OnReceive(request); }
+        public void OnReceive(DisconnectRequest request) { Session.OnReceive(request); }
+        public void OnReceive(SimpleRequest request) { Session.OnReceive(request); }
     }
 
     public class SimpleProtoSession : TcpSession
@@ -43,7 +46,7 @@ protected override void OnConnected()
             Console.WriteLine($"TCP protocol session with Id '{Id}' connected to remote address '{(Socket.RemoteEndPoint as IPEndPoint)?.Address}' and port {(Socket.RemoteEndPoint as IPEndPoint)?.Port}");
 
             // Send invite notification
-            simple.SimpleNotify notify = simple.SimpleNotify.Default;
+            SimpleNotify notify = SimpleNotify.Default;
             notify.Notification = "Hello from Simple protocol server! Please send a message or '!' to disconnect the client!";
             Sender.Send(notify);
         }
@@ -64,32 +67,32 @@ protected override void OnError(SocketError error)
         }
 
         // Protocol handlers
-        public void OnReceive(simple.DisconnectRequest request) { Disconnect(); }
-        public void OnReceive(simple.SimpleRequest request) 
+        public void OnReceive(DisconnectRequest request) { Disconnect(); }
+        public void OnReceive(SimpleRequest request) 
         {
             Console.WriteLine($"Received: {request}");
 
             // Validate request
             if (string.IsNullOrEmpty(request.Message))
             {
                 // Send reject
-                simple.SimpleReject reject = simple.SimpleReject.Default;
+                SimpleReject reject = SimpleReject.Default;
                 reject.id = request.id;
                 reject.Error = "Request message is empty!";
                 Sender.Send(reject);
                 return;
             }
 
             // Send response
-            simple.SimpleResponse response = simple.SimpleResponse.Default;
+            SimpleResponse response = SimpleResponse.Default;
             response.id = request.id;
             response.Hash = (uint)request.Message.GetHashCode();
             response.Length = (uint)request.Message.Length;
             Sender.Send(response);
         }
     }
 
-    public class SimpleProtoSender : FBE.simple.Sender, FBE.simple.ISenderListener
+    public class SimpleProtoSender : Sender, ISenderListener
     {
         public SimpleProtoServer Server { get; }
 
@@ -169,7 +172,7 @@ static void Main(string[] args)
                 }
 
                 // Multicast admin notification to all sessions
-                simple.SimpleNotify notify = simple.SimpleNotify.Default;
+                SimpleNotify notify = SimpleNotify.Default;
                 notify.Notification = "(admin) " + line;
                 server.Sender.Send(notify);
             }
diff --git a/performance/ProtoClient/Program.cs b/performance/ProtoClient/Program.cs
@@ -5,6 +5,9 @@
 using NetCoreServer;
 using NDesk.Options;
 
+using com.chronoxor.simple;
+using com.chronoxor.simple.FBE;
+
 namespace ProtoClient
 {
     class TcpProtoClient : NetCoreServer.TcpClient
@@ -42,7 +45,7 @@ protected override void OnError(SocketError error)
         }
     }
 
-    class ProtoClient : FBE.simple.Client, FBE.simple.ISenderListener, FBE.simple.IReceiverListener, IDisposable
+    class ProtoClient : Client, ISenderListener, IReceiverListener, IDisposable
     {
         private readonly TcpProtoClient _tcpProtoClient;
 
@@ -83,7 +86,7 @@ private void DisposeClient()
 
         private void SendMessage()
         {
-            simple.SimpleRequest message = simple.SimpleRequest.Default;
+            SimpleRequest message = SimpleRequest.Default;
             message.Message = Program.MessageToSend;
             Request(message);
         }
@@ -129,10 +132,10 @@ public void OnReceived(byte[] buffer, long offset, long size)
 
         #region Protocol handlers
 
-        private void HandleDisconnectRequest(simple.DisconnectRequest request) { _tcpProtoClient.DisconnectAsync(); }
-        private void HandleSimpleResponse(simple.SimpleResponse response) { SendMessage(); }
-        private void HandleSimpleReject(simple.SimpleReject reject) {}
-        private void HandleSimpleNotify(simple.SimpleNotify notify) {}
+        private void HandleDisconnectRequest(DisconnectRequest request) { _tcpProtoClient.DisconnectAsync(); }
+        private void HandleSimpleResponse(SimpleResponse response) { SendMessage(); }
+        private void HandleSimpleReject(SimpleReject reject) {}
+        private void HandleSimpleNotify(SimpleNotify notify) {}
 
         #endregion
 
diff --git a/performance/ProtoServer/Program.cs b/performance/ProtoServer/Program.cs
@@ -4,9 +4,12 @@
 using NetCoreServer;
 using NDesk.Options;
 
+using com.chronoxor.simple;
+using com.chronoxor.simple.FBE;
+
 namespace ProtoServer
 {
-    class ProtoSessionSender : FBE.simple.Sender, FBE.simple.ISenderListener
+    class ProtoSessionSender : Sender, ISenderListener
     {
         public ProtoSession Session { get; }
 
@@ -18,13 +21,13 @@ public long OnSend(byte[] buffer, long offset, long size)
         }
     }
 
-    class ProtoSessionReceiver : FBE.simple.Receiver, FBE.simple.IReceiverListener
+    class ProtoSessionReceiver : Receiver, IReceiverListener
     {
         public ProtoSession Session { get; }
 
         public ProtoSessionReceiver(ProtoSession session) { Session = session; }
 
-        public void OnReceive(simple.SimpleRequest request) { Session.OnReceive(request); }
+        public void OnReceive(SimpleRequest request) { Session.OnReceive(request); }
     }
 
     class ProtoSession : TcpSession
@@ -49,18 +52,18 @@ protected override void OnError(SocketError error)
         }
 
         // Protocol handlers
-        public void OnReceive(simple.SimpleRequest request)
+        public void OnReceive(SimpleRequest request)
         {
             // Send response
-            simple.SimpleResponse response = simple.SimpleResponse.Default;
+            SimpleResponse response = SimpleResponse.Default;
             response.id = request.id;
             response.Hash = 0;
             response.Length = (uint)request.Message.Length;
             Sender.Send(response);
         }
     }
 
-    class ProtoSender : FBE.simple.Sender, FBE.simple.ISenderListener
+    class ProtoSender : Sender, ISenderListener
     {
         public ProtoServer Server { get; }
 
diff --git a/proto/com.chronoxor.fbe.cs b/proto/com.chronoxor.fbe.cs
@@ -1,7 +1,14 @@
-// Automatically generated by the Fast Binary Encoding compiler, do not modify!
-// https://github.com/chronoxor/FastBinaryEncoding
-// Source: FBE
-// Version: 1.8.0.0
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Automatically generated by the Fast Binary Encoding compiler, do not modify!
+//     https://github.com/chronoxor/FastBinaryEncoding
+//     Source: FBE
+//     FBE version: 1.9.0.0
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
 
 using System;
 using System.Collections.Generic;
@@ -15,7 +22,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FBE {
+namespace com.chronoxor.FBE {
 
     // Fast Binary Encoding UUID generator
     public static class UuidGenerator
@@ -5977,4 +5984,4 @@ public void Receive(byte[] buffer, long offset, long size)
         internal abstract bool OnReceive(long type, byte[] buffer, long offset, long size);
     }
 
-} // namespace FBE
+} // namespace com.chronoxor.FBE
diff --git a/proto/com.chronoxor.simple.cs b/proto/com.chronoxor.simple.cs
diff --git a/tests/ProtoTests.cs b/tests/ProtoTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1341,9 +1341,12 @@ using System.Net;`
`1341`	`1341`	`using System.Net.Sockets;`
`1342`	`1342`	`using NetCoreServer;`
`1343`	`1343`
	`1344`	`+using com.chronoxor.simple;`
	`1345`	`+using com.chronoxor.simple.FBE;`
	`1346`	`+`
`1344`	`1347`	`namespace ProtoServer`
`1345`	`1348`	`{`
`1346`		`- public class SimpleProtoSessionSender : FBE.simple.Sender, FBE.simple.ISenderListener`
	`1349`	`+ public class SimpleProtoSessionSender : Sender, ISenderListener`
`1347`	`1350`	`{`
`1348`	`1351`	`public SimpleProtoSession Session { get; }`
`1349`	`1352`
`@@ -1355,14 +1358,14 @@ namespace ProtoServer`
`1355`	`1358`	`}`
`1356`	`1359`	`}`
`1357`	`1360`
`1358`		`- public class SimpleProtoSessionReceiver : FBE.simple.Receiver, FBE.simple.IReceiverListener`
	`1361`	`+ public class SimpleProtoSessionReceiver : Receiver, IReceiverListener`
`1359`	`1362`	`{`
`1360`	`1363`	`public SimpleProtoSession Session { get; }`
`1361`	`1364`
`1362`	`1365`	`public SimpleProtoSessionReceiver(SimpleProtoSession session) { Session = session; }`
`1363`	`1366`
`1364`		`- public void OnReceive(simple.DisconnectRequest request) { Session.OnReceive(request); }`
`1365`		`- public void OnReceive(simple.SimpleRequest request) { Session.OnReceive(request); }`
	`1367`	`+ public void OnReceive(DisconnectRequest request) { Session.OnReceive(request); }`
	`1368`	`+ public void OnReceive(SimpleRequest request) { Session.OnReceive(request); }`
`1366`	`1369`	`}`
`1367`	`1370`
`1368`	`1371`	`public class SimpleProtoSession : TcpSession`
`@@ -1381,7 +1384,7 @@ namespace ProtoServer`
`1381`	`1384`	`Console.WriteLine($"TCP protocol session with Id '{Id}' connected to remote address '{(Socket.RemoteEndPoint as IPEndPoint)?.Address}' and port {(Socket.RemoteEndPoint as IPEndPoint)?.Port}");`
`1382`	`1385`
`1383`	`1386`	`// Send invite notification`
`1384`		`- simple.SimpleNotify notify = simple.SimpleNotify.Default;`
	`1387`	`+ SimpleNotify notify = SimpleNotify.Default;`
`1385`	`1388`	`notify.Notification = "Hello from Simple protocol server! Please send a message or '!' to disconnect the client!";`
`1386`	`1389`	`Sender.Send(notify);`
`1387`	`1390`	`}`
`@@ -1402,32 +1405,32 @@ namespace ProtoServer`
`1402`	`1405`	`}`
`1403`	`1406`
`1404`	`1407`	`// Protocol handlers`
`1405`		`- public void OnReceive(simple.DisconnectRequest request) { Disconnect(); }`
`1406`		`- public void OnReceive(simple.SimpleRequest request)`
	`1408`	`+ public void OnReceive(DisconnectRequest request) { Disconnect(); }`
	`1409`	`+ public void OnReceive(SimpleRequest request)`
`1407`	`1410`	`{`
`1408`	`1411`	`Console.WriteLine($"Received: {request}");`
`1409`	`1412`
`1410`	`1413`	`// Validate request`
`1411`	`1414`	`if (string.IsNullOrEmpty(request.Message))`
`1412`	`1415`	`{`
`1413`	`1416`	`// Send reject`
`1414`		`- simple.SimpleReject reject = simple.SimpleReject.Default;`
	`1417`	`+ SimpleReject reject = SimpleReject.Default;`
`1415`	`1418`	`reject.id = request.id;`
`1416`	`1419`	`reject.Error = "Request message is empty!";`
`1417`	`1420`	`Sender.Send(reject);`
`1418`	`1421`	`return;`
`1419`	`1422`	`}`
`1420`	`1423`
`1421`	`1424`	`// Send response`
`1422`		`- simple.SimpleResponse response = simple.SimpleResponse.Default;`
	`1425`	`+ SimpleResponse response = SimpleResponse.Default;`
`1423`	`1426`	`response.id = request.id;`
`1424`	`1427`	`response.Hash = (uint)request.Message.GetHashCode();`
`1425`	`1428`	`response.Length = (uint)request.Message.Length;`
`1426`	`1429`	`Sender.Send(response);`
`1427`	`1430`	`}`
`1428`	`1431`	`}`
`1429`	`1432`
`1430`		`- public class SimpleProtoSender : FBE.simple.Sender, FBE.simple.ISenderListener`
	`1433`	`+ public class SimpleProtoSender : Sender, ISenderListener`
`1431`	`1434`	`{`
`1432`	`1435`	`public SimpleProtoServer Server { get; }`
`1433`	`1436`
`@@ -1507,7 +1510,7 @@ namespace ProtoServer`
`1507`	`1510`	`}`
`1508`	`1511`
`1509`	`1512`	`// Multicast admin notification to all sessions`
`1510`		`- simple.SimpleNotify notify = simple.SimpleNotify.Default;`
	`1513`	`+ SimpleNotify notify = SimpleNotify.Default;`
`1511`	`1514`	`notify.Notification = "(admin) " + line;`
`1512`	`1515`	`server.Sender.Send(notify);`
`1513`	`1516`	`}`
`@@ -1532,6 +1535,9 @@ using System.Net.Sockets;`
`1532`	`1535`	`using System.Threading;`
`1533`	`1536`	`using TcpClient = NetCoreServer.TcpClient;`
`1534`	`1537`
	`1538`	`+using com.chronoxor.simple;`
	`1539`	`+using com.chronoxor.simple.FBE;`
	`1540`	`+`
`1535`	`1541`	`namespace ProtoClient`
`1536`	`1542`	`{`
`1537`	`1543`	`public class TcpProtoClient : TcpClient`
`@@ -1649,7 +1655,7 @@ namespace ProtoClient`
`1649`	`1655`	`#endregion`
`1650`	`1656`	`}`
`1651`	`1657`
`1652`		`- public class SimpleProtoClient : FBE.simple.Client, FBE.simple.ISenderListener, FBE.simple.IReceiverListener, IDisposable`
	`1658`	`+ public class SimpleProtoClient : Client, ISenderListener, IReceiverListener, IDisposable`
`1653`	`1659`	`{`
`1654`	`1660`	`private readonly TcpProtoClient _tcpProtoClient;`
`1655`	`1661`
`@@ -1780,10 +1786,10 @@ namespace ProtoClient`
`1780`	`1786`
`1781`	`1787`	`#region Protocol handlers`
`1782`	`1788`
`1783`		`- private void HandleDisconnectRequest(simple.DisconnectRequest request) { Console.WriteLine($"Received: {request}"); _tcpProtoClient.DisconnectAsync(); }`
`1784`		`- private void HandleSimpleResponse(simple.SimpleResponse response) { Console.WriteLine($"Received: {response}"); }`
`1785`		`- private void HandleSimpleReject(simple.SimpleReject reject) { Console.WriteLine($"Received: {reject}"); }`
`1786`		`- private void HandleSimpleNotify(simple.SimpleNotify notify) { Console.WriteLine($"Received: {notify}"); }`
	`1789`	`+ private void HandleDisconnectRequest(DisconnectRequest request) { Console.WriteLine($"Received: {request}"); _tcpProtoClient.DisconnectAsync(); }`
	`1790`	`+ private void HandleSimpleResponse(SimpleResponse response) { Console.WriteLine($"Received: {response}"); }`
	`1791`	`+ private void HandleSimpleReject(SimpleReject reject) { Console.WriteLine($"Received: {reject}"); }`
	`1792`	`+ private void HandleSimpleNotify(SimpleNotify notify) { Console.WriteLine($"Received: {notify}"); }`
`1787`	`1793`
`1788`	`1794`	`#endregion`
`1789`	`1795`
`@@ -1879,7 +1885,7 @@ namespace ProtoClient`
`1879`	`1885`	`}`
`1880`	`1886`
`1881`	`1887`	`// Send request to the simple protocol server`
`1882`		`- simple.SimpleRequest request = simple.SimpleRequest.Default;`
	`1888`	`+ SimpleRequest request = SimpleRequest.Default;`
`1883`	`1889`	`request.Message = line;`
`1884`	`1890`	`var response = client.Request(request).Result;`
`1885`	`1891`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,12 @@`
`3`	`3`	`using System.Net.Sockets;`
`4`	`4`	`using NetCoreServer;`
`5`	`5`
	`6`	`+using com.chronoxor.simple;`
	`7`	`+using com.chronoxor.simple.FBE;`
	`8`	`+`
`6`	`9`	`namespace ProtoServer`
`7`	`10`	`{`
`8`		`- public class SimpleProtoSessionSender : FBE.simple.Sender, FBE.simple.ISenderListener`
	`11`	`+ public class SimpleProtoSessionSender : Sender, ISenderListener`
`9`	`12`	`{`
`10`	`13`	`public SimpleProtoSession Session { get; }`
`11`	`14`
`@@ -17,14 +20,14 @@ public long OnSend(byte[] buffer, long offset, long size)`
`17`	`20`	`}`
`18`	`21`	`}`
`19`	`22`
`20`		`- public class SimpleProtoSessionReceiver : FBE.simple.Receiver, FBE.simple.IReceiverListener`
	`23`	`+ public class SimpleProtoSessionReceiver : Receiver, IReceiverListener`
`21`	`24`	`{`
`22`	`25`	`public SimpleProtoSession Session { get; }`
`23`	`26`
`24`	`27`	`public SimpleProtoSessionReceiver(SimpleProtoSession session) { Session = session; }`
`25`	`28`
`26`		`- public void OnReceive(simple.DisconnectRequest request) { Session.OnReceive(request); }`
`27`		`- public void OnReceive(simple.SimpleRequest request) { Session.OnReceive(request); }`
	`29`	`+ public void OnReceive(DisconnectRequest request) { Session.OnReceive(request); }`
	`30`	`+ public void OnReceive(SimpleRequest request) { Session.OnReceive(request); }`
`28`	`31`	`}`
`29`	`32`
`30`	`33`	`public class SimpleProtoSession : TcpSession`
`@@ -43,7 +46,7 @@ protected override void OnConnected()`
`43`	`46`	`Console.WriteLine($"TCP protocol session with Id '{Id}' connected to remote address '{(Socket.RemoteEndPoint as IPEndPoint)?.Address}' and port {(Socket.RemoteEndPoint as IPEndPoint)?.Port}");`
`44`	`47`
`45`	`48`	`// Send invite notification`
`46`		`- simple.SimpleNotify notify = simple.SimpleNotify.Default;`
	`49`	`+ SimpleNotify notify = SimpleNotify.Default;`
`47`	`50`	`notify.Notification = "Hello from Simple protocol server! Please send a message or '!' to disconnect the client!";`
`48`	`51`	`Sender.Send(notify);`
`49`	`52`	`}`
`@@ -64,32 +67,32 @@ protected override void OnError(SocketError error)`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`// Protocol handlers`
`67`		`- public void OnReceive(simple.DisconnectRequest request) { Disconnect(); }`
`68`		`- public void OnReceive(simple.SimpleRequest request)`
	`70`	`+ public void OnReceive(DisconnectRequest request) { Disconnect(); }`
	`71`	`+ public void OnReceive(SimpleRequest request)`
`69`	`72`	`{`
`70`	`73`	`Console.WriteLine($"Received: {request}");`
`71`	`74`
`72`	`75`	`// Validate request`
`73`	`76`	`if (string.IsNullOrEmpty(request.Message))`
`74`	`77`	`{`
`75`	`78`	`// Send reject`
`76`		`- simple.SimpleReject reject = simple.SimpleReject.Default;`
	`79`	`+ SimpleReject reject = SimpleReject.Default;`
`77`	`80`	`reject.id = request.id;`
`78`	`81`	`reject.Error = "Request message is empty!";`
`79`	`82`	`Sender.Send(reject);`
`80`	`83`	`return;`
`81`	`84`	`}`
`82`	`85`
`83`	`86`	`// Send response`
`84`		`- simple.SimpleResponse response = simple.SimpleResponse.Default;`
	`87`	`+ SimpleResponse response = SimpleResponse.Default;`
`85`	`88`	`response.id = request.id;`
`86`	`89`	`response.Hash = (uint)request.Message.GetHashCode();`
`87`	`90`	`response.Length = (uint)request.Message.Length;`
`88`	`91`	`Sender.Send(response);`
`89`	`92`	`}`
`90`	`93`	`}`
`91`	`94`
`92`		`- public class SimpleProtoSender : FBE.simple.Sender, FBE.simple.ISenderListener`
	`95`	`+ public class SimpleProtoSender : Sender, ISenderListener`
`93`	`96`	`{`
`94`	`97`	`public SimpleProtoServer Server { get; }`
`95`	`98`
`@@ -169,7 +172,7 @@ static void Main(string[] args)`
`169`	`172`	`}`
`170`	`173`
`171`	`174`	`// Multicast admin notification to all sessions`
`172`		`- simple.SimpleNotify notify = simple.SimpleNotify.Default;`
	`175`	`+ SimpleNotify notify = SimpleNotify.Default;`
`173`	`176`	`notify.Notification = "(admin) " + line;`
`174`	`177`	`server.Sender.Send(notify);`
`175`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@`
`5`	`5`	`using NetCoreServer;`
`6`	`6`	`using NDesk.Options;`
`7`	`7`
	`8`	`+using com.chronoxor.simple;`
	`9`	`+using com.chronoxor.simple.FBE;`
	`10`	`+`
`8`	`11`	`namespace ProtoClient`
`9`	`12`	`{`
`10`	`13`	`class TcpProtoClient : NetCoreServer.TcpClient`
`@@ -42,7 +45,7 @@ protected override void OnError(SocketError error)`
`42`	`45`	`}`
`43`	`46`	`}`
`44`	`47`
`45`		`- class ProtoClient : FBE.simple.Client, FBE.simple.ISenderListener, FBE.simple.IReceiverListener, IDisposable`
	`48`	`+ class ProtoClient : Client, ISenderListener, IReceiverListener, IDisposable`
`46`	`49`	`{`
`47`	`50`	`private readonly TcpProtoClient _tcpProtoClient;`
`48`	`51`
`@@ -83,7 +86,7 @@ private void DisposeClient()`
`83`	`86`
`84`	`87`	`private void SendMessage()`
`85`	`88`	`{`
`86`		`- simple.SimpleRequest message = simple.SimpleRequest.Default;`
	`89`	`+ SimpleRequest message = SimpleRequest.Default;`
`87`	`90`	`message.Message = Program.MessageToSend;`
`88`	`91`	`Request(message);`
`89`	`92`	`}`
`@@ -129,10 +132,10 @@ public void OnReceived(byte[] buffer, long offset, long size)`
`129`	`132`
`130`	`133`	`#region Protocol handlers`
`131`	`134`
`132`		`- private void HandleDisconnectRequest(simple.DisconnectRequest request) { _tcpProtoClient.DisconnectAsync(); }`
`133`		`- private void HandleSimpleResponse(simple.SimpleResponse response) { SendMessage(); }`
`134`		`- private void HandleSimpleReject(simple.SimpleReject reject) {}`
`135`		`- private void HandleSimpleNotify(simple.SimpleNotify notify) {}`
	`135`	`+ private void HandleDisconnectRequest(DisconnectRequest request) { _tcpProtoClient.DisconnectAsync(); }`
	`136`	`+ private void HandleSimpleResponse(SimpleResponse response) { SendMessage(); }`
	`137`	`+ private void HandleSimpleReject(SimpleReject reject) {}`
	`138`	`+ private void HandleSimpleNotify(SimpleNotify notify) {}`
`136`	`139`
`137`	`140`	`#endregion`
`138`	`141`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,12 @@`
`4`	`4`	`using NetCoreServer;`
`5`	`5`	`using NDesk.Options;`
`6`	`6`
	`7`	`+using com.chronoxor.simple;`
	`8`	`+using com.chronoxor.simple.FBE;`
	`9`	`+`
`7`	`10`	`namespace ProtoServer`
`8`	`11`	`{`
`9`		`- class ProtoSessionSender : FBE.simple.Sender, FBE.simple.ISenderListener`
	`12`	`+ class ProtoSessionSender : Sender, ISenderListener`
`10`	`13`	`{`
`11`	`14`	`public ProtoSession Session { get; }`
`12`	`15`
`@@ -18,13 +21,13 @@ public long OnSend(byte[] buffer, long offset, long size)`
`18`	`21`	`}`
`19`	`22`	`}`
`20`	`23`
`21`		`- class ProtoSessionReceiver : FBE.simple.Receiver, FBE.simple.IReceiverListener`
	`24`	`+ class ProtoSessionReceiver : Receiver, IReceiverListener`
`22`	`25`	`{`
`23`	`26`	`public ProtoSession Session { get; }`
`24`	`27`
`25`	`28`	`public ProtoSessionReceiver(ProtoSession session) { Session = session; }`
`26`	`29`
`27`		`- public void OnReceive(simple.SimpleRequest request) { Session.OnReceive(request); }`
	`30`	`+ public void OnReceive(SimpleRequest request) { Session.OnReceive(request); }`
`28`	`31`	`}`
`29`	`32`
`30`	`33`	`class ProtoSession : TcpSession`
`@@ -49,18 +52,18 @@ protected override void OnError(SocketError error)`
`49`	`52`	`}`
`50`	`53`
`51`	`54`	`// Protocol handlers`
`52`		`- public void OnReceive(simple.SimpleRequest request)`
	`55`	`+ public void OnReceive(SimpleRequest request)`
`53`	`56`	`{`
`54`	`57`	`// Send response`
`55`		`- simple.SimpleResponse response = simple.SimpleResponse.Default;`
	`58`	`+ SimpleResponse response = SimpleResponse.Default;`
`56`	`59`	`response.id = request.id;`
`57`	`60`	`response.Hash = 0;`
`58`	`61`	`response.Length = (uint)request.Message.Length;`
`59`	`62`	`Sender.Send(response);`
`60`	`63`	`}`
`61`	`64`	`}`
`62`	`65`
`63`		`- class ProtoSender : FBE.simple.Sender, FBE.simple.ISenderListener`
	`66`	`+ class ProtoSender : Sender, ISenderListener`
`64`	`67`	`{`
`65`	`68`	`public ProtoServer Server { get; }`
`66`	`69`