From 8cf91d027ea75b76322c9b1acc103b36d36f8535 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 15 Apr 2014 14:28:49 -0300 Subject: [PATCH] add option to enable console.logs --- js/config.js | 8 +++++++- js/controllers/header.js | 3 --- js/models/core/Wallet.js | 20 +++++++++++++------- js/models/network/WebRTC.js | 10 +--------- js/models/storage/Plain.js | 2 -- js/services/network.js | 25 ++++++++++++------------- 6 files changed, 33 insertions(+), 35 deletions(-) diff --git a/js/config.js b/js/config.js index 5af0cc394..61e45f54b 100644 --- a/js/config.js +++ b/js/config.js @@ -5,7 +5,7 @@ var config = { network: { apiKey: 'lwjd5qra8257b9', maxPeers: 3, - debug: 3, + debug: 0, }, wallet: { requiredCopayers: 2, @@ -15,4 +15,10 @@ var config = { host: 'localhost', port: 3001 }, + verbose: 0, }; + +var log = function () { + if (config.verbose) console.log(arguments); +} + diff --git a/js/controllers/header.js b/js/controllers/header.js index 161181d6a..ed498cdc0 100644 --- a/js/controllers/header.js +++ b/js/controllers/header.js @@ -35,10 +35,7 @@ angular.module('copay.header').controller('HeaderController', }; $scope.signout = function() { - console.log('[header.js.37:signout:]'); //TODO - Network.disconnect(function() { - console.log('[header.js.41] disconnect CB'); //TODO $location.path('signin'); $rootScope.$digest(); }); diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index a5c6eb527..73ded4892 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -17,6 +17,12 @@ function Wallet(config) { this._startInterface(config); } +Wallet.prototype.log = function(){ + if (!this.verbose) return; + + console.this.log(arguments); +} + Wallet.prototype._startInterface = function(config) { this.storage = new Storage(config.storage); this.network = new Network(config.network); @@ -31,12 +37,12 @@ Wallet.prototype._startInterface = function(config) { Wallet.prototype.create = function(opts) { this.id = opts.id || Wallet.getRandomId(); - console.log('### CREATING NEW WALLET.' + (opts.id ? ' USING ID: ' + opts.id : ' NEW ID')); + this.log('### CREATING NEW WALLET.' + (opts.id ? ' USING ID: ' + opts.id : ' NEW ID')); this.privateKey = new copay.PrivateKey({ networkName: this.networkName }); - console.log('\t### PrivateKey Initialized'); + this.log('\t### PrivateKey Initialized'); this.publicKeyRing = new copay.PublicKeyRing({ walletId: this.id, @@ -46,14 +52,14 @@ Wallet.prototype.create = function(opts) { }); this.publicKeyRing.addCopayer(this.privateKey.getBIP32().extendedPublicKeyString()); - console.log('\t### PublicKeyRing Initialized WalletID: ' + this.publicKeyRing.walletId); + this.log('\t### PublicKeyRing Initialized WalletID: ' + this.publicKeyRing.walletId); this.txProposals = new copay.TxProposals({ walletId: this.id, publicKeyRing: this.publicKeyRing, networkName: this.networkName, }); - console.log('\t### TxProposals Initialized'); + this.log('\t### TxProposals Initialized'); }; @@ -86,7 +92,7 @@ Wallet.prototype.load = function(walletId) { this.privateKey.getBIP32().extendedPublicKeyString() ); } catch (e) { - console.log('NOT NECCESARY AN ERROR:', e); //TODO + this.log('NOT NECCESARY AN ERROR:', e); //TODO }; }; @@ -101,7 +107,7 @@ Wallet.prototype.store = function() { Wallet.prototype.sendTxProposals = function(recipients) { - console.log('### SENDING txProposals TO:', recipients||'All', this.txProposals); + this.log('### SENDING txProposals TO:', recipients||'All', this.txProposals); this.network.send( recipients, { type: 'txProposals', @@ -111,7 +117,7 @@ Wallet.prototype.sendTxProposals = function(recipients) { }; Wallet.prototype.sendPublicKeyRing = function(recipients) { - console.log('### SENDING publicKeyRing TO:', recipients||'All', this.publicKeyRing.toObj()); + this.log('### SENDING publicKeyRing TO:', recipients||'All', this.publicKeyRing.toObj()); this.network.send(recipients, { type: 'publicKeyRing', diff --git a/js/models/network/WebRTC.js b/js/models/network/WebRTC.js index 9350eea40..f3efa6895 100644 --- a/js/models/network/WebRTC.js +++ b/js/models/network/WebRTC.js @@ -63,7 +63,7 @@ Network._arrayRemove = function(el, array) { // DEBUG Network.prototype._showConnectedPeers = function() { - console.log("### CONNECTED PEERS", this.connectedPeers); +// console.log("### CONNECTED PEERS", this.connectedPeers); }; Network.prototype._onClose = function(peerId) { @@ -166,7 +166,6 @@ Network.prototype._setupConnectionHandlers = function( }; Network.prototype._notify = function(newPeer) { - console.log('[Network.js.168:_notify:]'); //TODO this._showConnectedPeers(); this.emit('networkChange', newPeer); }; @@ -177,7 +176,6 @@ Network.prototype._setupPeerHandlers = function(openCallback) { p.on('open', function(peerId) { - console.log('### PEER OPEN. I AM:' + peerId); self.peerId = peerId; self.connectedPeers = [peerId]; self._notify(); @@ -241,13 +239,10 @@ console.log('[WebRTC.js.222:peerId:]',peerId, data); //TODO Network.prototype.send = function(peerIds, data, cb) { var self=this; - -console.log('[WebRTC.js.242:peerIds:]',peerIds); //TODO if (!peerIds) { peerIds = this.connectedPeers; data.isBroadcast = 1; } -console.log('[WebRTC.js.246:peerIds:]',peerIds, data); //TODO if (Array.isArray(peerIds)) { var l = peerIds.length; @@ -279,13 +274,10 @@ Network.prototype.connectTo = function(peerId, openCallback, closeCallback ) { Network.prototype.disconnect = function(peerId, cb) { - console.log('[Network.js.268:disconnect:]'); //TODO var self = this; self.closing = 1; this.send(null, { type: 'disconnect' }, function() { - -console.log('[Network.js.273] disconnect CB'); //TODO self.connectedPeers = []; self.peerId = null; if (self.peer) { diff --git a/js/models/storage/Plain.js b/js/models/storage/Plain.js index bd1493fe2..a7009c8bb 100644 --- a/js/models/storage/Plain.js +++ b/js/models/storage/Plain.js @@ -23,8 +23,6 @@ Storage.prototype.getGlobal = function(k) { // set value for key Storage.prototype.setGlobal = function(k,v) { localStorage.setItem(k, JSON.stringify(v)); -console.log('[Plain.js.25]',k,v); //TODO - }; // remove value for key diff --git a/js/services/network.js b/js/services/network.js index e25d84bcc..edeedb728 100644 --- a/js/services/network.js +++ b/js/services/network.js @@ -4,10 +4,9 @@ angular.module('copay.network') .factory('Network', function($rootScope) { var peer; - var _refreshUx = function() { var net = $rootScope.wallet.network; - console.log('*** UPDATING UX'); //TODO + log('*** UPDATING UX'); //TODO $rootScope.peedId = net.peerId; $rootScope.connectedPeers = net.connectedPeers; $rootScope.$digest(); @@ -16,7 +15,7 @@ angular.module('copay.network') // set new inbound connections var _setNewPeer = function(newPeer) { var w = $rootScope.wallet; - console.log('#### Setting new PEER:', newPeer); + log('#### Setting new PEER:', newPeer); w.sendPublicKeyRing(newPeer); w.sendTxProposals(newPeer); }; @@ -34,7 +33,7 @@ angular.module('copay.network') var storeOpenWallet = function() { var w = $rootScope.wallet; w.store(); - console.log('\t### Wallet %s Stored', w.id); + log('\t### Wallet %s Stored', w.id); }; // TODO -> probably not in network.js @@ -43,14 +42,14 @@ angular.module('copay.network') w.create({id: walletId}); w.store(); $rootScope.wallet = w; - console.log('createWallet ENDED'); //TODO + log('createWallet ENDED'); //TODO }; var openWallet = function (walletId) { var w = $rootScope.wallet || new copay.Wallet(config); w.load(walletId); if (w && w.publicKeyRing && w.privateKey) { - console.log('### WALLET OPENED:', w.walletId); + log('### WALLET OPENED:', w.walletId); $rootScope.wallet = w; } }; @@ -61,12 +60,12 @@ angular.module('copay.network') if (w && w.id) w.store(); - console.log('### CLOSING WALLET'); + log('### CLOSING WALLET'); delete $rootScope['wallet']; }; var _checkWallet = function(walletId) { - console.log('[network.js.79:_checkWallet:]',walletId); //TODO + log('[network.js.79:_checkWallet:]',walletId); //TODO if ($rootScope.wallet && $rootScope.wallet.id === walletId) return; @@ -88,13 +87,13 @@ angular.module('copay.network') var recipients, pkr = w.publicKeyRing; var inPKR = copay.PublicKeyRing.fromObj(data.publicKeyRing); if (pkr.merge(inPKR, true) && !data.isBroadcast) { - console.log('### BROADCASTING PKR'); + log('### BROADCASTING PKR'); recipients = null; shouldSend = true; } else if (isInbound && !data.isBroadcast) { // always replying to connecting peer - console.log('### REPLYING PKR TO:', senderId); + log('### REPLYING PKR TO:', senderId); recipients = senderId; shouldSend = true; } @@ -110,19 +109,19 @@ angular.module('copay.network') var shouldSend = false; var w = $rootScope.wallet; - console.log('RECV TXPROPOSAL:',data); //TODO + log('RECV TXPROPOSAL:',data); //TODO var recipients; var inTxProposals = copay.TxProposals.fromObj(data.txProposals); var mergeInfo = w.txProposals.merge(inTxProposals, true); if ( mergeInfo.merged && !data.isBroadcast) { - console.log('### BROADCASTING txProposals'); + log('### BROADCASTING txProposals'); recipients = null; shouldSend = true; } else if (isInbound && !data.isBroadcast) { // always replying to connecting peer - console.log('### REPLYING txProposals TO:', senderId); + log('### REPLYING txProposals TO:', senderId); recipients = senderId; shouldSend = true; }