diff --git a/Example/Example.pidb b/Example/Example.pidb index 9d9da458..65ebf67a 100644 Binary files a/Example/Example.pidb and b/Example/Example.pidb differ diff --git a/Example/Program.cs b/Example/Program.cs index b555e452..140a62a3 100644 --- a/Example/Program.cs +++ b/Example/Program.cs @@ -112,6 +112,7 @@ namespace Example }; //ws.Origin = "http://echo.websocket.org"; + //ws.Compression = CompressionMethod.DEFLATE; //ws.SetCookie(new Cookie("nobita", "\"idiot, gunfighter\"")); //ws.SetCookie(new Cookie("dora", "tanuki")); ws.Connect(); diff --git a/Example/bin/Debug/example.exe b/Example/bin/Debug/example.exe index 846d455e..6c49cf39 100755 Binary files a/Example/bin/Debug/example.exe and b/Example/bin/Debug/example.exe differ diff --git a/Example/bin/Debug/example.exe.mdb b/Example/bin/Debug/example.exe.mdb index 76a51d96..5fdf189e 100644 Binary files a/Example/bin/Debug/example.exe.mdb and b/Example/bin/Debug/example.exe.mdb differ diff --git a/Example/bin/Debug/websocket-sharp.dll b/Example/bin/Debug/websocket-sharp.dll index 2b106f78..ed954f80 100755 Binary files a/Example/bin/Debug/websocket-sharp.dll and b/Example/bin/Debug/websocket-sharp.dll differ diff --git a/Example/bin/Debug/websocket-sharp.dll.mdb b/Example/bin/Debug/websocket-sharp.dll.mdb index 87d20b61..bd3d675e 100644 Binary files a/Example/bin/Debug/websocket-sharp.dll.mdb and b/Example/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example/bin/Debug_Ubuntu/example.exe b/Example/bin/Debug_Ubuntu/example.exe index 9b6571cf..7e482df7 100755 Binary files a/Example/bin/Debug_Ubuntu/example.exe and b/Example/bin/Debug_Ubuntu/example.exe differ diff --git a/Example/bin/Debug_Ubuntu/example.exe.mdb b/Example/bin/Debug_Ubuntu/example.exe.mdb index 38e8176b..ceae5d8c 100644 Binary files a/Example/bin/Debug_Ubuntu/example.exe.mdb and b/Example/bin/Debug_Ubuntu/example.exe.mdb differ diff --git a/Example/bin/Debug_Ubuntu/websocket-sharp.dll b/Example/bin/Debug_Ubuntu/websocket-sharp.dll index 7bdd9999..0c316954 100755 Binary files a/Example/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 804869eb..c8c152db 100644 Binary files a/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example/bin/Release/example.exe b/Example/bin/Release/example.exe index 94857832..437316d2 100755 Binary files a/Example/bin/Release/example.exe and b/Example/bin/Release/example.exe differ diff --git a/Example/bin/Release/websocket-sharp.dll b/Example/bin/Release/websocket-sharp.dll index 35be825e..8aa2d7df 100755 Binary files a/Example/bin/Release/websocket-sharp.dll and b/Example/bin/Release/websocket-sharp.dll differ diff --git a/Example/bin/Release_Ubuntu/example.exe b/Example/bin/Release_Ubuntu/example.exe index ce78364c..3f98096e 100755 Binary files a/Example/bin/Release_Ubuntu/example.exe and b/Example/bin/Release_Ubuntu/example.exe differ diff --git a/Example/bin/Release_Ubuntu/websocket-sharp.dll b/Example/bin/Release_Ubuntu/websocket-sharp.dll index f663f380..baf9e312 100755 Binary files a/Example/bin/Release_Ubuntu/websocket-sharp.dll and b/Example/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/Example1/AudioStreamer.cs b/Example1/AudioStreamer.cs index 5b81cca9..dce931e2 100644 --- a/Example1/AudioStreamer.cs +++ b/Example1/AudioStreamer.cs @@ -120,6 +120,8 @@ namespace Example1 ); }; + //_ws.Compression = CompressionMethod.DEFLATE; + _notifyMsgState = new ThreadState(); _notifyMsg = (state) => { diff --git a/Example1/Example1.pidb b/Example1/Example1.pidb index 4bb84f9d..3856493a 100644 Binary files a/Example1/Example1.pidb and b/Example1/Example1.pidb differ diff --git a/Example1/bin/Debug/example1.exe b/Example1/bin/Debug/example1.exe index b41fb166..bdadd1cf 100755 Binary files a/Example1/bin/Debug/example1.exe and b/Example1/bin/Debug/example1.exe differ diff --git a/Example1/bin/Debug/example1.exe.mdb b/Example1/bin/Debug/example1.exe.mdb index 258da593..7b1fd18f 100644 Binary files a/Example1/bin/Debug/example1.exe.mdb and b/Example1/bin/Debug/example1.exe.mdb differ diff --git a/Example1/bin/Debug/websocket-sharp.dll b/Example1/bin/Debug/websocket-sharp.dll index 2b106f78..ed954f80 100755 Binary files a/Example1/bin/Debug/websocket-sharp.dll and b/Example1/bin/Debug/websocket-sharp.dll differ diff --git a/Example1/bin/Debug/websocket-sharp.dll.mdb b/Example1/bin/Debug/websocket-sharp.dll.mdb index 87d20b61..bd3d675e 100644 Binary files a/Example1/bin/Debug/websocket-sharp.dll.mdb and b/Example1/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example1/bin/Debug_Ubuntu/example1.exe b/Example1/bin/Debug_Ubuntu/example1.exe index 2aba5157..2b2697b5 100755 Binary files a/Example1/bin/Debug_Ubuntu/example1.exe and b/Example1/bin/Debug_Ubuntu/example1.exe differ diff --git a/Example1/bin/Debug_Ubuntu/example1.exe.mdb b/Example1/bin/Debug_Ubuntu/example1.exe.mdb index 09b14c1a..494617f8 100644 Binary files a/Example1/bin/Debug_Ubuntu/example1.exe.mdb and b/Example1/bin/Debug_Ubuntu/example1.exe.mdb differ diff --git a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll index 7bdd9999..0c316954 100755 Binary files a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 804869eb..c8c152db 100644 Binary files a/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example1/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example1/bin/Release/example1.exe b/Example1/bin/Release/example1.exe index 8b6c2ac8..0b73b2d7 100755 Binary files a/Example1/bin/Release/example1.exe and b/Example1/bin/Release/example1.exe differ diff --git a/Example1/bin/Release/websocket-sharp.dll b/Example1/bin/Release/websocket-sharp.dll index 35be825e..8aa2d7df 100755 Binary files a/Example1/bin/Release/websocket-sharp.dll and b/Example1/bin/Release/websocket-sharp.dll differ diff --git a/Example1/bin/Release_Ubuntu/example1.exe b/Example1/bin/Release_Ubuntu/example1.exe index df96386e..31d9840a 100755 Binary files a/Example1/bin/Release_Ubuntu/example1.exe and b/Example1/bin/Release_Ubuntu/example1.exe differ diff --git a/Example1/bin/Release_Ubuntu/websocket-sharp.dll b/Example1/bin/Release_Ubuntu/websocket-sharp.dll index f663f380..baf9e312 100755 Binary files a/Example1/bin/Release_Ubuntu/websocket-sharp.dll and b/Example1/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/Example2/bin/Debug/example2.exe b/Example2/bin/Debug/example2.exe index 709dcab6..0f05913e 100755 Binary files a/Example2/bin/Debug/example2.exe and b/Example2/bin/Debug/example2.exe differ diff --git a/Example2/bin/Debug/example2.exe.mdb b/Example2/bin/Debug/example2.exe.mdb index 4c1a64de..01cbd7fa 100644 Binary files a/Example2/bin/Debug/example2.exe.mdb and b/Example2/bin/Debug/example2.exe.mdb differ diff --git a/Example2/bin/Debug/websocket-sharp.dll b/Example2/bin/Debug/websocket-sharp.dll index 2b106f78..ed954f80 100755 Binary files a/Example2/bin/Debug/websocket-sharp.dll and b/Example2/bin/Debug/websocket-sharp.dll differ diff --git a/Example2/bin/Debug/websocket-sharp.dll.mdb b/Example2/bin/Debug/websocket-sharp.dll.mdb index 87d20b61..bd3d675e 100644 Binary files a/Example2/bin/Debug/websocket-sharp.dll.mdb and b/Example2/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example2/bin/Debug_Ubuntu/example2.exe b/Example2/bin/Debug_Ubuntu/example2.exe index a025f78b..2b674880 100755 Binary files a/Example2/bin/Debug_Ubuntu/example2.exe and b/Example2/bin/Debug_Ubuntu/example2.exe differ diff --git a/Example2/bin/Debug_Ubuntu/example2.exe.mdb b/Example2/bin/Debug_Ubuntu/example2.exe.mdb index 299127e5..d45cee8b 100644 Binary files a/Example2/bin/Debug_Ubuntu/example2.exe.mdb and b/Example2/bin/Debug_Ubuntu/example2.exe.mdb differ diff --git a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll index 7bdd9999..0c316954 100755 Binary files a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 804869eb..c8c152db 100644 Binary files a/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example2/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example2/bin/Release/example2.exe b/Example2/bin/Release/example2.exe index 58def33c..be6adbee 100755 Binary files a/Example2/bin/Release/example2.exe and b/Example2/bin/Release/example2.exe differ diff --git a/Example2/bin/Release/websocket-sharp.dll b/Example2/bin/Release/websocket-sharp.dll index 35be825e..8aa2d7df 100755 Binary files a/Example2/bin/Release/websocket-sharp.dll and b/Example2/bin/Release/websocket-sharp.dll differ diff --git a/Example2/bin/Release_Ubuntu/example2.exe b/Example2/bin/Release_Ubuntu/example2.exe index cc206c9e..afe08830 100755 Binary files a/Example2/bin/Release_Ubuntu/example2.exe and b/Example2/bin/Release_Ubuntu/example2.exe differ diff --git a/Example2/bin/Release_Ubuntu/websocket-sharp.dll b/Example2/bin/Release_Ubuntu/websocket-sharp.dll index f663f380..baf9e312 100755 Binary files a/Example2/bin/Release_Ubuntu/websocket-sharp.dll and b/Example2/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/Example3/bin/Debug/Example3.exe b/Example3/bin/Debug/Example3.exe index 3fd0bc03..cc188fee 100755 Binary files a/Example3/bin/Debug/Example3.exe and b/Example3/bin/Debug/Example3.exe differ diff --git a/Example3/bin/Debug/Example3.exe.mdb b/Example3/bin/Debug/Example3.exe.mdb index 1b9b2738..c14f944d 100644 Binary files a/Example3/bin/Debug/Example3.exe.mdb and b/Example3/bin/Debug/Example3.exe.mdb differ diff --git a/Example3/bin/Debug/websocket-sharp.dll b/Example3/bin/Debug/websocket-sharp.dll index 2b106f78..ed954f80 100755 Binary files a/Example3/bin/Debug/websocket-sharp.dll and b/Example3/bin/Debug/websocket-sharp.dll differ diff --git a/Example3/bin/Debug/websocket-sharp.dll.mdb b/Example3/bin/Debug/websocket-sharp.dll.mdb index 87d20b61..bd3d675e 100644 Binary files a/Example3/bin/Debug/websocket-sharp.dll.mdb and b/Example3/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe b/Example3/bin/Debug_Ubuntu/Example3.exe index 6309b6ec..07dc44c3 100755 Binary files a/Example3/bin/Debug_Ubuntu/Example3.exe and b/Example3/bin/Debug_Ubuntu/Example3.exe differ diff --git a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb index 99d939e5..8bbb431d 100644 Binary files a/Example3/bin/Debug_Ubuntu/Example3.exe.mdb and b/Example3/bin/Debug_Ubuntu/Example3.exe.mdb differ diff --git a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll index 7bdd9999..0c316954 100755 Binary files a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll and b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 804869eb..c8c152db 100644 Binary files a/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/Example3/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/Example3/bin/Release/Example3.exe b/Example3/bin/Release/Example3.exe index b3e9c2e7..d4aa5d9a 100755 Binary files a/Example3/bin/Release/Example3.exe and b/Example3/bin/Release/Example3.exe differ diff --git a/Example3/bin/Release/websocket-sharp.dll b/Example3/bin/Release/websocket-sharp.dll index 35be825e..8aa2d7df 100755 Binary files a/Example3/bin/Release/websocket-sharp.dll and b/Example3/bin/Release/websocket-sharp.dll differ diff --git a/Example3/bin/Release_Ubuntu/Example3.exe b/Example3/bin/Release_Ubuntu/Example3.exe index c61c2ea1..1152db10 100755 Binary files a/Example3/bin/Release_Ubuntu/Example3.exe and b/Example3/bin/Release_Ubuntu/Example3.exe differ diff --git a/Example3/bin/Release_Ubuntu/websocket-sharp.dll b/Example3/bin/Release_Ubuntu/websocket-sharp.dll index f663f380..baf9e312 100755 Binary files a/Example3/bin/Release_Ubuntu/websocket-sharp.dll and b/Example3/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/CompressionMethod.cs b/websocket-sharp/CompressionMethod.cs new file mode 100644 index 00000000..a1003b72 --- /dev/null +++ b/websocket-sharp/CompressionMethod.cs @@ -0,0 +1,52 @@ +#region License +/* + * CompressionMethod.cs + * + * The MIT License + * + * Copyright (c) 2013 sta.blockhead + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#endregion + +using System; + +namespace WebSocketSharp { + + /// + /// Contains the values of the compression methods used to compress the payload data of the WebSocket Data frame. + /// + /// + /// The CompressionMethod enumeration contains the values of the compression methods defined in + /// WebSocket Per-message Compression + /// specification for a WebSocket extension. + /// + public enum CompressionMethod : byte + { + /// + /// Indicates non compression. + /// + NONE, + /// + /// Indicates using DEFLATE. + /// + DEFLATE + } +} diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs index 3a55b2a4..9cc26ee1 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -115,14 +115,60 @@ namespace WebSocketSharp { internal static bool IsToken(this string value) { foreach (char c in value) - { if (c < 0x20 || c >= 0x7f || _tspecials.Contains(c)) return false; - } return true; } + internal static string Quote(this string value) + { + return value.IsToken() + ? value + : String.Format("\"{0}\"", value.Replace("\"", "\\\"")); + } + + internal static IEnumerable SplitHeaderValue(this string value, params char[] separator) + { + var separators = new string(separator); + var buffer = new StringBuilder(64); + int len = value.Length; + bool quoted = false; + bool escaped = false; + for (int i = 0; i < len; i++) + { + char c = value[i]; + if (c == '"') + { + if (escaped) + escaped = !escaped; + else + quoted = !quoted; + } + else if (c == '\\') + { + if (i < len - 1 && value[i + 1] == '"') + escaped = true; + } + else if (separators.Contains(c)) + { + if (!quoted) + { + yield return buffer.ToString(); + buffer.Length = 0; + continue; + } + } + else { + } + + buffer.Append(c); + } + + if (buffer.Length > 0) + yield return buffer.ToString(); + } + #endregion #region Public Methods @@ -547,17 +593,17 @@ namespace WebSocketSharp { } /// - /// Determines whether the specified is a . + /// Determines whether the specified is empty. /// /// - /// true if is ; otherwise, false. + /// true if is empty; otherwise, false. /// /// /// A to test. /// public static bool IsEmpty(this string value) { - return value == String.Empty ? true : false; + return value.Length == 0; } /// @@ -628,18 +674,18 @@ namespace WebSocketSharp { /// Determines whether the specified object is . /// /// - /// true if the parameter is ; otherwise, false. + /// true if is ; otherwise, false. /// /// - /// A class to test. + /// An object to test. /// /// - /// The type of the parameter. + /// The type of parameter. /// public static bool IsNull(this T obj) where T : class { - return obj == null ? true : false; + return obj == null; } /// @@ -671,17 +717,17 @@ namespace WebSocketSharp { } /// - /// Determines whether the specified is or . + /// Determines whether the specified is or empty. /// /// - /// true if the parameter is or ; otherwise, false. + /// true if the parameter is or empty; otherwise, false. /// /// /// A to test. /// public static bool IsNullOrEmpty(this string value) { - return String.IsNullOrEmpty(value); + return value.IsNull() || value.IsEmpty(); } /// diff --git a/websocket-sharp/MessageEventArgs.cs b/websocket-sharp/MessageEventArgs.cs index 73cbc531..89843f01 100644 --- a/websocket-sharp/MessageEventArgs.cs +++ b/websocket-sharp/MessageEventArgs.cs @@ -68,7 +68,7 @@ namespace WebSocketSharp { /// public string Data { get { - return ((Opcode.TEXT | Opcode.PING | Opcode.PONG) & _type) == _type + return _type == Opcode.TEXT || _type == Opcode.PING || _type == Opcode.PONG ? _data.Length > 0 ? Encoding.UTF8.GetString(_data.ToByteArray()) : String.Empty diff --git a/websocket-sharp/Net/Cookie.cs b/websocket-sharp/Net/Cookie.cs index 2cb7ab8f..d8cc016d 100644 --- a/websocket-sharp/Net/Cookie.cs +++ b/websocket-sharp/Net/Cookie.cs @@ -549,15 +549,6 @@ namespace WebSocketSharp.Net { return i ^ (j << 13 | j >> 19) ^ (k << 26 | k >> 6) ^ (l << 7 | l >> 25) ^ (m << 20 | m >> 12); } - // See para 3.6 of RFC 2616 - string Quote (string value) - { - if (version == 0 || value.IsToken ()) - return value; - else - return "\"" + value.Replace("\"", "\\\"") + "\""; - } - string ToResponseStringVersion0 () { var result = new StringBuilder (64); @@ -605,7 +596,7 @@ namespace WebSocketSharp.Net { result.AppendFormat ("; Comment={0}", comment.UrlEncode ()); if (!commentUri.IsNull ()) - result.AppendFormat ("; CommentURL={0}", Quote (commentUri.OriginalString)); + result.AppendFormat ("; CommentURL={0}", commentUri.OriginalString.Quote ()); if (discard) result.Append ("; Discard"); diff --git a/websocket-sharp/Net/CookieCollection.cs b/websocket-sharp/Net/CookieCollection.cs index ec84af6d..fe08e9b2 100644 --- a/websocket-sharp/Net/CookieCollection.cs +++ b/websocket-sharp/Net/CookieCollection.cs @@ -401,37 +401,7 @@ namespace WebSocketSharp.Net { static IEnumerable Split (string value) { - var buffer = new StringBuilder (64); - int len = value.Length; - bool quoted = false; - bool escaped = false; - for (int i = 0; i < len; i++) { - char c = value [i]; - if (c == '"') { - if (escaped) - escaped = !escaped; - else - quoted = !quoted; - } - else if (c == '\\') { - if (i < len - 1 && value [i + 1] == '"') - escaped = true; - } - else if (c == ',' || c == ';') { - if (!quoted) { - yield return buffer.ToString (); - buffer.Length = 0; - continue; - } - } - else { - } - - buffer.Append (c); - } - - if (buffer.Length > 0) - yield return buffer.ToString (); + return value.SplitHeaderValue (',', ';'); } #endregion diff --git a/websocket-sharp/Opcode.cs b/websocket-sharp/Opcode.cs index 335dd6dd..b3ca4fc9 100644 --- a/websocket-sharp/Opcode.cs +++ b/websocket-sharp/Opcode.cs @@ -37,7 +37,6 @@ namespace WebSocketSharp { /// The Opcode enumeration contains the values of the opcodes defined in /// RFC 6455 for the WebSocket protocol. /// - [Flags] public enum Opcode : byte { /// diff --git a/websocket-sharp/PayloadData.cs b/websocket-sharp/PayloadData.cs index dd2d48c3..ba953299 100644 --- a/websocket-sharp/PayloadData.cs +++ b/websocket-sharp/PayloadData.cs @@ -29,6 +29,8 @@ using System; using System.Collections; using System.Collections.Generic; +using System.IO; +using System.IO.Compression; using System.Linq; using System.Text; @@ -126,6 +128,48 @@ namespace WebSocketSharp { #region Private Methods + private static byte[] compress(byte[] value) + { + if (value.LongLength == 0) + //return new Byte[] { 0x00, 0x00, 0x00, 0xff, 0xff }; + return value; + + using (var comp = new MemoryStream()) + using (var ds = new DeflateStream(comp, CompressionMode.Compress, true)) + { + ds.Write(value, 0, value.Length); + ds.Close(); // "BFINAL" set to 1. + comp.Close(); + + return comp.ToArray(); + } + } + + private static byte[] decompress(byte[] value) + { + if (value.LongLength == 0) + return value; + + using (var decomp = new MemoryStream()) + using (var comp = new MemoryStream(value)) + using (var ds = new DeflateStream(comp, CompressionMode.Decompress, true)) + { + int readLen = 0; + var buffer = new byte[256]; + while (true) + { + readLen = ds.Read(buffer, 0, buffer.Length); + if (readLen == 0) + break; + + decomp.Write(buffer, 0, readLen); + } + + decomp.Close(); + return decomp.ToArray(); + } + } + private static void mask(byte[] src, byte[] key) { for (long i = 0; i < src.LongLength; i++) @@ -134,6 +178,50 @@ namespace WebSocketSharp { #endregion + #region Internal Methods + + internal bool Compress(CompressionMethod method) + { + try + { + if (ExtensionData.LongLength > 0) + return false; + + if (method == CompressionMethod.DEFLATE) + ApplicationData = compress(ApplicationData); + else + return false; + + return true; + } + catch + { + return false; + } + } + + internal bool Decompress(CompressionMethod method) + { + try + { + if (ApplicationData.LongLength == 0) + return true; + + if (method == CompressionMethod.DEFLATE) + ApplicationData = decompress(ApplicationData); + else + return false; + + return true; + } + catch + { + return false; + } + } + + #endregion + #region Public Methods public IEnumerator GetEnumerator() diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index a4c718b1..0c26182f 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -63,26 +63,45 @@ namespace WebSocketSharp { #endregion + #region Private Static Fields + + private static NameValueCollection _extensionsReg; + + #endregion + #region Private Fields - private string _base64key; - private bool _client; - private Action _closeContext; - private CookieCollection _cookies; - private WebSocketContext _context; - private string _extensions; - private AutoResetEvent _exitReceiving; - private Object _forClose; - private Object _forSend; - private string _origin; - private string _protocol; - private string _protocols; - private volatile WsState _readyState; - private AutoResetEvent _receivePong; - private bool _secure; - private TcpClient _tcpClient; - private Uri _uri; - private WsStream _wsStream; + private string _base64key; + private bool _client; + private Action _closeContext; + private CookieCollection _cookies; + private CompressionMethod _compression; + private WebSocketContext _context; + private string _extensions; + private AutoResetEvent _exitReceiving; + private Object _forClose; + private Object _forSend; + private string _origin; + private string _protocol; + private string _protocols; + private volatile WsState _readyState; + private AutoResetEvent _receivePong; + private bool _secure; + private TcpClient _tcpClient; + private Uri _uri; + private WsStream _wsStream; + + #endregion + + #region Static Constructor + + static WebSocket() + { + _extensionsReg = new NameValueCollection(); + _extensionsReg.Add("deflate", "deflate-frame"); + _extensionsReg.Add("deflate", "perframe-compress; method=deflate"); + _extensionsReg.Add("deflate", "permessage-compress; method=deflate"); + } #endregion @@ -90,12 +109,13 @@ namespace WebSocketSharp { private WebSocket() { - _cookies = new CookieCollection(); + _compression = CompressionMethod.NONE; + _cookies = new CookieCollection(); _extensions = String.Empty; - _forClose = new Object(); - _forSend = new Object(); - _origin = String.Empty; - _protocol = String.Empty; + _forClose = new Object(); + _forSend = new Object(); + _origin = String.Empty; + _protocol = String.Empty; _readyState = WsState.CONNECTING; } @@ -220,6 +240,26 @@ namespace WebSocketSharp { #region Public Properties + /// + /// Gets or sets the compression method used to compress the payload data of the WebSocket Data frame. + /// + /// + /// One of the values that indicates the compression method to use. + /// The default is . + /// + public CompressionMethod Compression { + get { + return _compression; + } + + set { + if (isOpened(true)) + return; + + _compression = value; + } + } + /// /// Gets the cookies used in the WebSocket opening handshake. /// @@ -238,11 +278,10 @@ namespace WebSocketSharp { } /// - /// Gets the extensions selected by the server. + /// Gets the WebSocket extensions selected by the server. /// /// /// A that contains the extensions if any. The default is . - /// (Currently this will only ever be the .) /// public string Extensions { get { @@ -251,7 +290,7 @@ namespace WebSocketSharp { } /// - /// Gets a value indicating whether a connection is alive. + /// Gets a value indicating whether the WebSocket connection is alive. /// /// /// true if the connection is alive; otherwise, false. @@ -266,7 +305,7 @@ namespace WebSocketSharp { } /// - /// Gets a value indicating whether a connection is secure. + /// Gets a value indicating whether the WebSocket connection is secure. /// /// /// true if the connection is secure; otherwise, false. @@ -299,30 +338,31 @@ namespace WebSocketSharp { } set { - var origin = value.ToUri(); - var msg = _readyState == WsState.OPEN - ? "The WebSocket connection has been established already." - : !origin.IsNull() && (!origin.IsAbsoluteUri || origin.Segments.Length > 1) - ? "The syntax of value must be '://[:]'." - : String.Empty; + if (isOpened(true)) + return; - if (!msg.IsEmpty()) + if (value.IsNullOrEmpty()) { - onError(msg); + _origin = String.Empty; return; } - _origin = origin.IsNull() - ? String.Empty - : value.TrimEnd('/'); + var origin = new Uri(value); + if (!origin.IsAbsoluteUri || origin.Segments.Length > 1) + { + onError("The syntax of value must be '://[:]'."); + return; + } + + _origin = value.TrimEnd('/'); } } /// - /// Gets the subprotocol selected by the server. + /// Gets the WebSocket subprotocol selected by the server. /// /// - /// A that contains the subprotocol if any. By default, String.Empty. + /// A that contains the subprotocol if any. The default is . /// public string Protocol { get { @@ -331,10 +371,10 @@ namespace WebSocketSharp { } /// - /// Gets the state of the connection. + /// Gets the state of the WebSocket connection. /// /// - /// One of the . By default, WsState.CONNECTING. + /// One of the values. The default is . /// public WsState ReadyState { get { @@ -343,10 +383,10 @@ namespace WebSocketSharp { } /// - /// Gets the WebSocket URL. + /// Gets the WebSocket URL to connect. /// /// - /// A that contains the WebSocket URL. + /// A that contains the WebSocket URL to connect. /// public Uri Url { get { @@ -397,15 +437,6 @@ namespace WebSocketSharp { return true; } - private void close(HttpStatusCode code) - { - if (_readyState != WsState.CONNECTING || _client) - return; - - sendResponseHandshake(code); - closeResources(); - } - private void close(PayloadData data) { #if DEBUG @@ -443,35 +474,45 @@ namespace WebSocketSharp { #endif } - private void close(CloseStatusCode code, string reason) + private void close(HttpStatusCode code) { - close((ushort)code, reason); + if (_readyState != WsState.CONNECTING || _client) + return; + + sendResponseHandshake(code); + closeResources(); } private void close(ushort code, string reason) { - var data = new List(code.ToByteArray(ByteOrder.BIG)); - if (!reason.IsNullOrEmpty()) + using (var buffer = new MemoryStream()) { - var buffer = Encoding.UTF8.GetBytes(reason); - data.AddRange(buffer); - } + var tmp = code.ToByteArray(ByteOrder.BIG); + buffer.Write(tmp, 0, tmp.Length); + if (!reason.IsNullOrEmpty()) + { + tmp = Encoding.UTF8.GetBytes(reason); + buffer.Write(tmp, 0, tmp.Length); + } - var payloadData = new PayloadData(data.ToArray()); - if (payloadData.Length > 125) - { - var msg = "A Close frame must have a payload length of 125 bytes or less."; - onError(msg); - return; - } + buffer.Close(); + var data = buffer.ToArray(); + if (data.Length > 125) + { + var msg = "The payload length of a Close frame must be 125 bytes or less."; + onError(msg); - close(payloadData); + return; + } + + close(new PayloadData(data)); + } } private void closeHandshake(PayloadData data) { - var args = new CloseEventArgs(data); - var frame = createFrame(Fin.FINAL, Opcode.CLOSE, data); + var args = new CloseEventArgs(data); + var frame = createControlFrame(Opcode.CLOSE, data); if (send(frame)) args.WasClean = true; @@ -542,11 +583,41 @@ namespace WebSocketSharp { return Convert.ToBase64String(src); } - private WsFrame createFrame(Fin fin, Opcode opcode, PayloadData payloadData) + // As client + private string createCompressionExtension() + { + return _compression != CompressionMethod.NONE + //? "deflate-frame" + //? String.Format("perframe-compress; method={0}", _compression.ToString().ToLower()) + ? String.Format("permessage-compress; method={0}", _compression.ToString().ToLower()) + : String.Empty; + } + + private WsFrame createControlFrame(Opcode opcode, PayloadData payloadData) { return _client - ? new WsFrame(fin, opcode, payloadData) - : new WsFrame(fin, opcode, Mask.UNMASK, payloadData); + ? new WsFrame(opcode, Mask.MASK, payloadData) + : new WsFrame(opcode, Mask.UNMASK, payloadData); + } + + private WsFrame createDataFrame(Fin fin, Opcode opcode, PayloadData payloadData) + { + return _client + ? new WsFrame(fin, opcode, Mask.MASK, payloadData, _compression) + : new WsFrame(fin, opcode, Mask.UNMASK, payloadData, _compression); + } + + // As client + private string createRequestExtensions() + { + var extensions = new StringBuilder(64); + var compression = createCompressionExtension(); + if (!compression.IsEmpty()) + extensions.Append(compression); + + return extensions.Length > 0 + ? extensions.ToString() + : String.Empty; } // As client @@ -559,12 +630,21 @@ namespace WebSocketSharp { var req = new RequestHandshake(path); req.AddHeader("Host", host); + if (!_origin.IsEmpty()) req.AddHeader("Origin", _origin); + req.AddHeader("Sec-WebSocket-Key", _base64key); + if (!_protocols.IsNullOrEmpty()) req.AddHeader("Sec-WebSocket-Protocol", _protocols); + + var extensions = createRequestExtensions(); + if (!extensions.IsEmpty()) + req.AddHeader("Sec-WebSocket-Extensions", extensions); + req.AddHeader("Sec-WebSocket-Version", _version); + if (_cookies.Count > 0) req.SetCookies(_cookies); @@ -576,6 +656,9 @@ namespace WebSocketSharp { { var res = new ResponseHandshake(); res.AddHeader("Sec-WebSocket-Accept", createResponseKey()); + if (!_extensions.IsEmpty()) + res.AddHeader("Sec-WebSocket-Extensions", _extensions); + if (_cookies.Count > 0) res.SetCookies(_cookies); @@ -630,14 +713,36 @@ namespace WebSocketSharp { } // As client - private bool isValid(ResponseHandshake response) + private bool isCompressionExtension(string value) { - return !response.IsWebSocketResponse - ? false - : !response.HeaderExists("Sec-WebSocket-Accept", createResponseKey()) - ? false - : !response.HeaderExists("Sec-WebSocket-Version") || - response.HeaderExists("Sec-WebSocket-Version", _version); + var expected = createCompressionExtension(); + return !expected.IsEmpty() + ? value.Equals(expected) + : false; + } + + // As server + private bool isDeflateExtension(string value) + { + if (value.StartsWith("x-webkit-")) + value = value.Substring(9); + + foreach (var deflate in _extensionsReg.GetValues("deflate")) + if (value.Equals(deflate)) + return true; + + return false; + } + + private bool isOpened(bool errorIfOpened) + { + if (_readyState != WsState.OPEN && _readyState != WsState.CLOSING) + return false; + + if (errorIfOpened) + onError("The WebSocket connection has been established already."); + + return true; } // As server @@ -670,6 +775,17 @@ namespace WebSocketSharp { : _context.Headers.Exists("Sec-WebSocket-Version", _version); } + // As client + private bool isValidResponseHandshake(ResponseHandshake response) + { + return !response.IsWebSocketResponse + ? false + : !response.HeaderExists("Sec-WebSocket-Accept", createResponseKey()) + ? false + : !response.HeaderExists("Sec-WebSocket-Version") || + response.HeaderExists("Sec-WebSocket-Version", _version); + } + private void onClose(CloseEventArgs eventArgs) { if (!Thread.CurrentThread.IsBackground) @@ -710,12 +826,13 @@ namespace WebSocketSharp { var buffer = Encoding.UTF8.GetBytes(message); if (buffer.Length > 125) { - var msg = "A Ping frame must have a payload length of 125 bytes or less."; + var msg = "The payload length of a Ping frame must be 125 bytes or less."; onError(msg); return false; } - if (!send(Fin.FINAL, Opcode.PING, buffer)) + var frame = createControlFrame(Opcode.PING, new PayloadData(buffer)); + if (!send(frame)) return false; return _receivePong.WaitOne(millisecondsTimeout); @@ -723,7 +840,7 @@ namespace WebSocketSharp { private void pong(PayloadData data) { - var frame = createFrame(Fin.FINAL, Opcode.PONG, data); + var frame = createControlFrame(Opcode.PONG, data); send(frame); } @@ -733,19 +850,6 @@ namespace WebSocketSharp { pong(payloadData); } - private void process(WsFrame frame) - { - bool processed = processAbnormal(frame) || - processFragmented(frame) || - processData(frame) || - processPing(frame) || - processPong(frame) || - processClose(frame); - - if (!processed) - processIncorrectFrame(); - } - private bool processAbnormal(WsFrame frame) { if (!frame.IsNull()) @@ -755,14 +859,14 @@ namespace WebSocketSharp { Console.WriteLine("WS: Info@processAbnormal: Start closing handshake."); #endif var msg = "What we've got here is a failure to communicate in the WebSocket protocol."; - close(CloseStatusCode.ABNORMAL, msg); + Close(CloseStatusCode.ABNORMAL, msg); return true; } private bool processClose(WsFrame frame) { - if (frame.Opcode != Opcode.CLOSE) + if (!frame.IsClose) return false; #if DEBUG @@ -778,6 +882,12 @@ namespace WebSocketSharp { if (!frame.IsData) return false; + if (frame.IsCompressed && _compression == CompressionMethod.NONE) + return false; + + if (frame.IsCompressed) + frame.Decompress(_compression); + onMessage(new MessageEventArgs(frame.Opcode, frame.PayloadData)); return true; } @@ -785,15 +895,15 @@ namespace WebSocketSharp { private bool processFragmented(WsFrame frame) { // Not first fragment - if (frame.Opcode == Opcode.CONT) + if (frame.IsContinuation) return true; // Not fragmented - if (frame.Fin == Fin.FINAL) + if (frame.IsFinal) return false; // First fragment - if (frame.IsData) + if (frame.IsData && !(frame.IsCompressed && _compression == CompressionMethod.NONE)) processFragments(frame); else processIncorrectFrame(); @@ -803,48 +913,55 @@ namespace WebSocketSharp { private void processFragments(WsFrame first) { + bool compressed = first.IsCompressed; + if (compressed) + first.Decompress(_compression); + var buffer = new List(first.PayloadData.ToByteArray()); + Func processContinuation = contFrame => + { + if (!contFrame.IsContinuation) + return false; + + if (compressed) + contFrame.Decompress(_compression); + + buffer.AddRange(contFrame.PayloadData.ToByteArray()); + return true; + }; + while (true) { var frame = readFrame(); if (processAbnormal(frame)) return; - // MORE - if (frame.Fin == Fin.MORE) + if (!frame.IsFinal) { // MORE & CONT - if (frame.Opcode == Opcode.CONT) - { - buffer.AddRange(frame.PayloadData.ToByteArray()); + if (processContinuation(frame)) continue; - } - - // MORE & ? - processIncorrectFrame(); - return; } - - // FINAL & CONT - if (frame.Opcode == Opcode.CONT) + else { - buffer.AddRange(frame.PayloadData.ToByteArray()); - break; + // FINAL & CONT + if (processContinuation(frame)) + break; + + // FINAL & PING + if (processPing(frame)) + continue; + + // FINAL & PONG + if (processPong(frame)) + continue; + + // FINAL & CLOSE + if (processClose(frame)) + return; } - // FINAL & PING - if (processPing(frame)) - continue; - - // FINAL & PONG - if (processPong(frame)) - continue; - - // FINAL & CLOSE - if (processClose(frame)) - return; - - // FINAL & ? + // ? processIncorrectFrame(); return; } @@ -852,17 +969,30 @@ namespace WebSocketSharp { onMessage(new MessageEventArgs(first.Opcode, new PayloadData(buffer.ToArray()))); } + private void processFrame(WsFrame frame) + { + bool processed = processAbnormal(frame) || + processFragmented(frame) || + processData(frame) || + processPing(frame) || + processPong(frame) || + processClose(frame); + + if (!processed) + processIncorrectFrame(); + } + private void processIncorrectFrame() { #if DEBUG Console.WriteLine("WS: Info@processIncorrectFrame: Start closing handshake."); #endif - close(CloseStatusCode.INCORRECT_DATA, String.Empty); + Close(CloseStatusCode.INCORRECT_DATA); } private bool processPing(WsFrame frame) { - if (frame.Opcode != Opcode.PING) + if (!frame.IsPing) return false; #if DEBUG @@ -875,7 +1005,7 @@ namespace WebSocketSharp { private bool processPong(WsFrame frame) { - if (frame.Opcode != Opcode.PONG) + if (!frame.IsPong) return false; #if DEBUG @@ -886,6 +1016,31 @@ namespace WebSocketSharp { return true; } + // As server + private void processRequestExtensions(string extensions) + { + if (extensions.IsNullOrEmpty()) + return; + + bool deflate = false; + var buffer = new StringBuilder(64); + foreach (var extension in extensions.SplitHeaderValue(',')) + { + var tmp = extension.Trim(); + if (!deflate && isDeflateExtension(tmp)) + { + buffer.Append(tmp); + deflate = true; + } + } + + if (deflate) + _compression = CompressionMethod.DEFLATE; + + if (buffer.Length > 0) + _extensions = buffer.ToString(); + } + // As server private bool processRequestHandshake() { @@ -902,39 +1057,73 @@ namespace WebSocketSharp { } _base64key = _context.SecWebSocketKey; - if (_context.Headers.Exists("Sec-WebSocket-Protocol")) - _protocols = _context.Headers["Sec-WebSocket-Protocol"]; - - if (_context.Headers.Exists("Sec-WebSocket-Extensions")) - _extensions = _context.Headers["Sec-WebSocket-Extensions"]; + processRequestProtocols(_context.Headers["Sec-WebSocket-Protocol"]); + processRequestExtensions(_context.Headers["Sec-WebSocket-Extensions"]); return true; } + // As server + private void processRequestProtocols(string protocols) + { + if (!protocols.IsNullOrEmpty()) + _protocols = protocols; + } + + // As client + private void processResponseCookies(CookieCollection cookies) + { + if (cookies.Count > 0) + _cookies.SetOrRemove(cookies); + } + + // As client + private void processResponseExtensions(string extensions) + { + bool compress = false; + if (!extensions.IsNullOrEmpty()) + { + foreach (var extension in extensions.SplitHeaderValue(',')) + { + var tmp = extension.Trim(); + if (!compress && isCompressionExtension(tmp)) + compress = true; + } + + _extensions = extensions; + } + + if (!compress) + _compression = CompressionMethod.NONE; + } + // As client private bool processResponseHandshake() { var res = receiveResponseHandshake(); - if (!isValid(res)) + if (!isValidResponseHandshake(res)) { var msg = "Invalid response to this WebSocket connection request."; onError(msg); - close(CloseStatusCode.ABNORMAL, msg); + Close(CloseStatusCode.ABNORMAL, msg); + return false; } - if (res.HeaderExists("Sec-WebSocket-Protocol")) - _protocol = res.Headers["Sec-WebSocket-Protocol"]; - - if (res.HeaderExists("Sec-WebSocket-Extensions")) - _extensions = res.Headers["Sec-WebSocket-Extensions"]; - - if (res.Cookies.Count > 0) - _cookies.SetOrRemove(res.Cookies); + processResponseProtocol(res.Headers["Sec-WebSocket-Protocol"]); + processResponseExtensions(res.Headers["Sec-WebSocket-Extensions"]); + processResponseCookies(res.Cookies); return true; } + // As client + private void processResponseProtocol(string protocol) + { + if (!protocol.IsNullOrEmpty()) + _protocol = protocol; + } + private WsFrame readFrame() { return _wsStream.ReadFrame(); @@ -978,8 +1167,7 @@ namespace WebSocketSharp { private bool send(WsFrame frame) { - if (_readyState == WsState.CONNECTING || - _readyState == WsState.CLOSED) + if (!isOpened(false)) { onError("The WebSocket connection isn't established or has been closed."); return false; @@ -1035,7 +1223,7 @@ namespace WebSocketSharp { private bool send(Fin fin, Opcode opcode, byte[] data) { - var frame = createFrame(fin, opcode, new PayloadData(data)); + var frame = createDataFrame(fin, opcode, new PayloadData(data)); return send(frame); } @@ -1138,7 +1326,7 @@ namespace WebSocketSharp { { try { - process(frame); + processFrame(frame); if (_readyState == WsState.OPEN) _wsStream.ReadFrameAsync(completed); else @@ -1146,11 +1334,11 @@ namespace WebSocketSharp { } catch (WsReceivedTooBigMessageException ex) { - close(CloseStatusCode.TOO_BIG, ex.Message); + Close(CloseStatusCode.TOO_BIG, ex.Message); } catch (Exception) { - close(CloseStatusCode.ABNORMAL, "An exception has occured."); + Close(CloseStatusCode.ABNORMAL, "An exception has occured."); } }; @@ -1176,8 +1364,7 @@ namespace WebSocketSharp { /// public void Close() { - var data = new PayloadData(new byte[]{}); - close(data); + close(new PayloadData()); } /// @@ -1185,8 +1372,8 @@ namespace WebSocketSharp { /// releases all associated resources. /// /// - /// Emits a event if is not in the allowable range of - /// the WebSocket close status code, and do nothing any more. + /// This Close method emits a event if is not + /// in the allowable range of the WebSocket close status code. /// /// /// A that indicates the status code for closure. @@ -1205,16 +1392,16 @@ namespace WebSocketSharp { /// public void Close(CloseStatusCode code) { - close(code, String.Empty); + close((ushort)code, String.Empty); } /// - /// Closes the WebSocket connection with the specified and , and - /// releases all associated resources. + /// Closes the WebSocket connection with the specified and + /// , and releases all associated resources. /// /// - /// Emits a event if is not in the allowable range of - /// the WebSocket close status code, and do nothing any more. + /// This Close method emits a event if is not + /// in the allowable range of the WebSocket close status code. /// /// /// A that indicates the status code for closure. @@ -1235,8 +1422,8 @@ namespace WebSocketSharp { } /// - /// Closes the WebSocket connection with the specified and , and - /// releases all associated resources. + /// Closes the WebSocket connection with the specified and + /// , and releases all associated resources. /// /// /// One of the values that indicates the status code for closure. @@ -1246,7 +1433,7 @@ namespace WebSocketSharp { /// public void Close(CloseStatusCode code, string reason) { - close(code, reason); + close((ushort)code, reason); } /// @@ -1254,22 +1441,19 @@ namespace WebSocketSharp { /// public void Connect() { - if (_readyState == WsState.OPEN) - { - Console.WriteLine("WS: Info@Connect: The WebSocket connection has been established already."); + if (isOpened(true)) return; - } try { if (connect()) onOpen(); } - catch (Exception) + catch { var msg = "An exception has occured."; onError(msg); - close(CloseStatusCode.ABNORMAL, msg); + Close(CloseStatusCode.ABNORMAL, msg); } } @@ -1441,15 +1625,12 @@ namespace WebSocketSharp { /// public void SetCookie(Cookie cookie) { - var msg = _readyState == WsState.OPEN - ? "The WebSocket connection has been established already." - : cookie.IsNull() - ? "'cookie' must not be null." - : String.Empty; + if (isOpened(true)) + return; - if (!msg.IsEmpty()) + if (cookie.IsNull()) { - onError(msg); + onError("'cookie' must not be null."); return; } diff --git a/websocket-sharp/WsFrame.cs b/websocket-sharp/WsFrame.cs index 79dee02c..62a65e90 100644 --- a/websocket-sharp/WsFrame.cs +++ b/websocket-sharp/WsFrame.cs @@ -53,16 +53,22 @@ namespace WebSocketSharp { #region Public Constructors public WsFrame(Opcode opcode, PayloadData payloadData) - : this(Fin.FINAL, opcode, payloadData) + : this(opcode, Mask.MASK, payloadData) { } - public WsFrame(Fin fin, Opcode opcode, PayloadData payloadData) - : this(fin, opcode, Mask.MASK, payloadData) + public WsFrame(Opcode opcode, Mask mask, PayloadData payloadData) + : this(Fin.FINAL, opcode, mask, payloadData) { } public WsFrame(Fin fin, Opcode opcode, Mask mask, PayloadData payloadData) + : this(fin, opcode, mask, payloadData, CompressionMethod.NONE) + { + } + + public WsFrame( + Fin fin, Opcode opcode, Mask mask, PayloadData payloadData, CompressionMethod compress) { if (payloadData.IsNull()) throw new ArgumentNullException("payloadData"); @@ -74,10 +80,18 @@ namespace WebSocketSharp { if (!isFinal(fin) && isControl(opcode)) throw new ArgumentException("The control frame must not be fragmented."); + if (isControl(opcode) && compress != CompressionMethod.NONE) + throw new ArgumentException("The control frame must not be compressed."); + Fin = fin; + Rsv1 = Rsv.OFF; + Rsv2 = Rsv.OFF; + Rsv3 = Rsv.OFF; Opcode = opcode; Mask = mask; PayloadData = payloadData; + if (compress != CompressionMethod.NONE) + compressPayloadData(compress); init(); } @@ -86,6 +100,30 @@ namespace WebSocketSharp { #region Internal Properties + internal bool IsBinary { + get { + return isBinary(Opcode); + } + } + + internal bool IsClose { + get { + return isClose(Opcode); + } + } + + internal bool IsCompressed { + get { + return Rsv1 == Rsv.ON; + } + } + + internal bool IsContinuation { + get { + return isContinuation(Opcode); + } + } + internal bool IsControl { get { return isControl(Opcode); @@ -104,12 +142,36 @@ namespace WebSocketSharp { } } + internal bool IsFragmented { + get { + return !IsFinal || IsContinuation; + } + } + internal bool IsMasked { get { return isMasked(Mask); } } + internal bool IsPing { + get { + return isPing(Opcode); + } + } + + internal bool IsPong { + get { + return isPong(Opcode); + } + } + + internal bool IsText { + get { + return isText(Opcode); + } + } + internal ulong Length { get { return 2 + (ulong)(ExtPayloadLen.Length + MaskingKey.Length) + PayloadData.Length; @@ -144,6 +206,26 @@ namespace WebSocketSharp { #region Private Methods + private bool compressPayloadData(CompressionMethod method) + { + if (!PayloadData.Compress(method)) + return false; + + if (IsData) + Rsv1 = Rsv.ON; + + return true; + } + + private bool decompressPayloadData(CompressionMethod method) + { + if (!PayloadData.Decompress(method)) + return false; + + Rsv1 = Rsv.OFF; + return true; + } + private static void dump(WsFrame frame) { var len = frame.Length; @@ -216,10 +298,6 @@ namespace WebSocketSharp { private void init() { - Rsv1 = Rsv.OFF; - Rsv2 = Rsv.OFF; - Rsv3 = Rsv.OFF; - setPayloadLen(PayloadData.Length); if (IsMasked) maskPayloadData(); @@ -227,16 +305,29 @@ namespace WebSocketSharp { MaskingKey = new byte[]{}; } + private static bool isBinary(Opcode opcode) + { + return opcode == Opcode.BINARY; + } + + private static bool isClose(Opcode opcode) + { + return opcode == Opcode.CLOSE; + } + + private static bool isContinuation(Opcode opcode) + { + return opcode == Opcode.CONT; + } + private static bool isControl(Opcode opcode) { - Opcode control = Opcode.CLOSE | Opcode.PING | Opcode.PONG; - return (control & opcode) == opcode; + return isClose(opcode) || isPing(opcode) || isPong(opcode); } private static bool isData(Opcode opcode) { - Opcode data = Opcode.TEXT | Opcode.BINARY; - return (data & opcode) == opcode; + return isText(opcode) || isBinary(opcode); } private static bool isFinal(Fin fin) @@ -249,6 +340,21 @@ namespace WebSocketSharp { return mask == Mask.MASK; } + private static bool isPing(Opcode opcode) + { + return opcode == Opcode.PING; + } + + private static bool isPong(Opcode opcode) + { + return opcode == Opcode.PONG; + } + + private static bool isText(Opcode opcode) + { + return opcode == Opcode.TEXT; + } + private void maskPayloadData() { var key = new byte[4]; @@ -289,7 +395,7 @@ namespace WebSocketSharp { var opcode = frame.Opcode; var payloadData = frame.PayloadData.Length == 0 ? String.Empty - : masked || ((Opcode.CONT | Opcode.BINARY | Opcode.CLOSE) & opcode) == opcode + : masked || frame.IsFragmented || frame.IsBinary || frame.IsClose ? BitConverter.ToString(frame.PayloadData.ToByteArray()) : Encoding.UTF8.GetString(frame.PayloadData.ToByteArray()); @@ -432,6 +538,26 @@ namespace WebSocketSharp { ExtPayloadLen = length.ToByteArray(ByteOrder.BIG); } + private void unmaskPayloadData() + { + PayloadData.Mask(MaskingKey); + Mask = Mask.UNMASK; + MaskingKey = new byte[]{}; + } + + #endregion + + #region Internal Methods + + internal void Decompress(CompressionMethod method) + { + if (Mask == Mask.MASK) + unmaskPayloadData(); + + if (decompressPayloadData(method)) + setPayloadLen(PayloadData.Length); + } + #endregion #region Public Methods diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll b/websocket-sharp/bin/Debug/websocket-sharp.dll index 2b106f78..ed954f80 100755 Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll and b/websocket-sharp/bin/Debug/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb index 87d20b61..bd3d675e 100644 Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll index 7bdd9999..0c316954 100755 Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 804869eb..c8c152db 100644 Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/bin/Release/websocket-sharp.dll b/websocket-sharp/bin/Release/websocket-sharp.dll index 35be825e..8aa2d7df 100755 Binary files a/websocket-sharp/bin/Release/websocket-sharp.dll and b/websocket-sharp/bin/Release/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll index 46f5cdb5..baf9e312 100755 Binary files a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml index fd4e964f..5413bae6 100644 --- a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml +++ b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.xml @@ -252,10 +252,10 @@ - Determines whether the specified is a . + Determines whether the specified is empty. - true if is ; otherwise, false. + true if is empty; otherwise, false. A to test. @@ -305,13 +305,13 @@ Determines whether the specified object is . - true if the parameter is ; otherwise, false. + true if is ; otherwise, false. - A class to test. + An object to test. - The type of the parameter. + The type of parameter. @@ -334,10 +334,10 @@ - Determines whether the specified is or . + Determines whether the specified is or empty. - true if the parameter is or ; otherwise, false. + true if the parameter is or empty; otherwise, false. A to test. @@ -942,6 +942,15 @@ Occurs when the WebSocket connection has been established. + + + Gets or sets the compression method used to compress the payload data of the WebSocket Data frame. + + + One of the values that indicates the compression method to use. + The default is . + + Gets the cookies used in the WebSocket opening handshake. @@ -953,16 +962,15 @@ - Gets the extensions selected by the server. + Gets the WebSocket extensions selected by the server. A that contains the extensions if any. The default is . - (Currently this will only ever be the .) - Gets a value indicating whether a connection is alive. + Gets a value indicating whether the WebSocket connection is alive. true if the connection is alive; otherwise, false. @@ -970,7 +978,7 @@ - Gets a value indicating whether a connection is secure. + Gets a value indicating whether the WebSocket connection is secure. true if the connection is secure; otherwise, false. @@ -995,26 +1003,26 @@ - Gets the subprotocol selected by the server. + Gets the WebSocket subprotocol selected by the server. - A that contains the subprotocol if any. By default, String.Empty. + A that contains the subprotocol if any. The default is . - Gets the state of the connection. + Gets the state of the WebSocket connection. - One of the . By default, WsState.CONNECTING. + One of the values. The default is . - Gets the WebSocket URL. + Gets the WebSocket URL to connect. - A that contains the WebSocket URL. + A that contains the WebSocket URL to connect. @@ -1028,8 +1036,8 @@ releases all associated resources. - Emits a event if is not in the allowable range of - the WebSocket close status code, and do nothing any more. + This Close method emits a event if is not + in the allowable range of the WebSocket close status code. A that indicates the status code for closure. @@ -1046,12 +1054,12 @@ - Closes the WebSocket connection with the specified and , and - releases all associated resources. + Closes the WebSocket connection with the specified and + , and releases all associated resources. - Emits a event if is not in the allowable range of - the WebSocket close status code, and do nothing any more. + This Close method emits a event if is not + in the allowable range of the WebSocket close status code. A that indicates the status code for closure. @@ -1062,8 +1070,8 @@ - Closes the WebSocket connection with the specified and , and - releases all associated resources. + Closes the WebSocket connection with the specified and + , and releases all associated resources. One of the values that indicates the status code for closure. @@ -5170,5 +5178,25 @@ A that contains the HTTP response objects. + + + Contains the values of the compression methods used to compress the payload data of the WebSocket Data frame. + + + The CompressionMethod enumeration contains the values of the compression methods defined in + WebSocket Per-message Compression + specification for a WebSocket extension. + + + + + Indicates non compression. + + + + + Indicates using DEFLATE. + + diff --git a/websocket-sharp/doc/html/WebSocketSharp/CompressionMethod.html b/websocket-sharp/doc/html/WebSocketSharp/CompressionMethod.html new file mode 100644 index 00000000..d0b8faf7 --- /dev/null +++ b/websocket-sharp/doc/html/WebSocketSharp/CompressionMethod.html @@ -0,0 +1,258 @@ + + + WebSocketSharp.CompressionMethod + + + + + +
+ websocket-sharp : WebSocketSharp Namespace
+
+

