adds PublicKeyRing syncing to the new classes schema
This commit is contained in:
Matias Alejo Garcia
parent
12e30a5e63
commit
9eadda0ed3
6 changed files with 269 additions and 125 deletions
|
|
@ -3,100 +3,160 @@
|
|||
angular.module('copay.network')
|
||||
.factory('Network', function($rootScope, Storage) {
|
||||
var peer;
|
||||
// $rootScope.connectedPeers = [];
|
||||
// $rootScope.peerId = null;
|
||||
|
||||
// case 'publicKeyRing':
|
||||
// console.log('### RECEIVED PKR FROM:', obj.sender);
|
||||
|
||||
// if ($rootScope.publicKeyRing.merge(obj.data.publicKeyRing, true)) {
|
||||
// //TODO Remove log
|
||||
// console.log('### BROADCASTING PRK');
|
||||
// _send( $rootScope.connectedPeers, {
|
||||
// type: 'publicKeyRing',
|
||||
// publicKeyRing: $rootScope.publicKeyRing.toObj(),
|
||||
// isBroadcast: 1,
|
||||
// });
|
||||
// $rootScope.$digest();
|
||||
// }
|
||||
// else if (!isOutbound && !obj.data.isBroadcast) {
|
||||
// // replying always to connecting peer
|
||||
// console.log('### REPLYING PRK TO:', obj.sender );
|
||||
// _send( obj.sender, {
|
||||
// type: 'publicKeyRing',
|
||||
// publicKeyRing: $rootScope.publicKeyRing.toObj(),
|
||||
// });
|
||||
|
||||
// }
|
||||
|
||||
// //TODO Remove log
|
||||
// console.log('*** PRK:', $rootScope.publicKeyRing.toObj());
|
||||
// break;
|
||||
// }
|
||||
|
||||
// // TODO
|
||||
// $rootScope.publicKeyRing = new copay.PublicKeyRing({
|
||||
// network: config.networkName,
|
||||
// });
|
||||
// $rootScope.publicKeyRing.addCopayer();
|
||||
// console.log('### PublicKeyRing Initialized');
|
||||
//
|
||||
// //
|
||||
|
||||
// console.log('#### SENDING PKR ');
|
||||
// _send(dataConn.peer, {
|
||||
// type: 'publicKeyRing',
|
||||
// publicKeyRing: $rootScope.publicKeyRing.toObj(),
|
||||
// });
|
||||
|
||||
// if (typeof cb === 'function') cb();
|
||||
//
|
||||
// $rootScope.$digest();
|
||||
// });
|
||||
|
||||
|
||||
var _refreshUx = function() {
|
||||
var cp = $rootScope.cp;
|
||||
console.log('*** UPDATING UX'); //TODO
|
||||
$rootScope.peerId = cp.peerId;
|
||||
$rootScope.connectedPeers = cp.connectedPeers;
|
||||
$rootScope.$digest();
|
||||
};
|
||||
|
||||
var _store = function() {
|
||||
Storage.set($rootScope.walletId, 'peerData', {
|
||||
peerId: $rootScope.peerId,
|
||||
connectedPeers: $rootScope.connectedPeers
|
||||
});
|
||||
};
|
||||
|
||||
// set new inbound connections
|
||||
var _setNewPeer = function(newPeer) {
|
||||
var cp = $rootScope.cp;
|
||||
console.log('#### SENDING PKR 1111 ');
|
||||
cp.send(newPeer, {
|
||||
type: 'publicKeyRing',
|
||||
publicKeyRing: $rootScope.publicKeyRing.toObj(),
|
||||
});
|
||||
};
|
||||
|
||||
var _handleNetworkChange = function(newPeer) {
|
||||
var cp = $rootScope.cp;
|
||||
|
||||
if (newPeer)
|
||||
_setNewPeer(newPeer);
|
||||
|
||||
_store();
|
||||
_refreshUx();
|
||||
};
|
||||
|
||||
// TODO -> probably not in network.js
|
||||
var createWallet = function(walletId) {
|
||||
console.log('### CREATING WALLET. ID:' + walletId);
|
||||
|
||||
//TODO create a wallet and WalletId, not only pkr
|
||||
var pkr = new copay.PublicKeyRing({
|
||||
network: config.networkName,
|
||||
id: walletId,
|
||||
});
|
||||
pkr.addCopayer();
|
||||
console.log('\t### PublicKeyRing Initialized:');
|
||||
Storage.addWalletId(pkr.id);
|
||||
Storage.set(pkr.id, 'publicKeyRing', pkr.toObj());
|
||||
|
||||
$rootScope.walletId = pkr.id;
|
||||
$rootScope.publicKeyRing = pkr;
|
||||
};
|
||||
|
||||
var openWallet = function (walletId) {
|
||||
var ret = false;
|
||||
var pkr = Storage.get(walletId, 'publicKeyRing');
|
||||
|
||||
if (pkr) {
|
||||
console.log('### WALLET OPENED:', walletId, pkr);
|
||||
$rootScope.walletId = walletId;
|
||||
$rootScope.publicKeyRing = new copay.PublicKeyRing.fromObj(pkr);
|
||||
ret = true;
|
||||
}
|
||||
return ret;
|
||||
};
|
||||
|
||||
var closeWallet = function() {
|
||||
console.log('### CLOSING WALLET');
|
||||
$rootScope.walletId = null;
|
||||
$rootScope.publicKeyRing = null;
|
||||
//TODO
|
||||
};
|
||||
|
||||
var _checkWallet = function(walletId) {
|
||||
console.log('[network.js.79:_checkWallet:]',walletId); //TODO
|
||||
|
||||
if ($rootScope.walletId && $rootScope.walletId !== walletId)
|
||||
closeWallet();
|
||||
|
||||
if ($rootScope.walletId)
|
||||
return;
|
||||
|
||||
if (!openWallet(walletId)) {
|
||||
createWallet(walletId);
|
||||
}
|
||||
};
|
||||
|
||||
var _handleData = function(senderId, data, isInbound) {
|
||||
var cp = $rootScope.cp;
|
||||
|
||||
switch(data.type) {
|
||||
case 'publicKeyRing':
|
||||
|
||||
console.log('[network.js.91:data:]',data); //TODO
|
||||
|
||||
_checkWallet(data.publicKeyRing.id);
|
||||
var shouldSend = false;
|
||||
|
||||
var recipients, pkr = $rootScope.publicKeyRing;
|
||||
console.log('### RECEIVED PKR FROM:', senderId);
|
||||
if (pkr.merge(data.publicKeyRing, true) && !data.isBroadcast) {
|
||||
console.log('### BROADCASTING PKR');
|
||||
recipients = null;
|
||||
shouldSend = true;
|
||||
}
|
||||
else if (isInbound && !data.isBroadcast) {
|
||||
// always replying to connecting peer
|
||||
console.log('### REPLYING PKR TO:', senderId);
|
||||
recipients = senderId;
|
||||
shouldSend = true;
|
||||
}
|
||||
|
||||
if (shouldSend) {
|
||||
console.log('### SENDING PKR TO:', recipients);
|
||||
cp.send( recipients, {
|
||||
type: 'publicKeyRing',
|
||||
publicKeyRing: $rootScope.publicKeyRing.toObj(),
|
||||
});
|
||||
}
|
||||
|
||||
console.log('[network.js.126] END'); //TODO
|
||||
_refreshUx();
|
||||
break;
|
||||
}
|
||||
};
|
||||
var _setupHandlers = function () {
|
||||
var cp = $rootScope.cp;
|
||||
cp.on('networkChange', _handleNetworkChange);
|
||||
cp.on('data', _handleData);
|
||||
};
|
||||
|
||||
// public methods
|
||||
var init = function(cb) {
|
||||
|
||||
var opts = {
|
||||
//peerId: <stored>
|
||||
var cp = $rootScope.cp = new copay.CopayPeer({
|
||||
apiKey: config.p2pApiKey,
|
||||
debug: config.p2pDebug,
|
||||
};
|
||||
var cp = $rootScope.cp = new copay.CopayPeer(opts);
|
||||
|
||||
cp.on('update', function() {
|
||||
|
||||
console.log('*** UPDATING UX'); //TODO
|
||||
|
||||
$rootScope.peerId = cp.peerId;
|
||||
$rootScope.connectedPeers = cp.connectedPeers;
|
||||
|
||||
Storage.set('peerData', {
|
||||
peerId: $rootScope.peerId,
|
||||
connectedPeers: $rootScope.connectedPeers
|
||||
});
|
||||
|
||||
$rootScope.$digest();
|
||||
});
|
||||
});
|
||||
_setupHandlers();
|
||||
|
||||
// inicia session
|
||||
cp.start(function(peerId) {
|
||||
console.log('[kkkk.7] START: SOY', peerId); //TODO
|
||||
// networkPubKeyRing.setUpHandlers(cp);
|
||||
// networkTransactionProposal.setUpHandlers(cp);
|
||||
return cb();
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
var connect = function(peerId, cb) {
|
||||
$rootScope.cp.connectTo(peerId, function(id) {
|
||||
console.log('CONNECTTO CALLBACK SOY:', id); //TODO
|
||||
if ($rootScope.cp) {
|
||||
$rootScope.cp.connectTo(peerId, cb);
|
||||
}
|
||||
else
|
||||
return cb();
|
||||
});
|
||||
};
|
||||
|
||||
var disconnect = function(cb) {
|
||||
|
|
@ -109,7 +169,9 @@ angular.module('copay.network')
|
|||
return {
|
||||
init: init,
|
||||
connect: connect,
|
||||
disconnect: disconnect
|
||||
disconnect: disconnect,
|
||||
createWallet: createWallet,
|
||||
openWallet: openWallet,
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -2,21 +2,63 @@
|
|||
|
||||
angular.module('copay.storage')
|
||||
.factory('Storage', function($rootScope) {
|
||||
|
||||
|
||||
var _key = function(walletId, key) {
|
||||
return walletId + '::' + key;
|
||||
};
|
||||
|
||||
var _pushKey = function(walletId, key) {
|
||||
var keys = localStorage.getItem(walletId);
|
||||
localStorage.setItem(walletId, (keys?keys+',':'') +key);
|
||||
};
|
||||
|
||||
return {
|
||||
get: function(key) {
|
||||
getGlobal: function( key) {
|
||||
return JSON.parse(localStorage.getItem(key));
|
||||
},
|
||||
|
||||
set: function(key, data) {
|
||||
setGlobal: function( key, data) {
|
||||
localStorage.setItem(key, JSON.stringify(data));
|
||||
},
|
||||
|
||||
remove: function(key) {
|
||||
localStorage.removeItem(key);
|
||||
get: function(walletId, key) {
|
||||
if (!walletId) return;
|
||||
return JSON.parse(localStorage.getItem(_key(walletId,key)));
|
||||
},
|
||||
set: function(walletId, key, data) {
|
||||
if (!walletId) return;
|
||||
var k = _key(walletId,key);
|
||||
localStorage.setItem(k, JSON.stringify(data));
|
||||
_pushKey(walletId, k);
|
||||
},
|
||||
remove: function(walletId, key) {
|
||||
localStorage.removeItem(_key(walletId,key));
|
||||
},
|
||||
clearAll: function(walletId){
|
||||
var keys = localStorage.getItem(walletId);
|
||||
keys.split(',').forEach(function(k){
|
||||
localStorage.removeItem(key);
|
||||
});
|
||||
},
|
||||
addWalletId: function(walletId) {
|
||||
var ids = localStorage.getItem('walletIds');
|
||||
localStorage.setItem('walletIds', (ids?ids+',':'') + walletId);
|
||||
},
|
||||
delWalletId: function(walletId) {
|
||||
var ids = localStorage.getItem('walletIds');
|
||||
if (ids) {
|
||||
var is = ids.split(',');
|
||||
var newIds = [];
|
||||
is.forEach(function(i) {
|
||||
if (i != walletId) {
|
||||
newIds.push(i);
|
||||
}
|
||||
});
|
||||
localStorage.setItem('walletIds', newIds.join(',') );
|
||||
}
|
||||
},
|
||||
getWalletIds: function() {
|
||||
var ids = localStorage.getItem('walletIds');
|
||||
return ids ? ids.split(',') : [];
|
||||
},
|
||||
|
||||
clearAll: function() {
|
||||
localStorage.clear();
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue