Migrate to Express 4 and resolve deprecated notices

.gitignore

@@ -1,5 +1,9 @@
-node_modules
+.idea
+
 config/development.yaml
 config/production.yaml
 config/runtime.json
-.idea
+
+node_modules
+tmp
+phantomjs

app.js

@@ -22,14 +22,9 @@ process.on('SIGINT', function () {
 // web service
 var app = express();
 app.use(express.static(__dirname + '/public'));
-app.use(app.router);
 app.set('rasterizerService', new RasterizerService(config.rasterizer).startService());
 app.set('fileCleanerService', new FileCleanerService(config.cache.lifetime));
 
-if (app.get('env') == 'development') {
-    app.use(express.errorHandler({dumpExceptions: true, showStack: true}));
-}
-
 require('./routes')(app, config.server.useCors);
 app.listen(config.server.port);
 console.log('Express server listening on ' + config.server.host + ':' + config.server.port);

config/default.yaml

@@ -2,7 +2,7 @@ rasterizer:
   command: phantomjs   # phantomjs executable
   port: 3001           # internal service port. No need to allow inbound or outbound access to this port
   host: '127.0.0.1'    # host to listen on
-  path: 'tmp/'         # where the screenshot files are stored
+  path: /tmp           # where the screenshot files are stored
   viewport: '1024x600' # browser window size. Height frows according to the content
 cache:
   lifetime: 60000      # one minute, set to 0 for no cache

lib/rasterizerService.js

@@ -93,7 +93,7 @@ RasterizerService.prototype.pingService = function () {
     }
     var self = this;
     request('http://localhost:' + this.getPort() + '/healthCheck', function (error, response) {
-        if (error || response.statusCode != 200) {
+        if (error || response.statusCode !== 200) {
             return;
         }
         self.lastHealthCheckDate = Date.now();

package.json

@@ -7,9 +7,10 @@
     "node": ">=0.8.4"
   },
   "dependencies": {
-    "config": "0.4.15",
-    "express": "3.x",
-    "request": "2.9.153"
+    "config": "^1.26.2",
+    "express": "^4.15.4",
+    "js-yaml": "^3.10.0",
+    "request": "^2.81.0"
   },
   "scripts": {
     "start": "node app"

routes/index.js

@@ -1,7 +1,6 @@
 var utils = require('../lib/utils');
 var join = require('path').join;
 var fs = require('fs');
-var path = require('path');
 var request = require('request');
 
 module.exports = function (app, useCors) {
@@ -10,11 +9,12 @@ module.exports = function (app, useCors) {
 
     // routes
     app.get('/', function (req, res, next) {
-        if (!req.param('url', false)) {
+        var rawUrl = req.query.url || false;
+        if (!rawUrl) {
             return res.redirect('/usage.html');
         }
 
-        var url = utils.url(req.param('url'));
+        var url = utils.url(rawUrl);
         // required options
         var options = {
             uri: 'http://localhost:' + rasterizerService.getPort() + '/',
@@ -32,8 +32,9 @@ module.exports = function (app, useCors) {
             'password',
             'delay'
         ].forEach(function (name) {
-            if (req.param(name, false)) {
-                options.headers[name] = req.param(name);
+            var header = req.query[name] || false;
+            if (header) {
+                options.headers[name] = header;
             }
         });
 
@@ -42,7 +43,7 @@ module.exports = function (app, useCors) {
 
         var filePath = join(rasterizerService.getPath(), filename);
 
-        var callbackUrl = req.param('callback', false) ? utils.url(req.param('callback')) : false;
+        var callbackUrl = req.query.callback ? utils.url(req.query.callback) : false;
 
         if (fs.existsSync(filePath)) {
             console.log('Request for %s - Found in cache', url);
@@ -93,12 +94,12 @@ module.exports = function (app, useCors) {
 
     var callRasterizer = function (rasterizerOptions, callback) {
         request.get(rasterizerOptions, function (error, response, body) {
-            if (error || response.statusCode != 200) {
+            if (error || response.statusCode !== 200) {
                 console.log('Error while requesting the rasterizer: %s', error.message);
                 rasterizerService.restartService();
                 return callback(new Error(body));
             }
-            else if (body.indexOf('Error: ') == 0) {
+            if (body.indexOf('Error: ') === 0) {
                 var errmsg = body.substring(7);
                 console.log('Error while requesting the rasterizer: %s', errmsg);
                 return callback(new Error(errmsg));
@@ -129,7 +130,7 @@ module.exports = function (app, useCors) {
             res.setHeader("Access-Control-Allow-Origin", "*");
             res.setHeader("Access-Control-Expose-Headers", "Content-Type");
         }
-        res.sendfile(imagePath, function (err) {
+        res.sendFile(imagePath, function (err) {
             fileCleanerService.addFile(imagePath);
             callback(err);
         });