Dev

.gitignore

@@ -25,3 +25,6 @@ bin/__pycache__
 package-lock.json
 
 *.pyc
+
+bash-unit-test-temp
+

README.md

@@ -87,7 +87,7 @@ API_SECRET="..." NIGHTSCOUT_HOST=localhost:1337 ns-upload-entries <input> <outpu
 ### Get the source
 
 ```
-git clone git://github.com/openaps/oref0.git
+git clone https://github.com/openaps/oref0.git
 cd oref0
 git checkout dev
 git checkout -b wip/my-enhancement-fix-or-proposal

bin/mm-format-ns-treatments.sh

@@ -18,16 +18,25 @@ EOT
 # | json -e "this.type = 'mm://openaps/$self'" \
 model=$(jq -r . $MODEL)
 
-oref0-normalize-temps $HISTORY \
+#load ns event preferences
+PREF=${4-preferences.json}
+rewind_indicates_cartridge_change=$(jq -r .rewind_indicates_cartridge_change $PREF)
+prime_indicates_pump_site_change=$(jq -r .prime_indicates_pump_site_change $PREF)
+battery_indicates_battery_change=$(jq -r .battery_indicates_battery_change $PREF)
+
+run_remote_command "oref0-normalize-temps $HISTORY" \
   | jq '[ .[]
     | .medtronic = ( [ "mm://openaps/'$self'/", ( . | if ._type then ._type else .eventType end ) ] | join("") )
     | .created_at = if .created_at then .created_at else .timestamp end
     | .enteredBy = "openaps://medtronic/'$model'"
     | if .glucose and (.glucoseType | not) and .glucose > 0 then .glucoseType = .enteredBy else . end
+    | if ._type == "Rewind" and "'$rewind_indicates_cartridge_change'" == "true" then .eventType = "Insulin Change" else . end
+    | if ._type == "Prime" and .type == "fixed" and "'$prime_indicates_pump_site_change'" == "true" then .eventType = "Site Change" else . end
+    | if ._type == "Battery" and "'$battery_indicates_battery_change'" == "true" then .eventType = "Pump Battery Change" else . end
     | .eventType = if .eventType then .eventType else "Note" end
     | if ._type == "AlarmSensor" and .alarm_description then .notes = .alarm_description else . end
     | ( if .notes then .notes else "" end ) as $note
-    | if ( .eventType == "Note" ) and ( .alarm_description | not ) then .notes = ( [ ._type, "'" $model "'", $note ] | join("") ) else . end
+    | if ( .eventType == "Note" or .eventType == "Insulin Change" or .eventType == "Site Change" or .eventType == "Pump Battery Change" ) and ( .alarm_description | not ) then .notes = ( [ ._type, "'" $model "'", $note ] | join("") ) else . end
   ]' \
   > $OUTPUT
 

bin/nightscout.sh

@@ -237,7 +237,7 @@ ns)
         |  openaps use ${ZONE} select --date dateString --current now --gaps - ${FILE}  | jq .
     ;;
     latest-entries-time)
-      PREVIOUS_TIME=$(ns-get host $NIGHTSCOUT_HOST entries.json 'find[type]=sgv'  | jq .[0])
+      PREVIOUS_TIME=$(ns-get host $NIGHTSCOUT_HOST entries.json 'find[type][$eq]=sgv'  | jq .[0])
       test -z "${PREVIOUS_TIME}" && echo -n 0 || echo $PREVIOUS_TIME | jq .dateString
       exit 0
     ;;

bin/ns-delete-old-devicestatus.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+source $(dirname $0)/oref0-bash-common-functions.sh || (echo "ERROR: Failed to run oref0-bash-common-functions.sh. Is oref0 correctly installed?"; exit 1)
+
+usage "$@" <<EOF
+Usage: $self --find <NIGHTSCOUT_HOST> <API_SECREAT> <number_of_days>- No-op version, find out what delete would do.
+$self delete <NIGHTSCOUT_HOST>  <API_SECREAT> <number_of_days> - move  entries from NIGHTSCOUT_HOST devicestatus collection to "$HOME/myopenaps/backup
+$self nightly <number_of_days> - move  entries from NIGHTSCOUT_HOST devicestatus collection to "$HOME/myopenaps/backup
+EOF
+
+function write_backup() {
+json -a -o jsony-0 >> $BACKUP_DIR/devicestatus.txt
+}
+
+export API_SECRET
+test -n "$3" && API_SECRET=$(nightscout hash-api-secret $3)
+test -n "$4" && NUM_DAYS=$4
+BACKUP_DIR="$HOME/myopenaps"/backup
+mkdir -p $BACKUP_DIR
+
+ENDPOINT=$2/api/v1/devicestatus
+
+if [ $1 = "nightly" ]; then
+   test -n "$2" && NUM_DAYS=$2
+   ENDPOINT=$NIGHTSCOUT_HOST/api/v1/devicestatus
+fi
+
+if [[ -z "$API_SECRET" || -z "$NUM_DAYS" ]] ; then
+  test -z "$API_SECRET" && echo API_SECRET undefined.
+  test -z "$NUM_DAYS" && echo NUM_DAYS undefined.
+  print_usage
+  exit 1;
+fi
+
+date_string=$(date -d "-$NUM_DAYS days" +%Y-%m-%d)
+fetch_cmd="curl  --compressed -s -g $ENDPOINT.json?find\[created_at\]\[\\"\$"lte\]=$date_string\&count=100000"
+delete_cmd="curl -X DELETE -H \"API-SECRET: $API_SECRET\"  -s -g $ENDPOINT.json?find\[created_at\]\[\\"\$"lte\]=$date_string\&count=100000"
+
+case "$1" in
+  --find)
+    echo $fetch_cmd
+    echo $delete_cmd
+    ;;
+  delete)
+    #echo $fetch_cmd
+    #echo $delete_cmd
+    eval $fetch_cmd | write_backup
+    eval $delete_cmd
+    ;;
+  nightly)
+    #echo $fetch_cmd
+    #echo $delete_cmd
+    eval $fetch_cmd | write_backup
+    eval $delete_cmd
+    ;;
+  *|help|--help|-h)
+    print_usage
+    exit 1;
+    ;;
+esac

bin/ns-status.js

@@ -2,10 +2,12 @@
 'use strict';
 
 var os = require("os");
+var fs = require('fs');
+var moment = require("moment");
 
 var requireUtils = require('../lib/require-utils');
-var safeRequire = requireUtils.safeRequire;
 var requireWithTimestamp = requireUtils.requireWithTimestamp;
+var safeLoadFile = requireUtils.safeLoadFile;
 
 /*
   Prepare Status info to for upload to Nightscout
@@ -23,7 +25,7 @@ var requireWithTimestamp = requireUtils.requireWithTimestamp;
 
 */
 
-function mmtuneStatus (status) {
+function mmtuneStatus (status, cwd, mmtune_input) {
     var mmtune = requireWithTimestamp(cwd + mmtune_input);
     if (mmtune) {
         if (mmtune.scanDetails && mmtune.scanDetails.length) {
@@ -35,7 +37,7 @@ function mmtuneStatus (status) {
     }
 }
 
-function preferencesStatus (status) {
+function preferencesStatus (status, cwd ,preferences_input) {
     var preferences = requireWithTimestamp(cwd + preferences_input);
     if (preferences) {
       status.preferences = preferences;
@@ -47,8 +49,8 @@ function preferencesStatus (status) {
     }
 }
 
-function uploaderStatus (status) {
-    var uploader = require(cwd + uploader_input);
+function uploaderStatus (status, cwd, uploader_input) {
+    var uploader = JSON.parse(fs.readFileSync(cwd + uploader_input, 'utf8'));
     if (uploader) {
         if (typeof uploader === 'number') {
             status.uploader = {
@@ -60,9 +62,12 @@ function uploaderStatus (status) {
     }
 }
 
-if (!module.parent) {
 
-    var argv = require('yargs')
+
+
+var ns_status = function ns_status(argv_params) {
+
+    var argv = require('yargs')(argv_params)
         .usage("$0 <clock.json> <iob.json> <suggested.json> <enacted.json> <battery.json> <reservoir.json> <status.json> [--uploader uploader.json] [mmtune.json] [--preferences preferences.json]")
         .option('preferences', {
             alias: 'p',
@@ -77,10 +82,16 @@ if (!module.parent) {
             default: false
         })
         .strict(true)
+        .fail(function (msg, err, yargs) {
+            if (err) {
+                return console.error('Error found', err);
+            }
+            return console.error('Parsing of command arguments failed', msg)
+            })
         .help('help');
-
     var params = argv.argv;
     var inputs = params._;
+
     var clock_input = inputs[0];
     var iob_input = inputs[1];
     var suggested_input = inputs[2];
@@ -94,9 +105,11 @@ if (!module.parent) {
 
     if (inputs.length < 7 || inputs.length > 8) {
         argv.showHelp();
-        process.exit(1);
+        return;
     }
 
+    // TODO: For some reason the following line does not work (../package.json ia not found).
+    //var pjson = JSON.parse(fs.readFileSync('../package.json', 'utf8'));
     var pjson = require('../package.json');
 
     var cwd = process.cwd() + '/';
@@ -117,6 +130,7 @@ if (!module.parent) {
         if (iobArray && iobArray.length) {
             iob = iobArray[0];
             iob.timestamp = iob.time;
+            iob.mills = moment(iob.time).valueOf();
             delete iob.time;
         }
 
@@ -129,6 +143,14 @@ if (!module.parent) {
           }
         }
 
+        if (enacted && enacted.timestamp) {
+          enacted.mills = moment(enacted.timestamp).valueOf();
+        }
+
+        if (suggested && suggested.timestamp) {
+          suggested.mills = moment(suggested.timestamp).valueOf();
+        }
+
         var status = {
             device: 'openaps://' + os.hostname(),
             openaps: {
@@ -138,27 +160,41 @@ if (!module.parent) {
                 version: pjson.version
             },
             pump: {
-                clock: safeRequire(cwd + clock_input),
-                battery: safeRequire(cwd + battery_input),
-                reservoir: safeRequire(cwd + reservoir_input),
+                clock: safeLoadFile(cwd + clock_input),
+                battery: safeLoadFile(cwd + battery_input),
+                reservoir: safeLoadFile(cwd + reservoir_input),
                 status: requireWithTimestamp(cwd + status_input)
-            }
+            },
+            created_at: new Date()
         };
 
         if (mmtune_input) {
-            mmtuneStatus(status);
+            mmtuneStatus(status, cwd, mmtune_input);
         }
 
         if (preferences_input) {
-            preferencesStatus(status);
+            preferencesStatus(status, cwd ,preferences_input);
         }
 
         if (uploader_input) {
-            uploaderStatus(status);
+            uploaderStatus(status, cwd, uploader_input);
         }
 
-        console.log(JSON.stringify(status));
+        return JSON.stringify(status);
     } catch (e) {
         return console.error("Could not parse input data: ", e);
     }
 }
+
+if (!module.parent) {
+    // remove the first parameter.
+    var command = process.argv;
+    command.shift();
+    command.shift();
+    var result = ns_status(command);
+    if(result !== undefined) {
+        console.log(result);
+    }
+}
+
+exports = module.exports = ns_status

bin/ns-upload-entries.sh

@@ -28,7 +28,7 @@ fi
 
 # requires API_SECRET and NIGHTSCOUT_HOST to be set in calling environment (i.e. in crontab)
 (
-curl -m 30 -s -X POST --data-binary @${ENTRIES} \
+curl --compressed -m 30 -s -X POST --data-binary @${ENTRIES} \
   ${API_SECRET_HEADER}  -H "content-type: application/json" \
   ${REST_ENDPOINT}
 ) && ( test -n "${OUTPUT}" && touch ${OUTPUT} ; logger "Uploaded ${ENTRIES} to ${NIGHTSCOUT_HOST}" ) || logger "Unable to upload to ${NIGHTSCOUT_HOST}"

bin/ns-upload.sh

@@ -38,13 +38,13 @@ fi
 if [[ "${API_SECRET,,}" =~ "token=" ]]; then
   REST_ENDPOINT="${REST_ENDPOINT}?${API_SECRET}"
     (test "$ENTRIES" != "-" && cat $ENTRIES || cat )| (
-    curl -m 30 -s -X POST --data-binary @- \
+    curl --compressed -m 30 -s -X POST --data-binary @- \
         -H "content-type: application/json" \
         $REST_ENDPOINT
     ) && ( test -n "$OUTPUT" && touch $OUTPUT ; logger "Uploaded $ENTRIES to $NIGHTSCOUT_HOST" ) || ( logger "Unable to upload to $NIGHTSCOUT_HOST"; exit 2 )
 else
     (test "$ENTRIES" != "-" && cat $ENTRIES || cat )| (
-    curl -m 30 -s -X POST --data-binary @- \
+    curl --compressed -m 30 -s -X POST --data-binary @- \
         -H "API-SECRET: $API_SECRET" \
         -H "content-type: application/json" \
         $REST_ENDPOINT

bin/openaps-install.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-BRANCH=${1:-master}
+BRANCH=${1:-dev}
 read -p "Enter your rig's new hostname (this will be your rig's "name" in the future, so make sure to write it down): " -r
 myrighostname=$REPLY
 echo $myrighostname > /etc/hostname
@@ -42,21 +42,16 @@ if cat /etc/os-release | grep 'PRETTY_NAME="Debian GNU/Linux 8 (jessie)"' &> /de
     echo "Acquire::Check-Valid-Until false;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid
     # Replace apt sources.list with archive.debian.org locations
     echo -e "deb http://security.debian.org/ jessie/updates main\n#deb-src http://security.debian.org/ jessie/updates main\n\ndeb http://archive.debian.org/debian/ jessie-backports main\n#deb-src http://archive.debian.org/debian/ jessie-backports main\n\ndeb http://archive.debian.org/debian/ jessie main contrib non-free\n#deb-src http://archive.debian.org/debian/ jessie main contrib non-free" > /etc/apt/sources.list
+    echo "Please consider upgrading your rig to Jubilinux 0.3.0 (Debian Stretch)!"
+    echo "Jubilinux 0.2.0, based on Debian Jessie, is no longer receiving security or software updates!"
 fi
 
-#Workaround for Jubilinux to install nodejs/npm from nodesource
-if getent passwd edison &> /dev/null; then
-    #Use nodesource setup script to add nodesource repository to sources.list.d
-    curl -sL https://deb.nodesource.com/setup_8.x | bash -
-fi
-
-#dpkg -P nodejs nodejs-dev
 # TODO: remove the `-o Acquire::ForceIPv4=true` once Debian's mirrors work reliably over IPv6
 apt-get -o Acquire::ForceIPv4=true update && apt-get -o Acquire::ForceIPv4=true -y dist-upgrade && apt-get -o Acquire::ForceIPv4=true -y autoremove
-apt-get -o Acquire::ForceIPv4=true update && apt-get -o Acquire::ForceIPv4=true install -y sudo strace tcpdump screen acpid vim python-pip locate ntpdate ntp
+apt-get -o Acquire::ForceIPv4=true update && apt-get -o Acquire::ForceIPv4=true install -y sudo strace tcpdump screen acpid vim locate ntpdate ntp
 #check if edison user exists before trying to add it to groups
 
-grep "PermitRootLogin yes" /etc/ssh/sshd_config || echo "PermitRootLogin yes" > /etc/ssh/sshd_config
+grep "PermitRootLogin yes" /etc/ssh/sshd_config || echo "PermitRootLogin yes" >>/etc/ssh/sshd_config
 
 if  getent passwd edison > /dev/null; then
   echo "Adding edison to sudo users"
@@ -71,7 +66,7 @@ sed -i "s/daily/hourly/g" /etc/logrotate.conf
 sed -i "s/#compress/compress/g" /etc/logrotate.conf
 
 curl -s https://raw.githubusercontent.com/openaps/oref0/$BRANCH/bin/openaps-packages.sh | bash -
-mkdir -p ~/src; cd ~/src && ls -d oref0 && (cd oref0 && git checkout $BRANCH && git pull) || git clone git://github.com/openaps/oref0.git
+mkdir -p ~/src; cd ~/src && ls -d oref0 && (cd oref0 && git checkout $BRANCH && git pull) || git clone https://github.com/openaps/oref0.git -b $BRANCH
 echo "Press Enter to run oref0-setup with the current release ($BRANCH branch) of oref0,"
 read -p "or press ctrl-c to cancel. " -r
 cd && ~/src/oref0/bin/oref0-setup.sh