Fixed WebSocketServer

websocket-sharp/Server/IWebSocketServer.cs

@@ -1,6 +1,6 @@
 #region MIT License
 /**
- * ConnectionEventArgs.cs
+ * IWebSocketServer.cs
  *
  * The MIT License
  *
@@ -27,16 +27,20 @@
 #endregion
 
 using System;
+using WebSocketSharp.Frame;
 
-namespace WebSocketSharp
+namespace WebSocketSharp.Server
 {
-  public class ConnectionEventArgs : EventArgs
+  public interface IWebSocketServer
   {
-    public WebSocket Socket { get; private set; }
-
-    public ConnectionEventArgs(WebSocket webSocket)
-    {
-      Socket = webSocket;
-    }
+    void AddService(WebSocketService service);
+    void Close();
+    void Close(CloseStatusCode code, string reason);
+    void Ping(string data);
+    void RemoveService(WebSocketService service);
+    void Send(byte[] data);
+    void Send(string data);
+    void Start();
+    void Stop();
   }
 }

websocket-sharp/Server/WebSocketServer.cs

@@ -37,15 +37,16 @@ using System.Text;
 using System.Threading;
 using WebSocketSharp.Frame;
 
-namespace WebSocketSharp
+namespace WebSocketSharp.Server
 {
-  public class WebSocketServer
+  public class WebSocketServer<T> : IWebSocketServer
+    where T : WebSocketService, new()
   {
     #region Private Fields
 
-    private TcpListener                       _tcpListener;
-    private Uri                               _uri;
-    private SynchronizedCollection<WebSocket> _webSockets;
+    private SynchronizedCollection<WebSocketService> _services;
+    private TcpListener                              _tcpListener;
+    private Uri                                      _uri;
 
     #endregion
 
@@ -75,8 +76,7 @@ namespace WebSocketSharp
 
     #region Events
 
-    public event EventHandler<ConnectionEventArgs> OnConnection;
-    public event EventHandler<ErrorEventArgs>      OnError;
+    public event EventHandler<ErrorEventArgs> OnError;
 
     #endregion
 
@@ -106,7 +106,7 @@ namespace WebSocketSharp
       }
 
       _tcpListener = new TcpListener(IPAddress.Any, port);
-      _webSockets  = new SynchronizedCollection<WebSocket>();
+      _services    = new SynchronizedCollection<WebSocketService>();
     }
 
     #endregion
@@ -125,12 +125,10 @@ namespace WebSocketSharp
       try
       {
         TcpClient client = listener.EndAcceptTcpClient(ar);
-
-        WebSocket ws = new WebSocket(_uri.ToString(), client);
-        OnConnection.Emit(this, new ConnectionEventArgs(ws));
-        _webSockets.Add(ws);
-
-        ws.Connect();
+        WebSocket socket = new WebSocket(_uri.ToString(), client);
+        T service = new T();
+        service.Bind(this, socket);
+        service.Open();
       }
       catch (ObjectDisposedException)
       {
@@ -170,32 +168,56 @@ namespace WebSocketSharp
 
     #region Public Methods
 
+    public void AddService(WebSocketService service)
+    {
+      _services.Add(service);
+    }
+
+    public void Close()
+    {
+      Close(CloseStatusCode.NORMAL, String.Empty);
+    }
+
     public void Close(CloseStatusCode code, string reason)
     {
-      lock (_webSockets.SyncRoot)
+      lock (_services.SyncRoot)
       {
-        foreach (WebSocket ws in _webSockets)
+        foreach (WebSocketService service in _services)
         {
-          if (ws.ReadyState == WsState.OPEN)
-          {
-            ws.Close(code, reason);
-          }
+          service.Close(code, reason);
         }
       }
     }
 
+    public void Ping(string data)
+    {
+      WaitCallback broadcast = (state) =>
+      {
+        lock (_services.SyncRoot)
+        {
+          foreach (WebSocketService service in _services)
+          {
+            service.Ping(data);
+          }
+        }
+      };
+      ThreadPool.QueueUserWorkItem(broadcast);
+    }
+
+    public void RemoveService(WebSocketService service)
+    {
+      _services.Remove(service);
+    }
+
     public void Send(byte[] data)
     {
       WaitCallback broadcast = (state) =>
       {
-        lock (_webSockets.SyncRoot)
+        lock (_services.SyncRoot)
         {
-          foreach (WebSocket ws in _webSockets)
+          foreach (WebSocketService service in _services)
           {
-            if (ws.ReadyState == WsState.OPEN)
-            {
-              ws.Send(data);
-            }
+            service.Send(data);
           }
         }
       };
@@ -206,14 +228,11 @@ namespace WebSocketSharp
     {
       WaitCallback broadcast = (state) =>
       {
-        lock (_webSockets.SyncRoot)
+        lock (_services.SyncRoot)
         {
-          foreach (WebSocket ws in _webSockets)
+          foreach (WebSocketService service in _services)
           {
-            if (ws.ReadyState == WsState.OPEN)
-            {
-              ws.Send(data);
-            }
+            service.Send(data);
           }
         }
       };
@@ -229,7 +248,7 @@ namespace WebSocketSharp
     public void Stop()
     {
       _tcpListener.Stop();
-      Close(CloseStatusCode.NORMAL, String.Empty);
+      Close();
     }
 
     #endregion

websocket-sharp/Server/WebSocketService.cs

@@ -0,0 +1,130 @@
+#region MIT License
+/**
+ * WebSocketService.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 WebSocketSharp.Frame;
+
+namespace WebSocketSharp.Server
+{
+  public abstract class WebSocketService
+  {
+    #region Properties
+
+    public IWebSocketServer Server { get; private set; }
+    public WebSocket        Socket { get; private set; }
+
+    #endregion
+
+    #region Public Constructor
+
+    public WebSocketService()
+    {
+    }
+
+    #endregion
+
+    #region Private Method
+
+    private void defaultBind()
+    {
+      Socket.OnOpen += (sender, e) =>
+      {
+        Server.AddService(this);
+      };
+    }
+
+    #endregion
+
+    #region Protected Methods
+
+    protected virtual void onOpen(object sender, EventArgs e)
+    {
+    }
+
+    protected virtual void onMessage(object sender, MessageEventArgs e)
+    {
+    }
+
+    protected virtual void onError(object sender, ErrorEventArgs e)
+    {
+    }
+
+    protected virtual void onClose(object sender, CloseEventArgs e)
+    {
+      Server.RemoveService(this);
+    }
+
+    #endregion
+
+    #region Public Methods
+
+    public void Bind(IWebSocketServer server, WebSocket socket)
+    {
+      Server = server;
+      Socket = socket;
+
+      defaultBind();
+      Socket.OnOpen    += onOpen;
+      Socket.OnMessage += onMessage;
+      Socket.OnError   += onError;
+      Socket.OnClose   += onClose;
+    }
+
+    public void Close()
+    {
+      Socket.Close();
+    }
+
+    public void Close(CloseStatusCode code, string reason)
+    {
+      Socket.Close(code, reason);
+    }
+
+    public void Open()
+    {
+      Socket.Connect();
+    }
+
+    public void Ping(string data)
+    {
+      Socket.Ping(data);
+    }
+
+    public void Send(byte[] data)
+    {
+      Socket.Send(data);
+    }
+
+    public void Send(string data)
+    {
+      Socket.Send(data);
+    }
+
+    #endregion
+  }
+}

websocket-sharp/WebSocket.cs

@@ -748,16 +748,10 @@ namespace WebSocketSharp
 
     private void messageLoop()
     {
-      #if DEBUG
-      Console.WriteLine("\nWS: Info@messageLoop: Current thread IsBackground?: {0}", Thread.CurrentThread.IsBackground);
-      #endif
       while (_readyState == WsState.OPEN)
       {
         message();
       }
-      #if DEBUG
-      Console.WriteLine("WS: Info@messageLoop: Exit messageLoop method.");
-      #endif
     }
 
     private void startMessageThread()

websocket-sharp/websocket-sharp.csproj

@@ -72,14 +72,16 @@
     <Compile Include="Frame\Opcode.cs" />
     <Compile Include="Frame\PayloadData.cs" />
     <Compile Include="Frame\Rsv.cs" />
-    <Compile Include="ConnectionEventArgs.cs" />
     <Compile Include="ErrorEventArgs.cs" />
-    <Compile Include="WebSocketServer.cs" />
     <Compile Include="WebSocket.cs" />
+    <Compile Include="Server\IWebSocketServer.cs" />
+    <Compile Include="Server\WebSocketServer.cs" />
+    <Compile Include="Server\WebSocketService.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Folder Include="Stream\" />
     <Folder Include="Frame\" />
+    <Folder Include="Server\" />
   </ItemGroup>
 </Project>