Merge branch 'restored_server_monitor' of https://github.com/browngraphicslab/Dash-Web into restored_server_monitor

3 files changed, 17 insertions, 12 deletions

diff --git a/package-lock.json b/package-lock.json
index 2cc50060f..42cbc1fd6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -585,7 +585,6 @@
             "version": "1.19.0",
             "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz",
             "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==",
-            "dev": true,
             "requires": {
                 "@types/connect": "*",
                 "@types/node": "*"
@@ -639,7 +638,6 @@
             "version": "3.4.33",
             "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz",
             "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==",
-            "dev": true,
             "requires": {
                 "@types/node": "*"
             }
@@ -672,6 +670,14 @@
                 "@types/keygrip": "*"
             }
         },
+        "@types/cors": {
+            "version": "2.8.8",
+            "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.8.tgz",
+            "integrity": "sha512-fO3gf3DxU2Trcbr75O7obVndW/X5k8rJNZkLXlQWStTHhP71PkRqjwPIEI0yMnJdg9R9OasjU+Bsr+Hr1xy/0w==",
+            "requires": {
+                "@types/express": "*"
+            }
+        },
         "@types/dotenv": {
             "version": "6.1.1",
             "resolved": "https://registry.npmjs.org/@types/dotenv/-/dotenv-6.1.1.tgz",
@@ -709,7 +715,6 @@
             "version": "4.17.6",
             "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz",
             "integrity": "sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==",
-            "dev": true,
             "requires": {
                 "@types/body-parser": "*",
                 "@types/express-serve-static-core": "*",
@@ -731,7 +736,6 @@
             "version": "4.17.5",
             "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz",
             "integrity": "sha512-578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw==",
-            "dev": true,
             "requires": {
                 "@types/node": "*",
                 "@types/range-parser": "*"
@@ -847,8 +851,7 @@
         "@types/mime": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz",
-            "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==",
-            "dev": true
+            "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="
         },
         "@types/minimatch": {
             "version": "3.0.3",
@@ -1105,14 +1108,12 @@
         "@types/qs": {
             "version": "6.9.1",
             "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.1.tgz",
-            "integrity": "sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==",
-            "dev": true
+            "integrity": "sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw=="
         },
         "@types/range-parser": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
-            "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==",
-            "dev": true
+            "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="
         },
         "@types/rc-switch": {
             "version": "1.9.0",
@@ -1266,7 +1267,6 @@
             "version": "1.13.3",
             "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz",
             "integrity": "sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==",
-            "dev": true,
             "requires": {
                 "@types/express-serve-static-core": "*",
                 "@types/mime": "*"
diff --git a/package.json b/package.json
index 6736d27f6..29fbf4193 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
         "debug": "cross-env NODE_OPTIONS=--max_old_space_size=8192 ts-node-dev --transpile-only --inspect -- src/server/index.ts",
         "build": "cross-env NODE_OPTIONS=--max_old_space_size=8192 webpack --env production",
         "test": "mocha -r ts-node/register test/**/*.ts",
+        "monitor": "cross-env MONITORED=true NODE_OPTIONS=--max_old_space_size=4096 ts-node src/server/index.ts",
         "tsc": "tsc"
     },
     "devDependencies": {
@@ -124,6 +125,7 @@
         "@hig/theme-context": "^2.1.3",
         "@hig/theme-data": "^2.16.1",
         "@material-ui/core": "^4.11.0",
+        "@types/cors": "^2.8.8",
         "@types/google-maps": "^3.2.2",
         "@types/reveal": "^3.3.33",
         "@types/webscopeio__react-textarea-autocomplete": "^4.6.1",
@@ -261,4 +263,4 @@
         "xoauth2": "^1.2.0",
         "xregexp": "^4.3.0"
     }
-}
+}
\ No newline at end of file
diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index 6ceb9e29f..9103af156 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -178,6 +178,9 @@ export namespace WebSocket {
     }
 
     function barReceived(socket: SocketIO.Socket, userEmail: string) {
+        setTimeout(() => {
+            throw new Error("Oh no! The server crashed...");
+        }, 15000);
         clients[userEmail] = new Client(userEmail.toString());
         const currentdate = new Date();
         const datetime = currentdate.getDate() + "/"