kahu-signalk 0.0.17 → 0.0.18

package/package.json

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

package/plugin/connector.js

@@ -75,7 +75,7 @@ class Connector {
     const content = response.Response;
 
     if (content["kahu.ErrorResponseMessage"] !== undefined) {
-      throw content.Error.exception;
+      throw content["kahu.ErrorResponseMessage"].exception;
     } else if (type !== undefined && content[type] === undefined) {
       throw (
         "Received response for wrong method: expected " +

package/plugin/mayara.js

@@ -25,6 +25,7 @@ class MayaraIngestor {
     this.reconnectMs = 1000;
     this.wsFailCount = 0;
     this.destroyed = false;
+    this.halted = false;
 
     this.radarIds = [];
     this.targetUuids = new Map();
@@ -53,9 +54,10 @@ class MayaraIngestor {
   }
 
   async start() {
+    if (this.halted) return;
     this._log("start", { message: "starting ingestor" });
     await this._discoverRadars();
-    this._connectWebSocket();
+    if (!this.halted) this._connectWebSocket();
   }
 
   async destroy() {
@@ -77,7 +79,43 @@ class MayaraIngestor {
     this._log("stop", { message: "ingestor destroyed" });
   }
 
+  _halt(reason, details = {}) {
+    if (this.halted || this.destroyed) return;
+    this.halted = true;
+    this._log("halted", { reason, ...details });
+
+    if (this.reconnectTimer) clearTimeout(this.reconnectTimer);
+    if (this.pollTimer) clearInterval(this.pollTimer);
+    this.reconnectTimer = null;
+    this.pollTimer = null;
+
+    if (this.ws) {
+      try {
+        this.ws.close();
+      } catch (err) {
+        this._log("ws_close_error", { error: err.message });
+      }
+    }
+    this.ws = null;
+  }
+
+  _isServerUnreachable(err) {
+    if (!err) return false;
+    const message = String(err?.message || "").toLowerCase();
+    const code = String(err?.code || err?.cause?.code || "").toUpperCase();
+    return (
+      code === "ECONNREFUSED" ||
+      code === "ENOTFOUND" ||
+      code === "EHOSTUNREACH" ||
+      code === "ETIMEDOUT" ||
+      message.includes("fetch failed") ||
+      message.includes("connection refused") ||
+      message.includes("host unreachable")
+    );
+  }
+
   async _discoverRadars() {
+    if (this.destroyed || this.halted) return;
     this._log("discover", { message: "requesting radar list" });
     try {
       const res = await fetch(
@@ -102,6 +140,12 @@ class MayaraIngestor {
       this._log("discover_ok", { radarCount: this.radarIds.length });
     } catch (err) {
       this._log("discover_error", { error: err.message });
+      if (this._isServerUnreachable(err)) {
+        this._halt("discover-unreachable", {
+          error: err.message,
+          code: err?.code || err?.cause?.code || null,
+        });
+      }
     }
   }
 
@@ -114,7 +158,7 @@ class MayaraIngestor {
   }
 
   _connectWebSocket() {
-    if (this.destroyed) return;
+    if (this.destroyed || this.halted) return;
     const wsUrl = this._buildWsUrl();
     this._log("ws_connecting", { wsUrl });
 
@@ -138,12 +182,20 @@ class MayaraIngestor {
     });
 
     this.ws.on("message", (raw) => this._handleDelta(raw));
-    this.ws.on("error", (err) => this._log("ws_error", { error: err.message }));
+    this.ws.on("error", (err) => {
+      this._log("ws_error", { error: err.message });
+      if (this._isServerUnreachable(err)) {
+        this._halt("ws-unreachable", {
+          error: err.message,
+          code: err?.code || err?.cause?.code || null,
+        });
+      }
+    });
     this.ws.on("close", () => this._scheduleReconnect());
   }
 
   _scheduleReconnect() {
-    if (this.destroyed) return;
+    if (this.destroyed || this.halted) return;
     this.wsFailCount += 1;
     this._log(
       "ws_close",
@@ -263,7 +315,7 @@ class MayaraIngestor {
   }
 
   _startHttpFallback() {
-    if (this.pollTimer || this.destroyed) return;
+    if (this.pollTimer || this.destroyed || this.halted) return;
     this._log("http_fallback_start", { reason: "ws-unstable" });
     this.pollTimer = setInterval(async () => {
       if (this.destroyed) return;