Merge pull request #49 from thevahidal/bug/fails-with-missing-port

overriding env variables with CLI args. adding shebang to server.js
thevahidal · Oct 30, 2022 · beda9f5 · beda9f5
2 parents d9ecac7 + 8f12558
commit beda9f5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/core/.env.sample b/core/.env.sample
@@ -4,7 +4,7 @@ NODE_ENV=development
 
 CORS_ORIGIN_WHITELIST=http://localhost:3000,http://127.0.0.1:3000
 
-RATE_LIMIT_ENABLED=True
+RATE_LIMIT_ENABLED=False
 RATE_LIMIT_WINDOW_MS=1000
 RATE_LIMIT_MAX_REQUESTS=10
 
diff --git a/core/package.json b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "soul-cli",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "A SQLite RESTful server",
   "main": "src/server.js",
   "bin": {

diff --git a/core/src/config/index.js b/core/src/config/index.js
@@ -4,6 +4,8 @@ const path = require('path');
 
 const { yargs, usage, options } = require('../cli');
 
+const { argv } = yargs;
+
 dotenv.config({ path: path.join(__dirname, '../../.env') });
 
 const envVarsSchema = Joi.object()
@@ -19,22 +21,28 @@ const envVarsSchema = Joi.object()
 
     CORS_ORIGIN_WHITELIST: Joi.string().required(),
 
-    RATE_LIMIT_ENABLED: Joi.boolean().required(),
+    RATE_LIMIT_ENABLED: Joi.boolean().default(false),
     RATE_LIMIT_WINDOW_MS: Joi.number().positive().required(),
     RATE_LIMIT_MAX_REQUESTS: Joi.number().positive().required(),
   })
   .unknown();
 
 const { value: envVars, error } = envVarsSchema
   .prefs({ errors: { label: 'key' } })
-  .validate(process.env);
+  .validate({
+    ...process.env,
+
+    // Allow overriding of config with CLI args
+    PORT: argv.port,
+    VERBOSE: argv['verbose'],
+    DB: argv.database,
+    RATE_LIMIT_ENABLED: argv['rate-limit-enabled'],
+  });
 
 if (error) {
   throw new Error(`Config validation error: ${error.message}`);
 }
 
-const { argv } = yargs;
-
 module.exports = {
   env: envVars.NODE_ENV,
 

diff --git a/core/src/server.js b/core/src/server.js
@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 const app = require('./index');
 const config = require('./config/index');