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

options for running with local peerJs server. Ux fixes

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-04-17 16:27:15 -03:00
commit 1e64031ec3
7 changed files with 85 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,8 +96,11 @@ Wallet.prototype._handleTxProposals = function(senderId, data, isInbound) {
Wallet.prototype._handleData = function(senderId, data, isInbound) {
if (this.id !== data.walletId)
throw new Error('wrong message received: Bad wallet ID');
if (this.id !== data.walletId) {
this.emit('badMessage',senderId);
this.log('badMessage FROM:', senderId); //TODO
return;
}
this.log('[Wallet.js.98]' , data.type); //TODO
@ -108,18 +111,16 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
case 'txProposals':
this._handleTxProposals(senderId, data, isInbound);
break;
case 'abort':
this.emit('abort');
break;
}
};
Wallet.prototype._handleNetworkChange = function(newPeer) {
if (!newPeer) return;
this.log('#### Setting new PEER:', newPeer);
this.sendWalletId(newPeer);
this.sendPublicKeyRing(newPeer);
this.sendTxProposals(newPeer);
if (newPeer) {
this.log('#### Setting new PEER:', newPeer);
this.sendWalletId(newPeer);
this.sendPublicKeyRing(newPeer);
this.sendTxProposals(newPeer);
}
this.emit('refresh');
};
@ -129,7 +130,13 @@ Wallet.prototype.netStart = function() {
net.on('networkChange', self._handleNetworkChange.bind(self) );
net.on('data', self._handleData.bind(self) );
net.on('open', function() {}); // TODO
net.on('close', function() {}); // TODO
net.on('openError', function() {
console.log('[Wallet.js.132:openError:] GOT openError'); //TODO
self.emit('openError');
});
net.on('close', function() {
self.emit('close');
});
net.start(function(peerId) {
self.emit('created');
});
@ -185,6 +192,7 @@ Wallet.prototype.sendPublicKeyRing = function(recipients) {
this.emit('publicKeyRingUpdated', this.publicKeyRing);
};
Wallet.prototype.generateAddress = function() {
var addr = this.publicKeyRing.generateAddress();
this.store();

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

@ -21,6 +21,12 @@ function Network(opts) {
this.apiKey = opts.apiKey || 'lwjd5qra8257b9';
this.debug = opts.debug || 3;
this.maxPeers = opts.maxPeers || 5;
// For using your own peerJs server
this.port = opts.port;
this.host = opts.host;
this.path = opts.path;
this.connectedPeers = [];
}
@ -150,14 +156,17 @@ Network.prototype._setupConnectionHandlers = function(dataConn, isInbound) {
dataConn.on('error', function(e) {
console.log('### DATA ERROR',e ); //TODO
self.emit('openError');
});
dataConn.on('close', function() {
if (self.closing) return;
self.closing=1;
console.log('### CLOSE RECV FROM:', dataConn.peer);
self._onClose(dataConn.peer);
this.emit('close');
if (! isInbound) {
console.log('[WebRTC.js.163] EMIT openError'); //TODO
self.emit('openError');
}
});
};
@ -182,7 +191,7 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
self.peer.disconnect();
self.peer.destroy();
self.peer = null;
this.emit('abort');
self.emit('openError');
});
p.on('connection', function(dataConn) {
@ -207,6 +216,9 @@ Network.prototype.start = function(openCallback) {
this.peer = new Peer(this.peerId, {
key: this.apiKey, // TODO: we need our own PeerServer KEY (http://peerjs.com/peerserver)
host: this.host,
port: this.port,
path: this.path,
debug: this.debug,
});
@ -234,6 +246,7 @@ Network.prototype._sendToOne = function(peerId, data, cb) {
Network.prototype.send = function(peerIds, data, cb) {
var self=this;
console.log('[WebRTC.js.242] SENDING ', data.type); //TODO
if (!peerIds) {
peerIds = this.connectedPeers;
data.isBroadcast = 1;
@ -270,7 +283,6 @@ Network.prototype.connectTo = function(peerId) {
Network.prototype.disconnect = function(cb) {
var self = this;
self.closing = 1;
this.send(null, { type: 'disconnect' }, function() {
self.connectedPeers = [];
self.peerId = null;