Merge pull request #316 from matiu/feat/unsync-500

Feat/unsync 500

app/controllers/addresses.js

@@ -11,6 +11,18 @@ var async = require('async');
 
 var tDb = require('../../lib/TransactionDb').default();
 
+var checkSync = function(req, res) {
+  if (req.historicSync) {
+    var i = req.historicSync.info()
+    if (i.status !== 'finished') {
+      common.notReady(req, res, i.syncPercentage);
+      return false;
+    }
+  }
+  return true;
+};
+
+
 var getAddr = function(req, res, next) {
   var a;
   try {
@@ -47,6 +59,7 @@ var getAddrs = function(req, res, next) {
 };
 
 exports.show = function(req, res, next) {
+  if (!checkSync(req, res)) return;
   var a = getAddr(req, res, next);
 
   if (a) {
@@ -56,13 +69,18 @@ exports.show = function(req, res, next) {
       } else {
         return res.jsonp(a.getObj());
       }
-    }, {txLimit: req.query.noTxList?0:-1, ignoreCache: req.param('noCache')});
+    }, {
+      txLimit: req.query.noTxList ? 0 : -1,
+      ignoreCache: req.param('noCache')
+    });
   }
 };
 
 
 
 exports.utxo = function(req, res, next) {
+  if (!checkSync(req, res)) return;
+
   var a = getAddr(req, res, next);
   if (a) {
     a.update(function(err) {
@@ -71,11 +89,15 @@ exports.utxo = function(req, res, next) {
       else {
         return res.jsonp(a.unspent);
       }
-    }, {onlyUnspent:1, ignoreCache: req.param('noCache')});
+    }, {
+      onlyUnspent: 1,
+      ignoreCache: req.param('noCache')
+    });
   }
 };
 
 exports.multiutxo = function(req, res, next) {
+  if (!checkSync(req, res)) return;
   var as = getAddrs(req, res, next);
   if (as) {
     var utxos = [];
@@ -84,7 +106,10 @@ exports.multiutxo = function(req, res, next) {
         if (err) callback(err);
         utxos = utxos.concat(a.unspent);
         callback();
-      }, {onlyUnspent:1, ignoreCache: req.param('noCache')});
+      }, {
+        onlyUnspent: 1,
+        ignoreCache: req.param('noCache')
+      });
     }, function(err) { // finished callback
       if (err) return common.handleErrors(err, res);
       res.jsonp(utxos);
@@ -93,6 +118,7 @@ exports.multiutxo = function(req, res, next) {
 };
 
 exports.multitxs = function(req, res, next) {
+  if (!checkSync(req, res)) return;
 
   function processTxs(txs, from, to, cb) {
     txs = _.uniq(_.flatten(txs), 'txid');
@@ -109,7 +135,9 @@ exports.multitxs = function(req, res, next) {
     }
 
     var txIndex = {};
-    _.each(txs, function (tx) { txIndex[tx.txid] = tx; });
+    _.each(txs, function(tx) {
+      txIndex[tx.txid] = tx;
+    });
 
     async.each(txs, function(tx, callback) {
       tDb.fromIdWithInfo(tx.txid, function(err, tx) {
@@ -146,7 +174,10 @@ exports.multitxs = function(req, res, next) {
         if (err) callback(err);
         txs.push(a.transactions);
         callback();
-      }, {ignoreCache: req.param('noCache'), includeTxInfo: true});
+      }, {
+        ignoreCache: req.param('noCache'),
+        includeTxInfo: true
+      });
     }, function(err) { // finished callback
       if (err) return common.handleErrors(err, res);
       processTxs(txs, from, to, function(err, transactions) {
@@ -158,6 +189,7 @@ exports.multitxs = function(req, res, next) {
 };
 
 exports.balance = function(req, res, next) {
+  if (!checkSync(req, res)) return;
   var a = getAddr(req, res, next);
   if (a)
     a.update(function(err) {
@@ -166,10 +198,13 @@ exports.balance = function(req, res, next) {
       } else {
         return res.jsonp(a.balanceSat);
       }
-    }, {ignoreCache: req.param('noCache')});
+    }, {
+      ignoreCache: req.param('noCache')
+    });
 };
 
 exports.totalReceived = function(req, res, next) {
+  if (!checkSync(req, res)) return;
   var a = getAddr(req, res, next);
   if (a)
     a.update(function(err) {
@@ -178,10 +213,13 @@ exports.totalReceived = function(req, res, next) {
       } else {
         return res.jsonp(a.totalReceivedSat);
       }
-    }, {ignoreCache: req.param('noCache')});
+    }, {
+      ignoreCache: req.param('noCache')
+    });
 };
 
 exports.totalSent = function(req, res, next) {
+  if (!checkSync(req, res)) return;
   var a = getAddr(req, res, next);
   if (a)
     a.update(function(err) {
@@ -190,10 +228,13 @@ exports.totalSent = function(req, res, next) {
       } else {
         return res.jsonp(a.totalSentSat);
       }
-    }, {ignoreCache: req.param('noCache')});
+    }, {
+      ignoreCache: req.param('noCache')
+    });
 };
 
 exports.unconfirmedBalance = function(req, res, next) {
+  if (!checkSync(req, res)) return;
   var a = getAddr(req, res, next);
   if (a)
     a.update(function(err) {
@@ -202,5 +243,7 @@ exports.unconfirmedBalance = function(req, res, next) {
       } else {
         return res.jsonp(a.unconfirmedBalanceSat);
       }
-    }, {ignoreCache: req.param('noCache')});
+    }, {
+      ignoreCache: req.param('noCache')
+    });
 };

