Skip to content

Added support to disable SSL server #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support to disable SSL server #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 63 additions & 41 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,64 +7,86 @@ const pify = require('pify');
const createCert = require('create-cert');
const bodyParser = require('body-parser');

const createTestServer = (opts = {}) => createCert(opts.certificate)
.then(keys => {
const server = express();
server.http = http.createServer(server);
const createServer = (keys, opts) => {
const server = express();
server.http = http.createServer(server);

if (keys) {
server.https = https.createServer(keys, server);
server.caCert = keys.caCert;
}

server.set('etag', false);
server.set('etag', false);

if (opts.bodyParser !== false) {
server.use(bodyParser.json(Object.assign({ limit: '1mb', type: 'application/json' }, opts.bodyParser)));
server.use(bodyParser.text(Object.assign({ limit: '1mb', type: 'text/plain' }, opts.bodyParser)));
server.use(bodyParser.urlencoded(Object.assign({ limit: '1mb', type: 'application/x-www-form-urlencoded', extended: true }, opts.bodyParser)));
server.use(bodyParser.raw(Object.assign({ limit: '1mb', type: 'application/octet-stream' }, opts.bodyParser)));
}
if (opts.bodyParser !== false) {
server.use(bodyParser.json(Object.assign({ limit: '1mb', type: 'application/json' }, opts.bodyParser)));
server.use(bodyParser.text(Object.assign({ limit: '1mb', type: 'text/plain' }, opts.bodyParser)));
server.use(bodyParser.urlencoded(Object.assign({ limit: '1mb', type: 'application/x-www-form-urlencoded', extended: true }, opts.bodyParser)));
server.use(bodyParser.raw(Object.assign({ limit: '1mb', type: 'application/octet-stream' }, opts.bodyParser)));
}

const send = fn => (req, res, next) => {
const cb = typeof fn === 'function' ? fn(req, res, next) : fn;
const send = fn => (req, res, next) => {
const cb = typeof fn === 'function' ? fn(req, res, next) : fn;

Promise.resolve(cb).then(val => {
if (val) {
res.send(val);
}
});
};
Promise.resolve(cb).then(val => {
if (val) {
res.send(val);
}
});
};

const get = server.get.bind(server);
server.get = function () {
const [path, ...handlers] = [...arguments];
const get = server.get.bind(server);
server.get = function () {
const [path, ...handlers] = [...arguments];

for (const handler of handlers) {
get(path, send(handler));
}
};
for (const handler of handlers) {
get(path, send(handler));
}
};

server.listen = () => Promise.all([
server.listen = () => {
const promises = [
pify(server.http.listen.bind(server.http))().then(() => {
server.port = server.http.address().port;
server.url = `http://localhost:${server.port}`;
}),
pify(server.https.listen.bind(server.https))().then(() => {
server.sslPort = server.https.address().port;
server.sslUrl = `https://localhost:${server.sslPort}`;
})
]);
];
if (server.https) {
promises.push(
pify(server.https.listen.bind(server.https))().then(() => {
server.sslPort = server.https.address().port;
server.sslUrl = `https://localhost:${server.sslPort}`;
})
);
}
return Promise.all(promises);
};

server.close = () => Promise.all([
server.close = () => {
const promises = [
pify(server.http.close.bind(server.http))().then(() => {
server.port = undefined;
server.url = undefined;
}),
pify(server.https.close.bind(server.https))().then(() => {
server.sslPort = undefined;
server.sslUrl = undefined;
})
]);
];
if (server.https) {
promises.push(
pify(server.https.close.bind(server.https))().then(() => {
server.sslPort = undefined;
server.sslUrl = undefined;
})
);
}
return Promise.all(promises);
};

return server.listen().then(() => server);
};

return server.listen().then(() => server);
});
module.exports = (opts = {}) => {
if (opts.certificate === false) {
return createServer(null, opts);
}

module.exports = createTestServer;
return createCert(opts.certificate).then(keys => createServer(keys, opts));
};
10 changes: 10 additions & 0 deletions test/create-test-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,16 @@ test('if opts.bodyParser is false body parsing middleware is disabled', async t
});
});

test('if opts.certificate is false server wont create ssl', async t => {
const server = await createTestServer({
certificate: false
});

t.true(typeof server.sslPort === 'undefined');
t.true(typeof server.sslUrl === 'undefined');
t.true(typeof server.caCert === 'undefined');
});

test('support returning body directly', async t => {
const server = await createTestServer();

Expand Down