Bewest/nodejs ify

.gitignore

@@ -0,0 +1,3 @@
+node_modules/
+ldata
+history.json

app.js

@@ -0,0 +1,96 @@
+
+var express = require('express');
+
+var app = express( );
+var server = require('http').Server(app);
+
+var remote = require('./lib/remote');
+var io = require('socket.io')(server);
+var uart = require('comlink2-uart');
+
+var pump = null;
+var serial = null;
+function get_pump (session) {
+  var transport = remote.transport(function opened ( ) {
+    console.log('creating transport');
+    var stream = this;
+    session(uart(stream).session, stream);
+  });
+  /*
+  pump = transport.duplex
+        .open(function ( ) {
+          console.log('created  transport');
+          session(transport.session);
+        })
+        ;
+  */
+
+  return transport;
+};
+
+app.use(express.static(__dirname + "/static"));
+app.get('/latest.json', function (req, res) {
+  console.log("REQ PARAMS", req.params, 'QUERY', req.query);
+  if (req.query.serial)
+      pump = get_pump( )
+      .serial(req.query.serial)
+      ;
+      pump = pump
+      .prelude({minutes: 3})
+      .ReadPumpModel(function rec_model (model, msg) {
+        pump.model = model;
+      })
+      .tap(function ( ) {
+        console.log('PUMP', pump.model, pump);
+        if (pump.model) {
+          this.ReadHistoryData({ page: 0 }, function (history, msg) {
+            console.log(history, msg);
+            res.send(history.json);
+          });
+        }
+      })
+});
+
+io.on('connection', function (socket) {
+  socket.on('query', function (data) {
+    console.log('querying', data, serial);
+    get_pump(function (pump, stream) {
+      console.log(pump);
+      pump.open( )
+      .serial(serial)
+      .prelude({minutes: 3})
+      .ReadPumpModel(function rec_model (model, msg) {
+        pump.model = model;
+        socket.emit('model', model);
+      })
+      .read_clock(function (clock, msg) {
+        console.log("CLOCK", arguments);
+        socket.emit('clock', clock, msg);
+      })
+      .tap(function ( ) {
+        if (pump.model) {
+          this.ReadHistoryData({ page: 0 }, function (history, msg) {
+            console.log(history, msg);
+            socket.emit('history', history, msg);
+          });
+        }
+      })
+      .end(function ( ) {
+        console.log("GAH CLOSE");
+        stream.close( );
+      });
+      ;
+
+    })
+      ;
+
+  });
+  socket.on('serial', function (data) {
+    console.log('serial data input', data, arguments);
+    serial = data;
+    // pump = (pump || get_pump( )).serial(data) ;
+  });
+});
+
+server.listen(process.env.PORT || 8080);
+

his2.sh

@@ -19,21 +19,12 @@ unset IFS
 
 
 
-$dir/decoding-carelink/bin/mm-latest2.py 360 --init --port $port --serial  $serial | tee ldata > /dev/null
-sed -n -e 's/.*data://p' ldata 
-#grab just history
-sed -n "/.*bolusdata:/,/.*bolusdata:/p" ldata | tee part1 >/dev/null
-#remove markers
-sed -e 's/bolusdata://g' part1 > part2 
-#remove line feeds
-tr '\n' ' ' < part2
+# get last 6 hours of data
+mm-latest.py --serial $serial --init --rf-minutes 3 360 --parser-out history.json | tee ldata > /dev/null
+tr '\n' ' ' < history.json
 
 echo""
 echo "</body></html>"
-rm part1
-rm part2
-# have to erase files
-# leave ldata for debug purposes in case of app crash