feat(settings): implement hot settings reload

fh1ch · fh1ch · commit 42e47590524e · 2017-12-27T16:53:34.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 /dist
 /tmp
 /out-tsc
+/bin
 
 # dependencies
 /node_modules
diff --git a/lib/api.js b/lib/api.js
@@ -1,46 +1,82 @@
-const os        = require('os');
-const ip        = require('ip');
-const async     = require('async');
-const express   = require('express');
-const bacnet    = require('bacstack');
-const debug     = require('debug')('bacstack-browser');
+const os          = require('os');
+const ip          = require('ip');
+const async       = require('async');
+const express     = require('express');
+const bodyParser  = require('body-parser')
+const bacnet      = require('bacstack');
+const debug       = require('debug')('bacstack-browser');
 
 const utils     = require('./utils');
 
 const app = express();
 
 // Local stores
+const options = utils.getSettings();
 const settings = {
-  port: 47808,
-  nic: 12,
-  timeout: 4000,
-  language: 'en',
-  analytics: true
+  port: options.port || 47808,
+  nic: options.nic || 0,
+  timeout: options.timeout || 4000,
+  language: options.language || 'en',
+  noAnalytics: options.noAnalytics
 };
 
 const devices = {};
+const nics = [];
+
+// NIC Stuff
+const getNics = () => {
+  const osNics = os.networkInterfaces();
+  nics.push({name: 'Default'});
+  Object.keys(osNics).forEach((ifname) => {
+    osNics[ifname].forEach((iface) => {
+      if (iface.interal === true) return;
+      if (iface.family !== 'IPv4') return;
+      nics.push({
+        name: ifname,
+        address: iface.address,
+        broadcast: ip.subnet(iface.address, iface.netmask).broadcastAddress
+      });
+    });
+  });
+};
+getNics();
 
 // BACNET Stuff
-const client = new bacnet({adpuTimeout: 6000});
+let client;
 