+ Overview +

+

+ Signature +

+

+ Remarks +

+

+ Members +

+

+ Member Details +

+
+

CompressionMethod Enum

+

+ Contains the values of the compression methods used to compress the payload data of the WebSocket Data frame. +

+
+

Syntax

+
public enum CompressionMethod
+
+
+

Remarks

+
+ The CompressionMethod enumeration contains the values of the compression methods defined in + WebSocket Per-message Compression + specification for a WebSocket extension. +
+

Members

+
+ + + + + + + + + + + + + +
Member NameDescription
+ DEFLATE + + Indicates using DEFLATE. +
+ NONE + + Indicates non compression. +
+
+

Requirements

+
+ Namespace: WebSocketSharp
Assembly: websocket-sharp (in websocket-sharp.dll)
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/websocket-sharp/doc/html/WebSocketSharp/Ext.html b/websocket-sharp/doc/html/WebSocketSharp/Ext.html index fef971b0..148c8ab7 100644 --- a/websocket-sharp/doc/html/WebSocketSharp/Ext.html +++ b/websocket-sharp/doc/html/WebSocketSharp/Ext.html @@ -418,7 +418,7 @@ IsEmpty (this string) : bool
- Determines whether the specified string is a string.Empty. + Determines whether the specified string is empty.
@@ -461,7 +461,7 @@ IsNull<T> - (this T) : bool
+ (this T) : bool
Determines whether the specified object is null.
@@ -485,7 +485,7 @@ IsNullOrEmpty (this string) : bool
- Determines whether the specified string is null or string.Empty. + Determines whether the specified string is null or empty.
@@ -1443,7 +1443,7 @@

