anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

rm variable reconnect time

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-06-09 19:35:30 -03:00
commit be7e122b0a
4 changed files with 22 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

36
config.js
View file

@ -42,26 +42,26 @@ var defaultConfig = {
config: { config: {
'iceServers': [ 'iceServers': [
// Pass in STUN and TURN servers for maximum network compatibility // Pass in STUN and TURN servers for maximum network compatibility
{
url: 'stun:162.242.219.26'
}, {
url: 'turn:162.242.219.26',
username: 'bitcore',
credential: 'bitcore',
}
// { // {
// url: 'stun:stun.l.google.com:19302' // url: 'stun:162.242.219.26'
// }, { // }, {
// url: 'stun:stun1.l.google.com:19302' // url: 'turn:162.242.219.26',
// }, { // username: 'bitcore',
// url: 'stun:stun2.l.google.com:19302' // credential: 'bitcore',
// }, {
// url: 'stun:stun3.l.google.com:19302'
// }, {
// url: 'stun:stun4.l.google.com:19302'
// }, {
// url: 'stun:stunserver.org'
// } // }
{
url: 'stun:stun.l.google.com:19302'
}, {
url: 'stun:stun1.l.google.com:19302'
}, {
url: 'stun:stun2.l.google.com:19302'
}, {
url: 'stun:stun3.l.google.com:19302'
}, {
url: 'stun:stun4.l.google.com:19302'
}, {
url: 'stun:stunserver.org'
}
// // Options fot TURN servers with p2p communications are not possible. // // Options fot TURN servers with p2p communications are not possible.
// { // {
// url: 'turn:numb.viagenie.ca', // url: 'turn:numb.viagenie.ca',
@ -86,7 +86,7 @@ var defaultConfig = {
totalCopayers: 3, totalCopayers: 3,
spendUnconfirmed: 1, spendUnconfirmed: 1,
verbose: 1, verbose: 1,
reconnectDelay: 500, reconnectDelay: 5000,
}, },
// blockchain service API config // blockchain service API config

4
js/models/core/Wallet.js
View file

@ -164,7 +164,6 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
Wallet.prototype._handleConnect = function(newCopayerId) { Wallet.prototype._handleConnect = function(newCopayerId) {
if (newCopayerId) { if (newCopayerId) {
this.log('#### Setting new COPAYER:', newCopayerId); this.log('#### Setting new COPAYER:', newCopayerId);
this.currentDelay = null;
this.sendWalletId(newCopayerId); this.sendWalletId(newCopayerId);
} }
var peerID = this.network.peerFromCopayer(newCopayerId) var peerID = this.network.peerFromCopayer(newCopayerId)
@ -276,8 +275,7 @@ Wallet.prototype.scheduleConnect = function() {
var self = this; var self = this;
if (self.network.isOnline()) { if (self.network.isOnline()) {
self.connectToAll(); self.connectToAll();
self.currentDelay = self.currentDelay*2 || self.reconnectDelay; setTimeout(self.scheduleConnect.bind(self), self.reconnectDelay);
setTimeout(self.scheduleConnect.bind(self), self.currentDelay);
} }
} }

1
js/models/network/WebRTC.js
View file

@ -126,6 +126,7 @@ Network.prototype._onClose = function(peerID) {
Network.prototype.connectToCopayers = function(copayerIds) { Network.prototype.connectToCopayers = function(copayerIds) {
var self = this; var self = this;
var arrayDiff= Network._arrayDiff(copayerIds, this.connectedCopayers()); var arrayDiff= Network._arrayDiff(copayerIds, this.connectedCopayers());
console.log('[WebRTC.js.128:arrayDiff:]',arrayDiff); //TODO
arrayDiff.forEach(function(copayerId) { arrayDiff.forEach(function(copayerId) {
if (this.allowedCopayerIds && !this.allowedCopayerIds[copayerId]) { if (this.allowedCopayerIds && !this.allowedCopayerIds[copayerId]) {

14
test/test.Wallet.js
View file

@ -238,23 +238,13 @@ describe('Wallet model', function() {
throw (); throw ();
}); });
it('call reconnect after interval', function(done) { it.only('call reconnect after interval', function(done) {
var w = createW2(); var w = createW2();
var testTime = 1000; var testTime = 1000;
var callCount = 0;
var cT = w.reconnectDelay;
var t = 0;
do {
callCount++;
t += cT;
cT *= 2;
} while (t < testTime);
var spy = sinon.spy(w, 'scheduleConnect'); var spy = sinon.spy(w, 'scheduleConnect');
w.netStart(); w.netStart();
setTimeout(function() { setTimeout(function() {
sinon.assert.callCount(spy, callCount); sinon.assert.callCount(spy, 10);
done(); done();
}, testTime); }, testTime);
}); });