github/peerjs-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bin/peerjs

Browse Source
This commit is contained in:
lmb 2014-10-18 13:23:09 +01:00
parent eb4f31dabd
commit be66a1b346
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bin/peerjs
View File

@ -4,7 +4,8 @@ var path = require('path')
, pkg = require('../package.json') , pkg = require('../package.json')
, fs = require('fs') , fs = require('fs')
, version = pkg.version , version = pkg.version
, PeerServer = require('../lib')() , app = require('express')()
, PeerServer = require('../lib')
, opts = require('optimist') , opts = require('optimist')
.usage('Usage: $0') .usage('Usage: $0')
.options({ .options({
@ -75,8 +76,10 @@ process.on('uncaughtException', function(e) {
console.error('Error: ' + e); console.error('Error: ' + e);
}); });
var server = new PeerServer(opts); opts.server = app.listen(opts.port);
server.listen(opts.port);
app.use(PeerServer(opts));
console.log( console.log(
'Started PeerServer, port: ' + opts.port + ', path: ' + (opts.path || '/') + (" (v. %s)"), version 'Started PeerServer, port: ' + opts.port + ', path: ' + (opts.path || '/') + (" (v. %s)"), version
); );

14
lib/index.js
View File

@ -4,12 +4,7 @@ var proto = require('./server');
var util = require('./util'); var util = require('./util');
var http = require('http'); var http = require('http');
exports = module.exports = {
PeerServer: createPeerServer
};
function createPeerServer(options, callback) { function createPeerServer(options, callback) {
var app = express(); var app = express();
mixin(app, proto); mixin(app, proto);
@ -62,16 +57,13 @@ function createPeerServer(options, callback) {
app._server = options.server; app._server = options.server;
if (app.options.port) {
app._server = http.createServer(app);
app._server.listen(options.port, options.host, callback);
}
if (!app._server) { if (!app._server) {
throw new Error('Neither port or server is passed to constructor - can\'t start PeerServer'); throw new Error('Server is not passed to constructor - can\'t start PeerServer');
} }
app._initializeWSS(); app._initializeWSS();
return app; return app;
} }
exports = module.exports = createPeerServer;