#93 #48 looks like new installs from scratch work correctly now

bubblesnet · bubblesnet · commit b9efd43d3806 · 2023-01-15T21:35:47.000-05:00
diff --git a/balena.yml b/balena.yml
@@ -1,7 +1,7 @@
 name: "BubblesNet Controller"
 type: "sw.application"
 description: >-
-  Deep-water-culture hydroponics ... automated
+  Deep-water-culture (DWC) hydroponics ... automated
 post-provisioning: >-
 
   ## Introduction
@@ -12,6 +12,8 @@ post-provisioning: >-
 
   - Requires at least 4G RAM, preferably 8G. Developed and tested on 8G, known not to work on 1G. RAM requirement driven almost entirely by ActiveMQ.
 
+  - Bring a sandwich to this process.  After you flash a micro-SD card and start it up, it can take 20+ minutes for the device to connect and update via Balena.
+  
   - This is literally an alpha-release. The underlying code has been in production for months, but the deployment to a Balena public fleet is brand new and has required a number of modifications. 
 
 
diff --git a/client/src/AuthenticatedApp.js b/client/src/AuthenticatedApp.js
@@ -199,6 +199,14 @@ function AuthenticatedApp (props) {
     const [switch_state, setSwitchState] = useState(props.initial_switch_state);
     const [sensor_readings] = useState(initial_sensor_readings);
     const [tilt,setTilt] = useState({ currently_tilted: false, last_tilt: 0} )
+/*    let initial_lastseen = []
+    for( let i = 0; i < site.stations[currentStationIndex].attached_devices.length; i++ ) {
+        initial_lastseen.push({deviceid: site.stations[currentStationIndex].attached_devices[i].deviceid,
+            lastseen_millis: site.stations[currentStationIndex].attached_devices[i].lastseen_millis})
+    }
+    console.log("initial_lastseen = " + JSON.stringify(initial_lastseen))
+    const [lastseen, setLastseen] = useState(initial_lastseen)
+*/
 
     /**
      * Port the API server is listening on - change it and rerender
@@ -386,6 +394,14 @@ function AuthenticatedApp (props) {
                 sensor_readings[msg.measurement_name + "_direction"] = msg.direction
                 sensor_readings[msg.measurement_name + "_units"] = msg.units
                 log.trace("msg: applying " + msg.value + " " + sensor_readings[msg.measurement_name + "_direction"] + " to " + msg.measurement_name)
+/*                for( let i = 0; i < lastseen.length; i++ ) {
+                    if( lastseen[i].deviceid == msg.deviceid ) {
+                        let new_lastseen = JSON.parse(JSON.stringify(lastseen))
+                        setLastseen( new_lastseen )
+                        break;
+                    }
+                }
+ */
             }
         }
 
