send requestId to JOIN_ROOM. closes #26

Author: endel

Assets/ColyseusClient.cs

@@ -33,6 +33,8 @@ IEnumerator Start () {
 		room.Listen ("messages/:number", this.OnMessageAdded);
 		room.Listen (this.OnChangeFallback);
 
+		room.OnData += (object sender, MessageEventArgs e) => Debug.Log(e.data);
+
 		int i = 0;
 
 		while (true)
@@ -42,7 +44,7 @@ IEnumerator Start () {
 			// string reply = client.RecvString();
 			if (client.error != null)
 			{
-				Debug.LogError ("Error: "+client.error);
+				Debug.LogError ("Error: " + client.error);
 				break;
 			}
 

Assets/Plugins/Colyseus/Client.cs

@@ -25,8 +25,9 @@ public class Client
 		public string id;
 		protected UriBuilder endpoint;
 
-		protected Room room;
 		protected Dictionary<string, Room> rooms = new Dictionary<string, Room> ();
+		protected Dictionary<int, Room> connectingRooms = new Dictionary<int, Room> ();
+		protected int joinRequestId;
 
 		protected Connection connection;
 
@@ -100,11 +101,15 @@ public Room Join (string roomName, Dictionary<string, object> options = null)
 				options = new Dictionary<string, object> ();
 			}
 
-			this.room = new Room (roomName);
+			int requestId = ++this.joinRequestId;
+			options.Add ("requestId", requestId);
+
+			var room = new Room (roomName);
+			this.connectingRooms.Add (requestId, room);
 
 			this.connection.Send (new object[]{Protocol.JOIN_ROOM, roomName, options});
 
-			return this.room;
+			return room;
 		}
 
         void ParseMessage (byte[] recv)
@@ -119,16 +124,24 @@ void ParseMessage (byte[] recv)
 					this.OnOpen.Invoke (this, EventArgs.Empty);
 
 			} else if (code == Protocol.JOIN_ROOM) {
-				var room = this.room;
-				room.id = (string) message [1];
+				var requestId = (byte) message [2];
 
-				this.endpoint.Path = "/" + room.id;
-				this.endpoint.Query = "colyseusid=" + this.id;
+				Room room;
+				if (this.connectingRooms.TryGetValue (requestId, out room)) {
+					room.id = (string) message [1];
+
+					this.endpoint.Path = "/" + room.id;
+					this.endpoint.Query = "colyseusid=" + this.id;
+
+					room.SetConnection (new Connection (this.endpoint.Uri));
+					room.OnLeave += OnLeaveRoom;
 
-				room.SetConnection (new Connection (this.endpoint.Uri));
-				room.OnLeave += OnLeaveRoom;
+					this.rooms.Add (room.id, room);
+					this.connectingRooms.Remove (requestId);
 
-				this.rooms.Add (room.id, room);
+				} else {
+					throw new Exception ("can't join room using requestId " + requestId.ToString());
+				}
 
 			} else if (code == Protocol.JOIN_ERROR) {
 				if (this.OnError != null)

Server/package.json

@@ -12,7 +12,7 @@
     "node": ">= 5.x"
   },
   "dependencies": {
-    "colyseus": "^0.5.0",
+    "colyseus": "^0.5.7",
     "express": "^4.13.3"
   },
   "devDependencies": {

Server/yarn.lock

@@ -2,6 +2,12 @@
 # yarn lockfile v1
 
 
+"@gamestdio/timeline@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@gamestdio/timeline/-/timeline-0.3.5.tgz#35ffbe1621535b41dfb5d5009c4c52301bbb1fc6"
+  dependencies:
+    harmony-proxy "^1.0.1"
+
 "@gamestdio/timer@^1.1.7":
   version "1.1.8"
   resolved "https://registry.npmjs.org/@gamestdio/timer/-/timer-1.1.8.tgz#6e5424f6e137aa88935571628f790433429a2f14"
@@ -32,11 +38,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*":
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.5.tgz#96a0f0a618b7b606f1ec547403c00650210bfbb7"
-
-"@types/node@^7.0.18":
+"@types/node@*", "@types/node@^7.0.18":
   version "7.0.39"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.39.tgz#8aced4196387038113f6f9aa4014ab4c51edab3c"
 
@@ -211,18 +213,19 @@ chokidar@^1.4.3:
   optionalDependencies:
     fsevents "^1.0.0"
 
-clock.js@*, clock.js@^1.1.5:
+clock.js@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/clock.js/-/clock.js-1.1.5.tgz#c1186cd7e328cc838006d1d2a74eac72070b8f45"
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-colyseus@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/colyseus/-/colyseus-0.5.0.tgz#143552bddf6662d80ab3192e496ed952e88cd6b0"
+colyseus@^0.5.7:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/colyseus/-/colyseus-0.5.7.tgz#5766b28faf14302c139eac3c3f440d9bc0ef4fd9"
   dependencies:
+    "@gamestdio/timeline" "^0.3.5"
     "@gamestdio/timer" "^1.1.7"
     "@types/debug" "^0.0.29"
     "@types/fossil-delta" "^0.2.1"
@@ -235,11 +238,10 @@ colyseus@^0.5.0:
     debug "^2.6.8"
     fossil-delta "^0.2.5"
     ip "^1.1.5"
-    memshared "^0.9.14"
+    memshared "^0.9.15"
     msgpack-lite "^0.1.26"
     nonenumerable "^1.0.1"
     shortid "^2.2.6"
-    timeframe "^0.3.5"
     url-parse "^1.1.9"
     uws "8.14.1"
 
@@ -946,9 +948,9 @@ [email protected]:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
 
-memshared@^0.9.14:
-  version "0.9.14"
-  resolved "https://registry.yarnpkg.com/memshared/-/memshared-0.9.14.tgz#e41024153d1e7761b2dae7c60bf1448df9ba0448"
+memshared@^0.9.15:
+  version "0.9.15"
+  resolved "https://registry.yarnpkg.com/memshared/-/memshared-0.9.15.tgz#1d93d07a15958fafe867523a9804f31917cbca34"
 
 [email protected]:
   version "1.0.1"
@@ -1527,13 +1529,6 @@ timed-out@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-2.0.0.tgz#f38b0ae81d3747d628001f41dafc652ace671c0a"
 
-timeframe@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/timeframe/-/timeframe-0.3.5.tgz#c8cc612d22faacdd9b31e33e6072c85f21ab208c"
-  dependencies:
-    clock.js "*"
-    harmony-proxy "^1.0.1"
-
 [email protected]:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/touch/-/touch-1.0.0.tgz#449cbe2dbae5a8c8038e30d71fa0ff464947c4de"