From 974f00c996629608c7bed681ae6dbcf3d867aec0 Mon Sep 17 00:00:00 2001 From: yosssi Date: Mon, 7 Oct 2013 10:22:14 +0900 Subject: [PATCH 1/3] fixed some syntax mistakes. --- lib/server.js | 16 ++++++++-------- lib/util.js | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/server.js b/lib/server.js index 9bea262..86c6e6c 100644 --- a/lib/server.js +++ b/lib/server.js @@ -49,7 +49,7 @@ function PeerServer(options) { this._ips = {}; this._setCleanupIntervals(); -}; +} util.inherits(PeerServer, EventEmitter); @@ -131,8 +131,8 @@ PeerServer.prototype._configureWS = function(socket, key, id, token) { // Clean up if a Peer sends a LEAVE. if (!message.dst) { self._removePeer(key, id); - break; } + break; // ICE candidates case 'CANDIDATE': // Offer or answer between peers. @@ -150,11 +150,11 @@ PeerServer.prototype._configureWS = function(socket, key, id, token) { util.prettyError('Message unrecognized'); } } catch(e) { - throw e; util.log('Invalid message', data); + throw e; } }); -} +}; PeerServer.prototype._checkKey = function(key, ip, cb) { @@ -181,14 +181,14 @@ PeerServer.prototype._checkKey = function(key, ip, cb) { } else { cb('Invalid key provided'); } -} +}; /** Initialize HTTP server routes. */ PeerServer.prototype._initializeHTTP = function() { var self = this; this._app.use(restify.bodyParser({ mapParams: false })); - this._app.use(restify.queryParser()) + this._app.use(restify.queryParser()); this._app.use(util.allowCrossDomain); // Retrieve guaranteed random ID. @@ -332,7 +332,7 @@ PeerServer.prototype._setCleanupIntervals = function() { var keys = Object.keys(self._ips); for (var i = 0, ii = keys.length; i < ii; i += 1) { var key = keys[i]; - if (self._ips[key] == 0) { + if (self._ips[key] === 0) { delete self._ips[key]; } } @@ -383,7 +383,7 @@ PeerServer.prototype._handleTransmission = function(key, message) { destination.res.write(data); } else { // Neither socket no res available. Peer dead? - throw "Peer dead" + throw "Peer dead"; } } catch (e) { // This happens when a peer disconnects without closing connections and diff --git a/lib/util.js b/lib/util.js index fbd7ab6..8a81cf1 100644 --- a/lib/util.js +++ b/lib/util.js @@ -13,7 +13,7 @@ var util = { }); }, extend: function(dest, source) { - source = source || {} + source = source || {}; for(var key in source) { if(source.hasOwnProperty(key)) { dest[key] = source[key]; From 32381d1f2f11d9de2dbdfc08f6741ae6c7e45443 Mon Sep 17 00:00:00 2001 From: yosssi Date: Mon, 7 Oct 2013 22:25:56 +0900 Subject: [PATCH 2/3] Deleted the unused variable. --- lib/server.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/server.js b/lib/server.js index 86c6e6c..4f8657c 100644 --- a/lib/server.js +++ b/lib/server.js @@ -21,8 +21,6 @@ function PeerServer(options) { util.debug = this._options.debug; - // Set up HTTPS server if key and certificate are provided. - var secure = this._options.ssl.key && this._options.ssl.certificate; // Print warning if only one of the two is given. if (Object.keys(this._options.ssl).length === 1) { util.prettyError('Warning: PeerServer will not run on an HTTPS server' From 5affb856d8a1b28f169dabca20aac5630f5cebe5 Mon Sep 17 00:00:00 2001 From: Michelle Bu Date: Fri, 18 Oct 2013 20:04:05 -0700 Subject: [PATCH 3/3] Remove ugly switch --- lib/server.js | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/lib/server.js b/lib/server.js index 4f8657c..0e5d087 100644 --- a/lib/server.js +++ b/lib/server.js @@ -124,28 +124,15 @@ PeerServer.prototype._configureWS = function(socket, key, id, token) { try { var message = JSON.parse(data); - switch (message.type) { - case 'LEAVE': - // Clean up if a Peer sends a LEAVE. - if (!message.dst) { - self._removePeer(key, id); - } - break; - // ICE candidates - case 'CANDIDATE': - // Offer or answer between peers. - case 'OFFER': - case 'ANSWER': - // Use the ID we know to be correct to prevent spoofing. - self._handleTransmission(key, { - type: message.type, - src: id, - dst: message.dst, - payload: message.payload - }); - break; - default: - util.prettyError('Message unrecognized'); + if (['LEAVE', 'CANDIDATE', 'OFFER', 'ANSWER'].indexOf(message.type) !== -1) { + self._handleTransmission(key, { + type: message.type, + src: id, + dst: message.dst, + payload: message.payload + }); + } else { + util.prettyError('Message unrecognized'); } } catch(e) { util.log('Invalid message', data);