iobroker.al-ko 0.3.0 → 0.3.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019
+Copyright (c) 2026 Hubert Zechner <hubertiob@posteo.at>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -51,29 +51,41 @@ Do **not** contact AL-KO customer service regarding this project.
 
 ---
 
-## Latest Changes
+## Changelog
 
-### **0.2.16 (unreleased / development)**
+### 0.3.2 (2026-03-12)
 
-- Improved instance handling and object hierarchy
-- Better separation of writable and non-writable states
-- Added axios global timeout
-- Introduced adapter-safe timers (`this.setTimeout`, `this.setInterval`)
-- Many internal improvements and preparations for future patches
+- Improved WebSocket reconnect handling after token refresh
+- Prevented reconnect loops on intentional WebSocket closes
+- Improved API error logging for push requests
+- Added WebSocket close code and reason logging
 
-### **0.2.15 (2025-11-02)**
+### 0.3.1 (2026-03-09)
 
-- Cleaned up admin/jsonConfig structure for adapter-check
-- Added missing `size` attributes
-- Added `.commitinfo` to `.gitignore`
+- Documentation improvements
+- Corrected LICENSE information
+- Updated development dependencies
+- Minor CI / workflow cleanup
 - No functional changes
 
-➡ **Full changelog here:**  
-**[CHANGELOG.md](./CHANGELOG.md)**
+### 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
+
+➡ Full changelog here:  
+[CHANGELOG.md](./CHANGELOG.md)
 
 ---
 
 ## License
 
+MIT License
+
+Copyright (c) 2026 Hubert Zechner <hubertiob@posteo.at>
+
 This project is released under the **MIT License**.  
 See the included **LICENSE** file for full details.

package/docs/de/README.md

@@ -48,7 +48,19 @@ AL-KO bietet **keinen offiziellen Support** hierfür.
 
 ## Änderungen (Auszug)
 
-### **0.3.0**
+### 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
+- Lizenzangaben korrigiert
+- Entwicklungsabhängigkeiten aktualisiert
+- Keine funktionalen Änderungen
 
 Alle Änderungen siehe vollständigen Changelog:  
 ➡ [CHANGELOG.md](../../CHANGELOG.md)

package/docs/en/README.md

@@ -48,7 +48,19 @@ It is a **community-developed project**.
 
 ## Changes (Summary)
 
-### **0.3.0**
+### 0.3.2 (2026-03-12)
+
+- Improved WebSocket reconnect handling after token refresh
+- Prevented reconnect loops on intentional WebSocket closes
+- Improved API error logging for push requests
+- Added WebSocket close code and reason logging
+
+### 0.3.1 (2026-03-09)
+
+- Documentation improvements
+- Corrected LICENSE information
+- 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.0",
+    "version": "0.3.2",
     "tier": 3,
     "titleLang": {
       "en": "AL-KO",
@@ -40,6 +40,18 @@
       "de": "docs/de/README.md"
     },
     "news": {
+      "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."
+      },
+      "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."
@@ -51,14 +63,6 @@
       "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."
-      },
-      "0.2.12": {
-        "en": "Fixed jsonConfig schema URL, added missing size attributes, increased minimum requirements.",
-        "de": "Schema-URL korrigiert, fehlende Size-Attribute ergänzt, Mindestanforderungen erhöht."
-      },
-      "0.2.11": {
-        "en": "Minor code corrections.",
-        "de": "Kleine Code-Korrekturen."
       }
     },
     "keywords": ["al-ko", "Robolinho", "mower", "garden", "smart-garden"],
@@ -81,7 +85,7 @@
     ],
     "globalDependencies": [
       {
-        "admin": ">=7.6.17"
+        "admin": ">=7.6.20"
       }
     ]
   },

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,7 +403,10 @@ 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) => {
@@ -290,17 +436,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 +701,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.0",
+  "version": "0.3.2",
   "description": "Adapter for communication with AL-KO smart garden devices (Robolinho, mowing windows, operationState, etc.)",
   "author": {
     "name": "Hubert Zechner",
@@ -56,13 +56,13 @@
     "ws": "^8.19.0"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^5.0.0",
-    "@alcalzone/release-script-plugin-iobroker": "^4.0.0",
-    "@alcalzone/release-script-plugin-license": "^4.0.0",
-    "@alcalzone/release-script-plugin-manual-review": "^4.0.0",
-    "@iobroker/adapter-dev": "^1.0.0",
+    "@alcalzone/release-script": "^5.1.1",
+    "@alcalzone/release-script-plugin-iobroker": "^5.1.2",
+    "@alcalzone/release-script-plugin-license": "^5.1.1",
+    "@alcalzone/release-script-plugin-manual-review": "^5.1.1",
+    "@iobroker/adapter-dev": "^1.5.0",
     "@iobroker/eslint-config": "^2.2.0",
-    "@iobroker/testing": "^5.1.1",
+    "@iobroker/testing": "^5.2.2",
     "@tsconfig/node20": "^20.1.8",
     "@types/node": "^25.1.0",
     "@typescript-eslint/eslint-plugin": "^8.54.0",