Merge pull request #718 from braydonf/bitcoind

bitcoind: change to use bitcoind/addresstxid event

public/src/js/controllers/address.js

@@ -4,24 +4,34 @@ angular.module('insight.address').controller('AddressController',
   function($scope, $rootScope, $routeParams, $location, Global, Address, getSocket) {
     $scope.global = Global;
 
-
     var socket = getSocket($scope);
+    var addrStr = $routeParams.addrStr;
 
-    var _startSocket = function () {
+    var _startSocket = function() {
-      socket.emit('subscribe', $routeParams.addrStr);
+      socket.on('bitcoind/addresstxid', function(data) {
-      socket.on($routeParams.addrStr, function(tx) {
+        if (data.address === addrStr) {
-        $rootScope.$broadcast('tx', tx);
+          $rootScope.$broadcast('tx', data.txid);
-        var beep = new Audio('/sound/transaction.mp3');
+          var base = document.querySelector('base');
-        beep.play();
+          var beep = new Audio(base.href + '/sound/transaction.mp3');
+          beep.play();
+        }
       });
+      socket.emit('subscribe', 'bitcoind/addresstxid', [addrStr]);
+    };
+
+    var _stopSocket = function () {
+      socket.emit('unsubscribe', 'bitcoind/addresstxid', [addrStr]);
     };
 
     socket.on('connect', function() {
       _startSocket();
     });
 
-    $scope.params = $routeParams;
+    $scope.$on('$destroy', function(){
+      _stopSocket();
+    });
 
+    $scope.params = $routeParams;
 
     $scope.findOne = function() {
       $rootScope.currentAddr = $routeParams.addrStr;

public/src/js/services/socket.js

@@ -39,8 +39,9 @@ ScopedSocket.prototype.on = function(event, callback) {
 ScopedSocket.prototype.emit = function(event, data, callback) {
   var socket = this.socket;
   var $rootScope = this.$rootScope;
+  var args = Array.prototype.slice.call(arguments);
 
-  socket.emit(event, data, function() {
+  args.push(function() {
     var args = arguments;
     $rootScope.$apply(function() {
       if (callback) {
@@ -48,6 +49,8 @@ ScopedSocket.prototype.emit = function(event, data, callback) {
       }
     });
   });
+
+  socket.emit.apply(socket, args);
 };
 
 angular.module('insight.socket').factory('getSocket',