-client.on('iAm', (device) => {
-  const id = `${device.address}:${device.deviceId}`;
-  devices[id] = device;
-  devices[id].id = id;
-  client.readPropertyMultiple(device.address, [
-    {objectId: {type: 8, instance: 4194303}, properties: [{id: bacnet.enum.PropertyIds.PROP_OBJECT_NAME}, {id: bacnet.enum.PropertyIds.PROP_DESCRIPTION}]}
-  ], (err, value) => {
-    if (err) return;
-    if (value && value.values && value.values[0] && value.values[0].values) {
-      const tmp = {};
-      value.values[0].values.forEach(data => tmp[data.id] = data.value[0])
-      devices[id].name = tmp[bacnet.enum.PropertyIds.PROP_OBJECT_NAME].value;
-      devices[id].description = tmp[bacnet.enum.PropertyIds.PROP_DESCRIPTION].value;
-    }
+const startBacnet = () => {
+  client = new bacnet({
+    port: settings.port,
+    interface: (nics[settings.nic] || {}).address,
+    broadcastAddress: (nics[settings.nic] || {}).broadcast,
+    adpuTimeout: settings.timeout
   });
-});
+  client.on('iAm', (device) => {
+    const id = `${device.address}:${device.deviceId}`;
+    devices[id] = device;
+    devices[id].id = id;
+    client.readPropertyMultiple(device.address, [
+      {objectId: {type: 8, instance: 4194303}, properties: [{id: bacnet.enum.PropertyIds.PROP_OBJECT_NAME}, {id: bacnet.enum.PropertyIds.PROP_DESCRIPTION}]}
+    ], (err, value) => {
+      if (err) return;
+      if (value && value.values && value.values[0] && value.values[0].values) {
+        const tmp = {};
+        value.values[0].values.forEach(data => tmp[data.id] = data.value[0])
+        devices[id].name = tmp[bacnet.enum.PropertyIds.PROP_OBJECT_NAME].value;
+        devices[id].description = tmp[bacnet.enum.PropertyIds.PROP_DESCRIPTION].value;
+      }
+    });
+  });
+}
+
+const stopBacnet = () => {
+  if (client) client.close();
+  client = undefined;
+}
 
 // Webserver Stuff
+app.use(bodyParser.json());
+
 app.use((req, res, next) => {
   res.header('Access-Control-Allow-Origin', '*');
   res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE');
@@ -54,23 +90,20 @@ app.get('/api/settings', (req, res) => {
 });
 
 app.post('/api/settings', (req, res) => {
-  res.send(req.body);
+  settings.port = req.body.port || settings.port;
+  settings.nic = req.body.nic || settings.nic;
+  settings.timeout = req.body.timeout || settings.timeout;
+  settings.language = req.body.language || settings.language;
+  settings.noAnalytics = req.body.noAnalytics || settings.noAnalytics;
+  utils.setSettings(settings, (err) => {
+    if (err) return res.sendStatus(400);
+    stopBacnet();
+    startBacnet();
+    res.send(settings);
+  });
 });
 
 app.get('/api/settings/interfaces', (req, res) => {
-  const nics = [];
-  const osNics = os.networkInterfaces();
-  Object.keys(osNics).forEach((ifname) => {
-    osNics[ifname].forEach((iface) => {
-      if (iface.interal === true) return;
-      if (iface.family !== 'IPv4') return;
-      nics.push({
-        name: ifname,
-        address: iface.address,
-        broadcast: ip.subnet(iface.address, iface.netmask).broadcastAddress
-      });
-    });
-  });
   res.send(nics);
 });
 
@@ -141,3 +174,5 @@ app.get('/api/devices/:id/objects/:oid', (req, res) => {
 app.listen(3000, '127.0.0.1', () => {
   console.log('Example app listening on port 3000!');
 });
+
+startBacnet();
diff --git a/lib/utils.js b/lib/utils.js
@@ -1,9 +1,26 @@
+const fs        = require('fs');
+const os        = require('os');
+const path      = require('path');
 const _         = require('lodash');
 const bacnet    = require('bacstack');
 
+const configFile = '.nodebacstackbrowser';
+
 module.exports.getPropertyName = (id) => {
   let name = Object.keys(bacnet.enum.PropertyIds).find(key => bacnet.enum.PropertyIds[key] === id);
   if (!name) return;
   name = _.startCase(_.lowerCase(name.substring(5)));
   return name;
 };
+
+module.exports.getSettings = () => {
+  try {
+    return JSON.parse(fs.readFileSync(path.join(os.homedir(), configFile), {encoding: 'utf8'}));
+  } catch (err) {
+    return {};
+  }
+};
+
+module.exports.setSettings = (settings, next) => {
+  fs.writeFile(path.join(os.homedir(), configFile), JSON.stringify(settings), next);
+};
diff --git a/main.js b/main.js
@@ -1,20 +1,29 @@
 const { app, BrowserWindow } = require('electron');
 
+const path                   = require('path');
+const url                    = require('url');
+
 const api = require('./lib/api');
 
 let win;
 
-app.on('ready', () => {
+const createWindow = () => {
   win = new BrowserWindow({width: 1000, height: 600});
 
-  win.loadURL('http://localhost:4200');
+  //win.loadURL('http://localhost:4200');
 
-  win.webContents.openDevTools();
+  win.loadURL(url.format({
+    pathname: path.join(__dirname, 'dist' , 'index.html'),
+    protocol: 'file:',
+    slashes: true
+  }));
 
   win.on('closed', () => {
     win = null;
   });
-});
+};
+
+app.on('ready', createWindow);
 
 app.on('activate', () => {
   if (!win) createWindow();
diff --git a/package.json b/package.json
@@ -10,7 +10,8 @@
     "build": "ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
-    "e2e": "ng e2e"
+    "e2e": "ng e2e",
+    "pack": "npm run build && electron-packager . --platform=darwin --arch=x64 --overwrite --out=bin"
   },
   "repository": {
     "type": "git",
@@ -51,6 +52,7 @@
     "@angular/router": "^5.0.0",
     "async": "^2.6.0",
     "bacstack": "0.0.1-beta.13",
+    "body-parser": "^1.18.2",
     "core-js": "^2.4.1",
     "debug": "^3.1.0",
     "express": "^4.16.2",
@@ -72,6 +74,7 @@
     "@types/node": "~6.0.60",
     "codelyzer": "^4.0.1",
     "electron": "^1.7.10",
+    "electron-packager": "^10.1.0",
     "jasmine-core": "~2.6.2",
     "jasmine-spec-reporter": "~4.1.0",
     "karma": "~1.7.0",
diff --git a/src/app/pages/settings/settings.component.html b/src/app/pages/settings/settings.component.html
@@ -24,7 +24,7 @@ <h1>Settings</h1>
     <a tabindex="0" role="button" data-toggle="popover" data-trigger="focus" data-html="true" title="" data-content="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et <a href='#'>dolore magna aliqua</a>." data-placement="top"><span class="fa fa-info-circle"></span></a></label>
     <div class="col-sm-9">
       <select id="help-2" class="combobox form-control" [(ngModel)]="settings.nic" (change)="saveSettings()">
-        <option *ngFor="let nic of nics" value="{{ nic.id }}">{{ nic.name }}</option>
+        <option *ngFor="let nic of nics; let i = index" value="{{ i }}">{{ nic.name }} - {{ nic.address || '1.1.1.1' }}</option>
       </select>
     </div>
   </div>
diff --git a/src/app/pages/settings/settings.component.ts b/src/app/pages/settings/settings.component.ts
@@ -10,10 +10,7 @@ import { ApiService } from '../../services/api.service';
 export class SettingsComponent implements OnInit {
   constructor(private api: ApiService) { }
 
-  nics = [
-    {name: 'en0 - 192.168.178.3', id: '12'},
-    {name: 'lo0 - 127.0.0.1', id: '13'}
-  ];
+  nics = [];
 
   ports = [
     {name: 'BAC0', value: 47808},
@@ -49,8 +46,11 @@ export class SettingsComponent implements OnInit {
   statusMessage: any;
 
   ngOnInit() {
-    this.api.getSettings().subscribe(res => {
-      this.settings = res;
+    this.api.getNics().subscribe(res1 => {
+      this.nics = res1;
+      this.api.getSettings().subscribe(res2 => {
+        this.settings = res2;
+      });
     });
   }
 
diff --git a/src/app/services/api.service.ts b/src/app/services/api.service.ts
@@ -15,6 +15,10 @@ export class ApiService {
     return this.http.get(`${this.baseUrl}/devices/search`);
   }
 
+  getNics(): any {
+    return this.http.get(`${this.baseUrl}/settings/interfaces`);
+  }
+
   getSettings(): any {
     return this.http.get(`${this.baseUrl}/settings`);
   }
diff --git a/src/index.html b/src/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title>Node BACStack Browser</title>
-  <base href="/">
+  <base href="">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ export class ApiService {`
`15`	`15`	return this.http.get(`${this.baseUrl}/devices/search`);
`16`	`16`	`}`
`17`	`17`
	`18`	`+ getNics(): any {`
	`19`	+ return this.http.get(`${this.baseUrl}/settings/interfaces`);
	`20`	`+ }`
	`21`	`+`
`18`	`22`	`getSettings(): any {`
`19`	`23`	return this.http.get(`${this.baseUrl}/settings`);
`20`	`24`	`}`