Updated socketio

contrib/buzzer.click.service

@@ -0,0 +1,27 @@
+# systemd service file to start buzzer.click
+
+[Unit]
+Description=Buzzer.click is an online synchronous quiz game
+Wants=network.target
+
+[Service]
+Type=simple
+# Run as normal user - feel free to change...
+User=buzzer
+Group=software
+WorkingDirectory=/var/www/buzzer.click
+Nice=0
+Environment="PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/node/bin"
+Environment="port=3000"
+Environment="ip=localhost"
+ExecStart=/usr/bin/env node server.js 
+# Use SIGINT to stop
+KillSignal=SIGINT
+# Auto restart on crash
+Restart=on-failure
+# Tag things in the log
+SyslogIdentifier=buzzer.click
+#StandardOutput=syslog
+
+[Install]
+WantedBy=multi-user.target

package.json

@@ -7,8 +7,8 @@
     "node": "6.5.0"
   },
   "scripts": {
-    "tests-bdd": "Mocha tests/BDD/**/*.js --reporter mochawesome --reporter-options reportDir=Docs/Test-BDD",
-    "tests-functional": "Mocha tests/Functional/**/*.js --reporter mochawesome --reporter-options reportDir=Docs/Test-Functional",
+    "tests-bdd": "mocha tests/BDD/**/*.js --reporter mochawesome --reporter-options reportDir=Docs/Test-BDD",
+    "tests-functional": "mocha tests/Functional/**/*.js --reporter mochawesome --reporter-options reportDir=Docs/Test-Functional",
     "build": "browserify browser.js --standalone buzzapi -o www/js/bundle.js",
     "watch": "watchify browser.js --standalone buzzapi -o www/js/bundle.js -verbose",
     "beautify-solution": "node beautify-solution.js",
@@ -31,8 +31,8 @@
     "node-uuid": "^1.4.7",
     "random-js": "^1.0.8",
     "semver": "^5.0.1",
-    "socket.io": "1.3.*",
-    "socket.io-client": "^1.3.6",
+    "socket.io": "^2.0.3",
+    "socket.io-client": "^2.0.3",
     "socketio-wildcard": "^0.3.0"
   },
   "devDependencies": {

server.js

@@ -6,7 +6,9 @@ var express = require('express');
 var BuzzerServer = require('./lib/BuzzerServer');
 
 var app = express();
-var server = http.createServer(app).listen(process.env.port ? process.env.port : 3000);
+var server = http.createServer(app).listen(
+    process.env.port ? process.env.port : 3000, process.env.ip ? process.env.ip : undefined
+);
 BuzzerServer.listen(server);
 
 //Publish the www directory

tests/BDD/lib/TeamsTests.js

@@ -4,7 +4,7 @@ var should = require('should');
 
 var Teams = require('../../../lib/Teams');
 var Team = require('../../../lib/Team');
-var teamFactory = require('../../../lib/teamFactory');
+var teamFactory = require('../../../lib/TeamFactory');
 var Settings = require('../../../lib/Settings');
 var Contestant = require('../../../lib/Contestant');
 var constants = require('../../../lib/Constants');

tests/BDD/lib/message/RejoinSessionMessageTests.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 var should = require('should');
 /* eslint-enable no-unused-vars */
-var constants = require('../../../../lib/constants');
+var constants = require('../../../../lib/Constants');
 var RejoinSessionMessage = require('../../../../lib/message/RejoinSessionMessage');
 
 describe('RejoinSessionMessage', function() {

tests/BDD/lib/message/SessionInformationRequestMessageTests.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-unused-vars */
 var should = require('should');
 /* eslint-enable no-unused-vars */
-var constants = require('../../../../lib/constants');
+var constants = require('../../../../lib/Constants');
 var SessionInformationRequestMessage = require('../../../../lib/message/SessionInformationRequestMessage');
 
 describe('SessionInformationRequestMessage', function() {

tests/Functional/lib/BuzzerServerContestantTests.js

@@ -4,7 +4,7 @@ var should = require('should');
 var Settings = require('../../../lib/Settings');
 var messageFactory = require('../../../lib/MessageFactory');
 var successMessage = require('../../../lib/message/SuccessMessage');
-var constants = require('../../../lib/constants');
+var constants = require('../../../lib/Constants');
 var messageConstants = constants.socketMessageNames;
 var helper = require('./ServerTestHelper');
 var idUtility = require('../../../lib/IdentifierUtility');

tests/Functional/lib/BuzzerServerHostTests.js

@@ -4,7 +4,7 @@ var should = require('should');
 var Settings = require('../../../lib/Settings');
 var messageFactory = require('../../../lib/MessageFactory');
 var successMessage = require('../../../lib/message/SuccessMessage');
-var constants = require('../../../lib/constants');
+var constants = require('../../../lib/Constants');
 var messageConstants = constants.socketMessageNames;
 var helper = require('./ServerTestHelper');
 var idUtility = require('../../../lib/IdentifierUtility');

tests/Functional/lib/BuzzerServerObserverTests.js

@@ -4,7 +4,7 @@ var should = require('should');
 var Settings = require('../../../lib/Settings');
 var messageFactory = require('../../../lib/MessageFactory');
 var successMessage = require('../../../lib/message/SuccessMessage');
-var constants = require('../../../lib/constants');
+var constants = require('../../../lib/Constants');
 var messageConstants = constants.socketMessageNames;
 var helper = require('./ServerTestHelper');
 var idUtility = require('../../../lib/IdentifierUtility');

tests/Functional/lib/ServerTestHelper.js

@@ -7,7 +7,7 @@ var http = require('http');
 var socketIoWildcardPatch = require('socketio-wildcard')(io.Manager);
 var BuzzerServer = require('../../../lib/BuzzerServer');
 var messageFactory = require('../../../lib/MessageFactory');
-var constants = require('../../../lib/constants');
+var constants = require('../../../lib/Constants');
 var messageConstants = constants.socketMessageNames;
 var isDebug = false;