iobroker.al-ko 0.3.1 → 0.3.3

package/README.md

@@ -53,28 +53,12 @@ Do **not** contact AL-KO customer service regarding this project.
 
 ## Changelog
 
-### 0.3.1 (2026-03-09)
+### 0.3.3 (2026-03-13)
 
-- Documentation improvements
-- Corrected LICENSE information
+- Improved WebSocket reconnect handling
+- Fixed processing of AL-KO WebSocket reportedState messages
+- Updated Dependabot and workflow configuration
 - Updated development dependencies
-- Minor CI / workflow cleanup
-- No functional changes
-
-### 0.3.0 (2026-03-09)
-
-- Major maintenance release
-- Updated ESLint 9, Prettier 3 and TypeScript tooling
-- Updated development dependencies
-- Improved CI pipeline and adapter structure
-- No functional changes
-
-### 0.2.15 (2025-11-02)
-
-- Cleaned up admin/jsonConfig structure for adapter-check
-- Added missing `size` attributes
-- Added `.commitinfo` to `.gitignore`
-- No functional changes
 
 ➡ Full changelog here:  
 [CHANGELOG.md](./CHANGELOG.md)

package/docs/de/README.md

@@ -48,6 +48,21 @@ AL-KO bietet **keinen offiziellen Support** hierfür.
 
 ## Änderungen (Auszug)
 
+### 0.3.3 (2026-03-13)
+
+- WebSocket-Verarbeitung verbessert
+- Verarbeitung der AL-KO `reportedState` WebSocket-Nachrichten korrigiert
+- Stabileres Wiederverbinden der WebSocket-Verbindung
+- GitHub-Workflows aktualisiert (Dependabot / Automerge)
+- Entwicklungsabhängigkeiten aktualisiert
+
+### 0.3.2 (2026-03-12)
+
+- WebSocket-Reconnect nach Token-Aktualisierung verbessert
+- Reconnect-Schleifen bei absichtlich geschlossenen WebSocket-Verbindungen verhindert
+- API-Fehlerlogging für Push-Requests verbessert
+- Logging für WebSocket-Close-Code und Reason ergänzt
+
 ### 0.3.1 (2026-03-09)
 
 - Verbesserte Dokumentation

package/docs/en/README.md

@@ -48,12 +48,12 @@ It is a **community-developed project**.
 
 ## Changes (Summary)
 
-### 0.3.1 (2026-03-09)
+### 0.3.3 (2026-03-13)
 
-- Documentation improvements
-- Corrected LICENSE information
+- Improved WebSocket reconnect handling
+- Fixed processing of AL-KO WebSocket reportedState messages
+- Updated Dependabot and workflow configuration
 - Updated development dependencies
