kahu-signalk 0.0.8 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kahu-signalk",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "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

@@ -130,7 +130,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: () => {