merged in latest from master

lib/app.js

@@ -47,10 +47,9 @@ module.exports = function (options) {
 
   app.use(express.bodyParser());
 
-  if (!options.https) {
+  var authMiddleware;
-    server = http.createServer(app);
+
-  }
+  if (options.https) {
-  else {
     var serverOptions = {
       key: options.https.key,
       cert: options.https.cert,
@@ -61,30 +60,28 @@ module.exports = function (options) {
     };
 
     server = https.createServer(serverOptions, app);
-  }
 
-  var authMiddleware = function (req, res, next) {
-    req.device = {};
-    return next();
-  };
-
-  if (options.https) {
     authMiddleware = function(req, res, next) {
-      var fingerprint = req.connection.getPeerCertificate().fingerprint;
+      config.isAuthorized(routes.getFingerprint(req), function (err, device) {
-
-      config.isAuthorized(fingerprint, function (err, device) {
         if (err) {
           res.json({err: 'Internal Server Error'});
           return next(err);
         }
         if (!device) {
-          res.statusCode = 404;
+          res.json(404, {err: 'Not Found'});
-          res.json({err: 'Not Found'});
           return next(new Error('Device is unpaired'));
         }
         next();
       });
     };
+
+  } else {
+    server = http.createServer(app);
+
+    authMiddleware = function (req, res, next) {
+      req.device = {};
+      return next();
+    };
   }
 
   routes.init({

lib/routes.js

@@ -3,82 +3,90 @@
 var _trader;
 var _lamassuConfig;
 var _idVerifier = null;
+var _trader = null;
 var logger = require('./logger');
 
+module.exports = {
+  init: init,
+  getFingerprint: getFingerprint
+};
+
 // Make sure these are higher than polling interval
 // or there will be a lot of errors
 var STALE_TICKER  = 180000;
 var STALE_BALANCE = 180000;
 
-var poll = function(req, res) {
+function poll(req, res) {
   var rateRec = _trader.rate();
   var balanceRec = _trader.balance;
   var fingerprint = getFingerprint(req);
-  var api = prepareApi(req, res);
 
   logger.debug('poll request from: %s', fingerprint);
 
   // `rateRec` and `balanceRec` are both objects, so there's no danger
   // of misinterpreting rate or balance === 0 as 'Server initializing'.
   if (!rateRec || !balanceRec) {
-    return api.respond('Server initializing');
+    return res.json({err: 'Server initializing'});
   }
 
   var now = Date.now();
   if (now - rateRec.timestamp > STALE_TICKER) {
-    return api.respond('Stale ticker');
+    return res.json({err: 'Stale ticker'});
   }
 
   if (now - balanceRec.timestamp > STALE_BALANCE) {
-    return api.respond('Stale balance');
+    return res.json({err: 'Stale balance'});
   }
 
   var rate = rateRec.rate;
-  if (rate === null) return api.respond('No rate available');
+  if (rate === null) return res.json({err: 'No rate available'});
   var fiatBalance = _trader.fiatBalance(fingerprint);
-  if (fiatBalance === null) return api.respond('No balance available');
+  if (fiatBalance === null) return res.json({err: 'No balance available'});
 
-  api.respond(null, {
+  res.json({
+    err: null,
     rate: rate * _trader.config.exchanges.settings.commission,
     fiat: fiatBalance,
     locale: _trader.config.brain.locale,
     txLimit: parseInt(_trader.config.exchanges.settings.compliance.maximum.limit, 10),
     idVerificationLimit: 0  // DEBUG
   });
-};
+}
 
-var trade = function (req, res) {
+function trade(req, res) {
   var fingerprint = getFingerprint(req);
-  var api = prepareApi(req, res);
   _trader.trade(req.body, fingerprint);
-  api.respond();
-};
 
-var deviceEvent = function deviceEvent(req, res) {
+  res.json({err: null});
+}
+
+function deviceEvent(req, res) {
   var fingerprint = req.connection.getPeerCertificate().fingerprint;
-  var api = prepareApi(req, res);
   _trader.event(req.body, fingerprint);
-  api.respond();
+  res.json({err: null});
-};
+}
 
-var idVerify = function idVerify(req, res) {
+function idVerify(req, res) {
   // var fingerprint = req.connection.getPeerCertificate().fingerprint;
-  var api = prepareApi(req, res);
   _idVerifier.verify(req.body, function (err, idResult) {
-    api.respond(err, idResult);
+    if (err)
+      return res.json({err: 'Verification failed'});
+    res.json(idResult);
   });
-};
+}
 
-var send = function(req, res) {
+function send(req, res) {
   var fingerprint = getFingerprint(req);
-  var api = prepareApi(req, res);
   _trader.sendBitcoins(fingerprint, req.body, function(err, txHash) {
-    api.respond(err, {txHash: txHash});
+    res.json({
+      err: err && err.message,
+      txHash: txHash,
+      errType: err && err.name
     });
-};
+  });
+}
 
-var pair = function(req, res) {
+function pair(req, res) {
-  var api = prepareApi(req, res);
   var token = req.body.token;
   var name = req.body.name;
 
@@ -87,13 +95,16 @@ var pair = function(req, res) {
     getFingerprint(req),
     name,
     function(err) {
-      if (err) return api.respond(err, null, 500);
+      if (err) {
-      api.respond();
+        return res.json(500, { err: err.message });
+      }
+
+      res.json(200);
     }
   );
-};
+}
 
-exports.init = function(config) {
+function init(config) {
   _lamassuConfig = config.lamassuConfig;
   _trader = config.trader;
 
@@ -113,9 +124,9 @@ exports.init = function(config) {
   app.post('/pair', pair);
 
   return app;
-};
+}
 
 function getFingerprint(req) {
-  return req.connection.getPeerCertificate &&
+  return typeof req.connection.getPeerCertificate === 'function' &&
     req.connection.getPeerCertificate().fingerprint;
 }

lib/trader.js

@@ -21,7 +21,12 @@ var Trader = module.exports = function (db) {
 };
 
 Trader.prototype._findExchange = function (name) {
+  try {
     return require('lamassu-' + name);
+
+  } catch(_) {
+    throw new Error(name + ' module is not installed. Try running `npm install --save lamassu-' + name + '` first');
+  }
 };
 
 Trader.prototype._findTicker = function (name) {