app/controllers/common.js

@@ -1,5 +1,8 @@
 'use strict';
 
+exports.notReady = function (err, res, p) {
+  res.status(503).send('Server not yet ready. Sync Percentage:' + p);
+};
 
 exports.handleErrors = function (err, res) {
   if (err) {

app/controllers/status.js

@@ -12,10 +12,6 @@ var Status  = require('../models/Status'),
  */
 exports.show = function(req, res) {
   
-  if (! req.query.q) {
-    res.status(400).send('Bad Request');
-  }
-  else {
   var option = req.query.q;
   var statusObject = new Status();
 
@@ -28,9 +24,6 @@ exports.show = function(req, res) {
   };
 
   switch(option) {
-      case 'getInfo':
-        statusObject.getInfo(returnJsonp);
-        break;
     case 'getDifficulty':
       statusObject.getDifficulty(returnJsonp);
       break;
@@ -43,9 +36,9 @@ exports.show = function(req, res) {
     case 'getBestBlockHash':
       statusObject.getBestBlockHash(returnJsonp);
       break;
+    case 'getInfo':
     default:
-        res.status(400).send('Bad Request');
+      statusObject.getInfo(returnJsonp);
-    }
   }
 };
 

app/models/Address.js

@@ -103,7 +103,8 @@ Address.prototype._addTxItem = function(txItem, txList, includeInfo) {
     }
   };
 
-  var add=0, addSpend=0;
+  var add = 0,
+    addSpend = 0;
   var v = txItem.value_sat;
   var seen = this.seen;
 
@@ -112,12 +113,18 @@ Address.prototype._addTxItem = function(txItem, txList, includeInfo) {
     seen[txItem.txid] = 1;
     add = 1;
 
-    addTx({ txid: txItem.txid, ts: txItem.ts });
+    addTx({
+      txid: txItem.txid,
+      ts: txItem.ts
+    });
   }
 
   // Spent tx
   if (txItem.spentTxId && !seen[txItem.spentTxId]) {
-    addTx({ txid: txItem.spentTxId, ts: txItem.spentTs });
+    addTx({
+      txid: txItem.spentTxId,
+      ts: txItem.spentTs
+    });
     seen[txItem.spentTxId] = 1;
     addSpend = 1;
   }
@@ -127,20 +134,17 @@ Address.prototype._addTxItem = function(txItem, txList, includeInfo) {
     if (!txItem.spentTxId) {
       //unspent
       this.balanceSat += v;
-    }
+    } else if (!txItem.spentIsConfirmed) {
-    else if(!txItem.spentIsConfirmed) {
       // unspent
       this.balanceSat += v;
       this.unconfirmedBalanceSat -= v;
       this.unconfirmedTxApperances += addSpend;
-    }
+    } else {
-    else {
       // spent
       this.totalSentSat += v;
       this.txApperances += addSpend;
     }
-  }
+  } else {
-  else {
     this.unconfirmedBalanceSat += v;
     this.unconfirmedTxApperances += add;
   }
@@ -192,8 +196,7 @@ Address.prototype.update = function(next, opts) {
             });
             return next();
           });
-        }
+        } else {
-        else {
           txOut.forEach(function(txItem) {
             self._addTxItem(txItem, txList, opts.includeTxInfo);
           });
@@ -208,4 +211,3 @@ Address.prototype.update = function(next, opts) {
 };
 
 module.exports = require('soop')(Address);
-

config/express.js

@@ -26,8 +26,8 @@ module.exports = function(app, historicSync, peerSync) {
   app.set('json spaces', 0);
 
   app.enable('jsonp callback');
-  app.use(config.apiPrefix + '/sync', setHistoric);
+  app.use(config.apiPrefix, setHistoric);
-  app.use(config.apiPrefix + '/peer', setPeer);
+  app.use(config.apiPrefix, setPeer);
   app.use(express.logger('dev'));
   app.use(express.json());
   app.use(express.urlencoded());

insight.js

@@ -131,18 +131,6 @@ if (config.enableRatelimiter) {
   require('./plugins/ratelimiter').init(expressApp, config.ratelimiter);
 }
 
-if (config.enableMailbox) {
-  require('./plugins/mailbox').init(ios, config.mailbox);
-}
-
-if (config.enableCleaner) {
-  require('./plugins/cleaner').init(config.cleaner);
-}
-
-if (config.enableMonitor) {
-  require('./plugins/monitor').init(config.monitor);
-}
-
 if (config.enableEmailstore) {
   require('./plugins/emailstore').init(config.emailstore);
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "insight-bitcore-api",
   "description": "An open-source bitcoin blockchain API. The Insight API provides you with a convenient, powerful and simple way to query and broadcast data on the bitcoin network and build your own services with it.",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "author": {
     "name": "Ryan X Charles",
     "email": "ryan@bitpay.com"