IsEmpty Method

- Determines whether the specified string is a string.Empty. + Determines whether the specified string is empty.

Syntax

public static bool IsEmpty (this string value)
@@ -1460,7 +1460,7 @@

Returns

- true if value is string.Empty; otherwise, false. + true if value is empty; otherwise, false.

Remarks

@@ -1593,7 +1593,7 @@ Determines whether the specified object is null.

Syntax

-
public static bool IsNull<T> (this T obj)
where T : class
+
public static bool IsNull<T> (this T obj)
where T : class

Type Parameters

@@ -1601,7 +1601,7 @@ T
- The type of the obj parameter. + The type of obj parameter.
@@ -1612,13 +1612,13 @@ obj
- A class to test. + An object to test.

Returns

- true if the obj parameter is null; otherwise, false. + true if obj is null; otherwise, false.

Remarks

@@ -1681,7 +1681,7 @@

IsNullOrEmpty Method

- Determines whether the specified string is null or string.Empty. + Determines whether the specified string is null or empty.

Syntax

public static bool IsNullOrEmpty (this string value)
@@ -1698,7 +1698,7 @@

Returns

- true if the value parameter is null or string.Empty; otherwise, false. + true if the value parameter is null or empty; otherwise, false.

Remarks

diff --git a/websocket-sharp/doc/html/WebSocketSharp/Opcode.html b/websocket-sharp/doc/html/WebSocketSharp/Opcode.html index 8789ea8a..9da6fa39 100644 --- a/websocket-sharp/doc/html/WebSocketSharp/Opcode.html +++ b/websocket-sharp/doc/html/WebSocketSharp/Opcode.html @@ -211,7 +211,7 @@

