v8.8 release

- user metrics folder!
- (total log disk space / visible data disk space) in graph status
- server uptime on terminal page
- new dependency: merge package (get latest packages.json and run `npm
update` to get it)
- updated nedb to 1.8, json5 to 0.5, request to 2.75, console-stamp to
0.2.4
- removed old neDB upgrade script (gateway_NeDB-2-Binary.js)

Author: LowPowerLab

gateway.js

@@ -32,6 +32,7 @@ var JSON5 = require('json5');                                   //https://github
 var path = require('path');
 var dbDir = 'data/db';
 var metricsFile = 'metrics.js';
+var userMetricsDir = 'userMetrics';
 nconf.argv().file({ file: path.resolve(__dirname, 'settings.json5'), format: JSON5 });
 settings = nconf.get('settings');
 var dbLog = require(path.resolve(__dirname,'logUtil.js'));
@@ -58,12 +59,38 @@ serial.on('close', function serialCloseHandler(error) {
 });
 
 serial.on("data", function(data) { processSerialData(data); });
-
 serial.open();
 
+require("console-stamp")(console, settings.general.consoleLogDateFormat.value); //timestamp logs - https://github.com/starak/node-console-stamp
+
+//LOAD METRICS:
+// - First load main metrics.js definitions (metrics, motes, events etc)
 metricsDef = require(path.resolve(__dirname, metricsFile));
+// - Then load user metrics which can override default metrics
+try {
+  console.info('LOADING USER METRICS...');
+  fs = require('fs');
+  merge = require('merge');
+  if (fs.existsSync(__dirname + '/' + userMetricsDir))
+  {
+    fs.readdirSync(__dirname + '/' + userMetricsDir).forEach(function(file) {
+      if (file.match(/\.js$/) !== null) {
+        var name = file.replace('.js', '');
+        console.info('LOADING USER METRICS MODULE [' + name + ']');
+        try {
+          var tmp = require(__dirname + '/' + userMetricsDir + '/' + file);
+          metricsDef = merge(true, metricsDef, tmp);
+        } catch (ex) {
+          console.error('FAIL LOADING USER METRICS MODULE ['+ name + ']: ' + ex.message);
+        }
+      }
+    });
+  } else console.info('NO USER METRICS DEFINED (dir: /' + userMetricsDir + '), SKIPPING');
+}
+catch (ex) {
+  console.error('FAIL ACCESSING USER METRICS: '+ ex.message);
+}
 
