Move start to scaffold start and pass the bitcore-node configuration.

bin/start.js

@@ -1,144 +1,13 @@
 'use strict';
 
-var BitcoinNode = require('..').Node;
+var start = require('../lib/scaffold/start');
-var chainlib = require('chainlib');
-var socketio = require('socket.io');
-var log = chainlib.log;
-log.debug = function() {};
 
-var configuration = {
+start({
-  datadir: process.env.BITCORENODE_DIR || '~/.bitcoin',
+  path: process.cwd(),
-  network: process.env.BITCORENODE_NETWORK || 'livenet',
+  config: {
-  port: 3000
+    datadir: process.env.BITCORENODE_DIR || '~/.bitcoin',
-};
+    network: process.env.BITCORENODE_NETWORK || 'livenet',
-
+    port: 3000
-var node = new BitcoinNode(configuration);
-
-var count = 0;
-var interval = false;
-
-function logSyncStatus() {
-  log.info('Sync Status: Tip:', node.chain.tip.hash, 'Height:', node.chain.tip.__height, 'Rate:', count/10, 'blocks per second');
-}
-
-node.on('synced', function() {
-  // Stop logging of sync status
-  clearInterval(interval);
-  interval = false;
-  logSyncStatus();
-});
-
-node.on('ready', function() {
-
-  var io = socketio(configuration.port);
-
-  io.on('connection', function(socket) {
-
-    var bus = node.openBus();
-
-    var methods = node.getAllAPIMethods();
-    var methodsMap = {};
-
-    methods.forEach(function(data) {
-      var name = data[0];
-      var instance = data[1];
-      var method = data[2];
-      var args = data[3];
-      methodsMap[name] = {
-        fn: function() {
-          return method.apply(instance, arguments);
-        },
-        args: args
-      };
-    });
-
-    socket.on('message', function(message, socketCallback) {
-      if (methodsMap[message.method]) {
-        var params = message.params;
-
-        if(!params || !params.length) {
-          params = [];
-        }
-
-        if(params.length !== methodsMap[message.method].args) {
-          return socketCallback({
-            error: {
-              message: 'Expected ' + methodsMap[message.method].args + ' parameters'
-            }
-          });
-        }
-
-        var callback = function(err, result) {
-          var response = {};
-          if(err) {
-            response.error = {
-              message: err.toString()
-            };
-          }
-
-          if(result) {
-            response.result = result;
-          }
-
-          socketCallback(response);
-        };
-
-        params = params.concat(callback);
-        methodsMap[message.method].fn.apply(this, params);
-      } else {
-        socketCallback({
-          error: {
-            message: 'Method Not Found'
-          }
-        });
-      }
-    });
-
-    socket.on('subscribe', function(name, params) {
-      bus.subscribe(name, params);
-    });
-
-    socket.on('unsubscribe', function(name, params) {
-      bus.unsubscribe(name, params);
-    });
-
-    var events = node.getAllPublishEvents();
-
-    events.forEach(function(event) {
-      bus.on(event.name, function() {
-        if(socket.connected) {
-          var results = [];
-
-          for(var i = 0; i < arguments.length; i++) {
-            results.push(arguments[i]);
-          }
-
-          var params = [event.name].concat(results);
-          socket.emit.apply(socket, params);
-        }
-      });
-    });
-
-    socket.on('disconnect', function() {
-      bus.close();
-    });
-
-  });
-
-});
-
-node.on('error', function(err) {
-  log.error(err);
-});
-
-node.chain.on('addblock', function(block) {
-  count++;
-  // Initialize logging if not already instantiated
-  if (!interval) {
-    interval = setInterval(function() {
-      logSyncStatus();
-      count = 0;
-    }, 10000);
   }
 });
 

cli/bitcore-node.js

@@ -33,11 +33,14 @@ program
 
 program
   .command('start')
-  .option('-b', '--background', 'Will start in the background')
   .description('Start the current node')
   .action(function(){
-    var config = findConfig();
+    var configInfo = findConfig(process.cwd());
-    start(config);
+    if (configInfo) {
+      start(configInfo);
+    } else {
+      throw new Error('Can not find bitcore-node.json in current path');
+    }
   });
 
 program

lib/scaffold/create.js

@@ -16,7 +16,8 @@ var BASE_CONFIG = {
     'address'
   ],
   datadir: './data',
-  network: 'livenet'
+  network: 'livenet',
+  port: 3001
 };
 
 var version;

lib/scaffold/start.js

@@ -1 +1,183 @@
 'use strict';
+
+var path = require('path');
+var socketio = require('socket.io');
+var BitcoreNode = require('../node');
+var chainlib = require('chainlib');
+var bitcore = require('bitcore');
+var _ = bitcore.deps._;
+var log = chainlib.log;
+log.debug = function() {};
+
+var count = 0;
+var interval = false;
+
+function start(options) {
+  /* jshint maxstatements: 100 */
+
+  var modules = [];
+
+  var configPath = options.path;
+  var config = options.config;
+
+  if (config.modules) {
+    for (var i = 0; i < config.modules.length; i++) {
+      var moduleName = config.modules[i];
+      var module;
+      try {
+        // first try in the built-in bitcore-node modules directory
+        module = require(path.resolve(__dirname, '../modules/' + moduleName));
+      } catch(e) {
+        // then try loading external modules
+        module = require(moduleName);
+      }
+
+      modules.push(module);
+    }
+  }
+
+  var fullConfig = _.clone(config);
+
+  // expand to the full path
+  var datadir = config.datadir.replace(/^~/, process.env.HOME);
+  fullConfig.datadir = path.resolve(configPath, datadir);
+
+  // load the modules
+  fullConfig.db = {
+    modules: modules
+  };
+
+  var node = new BitcoreNode(fullConfig);
+
+  function logSyncStatus() {
+    log.info(
+      'Sync Status: Tip:', node.chain.tip.hash,
+      'Height:', node.chain.tip.__height,
+      'Rate:', count/10, 'blocks per second'
+    );
+  }
+
+  node.on('synced', function() {
+    // Stop logging of sync status
+    clearInterval(interval);
+    interval = false;
+    logSyncStatus();
+  });
+
+  node.on('ready', function() {
+
+    var io = socketio(fullConfig.port);
+
+    io.on('connection', function(socket) {
+
+      var bus = node.openBus();
+
+      var methods = node.getAllAPIMethods();
+      var methodsMap = {};
+
+      methods.forEach(function(data) {
+        var name = data[0];
+        var instance = data[1];
+        var method = data[2];
+        var args = data[3];
+        methodsMap[name] = {
+          fn: function() {
+            return method.apply(instance, arguments);
+          },
+          args: args
+        };
+      });
+
+      socket.on('message', function(message, socketCallback) {
+        if (methodsMap[message.method]) {
+          var params = message.params;
+
+          if(!params || !params.length) {
+            params = [];
+          }
+
+          if(params.length !== methodsMap[message.method].args) {
+            return socketCallback({
+              error: {
+                message: 'Expected ' + methodsMap[message.method].args + ' parameters'
+              }
+            });
+          }
+
+          var callback = function(err, result) {
+            var response = {};
+            if(err) {
+              response.error = {
+                message: err.toString()
+              };
+            }
+
+            if(result) {
+              response.result = result;
+            }
+
+            socketCallback(response);
+          };
+
+          params = params.concat(callback);
+          methodsMap[message.method].fn.apply(this, params);
+        } else {
+          socketCallback({
+            error: {
+              message: 'Method Not Found'
+            }
+          });
+        }
+      });
+
+      socket.on('subscribe', function(name, params) {
+        bus.subscribe(name, params);
+      });
+
+      socket.on('unsubscribe', function(name, params) {
+        bus.unsubscribe(name, params);
+      });
+
+      var events = node.getAllPublishEvents();
+
+      events.forEach(function(event) {
+        bus.on(event.name, function() {
+          if(socket.connected) {
+            var results = [];
+
+            for(var i = 0; i < arguments.length; i++) {
+              results.push(arguments[i]);
+            }
+
+            var params = [event.name].concat(results);
+            socket.emit.apply(socket, params);
+          }
+        });
+      });
+
+      socket.on('disconnect', function() {
+        bus.close();
+      });
+
+    });
+
+  });
+
+  node.on('error', function(err) {
+    log.error(err);
+  });
+
+  node.chain.on('addblock', function(block) {
+    count++;
+    // Initialize logging if not already instantiated
+    if (!interval) {
+      interval = setInterval(function() {
+        logSyncStatus();
+        count = 0;
+      }, 10000);
+    }
+  });
+
+}
+
+module.exports = start;