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

Added a new AddWebSocketService method to the WebSocketServer and HttpServer classes

Browse Source
This commit is contained in:
sta
2013-10-02 14:39:56 +09:00
parent 2b57a58da2
commit 24e74b60b7
8 changed files with 356 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,8 @@
/*
* HttpServer.cs
*
* A simple HTTP server that allows to accept the WebSocket connection requests.
*
* The MIT License
*
* Copyright (c) 2012-2013 sta.blockhead
@@ -26,6 +28,13 @@
*/
#endregion
#region Thanks
/*
* Thanks:
* Juan Manuel Lallana <juan.manuel.lallana@gmail.com>
*/
#endregion
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -510,20 +519,53 @@ namespace WebSocketSharp.Server
/// <param name="servicePath">
/// A <see cref="string"/> that contains an absolute path to the WebSocket service.
/// </param>
/// <typeparam name="TWithNew">
/// The type of the WebSocket service. The TWithNew must inherit the <see cref="WebSocketService"/> class and
/// must have a public parameterless constructor.
/// </typeparam>
public void AddWebSocketService<TWithNew> (string servicePath)
where TWithNew : WebSocketService, new ()
{
AddWebSocketService<TWithNew> (servicePath, () => new TWithNew ());
}
/// <summary>
/// Adds the specified typed WebSocket service with the specified <paramref name="servicePath"/> and
/// <paramref name="serviceConstructor"/>.
/// </summary>
/// <remarks>
/// <para>
/// This method converts <paramref name="servicePath"/> to URL-decoded string and
/// removes <c>'/'</c> from tail end of <paramref name="servicePath"/>.
/// </para>
/// <para>
/// <paramref name="serviceConstructor"/> returns a initialized specified typed WebSocket service
/// instance.
/// </para>
/// </remarks>
/// <param name="servicePath">
/// A <see cref="string"/> that contains an absolute path to the WebSocket service.
/// </param>
/// <param name="serviceConstructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize a new WebSocket service
/// instance (a new WebSocket session).
/// </param>
/// <typeparam name="T">
/// The type of the WebSocket service. The T must inherit the <see cref="WebSocketService"/> class.
/// </typeparam>
public void AddWebSocketService<T> (string servicePath)
where T : WebSocketService, new ()
public void AddWebSocketService<T> (string servicePath, Func<T> serviceConstructor)
where T : WebSocketService
{
var msg = servicePath.CheckIfValidServicePath ();
var msg = servicePath.CheckIfValidServicePath () ??
(serviceConstructor == null ? "'serviceConstructor' must not be null." : null);
if (msg != null)
{
_logger.Error (String.Format ("{0}\nservice path: {1}", msg, servicePath ?? ""));
return;
}
var host = new WebSocketServiceHost<T> (_logger);
var host = new WebSocketServiceHost<T> (serviceConstructor, _logger);
host.Uri = servicePath.ToUri ();
if (!KeepClean)
host.KeepClean = false;

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

@@ -28,6 +28,13 @@
*/
#endregion
#region Thanks
/*
* Thanks:
* Juan Manuel Lallana <juan.manuel.lallana@gmail.com>
*/
#endregion
using System;
using System.Collections.Generic;
using System.Net.Sockets;
@@ -245,20 +252,53 @@ namespace WebSocketSharp.Server
/// <param name="servicePath">
/// A <see cref="string"/> that contains an absolute path to the WebSocket service.
/// </param>
/// <typeparam name="TWithNew">
/// The type of the WebSocket service. The TWithNew must inherit the <see cref="WebSocketService"/>
/// class and must have a public parameterless constructor.
/// </typeparam>
public void AddWebSocketService<TWithNew> (string servicePath)
where TWithNew : WebSocketService, new ()
{
AddWebSocketService<TWithNew> (servicePath, () => new TWithNew ());
}
/// <summary>
/// Adds the specified typed WebSocket service with the specified <paramref name="servicePath"/> and
/// <paramref name="serviceConstructor"/>.
/// </summary>
/// <remarks>
/// <para>
/// This method converts <paramref name="servicePath"/> to URL-decoded string and
/// removes <c>'/'</c> from tail end of <paramref name="servicePath"/>.
/// </para>
/// <para>
/// <paramref name="serviceConstructor"/> returns a initialized specified typed WebSocket service
/// instance.
/// </para>
/// </remarks>
/// <param name="servicePath">
/// A <see cref="string"/> that contains an absolute path to the WebSocket service.
/// </param>
/// <param name="serviceConstructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize a new WebSocket service
/// instance (a new WebSocket session).
/// </param>
/// <typeparam name="T">
/// The type of the WebSocket service. The T must inherit the <see cref="WebSocketService"/> class.
/// </typeparam>
public void AddWebSocketService<T> (string servicePath)
where T : WebSocketService, new ()
public void AddWebSocketService<T> (string servicePath, Func<T> serviceConstructor)
where T : WebSocketService
{
var msg = servicePath.CheckIfValidServicePath ();
var msg = servicePath.CheckIfValidServicePath () ??
(serviceConstructor == null ? "'serviceConstructor' must not be null." : null);
if (msg != null)
{
Log.Error (String.Format ("{0}\nservice path: {1}", msg, servicePath ?? ""));
return;
}
var host = new WebSocketServiceHost<T> (Log);
var host = new WebSocketServiceHost<T> (serviceConstructor, Log);
host.Uri = BaseUri.IsAbsoluteUri
? new Uri (BaseUri, servicePath)
: servicePath.ToUri ();

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

@@ -28,6 +28,13 @@
*/
#endregion
#region Thanks
/*
* Thanks:
* Juan Manuel Lallana <juan.manuel.lallana@gmail.com>
*/
#endregion
using System;
using System.Collections.Generic;
using System.Net.Sockets;
@@ -48,10 +55,11 @@ namespace WebSocketSharp.Server
/// The T must inherit the <see cref="WebSocketService"/> class.
/// </typeparam>
public class WebSocketServiceHost<T> : WebSocketServerBase, IWebSocketServiceHost
where T : WebSocketService, new ()
where T : WebSocketService
{
#region Private Fields
private Func<T> _serviceConstructor;
private string _servicePath;
private WebSocketSessionManager _sessions;
private volatile ServerState _state;
@@ -61,9 +69,10 @@ namespace WebSocketSharp.Server
#region Internal Constructors
internal WebSocketServiceHost (Logger logger)
internal WebSocketServiceHost (Func<T> serviceConstructor, Logger logger)
: base (logger)
{
_serviceConstructor = serviceConstructor;
_sessions = new WebSocketSessionManager (logger);
_state = ServerState.READY;
_sync = new object ();
@@ -80,8 +89,18 @@ namespace WebSocketSharp.Server
/// <param name="port">
/// An <see cref="int"/> that contains a port number.
/// </param>
public WebSocketServiceHost (int port)
: this (port, "/")
/// <param name="serviceConstructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize a new WebSocket service
/// instance (a new WebSocket session).
/// </param>
/// <exception cref="ArgumentNullException">
/// <paramref name="serviceConstructor"/> is <see langword="null"/>.
/// </exception>
/// <exception cref="ArgumentOutOfRangeException">
/// <paramref name="port"/> is 0 or less, or 65536 or greater.
/// </exception>
public WebSocketServiceHost (int port, Func<T> serviceConstructor)
: this (port, "/", serviceConstructor)
{
}
@@ -92,9 +111,31 @@ namespace WebSocketSharp.Server
/// <param name="url">
/// A <see cref="string"/> that contains a WebSocket URL.
/// </param>
public WebSocketServiceHost (string url)
/// <param name="serviceConstructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize a new WebSocket service
/// instance (a new WebSocket session).
/// </param>
/// <exception cref="ArgumentNullException">
/// <para>
/// <paramref name="url"/> is <see langword="null"/>.
/// </para>
/// <para>
/// -or-
/// </para>
/// <para>
/// <paramref name="serviceConstructor"/> is <see langword="null"/>.
/// </para>
/// </exception>
/// <exception cref="ArgumentException">
/// <paramref name="url"/> is invalid.
/// </exception>
public WebSocketServiceHost (string url, Func<T> serviceConstructor)
: base (url)
{
if (serviceConstructor == null)
throw new ArgumentNullException ("serviceConstructor");
_serviceConstructor = serviceConstructor;
_sessions = new WebSocketSessionManager (Log);
_state = ServerState.READY;
_sync = new object ();
@@ -111,14 +152,28 @@ namespace WebSocketSharp.Server
/// A <see cref="bool"/> that indicates providing a secure connection or not.
/// (<c>true</c> indicates providing a secure connection.)
/// </param>
public WebSocketServiceHost (int port, bool secure)
: this (port, "/", secure)
/// <param name="serviceConstructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize a new WebSocket service
/// instance (a new WebSocket session).
/// </param>
/// <exception cref="ArgumentNullException">
/// <paramref name="serviceConstructor"/> is <see langword="null"/>.
/// </exception>
/// <exception cref="ArgumentOutOfRangeException">
/// <paramref name="port"/> is 0 or less, or 65536 or greater.
/// </exception>
/// <exception cref="ArgumentException">
/// Pair of <paramref name="port"/> and <paramref name="secure"/> is invalid.
/// </exception>
public WebSocketServiceHost (int port, bool secure, Func<T> serviceConstructor)
: this (port, "/", secure, serviceConstructor)
{
}
/// <summary>
/// Initializes a new instance of the WebSocketServiceHost&lt;T&gt; class that listens for
/// incoming connection attempts on the specified <paramref name="port"/> and <paramref name="servicePath"/>.
/// incoming connection attempts on the specified <paramref name="port"/> and
/// <paramref name="servicePath"/>.
/// </summary>
/// <param name="port">
/// An <see cref="int"/> that contains a port number.
@@ -126,8 +181,29 @@ namespace WebSocketSharp.Server
/// <param name="servicePath">
/// A <see cref="string"/> that contains an absolute path.
/// </param>
public WebSocketServiceHost (int port, string servicePath)
: this (System.Net.IPAddress.Any, port, servicePath)
/// <param name="serviceConstructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize a new WebSocket service
/// instance (a new WebSocket session).
/// </param>
/// <exception cref="ArgumentNullException">
/// <para>
/// <paramref name="servicePath"/> is <see langword="null"/>.
/// </para>
/// <para>
/// -or-
/// </para>
/// <para>
/// <paramref name="serviceConstructor"/> is <see langword="null"/>.
/// </para>
/// </exception>
/// <exception cref="ArgumentOutOfRangeException">
/// <paramref name="port"/> is 0 or less, or 65536 or greater.
/// </exception>
/// <exception cref="ArgumentException">
/// <paramref name="servicePath"/> is invalid.
/// </exception>
public WebSocketServiceHost (int port, string servicePath, Func<T> serviceConstructor)
: this (System.Net.IPAddress.Any, port, servicePath, serviceConstructor)
{
}
@@ -146,8 +222,37 @@ namespace WebSocketSharp.Server
/// A <see cref="bool"/> that indicates providing a secure connection or not.
/// (<c>true</c> indicates providing a secure connection.)
/// </param>
public WebSocketServiceHost (int port, string servicePath, bool secure)
: this (System.Net.IPAddress.Any, port, servicePath, secure)
/// <param name="serviceConstructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize a new WebSocket service
/// instance (a new WebSocket session).
/// </param>
/// <exception cref="ArgumentNullException">
/// <para>
/// <paramref name="servicePath"/> is <see langword="null"/>.
/// </para>
/// <para>
/// -or-
/// </para>
/// <para>
/// <paramref name="serviceConstructor"/> is <see langword="null"/>.
/// </para>
/// </exception>
/// <exception cref="ArgumentOutOfRangeException">
/// <paramref name="port"/> is 0 or less, or 65536 or greater.
/// </exception>
/// <exception cref="ArgumentException">
/// <para>
/// <paramref name="servicePath"/> is invalid.
/// </para>
/// <para>
/// -or-
/// </para>
/// <para>
/// Pair of <paramref name="port"/> and <paramref name="secure"/> is invalid.
/// </para>
/// </exception>
public WebSocketServiceHost (int port, string servicePath, bool secure, Func<T> serviceConstructor)
: this (System.Net.IPAddress.Any, port, servicePath, secure, serviceConstructor)
{
}
@@ -165,8 +270,36 @@ namespace WebSocketSharp.Server
/// <param name="servicePath">
/// A <see cref="string"/> that contains an absolute path.
/// </param>
public WebSocketServiceHost (System.Net.IPAddress address, int port, string servicePath)
: this (address, port, servicePath, port == 443 ? true : false)
/// <param name="serviceConstructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize a new WebSocket service
/// instance (a new WebSocket session).
/// </param>
/// <exception cref="ArgumentNullException">
/// <para>
/// <paramref name="address"/> is <see langword="null"/>.
/// </para>
/// <para>
/// -or-
/// </para>
/// <para>
/// <paramref name="servicePath"/> is <see langword="null"/>.
/// </para>
/// <para>
/// -or-
/// </para>
/// <para>
/// <paramref name="serviceConstructor"/> is <see langword="null"/>.
/// </para>
/// </exception>
/// <exception cref="ArgumentOutOfRangeException">
/// <paramref name="port"/> is 0 or less, or 65536 or greater.
/// </exception>
/// <exception cref="ArgumentException">
/// <paramref name="servicePath"/> is invalid.
/// </exception>
public WebSocketServiceHost (
System.Net.IPAddress address, int port, string servicePath, Func<T> serviceConstructor)
: this (address, port, servicePath, port == 443 ? true : false, serviceConstructor)
{
}
@@ -188,9 +321,49 @@ namespace WebSocketSharp.Server
/// A <see cref="bool"/> that indicates providing a secure connection or not.
/// (<c>true</c> indicates providing a secure connection.)
/// </param>
public WebSocketServiceHost (System.Net.IPAddress address, int port, string servicePath, bool secure)
/// <param name="serviceConstructor">
/// A Func&lt;T&gt; delegate that references the method used to initialize a new WebSocket service
/// instance (a new WebSocket session).
/// </param>
/// <exception cref="ArgumentNullException">
/// <para>
/// <paramref name="address"/> is <see langword="null"/>.
/// </para>
/// <para>
/// -or-
/// </para>
/// <para>
/// <paramref name="servicePath"/> is <see langword="null"/>.
/// </para>
/// <para>
/// -or-
/// </para>
/// <para>
/// <paramref name="serviceConstructor"/> is <see langword="null"/>.
/// </para>
/// </exception>
/// <exception cref="ArgumentOutOfRangeException">
/// <paramref name="port"/> is 0 or less, or 65536 or greater.
/// </exception>
/// <exception cref="ArgumentException">
/// <para>
/// <paramref name="servicePath"/> is invalid.
/// </para>
/// <para>
/// -or-
/// </para>
/// <para>
/// Pair of <paramref name="port"/> and <paramref name="secure"/> is invalid.
/// </para>
/// </exception>
public WebSocketServiceHost (
System.Net.IPAddress address, int port, string servicePath, bool secure, Func<T> 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 ();
@@ -450,14 +623,14 @@ namespace WebSocketSharp.Server
#region Explicit Interface Implementation
/// <summary>
/// Binds the specified <see cref="WebSocketContext"/> to a <see cref="WebSocketService"/> instance.
/// Binds the specified <see cref="WebSocketContext"/> to a WebSocket service instance.
/// </summary>
/// <param name="context">
/// A <see cref="WebSocketContext"/> that contains the WebSocket connection request objects to bind.
/// </param>
void IWebSocketServiceHost.BindWebSocket (WebSocketContext context)
{
T service = new T ();
T service = _serviceConstructor ();
service.Bind (context, _sessions);
service.Start ();
}