decode varint for incoming typeid of Schema messages. colyseus/colyseus#369

endel · endel · commit 7e5b3bf94d5e · 2020-10-20T14:30:27.000-03:00
diff --git a/Assets/Plugins/Colyseus/Room.cs b/Assets/Plugins/Colyseus/Room.cs
@@ -274,10 +274,13 @@ protected async void ParseMessage (byte[] bytes)
 			}
 			else if (code == Protocol.ROOM_DATA_SCHEMA)
 			{
-				Type messageType = Schema.Context.GetInstance().Get(bytes[1]);
+				Schema.Iterator it = new Schema.Iterator { Offset = 1 };
+				var typeId = Decode.DecodeNumber(bytes, it);
 
+				Type messageType = Schema.Context.GetInstance().Get(typeId);
 				var message = (Schema.Schema) Activator.CreateInstance(messageType);
-				message.Decode(bytes, new Schema.Iterator { Offset = 2 });
+
+				message.Decode(bytes, it);
 
 				IMessageHandler handler = null;
 				OnMessageHandlers.TryGetValue("s" + message.GetType(), out handler);
diff --git a/Server/package.json b/Server/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@colyseus/social": "^0.10.0",
-    "colyseus": "^0.14.0-alpha.16",
+    "colyseus": "^0.14.0-alpha.19",
     "cors": "^2.8.5",
     "express": "^4.13.3",
     "express-jwt": "^5.3.1",

Original file line number	Diff line number	Diff line change
`@@ -274,10 +274,13 @@ protected async void ParseMessage (byte[] bytes)`
`274`	`274`	`}`
`275`	`275`	`else if (code == Protocol.ROOM_DATA_SCHEMA)`
`276`	`276`	`{`
`277`		`- Type messageType = Schema.Context.GetInstance().Get(bytes[1]);`
	`277`	`+ Schema.Iterator it = new Schema.Iterator { Offset = 1 };`
	`278`	`+ var typeId = Decode.DecodeNumber(bytes, it);`
`278`	`279`
	`280`	`+ Type messageType = Schema.Context.GetInstance().Get(typeId);`
`279`	`281`	`var message = (Schema.Schema) Activator.CreateInstance(messageType);`
`280`		`- message.Decode(bytes, new Schema.Iterator { Offset = 2 });`
	`282`	`+`
	`283`	`+ message.Decode(bytes, it);`
`281`	`284`
`282`	`285`	`IMessageHandler handler = null;`
`283`	`286`	`OnMessageHandlers.TryGetValue("s" + message.GetType(), out handler);`