From 5fe57077d7879656c2c56314beb0d6015238277e Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Fri, 17 Jan 2014 15:25:15 -0300 Subject: [PATCH 1/5] hello world version of address specific socket --- app/controllers/socket.js | 20 ++++++++++++++------ lib/PeerSync.js | 1 - public/js/controllers/address.js | 15 ++++++++++++++- public/js/controllers/index.js | 17 +++++++++++++---- 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/app/controllers/socket.js b/app/controllers/socket.js index 7bcad79..3be31a5 100644 --- a/app/controllers/socket.js +++ b/app/controllers/socket.js @@ -1,23 +1,31 @@ 'use strict'; // server-side socket behaviour - // io is a variable already taken in express var ios = null; module.exports.init = function(app, io_ext) { ios = io_ext; ios.set('log level', 1); // reduce logging - ios.sockets.on('connection', function() { + ios.sockets.on('connection', function(socket) { + socket.on('subscribe', function(topic) { + socket.join(topic); + if (topic !== 'inv') { + module.exports.broadcast_address_tx(topic, 'hello world'); + } + }); }); }; - module.exports.broadcast_tx = function(tx) { - ios.sockets.emit('tx', tx); + ios.sockets.in('inv').emit('tx', tx); }; - module.exports.broadcast_block = function(block) { - ios.sockets.emit('block', block); + ios.sockets.in('inv').emit('block', block); }; + +module.exports.broadcast_address_tx = function(address, tx) { + ios.sockets.in(address).emit('tx', tx); +}; + diff --git a/lib/PeerSync.js b/lib/PeerSync.js index 49526cf..9f5a106 100644 --- a/lib/PeerSync.js +++ b/lib/PeerSync.js @@ -15,7 +15,6 @@ function spec() { PeerSync.prototype.init = function(config, cb) { if (!config) config = {}; - var that = this; var network = config && (config.network || 'testnet'); diff --git a/public/js/controllers/address.js b/public/js/controllers/address.js index 926f3f8..afc5c91 100644 --- a/public/js/controllers/address.js +++ b/public/js/controllers/address.js @@ -1,6 +1,13 @@ 'use strict'; -angular.module('insight.address').controller('AddressController', ['$scope', '$routeParams', '$location', 'Global', 'Address', function ($scope, $routeParams, $location, Global, Address) { +angular.module('insight.address').controller('AddressController', + ['$scope', + '$routeParams', + '$location', + 'Global', + 'Address', + 'socket', + function ($scope, $routeParams, $location, Global, Address, socket) { $scope.global = Global; $scope.findOne = function() { @@ -10,6 +17,12 @@ angular.module('insight.address').controller('AddressController', ['$scope', '$r $scope.address = address; }); }; + socket.on('connect', function() { + socket.emit('subscribe', $routeParams.addrStr); + }); + socket.on('tx', function(data) { + console.log('Incoming message:', data); + }); $scope.params = $routeParams; }]); diff --git a/public/js/controllers/index.js b/public/js/controllers/index.js index 12eec9d..763f952 100755 --- a/public/js/controllers/index.js +++ b/public/js/controllers/index.js @@ -2,9 +2,18 @@ var TRANSACTION_DISPLAYED = 5; var BLOCKS_DISPLAYED = 5; -angular.module('insight.system').controller('IndexController', ['$scope', 'Global', 'socket', 'Blocks', 'Transactions', function($scope, Global, socket, Blocks, Transactions) { +angular.module('insight.system').controller('IndexController', + ['$scope', + 'Global', + 'socket', + 'Blocks', + 'Transactions', + function($scope, Global, socket, Blocks, Transactions) { $scope.global = Global; + socket.on('connect', function() { + socket.emit('subscribe', 'inv'); + }); socket.on('tx', function(tx) { console.log('Transaction received! ' + JSON.stringify(tx)); if ($scope.txs.length === TRANSACTION_DISPLAYED) { @@ -15,9 +24,9 @@ angular.module('insight.system').controller('IndexController', ['$scope', 'Globa socket.on('block', function(block) { console.log('Block received! ' + JSON.stringify(block)); - if ($scope.blocks.length === BLOCKS_DISPLAYED) { - $scope.blocks.pop(); - } + if ($scope.blocks.length === BLOCKS_DISPLAYED) { + $scope.blocks.pop(); + } $scope.blocks.unshift(block); }); From 6c7ecef5d44d93c75457ab4be10ca38c211db119 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Fri, 17 Jan 2014 16:49:08 -0300 Subject: [PATCH 2/5] socket api for address transactions --- app/controllers/socket.js | 3 -- app/models/Transaction.js | 40 ++++++++++++++++----------- public/js/controllers/address.js | 3 -- public/js/controllers/transactions.js | 27 ++++++++++++++++-- public/views/transaction.html | 2 +- 5 files changed, 49 insertions(+), 26 deletions(-) diff --git a/app/controllers/socket.js b/app/controllers/socket.js index 3be31a5..8f6d254 100644 --- a/app/controllers/socket.js +++ b/app/controllers/socket.js @@ -10,9 +10,6 @@ module.exports.init = function(app, io_ext) { ios.sockets.on('connection', function(socket) { socket.on('subscribe', function(topic) { socket.join(topic); - if (topic !== 'inv') { - module.exports.broadcast_address_tx(topic, 'hello world'); - } }); }); }; diff --git a/app/models/Transaction.js b/app/models/Transaction.js index fbb3f35..f432123 100644 --- a/app/models/Transaction.js +++ b/app/models/Transaction.js @@ -4,17 +4,18 @@ * Module dependencies. */ -var mongoose = require('mongoose'), - Schema = mongoose.Schema, - async = require('async'), - RpcClient = require('bitcore/RpcClient').class(), - Transaction = require('bitcore/Transaction').class(), - Address = require('bitcore/Address').class(), - BitcoreBlock= require('bitcore/Block').class(), - networks = require('bitcore/networks'), - util = require('bitcore/util/util'), - bignum = require('bignum'), - config = require('../../config/config'), +var mongoose = require('mongoose'), + Schema = mongoose.Schema, + async = require('async'), + RpcClient = require('bitcore/RpcClient').class(), + Transaction = require('bitcore/Transaction').class(), + Address = require('bitcore/Address').class(), + BitcoreBlock = require('bitcore/Block').class(), + networks = require('bitcore/networks'), + util = require('bitcore/util/util'), + bignum = require('bignum'), + config = require('../../config/config'), + sockets = require('../controllers/socket.js'), TransactionItem = require('./TransactionItem'); var CONCURRENCY = 5; @@ -94,8 +95,14 @@ TransactionSchema.statics.createFromArray = function(txs, time, next) { async.forEachLimit(txs, CONCURRENCY, function(txid, cb) { - that.explodeTransactionItems( txid, time, function(err) { + that.explodeTransactionItems( txid, time, function(err, addrs) { if (err) return next(err); + if (addrs) { + async.each(addrs, function(addr){ + sockets.broadcast_address_tx(addr, {'txid': txid}); + }); + + } that.create({txid: txid, time: time}, function(err, new_tx) { if (err && ! err.toString().match(/E11000/)) return cb(err); @@ -112,7 +119,7 @@ TransactionSchema.statics.createFromArray = function(txs, time, next) { TransactionSchema.statics.explodeTransactionItems = function(txid, time, cb) { - + var addrs = []; this.queryInfo(txid, function(err, info) { if (err || !info) return cb(err); @@ -124,7 +131,6 @@ TransactionSchema.statics.explodeTransactionItems = function(txid, time, cb) { async.forEachLimit(info.vin, CONCURRENCY, function(i, next_in) { if (i.addr && i.value) { -//console.log("Creating IN %s %d", i.addr, i.valueSat); TransactionItem.create({ txid : txid, value_sat : -1 * i.valueSat, @@ -132,6 +138,9 @@ TransactionSchema.statics.explodeTransactionItems = function(txid, time, cb) { index : i.n, ts : time, }, next_in); + if (addrs.indexOf(i.addr) === -1) { + addrs.push(i.addr); + } } else { if ( !i.coinbase ) { @@ -148,7 +157,6 @@ TransactionSchema.statics.explodeTransactionItems = function(txid, time, cb) { * TODO Support multisigs */ if (o.value && o.scriptPubKey && o.scriptPubKey.addresses && o.scriptPubKey.addresses[0]) { -//console.log("Creating OUT %s %d", o.scriptPubKey.addresses[0], o.valueSat); TransactionItem.create({ txid : txid, value_sat : o.valueSat, @@ -164,7 +172,7 @@ TransactionSchema.statics.explodeTransactionItems = function(txid, time, cb) { }, function (err) { if (err && ! err.toString().match(/E11000/)) return cb(err); - return cb(); + return cb(null, addrs); }); }); }); diff --git a/public/js/controllers/address.js b/public/js/controllers/address.js index afc5c91..c66351e 100644 --- a/public/js/controllers/address.js +++ b/public/js/controllers/address.js @@ -20,9 +20,6 @@ angular.module('insight.address').controller('AddressController', socket.on('connect', function() { socket.emit('subscribe', $routeParams.addrStr); }); - socket.on('tx', function(data) { - console.log('Incoming message:', data); - }); $scope.params = $routeParams; }]); diff --git a/public/js/controllers/transactions.js b/public/js/controllers/transactions.js index 665929a..9408862 100644 --- a/public/js/controllers/transactions.js +++ b/public/js/controllers/transactions.js @@ -1,13 +1,28 @@ 'use strict'; -angular.module('insight.transactions').controller('transactionsController', ['$scope', '$routeParams', '$location', 'Global', 'Transaction', 'TransactionsByBlock', 'TransactionsByAddress', function ($scope, $routeParams, $location, Global, Transaction, TransactionsByBlock, TransactionsByAddress) { +angular.module('insight.transactions').controller('transactionsController', + ['$scope', + '$routeParams', + '$location', + 'Global', + 'Transaction', + 'TransactionsByBlock', + 'TransactionsByAddress', + 'socket', + function ($scope, $routeParams, $location, Global, Transaction, TransactionsByBlock, TransactionsByAddress, socket) { $scope.global = Global; - $scope.findOne = function() { + + $scope.findThis = function() { + $scope.findTx($routeParams.txId); + }; + + $scope.findTx = function(txid) { Transaction.get({ - txId: $routeParams.txId + txId: txid }, function(tx) { $scope.tx = tx; + $scope.txs.push(tx); }); }; @@ -26,6 +41,12 @@ angular.module('insight.transactions').controller('transactionsController', ['$s $scope.txs = txs; }); }; + socket.on('tx', function(tx) { + console.log('Incoming message for new transaction!', tx); + $scope.findTx(tx.txid); + }); + + $scope.txs = []; }]); diff --git a/public/views/transaction.html b/public/views/transaction.html index 7ba4744..7ef3cd4 100644 --- a/public/views/transaction.html +++ b/public/views/transaction.html @@ -1,4 +1,4 @@ -
+

