kahu-signalk 0.0.8 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kahu-signalk",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Contribute AIS and ARPA targets from your vessel to crowdsourcing for marine safety!",
   "keywords": [
     "signalk-node-server-plugin",

package/plugin/connector.js

@@ -1,18 +1,18 @@
-const fs = require('fs').promises;
-const { delay } = require('./utils');
-const { AvroClient } = require('./avroclient');
-const path = require('path');
+const fs = require("fs").promises;
+const { delay } = require("./utils");
+const { AvroClient } = require("./avroclient");
+const path = require("path");
 
 // Connector acts as a cooperative thread: When created, it starts an
 // async timeout function immediately
 
 process.on("unhandledRejection", (reason, promise) => {
-    console.error("Unhandled Rejection at:", promise);
-    console.error("Reason:", reason.stack);
+  console.error("Unhandled Rejection at:", promise);
+  console.error("Reason:", reason.stack);
 });
 
 class Connector {
-  constructor({status_function, routecache, plugin_dir, config}) {
+  constructor({ status_function, routecache, plugin_dir, config }) {
     this.last_stats = null;
     this.last_status = null;
     this.status_function = status_function;
@@ -28,7 +28,8 @@ class Connector {
       plugin_dir,
       "data",
       "protocol",
-      "proto_avro.json");
+      "proto_avro.json",
+    );
     this.schema = null;
     console.error("Connector created");
     setTimeout(this.main.bind(this), 0);
@@ -45,7 +46,7 @@ class Connector {
     this.last_stats = await this.routecache.connectionStats();
     this.updateStatus();
   }
-  
+
   setStatus(status) {
     this.last_status = status;
     this.updateStatus();
@@ -55,11 +56,13 @@ class Connector {
     const status = [];
     if (this.last_status !== null) status.push(this.last_status);
     if (this.last_stats !== null) {
-      status.push(`${this.last_stats.unsent_tracks} unsent tracks totalling ${this.last_stats.unsent_datapoints} unsent datapoints`);
+      status.push(
+        `${this.last_stats.unsent_tracks} unsent tracks totalling ${this.last_stats.unsent_datapoints} unsent datapoints`,
+      );
     }
     this.status_function?.(status.join(", "));
   }
-  
+
   async read(type) {
     console.error("Connector parsing response");
 
@@ -70,12 +73,16 @@ class Connector {
       throw "Received response with wrong callid";
     }
     const content = response.Response;
-    
-    if (content["kahu.ErrorResponseMessage"] !== undefined) {    
+
+    if (content["kahu.ErrorResponseMessage"] !== undefined) {
       throw content.Error.exception;
-    } else if (   (type !== undefined)
-               && (content[type] === undefined)) {
-      throw "Received response for wrong method: expected " + type + " but got " + Object.keys(content)[0];
+    } else if (type !== undefined && content[type] === undefined) {
+      throw (
+        "Received response for wrong method: expected " +
+        type +
+        " but got " +
+        Object.keys(content)[0]
+      );
     }
     console.error("Connector response parsed");
     return container;
@@ -83,7 +90,7 @@ class Connector {
 
   async login() {
     while (!this.config.api_key) await delay(500);
-    
+
     console.error("Connector logging in");
 
     await this.client.send({
@@ -94,15 +101,15 @@ class Connector {
             Call: {
               "kahu.LoginMessage": {
                 Login: {
-                  apikey: this.config.api_key
-                }
-              }
-            }
-          }
-        }
-      }
+                  apikey: this.config.api_key,
+                },
+              },
+            },
+          },
+        },
+      },
     });
-    
+
     console.error("Send done, gonna parse response\n");
     const response = await this.read("kahu.LoginResponseMessage");
     console.error("Response parsed");
@@ -110,9 +117,9 @@ class Connector {
   }
 
   async sendTracks() {
-    console.error("Connector sending tracks");
     const submit = await this.routecache.retrieve();
     if (submit === null) return;
+    console.error("Connector sending tracks");
     await this.client.send({
       Message: {
         "kahu.Call": {
@@ -120,14 +127,14 @@ class Connector {
             id: ++this.callid,
             Call: {
               "kahu.SubmitMessage": {
-                Submit: submit
-              }
-            }
-          }
-        }
-      }
+                Submit: submit,
+              },
+            },
+          },
+        },
+      },
     });
-    
+
     await this.read("kahu.SubmitResponseMessage");
     await this.routecache.markAsSent(submit);
     this.last_track_sent = new Date();
