From 9c19a109eff9b3367cc5081aa61dcfeec8a01bde Mon Sep 17 00:00:00 2001 From: Henning Morud Date: Fri, 29 Aug 2014 13:59:19 +0200 Subject: [PATCH] Allow routes to be defined before calling app.listen() --- examples/simple.js | 8 ++------ index.js | 9 ++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/examples/simple.js b/examples/simple.js index 4e7e7a5..f562dbc 100755 --- a/examples/simple.js +++ b/examples/simple.js @@ -1,22 +1,16 @@ #!/usr/bin/env node var express = require('express'); - var expressWs = require('..') - var app = expressWs(express()); -app.listen(3000) - - app.use(function (req, res, next) { console.log('middleware'); req.testing = 'testing'; return next(); }); - app.get('/', function(req, res, next){ console.log('get route', req.testing); res.end(); @@ -28,3 +22,5 @@ app.ws('/', function(ws, req) { }); console.log('socket', req.testing); }); + +app.listen(3000) diff --git a/index.js b/index.js index 8cffa4a..d38483b 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,6 @@ var path = require('path'); -var ServerResponse = require('http').ServerResponse; +var http = require('http'); +var ServerResponse = http.ServerResponse; var WebSocketServer = require('ws').Server; /** @@ -8,13 +9,11 @@ var WebSocketServer = require('ws').Server; */ module.exports = function (app, server) { if(!server) { - var app_listen = app.listen + var server = http.createServer(app); app.listen = function() { - server = app_listen.apply(app, arguments) - - return server + return server.listen.apply(server, arguments) } }