Syntax

-
[System.Flags]
public enum Opcode
+
public enum Opcode

Remarks

diff --git a/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html b/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html index b45d0748..e7637c02 100644 --- a/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html +++ b/websocket-sharp/doc/html/WebSocketSharp/WebSocket.html @@ -270,6 +270,23 @@
+ + + + + @@ -309,7 +326,7 @@ bool . - Gets a value indicating whether a connection is alive. + Gets a value indicating whether the WebSocket connection is alive. @@ -323,7 +340,7 @@ bool . - Gets a value indicating whether a connection is secure. + Gets a value indicating whether the WebSocket connection is secure. @@ -354,7 +371,7 @@ string . - Gets the subprotocol selected by the server. + Gets the WebSocket subprotocol selected by the server. @@ -368,7 +385,7 @@ WsState . - Gets the state of the connection. + Gets the state of the WebSocket connection. @@ -382,7 +399,7 @@ Uri . - Gets the WebSocket URL. + Gets the WebSocket URL to connect.
+
+
+ 		+ + Compression + + + + CompressionMethod + . + Gets or sets the compression method used to compress the payload data of the WebSocket Data frame. +
[read-only]
 @@ -295,7 +312,7 @@ string . - Gets the extensions selected by the server. + Gets the WebSocket extensions selected by the server.