-- No functional changes
 
 See full changelog here:  
 ➡ [CHANGELOG.md](../../CHANGELOG.md)

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "al-ko",
-    "version": "0.3.1",
+    "version": "0.3.3",
     "tier": 3,
     "titleLang": {
       "en": "AL-KO",
@@ -40,6 +40,14 @@
       "de": "docs/de/README.md"
     },
     "news": {
+      "0.3.3": {
+        "en": "Improved WebSocket handling and message processing, updated repository workflows, and updated development dependencies.",
+        "de": "WebSocket-Handling und Nachrichtenverarbeitung verbessert, Repository-Workflows aktualisiert und Entwicklungsabhängigkeiten aktualisiert."
+      },
+      "0.3.2": {
+        "en": "Improved WebSocket reconnect handling, prevented reconnect loops on intentional closes, and improved API error logging for push requests.",
+        "de": "WebSocket-Reconnect-Verhalten verbessert, Reconnect-Schleifen bei absichtlich geschlossenen Verbindungen verhindert und API-Fehlerlogging für Push-Requests verbessert."
+      },
       "0.3.1": {
         "en": "Documentation improvements, corrected license information and updated development dependencies. No functional changes.",
         "de": "Dokumentation verbessert, Lizenzangaben korrigiert und Entwicklungsabhängigkeiten aktualisiert. Keine funktionalen Änderungen."
@@ -47,18 +55,6 @@
       "0.3.0": {
         "en": "Major maintenance release. Updated ESLint 9, Prettier 3, TypeScript tooling and development dependencies. Improved adapter structure and CI pipeline. No functional changes.",
         "de": "Größeres Wartungsrelease. Aktualisierung von ESLint 9, Prettier 3, TypeScript-Tooling und Entwicklungsabhängigkeiten. Verbesserte Adapterstruktur und CI-Pipeline. Keine funktionalen Änderungen."
-      },
-      "0.2.15": {
-        "en": "Admin config cleanup for adapter-check: removed $schema, corrected structure, added missing size attributes.",
-        "de": "Admin-Konfiguration für adapter-check bereinigt: $schema entfernt, Struktur korrigiert, fehlende size-Attribute ergänzt."
-      },
-      "0.2.14": {
-        "en": "Updated development tooling: release-script v5, plugins v4, ESLint 9, TypeScript 5.9, Prettier 3.",
-        "de": "Entwicklungswerkzeuge aktualisiert: release-script v5, Plugins v4, ESLint 9, TypeScript 5.9, Prettier 3."
-      },
-      "0.2.13": {
-        "en": "Fixed JSON syntax error in io-package.json. No functional changes.",
-        "de": "JSON-Syntaxfehler in io-package.json behoben. Keine funktionalen Änderungen."
       }
     },
     "keywords": ["al-ko", "Robolinho", "mower", "garden", "smart-garden"],

package/main.js

@@ -83,7 +83,9 @@ class AlKoAdapter extends utils.Adapter {
       this.log.info("Adapter is ready.");
     } catch (err) {
       this.log.error(
-        `Startup error: ${err.response?.data || err.message || err}`,
+        `Startup error: ${err.response?.status || ""} ${
+          JSON.stringify(err.response?.data, null, 2) || err.message
+        }`,
       );
     }
   }
@@ -139,6 +141,34 @@ class AlKoAdapter extends utils.Adapter {
       this.tokenExpiresAt = Date.now() + res.data.expires_in * 1000;
 
       this.log.debug("Access token refreshed successfully.");
+
+      for (const deviceId of Object.keys(this.webSockets)) {
+        try {
+          this.log.debug(
+            `Reconnecting WebSocket for ${deviceId} after token refresh`,
+          );
+
+          // const ws = this.webSockets[deviceId];
+          // if (ws) {
+          //  ws.terminate();
+          //}
+
+          const ws = this.webSockets[deviceId];
+          if (ws) {
+            ws._intentionalClose = true;
+            ws.terminate();
+          }
+
+          this.clearInterval(this.pingIntervals[deviceId]);
+          this.clearTimeout(this.pongTimeouts[deviceId]);
+
+          this.connectWebSocket(deviceId);
+        } catch (err) {
+          this.log.warn(
+            `Failed to reconnect WebSocket for ${deviceId}: ${err.message}`,
+          );
+        }
+      }
     }
   }
 
@@ -227,24 +257,137 @@ class AlKoAdapter extends utils.Adapter {
     return res.data;
   }
 
