Improve the device script (#560)

bieniu · Jan 16, 2025 · 4006f5a · 4006f5a
1 parent fb7868d
commit 4006f5a
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/python_scripts/shellies_discovery_gen2.py b/python_scripts/shellies_discovery_gen2.py
@@ -310,6 +310,7 @@
 UPDATE_FIRMWARE_BETA = "firmware_beta"
 
 SCRIPT_CODE = """let topicPrefix = null;
+let updateTimer = null;
 
 function sendDeviceStatus() {
   try {
@@ -319,32 +320,38 @@
       MQTT.publish(topicPrefix + ^/status/rpc^, JSON.stringify(status));
     });
   } catch (e) {
-    console.log(^sendDeviceStatus has failed: ^, e1);
+    console.log(^sendDeviceStatus has failed: ^, e);
   }
-};
+}
+
+function onMQTTConfigReceived(config) {
+  topicPrefix = config.topic_prefix;
+  console.log(^Using topic prefix: ^, topicPrefix);
+
+  if (!updateTimer) {
+    updateTimer = Timer.set(30000, true, sendDeviceStatus);
+  }
+}
 
 function initScript() {
   console.log(^Starting shellies_discovery_gen2_script^);
   try {
-    Shelly.call(^MQTT.GetConfig^, {}, function (config) {
-      topicPrefix = config.topic_prefix;
-      console.log(^Using topic prefix: ^, topicPrefix);
-    });
-    let updateTimer = Timer.set(30000, true, sendDeviceStatus);
+    Shelly.call(^MQTT.GetConfig^, {}, onMQTTConfigReceived);
   } catch (e) {
-    console.log(^initScript has failed: ^, e1);
+    console.log(^initScript has failed: ^, e);
   }
 }
 
 initScript();
 """
-SCRIPT_CURRENT_NAME = "shellies_discovery_gen2_script_20241123"
+SCRIPT_CURRENT_NAME = "shellies_discovery_gen2_script_20250114"
 SCRIPT_OLD_NAMES = [
     "Send Device Status",
     "send_device_status",
     "send_device_status.js",
     "shellies_discovery_gen2_script_20221116",
     "shellies_discovery_gen2_script_20240216",
+    "shellies_discovery_gen2_script_20241123",
 ]
 
 STATE_CLASS_MEASUREMENT = "measurement"