share2nightscout-bridge 0.2.6 → 0.2.9

package/index.js

@@ -66,6 +66,45 @@ var DIRECTIONS = {
 , 'NOT COMPUTABLE': 8
 , 'RATE OUT OF RANGE': 9
 };
+function stringLowerCaseNoSpaces(str) {
+  str = str.toLowerCase()
+  while(str.indexOf(' ')>-1)
+    str = str.replace(' ','');
+  return str;
+}
+
+
+function copyObjectWithLowercaseKeys(obj) {
+  // return a copy of obj but with each key transformed to lowercase
+  // and spaces removed
+  return Object.keys(obj).reduce(function (result, key)  {
+    var newKey = stringLowerCaseNoSpaces(key);
+    result[newKey] = obj[key];
+    return result
+  }, {});
+}
+
+var LCDIRECTIONS = copyObjectWithLowercaseKeys(DIRECTIONS);
+
+
+function matchTrend(trend) {
+  // attempt to match the trend based on
+  // a) it is a number
+  // b) it matches a key in DIRECTIONS
+  // c) it matches a key in LCDIRECTIONS if converted to lowercase and all spaces removed
+
+  if (typeof(trend) !== "string")
+    return trend;
+
+  if (trend in DIRECTIONS)
+    return DIRECTIONS[trend];
+    
+  var lctrend = stringLowerCaseNoSpaces(trend);
+
+  if (lctrend in LCDIRECTIONS) return LCDIRECTIONS[lctrend];
+  return trend;
+}
+
 var Trends = (function ( ) {
   var keys = Object.keys(DIRECTIONS);
   var trends = keys.sort(function (a, b) {
@@ -142,7 +181,8 @@ function authorize (opts, then) {
       return request(req, then);
     } else {
       var responseStatus = res ? res.statusCode : "response not found";
-      console.log("Cannot authorize account: ", err, responseStatus, body);
+      console.log("Cannot authorize account: ", err, responseStatus, accbody);
+      return process.nextTick(then, err, res, accbody);
     }
   });
 }
@@ -201,12 +241,14 @@ function dex_to_entry (d) {
   var regex = /\((.*)\)/;
   var wall = parseInt(d.WT.match(regex)[1]);
   var date = new Date(wall);
+  var trend = matchTrend(d.Trend);
+  
   var entry = {
     sgv: d.Value
   , date: wall
   , dateString: date.toISOString( )
-  , trend: d.Trend
-  , direction: trendToDirection(d.Trend)
+  , trend: trend
+  , direction: trendToDirection(trend)
   , device: 'share2'
   , type: 'sgv'
   };
@@ -269,6 +311,7 @@ function engine (opts) {
 
   function refresh_token ( ) {
     console.log('Fetching new token');
+    opts.login.accountId = null;
     authorize(opts.login, function (err, res, body) {
       if (!err && body && res && res.statusCode == 200) {
         my.sessionID = body;