@@ -439,8 +456,8 @@ Close (ushort, string)
- Closes the WebSocket connection with the specified code and reason, and - releases all associated resources. + Closes the WebSocket connection with the specified code and + reason, and releases all associated resources.
@@ -452,8 +469,8 @@ Close (CloseStatusCode, string)
- Closes the WebSocket connection with the specified code and reason, and - releases all associated resources. + Closes the WebSocket connection with the specified code and + reason, and releases all associated resources.
@@ -665,7 +682,7 @@ IsNull<T> - (this T) : bool
+ (this T) : bool
Determines whether the specified object is null.
@@ -867,8 +884,8 @@

Remarks

- Emits a WebSocket.OnError event if code is not in the allowable range of - the WebSocket close status code, and do nothing any more. + This Close method emits a WebSocket.OnError event if code is not + in the allowable range of the WebSocket close status code.

Requirements

@@ -906,8 +923,8 @@

Close Method

- Closes the WebSocket connection with the specified code and reason, and - releases all associated resources. + Closes the WebSocket connection with the specified code and + reason, and releases all associated resources.

Syntax

public void Close (ushort code, string reason)
@@ -930,8 +947,8 @@

Remarks

- Emits a WebSocket.OnError event if code is not in the allowable range of - the WebSocket close status code, and do nothing any more. + This Close method emits a WebSocket.OnError event if code is not + in the allowable range of the WebSocket close status code.

