Bugfix: wait for async call on subscription (needed for multiple subscription calls to prevent subscriptionId from beeing overwritten)

Author: brean

unity-project/Assets/Moulin/DDP/ddp/DdpConnection.cs

@@ -467,18 +467,31 @@ async void Send(string message)
             await SendAsync(message);
         }
 
-		public Subscription Subscribe(string name, params JSONObject[] items) {
-			Subscription subscription = new Subscription() {
-				id = "" + subscriptionId++,
-				name = name,
-				items = items
-			};
-			subscriptions[subscription.id] = subscription;
-            Send(GetSubscriptionMessage(subscription));
-			return subscription;
-		}
+        public Subscription Subscribe(string name, params JSONObject[] items)
+        {
+            Task<Subscription> sub = SubscribeAsync(name, items);
+            // wait until message has been send
+            sub.Wait();
+            return sub.Result;
+        }
+
+        public async Task<Subscription> SubscribeAsync(string name, params JSONObject[] items)
+        {
+            Subscription subscription = new Subscription()
+            {
+                id = "" + subscriptionId++,
+                name = name,
+                items = items
+            };
+            lock (subscriptions)
+            {
+                subscriptions[subscription.id] = subscription;
+            }
+            await SendAsync(GetSubscriptionMessage(subscription));
+            return subscription;
+        }
 
-		public void Unsubscribe(Subscription subscription) {
+        public void Unsubscribe(Subscription subscription) {
 			Send(GetUnsubscriptionMessage(subscription));
 		}