Merge pull request #313 from FlowFuse/312-use-port-from-config

Use port from config file

index.js

@@ -207,7 +207,10 @@ Please ensure the parent directory is writable, or set a different path with -d`
         return {
             AgentManager,
             webServer,
-            options
+            options: {
+                ...ConfigLoader.defaults,
+                ...options
+            }
         }
     }
     return null

lib/cli/args.js

@@ -32,7 +32,6 @@ module.exports = [
         name: 'port',
         alias: 'p',
         type: Number,
-        defaultValue: 1880,
         typeLabel: '{underline number}',
         group: 'main'
     },
@@ -67,22 +66,19 @@ module.exports = [
         name: 'ui',
         description: 'Start the Web UI Server (optional, does not run by default)',
         type: Boolean,
-        defaultValue: false,
         alias: 'w',
         group: 'ui'
     },
     {
         name: 'ui-host',
         description: 'Web UI server host. Default: {underline (0.0.0.0)} (listen on all interfaces)',
         type: String,
-        defaultValue: '0.0.0.0',
         group: 'ui'
     },
     {
         name: 'ui-port',
         description: 'Web UI server port. Default: {underline 1879}',
         type: Number,
-        defaultValue: 1879,
         group: 'ui'
     },
     {

lib/config.js

@@ -14,10 +14,19 @@ const yaml = require('yaml')
  * @property {string} [deviceVersion] - The device version
  * @property {string} [deviceDescription] - The device description
 */
+
+const defaults = {
+    port: 1880,
+    ui: false,
+    uiHost: '0.0.0.0',
+    uiPort: 1879
+}
+
 module.exports = {
     parseDeviceConfigFile,
     parseDeviceConfig,
-    config
+    config,
+    defaults
 }
 
 /**
@@ -139,6 +148,7 @@ function config (options) {
 
     return {
         version,
+        ...defaults,
         ...parsedOptions.deviceConfig,
         ...options
     }