@@ -137,9 +144,9 @@ class Connector {
 
   async main() {
     try {
-      console.error("Connector running client is null: ", (this.client === null));
+      console.error("Connector running client is null: ", this.client === null);
 
-      this.schema = await fs.readFile(this.schema_file, 'utf8');
+      this.schema = await fs.readFile(this.schema_file, "utf8");
 
       this.client = new AvroClient({
         schema: this.schema,
@@ -148,12 +155,11 @@ class Connector {
         min_reconnect_time: this.config.min_reconnect_time || 100.0,
         max_reconnect_time: this.config.max_reconnect_time || 6000.0,
         connect_function: this.login.bind(this),
-        status_function: this.setStatus.bind(this)
+        status_function: this.setStatus.bind(this),
       });
 
       while (!this.cancelled) {
         try {
-          console.error("Connector connecting...");
           await this.client.ensureConnection();
           if (this.cancelled) break;
           await this.sendTracks();
@@ -170,6 +176,6 @@ class Connector {
       console.error(e.stack);
     }
   }
-};
+}
 
 module.exports = { Connector };

package/plugin/index.js

@@ -10,7 +10,50 @@ while (packageDir !== path.dirname(packageDir)
   packageDir = path.dirname(packageDir);
 }
 
-const nmeaRattmRegex = /\$RATTM,(\d{2}),([\d\.\-]+),([\d\.\-]+),([^,]*),([\d\.\-]+),([\d\.\-]+),([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),(..*)\*([A-Fa-f0-9]{2})\s*/;
+const parseOptionalFloat = (value) => {
+  if (value === undefined || value === null || value === '') return undefined;
+  const parsed = parseFloat(value);
+  return Number.isNaN(parsed) ? undefined : parsed;
+};
+
+const parseRattmSentence = (sentence) => {
+  const [payload] = sentence.split('*');
+  if (!payload) return null;
+
+  const parts = payload.trim().split(',');
+  if (parts[0] !== '$RATTM') return null;
+  if (parts.length < 16) return null;
+
+  const target_id = parseInt(parts[1], 10);
+  const target_distance = parseOptionalFloat(parts[2]);
+  const target_bearing = parseOptionalFloat(parts[3]);
+  const target_bearing_unit = parts[4] || '';
+  const target_speed = parseOptionalFloat(parts[5]);
+  const target_course = parseOptionalFloat(parts[6]);
+  const target_course_unit = parts[7] || '';
+  const target_distance_unit = parts[10] || '';
+  const target_name = parts[12] || '';
+  const target_status = parts[13] || '';
+
+  if (!Number.isFinite(target_id) ||
+      !Number.isFinite(target_distance) ||
+      !Number.isFinite(target_bearing)) {
+    return null;
+  }
+
+  return {
+    target_id,
+    target_distance,
+    target_bearing,
+    target_bearing_unit,
+    target_speed,
+    target_course,
+    target_course_unit,
+    target_distance_unit,
+    target_name,
+    target_status,
+  };
+};
 
 const deg2rad = (degrees) => degrees * (Math.PI / 180);
 
@@ -48,21 +91,24 @@ module.exports = (app) => {
         parser: ({ id, sentence, parts, tags }, session) => {
           if (sentence.startsWith("$RATTL")) {
           } else if (sentence.startsWith("$RATTM")) {
-            const match = nmeaRattmRegex.exec(sentence);
-
-            if (!match) {
+            const parsed = parseRattmSentence(sentence);
+            if (!parsed) {
               console.error("Failed to parse RATTM NMEA sentence: [", sentence, "]");
               return;
             }
-            if (match.length - 1 != 14) {
-              console.log("Only parsed ", (match.length - 1), " fields of RATTM NMEA sentence: [", sentence, "]");
-              return;
-            }
-            
-            const target_id = parseInt(match[1]);
-            const target_distance = parseFloat(match[2]);
-            const target_bearing = parseFloat(match[3]);
-            const target_bearing_unit = match[4];
+
+            const {
+              target_id,
+              target_distance,
+              target_bearing,
+              target_bearing_unit,
+              target_speed,
+              target_course,
+              target_course_unit,
+              target_distance_unit,
+              target_name,
+              target_status,
+            } = parsed;
 
             if (target_bearing_unit === 'R') {
               console.warn("Relative bearings not yet supported, skipping RATTM sentence");
@@ -81,16 +127,11 @@ module.exports = (app) => {
               distance: target_distance,
               bearing: target_bearing,
               bearing_unit: target_bearing_unit,
-              distance_unit: match[10],
+              distance_unit: target_distance_unit,
             }
 
-            const target_speed = parseFloat(match[5]);
-            const target_course = parseFloat(match[6]);
-            const target_course_unit = match[7];
             // target_distance_closes_point_of_approac: parseInt(match[8]),
             // target_time_closes_point_of_approac: parseInt(match[9]),
-            const target_name = match[11];
-            const target_status = match[12];
             
             const now = new Date();
             if (now - plugin.route_updates[target_id] > 60000) {
@@ -130,7 +171,7 @@ module.exports = (app) => {
     },
     stop: async () => {
       await plugin.connector?.destroy?.();
-      await plugin.routecache?.destroy?.();
+      await plugin.cache?.destroy?.();
       console.log("Stopped KAHU radar Hub")
     },
     schema: () => {