diff --git a/client/src/components/CameraTab/CameraTabFunctional.js b/client/src/components/CameraTab/CameraTabFunctional.js
@@ -68,10 +68,14 @@ function RenderCameraTab(props) {
 
 
     function getDeviceRow(indexObject) {
+        let displayed_lastpicture = moment(props.station.attached_devices[indexObject.device_index].latest_picture_datetimemillis).format("LLLL")
+        if( displayed_lastpicture === 'Invalid date') {
+            displayed_lastpicture = 'No Pictures Yet'
+        }
 
 //        log.info("getDeviceRow " + JSON.stringify(indexObject) + ' label '+props.station.attached_devices[indexObject.device_index] + ' areas ' + JSON.stringify(Areas));
         return( <><Text gridArea={"label"+indexObject.labelarea_index}>{props.station.attached_devices[indexObject.device_index].deviceid + ' ' +
-            moment(props.station.attached_devices[indexObject.device_index].latest_picture_datetimemillis).format("LLLL")}</Text>
+            displayed_lastpicture }</Text>
             <Box gridArea={Areas[indexObject.picturearea_index].name}>
                 <ReactImageZoom {...ImageProps[indexObject.imageprops_index]} />
             </Box></>);
diff --git a/client/src/components/DeviceMapTab/DeviceMapTabFunctional.js b/client/src/components/DeviceMapTab/DeviceMapTabFunctional.js
@@ -34,6 +34,7 @@ import {
 } from 'grommet'
 import RenderFormActions from "../FormActions";
 import GoogleFontLoader from "react-google-font-loader";
+import moment from "moment";
 
 import {getContainerNames, getModuleTypes} from '../../api/utils';
 import log from "roarr";
@@ -68,10 +69,10 @@ function RenderDeviceMapTab (props) {
     let [displaySettings] = useState({units: 'IMPERIAL', language: 'en-us', languageOptions:['en-us','fr'], theme: props.theme}); //
 
     function getAddress( module ) {
-        if( module.device_type === "GPIO" ) {
-            return ""
+        if (module.protocol === "i2c") {
+            return "i2c " + module.address + " "
         } else {
-            return module.address + " "
+            return module.protocol
         }
     }
 
@@ -109,6 +110,25 @@ function RenderDeviceMapTab (props) {
         return ret
     }
 
+    function getDevices() {
+//        console.log("getModules " + JSON.stringify(station))
+//        log.trace("arr = " + JSON.stringify(arr))
+        let ret = station.attached_devices.map(getDeviceRow)
+        return ret
+    }
+
+    function getDeviceRow( row, index, arr ) {
+        console.log("row.lastseen_millis = "+row.lastseen_millis)
+        let displayed_lastseen = moment(row.lastseen_millis).format("DD MMM YYYY hh:mm a")
+        if( displayed_lastseen === 'Invalid date') {
+            displayed_lastseen = 'never'
+        }
+        return <TableRow key={row.deviceid}>
+            <TableCell >{row.deviceid}</TableCell>
+            <TableCell >{displayed_lastseen}</TableCell>
+            </TableRow>
+    }
+
 //    function getTypeSelector(module) {
 //            return <Text >{module.module_type} {module.module_name}</Text>
 //     }
@@ -128,6 +148,7 @@ function RenderDeviceMapTab (props) {
     }
 
     let module_rows = getModules()
+    let devices = getDevices()
 //    console.log("rendering with font set to " + values.theme.global.font.family)
 //    console.log("station = " + JSON.stringify(station))
     let ret =
@@ -140,7 +161,16 @@ function RenderDeviceMapTab (props) {
                 ]}
             />
             <div className="global_container_">
-                <Table id="settings-tab" >
+                <Table id="devicemap-lastseen-table" caption={"Edge devices and when they last messaged us."}>
+                    <tbody>
+                    <TableRow>
+                        <th >Device</th>
+                        <th >Last seen</th>
+                    </TableRow>
+                    {devices}
+                    </tbody></Table>
+                <hr />
+                <Table id="devicemap-modules-table" caption={"The sensor modules and which device they're attached to."}>
                     <tbody>
                     <TableRow>
                         <th >Device</th>
diff --git a/client/src/components/DeviceMapTab/deviceMapTab.css b/client/src/components/DeviceMapTab/deviceMapTab.css
@@ -56,3 +56,26 @@
 #advanced-table {
 }
 
+#devicemap-lastseen-table {
+    margin-top: 30px;
+    width: 800px;
+    font-size: medium;
+    border-collapse: collapse;
+}
+
+#devicemap-lastseen-table td {
+    border: 1px solid black; border-collapse: collapse;
+    text-align: center;
+}
+
+#devicemap-modules-table {
+    margin-top: 30px;
+    width: 800px;
+    font-size: medium;
+}
+
+#devicemap-modules-table td {
+    border: 1px solid black; border-collapse: collapse;
+}
+
+
diff --git a/push_local.cmd b/push_local.cmd
@@ -0,0 +1,3 @@
+copy client\.env.production client\.env
+balena push  --multi-dockerignore 192.168.23.163
+
diff --git a/server/migrations/00000041_bu.down.sql b/server/migrations/00000041_bu.down.sql
@@ -0,0 +1 @@
+ALTER TABLE device DROP COLUMN lastseen_millis;
diff --git a/server/migrations/00000041_bu.up.sql b/server/migrations/00000041_bu.up.sql
@@ -0,0 +1 @@
+ALTER TABLE device ADD COLUMN lastseen_millis bigint NULL;
diff --git a/server/src/api/models/device.js b/server/src/api/models/device.js
@@ -21,6 +21,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 const log = require("../../bubbles_logger").log
+const moment = require('moment');
 
 const locals = require("../../config/locals");
 const bcrypt = require('bcryptjs');
@@ -218,21 +219,28 @@ async function deleteDevice(deviceid) {
     })
 }
 
