diff --git a/Example2/Program.cs b/Example2/Program.cs index 36512e62..8ee167aa 100644 --- a/Example2/Program.cs +++ b/Example2/Program.cs @@ -10,31 +10,6 @@ namespace Example2 { public static void Main (string [] args) { - /* Single service server - var wssv = new WebSocketServiceHost ("ws://localhost:4649", () => new Echo ()); - //var wssv = new WebSocketServiceHost ("ws://localhost:4649/Echo", () => new Echo ()); - //var wssv = new WebSocketServiceHost ("ws://localhost:4649/エコー", () => new Echo ()); - //var wssv = new WebSocketServiceHost (4649, () => new Echo ()); - //var wssv = new WebSocketServiceHost (4649, "/Echo", () => new Echo ()); - //var wssv = new WebSocketServiceHost (4649, "/エコー", () => new Echo ()); - //var wssv = new WebSocketServiceHost ("ws://localhost:4649", () => new Chat ()); - //var wssv = new WebSocketServiceHost ("ws://localhost:4649/Chat", () => new Chat ()); - //var wssv = new WebSocketServiceHost ("ws://localhost:4649/チャット", () => new Chat ()); - //var wssv = new WebSocketServiceHost (4649, () => new Chat ()); - //var wssv = new WebSocketServiceHost (4649, "/Chat", () => new Chat ()); - //var wssv = new WebSocketServiceHost (4649, "/チャット", () => new Chat ()); - #if DEBUG - wssv.Log.Level = LogLevel.TRACE; - #endif - //wssv.KeepClean = false; - - wssv.Start (); - Console.WriteLine ( - "A WebSocket Service Host (url: {0})\n listening on address: {1} port: {2}\n", - wssv.Uri, wssv.Address, wssv.Port); - */ - - /* Multi services server */ var wssv = new WebSocketServer (4649); //var wssv = new WebSocketServer (4649, true); //var wssv = new WebSocketServer ("ws://localhost:4649"); @@ -57,10 +32,8 @@ namespace Example2 "A WebSocket Server listening on port: {0} service path:", wssv.Port); foreach (var path in wssv.WebSocketServices.ServicePaths) Console.WriteLine (" {0}", path); - - Console.WriteLine (); - Console.WriteLine ("Press Enter key to stop server..."); + Console.WriteLine ("\nPress Enter key to stop server..."); Console.ReadLine (); wssv.Stop (); diff --git a/websocket-sharp/Server/HttpServer.cs b/websocket-sharp/Server/HttpServer.cs index 41ba66a4..2ccd1a81 100644 --- a/websocket-sharp/Server/HttpServer.cs +++ b/websocket-sharp/Server/HttpServer.cs @@ -430,7 +430,7 @@ namespace WebSocketSharp.Server var wsContext = context.AcceptWebSocket (); var path = wsContext.Path; - IWebSocketServiceHost host; + WebSocketServiceHost host; if (path == null || !_serviceHosts.TryGetServiceHostInternally (path, out host)) { context.Response.StatusCode = (int) HttpStatusCode.NotImplemented; @@ -438,7 +438,7 @@ namespace WebSocketSharp.Server } wsContext.WebSocket.Log = _logger; - host.BindWebSocket (wsContext); + host.StartSession (wsContext); return true; } @@ -567,12 +567,11 @@ namespace WebSocketSharp.Server return; } - var host = new WebSocketServiceHost (serviceConstructor, _logger); - host.Uri = servicePath.ToUri (); + var host = new WebSocketServiceHost (servicePath, serviceConstructor, _logger); if (!KeepClean) host.KeepClean = false; - _serviceHosts.Add (servicePath, host); + _serviceHosts.Add (host.ServicePath, host); } /// diff --git a/websocket-sharp/Server/IWebSocketServiceHost.cs b/websocket-sharp/Server/IWebSocketServiceHost.cs deleted file mode 100644 index 8732e40f..00000000 --- a/websocket-sharp/Server/IWebSocketServiceHost.cs +++ /dev/null @@ -1,82 +0,0 @@ -#region License -/* - * IWebSocketServiceHost.cs - * - * The MIT License - * - * Copyright (c) 2012-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 System.Collections.Generic; -using WebSocketSharp.Net.WebSockets; - -namespace WebSocketSharp.Server -{ - /// - /// Exposes the methods and properties for the WebSocket service host. - /// - public interface IWebSocketServiceHost - { - /// - /// Gets the connection count to the WebSocket service host. - /// - /// - /// An that contains the connection count. - /// - int ConnectionCount { get; } - - /// - /// Gets or sets a value indicating whether the WebSocket service host cleans up - /// the inactive sessions periodically. - /// - /// - /// true if the WebSocket service host cleans up the inactive sessions periodically; - /// otherwise, false. - /// - bool KeepClean { get; set; } - - /// - /// Gets the path to the WebSocket service provided by the WebSocket service host. - /// - /// - /// A that contains an absolute path to the WebSocket service. - /// - string ServicePath { get; } - - /// - /// Gets the manager of the sessions to the WebSocket service host. - /// - /// - /// A that manages the sessions. - /// - WebSocketSessionManager Sessions { get; } - - /// - /// Binds the specified to a instance. - /// - /// - /// A that contains the WebSocket connection request objects to bind. - /// - void BindWebSocket (WebSocketContext context); - } -} diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs index 4c72ef4f..5fe8a287 100644 --- a/websocket-sharp/Server/WebSocketServer.cs +++ b/websocket-sharp/Server/WebSocketServer.cs @@ -77,6 +77,9 @@ namespace WebSocketSharp.Server /// /// An that contains a port number. /// + /// + /// is 0 or less, or 65536 or greater. + /// public WebSocketServer (int port) : this (System.Net.IPAddress.Any, port) { @@ -89,6 +92,12 @@ namespace WebSocketSharp.Server /// /// A that contains a WebSocket URL. /// + /// + /// is . + /// + /// + /// is invalid. + /// public WebSocketServer (string url) : base (url) { @@ -111,6 +120,12 @@ namespace WebSocketSharp.Server /// A that indicates providing a secure connection or not. /// (true indicates providing a secure connection.) /// + /// + /// is 0 or less, or 65536 or greater. + /// + /// + /// Pair of and is invalid. + /// public WebSocketServer (int port, bool secure) : this (System.Net.IPAddress.Any, port, secure) { @@ -126,6 +141,12 @@ namespace WebSocketSharp.Server /// /// An that contains a port number. /// + /// + /// is . + /// + /// + /// is 0 or less, or 65536 or greater. + /// public WebSocketServer (System.Net.IPAddress address, int port) : this (address, port, port == 443 ? true : false) { @@ -146,6 +167,15 @@ namespace WebSocketSharp.Server /// A that indicates providing a secure connection or not. /// (true indicates providing a secure connection.) /// + /// + /// is . + /// + /// + /// is 0 or less, or 65536 or greater. + /// + /// + /// Pair of and is invalid. + /// public WebSocketServer (System.Net.IPAddress address, int port, bool secure) : base (address, port, "/", secure) { @@ -226,7 +256,7 @@ namespace WebSocketSharp.Server websocket.Log = Log; var path = context.Path; - IWebSocketServiceHost host; + WebSocketServiceHost host; if (path == null || !_serviceHosts.TryGetServiceHostInternally (path, out host)) { websocket.Close (HttpStatusCode.NotImplemented); @@ -236,7 +266,7 @@ namespace WebSocketSharp.Server if (BaseUri.IsAbsoluteUri) websocket.Url = new Uri (BaseUri, path); - host.BindWebSocket (context); + host.StartSession (context); } #endregion @@ -299,15 +329,11 @@ namespace WebSocketSharp.Server return; } - var host = new WebSocketServiceHost (serviceConstructor, Log); - host.Uri = BaseUri.IsAbsoluteUri - ? new Uri (BaseUri, servicePath) - : servicePath.ToUri (); - + var host = new WebSocketServiceHost (servicePath, serviceConstructor, Log); if (!KeepClean) host.KeepClean = false; - _serviceHosts.Add (servicePath, host); + _serviceHosts.Add (host.ServicePath, host); } /// diff --git a/websocket-sharp/Server/WebSocketService.cs b/websocket-sharp/Server/WebSocketService.cs index 92633f12..10f713da 100644 --- a/websocket-sharp/Server/WebSocketService.cs +++ b/websocket-sharp/Server/WebSocketService.cs @@ -61,7 +61,6 @@ namespace WebSocketSharp.Server /// public WebSocketService () { - IsBound = false; _start = DateTime.MaxValue; } @@ -81,13 +80,13 @@ namespace WebSocketSharp.Server /// protected Logger Log { get { - return IsBound + return _websocket != null ? _websocket.Log : null; } set { - if (IsBound) + if (_websocket != null) _websocket.Log = value; } } @@ -130,18 +129,6 @@ namespace WebSocketSharp.Server get; private set; } - /// - /// Gets a value indicating whether the current instance - /// has been bound to a . - /// - /// - /// true if the current instance has been bound to - /// a ; otherwise, false. - /// - public bool IsBound { - get; private set; - } - /// /// Gets the time that the current instance has been started. /// @@ -163,7 +150,7 @@ namespace WebSocketSharp.Server /// public WebSocketState State { get { - return IsBound + return _websocket != null ? _websocket.ReadyState : WebSocketState.CONNECTING; } @@ -209,11 +196,8 @@ namespace WebSocketSharp.Server #region Internal Methods - internal void Bind (WebSocketContext context, WebSocketSessionManager sessions) + internal void Start (WebSocketContext context, WebSocketSessionManager sessions) { - if (IsBound) - return; - _context = context; _sessions = sessions; _websocket = context.WebSocket; @@ -223,11 +207,6 @@ namespace WebSocketSharp.Server _websocket.OnError += onError; _websocket.OnClose += onClose; - IsBound = true; - } - - internal void Start () - { _websocket.Connect (); } @@ -297,7 +276,7 @@ namespace WebSocketSharp.Server /// protected bool Ping () { - return IsBound + return _websocket != null ? _websocket.Ping () : false; } @@ -315,7 +294,7 @@ namespace WebSocketSharp.Server /// protected bool Ping (string message) { - return IsBound + return _websocket != null ? _websocket.Ping (message) : false; } @@ -332,7 +311,7 @@ namespace WebSocketSharp.Server /// protected void Send (byte [] data) { - if (IsBound) + if (_websocket != null) _websocket.Send (data, null); } @@ -348,7 +327,7 @@ namespace WebSocketSharp.Server /// protected void Send (string data) { - if (IsBound) + if (_websocket != null) _websocket.Send (data, null); } @@ -364,7 +343,7 @@ namespace WebSocketSharp.Server /// protected void Send (FileInfo file) { - if (IsBound) + if (_websocket != null) _websocket.Send (file, null); } @@ -386,7 +365,7 @@ namespace WebSocketSharp.Server /// protected void Send (byte [] data, Action completed) { - if (IsBound) + if (_websocket != null) _websocket.Send (data, completed); } @@ -408,7 +387,7 @@ namespace WebSocketSharp.Server /// protected void Send (string data, Action completed) { - if (IsBound) + if (_websocket != null) _websocket.Send (data, completed); } @@ -430,7 +409,7 @@ namespace WebSocketSharp.Server /// protected void Send (FileInfo file, Action completed) { - if (IsBound) + if (_websocket != null) _websocket.Send (file, completed); } @@ -453,7 +432,7 @@ namespace WebSocketSharp.Server /// protected void Send (Stream stream, int length, bool dispose) { - if (IsBound) + if (_websocket != null) _websocket.Send (stream, length, dispose, null); } @@ -482,7 +461,7 @@ namespace WebSocketSharp.Server /// protected void Send (Stream stream, int length, bool dispose, Action completed) { - if (IsBound) + if (_websocket != null) _websocket.Send (stream, length, dispose, completed); } @@ -491,7 +470,7 @@ namespace WebSocketSharp.Server /// protected void Stop () { - if (IsBound) + if (_websocket != null) _websocket.Close (); } @@ -507,7 +486,7 @@ namespace WebSocketSharp.Server /// protected void Stop (ushort code, string reason) { - if (IsBound) + if (_websocket != null) _websocket.Close (code, reason); } @@ -524,7 +503,7 @@ namespace WebSocketSharp.Server /// protected void Stop (CloseStatusCode code, string reason) { - if (IsBound) + if (_websocket != null) _websocket.Close (code, reason); } diff --git a/websocket-sharp/Server/WebSocketServiceHost.cs b/websocket-sharp/Server/WebSocketServiceHost.cs index 101f40a0..4afa089e 100644 --- a/websocket-sharp/Server/WebSocketServiceHost.cs +++ b/websocket-sharp/Server/WebSocketServiceHost.cs @@ -2,8 +2,6 @@ /* * WebSocketServiceHost.cs * - * A C# implementation of the WebSocket protocol server. - * * The MIT License * * Copyright (c) 2012-2013 sta.blockhead @@ -37,354 +35,131 @@ using System; using System.Collections.Generic; -using System.Net.Sockets; -using System.Text; using WebSocketSharp.Net; using WebSocketSharp.Net.WebSockets; namespace WebSocketSharp.Server { /// - /// Provides the functions of the server that receives the WebSocket connection requests. + /// Provides the methods and properties for the WebSocket service host. /// - /// - /// The WebSocketServiceHost<T> class provides the single WebSocket service. - /// - /// - /// The type of the WebSocket service that the server provides. - /// The T must inherit the class. - /// - public class WebSocketServiceHost : WebSocketServerBase, IWebSocketServiceHost - where T : WebSocketService + public abstract class WebSocketServiceHost { - #region Private Fields - - private Func _serviceConstructor; - private string _servicePath; - private WebSocketSessionManager _sessions; - private volatile ServerState _state; - private object _sync; - - #endregion - - #region Internal Constructors - - internal WebSocketServiceHost (Func serviceConstructor, Logger logger) - : base (logger) - { - _serviceConstructor = serviceConstructor; - _sessions = new WebSocketSessionManager (logger); - _state = ServerState.READY; - _sync = new object (); - } - - #endregion - - #region Public Constructors + #region Protected Constructors /// - /// Initializes a new instance of the WebSocketServiceHost<T> class that listens for - /// incoming connection attempts on the specified . + /// Initializes a new instance of the class. /// - /// - /// An that contains a port number. - /// - /// - /// A Func<T> delegate that references the method used to initialize a new WebSocket service - /// instance (a new WebSocket session). - /// - /// - /// is . - /// - /// - /// is 0 or less, or 65536 or greater. - /// - public WebSocketServiceHost (int port, Func serviceConstructor) - : this (port, "/", serviceConstructor) + protected WebSocketServiceHost () { } - /// - /// Initializes a new instance of the WebSocketServiceHost<T> class that listens for - /// incoming connection attempts on the specified WebSocket URL. - /// - /// - /// A that contains a WebSocket URL. - /// - /// - /// A Func<T> delegate that references the method used to initialize a new WebSocket service - /// instance (a new WebSocket session). - /// - /// - /// - /// is . - /// - /// - /// -or- - /// - /// - /// is . - /// - /// - /// - /// is invalid. - /// - public WebSocketServiceHost (string url, Func serviceConstructor) - : base (url) - { - if (serviceConstructor == null) - throw new ArgumentNullException ("serviceConstructor"); - - _serviceConstructor = serviceConstructor; - _sessions = new WebSocketSessionManager (Log); - _state = ServerState.READY; - _sync = new object (); - } - - /// - /// Initializes a new instance of the WebSocketServiceHost<T> class that listens for - /// incoming connection attempts on the specified and . - /// - /// - /// An that contains a port number. - /// - /// - /// A that indicates providing a secure connection or not. - /// (true indicates providing a secure connection.) - /// - /// - /// A Func<T> delegate that references the method used to initialize a new WebSocket service - /// instance (a new WebSocket session). - /// - /// - /// is . - /// - /// - /// is 0 or less, or 65536 or greater. - /// - /// - /// Pair of and is invalid. - /// - public WebSocketServiceHost (int port, bool secure, Func serviceConstructor) - : this (port, "/", secure, serviceConstructor) - { - } - - /// - /// Initializes a new instance of the WebSocketServiceHost<T> class that listens for - /// incoming connection attempts on the specified and - /// . - /// - /// - /// An that contains a port number. - /// - /// - /// A that contains an absolute path. - /// - /// - /// A Func<T> delegate that references the method used to initialize a new WebSocket service - /// instance (a new WebSocket session). - /// - /// - /// - /// is . - /// - /// - /// -or- - /// - /// - /// is . - /// - /// - /// - /// is 0 or less, or 65536 or greater. - /// - /// - /// is invalid. - /// - public WebSocketServiceHost (int port, string servicePath, Func serviceConstructor) - : this (System.Net.IPAddress.Any, port, servicePath, serviceConstructor) - { - } - - /// - /// Initializes a new instance of the WebSocketServiceHost<T> class that listens for - /// incoming connection attempts on the specified , - /// and . - /// - /// - /// An that contains a port number. - /// - /// - /// A that contains an absolute path. - /// - /// - /// A that indicates providing a secure connection or not. - /// (true indicates providing a secure connection.) - /// - /// - /// A Func<T> delegate that references the method used to initialize a new WebSocket service - /// instance (a new WebSocket session). - /// - /// - /// - /// is . - /// - /// - /// -or- - /// - /// - /// is . - /// - /// - /// - /// is 0 or less, or 65536 or greater. - /// - /// - /// - /// is invalid. - /// - /// - /// -or- - /// - /// - /// Pair of and is invalid. - /// - /// - public WebSocketServiceHost (int port, string servicePath, bool secure, Func serviceConstructor) - : this (System.Net.IPAddress.Any, port, servicePath, secure, serviceConstructor) - { - } - - /// - /// Initializes a new instance of the WebSocketServiceHost<T> class that listens for - /// incoming connection attempts on the specified , - /// and . - /// - /// - /// A that contains a local IP address. - /// - /// - /// An that contains a port number. - /// - /// - /// A that contains an absolute path. - /// - /// - /// A Func<T> delegate that references the method used to initialize a new WebSocket service - /// instance (a new WebSocket session). - /// - /// - /// - /// is . - /// - /// - /// -or- - /// - /// - /// is . - /// - /// - /// -or- - /// - /// - /// is . - /// - /// - /// - /// is 0 or less, or 65536 or greater. - /// - /// - /// is invalid. - /// - public WebSocketServiceHost ( - System.Net.IPAddress address, int port, string servicePath, Func serviceConstructor) - : this (address, port, servicePath, port == 443 ? true : false, serviceConstructor) - { - } - - /// - /// Initializes a new instance of the WebSocketServiceHost<T> class that listens for - /// incoming connection attempts on the specified , , - /// and . - /// - /// - /// A that contains a local IP address. - /// - /// - /// An that contains a port number. - /// - /// - /// A that contains an absolute path. - /// - /// - /// A that indicates providing a secure connection or not. - /// (true indicates providing a secure connection.) - /// - /// - /// A Func<T> delegate that references the method used to initialize a new WebSocket service - /// instance (a new WebSocket session). - /// - /// - /// - /// is . - /// - /// - /// -or- - /// - /// - /// is . - /// - /// - /// -or- - /// - /// - /// is . - /// - /// - /// - /// is 0 or less, or 65536 or greater. - /// - /// - /// - /// is invalid. - /// - /// - /// -or- - /// - /// - /// Pair of and is invalid. - /// - /// - public WebSocketServiceHost ( - System.Net.IPAddress address, int port, string servicePath, bool secure, Func serviceConstructor) - : base (address, port, servicePath, secure) - { - if (serviceConstructor == null) - throw new ArgumentNullException ("serviceConstructor"); - - _serviceConstructor = serviceConstructor; - _sessions = new WebSocketSessionManager (Log); - _state = ServerState.READY; - _sync = new object (); - } - #endregion #region Public Properties /// - /// Gets the connection count to the WebSocket service host. + /// Gets or sets a value indicating whether the WebSocket service host cleans up + /// the inactive sessions periodically. /// /// - /// An that contains the connection count. + /// true if the WebSocket service host cleans up the inactive sessions periodically; + /// otherwise, false. /// - public int ConnectionCount { - get { - return _sessions.Count; - } + public abstract bool KeepClean { get; set; } + + /// + /// Gets the path to the WebSocket service managed by the WebSocket service host. + /// + /// + /// A that contains an absolute path to the WebSocket service. + /// + public abstract string ServicePath { get; } + + /// + /// Gets the number of the sessions to the WebSocket service. + /// + /// + /// An that contains the session count. + /// + public abstract int SessionCount { get; } + + /// + /// Gets the manager of the sessions to the WebSocket service. + /// + /// + /// A that manages the sessions. + /// + public abstract WebSocketSessionManager Sessions { get; } + + #endregion + + #region Internal Methods + + /// + /// Starts a new session to the WebSocket service using the specified . + /// + /// + /// A that contains a WebSocket connection request objects. + /// + /// + /// is . + /// + internal void StartSession (WebSocketContext context) + { + if (context == null) + throw new ArgumentNullException ("context"); + + var session = CreateSession (); + session.Start (context, Sessions); } + #endregion + + #region Protected Methods + + /// + /// Creates a new session to the WebSocket service. + /// + /// + /// A instance that represents a new session. + /// + protected abstract WebSocketService CreateSession (); + + #endregion + } + + /// + /// Provides the methods and properties for the WebSocket service host. + /// + /// + /// The type of the WebSocket service provided by the server. + /// The T must inherit the class. + /// + internal class WebSocketServiceHost : WebSocketServiceHost + where T : WebSocketService + { + #region Private Fields + + private Func _constructor; + private string _path; + private WebSocketSessionManager _sessions; + + #endregion + + #region Internal Constructors + + internal WebSocketServiceHost (string path, Func constructor, Logger logger) + { + _path = HttpUtility.UrlDecode (path).TrimEndSlash (); + _constructor = constructor; + _sessions = new WebSocketSessionManager (logger); + } + + #endregion + + #region Public Properties + /// /// Gets or sets a value indicating whether the WebSocket service host cleans up /// the inactive sessions periodically. @@ -393,7 +168,7 @@ namespace WebSocketSharp.Server /// true if the WebSocket service host cleans up the inactive sessions /// every 60 seconds; otherwise, false. The default value is true. /// - public bool KeepClean { + public override bool KeepClean { get { return _sessions.KeepClean; } @@ -404,236 +179,54 @@ namespace WebSocketSharp.Server } /// - /// Gets the path to the WebSocket service provided by the WebSocket service host. + /// Gets the path to the WebSocket service managed by the WebSocket service host. /// /// /// A that contains an absolute path to the WebSocket service. /// - public string ServicePath { + public override string ServicePath { get { - if (_servicePath == null) - _servicePath = HttpUtility.UrlDecode (BaseUri.GetAbsolutePath ()).TrimEndSlash (); - - return _servicePath; + return _path; } } /// - /// Gets the manager of the sessions to the WebSocket service host. + /// Gets the number of the sessions to the WebSocket service. + /// + /// + /// An that contains the session count. + /// + public override int SessionCount { + get { + return _sessions.Count; + } + } + + /// + /// Gets the manager of the sessions to the WebSocket service. /// /// /// A that manages the sessions. /// - public WebSocketSessionManager Sessions { + public override WebSocketSessionManager Sessions { get { return _sessions; } } - /// - /// Gets the WebSocket URL on which to listen for incoming connection attempts. - /// - /// - /// A that contains a WebSocket URL. - /// - public Uri Uri { - get { - return BaseUri; - } - - internal set { - BaseUri = value; - } - } - #endregion #region Protected Methods /// - /// Aborts receiving the WebSocket connection requests. + /// Creates a new session to the WebSocket service. /// - /// - /// This method is called when an exception occurs while receiving the WebSocket connection requests. - /// - protected override void Abort () + /// + /// A instance that represents a new session. + /// + protected override WebSocketService CreateSession () { - lock (_sync) - { - if (_state != ServerState.START) - return; - - _state = ServerState.SHUTDOWN; - } - - StopListener (); - _sessions.Stop ( - ((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), true); - - _state = ServerState.STOP; - } - - /// - /// Accepts a WebSocket connection request. - /// - /// - /// A that contains the WebSocket connection request objects. - /// - protected override void AcceptWebSocket (TcpListenerWebSocketContext context) - { - var websocket = context.WebSocket; - websocket.Log = Log; - - var path = HttpUtility.UrlDecode (context.Path).TrimEndSlash (); - if (path != ServicePath) - { - websocket.Close (HttpStatusCode.NotImplemented); - return; - } - - if (BaseUri.IsAbsoluteUri) - websocket.Url = BaseUri; - - ((IWebSocketServiceHost) this).BindWebSocket (context); - } - - #endregion - - #region Public Methods - - /// - /// Starts to receive the WebSocket connection requests. - /// - public override void Start () - { - lock (_sync) - { - var msg = _state.CheckIfStopped (); - if (msg != null) - { - Log.Error (String.Format ("{0}\nstate: {1}", msg, _state)); - return; - } - - _sessions.Start (); - - base.Start (); - if (!IsListening) - { - _sessions.Stop (new byte []{}, false); - return; - } - - _state = ServerState.START; - } - } - - /// - /// Stops receiving the WebSocket connection requests. - /// - public override void Stop () - { - lock (_sync) - { - var msg = _state.CheckIfStarted (); - if (msg != null) - { - Log.Error (String.Format ("{0}\nstate: {1}", msg, _state)); - return; - } - - _state = ServerState.SHUTDOWN; - } - - base.Stop (); - _sessions.Stop (new byte []{}, true); - - _state = ServerState.STOP; - } - - /// - /// Stops receiving the WebSocket connection requests with the specified and - /// . - /// - /// - /// A that contains a status code indicating the reason for stop. - /// - /// - /// A that contains the reason for stop. - /// - public void Stop (ushort code, string reason) - { - byte [] data = null; - lock (_sync) - { - var msg = _state.CheckIfStarted () ?? - code.CheckIfValidCloseStatusCode () ?? - (data = code.Append (reason)).CheckIfValidCloseData (); - - if (msg != null) - { - Log.Error (String.Format ("{0}\nstate: {1}\ncode: {2}\nreason: {3}", msg, _state, code, reason)); - return; - } - - _state = ServerState.SHUTDOWN; - } - - base.Stop (); - _sessions.Stop (data, !code.IsReserved ()); - - _state = ServerState.STOP; - } - - /// - /// Stops receiving the WebSocket connection requests with the specified - /// and . - /// - /// - /// One of the values that represent the status codes indicating - /// the reasons for stop. - /// - /// - /// A that contains the reason for stop. - /// - public void Stop (CloseStatusCode code, string reason) - { - byte [] data = null; - lock (_sync) - { - var msg = _state.CheckIfStarted () ?? - (data = ((ushort) code).Append (reason)).CheckIfValidCloseData (); - - if (msg != null) - { - Log.Error (String.Format ("{0}\nstate: {1}\nreason: {2}", msg, _state, reason)); - return; - } - - _state = ServerState.SHUTDOWN; - } - - base.Stop (); - _sessions.Stop (data, !code.IsReserved ()); - - _state = ServerState.STOP; - } - - #endregion - - #region Explicit Interface Implementation - - /// - /// Binds the specified to a WebSocket service instance. - /// - /// - /// A that contains the WebSocket connection request objects to bind. - /// - void IWebSocketServiceHost.BindWebSocket (WebSocketContext context) - { - T service = _serviceConstructor (); - service.Bind (context, _sessions); - service.Start (); + return _constructor (); } #endregion diff --git a/websocket-sharp/Server/WebSocketServiceHostManager.cs b/websocket-sharp/Server/WebSocketServiceHostManager.cs index f5958d46..49e3adfa 100644 --- a/websocket-sharp/Server/WebSocketServiceHostManager.cs +++ b/websocket-sharp/Server/WebSocketServiceHostManager.cs @@ -44,11 +44,11 @@ namespace WebSocketSharp.Server { #region Private Fields - private volatile bool _keepClean; - private Logger _logger; - private Dictionary _serviceHosts; - private volatile ServerState _state; - private object _sync; + private volatile bool _keepClean; + private Logger _logger; + private Dictionary _serviceHosts; + private volatile ServerState _state; + private object _sync; #endregion @@ -63,7 +63,7 @@ namespace WebSocketSharp.Server { _logger = logger; _keepClean = true; - _serviceHosts = new Dictionary (); + _serviceHosts = new Dictionary (); _state = ServerState.READY; _sync = new object (); } @@ -72,27 +72,6 @@ namespace WebSocketSharp.Server #region Public Properties - /// - /// Gets the connection count to the every WebSocket service provided by the WebSocket server. - /// - /// - /// An that contains the connection count to the every WebSocket service. - /// - public int ConnectionCount { - get { - var count = 0; - foreach (var host in ServiceHosts) - { - if (_state != ServerState.START) - break; - - count += host.ConnectionCount; - } - - return count; - } - } - /// /// Gets the number of the WebSocket services provided by the WebSocket server. /// @@ -112,15 +91,15 @@ namespace WebSocketSharp.Server /// Gets a WebSocket service host with the specified . /// /// - /// A instance that represents the service host + /// A instance that represents the service host /// if the service is successfully found; otherwise, . /// /// /// A that contains an absolute path to the service to find. /// - public IWebSocketServiceHost this [string servicePath] { + public WebSocketServiceHost this [string servicePath] { get { - IWebSocketServiceHost host; + WebSocketServiceHost host; TryGetServiceHost (servicePath, out host); return host; @@ -157,10 +136,10 @@ namespace WebSocketSharp.Server /// Gets the collection of the WebSocket service hosts managed by the WebSocket server. /// /// - /// An IEnumerable<IWebSocketServiceHost> that contains the collection of the WebSocket + /// An IEnumerable<WebSocketServiceHost> that contains the collection of the WebSocket /// service hosts. /// - public IEnumerable ServiceHosts { + public IEnumerable ServiceHosts { get { lock (_sync) { @@ -184,6 +163,28 @@ namespace WebSocketSharp.Server } } + /// + /// Gets the number of the sessions to the every WebSocket service + /// provided by the WebSocket server. + /// + /// + /// An that contains the session count of the WebSocket server. + /// + public int SessionCount { + get { + var count = 0; + foreach (var host in ServiceHosts) + { + if (_state != ServerState.START) + break; + + count += host.SessionCount; + } + + return count; + } + } + #endregion #region Private Methods @@ -275,12 +276,11 @@ namespace WebSocketSharp.Server #region Internal Methods - internal void Add (string servicePath, IWebSocketServiceHost serviceHost) + internal void Add (string servicePath, WebSocketServiceHost serviceHost) { - servicePath = HttpUtility.UrlDecode (servicePath).TrimEndSlash (); lock (_sync) { - IWebSocketServiceHost host; + WebSocketServiceHost host; if (_serviceHosts.TryGetValue (servicePath, out host)) { _logger.Error ( @@ -298,7 +298,7 @@ namespace WebSocketSharp.Server internal bool Remove (string servicePath) { servicePath = HttpUtility.UrlDecode (servicePath).TrimEndSlash (); - IWebSocketServiceHost host; + WebSocketServiceHost host; lock (_sync) { if (!_serviceHosts.TryGetValue (servicePath, out host)) @@ -349,7 +349,7 @@ namespace WebSocketSharp.Server } } - internal bool TryGetServiceHostInternally (string servicePath, out IWebSocketServiceHost serviceHost) + internal bool TryGetServiceHostInternally (string servicePath, out WebSocketServiceHost serviceHost) { servicePath = HttpUtility.UrlDecode (servicePath).TrimEndSlash (); bool result; @@ -599,7 +599,7 @@ namespace WebSocketSharp.Server /// public void BroadcastTo (string servicePath, byte [] data, Action completed) { - IWebSocketServiceHost host; + WebSocketServiceHost host; if (TryGetServiceHost (servicePath, out host)) host.Sessions.Broadcast (data, completed); } @@ -623,7 +623,7 @@ namespace WebSocketSharp.Server /// public void BroadcastTo (string servicePath, string data, Action completed) { - IWebSocketServiceHost host; + WebSocketServiceHost host; if (TryGetServiceHost (servicePath, out host)) host.Sessions.Broadcast (data, completed); } @@ -680,7 +680,7 @@ namespace WebSocketSharp.Server public void BroadcastTo ( string servicePath, Stream stream, int length, bool dispose, Action completed) { - IWebSocketServiceHost host; + WebSocketServiceHost host; if (TryGetServiceHost (servicePath, out host)) host.Sessions.Broadcast (stream, length, dispose, completed); } @@ -750,7 +750,7 @@ namespace WebSocketSharp.Server /// public Dictionary BroadpingTo (string servicePath) { - IWebSocketServiceHost host; + WebSocketServiceHost host; return TryGetServiceHost (servicePath, out host) ? host.Sessions.Broadping () : null; @@ -773,7 +773,7 @@ namespace WebSocketSharp.Server /// public Dictionary BroadpingTo (string servicePath, string message) { - IWebSocketServiceHost host; + WebSocketServiceHost host; return TryGetServiceHost (servicePath, out host) ? host.Sessions.Broadping (message) : null; @@ -791,7 +791,7 @@ namespace WebSocketSharp.Server /// public void CloseSession (string servicePath, string id) { - IWebSocketServiceHost host; + WebSocketServiceHost host; if (TryGetServiceHost (servicePath, out host)) host.Sessions.CloseSession (id); } @@ -814,7 +814,7 @@ namespace WebSocketSharp.Server /// public void CloseSession (string servicePath, string id, ushort code, string reason) { - IWebSocketServiceHost host; + WebSocketServiceHost host; if (TryGetServiceHost (servicePath, out host)) host.Sessions.CloseSession (id, code, reason); } @@ -837,7 +837,7 @@ namespace WebSocketSharp.Server /// public void CloseSession (string servicePath, string id, CloseStatusCode code, string reason) { - IWebSocketServiceHost host; + WebSocketServiceHost host; if (TryGetServiceHost (servicePath, out host)) host.Sessions.CloseSession (id, code, reason); } @@ -859,7 +859,7 @@ namespace WebSocketSharp.Server /// public bool PingTo (string servicePath, string id) { - IWebSocketServiceHost host; + WebSocketServiceHost host; return TryGetServiceHost (servicePath, out host) && host.Sessions.PingTo (id); } @@ -883,7 +883,7 @@ namespace WebSocketSharp.Server /// public bool PingTo (string servicePath, string id, string message) { - IWebSocketServiceHost host; + WebSocketServiceHost host; return TryGetServiceHost (servicePath, out host) && host.Sessions.PingTo (id, message); } @@ -956,7 +956,7 @@ namespace WebSocketSharp.Server /// public void SendTo (string servicePath, string id, byte [] data, Action completed) { - IWebSocketServiceHost host; + WebSocketServiceHost host; if (TryGetServiceHost (servicePath, out host)) host.Sessions.SendTo (id, data, completed); } @@ -986,7 +986,7 @@ namespace WebSocketSharp.Server /// public void SendTo (string servicePath, string id, string data, Action completed) { - IWebSocketServiceHost host; + WebSocketServiceHost host; if (TryGetServiceHost (servicePath, out host)) host.Sessions.SendTo (id, data, completed); } @@ -1053,7 +1053,7 @@ namespace WebSocketSharp.Server public void SendTo ( string servicePath, string id, Stream stream, int length, bool dispose, Action completed) { - IWebSocketServiceHost host; + WebSocketServiceHost host; if (TryGetServiceHost (servicePath, out host)) host.Sessions.SendTo (id, stream, length, dispose, completed); } @@ -1068,11 +1068,11 @@ namespace WebSocketSharp.Server /// A that contains an absolute path to the service to find. /// /// - /// When this method returns, a instance that represents + /// When this method returns, a instance that represents /// the service host if the service is successfully found; otherwise, . /// This parameter is passed uninitialized. /// - public bool TryGetServiceHost (string servicePath, out IWebSocketServiceHost serviceHost) + public bool TryGetServiceHost (string servicePath, out WebSocketServiceHost serviceHost) { var msg = _state.CheckIfStarted () ?? servicePath.CheckIfValidServicePath (); if (msg != null) diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj index 13553bcf..852461ee 100644 --- a/websocket-sharp/websocket-sharp.csproj +++ b/websocket-sharp/websocket-sharp.csproj @@ -125,7 +125,6 @@ -