@meri-imperiumi/signalk-meshtastic 1.2.2 → 1.2.3

package/README.md

@@ -91,6 +91,9 @@ Metrics used:
 
 ## Changes
 
+* 1.2.3 (2024-10-15)
+  - Nodes that haven't been seen in last two days are no longer registered to Signal K data structure
+  - Added safeties for various non-numeric telemetry and coordinate values
 * 1.2.2 (2025-10-01)
   - Set "last seen" timestamp of nodes based on packet payloads, not the time they're received
   - Send timestamp with telemetry

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meri-imperiumi/signalk-meshtastic",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Signal K plugin for interfacing with the Meshtastic LoRa mesh network",
   "scripts": {
     "test": "eslint ."

package/plugin/commands/waypoint.js

@@ -47,7 +47,7 @@ module.exports = {
       latitudeI: Math.floor(waypointVessel.navigation.position.value.latitude / 1e-7),
       longitudeI: Math.floor(waypointVessel.navigation.position.value.longitude / 1e-7),
       expire: Math.floor((new Date().getTime() / 1000) + (length * 60 * 60)),
-      name: waypointVessel.name,
+      name: waypointVessel.name || waypointVessel.mmsi,
       description: `AIS vessel ${waypointVessel.mmsi}`,
       icon: vesselIcon(waypointVessel),
     });

package/plugin/index.js

@@ -101,7 +101,7 @@ function nodeToSignalK(app, node, nodeInfo, settings) {
     },
   ];
 
-  if (nodeInfo.position) {
+  if (nodeInfo.position && Number.isFinite(nodeInfo.position.latitudeI)) {
     values.push({
       path: 'navigation.position',
       value: {
@@ -561,10 +561,13 @@ module.exports = (app) => {
               nodes[nodeInfo.num].publicKey = Buffer.from(nodeInfo.user.publicKey).toString('base64');
             }
             nodes[nodeInfo.num].seen = new Date(nodeInfo.lastHeard * 1000);
-            const ctx = nodeToSignalK(app, nodes[nodeInfo.num], nodeInfo, settings);
-            if (ctx && ctx.indexOf('vessels.urn:mrn:imo:mmsi:') === 0) {
-              // We have an MMSI match, store it
-              nodes[nodeInfo.num].mmsi = ctx.split(':').at(-1);
+            if (nodes[nodeInfo.num].seen > Date.now() - (1000 * 60 * 60 * 24 * 2)) {
+              // Node seen less than a two days ago, register with SK
+              const ctx = nodeToSignalK(app, nodes[nodeInfo.num], nodeInfo, settings);
+              if (ctx && ctx.indexOf('vessels.urn:mrn:imo:mmsi:') === 0) {
+                // We have an MMSI match, store it
+                nodes[nodeInfo.num].mmsi = ctx.split(':').at(-1);
+              }
             }
             setConnectionStatus();
             writeNodeDb();
@@ -754,7 +757,7 @@ module.exports = (app) => {
               },
               {
                 path: 'navigation.gnss.antennaAltitude',
-                value: position.data.altitude,
+                value: position.data.altitude || 0,
               },
             ];
             app.handleMessage('signalk-meshtastic', {
@@ -847,7 +850,8 @@ module.exports = (app) => {
                     // Not connected to Meshtastic yet
                     return;
                   }
-                  if (v.value.latitude === null) {
+                  if (!Number.isFinite(v.value.latitude)
+                    || !Number.isFinite(v.value.longitude)) {
                     // No position
                     return;
                   }
@@ -911,7 +915,7 @@ module.exports = (app) => {
                         }
                       }
                     }
-                    if (!mobPosition || !mobPosition.latitude) {
+                    if (!mobPosition || !Number.isFinite(mobPosition.latitude)) {
                       return;
                     }
                     const setWaypointMessage = create(Protobuf.Mesh.WaypointSchema, {

package/plugin/telemetry.js

@@ -14,16 +14,16 @@ class Telemetry {
 
   toMeshtastic() {
     const values = {};
-    if (this.data['environment.outside.temperature']) {
+    if (Number.isFinite(this.data['environment.outside.temperature'])) {
       values.temperature = this.data['environment.outside.temperature'] - 273.15;
     }
-    if (this.data['environment.outside.relativeHumidity']) {
+    if (Number.isFinite(this.data['environment.outside.relativeHumidity'])) {
       values.relativeHumidity = this.data['environment.outside.relativeHumidity'] * 100;
     }
-    if (this.data['environment.outside.pressure']) {
+    if (Number.isFinite(this.data['environment.outside.pressure'])) {
       values.barometricPressure = this.data['environment.outside.pressure'] / 100;
     }
-    if (this.data['environment.wind.directionTrue']) {
+    if (Number.isFinite(this.data['environment.wind.directionTrue'])) {
       values.windDirection = Math.floor(this.data['environment.wind.directionTrue'] * (180 / Math.PI));
     }
     if (this.data['environment.wind.speedOverGround'] && this.data['environment.wind.speedOverGround'].length) {
@@ -38,16 +38,16 @@ class Telemetry {
       // Clear wind history
       this.data['environment.wind.speedOverGround'] = [];
     }
-    if (this.data['electrical.batteries.house.voltage']) {
+    if (Number.isFinite(this.data['electrical.batteries.house.voltage'])) {
       values.voltage = this.data['electrical.batteries.house.voltage'];
     }
-    if (this.data['electrical.batteries.house.current']) {
+    if (Number.isFinite(this.data['electrical.batteries.house.current'])) {
       values.current = this.data['electrical.batteries.house.current'] * 1000;
     }
-    if (this.data['navigation.anchor.distanceFromBow']) {
+    if (Number.isFinite(this.data['navigation.anchor.distanceFromBow'])) {
       // Using distance is a bit silly here as the unit is mm, but what can we do
       values.distance = this.data['navigation.anchor.distanceFromBow'] * 1000;
-    } else if (this.data['environment.depth.belowSurface']) {
+    } else if (Number.isFinite(this.data['environment.depth.belowSurface'])) {
       // If not anchored, report depth as distance. Still mm.
       values.distance = this.data['environment.depth.belowSurface'] * 1000;
     }
@@ -55,6 +55,9 @@ class Telemetry {
   }
 
   updateWindSpeed(windSpeed) {
+    if (!Number.isFinite(windSpeed)) {
+      return;
+    }
     if (!this.data['environment.wind.speedOverGround']) {
       this.data['environment.wind.speedOverGround'] = [];
     }