From 6741bf21be4bed8aca73ddec1361abe688250e96 Mon Sep 17 00:00:00 2001 From: Premshree Pillai Date: Wed, 12 Jul 2017 16:15:49 -0400 Subject: [PATCH 1/2] Make supergrep work with Express 4 --- package.json | 17 ++++++++++------- stream.js | 33 ++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 1cc7ad3..ad4705c 100644 --- a/package.json +++ b/package.json @@ -26,13 +26,16 @@ } , "dependencies": { - "dateformat": ">=1.x" - , "less": "1.1.x" - , "mime": "1.2.x" - , "socket.io": "0.8.x" - , "uglify-js": "1.2.x" - , "validator": "0.3.x" - , "express": ">=2.5.x" + "body-parser": "^1.5.2" + , "dateformat": ">=1.x" + , "errorhandler": "^1.1.1" + , "less": "1.1.x" + , "mime": "1.2.x" + , "morgan": "^1.2.2" + , "socket.io": "0.8.x" + , "uglify-js": "1.2.x" + , "validator": "0.3.x" + , "express": ">=2.5.x" } , "engines": { "node": ">= 0.6.0" } diff --git a/stream.js b/stream.js index 0567c86..9e02c6d 100644 --- a/stream.js +++ b/stream.js @@ -1,13 +1,16 @@ -var fs = require('fs'); -var qs = require('querystring'); -var net = require('net'); -var path = require('path'); -var exec = require("child_process").exec; -var express = require('express'); -var socketio = require('socket.io'); -var less = require('less'); -var uglify = require('uglify-js'); -var LogReader = require('./lib/logreader'); +var bodyParser = require('body-parser') +var errorHandler = require('errorhandler') +var fs = require('fs'); +var qs = require('querystring'); +var net = require('net'); +var path = require('path'); +var exec = require("child_process").exec; +var express = require('express'); +var socketio = require('socket.io'); +var logger = require('morgan'); +var less = require('less'); +var uglify = require('uglify-js'); +var LogReader = require('./lib/logreader'); var STATIC_PATH = '/static'; @@ -56,13 +59,14 @@ var cache = { js: {}, jsc: {}, less: {} }; } } -var app = express.createServer(); +var app = express(); + //Allow JSONP support app.enable("jsonp callback"); -app.use(express.logger()); -app.use(express.bodyParser()); +app.use(logger('dev')); +app.use(bodyParser.json()); app.use(express.query()); -app.use(express.errorHandler({ dumpExceptions: true, showStack: true })); +app.use(errorHandler({ dumpExceptions: true, showStack: true })) //IRCCat proxy app.post('/irccat', function (req, res, next) { @@ -245,7 +249,6 @@ app.all('/v2/:respath?', function (req, res, next) { (qs.length ? '?' + qs.join('?') : '') ); }); -app.use(express.staticCache()); app.use(express.static(__dirname + STATIC_PATH)); server = app.listen(config.port); From b88d2f33366055e96a47d75a82a211906506d3e5 Mon Sep 17 00:00:00 2001 From: Premshree Pillai Date: Wed, 12 Jul 2017 16:38:32 -0400 Subject: [PATCH 2/2] Bump express version to be at least 4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad4705c..9bfca59 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ , "socket.io": "0.8.x" , "uglify-js": "1.2.x" , "validator": "0.3.x" - , "express": ">=2.5.x" + , "express": ">=4.0.0" } , "engines": { "node": ">= 0.6.0" }