fix(jsbattle-server): default values of config are not assigned properly

jamro · Jan 18, 2020 · 1fc0433 · 1fc0433
1 parent d81b5c9
commit 1fc0433
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 22 deletions.
diff --git a/packages/jsbattle-server/.eslintrc.js b/packages/jsbattle-server/.eslintrc.js
@@ -74,7 +74,6 @@ module.exports = {
         "guard-for-in": "error",
         "handle-callback-err": "error",
         "id-blacklist": "error",
-        "id-length": "error",
         "id-match": "error",
         "implicit-arrow-linebreak": [
             "error",

diff --git a/packages/jsbattle-server/app/Gateway.js b/packages/jsbattle-server/app/Gateway.js
@@ -1,10 +1,24 @@
 const { ServiceBroker } = require("moleculer");
 const path = require('path')
+const _ = require('lodash')
 
 class Gateway {
 
   init(options) {
     return new Promise((resolve) => {
+      const defaultOptions = {
+        "loglevel": "info",
+        "data": {
+          "path": "./jsbattle-data"
+        },
+        "web": {
+          "webroot": path.resolve(__dirname, "./public"),
+          "host": "127.0.0.1",
+          "port": "8080",
+          "gaCode": ""
+        }
+      };
+      options = _.defaultsDeep(options, defaultOptions)
       this.broker = new ServiceBroker({
         namespace: 'jsbattle',
         logLevel: options.loglevel

diff --git a/...sbattle-server/app/public_html/index.html → ...ges/jsbattle-server/app/public/index.html b/...sbattle-server/app/public_html/index.html → ...ges/jsbattle-server/app/public/index.html
diff --git a/packages/jsbattle-server/app/runner.js b/packages/jsbattle-server/app/runner.js
@@ -7,10 +7,10 @@ let gateway = new Gateway();
 gateway.init({
   "loglevel": "info",
   "data": {
-    "path": path.join(__dirname, 'public_html')
+    "path": path.join(__dirname, 'jsbattle-data')
   },
   "web": {
-    "webroot": "./public",
+    "webroot": path.join(__dirname, 'public'),
     "host": "127.0.0.1",
     "port": "9000",
     "gaCode": "AB-123456789-Z"

diff --git a/packages/jsbattle-server/package.json b/packages/jsbattle-server/package.json
@@ -28,6 +28,7 @@
     "express": "^4.17.1",
     "hijackresponse": "^4.0.0",
     "jsbattle-engine": "^2.7.0",
+    "lodash": "^4.17.15",
     "moleculer": "^0.13.12",
     "moleculer-db": "^0.8.4",
     "moleculer-web": "^0.8.5",

diff --git a/packages/jsbattle/package-lock.json b/packages/jsbattle/package-lock.json
diff --git a/packages/jsbattle/package.json b/packages/jsbattle/package.json
@@ -43,6 +43,7 @@
     "jsbattle-engine": "^2.7.0",
     "jsbattle-server": "^2.7.0",
     "jsbattle-webpage": "^2.7.1",
+    "lodash": "^4.17.15",
     "path": "^0.12.7",
     "yargs": "^15.0.2"
   },

diff --git a/packages/jsbattle/src/jsbattle.js b/packages/jsbattle/src/jsbattle.js
@@ -2,6 +2,7 @@
 
 const Gateway = require('jsbattle-server').Gateway;
 const path = require('path');
+const _ = require('lodash');
 const yargs = require('yargs');
 
 
@@ -25,24 +26,15 @@ yargs
 
     },
     (argv) => {
-      let config = {
-        "loglevel": "info",
-        "data": {
-          "path": "./jsbattle-data"
-        },
-        "web": {
-          "webroot": "./public",
-          "host": "127.0.0.1",
-          "port": "8080",
-          "gaCode": ""
-        }
-      };
+      let config = {};
       if(argv.config) {
         config = require(path.resolve(argv.config));
       }
-      config.web = config.web || {};
-      config.data = config.data || {};
-      config.loglevel = argv.loglevel || config.loglevel || "info"
+      config = _.defaultsDeep(config, {
+        web: {
+          webroot: path.resolve(__dirname, 'public')
+        }
+      });
 
       let gateway = new Gateway();
       gateway.init(config)