cobular
/
DemoWebsocket
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modified some Send and Broadcast methods (e.g. Send (stream, length, dispose) -> Send (stream, length))

Browse Source
master
sta 12 years ago
parent cbf73e9865
commit f6610352e2
6 changed files with 185 additions and 245 deletions
Show Stats Download Patch File Download Diff File

14
README.md
Unescape Escape View File

@ -147,7 +147,13 @@ ws.Send (data);
The `Send` method is overloaded. The `Send` method is overloaded.
The types of `data` are `string`, `byte []` and `FileInfo` class. The types of `data` are `string`, `byte []` and `System.IO.FileInfo` class.
In addition, the `Send (stream, length)` method exists, too.
These methods don't wait for the send to be complete. This means that these methods behave asynchronously.
If you want to do something when the send is complete, you use any of some `Send (data, completed)` methods.
#### Step 6 #### #### Step 6 ####
@ -159,9 +165,11 @@ ws.Close (code, reason);
If you want to close the WebSocket connection explicitly, you use the `Close` method. If you want to close the WebSocket connection explicitly, you use the `Close` method.
The `Close` method is overloaded. The types of `code` are `WebSocketSharp.CloseStatusCode` and `ushort`, the type of `reason` is `string`. The `Close` method is overloaded.
The types of `code` are `WebSocketSharp.CloseStatusCode` and `ushort`, and the type of `reason` is `string`.
In addition, the `Close ()` and `Close (code)` methods exist. In addition, the `Close ()` and `Close (code)` methods exist, too.
### WebSocket Server ### ### WebSocket Server ###

28
websocket-sharp/Ext.cs
Unescape Escape View File

