fix compatibility with server

Author: Eric Andrews

streamr-client.js

@@ -3,7 +3,6 @@
 (function() {
 
 	var debug
-	var WebSocket
 	if (typeof window !== 'undefined') {
 		debug = (window.debug ? window.debug('StreamrClient') : function() {
 			if (window.consoleLoggingEnabled)
@@ -12,7 +11,6 @@
 	}
 	else {
 		debug = require('debug')('StreamrClient')
-		WebSocket = require('ws')
 	}
 
 	var BYE_KEY = "_bye"
@@ -363,33 +361,28 @@
 		},
 
 		decodeMessage: function(type, message) {
-			if (typeof message === 'string') {
-				message = JSON.parse(message)
-			}
-
-			// Stream content needs to be decoded further
 			if (type === 'b' || type === 'u') {
 				if (this.versionFields[message[0]] === undefined) {
 					throw "Unsupported version: " + message[0]
-				} else {
-					var result = {}
-					var fields = this.versionFields[message[0]]
-					var contentType
-					for (var i = 0; i < message.length; i++) {
-
-						// Parse content if necessary
-						if (fields[i] === 'content') {
-							if (result.contentType === this.CONTENT_TYPE_JSON) {
-								message[i] = JSON.parse(message[i])
-							} else {
-								throw "Unknown content type: " + result.contentType
-							}
-						}
+				}
+				var result = {}
+				var fields = this.versionFields[message[0]]
+
+				for (var i = 0; i < message.length; i++) {
+
+					// Parse content if necessary
+					if (fields[i] === 'content') {
+						if (result.contentType === this.CONTENT_TYPE_JSON) {
 
-						result[fields[i]] = message[i]
+							message[i] = JSON.parse(message[i])
+						} else {
+							throw "Unknown content type: " + result.contentType
+						}
 					}
-					return result
+
+					result[fields[i]] = message[i]
 				}
+				return result
 			} else {
 				return message
 			}
@@ -1042,4 +1035,4 @@
 		module.exports = StreamrClient
 	else window.StreamrClient = StreamrClient
 
-})(typeof(exports) !== 'undefined' ? exports : window)
+})(typeof(exports) !== 'undefined' ? exports : window)

test/test.streamr-client.js

@@ -47,7 +47,7 @@ describe('StreamrClient', function() {
 
 		// unicast message to subscription
 		if (subId != null) {
-			return JSON.stringify([
+			return [
 				28, // version
 				streamId,
 				0, // partition
@@ -56,14 +56,14 @@ describe('StreamrClient', function() {
 				offset,
 				forcePreviousOffset, // previousOffset
 				27, // contentType (JSON)
-				JSON.stringify(content)])
+				JSON.stringify(content)]
 		}
 		// broadcast message to all subscriptions
 		else {
 			var previousOffset = forcePreviousOffset || previousOffsetByStreamId[streamId]
 			previousOffsetByStreamId[streamId] = offset
 
-			return JSON.stringify([
+			return [
 				28, // version
 				streamId,
 				0, // partition
@@ -72,7 +72,7 @@ describe('StreamrClient', function() {
 				offset,
 				previousOffset !== offset ? previousOffset : null,
 				27, // contentType (JSON)
-				JSON.stringify(content)])
+				JSON.stringify(content)]
 		}
 	}
 
@@ -160,6 +160,7 @@ describe('StreamrClient', function() {
 			return socket
 		});
 
+		global.WebSocket = require('ws')
 		StreamrClient = require('../streamr-client')
 	})