From eefdb9965a931c46404f3111adf54d54b45512ed Mon Sep 17 00:00:00 2001
From: Alex <atm2g19@soton.ac.uk>
Date: Sat, 11 Apr 2020 15:22:54 +0100
Subject: [PATCH] added dev mode for non-https

---
 package.json  |  2 +-
 src/server.ts | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index bf14426..b93fcd1 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
 	"main": "server.js",
 	"scripts": {
 		"run": "export PORT=443; node server.js",
-		"test": "export PORT=8443; export DEBUG=1; node server.js"
+		"test": "export PORT=8080; export DEBUG=1; export DEV=1; node server.js"
 	},
 	"author": "Alex Mansfield",
 	"license": "ISC",
diff --git a/src/server.ts b/src/server.ts
index 1c368c5..7b6c370 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -29,21 +29,30 @@ import {
 const upload = multer();
 const app: express.Application = express();
 const PORT: number = parseInt(process.env.PORT) || 8080;
+const DEV: boolean = process.env.DEV ? true : false;
 
 const SSL_OPTS = {
 	key: readFileSync(".security/origin.priv"),
 	cert: readFileSync(".security/origin.pem"),
 }
 
-let secServ = createServer(SSL_OPTS, app);
-secServ.listen(PORT, () => {
-	console.log(`listening on port:${PORT}`);
-});
+let server;
+if (DEV) {
+	server = app.listen(PORT, () => {
+		console.log(`listening on port:${PORT}`);
+	})
+} else {
+	server = createServer(SSL_OPTS, app)
+		.listen(PORT, () => {
+			console.log(`listening on port:${PORT}`);
+		});
+}
+
 
 // let server = app.listen(PORT, () => {
 // 	console.log(`Listening on port ${PORT}`)
 // });
-const GAMES = game_api(secServ);
+const GAMES = game_api(server);
 
 
 app.use(bodyParser.json());
-- 
GitLab