Requirements

@@ -941,8 +958,8 @@

Close Method

- Closes the WebSocket connection with the specified code and reason, and - releases all associated resources. + Closes the WebSocket connection with the specified code and + reason, and releases all associated resources.

Syntax

public void Close (CloseStatusCode code, string reason)
@@ -972,6 +989,27 @@ Namespace: WebSocketSharp
Assembly: websocket-sharp (in websocket-sharp.dll)
+

Compression Property

+
+

+ Gets or sets the compression method used to compress the payload data of the WebSocket Data frame. +

+

Syntax

+
public CompressionMethod Compression { get; set; }
+

Value

+
+ One of the WebSocketSharp.CompressionMethod values that indicates the compression method to use. + The default is CompressionMethod.NONE. +
+

Remarks

+
+ Documentation for this section has not yet been entered. +
+

Requirements

+
+ Namespace: WebSocketSharp
Assembly: websocket-sharp (in websocket-sharp.dll)
+
+

Connect Method

@@ -1028,14 +1066,13 @@

Extensions Property

- Gets the extensions selected by the server. + Gets the WebSocket extensions selected by the server.

Syntax

public string Extensions { get; }

Value

A string that contains the extensions if any. The default is string.Empty. - (Currently this will only ever be the string.Empty.)

Remarks