@ -140,22 +140,22 @@ namespace WebSocketSharp
private static byte [] readBytes (this Stream stream, byte [] buffer, int offset, int length) private static byte [] readBytes (this Stream stream, byte [] buffer, int offset, int length)
{ {
var readLen = stream.Read (buffer, offset, length); var len = stream.Read (buffer, offset, length);
if (readLen < 1) if (len < 1)
return buffer.SubArray (0, offset); return buffer.SubArray (0, offset);
var tmpLen = 0; var tmp = 0;
while (readLen < length) while (len < length)
{ {
tmpLen = stream.Read (buffer, offset + readLen, length - readLen); tmp = stream.Read (buffer, offset + len, length - len);
if (tmpLen < 1) if (tmp < 1)
break; break;
readLen += tmpLen; len += tmp;
} }
return readLen < length return len < length
? buffer.SubArray (0, offset + readLen) ? buffer.SubArray (0, offset + len)
: buffer; : buffer;
} }
@ -536,15 +536,15 @@ namespace WebSocketSharp
AsyncCallback callback = ar => AsyncCallback callback = ar =>
{ {
try { try {
var readLen = stream.EndRead (ar); var len = stream.EndRead (ar);
var result = readLen < 1 var bytes = len < 1
? new byte []{} ? new byte []{}
: readLen < length : len < length
? stream.readBytes (buffer, readLen, length - readLen) ? stream.readBytes (buffer, len, length - len)
: buffer; : buffer;
if (completed != null) if (completed != null)
completed (result); completed (bytes);
} }
catch (Exception ex) { catch (Exception ex) {
if (error != null) if (error != null)

64
websocket-sharp/Server/WebSocketService.cs
Unescape Escape View File

@ -316,35 +316,35 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Sends a text <paramref name="data"/> to the client of the current /// Sends a binary data from the specified <see cref="FileInfo"/> to
/// <see cref="WebSocketService"/> instance. /// the client of the current <see cref="WebSocketService"/> instance.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method does not wait for the send to be complete. /// This method does not wait for the send to be complete.
/// </remarks> /// </remarks>
/// <param name="data"> /// <param name="file">
/// A <see cref="string"/> that contains a text data to send. /// A <see cref="FileInfo"/> from which contains a binary data to send.
/// </param> /// </param>
protected void Send (string data) protected void Send (FileInfo file)
{ {
if (_websocket != null) if (_websocket != null)
_websocket.Send (data, null); _websocket.Send (file, null);
} }
/// <summary> /// <summary>
/// Sends a binary data from the specified <see cref="FileInfo"/> to /// Sends a text <paramref name="data"/> to the client of the current
/// the client of the current <see cref="WebSocketService"/> instance. /// <see cref="WebSocketService"/> instance.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method does not wait for the send to be complete. /// This method does not wait for the send to be complete.
/// </remarks> /// </remarks>
/// <param name="file"> /// <param name="data">
/// A <see cref="FileInfo"/> from which contains a binary data to send. /// A <see cref="string"/> that contains a text data to send.
/// </param> /// </param>
protected void Send (FileInfo file) protected void Send (string data)
{ {
if (_websocket != null) if (_websocket != null)
_websocket.Send (file, null); _websocket.Send (data, null);
} }
/// <summary> /// <summary>
@ -370,14 +370,14 @@ namespace WebSocketSharp.Server
} }
/// <summary> /// <summary>
/// Sends a text <paramref name="data"/> to the client of the current /// Sends a binary data from the specified <see cref="FileInfo"/> to
/// <see cref="WebSocketService"/> instance. /// the client of the current <see cref="WebSocketService"/> instance.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method does not wait for the send to be complete. /// This method does not wait for the send to be complete.
/// </remarks> /// </remarks>
/// <param name="data"> /// <param name="file">
/// A <see cref="string"/> that contains a text data to send. /// A <see cref="FileInfo"/> from which contains a binary data to send.
/// </param> /// </param>
/// <param name="completed"> /// <param name="completed">
/// An Action&lt;bool&gt; delegate that references the method(s) called when /// An Action&lt;bool&gt; delegate that references the method(s) called when
@ -385,21 +385,21 @@ namespace WebSocketSharp.Server
/// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is /// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is
/// complete successfully; otherwise, <c>false</c>. /// complete successfully; otherwise, <c>false</c>.
/// </param> /// </param>
protected void Send (string data, Action<bool> completed) protected void Send (FileInfo file, Action<bool> completed)
{ {
if (_websocket != null) if (_websocket != null)
_websocket.Send (data, completed); _websocket.Send (file, completed);
} }
/// <summary> /// <summary>
/// Sends a binary data from the specified <see cref="FileInfo"/> to /// Sends a text <paramref name="data"/> to the client of the current
/// the client of the current <see cref="WebSocketService"/> instance. /// <see cref="WebSocketService"/> instance.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method does not wait for the send to be complete. /// This method does not wait for the send to be complete.
/// </remarks> /// </remarks>
/// <param name="file"> /// <param name="data">
/// A <see cref="FileInfo"/> from which contains a binary data to send. /// A <see cref="string"/> that contains a text data to send.
/// </param> /// </param>
/// <param name="completed"> /// <param name="completed">
/// An Action&lt;bool&gt; delegate that references the method(s) called when /// An Action&lt;bool&gt; delegate that references the method(s) called when
@ -407,10 +407,10 @@ namespace WebSocketSharp.Server
/// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is /// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is
/// complete successfully; otherwise, <c>false</c>. /// complete successfully; otherwise, <c>false</c>.
/// </param> /// </param>
protected void Send (FileInfo file, Action<bool> completed) protected void Send (string data, Action<bool> completed)
{ {
if (_websocket != null) if (_websocket != null)
_websocket.Send (file, completed); _websocket.Send (data, completed);
} }
/// <summary> /// <summary>
@ -426,14 +426,10 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to send. /// An <see cref="int"/> that contains the number of bytes to send.
/// </param> /// </param>
/// <param name="dispose"> protected void Send (Stream stream, int length)
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data read;
/// otherwise, <c>false</c>.
/// </param>
protected void Send (Stream stream, int length, bool dispose)
{ {
if (_websocket != null) if (_websocket != null)
_websocket.Send (stream, length, dispose, null); _websocket.Send (stream, length, null);
} }
/// <summary> /// <summary>
@ -449,20 +445,16 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to send. /// An <see cref="int"/> that contains the number of bytes to send.
/// </param> /// </param>
/// <param name="dispose">
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data read;
/// otherwise, <c>false</c>.
/// </param>
/// <param name="completed"> /// <param name="completed">
/// An Action&lt;bool&gt; delegate that references the method(s) called when /// An Action&lt;bool&gt; delegate that references the method(s) called when
/// the send is complete. /// the send is complete.
/// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is /// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is
/// complete successfully; otherwise, <c>false</c>. /// complete successfully; otherwise, <c>false</c>.
/// </param> /// </param>
protected void Send (Stream stream, int length, bool dispose, Action<bool> completed) protected void Send (Stream stream, int length, Action<bool> completed)
{ {
if (_websocket != null) if (_websocket != null)
_websocket.Send (stream, length, dispose, completed); _websocket.Send (stream, length, completed);
} }
/// <summary> /// <summary>

72
websocket-sharp/Server/WebSocketServiceHostManager.cs
Unescape Escape View File

@ -470,13 +470,9 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to broadcast. /// An <see cref="int"/> that contains the number of bytes to broadcast.
/// </param> /// </param>
/// <param name="dispose"> public void Broadcast (Stream stream, int length)
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data broadcasted;
/// otherwise, <c>false</c>.
/// </param>
public void Broadcast (Stream stream, int length, bool dispose)
{ {
Broadcast (stream, length, dispose, null); Broadcast (stream, length, null);
} }
/// <summary> /// <summary>
@ -492,15 +488,11 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to broadcast. /// An <see cref="int"/> that contains the number of bytes to broadcast.
/// </param> /// </param>
/// <param name="dispose">
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data broadcasted;
/// otherwise, <c>false</c>.
/// </param>
/// <param name="completed"> /// <param name="completed">
/// A <see cref="Action"/> delegate that references the method(s) called when /// A <see cref="Action"/> delegate that references the method(s) called when
/// the broadcast is complete. /// the broadcast is complete.
/// </param> /// </param>
public void Broadcast (Stream stream, int length, bool dispose, Action completed) public void Broadcast (Stream stream, int length, Action completed)
{ {
var msg = _state.CheckIfStarted () ?? var msg = _state.CheckIfStarted () ??
stream.CheckIfCanRead () ?? stream.CheckIfCanRead () ??
@ -512,36 +504,32 @@ namespace WebSocketSharp.Server
return; return;
} }
Action<byte []> result = data => stream.ReadBytesAsync (
length,
data =>
{ {
var readLen = data.Length; var len = data.Length;
if (readLen == 0) if (len == 0)
{ {
_logger.Error ("A data cannot be read from 'stream'."); _logger.Error ("A data cannot be read from 'stream'.");
return; return;
} }
if (readLen != length) if (len < length)
_logger.Warn (String.Format ( _logger.Warn (String.Format (
"A data with 'length' cannot be read from 'stream'.\nexpected: {0} actual: {1}", "A data with 'length' cannot be read from 'stream'.\nexpected: {0} actual: {1}",
length, length,
readLen)); len));
if (dispose) if (len <= WebSocket.FragmentLength)
stream.Dispose ();
if (readLen <= WebSocket.FragmentLength)
broadcast (Opcode.BINARY, data, completed); broadcast (Opcode.BINARY, data, completed);
else else
broadcast (Opcode.BINARY, new MemoryStream (data), completed); broadcast (Opcode.BINARY, new MemoryStream (data), completed);
}; },
ex =>
Action<Exception> exception = ex =>
{ {
_logger.Fatal (ex.ToString ()); _logger.Fatal (ex.ToString ());
}; });
stream.ReadBytesAsync (length, result, exception);
} }
/// <summary> /// <summary>
@ -644,13 +632,9 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to broadcast. /// An <see cref="int"/> that contains the number of bytes to broadcast.
/// </param> /// </param>
/// <param name="dispose"> public void BroadcastTo (string servicePath, Stream stream, int length)
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data broadcasted;
/// otherwise, <c>false</c>.
/// </param>
public void BroadcastTo (string servicePath, Stream stream, int length, bool dispose)
{ {
BroadcastTo (servicePath, stream, length, dispose, null); BroadcastTo (servicePath, stream, length, null);
} }
/// <summary> /// <summary>
@ -669,20 +653,16 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to broadcast. /// An <see cref="int"/> that contains the number of bytes to broadcast.
/// </param> /// </param>
/// <param name="dispose">
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data broadcasted;
/// otherwise, <c>false</c>.
/// </param>
/// <param name="completed"> /// <param name="completed">
/// A <see cref="Action"/> delegate that references the method(s) called when /// A <see cref="Action"/> delegate that references the method(s) called when
/// the broadcast is complete. /// the broadcast is complete.
/// </param> /// </param>
public void BroadcastTo ( public void BroadcastTo (
string servicePath, Stream stream, int length, bool dispose, Action completed) string servicePath, Stream stream, int length, Action completed)
{ {
WebSocketServiceHost host; WebSocketServiceHost host;
if (TryGetServiceHost (servicePath, out host)) if (TryGetServiceHost (servicePath, out host))
host.Sessions.Broadcast (stream, length, dispose, completed); host.Sessions.Broadcast (stream, length, completed);
} }
/// <summary> /// <summary>
@ -1011,13 +991,9 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to send. /// An <see cref="int"/> that contains the number of bytes to send.
/// </param> /// </param>
/// <param name="dispose"> public void SendTo (string servicePath, string id, Stream stream, int length)
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data read;
/// otherwise, <c>false</c>.
/// </param>
public void SendTo (string servicePath, string id, Stream stream, int length, bool dispose)
{ {
SendTo (servicePath, id, stream, length, dispose, null); SendTo (servicePath, id, stream, length, null);
} }
/// <summary> /// <summary>
@ -1040,10 +1016,6 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to send. /// An <see cref="int"/> that contains the number of bytes to send.
/// </param> /// </param>
/// <param name="dispose">
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data read;
/// otherwise, <c>false</c>.
/// </param>
/// <param name="completed"> /// <param name="completed">
/// An Action&lt;bool&gt; delegate that references the method(s) called when /// An Action&lt;bool&gt; delegate that references the method(s) called when
/// the send is complete. /// the send is complete.
@ -1051,11 +1023,11 @@ namespace WebSocketSharp.Server
/// successfully; otherwise, <c>false</c>. /// successfully; otherwise, <c>false</c>.
/// </param> /// </param>
public void SendTo ( public void SendTo (
string servicePath, string id, Stream stream, int length, bool dispose, Action<bool> completed) string servicePath, string id, Stream stream, int length, Action<bool> completed)
{ {
WebSocketServiceHost host; WebSocketServiceHost host;
if (TryGetServiceHost (servicePath, out host)) if (TryGetServiceHost (servicePath, out host))
host.Sessions.SendTo (id, stream, length, dispose, completed); host.Sessions.SendTo (id, stream, length, completed);
} }
/// <summary> /// <summary>