-async function setJustSeenFromEvent(event) {
-    return( await setJustSeen(event.deviceid))
+async function setJustSeenFromMessage(message) {
+    return( await setJustSeen(message.deviceid))
 }
 
 async function setJustSeen(deviceid) {
     return new Promise(function(resolve, reject) {
-        log.info("setJustSeen "+JSON.stringify(deviceid))
 
-        pool.query("UPDATE device SET lastseen=NOW() where deviceid=$1 RETURNING *",
-            [deviceid], (error, results) => {
+
+        let ms = moment().valueOf();
+
+        log.info("setJustSeen UPDATE device SET lastseen=NOW(), lastseen_millis="+ms+ " where deviceid="+deviceid)
+
+        pool.query("UPDATE device SET lastseen=NOW(), lastseen_millis=$2 where deviceid=$1 RETURNING *",
+            [deviceid, ms], (error, results) => {
                 if (error) {
-                    reject(error)
+                    let ret = {message: "setJustSeen failed for deviceid " + deviceid, deviceid: deviceid, error: error}
+                    log.error(JSON.stringify(ret))
+                    reject(ret)
                 } else {
-//                    log.info("new event " + results.rows[0])
-                    resolve({rowCount: results.rowCount, message: "updated "+ results.rowCount+" rows lastseen for deviceid " + deviceid})
+                    let ret = {rowCount: results.rowCount, message: "updated "+ results.rowCount+" rows lastseen for deviceid " + deviceid}
+//                    log.info("setJustSeen returning " + JSON.stringify(ret))
+                    resolve(ret)
                 }
             })
     });
@@ -249,7 +257,7 @@ module.exports = {
     getDevicesByStationId,
     createDefaultDevices,
     setJustSeen: setJustSeen,
-    setJustSeenFromEvent: setJustSeenFromEvent,
+    setJustSeenFromMessage: setJustSeenFromMessage,
     setLatestPicture,
     getDeviceShallow,
 }
diff --git a/server/src/api/models/module.js b/server/src/api/models/module.js
@@ -191,7 +191,7 @@ async function createDefaultSetOfModules( body ) {
 async function getAllModulesByCabinet(stationid) {
     log.info("getAllModulesByCabinet " + stationid)
     return new Promise( function (resolve, reject) {
-        let ssql = "select i2caddress, container_name, devicetypename, module_type, deviceid, moduleid, protocol from station c join device d on d.stationid_Station = stationid join devicetype t on d.devicetypeid_devicetype=t.devicetypeid join module m on m.deviceid_device = d.deviceid where c.stationid =$1"
+        let ssql = "select lastseen, d.lastseen_millis, i2caddress, container_name, devicetypename, module_type, deviceid, moduleid, protocol from station c join device d on d.stationid_Station = stationid join devicetype t on d.devicetypeid_devicetype=t.devicetypeid join module m on m.deviceid_device = d.deviceid where c.stationid =$1"
         pool.query(ssql, [stationid], async (error, results) => {
             if (error) {
                 log.info("getAllModulesByCabinet error " + error)
diff --git a/server/src/api/models/site.js b/server/src/api/models/site.js
@@ -71,6 +71,8 @@ async function getSiteById(siteid) {
                                FROM (
                                         SELECT c.stationid AS stationid,
                                                d.deviceid  AS deviceid,
+                                               d.lastseen,
+                                               d.lastseen_millis,
                                                d.picamera,
                                                d.picamera_resolutionx,
                                                d.picamera_resolutiony,
diff --git a/server/src/api/models/station.js b/server/src/api/models/station.js
@@ -112,6 +112,8 @@ async function getStationConfigsBySite(siteid) {
                                                FROM (
                                                         SELECT c.stationid AS stationid,
                                                                d.deviceid  AS deviceid,
+                                                               d.lastseen,
+                                                               d.lastseen_millis,
                                                                d.picamera,
                                                                d.picamera_resolutionx,
                                                                d.picamera_resolutiony,
diff --git a/server/src/queue-server.js b/server/src/queue-server.js
@@ -26,6 +26,7 @@ const message_type = require('./types').message_type
 const event = require('./api/models/event')
 const device = require('./api/models/device')
 const debug = require('debug')('queue-server')
+const moment = require('moment')
 
 const bubbles_queue = require('./api/models/bubbles_queue')
 const outlet = require('./api/models/outlet')
@@ -115,7 +116,7 @@ async function storeMessage(body) {
 
         // Set that this device was last seen just now.  This may be too costly to do as
         // a database update
-        let justseen_result = device.setJustSeenFromEvent(ev)
+        let justseen_result = await device.setJustSeenFromMessage(message)
         log.info("justseen returns " + JSON.stringify(justseen_result))
     } catch( err ) {
         log.error("storeMessage error saving message " + err + " " + message)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+copy client\.env.production client\.env`
	`2`	`+balena push --multi-dockerignore 192.168.23.163`
	`3`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE device DROP COLUMN lastseen_millis;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE device ADD COLUMN lastseen_millis bigint NULL;`