In progress refactor

Author: doctorpangloss

CoroutineHost.cs

@@ -0,0 +1,17 @@
+using System;
+
+public class CoroutineHost : MonoSingleton<CoroutineHost>
+{
+	public CoroutineHost ()
+	{
+	}
+
+	void OnApplicationQuit() {
+		try {
+			Meteor.LiveData.LiveData.Instance.Close();
+		} catch (Exception e) {
+
+		}
+	}
+}
+

DDP/DDPConnector.cs.meta renamed to CoroutineHost.cs.meta

@@ -9,7 +9,7 @@ namespace Meteor.LiveData
     public interface ILiveData
     {
 		void QueueMessage(string jsonItem);
-        Coroutine Connect(string url);
+        Coroutine Connect(string url, float timeout);
 		Method Call (string methodName, params object[] arguments);
 		Method<TResponseType> Call<TResponseType> (string methodName, params object[] arguments)
 			where TResponseType : new();

DDP/ILiveData.cs

@@ -1,15 +1,16 @@
 using System;
+using Meteor;
 
 namespace Meteor.LiveData
 {
-	public delegate void MethodHandler(Meteor.Error error, object response);
-	public delegate void MethodHandler<TResponseType>(Meteor.Error error, TResponseType response);
+	public delegate void MethodHandler(Error error, object response);
+	public delegate void MethodHandler<TResponseType>(Error error, TResponseType response);
 
 	public interface IMethod
 	{
-		void Callback(Meteor.Error error, object response);
+		void Callback(Error error, object response);
 		object UntypedResponse { get; }
-		Meteor.Error Error { get; }
+		Error Error { get; }
 		Type ResponseType { get; }
 	}
 }

DDP/IMethod.cs

@@ -23,6 +23,7 @@ public void Connect(string url)
             _socket.MessageReceived += new EventHandler<MessageReceivedEventArgs>(socket_MessageReceived);
             _socket.Opened += new EventHandler(_socket_Opened);
             _socket.Open();
+
             _isWait = 1;
             this.Wait();
         }
@@ -37,7 +38,6 @@ public void Close()
 
         public void Send(string message)
         {
-			Debug.Log (message);
             _socket.Send(message);
         }
 
@@ -49,6 +49,7 @@ void _socket_Opened(object sender, EventArgs e)
 
         void socket_MessageReceived(object sender, MessageReceivedEventArgs e)
         {
+			System.Console.WriteLine ("test");
             this._client.QueueMessage(e.Message);
         }
 

DDP/DDPConnector.cs renamed to DDP/LiveConnection.cs