@@ -1049,7 +1086,7 @@

IsAlive Property

- Gets a value indicating whether a connection is alive. + Gets a value indicating whether the WebSocket connection is alive.

Syntax

public bool IsAlive { get; }
@@ -1069,7 +1106,7 @@

IsSecure Property

- Gets a value indicating whether a connection is secure. + Gets a value indicating whether the WebSocket connection is secure.

Syntax

public bool IsSecure { get; }
@@ -1230,13 +1267,13 @@

Protocol Property

- Gets the subprotocol selected by the server. + Gets the WebSocket subprotocol selected by the server.

Syntax

public string Protocol { get; }

Value

- A string that contains the subprotocol if any. By default, String.Empty. + A string that contains the subprotocol if any. The default is string.Empty.

Remarks

@@ -1250,13 +1287,13 @@

ReadyState Property

- Gets the state of the connection. + Gets the state of the WebSocket connection.

Syntax

public WsState ReadyState { get; }

Value

- One of the WebSocketSharp.WsState. By default, WsState.CONNECTING. + One of the WebSocketSharp.WsState values. The default is WsState.CONNECTING.

Remarks

@@ -1480,13 +1517,13 @@

Url Property

- Gets the WebSocket URL. + Gets the WebSocket URL to connect.

Syntax

public Uri Url { get; }

