From e648a3360d439d7f265e2353e3c718669eabb289 Mon Sep 17 00:00:00 2001 From: TA2k Date: Mon, 9 Dec 2024 00:43:20 +0100 Subject: [PATCH] chore: release v0.3.4 - added config parameter for reconnect delay --- README.md | 3 + admin/index_m.html | 261 ++++++++++++++++++++++++--------------------- io-package.json | 21 +++- main.js | 13 +-- package-lock.json | 4 +- package.json | 2 +- 6 files changed, 166 insertions(+), 138 deletions(-) diff --git a/README.md b/README.md index 1e5ae25..fc3b919 100755 --- a/README.md +++ b/README.md @@ -18,6 +18,9 @@ Unter commands das commando auf klappen und den button neben start drücken wenn Remote sind vorgefertige Remote Befehle ## Changelog +### 0.3.4 (2024-12-08) + +- added config parameter for reconnect delay ### 0.3.2 (2024-12-06) diff --git a/admin/index_m.html b/admin/index_m.html index 98c345a..269a998 100755 --- a/admin/index_m.html +++ b/admin/index_m.html @@ -1,133 +1,154 @@ - - - - + + + + - - + + - - - + + + - - - + + + - - + // This will be called by the admin adapter when the user presses the save button + function save(callback) { + // example: select elements with class=value and build settings object + var obj = {}; + $(".value").each(function () { + var $this = $(this); + if ($this.attr("type") === "checkbox") { + obj[$this.attr("id")] = $this.prop("checked"); + } else { + obj[$this.attr("id")] = $this.val(); + } + }); + callback(obj); + } + + - -
-
-
- -
-
+ +
+
+
+ +
+
+ +
+
+ + +
+
+
+
+ + +
+
-
-
- - -
-
-
-
- - -
-
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
-
-
- - -
-
-
-
- - +
+
+ + +
+
+
+
+ + +
+
-
-
-
-
- - -
-
-
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
+
+
+ + +
+
-
-
- - -
-
-
-
- - -
-
+
+
+ +
- +
+
+ diff --git a/io-package.json b/io-package.json index 852d998..152aca9 100755 --- a/io-package.json +++ b/io-package.json @@ -1,8 +1,21 @@ { "common": { "name": "mercedesme", - "version": "0.3.3", + "version": "0.3.4", "news": { + "0.3.4": { + "en": "added config parameter for reconnect delay", + "de": "Konfigurationsparameter hinzugefügt für Reconnect-Verzögerung", + "ru": "добавлен параметр настройки для задержки перезаключения", + "pt": "parâmetro de configuração adicionado para reconectar o atraso", + "nl": "toegevoegde config parameter voor reconnect delay", + "fr": "paramètre de configuration ajouté pour reconnecter le délai", + "it": "parametro di configurazione aggiunto per riconnettere il ritardo", + "es": "parámetro de configuración añadido para el retraso de reconexión", + "pl": "dodany parametr konfiguracyjny dla opóźnienia ponownego połączenia", + "uk": "додано параметр налаштування для затримки відключення", + "zh-cn": "添加重连接延迟的配置参数" + }, "0.3.3": { "en": "fix for too many request error", "de": "Fix für zu viele Anfragen Fehler", @@ -80,9 +93,6 @@ "pl": "poprawić wysyłanie kodu", "uk": "поліпшення відправки коду", "zh-cn": "改进代码发送" - }, - "0.1.6": { - "en": "fix login" } }, "titleLang": { @@ -159,7 +169,8 @@ "disableSocket": false, "isAdapter": false, "ciam": "", - "resetAccess": false + "resetAccess": false, + "reconnectDelay": 60 }, "objects": [], "instanceObjects": [ diff --git a/main.js b/main.js index dd4d8f5..847a7f3 100755 --- a/main.js +++ b/main.js @@ -1539,7 +1539,7 @@ class Mercedesme extends utils.Adapter { setTimeout(() => { this.connectWS(); }, 2000); - }, 1 * 60 * 1000); //1min + }, this.config.reconnectDelay * 1000); }); this.ws.on("close", (data) => { this.log.debug(data); @@ -1552,17 +1552,10 @@ class Mercedesme extends utils.Adapter { // let parsed = new Uint8Array(hexString.match(/.{1,2}/g).map(byte => parseInt(byte, 16))); // const foo =Client.ClientMessage.deserializeBinary(parsed).toObject() this.log.silly("WS Message Length: " + data.length); - if (this.wsHeartbeatTimeout) { - clearTimeout(this.wsHeartbeatTimeout); + if (this.reconnectInterval) { clearInterval(this.reconnectInterval); } - this.wsHeartbeatTimeout = setTimeout(() => { - this.log.info("Lost WebSocket connection. Reconnect WebSocket"); - this.ws.close(); - setTimeout(() => { - this.connectWS(); - }, 2000); - }, 1 * 60 * 1000); //1min + try { const message = VehicleEvents.PushMessage.deserializeBinary(data).toObject(); if (message.debugmessage) { diff --git a/package-lock.json b/package-lock.json index 78ba119..5965c60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "iobroker.mercedesme", - "version": "0.3.3", + "version": "0.3.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "iobroker.mercedesme", - "version": "0.3.3", + "version": "0.3.4", "license": "MIT", "dependencies": { "@iobroker/adapter-core": "^3.2.3", diff --git a/package.json b/package.json index 8fd7f51..aa83289 100644 --- a/package.json +++ b/package.json @@ -59,5 +59,5 @@ "test:unit": "mocha test/unit --exit", "release": "release-script --all" }, - "version": "0.3.3" + "version": "0.3.4" }