-require("console-stamp")(console, settings.general.consoleLogDateFormat.value); //timestamp logs - https://github.com/starak/node-console-stamp
 db.persistence.setAutocompactionInterval(settings.database.compactDBInterval.value); //compact the database every 24hrs
 
 var transporter = nodemailer.createTransport({
@@ -165,7 +192,8 @@ io.sockets.on('connection', function (socket) {
   socket.emit('METRICSDEF', metricsDef.metrics);
   socket.emit('EVENTSDEF', metricsDef.events);
   socket.emit('SETTINGSDEF', settings);
-  socket.emit('SERVERTIME', new Date().getTime());
+  socket.emit('SERVERTIME', Date.now());
+  socket.emit('SERVERSTARTTIME', Date.now() - process.uptime()*1000);
 
   //pull all nodes from the database and send them to client
   db.find({ _id : { $exists: true } }, function (err, entries) {
@@ -538,7 +566,7 @@ global.processSerialData = function (data) {
   else
   {
     //console.log('no match: ' + data);
-    dbunmatched.insert({_id:(new Date().getTime()), data:data});
+    dbunmatched.insert({_id:Date.now(), data:data});
   }
 }
 

gateway_NeDB-2-Binary.js

@@ -62,7 +62,7 @@ exports.metrics = {
   //SwitchMote buttons
   SMB0_OFF : { name:'B0', regexp:/BTN0\:0/i, value:'OFF'},
   SMB0_ON  : { name:'B0', regexp:/BTN0\:1/i, value:'ON'},
-  SMB1_OFF : { name:'B1', regexp:/(BTN1|SSR|RLY)\:0/i, value:'OFF', pin:1, graph:1, logValue:0, graphOptions:{ yaxis: {ticks:0}, colors:['#4a0']}},
+  SMB1_OFF : { name:'B1', regexp:/(BTN1|SSR|RLY)\:0/i, value:'OFF', pin:1, graph:1, logValue:0, graphOptions:{ yaxis: {ticks:0, min:0, autoscaleMargin:0.5 }, colors:['#4a0']}},
   SMB1_ON  : { name:'B1', regexp:/(BTN1|SSR|RLY)\:1/i, value:'ON', pin:1, graph:1, logValue:1, graphOptions: { /* already defined above for 'B1', no need to repeat */ }},
   SMB2_OFF : { name:'B2', regexp:/BTN2\:0/i, value:'OFF'},
   SMB2_ON  : { name:'B2', regexp:/BTN2\:1/i, value:'ON'},

metrics.js

@@ -1,26 +1,27 @@
 {
   "name": "RaspberryPi-Gateway",
-  "version": "8.6",
-  "description": "RaspberryPi Home Automation Gateway",
+  "version": "8.8.0",
+  "description": "Moteino IoT Gateway",
   "main": "gateway.js",
   "repository": "https://github.com/LowPowerLab/RaspberryPi-Gateway.git",
   "author": "Felix Rusu (https://github.com/LowPowerLab)",
   "homepage": "http://lowpowerlab.com/gateway",
   "bugs": {
     "url": "https://github.com/LowPowerLab/RaspberryPi-Gateway/issues"
   },
-  "license": "SEE LICENSE IN license.txt",
+  "license": "SEE LICENSE IN LICENSE FILE",
   "contributors": "Felix Rusu (https://github.com/LowPowerLab)",
   "dependencies": {
     "serialport": "~2.0",
     "socket.io": "~1.3",
-    "nedb": "~1.5",
-    "json5": "~0.4.0",
+    "nedb": "~1.8",
+    "json5": "~0.5.0",
     "nconf": "~0.8.2",
     "nodemailer": "~1.10",
-    "console-stamp": "~0.2.0",
+    "console-stamp": "~0.2.4",
     "colors": "~1.1.2",
-    "request": "~2.67"
+    "request": "~2.75",
+    "merge": "~1.2.0"
   },
   "scripts": {
     "preinstall": "",

package.json

@@ -68,7 +68,7 @@
       editable: true,
       exposed: true,
       ip: {
-        value: "192.168.0.100"
+        value: "192.168.1.100"
       }
     }
   }

settings.json5

@@ -0,0 +1,13 @@
+User Metrics Folder
+----------------
+<br/>
+
+The purpose of this folder is to have a place to put custom user definitions for metrics, motes, events, custom functions and variables etc., without the need to directly edit the main metrics.js which might get overwritten during an upgrade.
+
+###How to use:
+- place your custom metrics/motes/events in this folder
+- whatever objects you define here will be merged with the contents of metrics.js
+- if a matching metric/mote/event is redefined in a file this folder, it will override the default from metrics.js, that also means that if duplicates are found, the last one in the last file (alphabetically) will be the winner
+- follow the same definition/syntax pattern as in main metrics.js definition file
+- each metric could be broken into its own separate file or everything could be in a single file just like in metrics.js, it all gets merged into the main `metricsDef` object
+- a basic example is provided as a starting point in _example.js

userMetrics/README.md

@@ -0,0 +1,5 @@
+/*this sample metric will override that which is already defined in main metrics.js*/
+/*you can redefine defaults or write your own new custom metrics in 1 or more files in this folder, separate them as you'd like - they all get merged together when the app loads*/
+exports.metrics = {
+  V : { name:'V', regexp:/(?:V?BAT|VOLTS|V)\:([\d\.]+)v?/i, value:'', unit:'v', graph:1, graphOptions:{ legendLbl:'VOLTZ!', lines: { fill:true, lineWidth:1 }, yaxis: { min: 0, autoscaleMargin: 0.5 }}}
+};

userMetrics/_example.js

@@ -68,7 +68,7 @@
   .btn-text, #loadingsocket { font-size: 32px; }
   #loadingsocket, #loadinggraph {padding:15px;}
   .labelbold { font-weight:bold !important; overflow:hidden; text-overflow:ellipsis;white-space:nowrap; }
-  #wrap { padding: 12px; }
+  .wrap { padding: 12px; }
   .ui-listview>li.hiddenNode { display:none; }
   .ui-listview>li.hiddenNodeShow { display:block; }
   .ui-li-count18 { font-size:18px; }
@@ -438,9 +438,12 @@ <h1>Terminal</h1>
       </span>
     </div>
 
-    <div id="wrap">
+    <div class="wrap">
       <textarea name="log" id="log" rows="10" style="font-size:10px;"></textarea>
     </div>
+    <div style="font-weight:bold;padding:0 12px;">
+      <span>Server uptime: </span><span id="status-uptime" data-time="147676078" class="nodeAgo">X</span>
+    </div>  
   </div>
 
   <div data-role="page" id="settingspage">
@@ -590,9 +593,13 @@ <h1>Settings</h1>
     });
 
     socket.on('SERVERTIME', function(serverMillisSinceEpoch) {
-      serverTimeOffset = new Date().getTime() - serverMillisSinceEpoch;
+      serverTimeOffset = Date.now() - serverMillisSinceEpoch;
       LOG('SERVERTIME OFFSET: ' + serverTimeOffset + 'ms');
     });
+    
+    socket.on('SERVERSTARTTIME', function(serverMillisSinceProcessStart) {
+      $('#status-uptime').attr('data-time', serverMillisSinceProcessStart + serverTimeOffset);
+    });
 
     $(document).on("pagecreate", "#eventAdd", function(){ if ($('addEventType').val()) $('#addEvent_OK').show(); else $('#addEvent_OK').hide(); });
 
@@ -732,7 +739,7 @@ <h1>Settings</h1>
       graphOptions.yaxis.max = max;
 
       graphOptions = $.extend(true, graphOptions, rawData.options); //http://stackoverflow.com/questions/171251/how-can-i-merge-properties-of-two-javascript-objects-dynamically
-      $(graphStat).html(rawData.graphData.msg != undefined ? rawData.graphData.msg : (rawData.graphData.data.length + (rawData.graphData.totalIntervalDatapoints != rawData.graphData.data.length ? ' / '+rawData.graphData.totalIntervalDatapoints : '') +'pts ('+ rawData.graphData.queryTime+'ms)'));
+      $(graphStat).html(rawData.graphData.msg != undefined ? rawData.graphData.msg : (rawData.graphData.data.length + (rawData.graphData.totalIntervalDatapoints != rawData.graphData.data.length ? ' / '+rawData.graphData.totalIntervalDatapoints : '') +'pts ('+ rawData.graphData.queryTime+'ms) ('+humanFileSize(rawData.graphData.totalIntervalDatapoints*9)+'/'+humanFileSize(rawData.graphData.logSize)+')'));
       //need to defer plotting until after pageshow is finished rendering, otherwise the wrapper will return an incorrect width of "100"
       if (metricGraphWrapper.width()==100)
         $(document).on("pageshow", "#metricdetails", renderAndCloneStat);
@@ -894,6 +901,12 @@ <h1>Settings</h1>
       $('#nodeList').listview('refresh'); //re-render the listview
     }
 
+    /// http://stackoverflow.com/a/20732091
+    function humanFileSize(size) {
+      var i = Math.floor( Math.log(size) / Math.log(1024) );
+      return ( size / Math.pow(1024, i) ).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i];
+    };
+
     /// calculated a style for an "ago" label based on a given timestamp in the past
     function ago(time, agoPrefix)
     {