hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5413 from NodeBB/nodebb-executable-refactor

Browse Source 
Refactor `nodebb`, move `build.js`, add `--dev`
v1.18.x
Julian Lam 8 years ago committed by GitHub
parent 70b20e3ff1 5aa3e6b95b
commit 1012368acd
6 changed files with 430 additions and 375 deletions
Show Stats Download Patch File Download Diff File

8
app.js
Unescape Escape View File

@ -75,7 +75,7 @@ if (nconf.get('setup') || nconf.get('install')) {
} else if (nconf.get('reset')) { } else if (nconf.get('reset')) {
async.waterfall([ async.waterfall([
async.apply(require('./src/reset').reset), async.apply(require('./src/reset').reset),
async.apply(require('./build').buildAll) async.apply(require('./src/meta/build').buildAll)
], function (err) { ], function (err) {
process.exit(err ? 1 : 0); process.exit(err ? 1 : 0);
}); });
@ -84,7 +84,7 @@ if (nconf.get('setup') || nconf.get('install')) {
} else if (nconf.get('plugins')) { } else if (nconf.get('plugins')) {
listPlugins(); listPlugins();
} else if (nconf.get('build')) { } else if (nconf.get('build')) {
require('./build').build(nconf.get('build')); require('./src/meta/build').build(nconf.get('build'));
} else { } else {
require('./src/start').start(); require('./src/start').start();
} }
@ -126,7 +126,7 @@ function setup() {
winston.info('NodeBB Setup Triggered via Command Line'); winston.info('NodeBB Setup Triggered via Command Line');
var install = require('./src/install'); var install = require('./src/install');
var build = require('./build'); var build = require('./src/meta/build');
process.stdout.write('\nWelcome to NodeBB!\n'); process.stdout.write('\nWelcome to NodeBB!\n');
process.stdout.write('\nThis looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.\n'); process.stdout.write('\nThis looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.\n');
@ -174,7 +174,7 @@ function upgrade() {
var db = require('./src/database'); var db = require('./src/database');
var meta = require('./src/meta'); var meta = require('./src/meta');
var upgrade = require('./src/upgrade'); var upgrade = require('./src/upgrade');
var build = require('./build'); var build = require('./src/meta/build');
async.series([ async.series([
async.apply(db.init), async.apply(db.init),

783
nodebb
Unescape Escape View File

@ -1,15 +1,17 @@
#!/usr/bin/env node #!/usr/bin/env node
'use strict';
try { try {
var colors = require('colors'), require('colors');
cproc = require('child_process'), var cproc = require('child_process');
argv = require('minimist')(process.argv.slice(2)), var args = require('minimist')(process.argv.slice(2));
fs = require('fs'), var fs = require('fs');
path = require('path'), var path = require('path');
request = require('request'), var request = require('request');
semver = require('semver'), var semver = require('semver');
prompt = require('prompt'), var prompt = require('prompt');
async = require('async'); var async = require('async');
} catch (e) { } catch (e) {
if (e.code === 'MODULE_NOT_FOUND') { if (e.code === 'MODULE_NOT_FOUND') {
process.stdout.write('NodeBB could not be started because it\'s dependencies have not been installed.\n'); process.stdout.write('NodeBB could not be started because it\'s dependencies have not been installed.\n');
@ -21,407 +23,460 @@ try {
} }
} }
var getRunningPid = function (callback) { if (args.dev) {
fs.readFile(__dirname + '/pidfile', { process.env.NODE_ENV = 'development';
encoding: 'utf-8' }
}, function (err, pid) {
if (err) { function getRunningPid(callback) {
return callback(err); fs.readFile(__dirname + '/pidfile', {
encoding: 'utf-8'
}, function (err, pid) {
if (err) {
return callback(err);
}
try {
process.kill(parseInt(pid, 10), 0);
callback(null, parseInt(pid, 10));
} catch(e) {
callback(e);
}
});
}
function getCurrentVersion(callback) {
fs.readFile(path.join(__dirname, 'package.json'), { encoding: 'utf-8' }, function (err, pkg) {
if (err) {
return callback(err);
}
try {
pkg = JSON.parse(pkg);
return callback(null, pkg.version);
} catch(err) {
return callback(err);
}
});
}
function fork(args) {
return cproc.fork('app.js', args, {
cwd: __dirname,
silent: false
});
}
function getInstalledPlugins(callback) {
async.parallel({
files: async.apply(fs.readdir, path.join(__dirname, 'node_modules')),
deps: async.apply(fs.readFile, path.join(__dirname, 'package.json'), { encoding: 'utf-8' })
}, function (err, payload) {
if (err) {
return callback(err);
}
var isNbbModule = /^nodebb-(?:plugin|theme|widget|rewards)-[\w\-]+$/,
moduleName, isGitRepo;
payload.files = payload.files.filter(function (file) {
return isNbbModule.test(file);
});
try {
payload.deps = JSON.parse(payload.deps).dependencies;
payload.bundled = [];
payload.installed = [];
} catch (err) {
return callback(err);
}
for (moduleName in payload.deps) {
if (isNbbModule.test(moduleName)) {
payload.bundled.push(moduleName);
} }
}
// Whittle down deps to send back only extraneously installed plugins/themes/etc
payload.files.forEach(function (moduleName) {
try { try {
process.kill(parseInt(pid, 10), 0); fs.accessSync(path.join(__dirname, 'node_modules/' + moduleName, '.git'));
callback(null, parseInt(pid, 10)); isGitRepo = true;
} catch(e) { } catch(e) {
callback(e); isGitRepo = false;
}
});
},
getCurrentVersion = function (callback) {
fs.readFile(path.join(__dirname, 'package.json'), { encoding: 'utf-8' }, function (err, pkg) {
if (err) {
return callback(err);
} }
try { if (
pkg = JSON.parse(pkg); payload.files.indexOf(moduleName) !== -1 && // found in `node_modules/`
return callback(null, pkg.version); payload.bundled.indexOf(moduleName) === -1 && // not found in `package.json`
} catch(err) { !fs.lstatSync(path.join(__dirname, 'node_modules/' + moduleName)).isSymbolicLink() && // is not a symlink
return callback(err); !isGitRepo // .git/ does not exist, so it is not a git repository
) {
payload.installed.push(moduleName);
} }
}); });
},
fork = function (args) {
cproc.fork('app.js', args, {
cwd: __dirname,
silent: false
});
},
getInstalledPlugins = function (callback) {
async.parallel({
files: async.apply(fs.readdir, path.join(__dirname, 'node_modules')),
deps: async.apply(fs.readFile, path.join(__dirname, 'package.json'), { encoding: 'utf-8' })
}, function (err, payload) {
if (err) {
return callback(err);
}
var isNbbModule = /^nodebb-(?:plugin|theme|widget|rewards)-[\w\-]+$/, getModuleVersions(payload.installed, callback);
moduleName, isGitRepo; });
}
function getModuleVersions(modules, callback) {
var versionHash = {};
payload.files = payload.files.filter(function (file) { async.eachLimit(modules, 50, function (module, next) {
return isNbbModule.test(file); fs.readFile(path.join(__dirname, 'node_modules/' + module + '/package.json'), { encoding: 'utf-8' }, function (err, pkg) {
}); if (err) {
return next(err);
}
try { try {
payload.deps = JSON.parse(payload.deps).dependencies; pkg = JSON.parse(pkg);
payload.bundled = []; versionHash[module] = pkg.version;
payload.installed = []; next();
} catch (err) { } catch (err) {
return callback(err); next(err);
} }
});
}, function (err) {
callback(err, versionHash);
});
}
function checkPlugins(standalone, callback) {
if (standalone) {
process.stdout.write('Checking installed plugins and themes for updates... ');
}
for (moduleName in payload.deps) { async.waterfall([
if (isNbbModule.test(moduleName)) { async.apply(async.parallel, {
payload.bundled.push(moduleName); plugins: async.apply(getInstalledPlugins),
} version: async.apply(getCurrentVersion)
}),
function (payload, next) {
var toCheck = Object.keys(payload.plugins);
if (!toCheck.length) {
process.stdout.write('OK'.green + '\n'.reset);
return next(null, []); // no extraneous plugins installed
} }
// Whittle down deps to send back only extraneously installed plugins/themes/etc request({
payload.files.forEach(function (moduleName) { method: 'GET',
try { url: 'https://packages.nodebb.org/api/v1/suggest?version=' + payload.version + '&package[]=' + toCheck.join('&package[]='),
fs.accessSync(path.join(__dirname, 'node_modules/' + moduleName, '.git')); json: true
isGitRepo = true; }, function (err, res, body) {
} catch(e) {
isGitRepo = false;
}
if (
payload.files.indexOf(moduleName) !== -1 // found in `node_modules/`
&& payload.bundled.indexOf(moduleName) === -1 // not found in `package.json`
&& !fs.lstatSync(path.join(__dirname, 'node_modules/' + moduleName)).isSymbolicLink() // is not a symlink
&& !isGitRepo // .git/ does not exist, so it is not a git repository
) {
payload.installed.push(moduleName);
}
});
getModuleVersions(payload.installed, callback);
});
},
getModuleVersions = function (modules, callback) {
var versionHash = {};
async.eachLimit(modules, 50, function (module, next) {
fs.readFile(path.join(__dirname, 'node_modules/' + module + '/package.json'), { encoding: 'utf-8' }, function (err, pkg) {
if (err) { if (err) {
process.stdout.write('error'.red + '\n'.reset);
return next(err); return next(err);
} }
process.stdout.write('OK'.green + '\n'.reset);
try { if (!Array.isArray(body) && toCheck.length === 1) {
pkg = JSON.parse(pkg); body = [body];
versionHash[module] = pkg.version;
next();
} catch (err) {
next(err);
} }
var current, suggested,
upgradable = body.map(function (suggestObj) {
current = payload.plugins[suggestObj.package];
suggested = suggestObj.version;
if (suggestObj.code === 'match-found' && semver.gt(suggested, current)) {
return {
name: suggestObj.package,
current: current,
suggested: suggested
};
} else {
return null;
}
}).filter(Boolean);
next(null, upgradable);
}); });
}, function (err) {
callback(err, versionHash);
});
},
checkPlugins = function (standalone, callback) {
if (standalone) {
process.stdout.write('Checking installed plugins and themes for updates... ');
} }
], callback);
}
function upgradePlugins(callback) {
var standalone = false;
if (typeof callback !== 'function') {
callback = function () {};
standalone = true;
}
async.waterfall([ checkPlugins(standalone, function (err, found) {
async.apply(async.parallel, { if (err) {
plugins: async.apply(getInstalledPlugins), process.stdout.write('\Warning'.yellow + ': An unexpected error occured when attempting to verify plugin upgradability\n'.reset);
version: async.apply(getCurrentVersion) return callback(err);
}), }
function (payload, next) {
var toCheck = Object.keys(payload.plugins);
if (!toCheck.length) {
process.stdout.write('OK'.green + '\n'.reset);
return next(null, []); // no extraneous plugins installed
}
request({ if (found && found.length) {
method: 'GET', process.stdout.write('\nA total of ' + String(found.length).bold + ' package(s) can be upgraded:\n');
url: 'https://packages.nodebb.org/api/v1/suggest?version=' + payload.version + '&package[]=' + toCheck.join('&package[]='), found.forEach(function (suggestObj) {
json: true process.stdout.write(' * '.yellow + suggestObj.name.reset + ' (' + suggestObj.current.yellow + ' -> '.reset + suggestObj.suggested.green + ')\n'.reset);
}, function (err, res, body) { });
if (err) { process.stdout.write('\n');
process.stdout.write('error'.red + '\n'.reset); } else {
return next(err); if (standalone) {
} process.stdout.write('\nAll packages up-to-date!'.green + '\n'.reset);
process.stdout.write('OK'.green + '\n'.reset); }
return callback();
}
if (!Array.isArray(body) && toCheck.length === 1) { prompt.message = '';
body = [body]; prompt.delimiter = '';
}
var current, suggested, prompt.start();
upgradable = body.map(function (suggestObj) { prompt.get({
current = payload.plugins[suggestObj.package]; name: 'upgrade',
suggested = suggestObj.version; description: 'Proceed with upgrade (y|n)?'.reset,
type: 'string'
if (suggestObj.code === 'match-found' && semver.gt(suggested, current)) { }, function (err, result) {
return {
name: suggestObj.package,
current: current,
suggested: suggested
};
} else {
return null;
}
}).filter(Boolean);
next(null, upgradable);
});
}
], callback);
},
upgradePlugins = function (callback) {
var standalone = false;
if (typeof callback !== 'function') {
callback = function () {};
standalone = true;
};
checkPlugins(standalone, function (err, found) {
if (err) { if (err) {
process.stdout.write('\Warning'.yellow + ': An unexpected error occured when attempting to verify plugin upgradability\n'.reset);
return callback(err); return callback(err);
} }
if (found && found.length) { if (['y', 'Y', 'yes', 'YES'].indexOf(result.upgrade) !== -1) {
process.stdout.write('\nA total of ' + String(found.length).bold + ' package(s) can be upgraded:\n'); process.stdout.write('\nUpgrading packages...');
var args = ['npm', 'i'];
found.forEach(function (suggestObj) { found.forEach(function (suggestObj) {
process.stdout.write(' * '.yellow + suggestObj.name.reset + ' (' + suggestObj.current.yellow + ' -> '.reset + suggestObj.suggested.green + ')\n'.reset); args.push(suggestObj.name + '@' + suggestObj.suggested);
});
require('child_process').execFile('/usr/bin/env', args, { stdio: 'ignore' }, function (err) {
if (!err) {
process.stdout.write(' OK\n'.green);
}
callback(err);
}); });
process.stdout.write('\n');
} else { } else {
if (standalone) { process.stdout.write('\nPackage upgrades skipped'.yellow + '. Check for upgrades at any time by running "'.reset + './nodebb upgrade-plugins'.green + '".\n'.reset);
process.stdout.write('\nAll packages up-to-date!'.green + '\n'.reset); callback();
}
return callback();
} }
});
});
}
prompt.message = ''; var commands = {
prompt.delimiter = ''; status: {
description: 'View the status of the NodeBB server',
prompt.start(); usage: 'Usage: ' + './nodebb status'.yellow,
prompt.get({ handler: function () {
name: 'upgrade', getRunningPid(function (err, pid) {
description: 'Proceed with upgrade (y|n)?'.reset, if (!err) {
type: 'string' process.stdout.write('\nNodeBB Running '.bold + '(pid '.cyan + pid.toString().cyan + ')\n'.cyan);
}, function (err, result) { process.stdout.write('\t"' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
if (err) { process.stdout.write('\t"' + './nodebb log'.yellow + '" to view server output\n');
return callback(err); process.stdout.write('\t"' + './nodebb restart'.yellow + '" to restart NodeBB\n\n');
} else {
process.stdout.write('\nNodeBB is not running\n'.bold);
process.stdout.write('\t"' + './nodebb start'.yellow + '" to launch the NodeBB server\n\n'.reset);
} }
});
if (['y', 'Y', 'yes', 'YES'].indexOf(result.upgrade) !== -1) { },
process.stdout.write('\nUpgrading packages...'); },
var args = ['npm', 'i']; start: {
found.forEach(function (suggestObj) { description: 'Start the NodeBB server',
args.push(suggestObj.name + '@' + suggestObj.suggested); usage: 'Usage: ' + './nodebb start'.yellow,
}); handler: function () {
process.stdout.write('\nStarting NodeBB\n'.bold);
require('child_process').execFile('/usr/bin/env', args, { stdio: 'ignore' }, function (err) { process.stdout.write(' "' + './nodebb stop'.yellow + '" to stop the NodeBB server\n');
if (!err) { process.stdout.write(' "' + './nodebb log'.yellow + '" to view server output\n');
process.stdout.write(' OK\n'.green); process.stdout.write(' "' + './nodebb restart'.yellow + '" to restart NodeBB\n\n'.reset);
}
// Spawn a new NodeBB process
callback(err); cproc.fork(__dirname + '/loader.js', {
}); env: process.env
});
},
},
stop: {
description: 'Stop the NodeBB server',
usage: 'Usage: ' + './nodebb stop'.yellow,
handler: function () {
getRunningPid(function (err, pid) {
if (!err) {
process.kill(pid, 'SIGTERM');
process.stdout.write('Stopping NodeBB. Goodbye!\n');
} else { } else {
process.stdout.write('\nPackage upgrades skipped'.yellow + '. Check for upgrades at any time by running "'.reset + './nodebb upgrade-plugins'.green + '".\n'.reset); process.stdout.write('NodeBB is already stopped.\n');
callback();
} }
}); });
}); },
}; },
restart: {
switch(process.argv[2]) { description: 'Restart the NodeBB server',
case 'status': usage: 'Usage: ' + './nodebb restart'.yellow,
getRunningPid(function (err, pid) { handler: function () {
if (!err) { getRunningPid(function (err, pid) {
process.stdout.write('\nNodeBB Running '.bold + '(pid '.cyan + pid.toString().cyan + ')\n'.cyan); if (!err) {
process.stdout.write('\t"' + './nodebb stop'.yellow + '" to stop the NodeBB server\n'); process.kill(pid, 'SIGHUP');
process.stdout.write('\t"' + './nodebb log'.yellow + '" to view server output\n'); process.stdout.write('\nRestarting NodeBB\n'.bold);
process.stdout.write('\t"' + './nodebb restart'.yellow + '" to restart NodeBB\n\n'); } else {
} else { process.stdout.write('NodeBB could not be restarted, as a running instance could not be found.\n');
process.stdout.write('\nNodeBB is not running\n'.bold); }
process.stdout.write('\t"' + './nodebb start'.yellow + '" to launch the NodeBB server\n\n'.reset); });
} },
}); },
break; log: {
description: 'Open the output log (useful for debugging)',
case 'start': usage: 'Usage: ' + './nodebb log'.yellow,
process.stdout.write('\nStarting NodeBB\n'.bold); handler: function () {
process.stdout.write(' "' + './nodebb stop'.yellow + '" to stop the NodeBB server\n'); process.stdout.write('\nHit '.red + 'Ctrl-C '.bold + 'to exit'.red);
process.stdout.write(' "' + './nodebb log'.yellow + '" to view server output\n'); process.stdout.write('\n\n'.reset);
process.stdout.write(' "' + './nodebb restart'.yellow + '" to restart NodeBB\n\n'.reset); cproc.spawn('tail', ['-F', './logs/output.log'], {
cwd: __dirname,
// Spawn a new NodeBB process stdio: 'inherit'
cproc.fork(__dirname + '/loader.js', { });
env: process.env },
}); },
break; slog: {
description: 'Start the NodeBB server and view the live output log',
case 'slog': usage: 'Usage: ' + './nodebb slog'.yellow,
process.stdout.write('\nStarting NodeBB with logging output\n'.bold); handler: function () {
process.stdout.write('\nHit '.red + 'Ctrl-C '.bold + 'to exit'.red); process.stdout.write('\nStarting NodeBB with logging output\n'.bold);
process.stdout.write('\n\n'.reset); process.stdout.write('\nHit '.red + 'Ctrl-C '.bold + 'to exit'.red);
process.stdout.write('\n\n'.reset);
// Spawn a new NodeBB process
cproc.fork(__dirname + '/loader.js', { // Spawn a new NodeBB process
env: process.env cproc.fork(__dirname + '/loader.js', {
}); env: process.env
cproc.spawn('tail', ['-F', './logs/output.log'], { });
cwd: __dirname, cproc.spawn('tail', ['-F', './logs/output.log'], {
stdio: 'inherit' cwd: __dirname,
}); stdio: 'inherit'
break; });
},
case 'stop': },
getRunningPid(function (err, pid) { dev: {
if (!err) { description: 'Start NodeBB in verbose development mode',
process.kill(pid, 'SIGTERM'); usage: 'Usage: ' + './nodebb dev'.yellow,
process.stdout.write('Stopping NodeBB. Goodbye!\n'); handler: function () {
} else { process.env.NODE_ENV = 'development';
process.stdout.write('NodeBB is already stopped.\n'); cproc.fork(__dirname + '/loader.js', ['--no-daemon', '--no-silent'], {
} env: process.env
}); });
break; },
},
case 'restart': build: {
getRunningPid(function (err, pid) { description: 'Compile static assets (CSS, Javascript, etc)',
if (!err) { usage: 'Usage: ' + './nodebb build'.yellow + ' [js,clientCSS,acpCSS,tpl,lang]'.red + '\n' +
process.kill(pid, 'SIGHUP'); ' e.g. ' + './nodebb build js,tpl'.yellow + '\tbuilds JS and templates\n' +
process.stdout.write('\nRestarting NodeBB\n'.bold); ' ' + './nodebb build'.yellow + '\t\tbuilds all targets\n',
} else { handler: function () {
process.stdout.write('NodeBB could not be restarted, as a running instance could not be found.\n'); var arr = ['--build'].concat(process.argv.slice(3));
} fork(arr);
}); },
break; },
setup: {
description: 'Run the NodeBB setup script',
usage: 'Usage: ' + './nodebb setup'.yellow,
handler: function () {
var arr = ['--setup'].concat(process.argv.slice(3));
fork(arr);
},
},
reset: {
description: 'Disable plugins and restore the default theme',
usage: 'Usage: ' + './nodebb reset '.yellow + '{-t|-p|-w|-s|-a}'.red + '\n' +
' -t <theme>\tuse specified theme\n' +
' -p <plugin>\tdisable specified plugin\n' +
'\n' +
' -t\t\tuse default theme\n' +
' -p\t\tdisable all but core plugins\n' +
' -w\t\twidgets\n' +
' -s\t\tsettings\n' +
' -a\t\tall of the above\n',
handler: function () {
var arr = ['--reset'].concat(process.argv.slice(3));
fork(arr);
},
},
activate: {
description: 'Activate a plugin for the next startup of NodeBB',
usage: 'Usage: ' + './nodebb activate <plugin>'.yellow,
handler: function () {
var arr = ['--activate=' + args._[1]].concat(process.argv.slice(4));
fork(arr);
},
},
plugins: {
description: 'List all installed plugins',
usage: 'Usage: ' + './nodebb plugins'.yellow,
handler: function () {
var arr = ['--plugins'].concat(process.argv.slice(3));
fork(arr);
},
},
upgrade: {
description: 'Run NodeBB upgrade scripts, ensure packages are up-to-date',
usage: 'Usage: ' + './nodebb upgrade'.yellow,
handler: function () {
async.series([
function (next) {
process.stdout.write('1. '.bold + 'Bringing base dependencies up to date... '.yellow);
cproc.exec('npm i --production', { cwd: __dirname, stdio: 'ignore' }, next);
},
function (next) {
process.stdout.write('OK\n'.green);
process.stdout.write('2. '.bold + 'Checking installed plugins for updates... '.yellow);
upgradePlugins(next);
},
function (next) {
process.stdout.write('3. '.bold + 'Updating NodeBB data store schema...\n'.yellow);
var arr = ['--upgrade'].concat(process.argv.slice(3));
var upgradeProc = fork(arr);
upgradeProc.on('close', next);
}
], function (err) {
if (err) {
process.stdout.write('\nError'.red + ': ' + err.message + '\n');
} else {
var message = 'NodeBB Upgrade Complete!';
// some consoles will return undefined/zero columns, so just use 2 spaces in upgrade script if we can't get our column count
var columns = process.stdout.columns;
var spaces = columns ? new Array(Math.floor(columns / 2) - (message.length / 2) + 1).join(' ') : " ";
case 'reload': process.stdout.write('OK\n'.green);
getRunningPid(function (err, pid) { process.stdout.write('\n' + spaces + message.green.bold + '\n\n'.reset);
if (!err) { }
process.kill(pid, 'SIGUSR2'); });
} else { },
process.stdout.write('NodeBB could not be reloaded, as a running instance could not be found.\n'); },
upgradePlugins: {
hidden: true,
description: '',
handler: function () {
upgradePlugins();
},
},
help: {
description: 'Display the help message for a given command',
usage: 'Usage: ' + './nodebb help <command>'.yellow,
handler: function () {
var command = commands[args._[1]];
if (command) {
process.stdout.write(command.description + '\n'.reset);
process.stdout.write(command.usage + '\n'.reset);
return;
} }
}); var keys = Object.keys(commands).filter(function (key) {
break; return !commands[key].hidden;
});
case 'dev':
process.env.NODE_ENV = 'development';
cproc.fork(__dirname + '/loader.js', ['--no-daemon', '--no-silent'], {
env: process.env
});
break;
case 'log':
process.stdout.write('\nHit '.red + 'Ctrl-C '.bold + 'to exit'.red);
process.stdout.write('\n\n'.reset);
cproc.spawn('tail', ['-F', './logs/output.log'], {
cwd: __dirname,
stdio: 'inherit'
});
break;
case 'build': process.stdout.write('\nWelcome to NodeBB\n\n'.bold);
var args = process.argv.slice(0); process.stdout.write('Usage: ./nodebb {' + keys.join('|') + '}\n\n');
args[2] = '--' + args[2];
fork(args); var usage = keys.map(function (key) {
break; var line = '\t' + key.yellow + (key.length < 8 ? '\t\t' : '\t');
return line + commands[key].description;
}).join('\n');
case 'setup': process.stdout.write(usage + '\n'.reset);
cproc.fork('app.js', ['--setup'], { },
cwd: __dirname, },
silent: false };
});
break;
case 'reset':
var args = process.argv.slice(0);
args.unshift('--reset');
fork(args);
break;
case 'activate':
var args = process.argv.slice(0);
args.unshift('--activate=' + process.argv[3]);
fork(args);
break;
case 'plugins':
var args = process.argv.slice(0);
args.unshift('--plugins');
fork(args);
break;
case 'upgrade-plugins':
upgradePlugins();
break;
case 'upgrade':
async.series([
function (next) {
process.stdout.write('1. '.bold + 'Bringing base dependencies up to date... '.yellow);
cproc.exec('npm i --production', { cwd: __dirname, stdio: 'ignore' }, next);
},
function (next) {
process.stdout.write('OK\n'.green);
process.stdout.write('2. '.bold + 'Checking installed plugins for updates... '.yellow);
upgradePlugins(next);
},
function (next) {
process.stdout.write('3. '.bold + 'Updating NodeBB data store schema...\n'.yellow);
var upgradeProc = cproc.fork('app.js', ['--upgrade'], {
cwd: __dirname,
silent: false
});
upgradeProc.on('close', next); commands['upgrade-plugins'] = commands.upgradePlugins;
}
], function (err) {
if (err) {
process.stdout.write('\nError'.red + ': ' + err.message + '\n');
} else {
var message = 'NodeBB Upgrade Complete!';
// some consoles will return undefined/zero columns, so just use 2 spaces in upgrade script if we can't get our column count
var columns = process.stdout.columns;
var spaces = columns ? new Array(Math.floor(columns / 2) - (message.length / 2) + 1).join(' ') : " ";
process.stdout.write('OK\n'.green); if (!commands[args._[0]]) {
process.stdout.write('\n' + spaces + message.green.bold + '\n\n'.reset); commands.help.handler();
} } else {
}); commands[args._[0]].handler();
break;
default:
process.stdout.write('\nWelcome to NodeBB\n\n'.bold);
process.stdout.write('Usage: ./nodebb {start|slog|stop|reload|restart|log|build|setup|reset|upgrade|dev}\n\n');
process.stdout.write('\t' + 'start'.yellow + '\t\tStart the NodeBB server\n');
process.stdout.write('\t' + 'slog'.yellow + '\t\tStarts the NodeBB server and displays the live output log\n');
process.stdout.write('\t' + 'stop'.yellow + '\t\tStops the NodeBB server\n');
process.stdout.write('\t' + 'reload'.yellow + '\t\tRestarts NodeBB\n');
process.stdout.write('\t' + 'restart'.yellow + '\t\tRestarts NodeBB\n');
process.stdout.write('\t' + 'log'.yellow + '\t\tOpens the logging interface (useful for debugging)\n');
process.stdout.write('\t' + 'build'.yellow + '\t\tCompiles javascript, css stylesheets, and templates\n');
process.stdout.write('\t' + 'setup'.yellow + '\t\tRuns the NodeBB setup script\n');
process.stdout.write('\t' + 'reset'.yellow + '\t\tDisables all plugins, restores the default theme.\n');
process.stdout.write('\t' + 'activate'.yellow + '\tActivates a plugin for the next startup of NodeBB.\n');
process.stdout.write('\t' + 'plugins'.yellow + '\t\tList all plugins that have been installed.\n');
process.stdout.write('\t' + 'upgrade'.yellow + '\t\tRun NodeBB upgrade scripts, ensure packages are up-to-date\n');
process.stdout.write('\t' + 'dev'.yellow + '\t\tStart NodeBB in interactive development mode\n');
process.stdout.write('\n'.reset);
break;
} }

2
package.json
Unescape Escape View File

@ -12,7 +12,7 @@
"scripts": { "scripts": {
"start": "node loader.js", "start": "node loader.js",
"lint": "eslint --cache .", "lint": "eslint --cache .",
"pretest": "npm run lint", "pretest": "npm run lint && node app --build",
"test": "istanbul cover node_modules/mocha/bin/_mocha -- -R dot", "test": "istanbul cover node_modules/mocha/bin/_mocha -- -R dot",
"coveralls": "istanbul cover _mocha --report lcovonly -- -R dot && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage" "coveralls": "istanbul cover _mocha --report lcovonly -- -R dot && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
}, },

8
build.js → src/meta/build.js
Unescape Escape View File

@ -14,9 +14,9 @@ exports.buildAll = function (callback) {
exports.build = function build(targets, callback) { exports.build = function build(targets, callback) {
buildStart = Date.now(); buildStart = Date.now();
var db = require('./src/database'); var db = require('../database');
var meta = require('./src/meta'); var meta = require('../meta');
var plugins = require('./src/plugins'); var plugins = require('../plugins');
targets = (targets === true ? valid : targets.split(',').filter(function (target) { targets = (targets === true ? valid : targets.split(',').filter(function (target) {
@ -43,7 +43,7 @@ exports.build = function build(targets, callback) {
}; };
exports.buildTargets = function (targets, callback) { exports.buildTargets = function (targets, callback) {
var meta = require('./src/meta'); var meta = require('../meta');
buildStart = buildStart || Date.now(); buildStart = buildStart || Date.now();
var step = function (startTime, target, next) { var step = function (startTime, target, next) {

2
src/socket.io/admin.js
Unescape Escape View File

@ -57,7 +57,7 @@ SocketAdmin.reload = function (socket, data, callback) {
}; };
SocketAdmin.restart = function (socket, data, callback) { SocketAdmin.restart = function (socket, data, callback) {
require('../../build').buildAll(function (err) { require('../meta/build').buildAll(function (err) {
if (err) { if (err) {
return callback(err); return callback(err);
} }

2
test/mocks/databasemock.js
Unescape Escape View File

@ -143,7 +143,7 @@
nconf.set('theme_config', path.join(nconf.get('themes_path'), 'nodebb-theme-persona', 'theme.json')); nconf.set('theme_config', path.join(nconf.get('themes_path'), 'nodebb-theme-persona', 'theme.json'));
nconf.set('bcrypt_rounds', 1); nconf.set('bcrypt_rounds', 1);
require('../../build').buildAll(next); next();
}, },
function (next) { function (next) {
var webserver = require('../../src/webserver'); var webserver = require('../../src/webserver');

Write Preview
Loading…
Cancel
Save