@@ -9,23 +9,9 @@ namespace Meteor.LiveData
 {
 	public class LiveData : ILiveData
 	{
-		protected sealed class LiveDataHost : MonoBehaviour {
-			private static LiveDataHost _instance;
-
-			public static LiveDataHost Instance {
-				get {
-					if (((object)_instance) == null) {
-						_instance = (new GameObject ("LiveData Host")).AddComponent<LiveDataHost> ();
-					}
-
-					return _instance;
-				}
-			}
-		}
-
 		public LiveConnection Connector;
 		int uniqueId;
-		Dictionary<string, Meteor.LiveData.ICollection> collections;
+		Dictionary<string, ICollection> collections;
 		Dictionary<string, List<string>> subscriptionsToCollections;
 		Dictionary<string, IMethod> methods;
 		string serverId;
@@ -51,7 +37,7 @@ public LiveData()
 		{
 			Connector = new LiveConnection(this);
 			jsonItemsQueue = new Queue<string>();
-			collections = new Dictionary<string, Meteor.LiveData.ICollection>();
+			collections = new Dictionary<string, ICollection>();
 			subscriptionsToCollections = new Dictionary<string, List<string>>();
 			methods = new Dictionary<string, IMethod>();
 
@@ -66,23 +52,38 @@ public LiveData()
 		/// Connect to the specified Meteor server.
 		/// </summary>
 		/// <param name="url">URL.</param>
-		public Coroutine Connect(string url)
+		public Coroutine Connect(string url, float timeout = 2f)
 		{
 			OnConnected += HandleOnConnected;
+			TimedOut = false;
+			Connector.Connect(url);
 
-			return LiveDataHost.Instance.StartCoroutine (ConnectCoroutine (url));
+			CoroutineHost.Instance.StartCoroutine (TimeoutCoroutine (timeout));
+			return CoroutineHost.Instance.StartCoroutine (ConnectCoroutine (url));
 		}
 
 		void HandleOnConnected (string obj)
 		{
-			connected = true;
+			Connected = true;
+			TimedOut = false;
 		}
 
-		bool connected;
-		private IEnumerator ConnectCoroutine(string url) {
-			Connector.Connect(url);
+		public bool Connected;
+
+		public bool TimedOut;
+
+		private IEnumerator TimeoutCoroutine(float timeout) {
+			yield return new WaitForSeconds (timeout);
+			if (!Connected) {
+				TimedOut = true;
+			}
+		}
 
-			while (!connected) {
+		private IEnumerator ConnectCoroutine(string url) {
+			while (!Connected) {
+				if (TimedOut) {
+					yield break;
+				}
 				yield return null;
 			}
 
@@ -237,10 +238,9 @@ public void RestartThread()
 		private void ProcessQueue()
 		{
 			while (Dequeue()) {
-				Debug.Log(currentJsonItem);
 				IDictionary message = currentJsonItem.Deserialize() as IDictionary;
 				if (message == null) {
-					return;
+					continue;
 				}
 
 				Message m = message.Coerce<Message>();
@@ -289,14 +289,14 @@ private void ProcessQueue()
 					if (methods.ContainsKey(resultm.id)) {
 						methods[resultm.id].Callback(resultm.error, resultm.methodResult);
 					} else {
-						Debug.LogError ("DDPClient.ProcessQueue: Result ID not found.");
+//						Debug.LogError ("DDPClient.ProcessQueue: Result ID not found.");
 					}
 					break;
 				case "updated":
 					break;
 				default:
 					if (!message.Contains("server_id")) {
-						Debug.Log(string.Format("DDPClient.ProcessQueue: Unhandled message.\nMessage:\n{0}",message.Serialize()));
+//						Debug.Log(string.Format("DDPClient.ProcessQueue: Unhandled message.\nMessage:\n{0}",message.Serialize()));
 					}
 					break;
 				}

DDP/LiveConnection.cs.meta

@@ -8,11 +8,13 @@ public class ConnectMessage : Message
 		const string pre = "pre1";
 		public static string connectMessage;
 		public string version;
+		public string[] support;
 
 		public ConnectMessage()
 		{
 			msg = connect;
 			version = pre;
+			support = new[] { "pre1" };
 		}
 
 		static ConnectMessage()

DDP/LiveData.cs

@@ -6,7 +6,7 @@ public class ResultMessage : Message
 	{
 		[JsonFx.Json.JsonIgnore]
 		public const string result = "result";
-		public Meteor.Error error;
+		public Error error;
 
 		public string id;
 

DDP/Messages/ConnectMessage.cs

@@ -10,7 +10,7 @@ public class Method : IMethod
 		public MethodMessage Message;
 		public event MethodHandler OnUntypedResponse;
 
-		public virtual void Callback(Meteor.Error error, object response)
+		public virtual void Callback(Error error, object response)
 		{
 			if (OnUntypedResponse != null)
 			{
@@ -31,26 +31,14 @@ public object UntypedResponse {
 			protected set;
 		}
 
-		public Meteor.Error Error {
+		public Error Error {
 			get;
 			protected set;
 		}
 
 		#endregion
 
-		protected sealed class MethodHost : MonoBehaviour {
-			private static MethodHost _instance;
-
-			public static MethodHost Instance {
-				get {
-					if (((object)_instance) == null) {
-						_instance = (new GameObject ("Method Host")).AddComponent<MethodHost> ();
-					}
-
-					return _instance;
-				}
-			}
-		}
+		protected sealed class MethodHost : MonoSingleton<MethodHost> {}
 	}
 
 	public class Method<TResponseType> : Method
@@ -71,7 +59,7 @@ public TResponseType Response
 
 		#region IMethod implementation
 
-		public override void Callback(Meteor.Error error, object response)
+		public override void Callback(Error error, object response)
 		{
 			TResponseType r = response.Coerce<TResponseType>();
 
@@ -91,10 +79,10 @@ public override Type ResponseType {
 
 		public static implicit operator Coroutine(Method<TResponseType> method) {
 			method.OnResponse += method.completed;
-			return MethodHost.Instance.StartCoroutine (method.Execute ());
+			return CoroutineHost.Instance.StartCoroutine (method.Execute ());
 		}
 
-		private void completed(Meteor.Error error, TResponseType response) {
+		private void completed(Error error, TResponseType response) {
 			Response = response;
 			Error = error;
 			complete = true;

DDP/Messages/ResultMessage.cs

@@ -0,0 +1,57 @@
+using UnityEngine;
+
+/// <summary>
+/// Mono singleton. From http://wiki.unity3d.com/index.php?title=Singleton#Generic_Based_Singleton_for_MonoBehaviours
+/// </summary>
+public abstract class MonoSingleton<T> : MonoBehaviour where T : MonoSingleton<T>
+{
+    private static T m_Instance = null;
+    public static T Instance
+    {
+        get
+        {
+        	if(m_Instance) {
+        		return m_Instance;
+        	}
+            // Instance requiered for the first time, we look for it
+            else {
+                m_Instance = GameObject.FindObjectOfType(typeof(T)) as T;
+
+                // Object not found, we create a temporary one
+                if( m_Instance == null )
+                {
+                    m_Instance = new GameObject(typeof(T).ToString(), typeof(T)).GetComponent<T>();
+
+                    // Problem during the creation, this should not happen
+                    if( m_Instance == null )
+                    {
+                        Debug.LogError("MonoSingleton: Problem during the creation of " + typeof(T).ToString());
+                    }
+                }
+            }
+
+            return m_Instance;
+        }
+    }
+
+    /// <summary>
+    /// Awake function. Override when necessary and call base.Awake() first.
+    /// </summary>
+    protected virtual void Awake()
+    {
+        if( m_Instance == null )
+        {
+            m_Instance = this as T;
+            DontDestroyOnLoad(gameObject);
+        }
+    }
+
+    /// <summary>
+    /// Clear the reference when the application quits. Override when necessary and call base.OnApplicationQuit() last.
+    /// </summary>
+    protected virtual void OnApplicationQuit()
+    {
+        m_Instance = null;
+    }
+}
+

DDP/Method.cs

@@ -12,6 +12,11 @@ public static Collection<Meteor.MongoDocument> Users {
 		private set;
 	}
 
+	public static string UserId {
+		get;
+		private set;
+	}
+
 	static Accounts() {
 //		FacebookManager.sessionOpenedEvent += HandleFacebookSessionOpened;
 //
@@ -75,6 +80,7 @@ static void HandleOnLogin (Meteor.Error error, LoginUserResult response)
 	{
 		if (error == null) {
 			PlayerPrefs.SetString (TokenKey, response.token);
+			UserId = response.id;
 			SubscribeToUsers ();
 		}
 	}

Extensions/MonoSingleton.cs

@@ -0,0 +1,20 @@
+using System;
+using Meteor.LiveData;
+using UnityEngine;
+
+namespace Meteor
+{
+	public static class Meteor
+	{
+		public static bool IsConnected {
+			get {
+				return LiveData.LiveData.Instance.Connected;
+			}
+		}
+
+		public static Coroutine Connect(string url) {
+			return LiveData.LiveData.Instance.Connect (url);
+		}
+	}
+}
+