From a6e5df547739ac91055ae0ae4928447c9ec50a98 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Tue, 01 Jul 2014 17:49:10 +0000 Subject: clipperz middleware as a router instead of two separate handlers and static --- diff --git a/backend/node/src/app.js b/backend/node/src/app.js index bbc62f8..09dcfac 100644 --- a/backend/node/src/app.js +++ b/backend/node/src/app.js @@ -35,10 +35,11 @@ app.use(require('body-parser').urlencoded({extended:true})); app.use(require('cookie-parser')('your secret here')); app.use(require('express-session')({secret:'99 little bugs in the code', key:'sid', store: clipperz.session_store(), resave: false, saveUninitialized: false })); -app.post('/json',clipperz.json); -app.get('/dump',clipperz.dump); +/* Like this: */ +app.use(clipperz.router); +/* Or this: */ +app.use('/clz/',clipperz.router); -app.use(EXPRESS.static(PATH.join(__dirname, 'htdocs/'))); if ('development' == app.get('env')) { app.use(require('express-error-with-sources')()); } diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js index 842de31..2a3df73 100644 --- a/backend/node/src/clipperz.js +++ b/backend/node/src/clipperz.js @@ -2,6 +2,8 @@ var FS = require('fs'); var CRYPTO = require('crypto'); var BIGNUM = require('bignum'); var ASYNC = require('async'); +var EXPRESS = require('express'); +var PATH = require('path'); var express_store = require('express-session').Store; @@ -579,6 +581,10 @@ var CLIPPERZ = module.exports = function(CONFIG) { }; rv.__defineGetter__('session_store',function(){ return function(o) { return new (clipperz_store(PG))(o) } }); + (rv.router = require('express').Router()) + .post('/json',rv.json).get('/dump',rv.dump) + .use(EXPRESS.static(PATH.join(__dirname,'htdocs/'))); + return rv; }; -- cgit v0.9.0.2