Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions lib/server.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

var fs = require('fs');
var qs = require('qs');
var path = require('path');
var util = require('util');
var http = require('http');
var https = require('https');
var events = require('events');
var parse = require('url').parse;
var debug = require('debug')('tinylr:server');
Expand All @@ -12,8 +12,6 @@ var constants = require('constants');

var config = require('../package.json');

module.exports = Server;

function Server(options) {
options = this.options = options || {};
events.EventEmitter.call(this);
Expand All @@ -32,13 +30,20 @@ function Server(options) {
this.configure(options.app);
}

module.exports = Server;

util.inherits(Server, events.EventEmitter);

Server.prototype.configure = function configure(app) {
debug('Configuring %s', app ? 'connect / express application' : 'HTTP server');

if(!app) {
this.server = http.createServer(this.handler.bind(this));
if (this.options.key && this.options.cert) {
this.server = https.createServer(this.options, this.handler.bind(this));
}
else {
this.server = http.createServer(this.handler.bind(this));
}
this.server.on('upgrade', this.websocketify.bind(this));
this.server.on('error', this.error.bind(this));
return this;
Expand Down