Enhancing samples.

dajuric · Jan 1, 2018 · aa64e23 · aa64e23
1 parent c88c321
commit aa64e23
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 6 deletions.
diff --git a/Samples/ClientJs/Program.cs b/Samples/ClientJs/Program.cs
@@ -1,5 +1,6 @@
 using SampleBase;
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -60,6 +61,7 @@ static void Main(string[] args)
             });
 
             Console.Write("{0} ", nameof(ClientJs));
+            Process.Start(new ProcessStartInfo(Path.GetFullPath("./Site/Index.html")) { UseShellExecute= true });
             AppExit.WaitFor(cts, t);
         }
     }

diff --git a/Samples/ClientJs/Site/Index.html b/Samples/ClientJs/Site/Index.html
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <title>Client JS</title>
         <script src="LocalAPI.js"></script>
     </head>
 

diff --git a/Samples/MultiService/Program.cs b/Samples/MultiService/Program.cs
@@ -1,5 +1,6 @@
 using SampleBase;
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using WebSocketRPC;
@@ -66,6 +67,7 @@ static void Main(string[] args)
             });
 
             Console.Write("{0} ", nameof(MultiService));
+            Process.Start(new ProcessStartInfo(Path.GetFullPath("./Site/Index.html")) { UseShellExecute = true });
             AppExit.WaitFor(cts, t);
         }
     }

diff --git a/Samples/MultiService/Site/Index.html b/Samples/MultiService/Site/Index.html
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <title>Multi service</title>
         <script src="NumericService.js"></script>
         <script src="TextService.js"></script>
     </head>

diff --git a/Samples/README.md b/Samples/README.md
@@ -35,5 +35,4 @@ The recommendation is to run samples in the following order (from the more simpl
     *Server has reporting service initiatted and stopped on the client's request.*
 
 **Remarks**  
-+ If a sample contains JavaScript client, open the corresponding *'Index.html'*.
 + Samples that contain multiple executables have *'Run.bat'* for one-click run.
diff --git a/Samples/RawMsgJs/Program.cs b/Samples/RawMsgJs/Program.cs
@@ -1,5 +1,6 @@
 using SampleBase;
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -46,6 +47,7 @@ static void Main(string[] args)
             });
 
             Console.Write("{0} ", nameof(RawMsgJs));
+            Process.Start(new ProcessStartInfo(Path.GetFullPath("./Site/Index.html")) { UseShellExecute = true });
             AppExit.WaitFor(cts, t);
         }
     }

diff --git a/Samples/RawMsgJs/Site/Index.html b/Samples/RawMsgJs/Site/Index.html
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <title>Raw messaging</title>
         <script src="MessagingAPI.js"></script>
     </head>
 

diff --git a/Samples/Serialization/Program.cs b/Samples/Serialization/Program.cs
@@ -7,6 +7,7 @@
 using WebSocketRPC;
 using System.Runtime.CompilerServices;
 using SampleBase;
+using System.Diagnostics;
 
 namespace Serialization
 {
@@ -89,6 +90,7 @@ static void Main(string[] args)
             var t = Server.ListenAsync("http://localhost:8001/", cts.Token, (c, ws) => c.Bind(new ImageProcessingAPI()));
 
             Console.Write("{0} ", nameof(Serialization));
+            Process.Start(new ProcessStartInfo(Path.GetFullPath("../../Site/Index.html")) { UseShellExecute = true });
             AppExit.WaitFor(cts, t);
         }
     }

diff --git a/Samples/Serialization/Site/Index.html b/Samples/Serialization/Site/Index.html
@@ -1,5 +1,6 @@
 <html>
     <head>
+        <title>Serialization</title>
         <script src="ImageProcessingAPI.js"></script>
     </head>
 

diff --git a/Samples/ServerClientSample/Run.bat b/Samples/ServerClientSample/Run.bat
@@ -1,5 +1,6 @@
-set serverApp = "Server\bin\Server.exe"
-set clientApp = "Client\bin\Client.exe"
+set currPath="%cd%
+set serverPath="%cd%\Server\bin\net47"
+set clientPath="%cd%\Client\bin\net47"
 
 if NOT EXIST %serverApp% (
   echo Build 'Server' project first.
@@ -11,6 +12,10 @@ if NOT EXIST %clientApp% (
   goto :eof
 )
 
-start %serverApp%
-timeout 1>nul
-start %clientApp%
+cd %serverPath%
+start Server.exe
+timeout /T 1  > nul
+cd %clientPath%
+start Client.exe
+
+cd %currPath%
diff --git a/Source/WebSocketRPC.Base/Invokers/RemoteInvoker.cs b/Source/WebSocketRPC.Base/Invokers/RemoteInvoker.cs
@@ -74,6 +74,8 @@ public void Dispose()
             }
         }
 
+        #region Static
+
         static HashSet<Type> verifiedTypes = new HashSet<Type>();
 
         static void verifyType()
@@ -88,6 +90,8 @@ static void verifyType()
                 throw new NotSupportedException($"The interface '{typeof(TInterface).Name}' must not declare any properties: { String.Join(", ", propertyList.Select(x => x.Name)) }.");
         }
 
+        #endregion
+
         Func<Request, Task> sendAsync;
         ConcurrentDictionary<string, RpcWaiter> runningMethods;
 

diff --git a/Source/WebSocketRPC.JS/ClassDiagram1.cd b/Source/WebSocketRPC.JS/ClassDiagram1.cd
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram /> 
diff --git a/Source/WebsocketRPC.Standalone/ClassDiagram1.cd b/Source/WebsocketRPC.Standalone/ClassDiagram1.cd
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram /> 
diff --git a/Source/WebsocketRPC.Standalone/ClassDiagram2.cd b/Source/WebsocketRPC.Standalone/ClassDiagram2.cd
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram /> 
diff --git a/Source/WebsocketRPC.Standalone/ClassDiagram3.cd b/Source/WebsocketRPC.Standalone/ClassDiagram3.cd
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram /> 
diff --git a/Source/WebsocketRPC.Standalone/ClassDiagram4.cd b/Source/WebsocketRPC.Standalone/ClassDiagram4.cd
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram />
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="utf-8"?>
		<ClassDiagram />