56
websocket-sharp/Server/WebSocketSessionManager.cs
Unescape Escape View File

@ -504,13 +504,9 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to broadcast. /// An <see cref="int"/> that contains the number of bytes to broadcast.
/// </param> /// </param>
/// <param name="dispose"> public void Broadcast (Stream stream, int length)
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data broadcasted;
/// otherwise, <c>false</c>.
/// </param>
public void Broadcast (Stream stream, int length, bool dispose)
{ {
Broadcast (stream, length, dispose, null); Broadcast (stream, length, null);
} }
/// <summary> /// <summary>
@ -526,15 +522,11 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to broadcast. /// An <see cref="int"/> that contains the number of bytes to broadcast.
/// </param> /// </param>
/// <param name="dispose">
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data broadcasted;
/// otherwise, <c>false</c>.
/// </param>
/// <param name="completed"> /// <param name="completed">
/// A <see cref="Action"/> delegate that references the method(s) called when /// A <see cref="Action"/> delegate that references the method(s) called when
/// the broadcast is complete. /// the broadcast is complete.
/// </param> /// </param>
public void Broadcast (Stream stream, int length, bool dispose, Action completed) public void Broadcast (Stream stream, int length, Action completed)
{ {
var msg = _state.CheckIfStarted () ?? var msg = _state.CheckIfStarted () ??
stream.CheckIfCanRead () ?? stream.CheckIfCanRead () ??
@ -546,36 +538,32 @@ namespace WebSocketSharp.Server
return; return;
} }
Action<byte []> result = data => stream.ReadBytesAsync (
length,
data =>
{ {
var readLen = data.Length; var len = data.Length;
if (readLen == 0) if (len == 0)
{ {
_logger.Error ("A data cannot be read from 'stream'."); _logger.Error ("A data cannot be read from 'stream'.");
return; return;
} }
if (readLen != length) if (len < length)
_logger.Warn (String.Format ( _logger.Warn (String.Format (
"A data with 'length' cannot be read from 'stream'.\nexpected: {0} actual: {1}", "A data with 'length' cannot be read from 'stream'.\nexpected: {0} actual: {1}",
length, length,
readLen)); len));
if (dispose)
stream.Dispose ();
if (readLen <= WebSocket.FragmentLength) if (len <= WebSocket.FragmentLength)
Broadcast (Opcode.BINARY, data, completed); Broadcast (Opcode.BINARY, data, completed);
else else
Broadcast (Opcode.BINARY, new MemoryStream (data), completed); Broadcast (Opcode.BINARY, new MemoryStream (data), completed);
}; },
ex =>
Action<Exception> exception = ex =>
{ {
_logger.Fatal (ex.ToString ()); _logger.Fatal (ex.ToString ());
}; });
stream.ReadBytesAsync (length, result, exception);
} }
/// <summary> /// <summary>
@ -826,13 +814,9 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to send. /// An <see cref="int"/> that contains the number of bytes to send.
/// </param> /// </param>
/// <param name="dispose"> public void SendTo (string id, Stream stream, int length)
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data read;
/// otherwise, <c>false</c>.
/// </param>
public void SendTo (string id, Stream stream, int length, bool dispose)
{ {
SendTo (id, stream, length, dispose, null); SendTo (id, stream, length, null);
} }
/// <summary> /// <summary>
@ -852,10 +836,6 @@ namespace WebSocketSharp.Server
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to send. /// An <see cref="int"/> that contains the number of bytes to send.
/// </param> /// </param>
/// <param name="dispose">
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data read;
/// otherwise, <c>false</c>.
/// </param>
/// <param name="completed"> /// <param name="completed">
/// An Action&lt;bool&gt; delegate that references the method(s) called when /// An Action&lt;bool&gt; delegate that references the method(s) called when
/// the send is complete. /// the send is complete.
@ -863,11 +843,11 @@ namespace WebSocketSharp.Server
/// successfully; otherwise, <c>false</c>. /// successfully; otherwise, <c>false</c>.
/// </param> /// </param>
public void SendTo ( public void SendTo (
string id, Stream stream, int length, bool dispose, Action<bool> completed) string id, Stream stream, int length, Action<bool> completed)
{ {
IWebSocketSession session; IWebSocketSession session;
if (TryGetSession (id, out session)) if (TryGetSession (id, out session))
session.Context.WebSocket.Send (stream, length, dispose, completed); session.Context.WebSocket.Send (stream, length, completed);
} }
/// <summary> /// <summary>

