From 496442fb77c6db40b2303d957313982fd255c701 Mon Sep 17 00:00:00 2001
From: Dunemask <dunemask@gmail.com>
Date: Sat, 14 Aug 2021 17:55:14 -0600
Subject: [PATCH] Updated package.json

---
 package.json                | 10 +++++-----
 src/{server.js => index.js} | 29 ++++++++++-------------------
 2 files changed, 15 insertions(+), 24 deletions(-)
 rename src/{server.js => index.js} (62%)

diff --git a/package.json b/package.json
index 8404db2..eb62782 100644
--- a/package.json
+++ b/package.json
@@ -2,10 +2,12 @@
   "name": "nubian",
   "version": "1.0.0",
   "description": "Express backend for Khufu",
-  "main": "server.js",
+  "main": "src/index.js",
   "scripts": {
-    "start": "node src/server.js --no-warnings",
-    "start:dev": "nodemon src/server.js"
+    "start": "node src/index.js --no-warnings",
+    "start:dev": "nodemon src/index.js",
+    "build": "npm run build:all",
+    "build:all": "docker-compose build"
   },
   "repository": {
     "type": "git",
@@ -20,10 +22,8 @@
   "dependencies": {
     "axios": "^0.21.1",
     "body-parser": "^1.19.0",
-    "cors": "^2.8.5",
     "express": "^4.17.1",
     "express-bearer-token": "^2.4.0",
-    "lodash": "^4.17.21",
     "mongoose": "^5.13.3",
     "multer": "^1.4.2",
     "path": "^0.12.7",
diff --git a/src/server.js b/src/index.js
similarity index 62%
rename from src/server.js
rename to src/index.js
index b4cf6b8..dddfe03 100644
--- a/src/server.js
+++ b/src/index.js
@@ -1,38 +1,29 @@
-//Imports
+// Imports
 const express = require("express");
-const cors = require("cors");
 const bodyParser = require("body-parser");
 const bearerToken = require("express-bearer-token");
-//Local Imports
+// Local Imports
 const { Web, StatusCode, Server } = require("./config.json");
-//Import Routers
+// Import Routers
 const stashRouter = require("./routes/stash");
-//Define Constants & Setup Database
+// Define Constants & Setup Database
 const app = express();
 const port = Server.Port;
+const timeout = 10 * 60 * 1000;
 const debuggingMode = Server.Debug;
 const viewOptions = { beautify: false };
-const corsOptions = {
-  origin: "*",
-  optionsSuccessStatus: 200,
-};
-//Set Up Express session and View engine
-app.use(cors(corsOptions));
+// Set Up Express session and View engine
 app.use(bearerToken());
 app.use(bodyParser.json({ limit: Server.BodyLimit })); // parse application/json
 app.use(bodyParser.urlencoded({ limit: Server.BodyLimit, extended: false })); // parse application/x-www-form-urlencoded
-//Test if there is a
-app.use(["/api/nubian/stash", "/api/stash", "/stash"], stashRouter);
+app.use(["/nubian/api/stash", "/api/stash", "/stash"], stashRouter);
 const startServer = () => {
-  server = app.listen(port, () => {
+  var server = app.listen(port, () => {
     console.log("Node version:" + process.versions.node);
     console.log(`Duneserver listening on port ${port}!`);
   });
-  server.timeout = 10 * 60 * 1000;
-  server.on("connection", (socket) => {
-    // 10 minutes timeout
-    socket.setTimeout(10 * 60 * 1000);
-  });
+  server.timeout = timeout;
+  server.on("connection", (socket) => socket.setTimeout(timeout));
   process.on("SIGINT", () => {
     console.log("Recieved Shutdown Signal!");
     process.exit();