Merge branch 'develop' of https://github.com/jacqueskang/IpcServiceFr…

…amework into develop
jacqueskang · Jun 30, 2018 · 8925593 · 8925593
2 parents a59044a + 43d5fb9
commit 8925593
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/src/JKang.IpcServiceFramework.Client/IpcServiceClient.cs b/src/JKang.IpcServiceFramework.Client/IpcServiceClient.cs
@@ -93,8 +93,8 @@ private static IpcRequest GetRequest(Expression exp, MyInterceptor interceptor)
         private async Task<IpcResponse> GetResponseAsync(IpcRequest request)
         {
             using (var client = new NamedPipeClientStream(".", _pipeName, PipeDirection.InOut, PipeOptions.None))
-            using (var writer = new IpcWriter(client, _serializer))
-            using (var reader = new IpcReader(client, _serializer))
+            using (var writer = new IpcWriter(client, _serializer, leaveOpen: true))
+            using (var reader = new IpcReader(client, _serializer, leaveOpen: true))
             {
                 await client.ConnectAsync();
 

diff --git a/src/JKang.IpcServiceFramework.Core/IO/IpcReader.cs b/src/JKang.IpcServiceFramework.Core/IO/IpcReader.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Text;
 
 namespace JKang.IpcServiceFramework.IO
 {
@@ -9,8 +10,12 @@ public class IpcReader : IDisposable
         private readonly IIpcMessageSerializer _serializer;
 
         public IpcReader(Stream stream, IIpcMessageSerializer serializer)
+            : this(stream, serializer, leaveOpen: false)
+        { }
+
+        public IpcReader(Stream stream, IIpcMessageSerializer serializer, bool leaveOpen)
         {
-            _reader = new BinaryReader(stream);
+            _reader = new BinaryReader(stream, Encoding.UTF8, leaveOpen);
             _serializer = serializer;
         }
 

diff --git a/src/JKang.IpcServiceFramework.Core/IO/IpcWriter.cs b/src/JKang.IpcServiceFramework.Core/IO/IpcWriter.cs
@@ -1,16 +1,21 @@
 using System;
 using System.IO;
+using System.Text;
 
 namespace JKang.IpcServiceFramework.IO
 {
-    public class IpcWriter: IDisposable
+    public class IpcWriter : IDisposable
     {
         private readonly BinaryWriter _writer;
         private readonly IIpcMessageSerializer _serializer;
 
         public IpcWriter(Stream stream, IIpcMessageSerializer serializer)
+            : this(stream, serializer, leaveOpen: false)
+        { }
+
+        public IpcWriter(Stream stream, IIpcMessageSerializer serializer, bool leaveOpen)
         {
-            _writer = new BinaryWriter(stream);
+            _writer = new BinaryWriter(stream, Encoding.UTF8, leaveOpen);
             _serializer = serializer;
         }
 

diff --git a/src/JKang.IpcServiceFramework.Core/Services/DefaultValueConverter.cs b/src/JKang.IpcServiceFramework.Core/Services/DefaultValueConverter.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 
 namespace JKang.IpcServiceFramework.Services
@@ -66,11 +67,19 @@ public bool TryConvert(object origValue, Type destType, out object destValue)
                 destValue = Convert.ChangeType(origValue, destType);
                 return true;
             }
-            catch (Exception)
+            catch
+            { }
+
+            try
             {
-                destValue = null;
-                return false;
+                destValue = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(origValue), destType);
+                return true;
             }
+            catch
+            { }
+
+            destValue = null;
+            return false;
         }
     }
 }
diff --git a/src/JKang.IpcServiceFramework.Server/IpcServiceHost.cs b/src/JKang.IpcServiceFramework.Server/IpcServiceHost.cs
@@ -57,8 +57,8 @@ public void Run()
         private void StartServerThread(object obj)
         {
             using (var server = new NamedPipeServerStream(_pipeName, PipeDirection.InOut, _options.ThreadCount))
-            using (var writer = new IpcWriter(server, _serializer))
-            using (var reader = new IpcReader(server, _serializer))
+            using (var writer = new IpcWriter(server, _serializer, leaveOpen: true))
+            using (var reader = new IpcReader(server, _serializer, leaveOpen: true))
             {
                 server.WaitForConnection();
 
@@ -83,10 +83,6 @@ private void StartServerThread(object obj)
                 {
                     _logger?.LogError(ex, ex.Message);
                 }
-                finally
-                {
-                    server.Close();
-                }
             }
         }