A first draft for rpc settings

Elad Zelingher · Elad Zelingher · commit ff909096b425 · 2016-10-21T14:59:36.000+03:00
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/AsyncLocalRpcOperation.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/AsyncLocalRpcOperation.cs
@@ -10,7 +10,8 @@ namespace WampSharp.V2.Rpc
 {
     public abstract class AsyncLocalRpcOperation: LocalRpcOperation
     {
-        protected AsyncLocalRpcOperation(string procedure) : base(procedure)
+        protected AsyncLocalRpcOperation(string procedure, ICalleeSettings settings = null) : 
+            base(procedure, settings)
         {
         }
 
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/LocalRpcOperation.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/LocalRpcOperation.cs
@@ -19,9 +19,12 @@ public abstract class LocalRpcOperation : IWampRpcOperation
         protected readonly static IWampFormatter<object> ObjectFormatter =
             WampObjectFormatter.Value;
 
-        protected LocalRpcOperation(string procedure)
+        private readonly ICalleeSettings mSettings;
+
+        protected LocalRpcOperation(string procedure, ICalleeSettings settings = null)
         {
             mProcedure = procedure;
+            mSettings = settings ?? new CalleeSettings();
             mLogger = LogProvider.GetLogger(typeof (LocalRpcOperation) + "." + procedure);
         }
 
@@ -121,6 +124,11 @@ protected void ValidateInstanceType(object instance, MethodInfo method)
             }
         }
 
+        protected WampRpcRuntimeException ConvertExceptionToRuntimeException(Exception exception)
+        {
+            return mSettings.ConvertExceptionToRuntimeException(exception);
+        }
+
         protected class WampRpcErrorCallback : IWampErrorCallback
         {
             private readonly IWampRawRpcOperationRouterCallback mCallback;
@@ -145,11 +153,5 @@ public void Error(object details, string error, object[] arguments, object argum
                 mCallback.Error(ObjectFormatter, details, error, arguments, argumentsKeywords);
             }
         }
-
-        protected static WampRpcRuntimeException ConvertExceptionToRuntimeException(Exception exception)
-        {
-            // TODO: Maybe try a different implementation.
-            return new WampRpcRuntimeException(exception.Message);
-        }
     }
 }
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/AsyncMethodInfoRpcOperation.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/AsyncMethodInfoRpcOperation.cs
@@ -21,8 +21,8 @@ public class AsyncMethodInfoRpcOperation : AsyncLocalRpcOperation
         private readonly CollectionResultTreatment mCollectionResultTreatment;
         private IWampResultExtractor mResultExtractor;
 
