Heroku fix - 11

2020-03-13 20:51:33 +05:30
parent 9898a3542c
commit c1a9af6f9e
5 changed files with 34 additions and 48 deletions
--- a/client/.env.development
+++ b/client/.env.development
@@ -1 +0,0 @@
-HOST=picturestory-v2.herokuapp.com
--- a/package.json
+++ b/package.json
@@ -3,6 +3,9 @@
  "homepage": "http://mohiit1502.github.io/PictureStory-v2",
  "version": "0.1.0",
  "private": true,
+  "engines": {
+    "node": "10.x"
+  },
  "dependencies": {
    "npm-run-all": "^4.1.5"
  },
@@ -17,6 +20,6 @@
    "build": "npm run predeploy",
    "deploy": "cd client && gh-pages -d build"
  },
-  "cacheDirectories": ["client/node_modules", "server/node_modules"],
+  "cacheDirectories": ["node_modules", "client/node_modules", "server/node_modules"],
  "devDependencies": {}
 }
--- a/server/index.js
+++ b/server/index.js
@@ -2,11 +2,14 @@ const express = require('express');
 const bodyParser = require('body-parser');
 const pino = require('express-pino-logger')();
 const cors = require('cors')
+const cluster = require('cluster')
+const numCPUs = require('os').cpus().length;
 const upload = require('./filesManager/upload')
 const download = require('./filesManager/download')
 const multer = require('multer')
 const mongoHandler = require('./dbManager/mongoIO')

+const isDev = process.env.NODE_ENV !== 'production';
 const app = express();
 var corsOptions = {origin: '*', optionsSuccessStatus: 200,}

--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -947,7 +947,6 @@
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
      "requires": {
        "color-convert": "^1.9.0"
      }
@@ -1119,8 +1118,7 @@
        },
        "kind-of": {
          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "resolved": "",
          "dev": true
        }
      }
@@ -1314,7 +1312,6 @@
      "version": "2.4.2",
      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
      "requires": {
        "ansi-styles": "^3.2.1",
        "escape-string-regexp": "^1.0.5",
@@ -1419,7 +1416,6 @@
      "version": "1.9.3",
      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
      "requires": {
        "color-name": "1.1.3"
      }
@@ -1427,8 +1423,7 @@
    "color-name": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
    },
    "commander": {
      "version": "2.20.3",
@@ -1698,9 +1693,9 @@
          }
        },
        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
          "dev": true
        }
      }
@@ -1735,6 +1730,11 @@
        "is-obj": "^1.0.0"
      }
    },
+    "dotenv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
+    },
    "duplexer3": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
@@ -1782,8 +1782,7 @@
    "escape-string-regexp": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
    },
    "esutils": {
      "version": "2.0.3",
@@ -2030,8 +2029,7 @@
        },
        "kind-of": {
          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "resolved": "",
          "dev": true
        }
      }
@@ -2039,8 +2037,7 @@
    "fast-json-parse": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
-      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==",
-      "dev": true
+      "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
    },
    "fast-redact": {
      "version": "2.0.0",
@@ -2802,8 +2799,7 @@
    "has-flag": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
    },
    "has-symbols": {
      "version": "1.0.0",
@@ -2995,7 +2991,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
      "requires": {
        "number-is-nan": "^1.0.0"
      }
@@ -3336,9 +3331,9 @@
      },
      "dependencies": {
        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
          "dev": true
        }
      }
@@ -3520,9 +3515,9 @@
      },
      "dependencies": {
        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "version": "6.0.3",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+          "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
          "dev": true
        }
      }
@@ -3840,8 +3835,7 @@
    "number-is-nan": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
    },
    "object-assign": {
      "version": "4.1.1",
@@ -4000,7 +3994,6 @@
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/pad-left/-/pad-left-2.1.0.tgz",
      "integrity": "sha1-FuajstRKjhOMsIOMx8tAOk/J6ZQ=",
-      "dev": true,
      "requires": {
        "repeat-string": "^1.5.4"
      }
@@ -4009,7 +4002,6 @@
      "version": "0.2.2",
      "resolved": "https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz",
      "integrity": "sha1-b7ySQEXSRPKiokRQMGDTv8YAl3Q=",
-      "dev": true,
      "requires": {
        "repeat-string": "^1.5.2"
      }
@@ -4017,8 +4009,7 @@
    "parse-ms": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz",
-      "integrity": "sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0=",
-      "dev": true
+      "integrity": "sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0="
    },
    "parseurl": {
      "version": "1.3.3",
@@ -4092,7 +4083,6 @@
      "version": "1.4.5",
      "resolved": "https://registry.npmjs.org/pino-colada/-/pino-colada-1.4.5.tgz",
      "integrity": "sha512-n50pEmLvifXcAhJhoizFp8wDlR4gcaXU0rx8qR0MTULX9tz+qEHG9GP1R9U8QmEGDcLZB0mZmJkDW2jjLueHNg==",
-      "dev": true,
      "requires": {
        "chalk": "^2.0.1",
        "fast-json-parse": "^1.0.2",
@@ -4128,8 +4118,7 @@
    "plur": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz",
-      "integrity": "sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY=",
-      "dev": true
+      "integrity": "sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY="
    },
    "posix-character-classes": {
      "version": "0.1.1",
@@ -4146,14 +4135,12 @@
    "prettier-bytes": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/prettier-bytes/-/prettier-bytes-1.0.4.tgz",
-      "integrity": "sha1-mUsCqkb2mcULYle1+qp/4lV+YtY=",
-      "dev": true
+      "integrity": "sha1-mUsCqkb2mcULYle1+qp/4lV+YtY="
    },
    "pretty-ms": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-2.1.0.tgz",
      "integrity": "sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw=",
-      "dev": true,
      "requires": {
        "is-finite": "^1.0.1",
        "parse-ms": "^1.0.0",
@@ -4420,8 +4407,7 @@
    "repeat-string": {
      "version": "1.6.1",
      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
    },
    "require-directory": {
      "version": "2.1.1",
@@ -4761,8 +4747,7 @@
        },
        "kind-of": {
          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "resolved": "",
          "dev": true
        }
      }
@@ -4832,7 +4817,6 @@
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz",
      "integrity": "sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==",
-      "dev": true,
      "requires": {
        "through2": "^2.0.2"
      }
@@ -4905,7 +4889,6 @@
      "version": "5.5.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
      "requires": {
        "has-flag": "^3.0.0"
      }
@@ -4957,7 +4940,6 @@
      "version": "2.0.5",
      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
      "requires": {
        "readable-stream": "~2.3.6",
        "xtend": "~4.0.1"
@@ -4967,7 +4949,6 @@
          "version": "2.3.6",
          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
          "requires": {
            "core-util-is": "~1.0.0",
            "inherits": "~2.0.3",
@@ -4982,7 +4963,6 @@
          "version": "1.1.1",
          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
          "requires": {
            "safe-buffer": "~5.1.0"
          }
--- a/server/package.json
+++ b/server/package.json
@@ -4,6 +4,7 @@
  "private": true,
  "dependencies": {
    "cors": "^2.8.5",
+    "dotenv": "^8.2.0",
    "formidable": "^1.2.1",
    "mongoose": "^5.7.8",
    "multer": "^1.4.2",