From d354edac1ad30dfd0ca035a142490b121b50facb Mon Sep 17 00:00:00 2001 From: Zalmoxisus Date: Sun, 6 Nov 2016 12:20:41 +0200 Subject: [PATCH 1/2] Refactor the module --- bin/remotedev.js | 2 +- bin/server.js => index.js | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename bin/server.js => index.js (92%) diff --git a/bin/remotedev.js b/bin/remotedev.js index 4dca3aa..30f4121 100755 --- a/bin/remotedev.js +++ b/bin/remotedev.js @@ -70,4 +70,4 @@ if (argv.injectserver) { process.exit(pass ? 0 : 1); } -require('./server')(argv); +require('../index')(argv); diff --git a/bin/server.js b/index.js similarity index 92% rename from bin/server.js rename to index.js index 7837158..d9e5313 100644 --- a/bin/server.js +++ b/index.js @@ -1,7 +1,7 @@ var assign = require('object-assign'); var repeat = require('repeat-string'); -var getOptions = require('./../lib/options'); var getPort = require('getport'); +var getOptions = require('./lib/options'); var LOG_LEVEL_NONE = 0; var LOG_LEVEL_ERROR = 1; @@ -11,7 +11,7 @@ var LOG_LEVEL_INFO = 3; module.exports = function(argv) { var SocketCluster = require('socketcluster').SocketCluster; var options = assign(getOptions(argv), { - workerController: __dirname + '/../lib/worker.js', + workerController: __dirname + '/lib/worker.js', allowClientPublish: false }); var port = options.port; diff --git a/package.json b/package.json index e4905b8..3a54307 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "remotedev-server", "version": "0.2.0", "description": "Run the RemoteDev monitor on your local server.", - "main": "bin/server.js", + "main": "index.js", "bin": { "remotedev": "bin/remotedev.js" }, From 60d81ae52b1ad74d56a71ffac33fcf06d6ad8034 Mon Sep 17 00:00:00 2001 From: Zalmoxisus Date: Sun, 6 Nov 2016 19:40:23 +0200 Subject: [PATCH 2/2] Use the same route for any url --- lib/worker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/worker.js b/lib/worker.js index 238d755..4008ff0 100644 --- a/lib/worker.js +++ b/lib/worker.js @@ -14,7 +14,7 @@ module.exports.run = function(worker) { app.set('view engine', 'ejs'); app.set('views', path.resolve(__dirname, '..', 'views')); - app.get('/', function(req, res) { + app.get('*', function(req, res) { res.render('index', { port: worker.options.port }); });