Add UnityEvent support

Author: shaunabanana

Assets/WebSocketServer/WebSocketConnection.cs

@@ -63,6 +63,7 @@ public bool Establish() {
                 connectionHandler.Start();
 
                 // Call the server callback.
+                server.onOpen.Invoke(this);
                 server.OnOpen(this);
                 return true;
             } else {
@@ -81,11 +82,15 @@ private void HandleConnection () {
                         WebSocketMessage message = new WebSocketMessage(this, data);
                         server.messages.Enqueue(message);
                     } else if ((WebSocketOpCode)dataframe.opcode == WebSocketOpCode.Close) {
-                        // Handle closing the connection
+                        // Handle closing the connection.
                         Debug.Log("Client closed the connection.");
+                        // Close the connection.
                         stream.Close();
                         client.Close();
+                        // Call server callback.
+                        server.onClose.Invoke(this);
                         server.OnClose(this);
+                        // Jump out of the loop.
                         break;
                     }
                 } else {

Assets/WebSocketServer/WebSocketServer.cs

@@ -12,9 +12,15 @@
 using UnityEngine.Events;
 
 namespace WebSocketServer {
+    [System.Serializable]
+    public class WebSocketOpenEvent : UnityEvent<WebSocketConnection> {}
+
     [System.Serializable]
     public class WebSocketMessageEvent : UnityEvent<WebSocketMessage> {}
 
+    [System.Serializable]
+    public class WebSocketCloseEvent : UnityEvent<WebSocketConnection> {}
+
     public class WebSocketServer : MonoBehaviour
     {
         // The tcpListenerThread listens for incoming WebSocket connections, then assigns the client to handler threads;
@@ -27,7 +33,9 @@ public class WebSocketServer : MonoBehaviour
 
         public string address;
         public int port;
+        public WebSocketOpenEvent onOpen;
         public WebSocketMessageEvent onMessage;
+        public WebSocketCloseEvent onClose;
 
         void Awake() {
             if (onMessage == null) onMessage = new WebSocketMessageEvent();

Logs/AssetImportWorker0.log

@@ -2012,3 +2012,63 @@ System memory in use after: 167.5 MB.
 Unloading 12 unused Assets to reduce memory usage. Loaded Objects now: 2634.
 Total: 3.696991 ms (FindLiveObjects: 0.321621 ms CreateObjectMapping: 0.143795 ms MarkObjects: 3.090181 ms  DeleteObjects: 0.138315 ms)
 
+========================================================================
+Received Prepare
+Registering precompiled user dll's ...
+Registered in 0.000589 seconds.
+Begin MonoManager ReloadAssembly
+Native extension for OSXStandalone target not found
+Refreshing native plugins compatible for Editor in 0.41 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Mono: successfully reloaded assembly
+- Completed reload, in  1.054 seconds
+Platform modules already initialized, skipping
+Refreshing native plugins compatible for Editor in 0.39 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Unloading 1807 Unused Serialized files (Serialized files now loaded: 0)
+System memory in use before: 167.7 MB.
+System memory in use after: 167.7 MB.
+
+Unloading 12 unused Assets to reduce memory usage. Loaded Objects now: 2638.
+Total: 2.408146 ms (FindLiveObjects: 0.300355 ms CreateObjectMapping: 0.071596 ms MarkObjects: 1.920714 ms  DeleteObjects: 0.114462 ms)
+
+========================================================================
+Received Prepare
+Registering precompiled user dll's ...
+Registered in 0.000777 seconds.
+Begin MonoManager ReloadAssembly
+Native extension for OSXStandalone target not found
+Refreshing native plugins compatible for Editor in 0.36 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Mono: successfully reloaded assembly
+- Completed reload, in  1.051 seconds
+Platform modules already initialized, skipping
+Refreshing native plugins compatible for Editor in 0.36 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Unloading 1807 Unused Serialized files (Serialized files now loaded: 0)
+System memory in use before: 167.9 MB.
+System memory in use after: 167.9 MB.
+
+Unloading 12 unused Assets to reduce memory usage. Loaded Objects now: 2642.
+Total: 2.445527 ms (FindLiveObjects: 0.291766 ms CreateObjectMapping: 0.061581 ms MarkObjects: 1.980272 ms  DeleteObjects: 0.110776 ms)
+
+========================================================================
+Received Prepare
+Registering precompiled user dll's ...
+Registered in 0.002262 seconds.
+Begin MonoManager ReloadAssembly
+Native extension for OSXStandalone target not found
+Refreshing native plugins compatible for Editor in 0.36 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Mono: successfully reloaded assembly
+- Completed reload, in  1.178 seconds
+Platform modules already initialized, skipping
+Refreshing native plugins compatible for Editor in 0.53 ms, found 2 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Unloading 1807 Unused Serialized files (Serialized files now loaded: 0)
+System memory in use before: 168.1 MB.
+System memory in use after: 168.1 MB.
+
+Unloading 12 unused Assets to reduce memory usage. Loaded Objects now: 2646.
+Total: 3.040585 ms (FindLiveObjects: 0.363364 ms CreateObjectMapping: 0.067130 ms MarkObjects: 2.459490 ms  DeleteObjects: 0.149128 ms)
+