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

Fix due to the renamed WebSocketServer<T> to WebSocketServiceHost<T>

Browse Source
This commit is contained in:
sta
2012-10-23 15:39:31 +09:00
parent c55b5d6479
commit 2ae1d35d03
38 changed files with 387 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@
#endregion
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Diagnostics;
using System.IO;
@@ -40,12 +39,12 @@ namespace WebSocketSharp.Server {
#region Fields
private Thread _acceptRequestThread;
private bool _isWindows;
private HttpListener _listener;
private int _port;
private string _rootPath;
private Dictionary<string, IServiceHost> _services;
private Thread _acceptRequestThread;
private bool _isWindows;
private HttpListener _listener;
private int _port;
private string _rootPath;
private ServiceManager _services;
#endregion
@@ -120,7 +119,7 @@ namespace WebSocketSharp.Server {
{
_isWindows = false;
_listener = new HttpListener();
_services = new Dictionary<string, IServiceHost>();
_services = new ServiceManager();
var os = Environment.OSVersion;
if (os.Platform != PlatformID.Unix && os.Platform != PlatformID.MacOSX)
@@ -258,17 +257,17 @@ namespace WebSocketSharp.Server {
{
var res = context.Response;
var wsContext = context.AcceptWebSocket();
var socket = wsContext.WebSocket;
var path = wsContext.Path.UrlDecode();
if (!_services.ContainsKey(path))
IServiceHost svcHost;
if (!_services.TryGetServiceHost(path, out svcHost))
{
res.StatusCode = (int)HttpStatusCode.NotImplemented;
return false;
}
var socket = wsContext.WebSocket;
var service = _services[path];
service.BindWebSocket(socket);
svcHost.BindWebSocket(socket);
return true;
}
@@ -286,8 +285,8 @@ namespace WebSocketSharp.Server {
return;
}
var service = new WebSocketServer<T>();
_services.Add(absPath, service);
var svcHost = new WebSocketServiceHost<T>();
_services.Add(absPath, svcHost);
}
public byte[] GetFile(string path)
@@ -312,9 +311,7 @@ namespace WebSocketSharp.Server {
{
_listener.Close();
_acceptRequestThread.Join(5 * 1000);
foreach (var service in _services.Values)
service.Stop();
_services.Clear();
_services.Stop();
}
#endregion

1
websocket-sharp/Server/IServiceHost.cs
View File

@@ -33,6 +33,7 @@ namespace WebSocketSharp.Server {
public interface IServiceHost {
void BindWebSocket(WebSocket socket);
void Broadcast(string data);
void Start();
void Stop();
}

88
websocket-sharp/Server/ServiceManager.cs Normal file
View File

@@ -0,0 +1,88 @@
#region MIT License
/**
* ServiceManager.cs
*
* The MIT License
*
* Copyright (c) 2012 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;
namespace WebSocketSharp.Server {
public class ServiceManager {
#region Field
private Dictionary<string, IServiceHost> _services;
#endregion
#region Constructor
public ServiceManager()
{
_services = new Dictionary<string, IServiceHost>();
}
#endregion
#region Property
public int Count {
get {
return _services.Count;
}
}
#endregion
#region Public Methods
public void Add(string absPath, IServiceHost svcHost)
{
_services.Add(absPath.UrlDecode(), svcHost);
}
public void Broadcast(string data)
{
foreach (var svcHost in _services.Values)
svcHost.Broadcast(data);
}
public void Stop()
{
foreach (var svcHost in _services.Values)
svcHost.Stop();
_services.Clear();
}
public bool TryGetServiceHost(string absPath, out IServiceHost svcHost)
{
return _services.TryGetValue(absPath, out svcHost);
}
#endregion
}
}

4
websocket-sharp/Server/SessionManager.cs
View File

@@ -123,11 +123,11 @@ namespace WebSocketSharp.Server {
}
}
public Dictionary<string, bool> Broadping(string data)
public Dictionary<string, bool> Broadping(string message)
{
var result = new Dictionary<string, bool>();
foreach (var session in copySessions())
result.Add(session.Key, session.Value.Ping(data));
result.Add(session.Key, session.Value.Ping(message));
return result;
}

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

@@ -2,7 +2,7 @@
/**
* WebSocketServer.cs
*
* A C# implementation of a WebSocket protocol server.
* A C# implementation of the WebSocket protocol server.
*
* The MIT License
*
@@ -29,10 +29,8 @@
#endregion
using System;
using System.Collections.Generic;
using System.Net.Sockets;
using WebSocketSharp.Net;
using WebSocketSharp.Net.Sockets;
namespace WebSocketSharp.Server {
@@ -40,7 +38,7 @@ namespace WebSocketSharp.Server {
{
#region Field
private Dictionary<string, IServiceHost> _services;
private ServiceManager _services;
#endregion
@@ -80,7 +78,7 @@ namespace WebSocketSharp.Server {
private void init()
{
_services = new Dictionary<string, IServiceHost>();
_services = new ServiceManager();
}
#endregion
@@ -92,7 +90,9 @@ namespace WebSocketSharp.Server {
var context = client.AcceptWebSocket();
var socket = context.WebSocket;
var path = context.Path.UrlDecode();
if (!_services.ContainsKey(path))
IServiceHost svcHost;
if (!_services.TryGetServiceHost(path, out svcHost))
{
socket.Close(HttpStatusCode.NotImplemented);
return;
@@ -101,8 +101,7 @@ namespace WebSocketSharp.Server {
if (BaseUri.IsAbsoluteUri)
socket.Url = new Uri(BaseUri, path);
var service = _services[path];
service.BindWebSocket(socket);
svcHost.BindWebSocket(socket);
}
#endregion
@@ -119,118 +118,19 @@ namespace WebSocketSharp.Server {
return;
}
var service = new WebSocketServer<T>();
_services.Add(absPath, service);
var svcHost = new WebSocketServiceHost<T>();
_services.Add(absPath, svcHost);
}
public void Broadcast(string data)
{
_services.Broadcast(data);
}
public override void Stop()
{
base.Stop();
foreach (var service in _services.Values)
service.Stop();
_services.Clear();
}
#endregion
}
public class WebSocketServer<T> : WebSocketServerBase, IServiceHost
where T : WebSocketService, new()
{
#region Fields
private SessionManager _sessions;
#endregion
#region Internal Constructor
internal WebSocketServer()
{
init();
}
#endregion
#region Public Constructors
public WebSocketServer(int port)
: this(port, "/")
{
}
public WebSocketServer(string url)
: base(url)
{
init();
}
public WebSocketServer(int port, string absPath)
: this(System.Net.IPAddress.Any, port, absPath)
{
}
public WebSocketServer(System.Net.IPAddress address, int port, string absPath)
: base(address, port, absPath)
{
init();
}
#endregion
#region Property
public Uri Uri {
get {
return BaseUri;
}
}
#endregion
#region Private Method
private void init()
{
_sessions = new SessionManager();
}
#endregion
#region Protected Method
protected override void AcceptWebSocket(TcpClient client)
{
var context = client.AcceptWebSocket();
var socket = context.WebSocket;
var path = context.Path.UrlDecode();
if (path != Uri.GetAbsolutePath().UrlDecode())
{
socket.Close(HttpStatusCode.NotImplemented);
return;
}
if (Uri.IsAbsoluteUri)
socket.Url = new Uri(Uri, path);
BindWebSocket(socket);
}
#endregion
#region Public Methods
public void BindWebSocket(WebSocket socket)
{
T service = new T();
service.Bind(socket, _sessions);
service.Start();
}
public override void Stop()
{
base.Stop();
_sessions.Stop();
_services.Stop();
}
#endregion

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

@@ -32,8 +32,8 @@ using System.Collections.Specialized;
using System.Threading;
using WebSocketSharp.Frame;
namespace WebSocketSharp.Server
{
namespace WebSocketSharp.Server {
public abstract class WebSocketService
{
#region Private Fields
@@ -58,13 +58,13 @@ namespace WebSocketSharp.Server
protected NameValueCollection QueryString {
get {
return _socket.QueryString;
return IsBound ? _socket.QueryString : null;
}
}
protected SessionManager Sessions {
get {
return _sessions;
return IsBound ? _sessions : null;
}
}
@@ -137,10 +137,10 @@ namespace WebSocketSharp.Server
return Ping(String.Empty);
}
public bool Ping(string data)
public bool Ping(string message)
{
return IsBound
? _socket.Ping(data)
? _socket.Ping(message)
: false;
}
@@ -149,10 +149,10 @@ namespace WebSocketSharp.Server
return PingAround(String.Empty);
}
public Dictionary<string, bool> PingAround(string data)
public Dictionary<string, bool> PingAround(string message)
{
return IsBound
? _sessions.Broadping(data)
? _sessions.Broadping(message)
: null;
}
@@ -161,14 +161,14 @@ namespace WebSocketSharp.Server
return PingTo(id, String.Empty);
}
public bool PingTo(string id, string data)
public bool PingTo(string id, string message)
{
if (!IsBound)
return false;
WebSocketService service;
return _sessions.TryGetByID(id, out service)
? service.Ping(data)
? service.Ping(message)
: false;
}

149
websocket-sharp/Server/WebSocketServiceHost.cs Normal file
View File

@@ -0,0 +1,149 @@
#region MIT License
/**
* WebSocketServiceHost.cs
*
* A C# implementation of the WebSocket protocol server.
*
* The MIT License
*
* Copyright (c) 2012 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 System.Net.Sockets;
using WebSocketSharp.Net;
namespace WebSocketSharp.Server {
public class WebSocketServiceHost<T> : WebSocketServerBase, IServiceHost
where T : WebSocketService, new()
{
#region Field
private SessionManager _sessions;
#endregion
#region Internal Constructor
internal WebSocketServiceHost()
{
init();
}
#endregion
#region Public Constructors
public WebSocketServiceHost(int port)
: this(port, "/")
{
}
public WebSocketServiceHost(string url)
: base(url)
{
init();
}
public WebSocketServiceHost(int port, string absPath)
: this(System.Net.IPAddress.Any, port, absPath)
{
}
public WebSocketServiceHost(System.Net.IPAddress address, int port, string absPath)
: base(address, port, absPath)
{
init();
}
#endregion
#region Property
public Uri Uri {
get {
return BaseUri;
}
}
#endregion
#region Private Method
private void init()
{
_sessions = new SessionManager();
}
#endregion
#region Protected Method
protected override void AcceptWebSocket(TcpClient client)
{
var context = client.AcceptWebSocket();
var socket = context.WebSocket;
var path = context.Path.UrlDecode();
if (path != Uri.GetAbsolutePath().UrlDecode())
{
socket.Close(HttpStatusCode.NotImplemented);
return;
}
if (Uri.IsAbsoluteUri)
socket.Url = new Uri(Uri, path);
BindWebSocket(socket);
}
#endregion
#region Public Methods
public void BindWebSocket(WebSocket socket)
{
T service = new T();
service.Bind(socket, _sessions);
service.Start();
}
public void Broadcast(string data)
{
_sessions.Broadcast(data);
}
public Dictionary<string, bool> Broadping(string message)
{
return _sessions.Broadping(message);
}
public override void Stop()
{
base.Stop();
_sessions.Stop();
}
#endregion
}
}