Fixes #3 : rewrote the connection states and their transitions.

Author: Vincent Cantin

unity-project/Assets/example/TestDdpClient.cs

@@ -28,6 +28,10 @@ public void Start() {
 			}, 2.0f));
 		};
 
+		ddpConnection.OnConnectionClosed += (DdpConnection connection) => {
+			Debug.Log("Connection closed.");
+		};
+
 		ddpConnection.OnError += (DdpError error) => {
 			Debug.Log("Error: " + error.errorCode + " " + error.reason);
 		};
@@ -73,6 +77,7 @@ public void Update() {
 		}
 
 		if (Input.GetKeyDown(KeyCode.V)) {
+			Debug.Log("Closing connection ...");
 			ddpConnection.Close();
 		}
 

unity-project/Assets/unity3d-ddp-client/3rd/websocket-sharp/websocket-sharp.csproj.meta

@@ -69,8 +69,10 @@ public class Field {
 
 		public enum ConnectionState {
 			NOT_CONNECTED,
-			DISCONNECTED,
+			CONNECTING,
 			CONNECTED,
+			DISCONNECTED,
+			CLOSING,
 			CLOSED
 		}
 
@@ -92,6 +94,7 @@ public enum ConnectionState {
 
 		public delegate void OnConnectedDelegate(DdpConnection connection);
 		public delegate void OnDisconnectedDelegate(DdpConnection connection);
+		public delegate void OnConnectionClosedDelegate(DdpConnection connection);
 		public delegate void OnAddedDelegate(string collection, string docId, JSONObject fields);
 		public delegate void OnChangedDelegate(string collection, string docId, JSONObject fields, JSONObject cleared);
 		public delegate void OnRemovedDelegate(string collection, string docId);
@@ -101,6 +104,7 @@ public enum ConnectionState {
 
 		public event OnConnectedDelegate OnConnected;
 		public event OnDisconnectedDelegate OnDisconnected;
+		public event OnConnectionClosedDelegate OnConnectionClosed;
 		public event OnAddedDelegate OnAdded;
 		public event OnChangedDelegate OnChanged;
 		public event OnRemovedDelegate OnRemoved;
@@ -146,8 +150,15 @@ private void OnWebSocketError(object sender, WebSocketSharp.ErrorEventArgs e) {
 		private void OnWebSocketClose(object sender, WebSocketSharp.CloseEventArgs e) {
 			if (e.WasClean) {
 				ddpConnectionState = ConnectionState.CLOSED;
-			}
-			else {
+				sessionId = null;
+				subscriptions.Clear();
+				methodCalls.Clear();
+				coroutineHelper.RunInMainThread(() => {
+					if (OnDisconnected != null) {
+						OnDisconnected(this);
+					}
+				});
+			} else {
 				ddpConnectionState = ConnectionState.DISCONNECTED;
 				coroutineHelper.RunInMainThread(() => {
 					if (OnDisconnected != null) {
@@ -432,15 +443,19 @@ public ConnectionState GetConnectionState() {
 		}
 
 		public void Connect() {
-			ws.ConnectAsync();
+			if ((ddpConnectionState == ConnectionState.NOT_CONNECTED) ||
+  			  (ddpConnectionState == ConnectionState.DISCONNECTED) ||
+  			  (ddpConnectionState == ConnectionState.CLOSED)) {
+  			ddpConnectionState = ConnectionState.CONNECTING;
+  			ws.ConnectAsync();
+			}
 		}
 
 		public void Close() {
-			ws.Close();
-
-			sessionId = null;
-			subscriptions.Clear();
-			methodCalls.Clear();
+			if (ddpConnectionState == ConnectionState.CONNECTED) {
+				ddpConnectionState = ConnectionState.CLOSING;
+				ws.Close();
+			}
 		}
 
 		void IDisposable.Dispose() {