Allow message and presencemessage to work without data

ably · May 11, 2015 · 440f4ec · paddybyers · May 12, 2015 · SimonWoolf
1 parent c1c7606
commit 440f4ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/common/lib/client/presence.js b/common/lib/client/presence.js
@@ -23,7 +23,7 @@ var Presence = (function() {
 	Presence.prototype.enterClient = function(clientId, data, callback) {
 		if (!callback && (typeof(data)==='function')) {
 			callback = data;
-			data = '';
+			data = null;
 		}
 		Logger.logAction(Logger.LOG_MICRO, 'Presence.enterClient()', 'entering; channel = ' + this.channel.name + ', client = ' + clientId);
 		var presence = PresenceMessage.fromValues({

diff --git a/common/lib/types/message.js b/common/lib/types/message.js
@@ -24,11 +24,11 @@ var Message = (function() {
 			encoding: this.encoding
 		};
 
-		/* encode to base64 if we're returning real JSON;
+		/* encode data to base64 if present and we're returning real JSON;
 		 * although msgpack calls toJSON(), we know it is a stringify()
 		 * call if it has a non-empty arguments list */
 		var data = this.data;
-		if(arguments.length > 0 && BufferUtils.isBuffer(data)) {
+		if(data && arguments.length > 0 && BufferUtils.isBuffer(data)) {
 			var encoding = this.encoding;
 			result.encoding = encoding ? (encoding + '/base64') : 'base64';
 			data = BufferUtils.base64Encode(data);
@@ -78,10 +78,12 @@ var Message = (function() {
 	};
 
 	Message.encode = function(msg, options) {
-		var data = msg.data, encoding;
-		if(typeof(data) != 'string' && !BufferUtils.isBuffer(data)) {
-			msg.data = JSON.stringify(data);
-			msg.encoding = (encoding = msg.encoding) ? (encoding + '/json') : 'json';
+		if(msg.data){
+			var data = msg.data, encoding;
+			if(typeof(data) != 'string' && !BufferUtils.isBuffer(data)) {
+				msg.data = JSON.stringify(data);
+				msg.encoding = (encoding = msg.encoding) ? (encoding + '/json') : 'json';
+			}
 		}
 		if(options != null && options.encrypted)
 			Message.encrypt(msg, options);

diff --git a/common/lib/types/presencemessage.js b/common/lib/types/presencemessage.js
@@ -36,7 +36,7 @@ var PresenceMessage = (function() {
 		 * although msgpack calls toJSON(), we know it is a stringify()
 		 * call if it passes on the stringify arguments */
 		var data = this.data;
-		if(arguments.length > 0 && BufferUtils.isBuffer(data)) {
+		if(data && arguments.length > 0 && BufferUtils.isBuffer(data)) {
 			var encoding = this.encoding;
 			result.encoding = encoding ? (encoding + '/base64') : 'base64';
 			data = data.toString('base64');