-        public AsyncMethodInfoRpcOperation(Func<object> instanceProvider, MethodInfo method, string procedureName) :
-            base(procedureName)
+        public AsyncMethodInfoRpcOperation(Func<object> instanceProvider, MethodInfo method, string procedureName, ICalleeSettings settings = null) :
+            base(procedureName, settings)
         {
             mInstanceProvider = instanceProvider;
             mMethod = method;
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/CalleeSettings.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/CalleeSettings.cs
@@ -0,0 +1,26 @@
+﻿using System;
+
+namespace WampSharp.V2.Rpc
+{
+    public interface ICalleeSettings
+    {
+        WampRpcRuntimeException ConvertExceptionToRuntimeException(Exception exception);
+    }
+
+    public class CalleeSettings : ICalleeSettings
+    {
+        public bool IncludeExceptionStackTrace { get; set; }
+
+        public WampRpcRuntimeException ConvertExceptionToRuntimeException(Exception exception)
+        {
+            WampRpcRuntimeException result = new WampRpcRuntimeException(exception.Message);
+
+            if (IncludeExceptionStackTrace)
+            {
+                result.ArgumentsKeywords["stackTrace"] = exception.StackTrace;
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/ICalleeRegistrationInterceptor.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/ICalleeRegistrationInterceptor.cs
@@ -1,5 +1,6 @@
 ﻿using System.Reflection;
 using WampSharp.V2.Core.Contracts;
+using WampSharp.V2.Rpc;
 
 // ReSharper disable once CheckNamespace
 namespace WampSharp.V2
@@ -23,5 +24,10 @@ public interface ICalleeRegistrationInterceptor
         /// Gets the procedure uri that will be used to register the given method.
         /// </summary>
         string GetProcedureUri(MethodInfo method);
+
+        /// <summary>
+        /// Gets the settings to be used for the given method.
+        /// </summary>
+        ICalleeSettings GetSettings(MethodInfo method);
     }
 }
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/OperationExtractor.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/OperationExtractor.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading.Tasks;
-using WampSharp.Core.Utilities;
 using WampSharp.V2.Core.Contracts;
 using TaskExtensions = WampSharp.Core.Utilities.TaskExtensions;
 
@@ -58,27 +57,29 @@ protected IWampRpcOperation CreateRpcMethod(Func<object> instanceProvider, ICall
             string procedureUri =
                 interceptor.GetProcedureUri(method);
 
+            ICalleeSettings settings = interceptor.GetSettings(method);
+
             if (!typeof (Task).IsAssignableFrom(method.ReturnType))
             {
                 MethodInfoValidation.ValidateTupleReturnType(method);
-                return new SyncMethodInfoRpcOperation(instanceProvider, method, procedureUri);
+                return new SyncMethodInfoRpcOperation(instanceProvider, method, procedureUri, settings);
             }
             else
             {
                 if (method.IsDefined(typeof (WampProgressiveResultProcedureAttribute)))
                 {
                     MethodInfoValidation.ValidateProgressiveMethod(method);
-                    return CreateProgressiveOperation(instanceProvider, method, procedureUri);
+                    return CreateProgressiveOperation(instanceProvider, method, procedureUri, settings);
                 }
                 else
                 {
                     MethodInfoValidation.ValidateAsyncMethod(method);
-                    return new AsyncMethodInfoRpcOperation(instanceProvider, method, procedureUri);
+                    return new AsyncMethodInfoRpcOperation(instanceProvider, method, procedureUri, settings);
                 }
             }
         }
 
-        private static IWampRpcOperation CreateProgressiveOperation(Func<object> instanceProvider, MethodInfo method, string procedureUri)
+        private static IWampRpcOperation CreateProgressiveOperation(Func<object> instanceProvider, MethodInfo method, string procedureUri, ICalleeSettings settings)
         {
             //return new ProgressiveAsyncMethodInfoRpcOperation<returnType>
             // (instance, method, procedureUri);
@@ -94,7 +95,8 @@ private static IWampRpcOperation CreateProgressiveOperation(Func<object> instanc
                 (IWampRpcOperation) Activator.CreateInstance(operationType,
                     instanceProvider,
                     method,
-                    procedureUri);
+                    procedureUri,
+                    settings);
 
             return operation;
         }
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/ProgressiveAsyncMethodInfoRpcOperation.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/ProgressiveAsyncMethodInfoRpcOperation.cs
@@ -11,8 +11,8 @@ public class ProgressiveAsyncMethodInfoRpcOperation<T> : AsyncMethodInfoRpcOpera
     {
         private readonly RpcParameter[] mRpcParameters;
 
-        public ProgressiveAsyncMethodInfoRpcOperation(Func<object> instanceProvider, MethodInfo method, string procedureName) : 
-            base(instanceProvider, method, procedureName)
+        public ProgressiveAsyncMethodInfoRpcOperation(Func<object> instanceProvider, MethodInfo method, string procedureName, ICalleeSettings settings = null) : 
+            base(instanceProvider, method, procedureName, settings)
         {
             RpcParameter[] baseParameters = base.Parameters;
 
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/SyncMethodInfoRpcOperation.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/Reflection/SyncMethodInfoRpcOperation.cs
@@ -20,8 +20,8 @@ public class SyncMethodInfoRpcOperation : SyncLocalRpcOperation
         private readonly CollectionResultTreatment mCollectionResultTreatment;
         private IWampResultExtractor mResultExtractor;
 
-        public SyncMethodInfoRpcOperation(Func<object> instanceProvider, MethodInfo method, string procedureName) :
-            base(procedureName)
+        public SyncMethodInfoRpcOperation(Func<object> instanceProvider, MethodInfo method, string procedureName, ICalleeSettings settings = null) :
+            base(procedureName, settings)
         {
             mInstanceProvider = instanceProvider;
             mMethod = method;
diff --git a/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/SyncLocalRpcOperation.cs b/src/net45/WampSharp/WAMP2/V2/Rpc/Callee/SyncLocalRpcOperation.cs
@@ -9,8 +9,8 @@ namespace WampSharp.V2.Rpc
 {
     public abstract class SyncLocalRpcOperation: LocalRpcOperation
     {
-        protected SyncLocalRpcOperation(string procedure)
-            : base(procedure)
+        protected SyncLocalRpcOperation(string procedure, ICalleeSettings settings = null)
+            : base(procedure, settings)
         {
         }
 
diff --git a/src/net45/WampSharp/WampSharp.csproj b/src/net45/WampSharp/WampSharp.csproj
@@ -331,6 +331,7 @@
     <Compile Include="WAMP2\V2\Rpc\Callee\Reflection\CalleeRegistrationInterceptor.cs" />
     <Compile Include="WAMP2\V2\Api\CalleeProxy\ProgressiveAsyncCalleeProxyInterceptor.cs" />
     <Compile Include="WAMP2\V2\Api\CalleeProxy\ICalleeProxyInterceptor.cs" />
+    <Compile Include="WAMP2\V2\Rpc\Callee\Reflection\CalleeSettings.cs" />
     <Compile Include="WAMP2\V2\Rpc\Callee\Reflection\ICalleeRegistrationInterceptor.cs" />
     <Compile Include="WAMP2\V2\Rpc\Callee\Reflection\MethodInfoValidation.cs" />
     <Compile Include="Core\Utilities\MethodInvokeGenerator.cs" />

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ namespace WampSharp.V2.Rpc`
`10`	`10`	`{`
`11`	`11`	`public abstract class AsyncLocalRpcOperation: LocalRpcOperation`
`12`	`12`	`{`
`13`		`- protected AsyncLocalRpcOperation(string procedure) : base(procedure)`
	`13`	`+ protected AsyncLocalRpcOperation(string procedure, ICalleeSettings settings = null) :`
	`14`	`+ base(procedure, settings)`
`14`	`15`	`{`
`15`	`16`	`}`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,12 @@ public abstract class LocalRpcOperation : IWampRpcOperation`
`19`	`19`	`protected readonly static IWampFormatter<object> ObjectFormatter =`
`20`	`20`	`WampObjectFormatter.Value;`
`21`	`21`
`22`		`- protected LocalRpcOperation(string procedure)`
	`22`	`+ private readonly ICalleeSettings mSettings;`
	`23`	`+`
	`24`	`+ protected LocalRpcOperation(string procedure, ICalleeSettings settings = null)`
`23`	`25`	`{`
`24`	`26`	`mProcedure = procedure;`
	`27`	`+ mSettings = settings ?? new CalleeSettings();`
`25`	`28`	`mLogger = LogProvider.GetLogger(typeof (LocalRpcOperation) + "." + procedure);`
`26`	`29`	`}`
`27`	`30`
`@@ -121,6 +124,11 @@ protected void ValidateInstanceType(object instance, MethodInfo method)`
`121`	`124`	`}`
`122`	`125`	`}`
`123`	`126`
	`127`	`+ protected WampRpcRuntimeException ConvertExceptionToRuntimeException(Exception exception)`
	`128`	`+ {`
	`129`	`+ return mSettings.ConvertExceptionToRuntimeException(exception);`
	`130`	`+ }`
	`131`	`+`
`124`	`132`	`protected class WampRpcErrorCallback : IWampErrorCallback`
`125`	`133`	`{`
`126`	`134`	`private readonly IWampRawRpcOperationRouterCallback mCallback;`
`@@ -145,11 +153,5 @@ public void Error(object details, string error, object[] arguments, object argum`
`145`	`153`	`mCallback.Error(ObjectFormatter, details, error, arguments, argumentsKeywords);`
`146`	`154`	`}`
`147`	`155`	`}`
`148`		`-`
`149`		`- protected static WampRpcRuntimeException ConvertExceptionToRuntimeException(Exception exception)`
`150`		`- {`
`151`		`- // TODO: Maybe try a different implementation.`
`152`		`- return new WampRpcRuntimeException(exception.Message);`
`153`		`- }`
`154`	`156`	`}`
`155`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Reflection;`
`4`	`4`	`using System.Threading.Tasks;`
`5`		`-using WampSharp.Core.Utilities;`
`6`	`5`	`using WampSharp.V2.Core.Contracts;`
`7`	`6`	`using TaskExtensions = WampSharp.Core.Utilities.TaskExtensions;`
`8`	`7`
`@@ -58,27 +57,29 @@ protected IWampRpcOperation CreateRpcMethod(Func<object> instanceProvider, ICall`
`58`	`57`	`string procedureUri =`
`59`	`58`	`interceptor.GetProcedureUri(method);`
`60`	`59`
	`60`	`+ ICalleeSettings settings = interceptor.GetSettings(method);`
	`61`	`+`
`61`	`62`	`if (!typeof (Task).IsAssignableFrom(method.ReturnType))`
`62`	`63`	`{`
`63`	`64`	`MethodInfoValidation.ValidateTupleReturnType(method);`
`64`		`- return new SyncMethodInfoRpcOperation(instanceProvider, method, procedureUri);`
	`65`	`+ return new SyncMethodInfoRpcOperation(instanceProvider, method, procedureUri, settings);`
`65`	`66`	`}`
`66`	`67`	`else`
`67`	`68`	`{`
`68`	`69`	`if (method.IsDefined(typeof (WampProgressiveResultProcedureAttribute)))`
`69`	`70`	`{`
`70`	`71`	`MethodInfoValidation.ValidateProgressiveMethod(method);`
`71`		`- return CreateProgressiveOperation(instanceProvider, method, procedureUri);`
	`72`	`+ return CreateProgressiveOperation(instanceProvider, method, procedureUri, settings);`
`72`	`73`	`}`
`73`	`74`	`else`
`74`	`75`	`{`
`75`	`76`	`MethodInfoValidation.ValidateAsyncMethod(method);`
`76`		`- return new AsyncMethodInfoRpcOperation(instanceProvider, method, procedureUri);`
	`77`	`+ return new AsyncMethodInfoRpcOperation(instanceProvider, method, procedureUri, settings);`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`	`}`
`80`	`81`
`81`		`- private static IWampRpcOperation CreateProgressiveOperation(Func<object> instanceProvider, MethodInfo method, string procedureUri)`
	`82`	`+ private static IWampRpcOperation CreateProgressiveOperation(Func<object> instanceProvider, MethodInfo method, string procedureUri, ICalleeSettings settings)`
`82`	`83`	`{`
`83`	`84`	`//return new ProgressiveAsyncMethodInfoRpcOperation<returnType>`
`84`	`85`	`// (instance, method, procedureUri);`
`@@ -94,7 +95,8 @@ private static IWampRpcOperation CreateProgressiveOperation(Func<object> instanc`
`94`	`95`	`(IWampRpcOperation) Activator.CreateInstance(operationType,`
`95`	`96`	`instanceProvider,`
`96`	`97`	`method,`
`97`		`- procedureUri);`
	`98`	`+ procedureUri,`
	`99`	`+ settings);`
`98`	`100`
`99`	`101`	`return operation;`
`100`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ public class ProgressiveAsyncMethodInfoRpcOperation<T> : AsyncMethodInfoRpcOpera`
`11`	`11`	`{`
`12`	`12`	`private readonly RpcParameter[] mRpcParameters;`
`13`	`13`
`14`		`- public ProgressiveAsyncMethodInfoRpcOperation(Func<object> instanceProvider, MethodInfo method, string procedureName) :`
`15`		`- base(instanceProvider, method, procedureName)`
	`14`	`+ public ProgressiveAsyncMethodInfoRpcOperation(Func<object> instanceProvider, MethodInfo method, string procedureName, ICalleeSettings settings = null) :`
	`15`	`+ base(instanceProvider, method, procedureName, settings)`
`16`	`16`	`{`
`17`	`17`	`RpcParameter[] baseParameters = base.Parameters;`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ namespace WampSharp.V2.Rpc`
`9`	`9`	`{`
`10`	`10`	`public abstract class SyncLocalRpcOperation: LocalRpcOperation`
`11`	`11`	`{`
`12`		`- protected SyncLocalRpcOperation(string procedure)`
`13`		`- : base(procedure)`
	`12`	`+ protected SyncLocalRpcOperation(string procedure, ICalleeSettings settings = null)`
	`13`	`+ : base(procedure, settings)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`