client has its own ws now. examples fixed (#11)

Author: aapzu

examples/browser.html

@@ -26,23 +26,23 @@
 			)
 
 			// Event binding examples
-			client.bind('connected', function() {
+			client.on('connected', function() {
 				log('A connection has been established!')
 			})
 
-			subscription.bind('subscribed', function() {
+			subscription.on('subscribed', function() {
 				log('Subscribed to '+subscription.streamId)
 			})
 
-			subscription.bind('resending', function() {
+			subscription.on('resending', function() {
 				log('Resending from '+subscription.streamId)
 			})
 
-			subscription.bind('resent', function() {
+			subscription.on('resent', function() {
 				log('Resend complete for '+subscription.streamId)
 			})
 
-			subscription.bind('no_resend', function() {
+			subscription.on('no_resend', function() {
 				log('Nothing to resend for '+subscription.streamId)
 			})
 		</script>

examples/node.js

@@ -20,22 +20,22 @@ var subscription = client.subscribe(
 )
 
 // Event binding examples
-client.bind('connected', function() {
+client.on('connected', function() {
 	console.log('A connection has been established!')
 })
 
-subscription.bind('subscribed', function() {
+subscription.on('subscribed', function() {
 	console.log('Subscribed to '+subscription.streamId)
 })
 
-subscription.bind('resending', function() {
+subscription.on('resending', function() {
 	console.log('Resending from '+subscription.streamId)
 })
 
-subscription.bind('resent', function() {
+subscription.on('resent', function() {
 	console.log('Resend complete for '+subscription.streamId)
 })
 
-subscription.bind('no_resend', function() {
+subscription.on('no_resend', function() {
 	console.log('Nothing to resend for '+subscription.streamId)
 })

package.json

@@ -17,7 +17,8 @@
   "license": "",
   "dependencies": {
     "debug": "*",
-    "eventemitter3": "*"
+    "eventemitter3": "*",
+    "ws": "^3.0.0"
   },
   "devDependencies": {
     "mocha": "*",

streamr-client.js

@@ -3,14 +3,20 @@
 (function() {
 
 	var debug
-	if (typeof window !== 'undefined') {
+	if (typeof module !== 'undefined') {
+		debug = require('debug')('StreamrClient')
+	} else {
 		debug = (window.debug ? window.debug('StreamrClient') : function() {
 			if (window.consoleLoggingEnabled)
 				console.log.apply(console, arguments)
 		})
 	}
-	else {
-		debug = require('debug')('StreamrClient')
+	
+	var WebSocket
+	if (typeof module !== 'undefined') {
+		WebSocket = require('ws')
+	} else {
+		WebSocket = window.WebSocket
 	}
 
 	var BYE_KEY = "_bye"

test/test.streamr-client.js

@@ -160,7 +160,6 @@ describe('StreamrClient', function() {
 			return socket
 		});
 
-		global.WebSocket = require('ws')
 		StreamrClient = require('../streamr-client')
 	})