+  // ---------------- WebSocket Handling ----------------
+  // alte Version
+
+  //connectWebSocket(deviceId) {
+  //  if (!this.accessToken) {
+  //    return;
+  //  }
+  //
+  //  const url = `wss://socket.al-ko.com/v1?Authorization=${this.accessToken}&thingName=${deviceId}`;
+  //  const ws = new WebSocket(url);
+  //
+  //  ws.isAlive = true;
+  //
+  //  ws.on("open", () => {
+  //    this.log.debug(`WebSocket connected for device ${deviceId}`);
+  //
+  //    this.pingIntervals[deviceId] = this.setInterval(() => {
+  //      if (ws.readyState === WebSocket.OPEN) {
+  //        ws.ping();
+  //        ws.isAlive = false;
+  //
+  //        this.pongTimeouts[deviceId] = this.setTimeout(() => {
+  //          if (!ws.isAlive) {
+  //            this.log.warn(
+  //              `WebSocket ping timeout for ${deviceId}, closing connection.`,
+  //            );
+  //            ws.terminate();
+  //          }
+  //        }, 30000);
+  //      }
+  //    }, 120000);
+  //  });
+  //
+  //  ws.on("pong", () => {
+  //    ws.isAlive = true;
+  //    this.clearTimeout(this.pongTimeouts[deviceId]);
+  //  });
+  //
+  //  ws.on("message", async (msg) => {
+  //    if (this.config.wsDebug) {
+  //      this.log.debug(`WebSocket message (${deviceId}): ${msg}`);
+  //    }
+  //    try {
+  //      const data = JSON.parse(msg.toString());
+  //      if (data && data.state) {
+  //        const newState = data.state.reported || data.state;
+  //
+  //        this.deviceStates[deviceId] = this.deepMerge(
+  //          this.deviceStates[deviceId] || {},
+  //          newState,
+  //        );
+  //
+  //        await this.createStatesRecursive(
+  //          `${this.namespace}.${deviceId}.state`,
+  //          this.deviceStates[deviceId],
+  //          "",
+  //        );
+  //      }
+  //    } catch (e) {
+  //      this.log.error(
+  //        `Error processing WebSocket message for device ${deviceId}: ${e.message}`,
+  //      );
+  //    }
+  //  });
+  //
+  //  ws.on("close", () => {
+  //    this.log.warn(
+  //      `WebSocket closed for device ${deviceId}. Retrying in 10 seconds.`,
+  //    );
+  //    this.clearInterval(this.pingIntervals[deviceId]);
+  //    this.clearTimeout(this.pongTimeouts[deviceId]);
+  //
+  //    this.reconnectTimeouts[deviceId] = this.setTimeout(
+  //      () => this.connectWebSocket(deviceId),
+  //      10000,
+  //    );
+  //  });
+  //
+  //  ws.on("error", (err) => {
+  //    this.log.error(`WebSocket error for ${deviceId}: ${err.message}`);
+  //    try {
+  //      ws.terminate();
+  //    } catch {}
+  //  });
+  //
+  //  this.webSockets[deviceId] = ws;
+  //}
+
   // ---------------- WebSocket Handling ----------------
   connectWebSocket(deviceId) {
-    if (!this.accessToken) {
+    if (!this.accessToken || this._stopRequested) {
       return;
     }
 
+    if (this.reconnectTimeouts[deviceId]) {
+      this.clearTimeout(this.reconnectTimeouts[deviceId]);
+      delete this.reconnectTimeouts[deviceId];
+    }
+
+    const existingWs = this.webSockets[deviceId];
+    if (existingWs) {
+      try {
+        existingWs._intentionalClose = true;
+        existingWs.terminate();
+      } catch {}
+    }
+
     const url = `wss://socket.al-ko.com/v1?Authorization=${this.accessToken}&thingName=${deviceId}`;
     const ws = new WebSocket(url);
 
     ws.isAlive = true;
+    ws._intentionalClose = false;
 
     ws.on("open", () => {
       this.log.debug(`WebSocket connected for device ${deviceId}`);
 
+      if (this.pingIntervals[deviceId]) {
+        this.clearInterval(this.pingIntervals[deviceId]);
+      }
+      if (this.pongTimeouts[deviceId]) {
+        this.clearTimeout(this.pongTimeouts[deviceId]);
+      }
+
       this.pingIntervals[deviceId] = this.setInterval(() => {
         if (ws.readyState === WebSocket.OPEN) {
-          ws.ping();
           ws.isAlive = false;
+          ws.ping();
+
+          if (this.pongTimeouts[deviceId]) {
+            this.clearTimeout(this.pongTimeouts[deviceId]);
+          }
 
           this.pongTimeouts[deviceId] = this.setTimeout(() => {
             if (!ws.isAlive) {
@@ -260,29 +403,51 @@ class AlKoAdapter extends utils.Adapter {
 
     ws.on("pong", () => {
       ws.isAlive = true;
-      this.clearTimeout(this.pongTimeouts[deviceId]);
+      if (this.pongTimeouts[deviceId]) {
+        this.clearTimeout(this.pongTimeouts[deviceId]);
+        delete this.pongTimeouts[deviceId];
+      }
     });
 
     ws.on("message", async (msg) => {
       if (this.config.wsDebug) {
         this.log.debug(`WebSocket message (${deviceId}): ${msg}`);
       }
+
       try {
         const data = JSON.parse(msg.toString());
-        if (data && data.state) {
-          const newState = data.state.reported || data.state;
 
-          this.deviceStates[deviceId] = this.deepMerge(
-            this.deviceStates[deviceId] || {},
-            newState,
-          );
+        let newState = null;
+
+        if (data?.reportedState?.state?.reported) {
+          newState = data.reportedState.state.reported;
+        } else if (
+          data?.reportedState &&
+          typeof data.reportedState === "object" &&
+          !data.reportedState.state &&
+          !data.reportedState.previous &&
+          !data.reportedState.current &&
+          !data.reportedState.metadata
+        ) {
+          newState = data.reportedState;
+        } else if (data?.state?.reported) {
+          newState = data.state.reported;
+        }
 
-          await this.createStatesRecursive(
-            `${this.namespace}.${deviceId}.state`,
-            this.deviceStates[deviceId],
-            "",
-          );
+        if (!newState || typeof newState !== "object") {
+          return;
         }
+
+        this.deviceStates[deviceId] = this.deepMerge(
+          this.deviceStates[deviceId] || {},
+          newState,
+        );
+
+        await this.createStatesRecursive(
+          `${this.namespace}.${deviceId}.state`,
+          this.deviceStates[deviceId],
+          "",
+        );
       } catch (e) {
         this.log.error(
           `Error processing WebSocket message for device ${deviceId}: ${e.message}`,
@@ -290,17 +455,36 @@ class AlKoAdapter extends utils.Adapter {
       }
     });
 
-    ws.on("close", () => {
+    ws.on("close", (code, reason) => {
+      if (this.pingIntervals[deviceId]) {
+        this.clearInterval(this.pingIntervals[deviceId]);
+        delete this.pingIntervals[deviceId];
+      }
+      if (this.pongTimeouts[deviceId]) {
+        this.clearTimeout(this.pongTimeouts[deviceId]);
+        delete this.pongTimeouts[deviceId];
+      }
+
+      if (this.webSockets[deviceId] === ws) {
+        delete this.webSockets[deviceId];
+      }
+
+      if (this._stopRequested || ws._intentionalClose) {
+        return;
+      }
+
       this.log.warn(
-        `WebSocket closed for device ${deviceId}. Retrying in 10 seconds.`,
+        `WebSocket closed for device ${deviceId}. Code: ${code}, Reason: ${reason?.toString() || "none"}. Retrying in 10 seconds.`,
       );
-      this.clearInterval(this.pingIntervals[deviceId]);
-      this.clearTimeout(this.pongTimeouts[deviceId]);
 
-      this.reconnectTimeouts[deviceId] = this.setTimeout(
-        () => this.connectWebSocket(deviceId),
-        10000,
-      );
+      if (this.reconnectTimeouts[deviceId]) {
+        this.clearTimeout(this.reconnectTimeouts[deviceId]);
+      }
+
+      this.reconnectTimeouts[deviceId] = this.setTimeout(() => {
+        delete this.reconnectTimeouts[deviceId];
+        this.connectWebSocket(deviceId);
+      }, 10000);
     });
 
     ws.on("error", (err) => {
@@ -536,8 +720,14 @@ class AlKoAdapter extends utils.Adapter {
       this.log.info(`Push successful: ${id}`);
       this.updateDeviceStateCache(deviceId, relPathArr, state.val);
     } catch (err) {
+      const status = err.response?.status;
+      const data =
+        typeof err.response?.data === "object"
+          ? JSON.stringify(err.response.data, null, 2)
+          : err.response?.data;
+
       this.log.error(
-        `Error pushing state ${id}: ${err.response?.status} ${err.response?.data || err.message}`,
+        `Error pushing state ${id}: ${status || ""} ${data || err.message}`,
       );
     } finally {
       this.pendingPushes.delete(id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.al-ko",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Adapter for communication with AL-KO smart garden devices (Robolinho, mowing windows, operationState, etc.)",
   "author": {
     "name": "Hubert Zechner",
@@ -64,9 +64,9 @@
     "@iobroker/eslint-config": "^2.2.0",
     "@iobroker/testing": "^5.2.2",
     "@tsconfig/node20": "^20.1.8",
-    "@types/node": "^25.1.0",
-    "@typescript-eslint/eslint-plugin": "^8.54.0",
-    "@typescript-eslint/parser": "^8.54.0",
+    "@types/node": "^25.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.57.0",
+    "@typescript-eslint/parser": "^8.57.0",
     "prettier": "^3.8.1",
     "proxyquire": "^2.1.3"
   },