refactory of the socket service

js/services/controllerUtils.js

@@ -21,9 +21,7 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
     $rootScope.$digest();
   }
 
-
   root.setupUxHandlers =  function(w) {
-
     w.on('badMessage', function(peerId) {
       $rootScope.flashMessage = {type:'error', message: 'Received wrong message from peer id:' + peerId};
     });
@@ -45,19 +43,24 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
     w.on('close', root.onErrorDigest);
   };
 
-  root.handleTransactionByAddress = function(scope, cb) {
-    var socket = Socket(scope);
+  root.setSocketHandlers = function(cb) {
+    Socket.removeAllListeners();
+
     var addrs = $rootScope.wallet.getAddressesStr();
-    for(var i=0;i<addrs.length;i++) {
-      socket.emit('subscribe', addrs[i]);
+    for(var i = 0; i < addrs.length; i++) {
+      console.log('### SUBSCRIBE TO', addrs[i]);
+      Socket.emit('subscribe', addrs[i]);
     }
+
     addrs.forEach(function(addr) {
-      socket.on(addr, function(txid) {
+      Socket.on(addr, function(txid) {
         console.log('Received!', txid);
-        $rootScope.wallet.getBalance(function(balance) {
-          scope.$apply(function() {
+        $rootScope.wallet.getBalance(function(balance, balanceByAddr) {
+          $rootScope.$apply(function() {
             $rootScope.totalBalance = balance;
+            $rootScope.balanceByAddr = balanceByAddr;
           });
+
           console.log('New balance:', balance);
           if (typeof cb === 'function') return cb();
         });

js/services/socket.js

@@ -1,72 +1,49 @@
 '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, {
+    var listeners = [];
+    var url = 'http://' + config.socket.host + ':' + config.socket.port;
+    var socket = io.connect(url, {
       '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 {
+      on: function(event, callback) {
+        var wrappedCallback = function() {
+          var args = arguments;
+          $rootScope.$apply(function() {
+            callback.apply(socket, args);
+          });
+        };
+
+        socket.on(event, wrappedCallback);
+
+        if (event !== 'connect') {
+          listeners.push({
+            event: event,
+            fn: wrappedCallback
+          });
+        }
+      },
+      emit: function(event, data, callback) {
+        socket.emit(event, data, function() {
+          var args = arguments;
+          $rootScope.$apply(function() {
+            if (callback) {
+              callback.apply(socket, args);
+            }
+          });
         });
-      });
-      return scopedSocket;
+      },
+      removeAllListeners: function() {
+        for (var i = 0; i < listeners.length; i++) {
+          var details = listeners[i];
+          socket.removeListener(details.event, details.fn);
+        }
+
+        listeners = [];
+      }
     };
   });