Work to simplify session usage.

Dtronix · Sep 27, 2016 · 6aa8144 · 6aa8144
1 parent e352f54
commit 6aa8144
Show file tree

Hide file tree

Showing 15 changed files with 477 additions and 418 deletions.
diff --git a/src/DtronixMessageQueue/DtronixMessageQueue.csproj b/src/DtronixMessageQueue/DtronixMessageQueue.csproj
@@ -57,9 +57,10 @@
     <Compile Include="MqSession.cs" />
     <Compile Include="MqConfig.cs" />
     <Compile Include="Rpc\DataContract\RpcServerInfoDataContract.cs" />
-    <Compile Include="Rpc\IProcessRpcSession.cs" />
     <Compile Include="Rpc\IRemoteService.cs" />
+    <Compile Include="Rpc\MessageHandler.cs" />
     <Compile Include="Rpc\RpcAuthEventArgs.cs" />
+    <Compile Include="Rpc\RpcCallMessageHandler.cs" />
     <Compile Include="Rpc\RpcClient.cs" />
     <Compile Include="Rpc\RpcCommandType.cs" />
     <Compile Include="Rpc\RpcConfig.cs" />

diff --git a/src/DtronixMessageQueue/MqSession.cs b/src/DtronixMessageQueue/MqSession.cs
@@ -13,7 +13,7 @@ namespace DtronixMessageQueue {
 	/// </summary>
 	/// <typeparam name="TSession">Session type for this connection.</typeparam>
 	/// <typeparam name="TConfig">Configuration for this connection.</typeparam>
-	public abstract class MqSession<TSession, TConfig> : SocketSession<TConfig>
+	public abstract class MqSession<TSession, TConfig> : SocketSession<TSession, TConfig>
 		where TSession : MqSession<TSession, TConfig>, new()
 		where TConfig : MqConfig {
 
@@ -52,11 +52,6 @@ public abstract class MqSession<TSession, TConfig> : SocketSession<TConfig>
 		/// </summary>
 		public event EventHandler<IncomingMessageEventArgs<TSession, TConfig>> IncomingMessage;
 
-		/// <summary>
-		/// Base socket for this session.
-		/// </summary>
-		public SocketBase<TSession, TConfig> BaseSocket { get; set; }
-
 		protected override void OnSetup() {
 			frame_builder = new MqFrameBuilder(Config);
 		}

diff --git a/src/DtronixMessageQueue/Rpc/IProcessRpcSession.cs b/src/DtronixMessageQueue/Rpc/IProcessRpcSession.cs
diff --git a/src/DtronixMessageQueue/Rpc/MessageHandler.cs b/src/DtronixMessageQueue/Rpc/MessageHandler.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DtronixMessageQueue.Rpc {
+	public abstract class MessageHandler<TSession, TConfig> 
+		where TSession : RpcSession<TSession, TConfig>, new()
+		where TConfig : RpcConfig {
+
+		protected TSession Session;
+
+		protected MessageHandler(TSession session) {
+			Session = session;
+		}
+
+		public abstract bool HandleMessage(MqMessage message);
+	}
+}