From 7c14706e9261bf470e1e023b92400f49ab4db793 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Thu, 7 Aug 2014 18:55:13 -0300 Subject: [PATCH] add socket.io-browserify --- js/models/network/Async.js | 7 ++++--- package.json | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/js/models/network/Async.js b/js/models/network/Async.js index 1558abddc..e779480fa 100644 --- a/js/models/network/Async.js +++ b/js/models/network/Async.js @@ -6,7 +6,7 @@ var bitcore = require('bitcore'); var AuthMessage = bitcore.AuthMessage; var util = bitcore.util; var extend = require('util')._extend; -var io = require('socket.io-client'); +var io = require('socket.io-browserify'); var preconditions = require('preconditions').singleton(); /* @@ -244,6 +244,7 @@ Network.prototype._setupConnectionHandlers = function() { preconditions.checkState(this.socket); var self = this; + alert('setup'); self.socket.on('connect', function() { alert('CONNECTED!'); self.socket.on('disconnect', function() { @@ -295,7 +296,6 @@ Network.prototype.peerFromCopayer = function(hex) { }; Network.prototype.start = function(opts, openCallback) { - alert('start'); opts = opts || {}; if (this.started) return openCallback(); @@ -318,7 +318,8 @@ Network.prototype.start = function(opts, openCallback) { } this.socket = io.connect(this.host, { - port: this.port + port: this.port, + reconnection: false }); this.socket.emit('subscribe', this.getKey().public.toString('hex')); this.socket.emit('sync'); diff --git a/package.json b/package.json index 74fa2d40d..d256ffbab 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "mocha-lcov-reporter": "0.0.1", "optimist": "^0.6.1", "preconditions": "^1.0.7", - "sinon": "1.9.1" + "sinon": "1.9.1", + "socket.io-browserify": "^0.9.6" }, "scripts": { "shell": "node shell/scripts/launch.js",