Refactor blockchain backing service

js/services/controllerUtils.js

@@ -2,7 +2,7 @@
 var bitcore = require('bitcore');
 
 angular.module('copayApp.services')
-  .factory('controllerUtils', function($rootScope, $sce, $location, notification, $timeout, Socket, video, uriHandler) {
+  .factory('controllerUtils', function($rootScope, $sce, $location, notification, $timeout, video, uriHandler) {
     var root = {};
     root.getVideoMutedStatus = function(copayer) {
       if (!$rootScope.videoInfo) return;
@@ -24,8 +24,6 @@ angular.module('copayApp.services')
       if ($rootScope.wallet)
         $rootScope.wallet.close();
 
-      Socket.removeAllListeners();
-
       $rootScope.wallet = null;
       delete $rootScope['wallet'];
 
@@ -68,7 +66,6 @@ angular.module('copayApp.services')
       uriHandler.register();
       $rootScope.unitName = config.unitName;
       $rootScope.txAlertCount = 0;
-      $rootScope.insightError = 0;
       $rootScope.isCollapsed = true;
       $rootScope.$watch('txAlertCount', function(txAlertCount) {
         if (txAlertCount && txAlertCount > 0) {
@@ -100,8 +97,6 @@ angular.module('copayApp.services')
 
 
     root.startNetwork = function(w, $scope) {
-      Socket.removeAllListeners();
-
       root.setupRootVariables();
       root.installStartupHandlers(w, $scope);
       root.setSocketHandlers();
@@ -125,6 +120,8 @@ angular.module('copayApp.services')
       });
       w.on('ready', function(myPeerID) {
         $rootScope.wallet = w;
+
+
         if ($rootScope.pendingPayment) {
           $location.path('send');
         } else {
@@ -298,47 +295,20 @@ angular.module('copayApp.services')
       });
     }
 
-    var connectionLost = false;
-    $rootScope.$watch('insightError', function(status) {
-      if (!status) return;
-
-      // Reconnected
-      if (status === -1) {
-        if (!connectionLost) return; // Skip on first reconnect
-        connectionLost = false;
+    root.setConnectionListeners = function(wallet) {
+      wallet.blockchain.on('connect', function(attempts) {
+        if (attempts == 0) return;
         notification.success('Networking restored', 'Connection to Insight re-established');
-        return;
-      }
+      });
 
-      // Retry
-      if (status == 1) return; // Skip the first try
-      connectionLost = true;
-      notification.error('Networking problem', 'Connection to Insight lost, reconnecting (attempt number ' + (status - 1) + ')');
-    });
-
-    root._setCommError = function(e) {
-      if ($rootScope.insightError < 0)
-        $rootScope.insightError = 0;
-      $rootScope.insightError++;
-    };
-
-    root._clearCommError = function(e) {
-      if ($rootScope.insightError > 0)
-        $rootScope.insightError = -1;
-      else
-        $rootScope.insightError = 0;
-    };
+      wallet.blockchain.on('disconnect', function() {
+        notification.error('Networking problem', 'Connection to Insight lost, trying to reconnect...');
+      });
+    }
 
     root.setSocketHandlers = function() {
       root.updateAddressList();
-      if (!Socket.sysEventsSet) {
-        Socket.sysOn('error', root._setCommError);
-        Socket.sysOn('reconnect_error', root._setCommError);
-        Socket.sysOn('reconnect_failed', root._setCommError);
-        Socket.sysOn('connect', root._clearCommError);
-        Socket.sysOn('reconnect', root._clearCommError);
-        Socket.sysEventsSet = true;
-      }
+
       if (!$rootScope.wallet) return;
 
       var currentAddrs = Socket.getListeners();

js/services/socket.js

@@ -1,80 +0,0 @@
-'use strict';
-
-angular.module('copayApp.services').factory('Socket',
-  function($rootScope) {
-    var listeners = [];
-    var url = (config.socket.schema || 'http') + '://' + config.socket.host + ':' + config.socket.port;
-    var opts = {
-      'reconnection': true,
-      'reconnectionDelay': config.socket.reconnectDelay || 500,
-      'secure': config.socket.schema === 'https' ? true : false,
-    };
-
-    var socket = io(url, opts);
-
-    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
-          });
-        }
-      },
-      sysOn: function(event, callback) {
-        var wrappedCallback = function() {
-          var args = arguments;
-          $rootScope.$apply(function() {
-            callback.apply(socket, args);
-          });
-        };
-        socket.io.on(event, wrappedCallback);
-      },
-      getListeners: function() {
-        var ret = {};
-
-        var addrList = listeners
-          .filter(function(i) {
-            return i.event != 'block';
-          })
-          .map(function(i) {
-            return i.event;
-          });
-
-        for (var i in addrList) {
-          ret[addrList[i]] = 1;
-        }
-        return ret;
-      },
-      isListeningBlocks: function() {
-        return listeners.filter(function(i) {
-          return i.event == 'block';
-        }).length > 0;
-      },
-      emit: function(event, data, callback) {
-        socket.emit(event, data, function() {
-          var args = arguments;
-          $rootScope.$apply(function() {
-            if (callback) {
-              callback.apply(socket, args);
-            }
-          });
-        });
-      },
-      removeAllListeners: function() {
-        for (var i = 0; i < listeners.length; i++) {
-          var details = listeners[i];
-          socket.removeAllListeners(details.event);
-        }
-
-        listeners = [];
-      }
-    };
-  });