fix Ext.cs, WebSocket.cs and Add wsclient1/*

Author: sta

websocket-sharp.sln

@@ -5,6 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "websocket-sharp", "websocke
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wsclient", "wsclient\wsclient.csproj", "{52805AEC-EFB1-4F42-BB8E-3ED4E692C568}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wsclient1", "wsclient1\wsclient1.csproj", "{B0B609B7-A81C-46B0-A9B8-82E9716D355B}"
+EndProject
 Global
 GlobalSection(SolutionConfigurationPlatforms) = preSolution
 Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,14 @@ Global
 {52805AEC-EFB1-4F42-BB8E-3ED4E692C568}.Release_Ubuntu|Any CPU.Build.0 = Release_Ubuntu|Any CPU
 {52805AEC-EFB1-4F42-BB8E-3ED4E692C568}.Release|Any CPU.ActiveCfg = Release|Any CPU
 {52805AEC-EFB1-4F42-BB8E-3ED4E692C568}.Release|Any CPU.Build.0 = Release|Any CPU
+{B0B609B7-A81C-46B0-A9B8-82E9716D355B}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug_Ubuntu|Any CPU
+{B0B609B7-A81C-46B0-A9B8-82E9716D355B}.Debug_Ubuntu|Any CPU.Build.0 = Debug_Ubuntu|Any CPU
+{B0B609B7-A81C-46B0-A9B8-82E9716D355B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+{B0B609B7-A81C-46B0-A9B8-82E9716D355B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+{B0B609B7-A81C-46B0-A9B8-82E9716D355B}.Release_Ubuntu|Any CPU.ActiveCfg = Release_Ubuntu|Any CPU
+{B0B609B7-A81C-46B0-A9B8-82E9716D355B}.Release_Ubuntu|Any CPU.Build.0 = Release_Ubuntu|Any CPU
+{B0B609B7-A81C-46B0-A9B8-82E9716D355B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+{B0B609B7-A81C-46B0-A9B8-82E9716D355B}.Release|Any CPU.Build.0 = Release|Any CPU
 {B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug_Ubuntu|Any CPU
 {B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Debug_Ubuntu|Any CPU.Build.0 = Debug_Ubuntu|Any CPU
 {B357BAC7-529E-4D81-A0D2-71041B19C8DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

websocket-sharp.userprefs

@@ -2,7 +2,7 @@
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug_Ubuntu" ctype="Workspace" />
  <MonoDevelop.Ide.Workbench ActiveDocument="websocket-sharp/WebSocket.cs" ctype="Workbench">
  <Files>
- <File FileName="websocket-sharp/WebSocket.cs" Line="321" Column="66" />
+ <File FileName="websocket-sharp/WebSocket.cs" Line="142" Column="22" />
  </Files>
  </MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.DebuggingService.Breakpoints>

websocket-sharp/Ext.cs

@@ -93,7 +93,7 @@ public static Byte[] InitializeWithPrintableASCII(this Byte[] bytes, Random rand
  return bytes; 
  }
 
- public static void NotEqualsDo(this string expected, string actual, Action<string, string> act)
+ public static void AreNotEqualDo(this string expected, string actual, Action<string, string> act)
  {
  if (expected != actual)
  {

websocket-sharp/WebSocket.cs

@@ -129,8 +129,41 @@ public WebSocket(string url, string protocol)
  this.protocol = protocol;
  }
 
+ public WebSocket(
+ string url,
+ EventHandler onOpen,
+ MessageEventHandler onMessage,
+ MessageEventHandler onError,
+ EventHandler onClose)
+ : this(url, String.Empty, onOpen, onMessage, onError, onClose)
+ {
+ }
+
+ public WebSocket(
+ string url,
+ string protocol,
+ EventHandler onOpen,
+ MessageEventHandler onMessage,
+ MessageEventHandler onError,
+ EventHandler onClose)
+ : this(url, protocol)
+ {
+ this.OnOpen += onOpen;
+ this.OnMessage += onMessage;
+ this.OnError += onError;
+ this.OnClose += onClose;
+ 
+ Connect();
+ }
+
  public void Connect()
  {
+ if (readyState == WsState.OPEN)
+ {
+ Console.WriteLine("WS: Info @Connect: Connection is already established.");
+ return;
+ }
+
  createConnection();
  doHandshake();
 
@@ -286,9 +319,10 @@ private void doHandshake()
  { 
  throw new IOException("Invalid handshake response: " + a);
  };
- "HTTP/1.1 101 WebSocket Protocol Handshake".NotEqualsDo(response[0], act);
- "Upgrade: WebSocket".NotEqualsDo(response[1], act);
- "Connection: Upgrade".NotEqualsDo(response[2], act);
+
+ "HTTP/1.1 101 WebSocket Protocol Handshake".AreNotEqualDo(response[0], act);
+ "Upgrade: WebSocket".AreNotEqualDo(response[1], act);
+ "Connection: Upgrade".AreNotEqualDo(response[2], act);
 
  for (int i = 3; i < response.Length; i++)
  {
@@ -305,13 +339,13 @@ private void doHandshake()
  string expectedResToHexStr = BitConverter.ToString(expectedRes);
  string actualResToHexStr = BitConverter.ToString(actualRes);
 
- expectedResToHexStr.NotEqualsDo(actualResToHexStr, (e, a) =>
+ expectedResToHexStr.AreNotEqualDo(actualResToHexStr, (e, a) =>
  {
- #if DEBUG
+#if DEBUG
  Console.WriteLine("WS: Error @doHandshake: Invalid challenge response.");
  Console.WriteLine("\texpected: {0}", e);
  Console.WriteLine("\tactual : {0}", a);
- #endif
+#endif
  throw new IOException("Invalid challenge response: " + a);
  });