Merge pull request #75 from cmgustavo/feature/socket-io-support

Feature/socket io support

.gitignore

@@ -45,6 +45,7 @@ public/css/main.css
 
 README.html
 
-lib
+lib/*
+!lib/socket.io.js
 
 js/copayBundle.js

index.html

@@ -18,7 +18,8 @@
           </figure>
           <div class="text-right" ng-show="$root.wallet">
             <h5>Company Funds</h5>
-            <p>4.324 BTC</p>
+            <p ng-show="totalBalance">{{totalBalance}} BTC</p>
+            <p ng-show="!totalBalance">0 BTC</p>
           </div>
         </div>
 
@@ -181,7 +182,7 @@
           </div>
           <div class="large-3 columns line-dashed-v text-center">
             <qrcode size="160" data="{{selectedAddr}}"></qrcode>
-            <p class="m10t"> <strong> 2.5432 BTC </strong> </p>
+            <p class="m10t" ng-repeat="addr in addrs" ng-if="selectedAddr==addr"> <strong> {{addrBalance[addr]}} BTC </strong> </p>
           </div>
           <div class="large-1 columns"> </div>
           <div class="large-2 columns">
@@ -326,14 +327,15 @@
     <script src="lib/peerjs/peer.js"></script>
     <script src="lib/bitcore.js"></script>
     <script src="lib/crypto-js/rollups/aes.js"></script>
+    <script src="lib/socket.io.js"></script>
     <script src="js/copayBundle.js"></script>
 
-
     <script src="js/app.js"></script>
     <script src="js/config.js"></script>
     <script src="js/routes.js"></script>
     <script src="js/directives.js"></script>
     <script src="js/filters.js"></script>
+    <script src="js/services/socket.js"></script>
     <script src="js/services/walletFactory.js"></script>
     <script src="js/services/controllerUtils.js"></script>
 

js/app.js

@@ -11,6 +11,7 @@ angular.module('copay',[
   'copay.backup',
   'copay.walletFactory',
   'copay.signin',
+  'copay.socket',
   'copay.controllerUtils',
   'copay.setup',
   'copay.peer'
@@ -26,4 +27,5 @@ angular.module('copay.controllerUtils', []);
 angular.module('copay.signin', []);
 angular.module('copay.setup', []);
 angular.module('copay.peer', []);
+angular.module('copay.socket', []);
 

js/config.js

@@ -18,10 +18,12 @@ var config = {
     verbose: 1,
   },
   blockchain: {
-    host: 'test.insight.is',
-    port: 80
-    // host: 'localhost',
-    // port: 3001
+    host: 'localhost',
+    port: 3001
+  },
+  socket: {
+    host: 'localhost',
+    port: 3001
   },
   verbose: 1,
 };

js/controllers/backup.js

@@ -1,13 +1,15 @@
 'use strict';
 
 angular.module('copay.backup').controller('BackupController',
-  function($scope, $rootScope, $location) {
+  function($scope, $rootScope, $location, Socket, controllerUtils) {
 
-
-    if (!$rootScope.wallet.id) {
+    if (!$rootScope.wallet || !$rootScope.wallet.id) {
       $location.path('signin');
     }
-
+    else {
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
+    }
 
     $scope.title = 'Backup';
   });

js/controllers/header.js

@@ -24,7 +24,7 @@ angular.module('copay.header').controller('HeaderController',
       'link': '#/backup'
     }];
 
-    if (!$rootScope.peerId) {
+   if (!$rootScope.wallet || !$rootScope.wallet.id) {
       $location.path('signin');
     }
 
@@ -40,6 +40,7 @@ angular.module('copay.header').controller('HeaderController',
       if (w) {
         w.disconnect();
         delete $rootScope['wallet'];
+        $rootScope.totalBalance = 0;
         $location.path('signin');
       }
     };
@@ -47,4 +48,5 @@ angular.module('copay.header').controller('HeaderController',
     $scope.clearFlashMessage = function() {
       $rootScope.flashMessage = {};
     };
+
   });

js/controllers/home.js

@@ -1,12 +1,12 @@
 'use strict';
 
 angular.module('copay.home').controller('HomeController',
-  function($scope, $rootScope, $location) {
+  function($scope, $rootScope, $location, Socket, controllerUtils) {
     $scope.title = 'Home';
 
     $scope.oneAtATime = true;
     $scope.addrBalance = {};
-
+    
     var _getBalance = function() {
       $scope.addrs.forEach(function(addr) {
         $rootScope.wallet.blockchain.listUnspent([addr], function(unspent) {
@@ -24,6 +24,9 @@ angular.module('copay.home').controller('HomeController',
       $scope.selectedAddr = $scope.addrs[0];
 
       _getBalance();
+
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
     }
 
     $scope.newAddr = function() {
@@ -31,6 +34,8 @@ angular.module('copay.home').controller('HomeController',
       $scope.addrs.push(a);
 
       _getBalance();
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
     };
 
     $scope.selectAddr = function(addr) {

js/controllers/peer.js

@@ -1,10 +1,18 @@
 'use strict';
 
 angular.module('copay.peer').controller('PeerController',
-  function($scope, $rootScope, $location, $routeParams) {
+  function($scope, $rootScope, $location, $routeParams, Socket, controllerUtils) {
     
     $scope.init = function() {
       //Network.connect($rootScope.masterId);
     };
+
+    if (!$rootScope.wallet || !$rootScope.wallet.id) {
+      $location.path('signin');
+    }
+    else {
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
+    }
   });
 

js/controllers/send.js

@@ -1,13 +1,17 @@
 'use strict';
 
 angular.module('copay.send').controller('SendController',
-  function($scope, $rootScope, $location) {
+  function($scope, $rootScope, $location, Socket, controllerUtils) {
     $scope.title = 'Send';
 
-    if (!$rootScope.wallet.id) {
+    if (!$rootScope.wallet || !$rootScope.wallet.id) {
       $location.path('signin');
     }
-
+    else {
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
+   
+    }
 
     $scope.sendTest = function() {
       var w    = $rootScope.wallet;

js/controllers/transactions.js

@@ -1,29 +1,33 @@
 'use strict';
 
 angular.module('copay.transactions').controller('TransactionsController',
-  function($scope, $rootScope, $location) {
+  function($scope, $rootScope, $location, Socket, controllerUtils) {
     $scope.title = 'Transactions';
 
     $scope.oneAtATime = true;
 
-    if (!$rootScope.wallet.id) {
+    if (!$rootScope.wallet || !$rootScope.wallet.id) {
       $location.path('signin');
     }
+    else {
+      $scope.txsinput = [
+      {
+        fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
+        toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1",
+        amount: 23.9982
+      },
+      {
+        fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J",
+        toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS",
+        amount: 2.22
+      }
+      ];
 
-    $scope.txsinput = [
-    {
-      fromAddr: "n3zUqNR7Bbbc4zJhPVj1vG2Lx66K3Xhzvb",
-      toAddr: "msvv2mDfE298s7boXwALq4Dqv77K3TWRZ1",
-      amount: 23.9982
-    },
-    {
-      fromAddr: "my9wnLwwUrwpNfEgSrWY62ymEGf1edKf4J",
-      toAddr: "monCusNiDuptf68rtr58hEjKpJt6cW6zwS",
-      amount: 2.22
+      $scope.txsoutput = $rootScope.wallet.getTxProposals();
+
+      var socket = Socket($scope);
+      socket.on('connect', controllerUtils.handleTransactionByAddress($scope));
     }
-    ];
-
-    $scope.txsoutput = $rootScope.wallet.getTxProposals();
 
     $scope.sign = function (ntxid) {
       var w = $rootScope.wallet;

js/models/blockchain/Insight.js

@@ -34,7 +34,9 @@ Insight.prototype.getBalance = function(unspent) {
   for(var i=0;i<unspent.length; i++) {
     balance = balance + unspent[i].amount;
   }
-
+  if (balance) {
+    balance = balance.toFixed(4);
+  }
   return balance;
 };
 

js/models/core/Wallet.js

@@ -277,7 +277,18 @@ Wallet.prototype.getAddressesStr = function() {
   return ret;
 };
 
-
+Wallet.prototype.getBalance = function(cb) {
+  var balance = 0;
+  this.blockchain.listUnspent(this.getAddressesStr(), function(unspent) {
+    for(var i=0;i<unspent.length; i++) {
+      balance = balance + unspent[i].amount;
+    }
+    if (balance) {
+      balance = balance.toFixed(4);
+    }
+    return cb(balance);
+  });
+};
 
 Wallet.prototype.listUnspent = function(cb) {
   this.blockchain.listUnspent(this.getAddressesStr(), cb);

js/services/controllerUtils.js

@@ -1,16 +1,20 @@
 'use strict';
 
-angular.module('copay.controllerUtils').factory('controllerUtils', function ($rootScope, $location) {
+angular.module('copay.controllerUtils').factory('controllerUtils', function ($rootScope, $location, Socket) {
   var root = {};
   root.setupUxHandlers =  function(w) {
     w.on('created', function() {
       $location.path('peer');
       $rootScope.wallet = w;
-      $rootScope.$digest();
+      
+      // Initial getBalance
+      $rootScope.wallet.getBalance(function(balance) {
+        $rootScope.totalBalance = balance;
+        $rootScope.$digest();
+      });
     });
     w.on('refresh', function() {
       console.log('[controllerUtils.js] RECEIVED REFRESH'); //TODO
-      $rootScope.$digest();
     });
 
     w.on('openError', function(){
@@ -20,6 +24,26 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
     });
   };
 
+  root.handleTransactionByAddress = function(scope) {
+    var socket = Socket(scope);
+    var addrs = $rootScope.wallet.getAddressesStr();
+    socket.emit('subscribe', 'inv');
+    for(var i=0;i<addrs.length;i++) {
+      socket.emit('subscribe', addrs[i]);
+    }
+    addrs.forEach(function(addr) {
+      socket.on(addr, function(txid) {
+        console.log('Received!', txid);
+        $rootScope.wallet.getBalance(function(balance) {
+          scope.$apply(function() {
+            $rootScope.totalBalance = balance;
+          });
+          console.log('New balance:', balance);
+        });
+      });
+    });
+  };
+
   return root;
 });
 

js/services/socket.js

@@ -0,0 +1,72 @@
+'use strict';
+
+var ScopedSocket = function(socket, $rootScope) {
+  this.socket = socket;
+  this.$rootScope = $rootScope;
+  this.listeners = [];
+};
+
+ScopedSocket.prototype.removeAllListeners = function(opts) {
+  if (!opts) opts = {};
+  for (var i = 0; i < this.listeners.length; i++) {
+    var details = this.listeners[i];
+    if (opts.skipConnect && details.event === 'connect') {
+      continue;
+    }
+    this.socket.removeListener(details.event, details.fn);
+  }
+  this.listeners = [];
+};
+
+ScopedSocket.prototype.on = function(event, callback) {
+  var socket = this.socket;
+  var $rootScope = this.$rootScope;
+
+  var wrapped_callback = function() {
+    var args = arguments;
+    $rootScope.$apply(function() {
+      callback.apply(socket, args);
+    });
+  };
+  socket.on(event, wrapped_callback);
+
+  this.listeners.push({
+    event: event,
+    fn: wrapped_callback
+  });
+};
+
+ScopedSocket.prototype.emit = function(event, data, callback) {
+  var socket = this.socket;
+  var $rootScope = this.$rootScope;
+
+  socket.emit(event, data, function() {
+    var args = arguments;
+    $rootScope.$apply(function() {
+      if (callback) {
+        callback.apply(socket, args);
+      }
+    });
+  });
+};
+
+angular.module('copay.socket').factory('Socket',
+  function($rootScope) {
+    var server = 'http://' + config.socket.host + ':' + config.socket.port;
+    var socket = io.connect(server, {
+      'reconnect': true,
+      'reconnection delay': 500,
+    });
+    return function(scope) {
+      var scopedSocket = new ScopedSocket(socket, $rootScope);
+      scope.$on('$destroy', function() {
+        scopedSocket.removeAllListeners();
+      });
+      socket.on('connect', function() {
+        scopedSocket.removeAllListeners({
+          skipConnect: true
+        });
+      });
+      return scopedSocket;
+    };
+  });