Value

- A Uri that contains the WebSocket URL. + A Uri that contains the WebSocket URL to connect.

Remarks

diff --git a/websocket-sharp/doc/html/WebSocketSharp/index.html b/websocket-sharp/doc/html/WebSocketSharp/index.html index 9baaa747..d9a07e4a 100644 --- a/websocket-sharp/doc/html/WebSocketSharp/index.html +++ b/websocket-sharp/doc/html/WebSocketSharp/index.html @@ -226,6 +226,14 @@ Contains the values of the status codes for the WebSocket connection closure. + + + CompressionMethod + + + Contains the values of the compression methods used to compress the payload data of the WebSocket Data frame. + + ErrorEventArgs diff --git a/websocket-sharp/doc/html/index.html b/websocket-sharp/doc/html/index.html index 996bd8c4..e4bb4f3e 100644 --- a/websocket-sharp/doc/html/index.html +++ b/websocket-sharp/doc/html/index.html @@ -228,6 +228,14 @@ Contains the values of the status codes for the WebSocket connection closure. + + + CompressionMethod + + + Contains the values of the compression methods used to compress the payload data of the WebSocket Data frame. + + ErrorEventArgs diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/CompressionMethod.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/CompressionMethod.xml new file mode 100644 index 00000000..f2ae6135 --- /dev/null +++ b/websocket-sharp/doc/mdoc/WebSocketSharp/CompressionMethod.xml @@ -0,0 +1,48 @@ + + + + + websocket-sharp + + + System.Enum + + + + Contains the values of the compression methods used to compress the payload data of the WebSocket Data frame. + + + The CompressionMethod enumeration contains the values of the compression methods defined in + WebSocket Per-message Compression + specification for a WebSocket extension. + + + + + + + Field + + WebSocketSharp.CompressionMethod + + + + Indicates using DEFLATE. + + + + + + + Field + + WebSocketSharp.CompressionMethod + + + + Indicates non compression. + + + + + diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml index f1abe33e..09f6e93e 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp/Ext.xml @@ -492,10 +492,10 @@ A to test. - Determines whether the specified is a . + Determines whether the specified is empty. - true if is ; otherwise, false. + true if is empty; otherwise, false. To be added. @@ -595,16 +595,16 @@ - The type of the parameter. + The type of parameter. - A class to test. + An object to test. Determines whether the specified object is . - true if the parameter is ; otherwise, false. + true if is ; otherwise, false. To be added. @@ -662,10 +662,10 @@ A to test. - Determines whether the specified is or . + Determines whether the specified is or empty. - true if the parameter is or ; otherwise, false. + true if the parameter is or empty; otherwise, false. To be added. diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/Opcode.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/Opcode.xml index 29423db6..84beab99 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp/Opcode.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp/Opcode.xml @@ -7,11 +7,6 @@ System.Enum - - - System.Flags - - Contains the values of the opcodes that denotes the frame type of the WebSocket frame. diff --git a/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml b/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml index ac93a701..ffc41d3c 100644 --- a/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml +++ b/websocket-sharp/doc/mdoc/WebSocketSharp/WebSocket.xml @@ -1,6 +1,6 @@ - + websocket-sharp @@ -142,8 +142,8 @@ releases all associated resources. - Emits a event if is not in the allowable range of - the WebSocket close status code, and do nothing any more. + This Close method emits a event if is not + in the allowable range of the WebSocket close status code. @@ -187,12 +187,12 @@ A that contains the reason for closure. - Closes the WebSocket connection with the specified and , and - releases all associated resources. + Closes the WebSocket connection with the specified and + , and releases all associated resources. - Emits a event if is not in the allowable range of - the WebSocket close status code, and do nothing any more. + This Close method emits a event if is not + in the allowable range of the WebSocket close status code. @@ -215,12 +215,30 @@ A that contains the reason for closure. - Closes the WebSocket connection with the specified and , and - releases all associated resources. + Closes the WebSocket connection with the specified and + , and releases all associated resources. To be added. + + + + Property + + WebSocketSharp.CompressionMethod + + + + Gets or sets the compression method used to compress the payload data of the WebSocket Data frame. + + + One of the values that indicates the compression method to use. + The default is . + + To be added. + + @@ -280,11 +298,10 @@ - Gets the extensions selected by the server. + Gets the WebSocket extensions selected by the server. A that contains the extensions if any. The default is . - (Currently this will only ever be the .) To be added. @@ -298,7 +315,7 @@ - Gets a value indicating whether a connection is alive. + Gets a value indicating whether the WebSocket connection is alive. true if the connection is alive; otherwise, false. @@ -315,7 +332,7 @@ - Gets a value indicating whether a connection is secure. + Gets a value indicating whether the WebSocket connection is secure. true if the connection is secure; otherwise, false. @@ -454,10 +471,10 @@ - Gets the subprotocol selected by the server. + Gets the WebSocket subprotocol selected by the server. - A that contains the subprotocol if any. By default, String.Empty. + A that contains the subprotocol if any. The default is . To be added. @@ -471,10 +488,10 @@ - Gets the state of the connection. + Gets the state of the WebSocket connection. - One of the . By default, WsState.CONNECTING. + One of the values. The default is . To be added. @@ -643,10 +660,10 @@ - Gets the WebSocket URL. + Gets the WebSocket URL to connect. - A that contains the WebSocket URL. + A that contains the WebSocket URL to connect. To be added. diff --git a/websocket-sharp/doc/mdoc/index.xml b/websocket-sharp/doc/mdoc/index.xml index f43406b0..1f200ade 100644 --- a/websocket-sharp/doc/mdoc/index.xml +++ b/websocket-sharp/doc/mdoc/index.xml @@ -1,6 +1,6 @@ - + [00 24 00 00 04 80 00 00 94 00 00 00 06 02 00 00 00 24 00 00 52 53 41 31 00 04 00 00 11 00 00 00 29 17 fb 89 fe c3 91 f7 2b cb 8b e2 61 d2 3f 05 93 6d 65 a8 9e 63 72 a6 f5 d5 2c f2 9d 20 fa 0b c0 70 6a f6 88 7e 8b 90 3f 39 f5 76 c8 48 e0 bb 7b b2 7b ed d3 10 a7 1a 0f 70 98 0f 7f f4 4b 53 09 d2 a5 ef 36 c3 56 b4 aa f0 91 72 63 25 07 89 e0 93 3e 3f 2e f2 b9 73 0e 12 15 5d 43 56 c3 f4 70 a5 89 fe f7 f6 ac 3e 77 c2 d8 d0 84 91 f4 0c d1 f3 8e dc c3 c3 b8 38 3d 0c bf 17 de 20 78 c1 ] @@ -37,6 +37,7 @@ + @@ -586,7 +587,7 @@ A to test. - Determines whether the specified is a . + Determines whether the specified is empty. @@ -694,10 +695,10 @@ - The type of the parameter. + The type of parameter. - A class to test. + An object to test. Determines whether the specified object is . @@ -765,7 +766,7 @@ A to test. - Determines whether the specified is or . + Determines whether the specified is or empty. diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj index 31be87e7..e2aa5260 100644 --- a/websocket-sharp/websocket-sharp.csproj +++ b/websocket-sharp/websocket-sharp.csproj @@ -122,6 +122,7 @@ + diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb index f40c51f8..fbaf26a5 100644 Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