fix checksum issue. improve demo with moving entities. closes #25

Author: endel

Assets/ColyseusClient.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using System.Collections;
+using System.Collections.Generic;
 using System;
 using Colyseus;
 
@@ -14,6 +15,9 @@ public class ColyseusClient : MonoBehaviour {
 	public string port = "3553";
 	public string roomName = "chat";
 
+	// map of players
+	Dictionary<string, GameObject> players = new Dictionary<string, GameObject>();
+
 	// Use this for initialization
 	IEnumerator Start () {
 
@@ -29,8 +33,8 @@ IEnumerator Start () {
 		room.OnJoin += OnRoomJoined;
 		room.OnUpdate += OnUpdateHandler;
 
-		room.Listen ("players/:id/:axis", this.OnPlayerMove);
 		room.Listen ("players/:id", this.OnPlayerChange);
+		room.Listen ("players/:id/:axis", this.OnPlayerMove);
 		room.Listen ("messages/:number", this.OnMessageAdded);
 		room.Listen (this.OnChangeFallback);
 
@@ -78,19 +82,63 @@ void OnRoomJoined (object sender, EventArgs e)
 		Debug.Log("Joined room successfully.");
 	}
 
+	void OnUpdateHandler (object sender, RoomUpdateEventArgs e)
+	{
+		// Setup room first state
+		if (e.isFirstState) {
+			IndexedDictionary<string, object> players = (IndexedDictionary<string, object>) e.state ["players"];
+
+			// trigger to add existing players 
+			foreach(KeyValuePair<string, object> player in players)
+			{
+				this.OnPlayerChange (new DataChange {
+					path = new Dictionary<string, string> {
+						{"id", player.Key}
+					},
+					operation = "add",
+					value = player.Value
+				});
+			}
+		}
+	}
+
 	void OnPlayerChange (DataChange change)
 	{
 		Debug.Log ("OnPlayerChange");
 		Debug.Log (change.operation);
 		Debug.Log (change.path["id"]);
 		Debug.Log (change.value);
+
+		if (change.operation == "add") {
+			IndexedDictionary<string, object> value = (IndexedDictionary<string, object>) change.value;
+
+			GameObject cube = GameObject.CreatePrimitive (PrimitiveType.Cube);
+
+			cube.transform.position = new Vector3 (Convert.ToSingle(value ["x"]), Convert.ToSingle(value ["y"]), 0);
+
+			// add "player" to map of players by id.
+			players.Add (change.path ["id"], cube);
+
+		} else if (change.operation == "remove") {
+			// remove player from scene
+			GameObject cube;
+			players.TryGetValue (change.path ["id"], out cube);
+			Destroy (cube);
+
+			players.Remove (change.path ["id"]);
+		}
 	}
 
 	void OnPlayerMove (DataChange change)
 	{
 		Debug.Log ("OnPlayerMove");
 		Debug.Log ("playerId: " + change.path["id"] + ", Axis: " + change.path["axis"]);
 		Debug.Log (change.value);
+
+		GameObject cube;
+		players.TryGetValue (change.path ["id"], out cube);
+
+		cube.transform.Translate (new Vector3 (Convert.ToSingle(change.value), 0, 0));
 	}
 
 	void OnPlayerRemoved (DataChange change)
@@ -115,11 +163,6 @@ void OnChangeFallback (PatchObject change)
 		// Debug.Log (change.value);
 	}
 
-	void OnUpdateHandler (object sender, RoomUpdateEventArgs e)
-	{
-		// Debug.Log(e.state);
-	}
-
 	void OnApplicationQuit()
 	{
 		// Ensure the connection with server is closed immediatelly

Assets/Player.prefab

@@ -200,8 +200,12 @@ public static byte[] Apply(byte[] origin, byte[] delta) {
 
 				case ';':
 					byte[] output = zOut.ToArray ();
-					if (cnt != Checksum (output))
-						throw new Exception("bad checksum");
+					//
+					// Checksum is optional (2017-10-05)
+					// http://fossil-scm.org/xfer/info/d3a46b2a45b92bbc
+					//
+					//if (cnt != Checksum (output))
+					//	throw new Exception("bad checksum");
 					if (total != limit)
 						throw new Exception("generated size does not match predicted size");
 					return output;

Assets/Plugins/FossilDelta/Delta.cs

@@ -34,9 +34,12 @@ internal static class GettersAndSetters
 
 		static GettersAndSetters()
 		{
+#if ((UNITY_WEBGL || UNITY_IOS || ENABLE_IL2CPP) && !UNITY_EDITOR)
+			AotRuntime = true;
+#else
 			try { Expression.Lambda<Func<bool>>(Expression.Constant(true)).Compile(); }
 			catch (Exception) { AotRuntime = true; }
-
+#endif
 			ReadFunctions = new Dictionary<MemberInfo, Func<object, object>>();
 			WriteFunctions = new Dictionary<MemberInfo, Action<object, object>>();
 			ConstructorFunctions = new Dictionary<MemberInfo, Func<object>>();
@@ -108,7 +111,6 @@ public static bool TryGetAssessors(FieldInfo fieldInfo, out Func<object, object>
 			if (AotRuntime || fieldInfo.IsStatic)
 				return false;
 
-
 			lock (ReadFunctions)
 			{
 				if (ReadFunctions.TryGetValue(fieldInfo, out getFn) == false)

Assets/Plugins/GameDevWare.Serialization/Metadata/ReflectionUtils.cs

@@ -1,4 +1,4 @@
-/* 
+/* 
 	Copyright (c) 2016 Denis Zykov, GameDevWare.com
 
 	This a part of "Json & MessagePack Serialization" Unity Asset - https://www.assetstore.unity3d.com/#!/content/59918
@@ -18,6 +18,7 @@ to use it in your project you should accept Terms of Service and EULA
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Serialization;
 using System.Text;
 using GameDevWare.Serialization.Serializers;
 

Assets/Plugins/GameDevWare.Serialization/SerializationContext.cs

@@ -1,4 +1,4 @@
-/* 
+/* 
 	Copyright (c) 2016 Denis Zykov, GameDevWare.com
 
 	This a part of "Json & MessagePack Serialization" Unity Asset - https://www.assetstore.unity3d.com/#!/content/59918
@@ -27,6 +27,7 @@ public class ObjectSerializer : TypeSerializer
 		public const string TYPE_MEMBER_NAME = "_type";
 
 		private static readonly Regex VersionRegEx = new Regex(@", Version=[^\]]+", RegexOptions.None);
+		private static readonly string BclTypePart = typeof(byte).AssemblyQualifiedName.Substring(typeof(byte).FullName.Length);
 
 		private readonly Type objectType;
 		private readonly string objectTypeNameWithoutVersion;
@@ -57,7 +58,7 @@ public ObjectSerializer(SerializationContext context, Type type)
 				this.baseTypeSerializer = (ObjectSerializer)baseSerializer;
 			}
 
-		    this.objectTypeDescription = TypeDescription.Get(type);
+			this.objectTypeDescription = TypeDescription.Get(type);
 		}
 
 		public override object Deserialize(IJsonReader reader)
@@ -145,7 +146,17 @@ private object DeserializeMembers(IJsonReader reader, IndexedDictionary<string,
 				{
 					reader.NextToken();
 					var typeName = reader.ReadString(false);
-					var type = reader.Context.GetType(typeName, true, true);
+					var type = default(Type);
+					try
+					{
+						type = reader.Context.GetType(typeName, true, true);
+					}
+					catch (Exception getTypeError)
+					{
+						throw new SerializationException(string.Format("Failed to resolve type '{0}' of value for '{1}' of '{2}' type.\r\n" +
+							"More detailed information in inner exception.", typeName, memberName, this.objectType.Name), getTypeError);
+					}
+
 					if (type == typeof(object))
 					{
 						this.DeserializeMembers(reader, container, ref serializerOverride);
@@ -283,12 +294,15 @@ public static string GetVersionInvariantObjectTypeName(Type type)
 		{
 			if (type == null) throw new ArgumentNullException("type");
 
-			return VersionRegEx.Replace(type.AssemblyQualifiedName ?? type.FullName, string.Empty);
+			var fullName = (type.AssemblyQualifiedName ?? type.FullName ?? type.Name);
+			fullName = VersionRegEx.Replace(fullName, string.Empty);
+			fullName = fullName.Replace(BclTypePart, ""); // remove BCL path of type information for better interop compatibility
+			return fullName;
 		}
 
 		public override string ToString()
 		{
-			return string.Format("object, {0}", objectType);
+			return string.Format("object, {0}", this.objectType);
 		}
 	}
 }

Assets/Plugins/GameDevWare.Serialization/Serializers/ObjectSerializer.cs

@@ -1 +1 @@
-m_EditorVersion: 5.6.2f1
+m_EditorVersion: 2017.1.1f1

ProjectSettings/ProjectSettings.asset

@@ -24,24 +24,24 @@ class ChatRoom extends Room {
   }
 
   onJoin (client) {
-    console.log("client joined!", client.id);
-    this.state.players[client.id] = { x: 0, y: 0 };
+    console.log("client joined!", client.sessionId);
+    this.state.players[client.sessionId] = { x: 0, y: 0 };
   }
 
   onLeave (client) {
-    console.log("client left!", client.id);
-    delete this.state.players[client.id];
+    console.log("client left!", client.sessionId);
+    delete this.state.players[client.sessionId];
   }
 
   onMessage (client, data) {
-    console.log(data, "received from", client.id);
-    this.state.messages.push(client.id + " sent " + data);
+    console.log(data, "received from", client.sessionId);
+    this.state.messages.push(client.sessionId + " sent " + data);
   }
 
   update () {
     console.log("num clients:", Object.keys(this.clients).length);
-    for (var id in this.state.players) {
-      this.state.players[id].x++;
+    for (var sessionId in this.state.players) {
+      this.state.players[sessionId].x += 0.0001;
     }
   }
 

ProjectSettings/ProjectVersion.txt

@@ -1,21 +1,29 @@
-"use strict";
+const cluster = require("cluster");
+const express = require("express");
 
-var colyseus = require('colyseus')
-  , http = require('http')
+const ClusterServer = require("colyseus").ClusterServer;
+const ChatRoom = require('./chat_room');
 
-  , express = require('express')
-  // , cors = require('cors')
+const PORT = process.env.PORT || 3553;
+const gameServer = new ClusterServer();
 
-  , port = process.env.PORT || 3553
-  , app = express()
-  , server = http.createServer(app)
-  , gameServer = new colyseus.Server({ server: server })
+// Register ChatRoom as "chat"
+gameServer.register("chat", ChatRoom);
 
-  , ChatRoom = require('./chat_room');
+if (cluster.isMaster) {
+    gameServer.listen(PORT);
+    gameServer.fork();
 
-gameServer.register('chat', ChatRoom)
+} else {
+    let app = new express();
 
-app.use(express.static( __dirname ))
-gameServer.listen(port, '127.0.0.1');
+    app.get("/something", function (req, res) {
+        console.log("something!", process.pid);
+        res.send("Hey!");
+    });
 
-console.log(`Listening on http://localhost:${ port }`)
+    // Create HTTP Server
+    gameServer.attach({ server: app });
+}
+
+console.log("Listening on " + PORT);