Transaction From cf5aea11650d6b3db01effcabd8f19001533a60a Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Mon, 20 Jan 2014 13:31:37 -0300 Subject: [PATCH 3/5] socket.io and angular proper integration --- app/controllers/socket.js | 1 + public/js/controllers/address.js | 9 ++- public/js/controllers/footer.js | 11 ++-- public/js/controllers/index.js | 9 ++- public/js/controllers/transactions.js | 8 +-- public/js/services/socket.js | 80 +++++++++++++++++++-------- 6 files changed, 76 insertions(+), 42 deletions(-) diff --git a/app/controllers/socket.js b/app/controllers/socket.js index 8802a1e..e69a734 100644 --- a/app/controllers/socket.js +++ b/app/controllers/socket.js @@ -9,6 +9,7 @@ module.exports.init = function(app, io_ext) { ios.set('log level', 1); // reduce logging ios.sockets.on('connection', function(socket) { socket.on('subscribe', function(topic) { + console.log('subscribe to '+topic); socket.join(topic); }); }); diff --git a/public/js/controllers/address.js b/public/js/controllers/address.js index 7af59e5..6276230 100644 --- a/public/js/controllers/address.js +++ b/public/js/controllers/address.js @@ -7,8 +7,8 @@ angular.module('insight.address').controller('AddressController', '$location', 'Global', 'Address', - 'socket', - function ($scope, $rootScope, $routeParams, $location, Global, Address, socket) { + 'get_socket', + function ($scope, $rootScope, $routeParams, $location, Global, Address, get_socket) { $scope.global = Global; $scope.findOne = function() { @@ -21,9 +21,8 @@ angular.module('insight.address').controller('AddressController', $location.path('/'); }); }; - socket.on('connect', function() { - socket.emit('subscribe', $routeParams.addrStr); - }); + var socket = get_socket($scope); + socket.emit('subscribe', $routeParams.addrStr); $scope.params = $routeParams; }]); diff --git a/public/js/controllers/footer.js b/public/js/controllers/footer.js index 56ee28f..611cfc8 100644 --- a/public/js/controllers/footer.js +++ b/public/js/controllers/footer.js @@ -1,13 +1,12 @@ 'use strict'; -angular.module('insight.system').controller('FooterController', ['$scope', 'Global', 'socket', 'Status', function ($scope, Global, socket, Status) { +angular.module('insight.system').controller('FooterController', + ['$scope', + 'Global', + 'Status', + function ($scope, Global, Status) { $scope.global = Global; - socket.on('block', function(block) { -console.log('[footer.js:14]',block); //TODO - console.log('Block received! ' + JSON.stringify(block)); - }); - $scope.getFooter = function() { Status.get({ q: 'getInfo' diff --git a/public/js/controllers/index.js b/public/js/controllers/index.js index 22ea12f..e733d75 100755 --- a/public/js/controllers/index.js +++ b/public/js/controllers/index.js @@ -6,15 +6,14 @@ angular.module('insight.system').controller('IndexController', ['$scope', '$rootScope', 'Global', - 'socket', + 'get_socket', 'Blocks', 'Transactions', - function($scope, $rootScope, Global, socket, Blocks, Transactions) { + function($scope, $rootScope, Global, get_socket, Blocks, Transactions) { $scope.global = Global; - socket.on('connect', function() { - socket.emit('subscribe', 'inv'); - }); + var socket = get_socket($scope); + socket.emit('subscribe', 'inv'); //show errors $scope.flashMessage = $rootScope.flashMessage || null; diff --git a/public/js/controllers/transactions.js b/public/js/controllers/transactions.js index be8a61b..33e0469 100644 --- a/public/js/controllers/transactions.js +++ b/public/js/controllers/transactions.js @@ -2,14 +2,14 @@ angular.module('insight.transactions').controller('transactionsController', ['$scope', + '$rootScope', '$routeParams', '$location', 'Global', 'Transaction', 'TransactionsByBlock', 'TransactionsByAddress', - 'socket', - function ($scope, $routeParams, $location, Global, Transaction, TransactionsByBlock, TransactionsByAddress, socket) { + function ($scope, $rootScope, $routeParams, $location, Global, Transaction, TransactionsByBlock, TransactionsByAddress) { $scope.global = Global; $scope.findThis = function() { @@ -43,10 +43,10 @@ angular.module('insight.transactions').controller('transactionsController', $scope.txs = txs; }); }; - socket.on('tx', function(tx) { + /*socket.on('tx', function(tx) { console.log('Incoming message for new transaction!', tx); $scope.findTx(tx.txid); - }); + });*/ $scope.txs = []; diff --git a/public/js/services/socket.js b/public/js/services/socket.js index 2ffe741..9ed679c 100644 --- a/public/js/services/socket.js +++ b/public/js/services/socket.js @@ -1,26 +1,62 @@ 'use strict'; -angular.module('insight.socket').factory('socket', ['$rootScope', function($rootScope) { - var socket = io.connect(); - return { - on: function(eventName, callback) { - socket.on(eventName, function() { - var args = arguments; - $rootScope.$apply(function() { - callback.apply(socket, args); - }); - }); - }, - emit: function(eventName, data, callback) { - socket.emit(eventName, data, function() { - var args = arguments; - $rootScope.$apply(function() { - if (callback) { - callback.apply(socket, args); - } - }); - }); - } - }; +var ScopedSocket = function(socket, $rootScope) { + this.socket = socket; + this.$rootScope = $rootScope; + this.listeners = []; +}; + +ScopedSocket.prototype.removeAllListeners = function() { + console.log('remove all listeners'); + for (var i = 0; i < this.listeners.length; i++) { + var details = this.listeners[i]; + console.log('removing listener '+i); + 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('insight.socket').factory('get_socket', ['$rootScope', function($rootScope) { + var socket = io.connect(); + return function(scope) { + var scopedSocket = new ScopedSocket(socket, $rootScope); + scope.$on('$destroy', function() { + scopedSocket.removeAllListeners(); + }); + return scopedSocket; + }; }]); From 37d18b7b2d59eba8c1b734d01378683280b9cdd0 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Mon, 20 Jan 2014 14:30:25 -0300 Subject: [PATCH 4/5] fixing socket API --- app/controllers/socket.js | 5 +++-- public/js/controllers/transactions.js | 11 +++++++---- public/js/services/socket.js | 3 --- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/controllers/socket.js b/app/controllers/socket.js index e69a734..b208d0d 100644 --- a/app/controllers/socket.js +++ b/app/controllers/socket.js @@ -24,9 +24,10 @@ module.exports.broadcast_block = function(block) { }; module.exports.broadcast_address_tx = function(address, tx) { - ios.sockets.in(address).emit('tx', tx); + console.log('sending address tx '+address+' '+tx); + ios.sockets.in(address).emit('atx', tx); }; module.exports.broadcastSyncInfo = function(syncInfo) { - ios.sockets.emit('block', syncInfo); + ios.sockets.emit('status', syncInfo); }; diff --git a/public/js/controllers/transactions.js b/public/js/controllers/transactions.js index 33e0469..ccb3a92 100644 --- a/public/js/controllers/transactions.js +++ b/public/js/controllers/transactions.js @@ -9,7 +9,8 @@ angular.module('insight.transactions').controller('transactionsController', 'Transaction', 'TransactionsByBlock', 'TransactionsByAddress', - function ($scope, $rootScope, $routeParams, $location, Global, Transaction, TransactionsByBlock, TransactionsByAddress) { + 'get_socket', + function ($scope, $rootScope, $routeParams, $location, Global, Transaction, TransactionsByBlock, TransactionsByAddress, get_socket) { $scope.global = Global; $scope.findThis = function() { @@ -43,10 +44,12 @@ angular.module('insight.transactions').controller('transactionsController', $scope.txs = txs; }); }; - /*socket.on('tx', function(tx) { - console.log('Incoming message for new transaction!', tx); + var socket = get_socket($scope); + console.log('transactions.js'); + socket.on('atx', function(tx) { + console.log('Incoming transaction for address!', tx); $scope.findTx(tx.txid); - });*/ + }); $scope.txs = []; diff --git a/public/js/services/socket.js b/public/js/services/socket.js index 9ed679c..98af5e1 100644 --- a/public/js/services/socket.js +++ b/public/js/services/socket.js @@ -7,10 +7,8 @@ var ScopedSocket = function(socket, $rootScope) { }; ScopedSocket.prototype.removeAllListeners = function() { - console.log('remove all listeners'); for (var i = 0; i < this.listeners.length; i++) { var details = this.listeners[i]; - console.log('removing listener '+i); this.socket.removeListener(details.event, details.fn); } this.listeners = []; @@ -20,7 +18,6 @@ ScopedSocket.prototype.on = function(event, callback) { var socket = this.socket; var $rootScope = this.$rootScope; - var wrapped_callback = function() { var args = arguments; $rootScope.$apply(function() { From 86e149a0d8131bf2b1cb82a94f0db751b4f34536 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Mon, 20 Jan 2014 14:31:01 -0300 Subject: [PATCH 5/5] remove log --- app/controllers/socket.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/socket.js b/app/controllers/socket.js index b208d0d..d996f4c 100644 --- a/app/controllers/socket.js +++ b/app/controllers/socket.js @@ -24,7 +24,6 @@ module.exports.broadcast_block = function(block) { }; module.exports.broadcast_address_tx = function(address, tx) { - console.log('sending address tx '+address+' '+tx); ios.sockets.in(address).emit('atx', tx); };