DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed WebSocketServiceManager.cs to WebSocketSessionManager.cs, added IWebSocketSession.cs and modified WebSocketService.cs

Browse Source
This commit is contained in:
sta 2013-09-13 16:54:41 +09:00
parent 0eb8813274
commit e3d5dea096
14 changed files with 418 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Example2/Chat.cs
View File

@ -3,42 +3,37 @@ using System.Threading;
using WebSocketSharp;
using WebSocketSharp.Server;
namespace Example2 {
namespace Example2
{
public class Chat : WebSocketService
{
private static int _num = 0;
private string _name;
private string getName()
private string getName ()
{
return QueryString.Contains("name")
? QueryString["name"]
: "anon#" + getNum();
return Context.QueryString ["name"] ?? ("anon#" + getNum ());
}
private int getNum()
private int getNum ()
{
return Interlocked.Increment(ref _num);
return Interlocked.Increment (ref _num);
}
protected override void OnOpen()
protected override void OnOpen ()
{
_name = getName();
_name = getName ();
}
protected override void OnMessage(MessageEventArgs e)
protected override void OnMessage (MessageEventArgs e)
{
var msg = String.Format("{0}: {1}", _name, e.Data);
Broadcast(msg);
Broadcast (String.Format ("{0}: {1}", _name, e.Data));
}
protected override void OnClose(CloseEventArgs e)
protected override void OnClose (CloseEventArgs e)
{
var msg = String.Format("{0} got logged off...", _name);
Broadcast(msg);
Broadcast (String.Format ("{0} got logged off...", _name));
}
}
}

6
Example2/Echo.cs
View File

@ -9,9 +9,11 @@ namespace Example2
{
protected override void OnMessage (MessageEventArgs e)
{
var msg = QueryString.Contains ("name")
? String.Format ("Returns '{0}' to {1}", e.Data, QueryString ["name"])
var name = Context.QueryString ["name"];
var msg = name != null
? String.Format ("Returns '{0}' to {1}", e.Data, name)
: e.Data;
Send (msg);
}

29
Example3/Chat.cs
View File

@ -3,42 +3,37 @@ using System.Threading;
using WebSocketSharp;
using WebSocketSharp.Server;
namespace Example3 {
namespace Example3
{
public class Chat : WebSocketService
{
private static int _num = 0;
private string _name;
private string getName()
private string getName ()
{
return QueryString.Contains("name")
? QueryString["name"]
: "anon#" + getNum();
return Context.QueryString ["name"] ?? ("anon#" + getNum ());
}
private int getNum()
private int getNum ()
{
return Interlocked.Increment(ref _num);
return Interlocked.Increment (ref _num);
}
protected override void OnOpen()
protected override void OnOpen ()
{
_name = getName();
_name = getName ();
}
protected override void OnMessage(MessageEventArgs e)
protected override void OnMessage (MessageEventArgs e)
{
var msg = String.Format("{0}: {1}", _name, e.Data);
Broadcast(msg);
Broadcast (String.Format ("{0}: {1}", _name, e.Data));
}
protected override void OnClose(CloseEventArgs e)
protected override void OnClose (CloseEventArgs e)
{
var msg = String.Format("{0} got logged off...", _name);
Broadcast(msg);
Broadcast (String.Format ("{0} got logged off...", _name));
}
}
}

14
Example3/Echo.cs
View File

@ -2,16 +2,18 @@ using System;
using WebSocketSharp;
using WebSocketSharp.Server;
namespace Example3 {
namespace Example3
{
public class Echo : WebSocketService
{
protected override void OnMessage(MessageEventArgs e)
protected override void OnMessage (MessageEventArgs e)
{
var msg = QueryString.Contains("name")
? String.Format("'{0}' returns to {1}", e.Data, QueryString["name"])
var name = Context.QueryString ["name"];
var msg = name != null
? String.Format ("Returns '{0}' to {1}", e.Data, name)
: e.Data;
Send(msg);
Send (msg);
}
}
}

2
websocket-sharp/Net/WebSockets/WebSocketContext.cs
View File

@ -44,7 +44,7 @@ namespace WebSocketSharp.Net.WebSockets
#region Protected Constructors
/// <summary>
/// Initializes a new instance of the <see cref="WebSocketSharp.Net.WebSockets.WebSocketContext"/> class.
/// Initializes a new instance of the <see cref="WebSocketContext"/> class.
/// </summary>
protected WebSocketContext ()
{

6
websocket-sharp/Server/HttpServer.cs
View File

@ -171,11 +171,11 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Gets or sets a value indicating whether the server cleans up the inactive WebSocket service
/// instances periodically.
/// Gets or sets a value indicating whether the server cleans up the inactive WebSocket sessions
/// periodically.
/// </summary>
/// <value>
/// <c>true</c> if the server cleans up the inactive WebSocket service instances every 60 seconds;
/// <c>true</c> if the server cleans up the inactive WebSocket sessions every 60 seconds;
/// otherwise, <c>false</c>. The default value is <c>true</c>.
/// </value>
public bool KeepClean {

26
websocket-sharp/Server/IWebSocketServiceHost.cs
View File

@ -46,15 +46,23 @@ namespace WebSocketSharp.Server
int ConnectionCount { get; }
/// <summary>
/// Gets or sets a value indicating whether the WebSocket service host cleans up the inactive service
/// instances periodically.
/// Gets or sets a value indicating whether the WebSocket service host cleans up
/// the inactive sessions periodically.
/// </summary>
/// <value>
/// <c>true</c> if the WebSocket service host cleans up the inactive service instances periodically;
/// <c>true</c> if the WebSocket service host cleans up the inactive sessions periodically;
/// otherwise, <c>false</c>.
/// </value>
bool KeepClean { get; set; }
/// <summary>
/// Gets the manager of the sessions to the WebSocket service host.
/// </summary>
/// <value>
/// A <see cref="WebSocketSessionManager"/> that manages the sessions.
/// </value>
WebSocketSessionManager Sessions { get; }
/// <summary>
/// Binds the specified <see cref="WebSocketContext"/> to a <see cref="WebSocketService"/> instance.
/// </summary>
@ -101,7 +109,7 @@ namespace WebSocketSharp.Server
Dictionary<string, bool> Broadping (byte [] data);
/// <summary>
/// Close the WebSocket session with the specified <paramref name="id"/>.
/// Close the session with the specified <paramref name="id"/>.
/// </summary>
/// <param name="id">
/// A <see cref="string"/> that contains a session ID to find.
@ -109,7 +117,7 @@ namespace WebSocketSharp.Server
void CloseSession (string id);
/// <summary>
/// Close the WebSocket session with the specified <paramref name="code"/>, <paramref name="reason"/>
/// Close the session with the specified <paramref name="code"/>, <paramref name="reason"/>
/// and <paramref name="id"/>.
/// </summary>
/// <param name="code">
@ -124,7 +132,7 @@ namespace WebSocketSharp.Server
void CloseSession (ushort code, string reason, string id);
/// <summary>
/// Close the WebSocket session with the specified <paramref name="code"/>, <paramref name="reason"/>
/// Close the session with the specified <paramref name="code"/>, <paramref name="reason"/>
/// and <paramref name="id"/>.
/// </summary>
/// <param name="code">
@ -167,7 +175,8 @@ namespace WebSocketSharp.Server
bool PingTo (string message, string id);
/// <summary>
/// Sends a binary data to the client associated with the specified <paramref name="id"/>.
/// Sends a binary <paramref name="data"/> to the client associated with the specified
/// <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if <paramref name="data"/> is successfully sent; otherwise, <c>false</c>.
@ -181,7 +190,8 @@ namespace WebSocketSharp.Server
bool SendTo (byte [] data, string id);
/// <summary>
/// Sends a text data to the client associated with the specified <paramref name="id"/>.
/// Sends a text <paramref name="data"/> to the client associated with the specified
/// <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if <paramref name="data"/> is successfully sent; otherwise, <c>false</c>.

71
websocket-sharp/Server/IWebSocketSession.cs Normal file
View File

@ -0,0 +1,71 @@
#region License
/*
* IWebSocketSession.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;
using WebSocketSharp.Net.WebSockets;
namespace WebSocketSharp.Server
{
/// <summary>
/// Exposes the properties for the session to the WebSocket service.
/// </summary>
public interface IWebSocketSession
{
/// <summary>
/// Gets the WebSocket connection request information.
/// </summary>
/// <value>
/// A <see cref="WebSocketContext"/> that contains the WebSocket connection request information.
/// </value>
WebSocketContext Context { get; }
/// <summary>
/// Gets the unique ID of the session to the WebSocket service.
/// </summary>
/// <value>
/// A <see cref="string"/> that contains the unique ID of the session.
/// </value>
string ID { get; }
/// <summary>
/// Gets the time that the session has been started.
/// </summary>
/// <value>
/// A <see cref="DateTime"/> that represents the time that the session has been started.
/// </value>
DateTime StartTime { get; }
/// <summary>
/// Gets the state of the WebSocket connection.
/// </summary>
/// <value>
/// One of the <see cref="WebSocketState"/> values.
/// </value>
WebSocketState State { get; }
}
}

9
websocket-sharp/Server/WebSocketServer.cs
View File

@ -146,11 +146,10 @@ namespace WebSocketSharp.Server
#region Public Properties
/// <summary>
/// Gets or sets a value indicating whether the server cleans up the inactive WebSocket service
/// instances periodically.
/// Gets or sets a value indicating whether the server cleans up the inactive sessions periodically.
/// </summary>
/// <value>
/// <c>true</c> if the server cleans up the inactive WebSocket service instances every 60 seconds;
/// <c>true</c> if the server cleans up the inactive sessions every 60 seconds;
/// otherwise, <c>false</c>. The default value is <c>true</c>.
/// </value>
public bool KeepClean {
@ -164,10 +163,10 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Gets the collection of paths to the WebSocket services that the server provides.
/// Gets the collection of each path to the WebSocket services that the server provides.
/// </summary>
/// <value>
/// An IEnumerable&lt;string&gt; that contains the collection of paths.
/// An IEnumerable&lt;string&gt; that contains the collection of each path to the WebSocket services.
/// </value>
public IEnumerable<string> ServicePaths {
get {

198
websocket-sharp/Server/WebSocketService.cs
View File

@ -37,18 +37,19 @@ using WebSocketSharp.Net.WebSockets;
namespace WebSocketSharp.Server
{
/// <summary>
/// Provides the basic functions of the WebSocket service managed by the WebSocket service host.
/// Provides the basic functions of the WebSocket service used by the WebSocket service host.
/// </summary>
/// <remarks>
/// The WebSocketService class is an abstract class.
/// </remarks>
public abstract class WebSocketService
public abstract class WebSocketService : IWebSocketSession
{
#region Private Fields
private WebSocket _websocket;
private WebSocketContext _context;
private WebSocketServiceManager _sessions;
private WebSocketSessionManager _sessions;
private DateTime _start;
#endregion
@ -59,18 +60,8 @@ namespace WebSocketSharp.Server
/// </summary>
public WebSocketService ()
{
ID = String.Empty;
IsBound = false;
}
#endregion
#region Internal Properties
internal WebSocket WebSocket {
get {
return _websocket;
}
_start = DateTime.MaxValue;
}
#endregion
@ -99,32 +90,17 @@ namespace WebSocketSharp.Server
_websocket.Log = value;
}
}
/// <summary>
/// Gets the collection of query string variables used in the WebSocket connection request.
/// Gets the manager of the sessions to the WebSocket service.
/// </summary>
/// <value>
/// A <see cref="NameValueCollection"/> that contains the collection of query string variables.
/// A <see cref="WebSocketSessionManager"/> that manages the sessions
/// to the WebSocket service.
/// </value>
protected NameValueCollection QueryString {
protected WebSocketSessionManager Sessions {
get {
return IsBound
? _context.QueryString
: null;
}
}
/// <summary>
/// Gets the collection of the WebSocket sessions managed by the WebSocket service host.
/// </summary>
/// <value>
/// A <see cref="WebSocketServiceManager"/> that contains a collection of the WebSocket sessions.
/// </value>
protected WebSocketServiceManager Sessions {
get {
return IsBound
? _sessions
: null;
return _sessions;
}
}
@ -133,10 +109,22 @@ namespace WebSocketSharp.Server
#region Public Properties
/// <summary>
/// Gets the session ID of the current <see cref="WebSocketService"/> instance.
/// Gets the WebSocket connection request information.
/// </summary>
/// <value>
/// A <see cref="string"/> that contains a session ID.
/// A <see cref="WebSocketContext"/> that contains the WebSocket connection request information.
/// </value>
public WebSocketContext Context {
get {
return _context;
}
}
/// <summary>
/// Gets the unique ID of the current <see cref="WebSocketService"/> instance.
/// </summary>
/// <value>
/// A <see cref="string"/> that contains the unique ID.
/// </value>
public string ID {
get; private set;
@ -154,12 +142,42 @@ namespace WebSocketSharp.Server
get; private set;
}
/// <summary>
/// Gets the time that the current <see cref="WebSocketService"/> instance has been started.
/// </summary>
/// <value>
/// A <see cref="DateTime"/> that represents the time that the current <see cref="WebSocketService"/>
/// instance has been started.
/// </value>
public DateTime StartTime {
get {
return _start;
}
}
/// <summary>
/// Gets the state of the WebSocket connection.
/// </summary>
/// <value>
/// One of the <see cref="WebSocketState"/> values.
/// </value>
public WebSocketState State {
get {
return IsBound
? _websocket.ReadyState
: WebSocketState.CONNECTING;
}
}
#endregion
#region Private Methods
private void onClose (object sender, CloseEventArgs e)
{
if (ID == null)
return;
_sessions.Remove (ID);
OnClose (e);
}
@ -177,6 +195,13 @@ namespace WebSocketSharp.Server
private void onOpen (object sender, EventArgs e)
{
ID = _sessions.Add (this);
if (ID == null)
{
_websocket.Close (CloseStatusCode.AWAY);
return;
}
_start = DateTime.Now;
OnOpen ();
}
@ -184,7 +209,7 @@ namespace WebSocketSharp.Server
#region Internal Methods
internal void Bind (WebSocketContext context, WebSocketServiceManager sessions)
internal void Bind (WebSocketContext context, WebSocketSessionManager sessions)
{
if (IsBound)
return;
@ -206,16 +231,6 @@ namespace WebSocketSharp.Server
return _websocket.Ping (data);
}
internal void SendAsync (byte [] data, Action completed)
{
_websocket.SendAsync (data, completed);
}
internal void SendAsync (string data, Action completed)
{
_websocket.SendAsync (data, completed);
}
internal void Stop (byte [] data)
{
_websocket.Close (data);
@ -226,8 +241,7 @@ namespace WebSocketSharp.Server
#region Protected Methods
/// <summary>
/// Broadcasts the specified array of <see cref="byte"/> to the clients of every <see cref="WebSocketService"/>
/// instances in the <see cref="WebSocketService.Sessions"/>.
/// Broadcasts the specified array of <see cref="byte"/> to all clients of the WebSocket service.
/// </summary>
/// <param name="data">
/// An array of <see cref="byte"/> to broadcast.
@ -250,8 +264,7 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Broadcasts the specified <see cref="string"/> to the clients of every <see cref="WebSocketService"/>
/// instances in the <see cref="WebSocketService.Sessions"/>.
/// Broadcasts the specified <see cref="string"/> to all clients of the WebSocket service.
/// </summary>
/// <param name="data">
/// A <see cref="string"/> to broadcast.
@ -274,12 +287,11 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends Pings to the clients of every <see cref="WebSocketService"/> instances
/// in the <see cref="WebSocketService.Sessions"/>.
/// Sends Pings to all clients of the WebSocket service.
/// </summary>
/// <returns>
/// A Dictionary&lt;string, bool&gt; that contains the collection of pairs of session ID and value
/// indicating whether the each <see cref="WebSocketService"/> instance received a Pong in a time.
/// indicating whether the WebSocket service received a Pong from each client in a time.
/// </returns>
protected virtual Dictionary<string, bool> Broadping ()
{
@ -289,12 +301,11 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends Pings with the specified <paramref name="message"/> to the clients of every <see cref="WebSocketService"/>
/// instances in the <see cref="WebSocketService.Sessions"/>.
/// Sends Pings with the specified <paramref name="message"/> to all clients of the WebSocket service.
/// </summary>
/// <returns>
/// A Dictionary&lt;string, bool&gt; that contains the collection of pairs of session ID and value
/// indicating whether the each <see cref="WebSocketService"/> instance received a Pong in a time.
/// indicating whether the WebSocket service received a Pong from each client in a time.
/// </returns>
/// <param name="message">
/// A <see cref="string"/> that contains a message to send.
@ -374,12 +385,11 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends a Ping to the client of the <see cref="WebSocketService"/> instance
/// with the specified <paramref name="id"/>.
/// Sends a Ping to the client associated with the specified <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if the <see cref="WebSocketService"/> instance with <paramref name="id"/> receives
/// a Pong in a time; otherwise, <c>false</c>.
/// <c>true</c> if the WebSocket service receives a Pong from the client in a time;
/// otherwise, <c>false</c>.
/// </returns>
/// <param name="id">
/// A <see cref="string"/> that contains a session ID that represents the destination for the Ping.
@ -402,12 +412,12 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends a Ping with the specified <paramref name="message"/> to the client of
/// the <see cref="WebSocketService"/> instance with the specified <paramref name="id"/>.
/// Sends a Ping with the specified <paramref name="message"/> to the client associated with
/// the specified <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if the <see cref="WebSocketService"/> instance with <paramref name="id"/> receives
/// a Pong in a time; otherwise, <c>false</c>.
/// <c>true</c> if the WebSocket service receives a Pong from the client in a time;
/// otherwise, <c>false</c>.
/// </returns>
/// <param name="message">
/// A <see cref="string"/> that contains a message to send.
@ -433,8 +443,8 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends a binary data to the client of the <see cref="WebSocketService"/> instance
/// with the specified <paramref name="id"/>.
/// Sends a binary <paramref name="data"/> to the client associated with the specified
/// <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if <paramref name="data"/> is successfully sent; otherwise, <c>false</c>.
@ -463,8 +473,8 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends a text data to the client of the <see cref="WebSocketService"/> instance
/// with the specified <paramref name="id"/>.
/// Sends a text <paramref name="data"/> to the client associated with the specified
/// <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if <paramref name="data"/> is successfully sent; otherwise, <c>false</c>.
@ -523,8 +533,8 @@ namespace WebSocketSharp.Server
/// Sends a Ping to the client of the current <see cref="WebSocketService"/> instance.
/// </summary>
/// <returns>
/// <c>true</c> if the current <see cref="WebSocketService"/> instance receives a Pong in a time;
/// otherwise, <c>false</c>.
/// <c>true</c> if the current <see cref="WebSocketService"/> instance receives a Pong
/// from the client in a time; otherwise, <c>false</c>.
/// </returns>
public virtual bool Ping ()
{
@ -538,8 +548,8 @@ namespace WebSocketSharp.Server
/// the current <see cref="WebSocketService"/> instance.
/// </summary>
/// <returns>
/// <c>true</c> if the current <see cref="WebSocketService"/> instance receives a Pong in a time;
/// otherwise, <c>false</c>.
/// <c>true</c> if the current <see cref="WebSocketService"/> instance receives a Pong
/// from the client in a time; otherwise, <c>false</c>.
/// </returns>
/// <param name="message">
/// A <see cref="string"/> that contains a message to send.
@ -552,7 +562,8 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends a binary data to the client of the current <see cref="WebSocketService"/> instance.
/// Sends a binary <paramref name="data"/> to the client of the current
/// <see cref="WebSocketService"/> instance.
/// </summary>
/// <param name="data">
/// An array of <see cref="byte"/> that contains a binary data to send.
@ -564,7 +575,8 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends a text data to the client of the current <see cref="WebSocketService"/> instance.
/// Sends a text <paramref name="data"/> to the client of the current
/// <see cref="WebSocketService"/> instance.
/// </summary>
/// <param name="data">
/// A <see cref="string"/> that contains a text data to send.
@ -575,6 +587,40 @@ namespace WebSocketSharp.Server
_websocket.Send (data);
}
/// <summary>
/// Sends a binary <paramref name="data"/> to the client of the current
/// <see cref="WebSocketService"/> instance asynchronously.
/// </summary>
/// <param name="data">
/// An array of <see cref="byte"/> that contains a binary data to send.
/// </param>
/// <param name="completed">
/// An <see cref="Action"/> delegate that references the method(s) called when
/// the asynchronous operation completes.
/// </param>
public virtual void SendAsync (byte [] data, Action completed)
{
if (IsBound)
_websocket.SendAsync (data, completed);
}
/// <summary>
/// Sends a text <paramref name="data"/> to the client of the current
/// <see cref="WebSocketService"/> instance asynchronously.
/// </summary>
/// <param name="data">
/// A <see cref="string"/> that contains a text data to send.
/// </param>
/// <param name="completed">
/// An <see cref="Action"/> delegate that references the method(s) called when
/// the asynchronous operation completes.
/// </param>
public virtual void SendAsync (string data, Action completed)
{
if (IsBound)
_websocket.SendAsync (data, completed);
}
/// <summary>
/// Starts the current <see cref="WebSocketService"/> instance.
/// </summary>

50
websocket-sharp/Server/WebSocketServiceHost.cs
View File

@ -53,7 +53,7 @@ namespace WebSocketSharp.Server
#region Private Fields
private string _servicePath;
private WebSocketServiceManager _sessions;
private WebSocketSessionManager _sessions;
#endregion
@ -62,7 +62,7 @@ namespace WebSocketSharp.Server
internal WebSocketServiceHost (Logger logger)
: base (logger)
{
_sessions = new WebSocketServiceManager (logger);
_sessions = new WebSocketSessionManager (logger);
}
#endregion
@ -91,7 +91,7 @@ namespace WebSocketSharp.Server
public WebSocketServiceHost (string url)
: base (url)
{
_sessions = new WebSocketServiceManager (Log);
_sessions = new WebSocketSessionManager (Log);
}
/// <summary>
@ -185,7 +185,7 @@ namespace WebSocketSharp.Server
public WebSocketServiceHost (System.Net.IPAddress address, int port, string servicePath, bool secure)
: base (address, port, servicePath, secure)
{
_sessions = new WebSocketServiceManager (Log);
_sessions = new WebSocketSessionManager (Log);
}
#endregion
@ -206,10 +206,10 @@ namespace WebSocketSharp.Server
/// <summary>
/// Gets or sets a value indicating whether the WebSocket service host cleans up
/// the inactive <see cref="WebSocketService"/> instances periodically.
/// the inactive sessions periodically.
/// </summary>
/// <value>
/// <c>true</c> if the WebSocket service host cleans up the inactive WebSocket service instances
/// <c>true</c> if the WebSocket service host cleans up the inactive sessions
/// every 60 seconds; otherwise, <c>false</c>. The default value is <c>true</c>.
/// </value>
public bool KeepClean {
@ -222,18 +222,6 @@ namespace WebSocketSharp.Server
}
}
/// <summary>
/// Gets the collection of the WebSocket sessions managed by the WebSocket service host.
/// </summary>
/// <value>
/// A <see cref="WebSocketServiceManager"/> that contains a collection of the WebSocket sessions.
/// </value>
public WebSocketServiceManager Sessions {
get {
return _sessions;
}
}
/// <summary>
/// Gets the path to the WebSocket service that the WebSocket service host provides.
/// </summary>
@ -249,6 +237,18 @@ namespace WebSocketSharp.Server
}
}
/// <summary>
/// Gets the manager of the sessions to the WebSocket service host.
/// </summary>
/// <value>
/// A <see cref="WebSocketSessionManager"/> that manages the sessions.
/// </value>
public WebSocketSessionManager Sessions {
get {
return _sessions;
}
}
/// <summary>
/// Gets the WebSocket URL on which to listen for incoming connection attempts.
/// </summary>
@ -390,7 +390,7 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Close the WebSocket session with the specified <paramref name="id"/>.
/// Close the session with the specified <paramref name="id"/>.
/// </summary>
/// <param name="id">
/// A <see cref="string"/> that contains a session ID to find.
@ -408,7 +408,7 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Close the WebSocket session with the specified <paramref name="code"/>, <paramref name="reason"/>
/// Close the session with the specified <paramref name="code"/>, <paramref name="reason"/>
/// and <paramref name="id"/>.
/// </summary>
/// <param name="code">
@ -433,7 +433,7 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Close the WebSocket session with the specified <paramref name="code"/>, <paramref name="reason"/>
/// Close the session with the specified <paramref name="code"/>, <paramref name="reason"/>
/// and <paramref name="id"/>.
/// </summary>
/// <param name="code">
@ -506,7 +506,8 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends a binary data to the client associated with the specified <paramref name="id"/>.
/// Sends a binary <paramref name="data"/> to the client associated with the specified
/// <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if <paramref name="data"/> is successfully sent; otherwise, <c>false</c>.
@ -530,7 +531,8 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends a text data to the client associated with the specified <paramref name="id"/>.
/// Sends a text <paramref name="data"/> to the client associated with the specified
/// <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if <paramref name="data"/> is successfully sent; otherwise, <c>false</c>.
@ -654,7 +656,7 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Stops the WebSocket service host with the specified array of <see cref="byte"/>.
/// Stops receiving the WebSocket connection requests with the specified array of <see cref="byte"/>.
/// </summary>
/// <param name="data">
/// An array of <see cref="byte"/> that contains the reason for stop.

70
websocket-sharp/Server/WebSocketServiceHostManager.cs
View File

@ -28,13 +28,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using WebSocketSharp.Net;
namespace WebSocketSharp.Server
{
/// <summary>
/// Manages the collection of the WebSocket service hosts.
/// Manages the WebSocket services provided by the <see cref="HttpServer"/> and
/// <see cref="WebSocketServer"/>.
/// </summary>
public class WebSocketServiceHostManager
{
@ -88,7 +90,7 @@ namespace WebSocketSharp.Server
get {
lock (_sync)
{
return _serviceHosts.Values;
return _serviceHosts.Values.ToList ();
}
}
}
@ -98,10 +100,10 @@ namespace WebSocketSharp.Server
#region Public Properties
/// <summary>
/// Gets the connection count to the WebSocket services managed by the <see cref="WebSocketServiceHostManager"/>.
/// Gets the connection count to the WebSocket services provided by the WebSocket server.
/// </summary>
/// <value>
/// An <see cref="int"/> that contains the connection count.
/// An <see cref="int"/> that contains the connection count to the WebSocket services.
/// </value>
public int ConnectionCount {
get {
@ -114,7 +116,7 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Gets the number of the WebSocket services managed by the <see cref="WebSocketServiceHostManager"/>.
/// Gets the number of the WebSocket services provided by the WebSocket server.
/// </summary>
/// <value>
/// An <see cref="int"/> that contains the number of the WebSocket services.
@ -129,16 +131,16 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Gets the collection of paths to the WebSocket services managed by the <see cref="WebSocketServiceHostManager"/>.
/// Gets the collection of each path to the WebSocket services provided by the WebSocket server.
/// </summary>
/// <value>
/// An IEnumerable&lt;string&gt; that contains the collection of paths.
/// An IEnumerable&lt;string&gt; that contains the collection of each path to the WebSocket services.
/// </value>
public IEnumerable<string> ServicePaths {
get {
lock (_sync)
{
return _serviceHosts.Keys;
return _serviceHosts.Keys.ToList ();
}
}
}
@ -243,7 +245,7 @@ namespace WebSocketSharp.Server
/// <summary>
/// Broadcasts the specified array of <see cref="byte"/> to all clients of the WebSocket services
/// managed by the <see cref="WebSocketServiceHostManager"/>.
/// provided by the WebSocket server.
/// </summary>
/// <param name="data">
/// An array of <see cref="byte"/> to broadcast.
@ -263,7 +265,7 @@ namespace WebSocketSharp.Server
/// <summary>
/// Broadcasts the specified <see cref="string"/> to all clients of the WebSocket services
/// managed by the <see cref="WebSocketServiceHostManager"/>.
/// provided by the WebSocket server.
/// </summary>
/// <param name="data">
/// A <see cref="string"/> to broadcast.
@ -348,7 +350,7 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends Pings to all clients of the WebSocket services managed by the <see cref="WebSocketServiceHostManager"/>.
/// Sends Pings to all clients of the WebSocket services provided by the WebSocket server.
/// </summary>
/// <returns>
/// A Dictionary&lt;string, Dictionary&lt;string, bool&gt;&gt; that contains the collection of
@ -362,12 +364,13 @@ namespace WebSocketSharp.Server
/// <summary>
/// Sends Pings with the specified <paramref name="message"/> to all clients of the WebSocket services
/// managed by the <see cref="WebSocketServiceHostManager"/>.
/// provided by the WebSocket server.
/// </summary>
/// <returns>
/// A Dictionary&lt;string, Dictionary&lt;string, bool&gt;&gt; that contains the collection of
/// service paths and pairs of session ID and value indicating whether each WebSocket service
/// received a Pong from each client in a time.
/// If <paramref name="message"/> is invalid, returns <see langword="null"/>.
/// </returns>
/// <param name="message">
/// A <see cref="string"/> that contains a message to send.
@ -457,7 +460,7 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Close the WebSocket session with the specified <paramref name="id"/> and
/// Close the session with the specified <paramref name="id"/> and
/// <paramref name="servicePath"/>.
/// </summary>
/// <param name="id">
@ -486,7 +489,7 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Close the WebSocket session with the specified <paramref name="code"/>, <paramref name="reason"/>,
/// Close the session with the specified <paramref name="code"/>, <paramref name="reason"/>,
/// <paramref name="id"/> and <paramref name="servicePath"/>.
/// </summary>
/// <param name="code">
@ -521,7 +524,7 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Close the WebSocket session with the specified <paramref name="code"/>, <paramref name="reason"/>,
/// Close the session with the specified <paramref name="code"/>, <paramref name="reason"/>,
/// <paramref name="id"/> and <paramref name="servicePath"/>.
/// </summary>
/// <param name="code">
@ -584,6 +587,35 @@ namespace WebSocketSharp.Server
return host.ConnectionCount;
}
/// <summary>
/// Gets the manager of the sessions to the WebSocket service with the specified <paramref name="servicePath"/>.
/// </summary>
/// <returns>
/// A <see cref="WebSocketSessionManager"/> if the WebSocket service is successfully found;
/// otherwise, <see langword="null"/>.
/// </returns>
/// <param name="servicePath">
/// A <see cref="string"/> that contains an absolute path to the WebSocket service to find.
/// </param>
public WebSocketSessionManager GetSessions (string servicePath)
{
var msg = servicePath.CheckIfValidServicePath ();
if (msg != null)
{
_logger.Error (msg);
return null;
}
IWebSocketServiceHost host;
if (!TryGetServiceHost (servicePath, out host))
{
_logger.Error ("The WebSocket service with the specified path not found.\npath: " + servicePath);
return null;
}
return host.Sessions;
}
/// <summary>
/// Sends a Ping to the client associated with the specified <paramref name="id"/> and
/// <paramref name="servicePath"/>.
@ -654,8 +686,8 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends a binary data to the client associated with the specified <paramref name="id"/> and
/// <paramref name="servicePath"/>.
/// Sends a binary <paramref name="data"/> to the client associated with the specified
/// <paramref name="id"/> and <paramref name="servicePath"/>.
/// </summary>
/// <returns>
/// <c>true</c> if <paramref name="data"/> is successfully sent; otherwise, <c>false</c>.
@ -689,8 +721,8 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Sends a text data to the client associated with the specified <paramref name="id"/> and
/// <paramref name="servicePath"/>.
/// Sends a text <paramref name="data"/> to the client associated with the specified
/// <paramref name="id"/> and <paramref name="servicePath"/>.
/// </summary>
/// <returns>
/// <c>true</c> if <paramref name="data"/> is successfully sent; otherwise, <c>false</c>.

248
websocket-sharp/Server/WebSocketServiceManager.cs → websocket-sharp/Server/WebSocketSessionManager.cs
View File

@ -1,6 +1,6 @@
#region License
/*
* WebSocketServiceManager.cs
* WebSocketSessionManager.cs
*
* The MIT License
*
@ -34,15 +34,15 @@ using System.Timers;
namespace WebSocketSharp.Server
{
/// <summary>
/// Manages the collection of <see cref="WebSocketService"/> instances.
/// Manages the sessions to the Websocket service.
/// </summary>
public class WebSocketServiceManager
public class WebSocketSessionManager
{
#region Private Fields
private object _forSweep;
private Logger _logger;
private Dictionary<string, WebSocketService> _services;
private Dictionary<string, WebSocketService> _sessions;
private volatile bool _stopped;
private volatile bool _sweeping;
private Timer _sweepTimer;
@ -52,16 +52,16 @@ namespace WebSocketSharp.Server
#region Internal Constructors
internal WebSocketServiceManager ()
internal WebSocketSessionManager ()
: this (new Logger ())
{
}
internal WebSocketServiceManager (Logger logger)
internal WebSocketSessionManager (Logger logger)
{
_logger = logger;
_forSweep = new object ();
_services = new Dictionary<string, WebSocketService> ();
_sessions = new Dictionary<string, WebSocketService> ();
_stopped = false;
_sweeping = false;
_sync = new object ();
@ -72,15 +72,26 @@ namespace WebSocketSharp.Server
#endregion
#region Internal Properties
internal IEnumerable<WebSocketService> ServiceInstances {
get {
lock (_sync)
{
return _sessions.Values.ToList ();
}
}
}
#endregion
#region Public Properties
/// <summary>
/// Gets the collection of IDs of active <see cref="WebSocketService"/> instances
/// managed by the <see cref="WebSocketServiceManager"/>.
/// Gets the collection of every ID of the active sessions to the Websocket service.
/// </summary>
/// <value>
/// An IEnumerable&lt;string&gt; that contains the collection of IDs
/// of active <see cref="WebSocketService"/> instances.
/// An IEnumerable&lt;string&gt; that contains the collection of every ID of the active sessions.
/// </value>
public IEnumerable<string> ActiveIDs {
get {
@ -91,46 +102,40 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Gets the number of <see cref="WebSocketService"/> instances
/// managed by the <see cref="WebSocketServiceManager"/>.
/// Gets the number of the sessions to the Websocket service.
/// </summary>
/// <value>
/// An <see cref="int"/> that contains the number of <see cref="WebSocketService"/> instances
/// managed by the <see cref="WebSocketServiceManager"/>.
/// An <see cref="int"/> that contains the number of the sessions.
/// </value>
public int Count {
get {
lock (_sync)
{
return _services.Count;
return _sessions.Count;
}
}
}
/// <summary>
/// Gets the collection of IDs of <see cref="WebSocketService"/> instances
/// managed by the <see cref="WebSocketServiceManager"/>.
/// Gets the collection of every ID of the sessions to the Websocket service.
/// </summary>
/// <value>
/// An IEnumerable&lt;string&gt; that contains the collection of IDs
/// of <see cref="WebSocketService"/> instances.
/// An IEnumerable&lt;string&gt; that contains the collection of every ID of the sessions.
/// </value>
public IEnumerable<string> IDs {
get {
lock (_sync)
{
return _services.Keys;
return _sessions.Keys.ToList ();
}
}
}
/// <summary>
/// Gets the collection of IDs of inactive <see cref="WebSocketService"/> instances
/// managed by the <see cref="WebSocketServiceManager"/>.
/// Gets the collection of every ID of the inactive sessions to the Websocket service.
/// </summary>
/// <value>
/// An IEnumerable&lt;string&gt; that contains the collection of IDs
/// of inactive <see cref="WebSocketService"/> instances.
/// An IEnumerable&lt;string&gt; that contains the collection of every ID of the inactive sessions.
/// </value>
public IEnumerable<string> InactiveIDs {
get {
@ -141,17 +146,16 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Gets the <see cref="WebSocketService"/> instance with the specified <paramref name="id"/>
/// from the <see cref="WebSocketServiceManager"/>.
/// Gets the session information with the specified <paramref name="id"/>.
/// </summary>
/// <value>
/// A <see cref="WebSocketService"/> instance with <paramref name="id"/> if it is successfully found;
/// A <see cref="IWebSocketSession"/> instance with <paramref name="id"/> if it is successfully found;
/// otherwise, <see langword="null"/>.
/// </value>
/// <param name="id">
/// A <see cref="string"/> that contains an ID to find.
/// A <see cref="string"/> that contains a session ID to find.
/// </param>
public WebSocketService this [string id] {
public IWebSocketSession this [string id] {
get {
var msg = id.CheckIfValidSessionID ();
if (msg != null)
@ -163,7 +167,7 @@ namespace WebSocketSharp.Server
lock (_sync)
{
try {
return _services [id];
return _sessions [id];
}
catch {
_logger.Error ("'id' not found.\nid: " + id);
@ -174,12 +178,11 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Gets a value indicating whether the <see cref="WebSocketServiceManager"/> cleans up
/// the inactive <see cref="WebSocketService"/> instances periodically.
/// Gets a value indicating whether the manager cleans up the inactive sessions periodically.
/// </summary>
/// <value>
/// <c>true</c> if the <see cref="WebSocketServiceManager"/> cleans up the inactive
/// <see cref="WebSocketService"/> instances every 60 seconds; otherwise, <c>false</c>.
/// <c>true</c> if the manager cleans up the inactive sessions every 60 seconds;
/// otherwise, <c>false</c>.
/// </value>
public bool KeepClean {
get {
@ -198,19 +201,15 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Gets the collection of the <see cref="WebSocketService"/> instances
/// managed by the <see cref="WebSocketServiceManager"/>.
/// Gets the collection of the session informations to the Websocket service.
/// </summary>
/// <value>
/// An IEnumerable&lt;WebSocketService&gt; that contains the collection of
/// the <see cref="WebSocketService"/> instances.
/// An IEnumerable&lt;IWebSocketSession&gt; that contains the collection of the session informations.
/// </value>
public IEnumerable<WebSocketService> ServiceInstances {
public IEnumerable<IWebSocketSession> Sessions {
get {
lock (_sync)
{
return _services.Values;
}
return from IWebSocketSession session in ServiceInstances
select session;
}
}
@ -232,9 +231,7 @@ namespace WebSocketSharp.Server
private void broadcastAsync (byte [] data)
{
var copied = copy ();
var services = copied.Values.GetEnumerator ();
var services = ServiceInstances.GetEnumerator ();
Action completed = null;
completed = () =>
{
@ -248,9 +245,7 @@ namespace WebSocketSharp.Server
private void broadcastAsync (string data)
{
var copied = copy ();
var services = copied.Values.GetEnumerator ();
var services = ServiceInstances.GetEnumerator ();
Action completed = null;
completed = () =>
{
@ -262,14 +257,6 @@ namespace WebSocketSharp.Server
services.Current.SendAsync (data, completed);
}
private Dictionary<string, WebSocketService> copy ()
{
lock (_sync)
{
return new Dictionary<string, WebSocketService> (_services);
}
}
private static string createID ()
{
return Guid.NewGuid ().ToString ("N");
@ -300,7 +287,7 @@ namespace WebSocketSharp.Server
#region Internal Methods
internal string Add (WebSocketService service)
internal string Add (WebSocketService session)
{
lock (_sync)
{
@ -308,19 +295,12 @@ namespace WebSocketSharp.Server
return null;
var id = createID ();
_services.Add (id, service);
_sessions.Add (id, session);
return id;
}
}
/// <summary>
/// Broadcasts the specified array of <see cref="byte"/> to the clients of every <see cref="WebSocketService"/>
/// instances managed by the <see cref="WebSocketServiceManager"/>.
/// </summary>
/// <param name="data">
/// An array of <see cref="byte"/> to broadcast.
/// </param>
internal void Broadcast (byte [] data)
{
if (_stopped)
@ -329,13 +309,6 @@ namespace WebSocketSharp.Server
broadcastAsync (data);
}
/// <summary>
/// Broadcasts the specified <see cref="string"/> to the clients of every <see cref="WebSocketService"/>
/// instances managed by the <see cref="WebSocketServiceManager"/>.
/// </summary>
/// <param name="data">
/// A <see cref="string"/> to broadcast.
/// </param>
internal void Broadcast (string data)
{
if (_stopped)
@ -344,71 +317,35 @@ namespace WebSocketSharp.Server
broadcastAsync (data);
}
/// <summary>
/// Sends Pings with the specified <paramref name="data"/> to the clients of every <see cref="WebSocketService"/>
/// instances managed by the <see cref="WebSocketServiceManager"/>.
/// </summary>
/// <returns>
/// A Dictionary&lt;string, bool&gt; that contains the collection of pairs of ID and value indicating
/// whether each <see cref="WebSocketService"/> instance received a Pong from the client in a time.
/// </returns>
/// <param name="data">
/// An array of <see cref="byte"/> that contains a message data to send.
/// </param>
internal Dictionary<string, bool> Broadping (byte [] data)
{
var result = new Dictionary<string, bool> ();
foreach (var session in copy ())
result.Add (session.Key, session.Value.Ping (data));
foreach (var service in ServiceInstances)
result.Add (service.ID, service.Ping (data));
return result;
}
/// <summary>
/// Sends a Ping to the client of the <see cref="WebSocketService"/> instance
/// with the specified <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if the <see cref="WebSocketService"/> instance receives a Pong from the client
/// in a time; otherwise, <c>false</c>.
/// </returns>
/// <param name="id">
/// A <see cref="string"/> that contains an ID that represents the destination for the Ping.
/// </param>
internal bool PingTo (string id)
{
WebSocketService service;
if (!TryGetServiceInstance (id, out service))
{
_logger.Error (
"The WebSocket service instance with the specified ID not found.\nID: " + id);
"The WebSocket session with the specified ID not found.\nID: " + id);
return false;
}
return service.Ping ();
}
/// <summary>
/// Sends a Ping with the specified <paramref name="message"/> to the client of the <see cref="WebSocketService"/>
/// instance with the specified <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if the <see cref="WebSocketService"/> instance receives a Pong from the client
/// in a time; otherwise, <c>false</c>.
/// </returns>
/// <param name="message">
/// A <see cref="string"/> that contains a message to send.
/// </param>
/// <param name="id">
/// A <see cref="string"/> that contains an ID that represents the destination for the Ping.
/// </param>
internal bool PingTo (string message, string id)
{
WebSocketService service;
if (!TryGetServiceInstance (id, out service))
{
_logger.Error (
"The WebSocket service instance with the specified ID not found.\nID: " + id);
"The WebSocket session with the specified ID not found.\nID: " + id);
return false;
}
@ -419,30 +356,17 @@ namespace WebSocketSharp.Server
{
lock (_sync)
{
return _services.Remove (id);
return _sessions.Remove (id);
}
}
/// <summary>
/// Sends a binary data to the client of the <see cref="WebSocketService"/> instance
/// with the specified <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if <paramref name="data"/> is successfully sent; otherwise, <c>false</c>.
/// </returns>
/// <param name="data">
/// An array of <see cref="byte"/> that contains a binary data to send.
/// </param>
/// <param name="id">
/// A <see cref="string"/> that contains an ID that represents the destination for the data.
/// </param>
internal bool SendTo (byte [] data, string id)
{
WebSocketService service;
if (!TryGetServiceInstance (id, out service))
{
_logger.Error (
"The WebSocket service instance with the specified ID not found.\nID: " + id);
"The WebSocket session with the specified ID not found.\nID: " + id);
return false;
}
@ -450,26 +374,13 @@ namespace WebSocketSharp.Server
return true;
}
/// <summary>
/// Sends a text data to the client of the <see cref="WebSocketService"/> instance
/// with the specified <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if <paramref name="data"/> is successfully sent; otherwise, <c>false</c>.
/// </returns>
/// <param name="data">
/// A <see cref="string"/> that contains a text data to send.
/// </param>
/// <param name="id">
/// A <see cref="string"/> that contains an ID that represents the destination for the data.
/// </param>
internal bool SendTo (string data, string id)
{
WebSocketService service;
if (!TryGetServiceInstance (id, out service))
{
_logger.Error (
"The WebSocket service instance with the specified ID not found.\nID: " + id);
"The WebSocket session with the specified ID not found.\nID: " + id);
return false;
}
@ -486,7 +397,7 @@ namespace WebSocketSharp.Server
return;
_stopped = true;
foreach (var service in copy ().Values)
foreach (var service in ServiceInstances)
service.Stop ();
}
}
@ -500,7 +411,7 @@ namespace WebSocketSharp.Server
return;
_stopped = true;
foreach (var service in copy ().Values)
foreach (var service in ServiceInstances)
service.Stop (data);
}
}
@ -511,7 +422,7 @@ namespace WebSocketSharp.Server
if (!TryGetServiceInstance (id, out service))
{
_logger.Error (
"The WebSocket service instance with the specified ID not found.\nID: " + id);
"The WebSocket session with the specified ID not found.\nID: " + id);
return;
}
@ -524,7 +435,7 @@ namespace WebSocketSharp.Server
if (!TryGetServiceInstance (id, out service))
{
_logger.Error (
"The WebSocket service instance with the specified ID not found.\nID: " + id);
"The WebSocket session with the specified ID not found.\nID: " + id);
return;
}
@ -537,19 +448,27 @@ namespace WebSocketSharp.Server
if (!TryGetServiceInstance (id, out service))
{
_logger.Error (
"The WebSocket service instance with the specified ID not found.\nID: " + id);
"The WebSocket session with the specified ID not found.\nID: " + id);
return;
}
service.Stop (code, reason);
}
internal bool TryGetServiceInstance (string id, out WebSocketService service)
{
lock (_sync)
{
return _sessions.TryGetValue (id, out service);
}
}
#endregion
#region Public Methods
/// <summary>
/// Cleans up the inactive <see cref="WebSocketService"/> instances.
/// Cleans up the inactive sessions.
/// </summary>
public void Sweep ()
{
@ -567,15 +486,15 @@ namespace WebSocketSharp.Server
break;
WebSocketService service;
if (_services.TryGetValue (id, out service))
if (_sessions.TryGetValue (id, out service))
{
var state = service.WebSocket.ReadyState;
var state = service.State;
if (state == WebSocketState.OPEN)
service.Stop (((ushort) CloseStatusCode.ABNORMAL).ToByteArray (ByteOrder.BIG));
else if (state == WebSocketState.CLOSING)
continue;
else
_services.Remove (id);
_sessions.Remove (id);
}
}
}
@ -585,25 +504,26 @@ namespace WebSocketSharp.Server
}
/// <summary>
/// Tries to get the <see cref="WebSocketService"/> instance with the specified <paramref name="id"/>.
/// Tries to get the session information with the specified <paramref name="id"/>.
/// </summary>
/// <returns>
/// <c>true</c> if the <see cref="WebSocketService"/> instance with <paramref name="id"/>
/// is successfully found; otherwise, <c>false</c>.
/// <c>true</c> if the session information is successfully found;
/// otherwise, <c>false</c>.
/// </returns>
/// <param name="id">
/// A <see cref="string"/> that contains an ID to find.
/// A <see cref="string"/> that contains a session ID to find.
/// </param>
/// <param name="service">
/// When this method returns, contains a <see cref="WebSocketService"/> instance with <param name="id"/>
/// if it is successfully found; otherwise, <see langword="null"/>.
/// <param name="session">
/// When this method returns, a <see cref="IWebSocketSession"/> instance that contains the session
/// information if it is successfully found; otherwise, <see langword="null"/>.
/// </param>
public bool TryGetServiceInstance (string id, out WebSocketService service)
public bool TryGetSession (string id, out IWebSocketSession session)
{
lock (_sync)
{
return _services.TryGetValue (id, out service);
}
WebSocketService service;
var result = TryGetServiceInstance (id, out service);
session = service;
return result;
}
#endregion

3
websocket-sharp/websocket-sharp.csproj
View File

@ -110,7 +110,6 @@
<Compile Include="Net\WebSockets\HttpListenerWebSocketContext.cs" />
<Compile Include="Net\WebSockets\TcpListenerWebSocketContext.cs" />
<Compile Include="Net\WebSockets\WebSocketContext.cs" />
<Compile Include="Server\WebSocketServiceManager.cs" />
<Compile Include="Server\HttpRequestEventArgs.cs" />
<Compile Include="Net\HttpHeaderType.cs" />
<Compile Include="Net\HttpHeaderInfo.cs" />
@ -128,6 +127,8 @@
<Compile Include="Server\WebSocketServiceHostManager.cs" />
<Compile Include="Server\IWebSocketServiceHost.cs" />
<Compile Include="WebSocketState.cs" />
<Compile Include="Server\IWebSocketSession.cs" />
<Compile Include="Server\WebSocketSessionManager.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>