106
websocket-sharp/WebSocket.cs
Unescape Escape View File

@ -202,7 +202,7 @@ namespace WebSocketSharp
/// <paramref name="url"/> is <see langword="null"/>. /// <paramref name="url"/> is <see langword="null"/>.
/// </exception> /// </exception>
/// <exception cref="ArgumentException"> /// <exception cref="ArgumentException">
/// <paramref name="url"/> is not valid WebSocket URL. /// <paramref name="url"/> is invalid.
/// </exception> /// </exception>
public WebSocket ( public WebSocket (
string url, string url,
@ -1603,32 +1603,32 @@ namespace WebSocketSharp
} }
/// <summary> /// <summary>
/// Sends a text <paramref name="data"/> using the WebSocket connection. /// Sends a binary data from the specified <see cref="FileInfo"/>
/// using the WebSocket connection.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method does not wait for the send to be complete. /// This method does not wait for the send to be complete.
/// </remarks> /// </remarks>
/// <param name="data"> /// <param name="file">
/// A <see cref="string"/> that contains a text data to send. /// A <see cref="FileInfo"/> from which contains a binary data to send.
/// </param> /// </param>
public void Send (string data) public void Send (FileInfo file)
{ {
Send (data, null); Send (file, null);
} }
/// <summary> /// <summary>
/// Sends a binary data from the specified <see cref="FileInfo"/> /// Sends a text <paramref name="data"/> using the WebSocket connection.
/// using the WebSocket connection.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method does not wait for the send to be complete. /// This method does not wait for the send to be complete.
/// </remarks> /// </remarks>
/// <param name="file"> /// <param name="data">
/// A <see cref="FileInfo"/> from which contains a binary data to send. /// A <see cref="string"/> that contains a text data to send.
/// </param> /// </param>
public void Send (FileInfo file) public void Send (string data)
{ {
Send (file, null); Send (data, null);
} }
/// <summary> /// <summary>
@ -1664,13 +1664,14 @@ namespace WebSocketSharp
} }
/// <summary> /// <summary>
/// Sends a text <paramref name="data"/> using the WebSocket connection. /// Sends a binary data from the specified <see cref="FileInfo"/>
/// using the WebSocket connection.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method does not wait for the send to be complete. /// This method does not wait for the send to be complete.
/// </remarks> /// </remarks>
/// <param name="data"> /// <param name="file">
/// A <see cref="string"/> that contains a text data to send. /// A <see cref="FileInfo"/> from which contains a binary data to send.
/// </param> /// </param>
/// <param name="completed"> /// <param name="completed">
/// An Action&lt;bool&gt; delegate that references the method(s) called when /// An Action&lt;bool&gt; delegate that references the method(s) called when
@ -1678,9 +1679,11 @@ namespace WebSocketSharp
/// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is complete /// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is complete
/// successfully; otherwise, <c>false</c>. /// successfully; otherwise, <c>false</c>.
/// </param> /// </param>
public void Send (string data, Action<bool> completed) public void Send (FileInfo file, Action<bool> completed)
{ {
var msg = _readyState.CheckIfOpen () ?? data.CheckIfValidSendData (); var msg = _readyState.CheckIfOpen () ??
(file == null ? "'file' must not be null." : null);
if (msg != null) if (msg != null)
{ {
_logger.Error (msg); _logger.Error (msg);
@ -1689,22 +1692,17 @@ namespace WebSocketSharp
return; return;
} }
var rawData = Encoding.UTF8.GetBytes (data); send (Opcode.BINARY, file.OpenRead (), completed);
if (rawData.LongLength <= FragmentLength)
send (Opcode.TEXT, rawData, completed);
else
send (Opcode.TEXT, new MemoryStream (rawData), completed);
} }
/// <summary> /// <summary>
/// Sends a binary data from the specified <see cref="FileInfo"/> /// Sends a text <paramref name="data"/> using the WebSocket connection.
/// using the WebSocket connection.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// This method does not wait for the send to be complete. /// This method does not wait for the send to be complete.
/// </remarks> /// </remarks>
/// <param name="file"> /// <param name="data">
/// A <see cref="FileInfo"/> from which contains a binary data to send. /// A <see cref="string"/> that contains a text data to send.
/// </param> /// </param>
/// <param name="completed"> /// <param name="completed">
/// An Action&lt;bool&gt; delegate that references the method(s) called when /// An Action&lt;bool&gt; delegate that references the method(s) called when
@ -1712,11 +1710,9 @@ namespace WebSocketSharp
/// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is complete /// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is complete
/// successfully; otherwise, <c>false</c>. /// successfully; otherwise, <c>false</c>.
/// </param> /// </param>
public void Send (FileInfo file, Action<bool> completed) public void Send (string data, Action<bool> completed)
{ {
var msg = _readyState.CheckIfOpen () ?? var msg = _readyState.CheckIfOpen () ?? data.CheckIfValidSendData ();
(file == null ? "'file' must not be null." : null);
if (msg != null) if (msg != null)
{ {
_logger.Error (msg); _logger.Error (msg);
@ -1725,7 +1721,11 @@ namespace WebSocketSharp
return; return;
} }
send (Opcode.BINARY, file.OpenRead (), completed); var rawData = Encoding.UTF8.GetBytes (data);
if (rawData.LongLength <= FragmentLength)
send (Opcode.TEXT, rawData, completed);
else
send (Opcode.TEXT, new MemoryStream (rawData), completed);
} }
/// <summary> /// <summary>
@ -1741,13 +1741,9 @@ namespace WebSocketSharp
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to send. /// An <see cref="int"/> that contains the number of bytes to send.
/// </param> /// </param>
/// <param name="dispose"> public void Send (Stream stream, int length)
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data read;
/// otherwise, <c>false</c>.
/// </param>
public void Send (Stream stream, int length, bool dispose)
{ {
Send (stream, length, dispose, null); Send (stream, length, null);
} }
/// <summary> /// <summary>
@ -1763,17 +1759,13 @@ namespace WebSocketSharp
/// <param name="length"> /// <param name="length">
/// An <see cref="int"/> that contains the number of bytes to send. /// An <see cref="int"/> that contains the number of bytes to send.
/// </param> /// </param>
/// <param name="dispose">
/// <c>true</c> if <paramref name="stream"/> is disposed after a binary data read;
/// otherwise, <c>false</c>.
/// </param>
/// <param name="completed"> /// <param name="completed">
/// An Action&lt;bool&gt; delegate that references the method(s) called when /// An Action&lt;bool&gt; delegate that references the method(s) called when
/// the send is complete. /// the send is complete.
/// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is complete /// A <see cref="bool"/> passed to this delegate is <c>true</c> if the send is
/// successfully; otherwise, <c>false</c>. /// complete successfully; otherwise, <c>false</c>.
/// </param> /// </param>
public void Send (Stream stream, int length, bool dispose, Action<bool> completed) public void Send (Stream stream, int length, Action<bool> completed)
{ {
var msg = _readyState.CheckIfOpen () ?? var msg = _readyState.CheckIfOpen () ??
stream.CheckIfCanRead () ?? stream.CheckIfCanRead () ??
@ -1787,10 +1779,12 @@ namespace WebSocketSharp
return; return;
} }
Action<byte []> result = data => stream.ReadBytesAsync (
length,
data =>
{ {
var readLen = data.Length; var len = data.Length;
if (readLen == 0) if (len == 0)
{ {
var err = "A data cannot be read from 'stream'."; var err = "A data cannot be read from 'stream'.";
_logger.Error (err); _logger.Error (err);
@ -1799,30 +1793,24 @@ namespace WebSocketSharp
return; return;
} }
if (readLen != length) if (len < length)
_logger.Warn (String.Format ( _logger.Warn (String.Format (
"A data with 'length' cannot be read from 'stream'.\nexpected: {0} actual: {1}", "A data with 'length' cannot be read from 'stream'.\nexpected: {0} actual: {1}",
length, length,
readLen)); len));
if (dispose)
stream.Dispose ();
var sent = readLen <= FragmentLength var sent = len <= FragmentLength
? send (Opcode.BINARY, data) ? send (Opcode.BINARY, data)
: send (Opcode.BINARY, new MemoryStream (data)); : send (Opcode.BINARY, new MemoryStream (data));
if (completed != null) if (completed != null)
completed (sent); completed (sent);
}; },
ex =>
Action<Exception> exception = ex =>
{ {
_logger.Fatal (ex.ToString ()); _logger.Fatal (ex.ToString ());
error ("An exception has occured."); error ("An exception has occured.");
}; });
stream.ReadBytesAsync (length, result, exception);
} }
/// <summary> /// <summary>

Write Preview
Loading…
Cancel
Save