Chuck
@@ -28,22 +21,17 @@
Create your own!
- + +- - + +
- - - + +
+
+
+
+
+
Follow the development at http://chuck-game.tumblr.com/
diff --git a/app/Bootstrap/HttpServer.js b/app/Bootstrap/HttpServer.js
index e74a46a..a1293b2 100755
--- a/app/Bootstrap/HttpServer.js
+++ b/app/Bootstrap/HttpServer.js
@@ -1,92 +1,74 @@
define([
- 'http',
- 'node-static',
- 'Server/Api'
+ 'express',
+ 'http',
+ 'path',
+ 'Server/Api',
+ 'fs'
],
-function (http, nodeStatic, Api) {
+function (express, http, path, Api, fs) {
+
+ "use strict";
function HttpServer (options, coordinator) {
options.port = options.port || 1234;
- options.caching = typeof options.caching != 'undefined' ? options.caching : 3600;
options.rootDirectory = options.rootDirectory || './';
- this.server = null;
this.api = new Api(coordinator);
-
+ this.app = express();
+ this.server = http.createServer(this.app);
this.init(options);
}
HttpServer.prototype.init = function (options) {
var self = this;
+ var app = this.app;
- var fileServer = new nodeStatic.Server(options.rootDirectory, { cache: options.caching });
+ // Serve static files
+ app.use('/static', express.static(path.join(options.rootDirectory, 'static')));
+ app.use('/app', express.static(path.join(options.rootDirectory, 'app')));
- this.server = http.createServer(
- function (req, res) {
-
- var fullBody = '';
- req.addListener('data', function(chunk) { // doesn't work on Jeenas computer without this
- fullBody += chunk.toString();
- });
+ // Serve index.html at root
+ app.get('/', function(req, res) {
+ res.sendFile(path.resolve(options.rootDirectory, 'static/html/index.html'));
+ });
- req.addListener('error', function(err) {
- console.log('');
- });
-
-
- req.addListener('end', function () {
-
- switch(true) {
- case req.url == '/':
- fileServer.serveFile('./static/html/index.html', 200, {}, req, res);
- console.checkpoint('HTTP Server serves index');
- break;
-
- case req.url == '/game.html':
- fileServer.serveFile('./static/html/game.html', 200, {}, req, res);
- console.checkpoint('HTTP Server serves game');
- break;
-
- case req.url == '/client.js':
- fileServer.serveFile('./client.js', 200, {}, req, res);
- break;
-
- case req.url == '/require.js':
- fileServer.serveFile('./node_modules/requirejs/require.js', 200, {}, req, res);
- break;
-
- case req.url == '/screenfull.js':
- fileServer.serveFile('./node_modules/screenfull/dist/screenfull.js', 200, {}, req, res);
- break;
-
- case req.url == '/api':
- self.api.handleCall(fullBody);
- var status = self.api.isError ? 400 : 200;
- res.writeHead(status, {"Content-Type": self.api.getContentType()});
- res.end(self.api.getOutput());
- self.api.isError = false;
- break;
-
- case new RegExp(/^\/app/).test(req.url):
- fileServer.serve(req, res, function () {
- self.handleFileError(res)
- });
- break;
-
- case new RegExp(/^\/static/).test(req.url):
- fileServer.serve(req, res, function () {
- self.handleFileError(res)
- });
- break;
-
- default:
- self.handleFileError(res);
- break;
- }
- });
+ // Serve client.js and minified version
+ app.get('/client.js', function(req, res) {
+ if (process.env.NODE_ENV === 'production' && fs.existsSync(path.resolve(options.rootDirectory, 'build/client.min.js'))) {
+ res.sendFile(path.resolve(options.rootDirectory, 'build/client.min.js'));
+ } else {
+ res.sendFile(path.resolve(options.rootDirectory, 'client.js'));
}
- );
+ });
+ app.get('/client.min.js', function(req, res) {
+ res.sendFile(path.resolve(options.rootDirectory, 'build/client.min.js'));
+ });
+
+ // Serve require.js, screenfull.js, chart.js from node_modules
+ app.get('/require.js', function(req, res) {
+ res.sendFile(path.resolve(options.rootDirectory, 'node_modules/requirejs/require.js'));
+ });
+ app.get('/screenfull.js', function(req, res) {
+ res.sendFile(path.resolve(options.rootDirectory, 'static/vendor/screenfull.js'));
+ });
+ app.get('/chart.js', function(req, res) {
+ // Chart.js v4 uses 'dist/chart.umd.js'
+ res.sendFile(path.resolve(options.rootDirectory, 'node_modules/chart.js/dist/chart.umd.js'));
+ });
+
+ // API endpoint
+ app.post('/api', express.text({type: '*/*'}), function(req, res) {
+ self.api.handleCall(req.body);
+ var status = self.api.isError ? 400 : 200;
+ res.status(status).type(self.api.getContentType()).send(self.api.getOutput());
+ self.api.isError = false;
+ });
+
+ // 404 handler
+ app.use(function(req, res) {
+ res.status(404).send('@@ -28,22 +21,17 @@
- - + +
- - - + +