Improved InProcessClient significantly

Astn · Astn · commit 8d052a2fd0ef · 2014-03-08T01:43:40.000-07:00
diff --git a/AustinHarris.JsonRpcTest/UnitTest1.cs b/AustinHarris.JsonRpcTest/UnitTest1.cs
@@ -7,9 +7,14 @@ namespace UnitTests
     [TestClass]
     public class UnitTest1
     {
-        static object[] services = new object[] {
-           new CalculatorService()
-        };
+        static object[] services ;
+
+        static UnitTest1()
+        {
+            services = new object[] {
+           new CalculatorService()};
+        
+        }
 
         [TestMethod]
         public void TestInProcessClient()
diff --git a/Json-Rpc/Client/InProcessJsonRpcClient.cs b/Json-Rpc/Client/InProcessJsonRpcClient.cs
@@ -9,53 +9,37 @@ namespace AustinHarris.JsonRpc.Client
 {
     public class InProcessClient
     {
-        private static Dictionary<long, AustinHarris.JsonRpc.JsonResponse> results = new Dictionary<long, AustinHarris.JsonRpc.JsonResponse>();
-        private static Dictionary<long, ManualResetEvent> resultSignals = new Dictionary<long, ManualResetEvent>();
         /// <summary>
-        /// This is not very performant with all the conversions going on.
+        /// Simple wrapper around JsonRpcProcessor.Process
         /// </summary>
         /// <param name="jsonrpc"></param>
         /// <returns></returns>
         public static Task<string> Invoke(string jsonrpc)
         {
             var request = Newtonsoft.Json.JsonConvert.DeserializeObject<AustinHarris.JsonRpc.JsonRequest>(jsonrpc);
+            var taskSource = new TaskCompletionSource<string>();
 
-            // we need to remember this ID so we can return a task when we get a response with this ID.
-            var resultTask = Task<string>.Factory.StartNew(_id =>
-            {
-                var myid = (long)_id;
-
-                ManualResetEvent mr = new ManualResetEvent(false);
-                resultSignals[myid] = mr;
-                mr.WaitOne();
-                var result = results[myid];
-                // clean up dictionary
-                results.Remove(myid);
-                resultSignals.Remove(myid);
-                return Newtonsoft.Json.JsonConvert.SerializeObject(result);
-            }, request.Id);// Probly need to add a continuation to check for errors and 
-            // clean up our dictionarys there also..
-
-            var rpcResultHandler = new AsyncCallback(_ => 
-                {
-                    var response = ((JsonRpcStateAsync)_).Result;
-                    DispatchResults(Newtonsoft.Json.JsonConvert.DeserializeObject<AustinHarris.JsonRpc.JsonResponse>(response));
-                });
+            var mc = new IAsyncWrapper(taskSource);
             
-            var async = new JsonRpcStateAsync(rpcResultHandler, null);
+            var async = new JsonRpcStateAsync(mc.AsyncCallback, null);
             async.JsonRpc = jsonrpc;
             JsonRpcProcessor.Process(async);
 
-            return resultTask;
+            return taskSource.Task;
         }
 
-        private static void DispatchResults(JsonResponse response)
+        private class IAsyncWrapper
         {
-            // find our signal and result dictionary.
-            var signal = resultSignals[(long)response.Id];// must be long
-            // store our result
-            results[(long)response.Id] = response;
-            signal.Set();
+            TaskCompletionSource<string> foo;
+            public IAsyncWrapper(TaskCompletionSource<string> item)
+            {
+                foo = item;
+            }
+
+            public void AsyncCallback(IAsyncResult ar)
+            {
+                foo.SetResult(((JsonRpcStateAsync)ar).Result);
+            }
         }
     }
 }
