Merge pull request #3220 from benderl/fixes

Fixes

Author: benderl

packages/helpermodules/pub.py

@@ -13,8 +13,8 @@ def __init__(self) -> None:
         self.publisher = InternalBrokerPublisher()
         self.publisher.start_loop()
 
-    def pub(self, topic: str, payload, qos: int = 0, retain: bool = True) -> None:
-        if payload == "":
+    def pub(self, topic: str, payload, qos: int = 0, retain: bool = True, no_json: bool = False) -> None:
+        if payload == "" or no_json:
             self.publisher.client.publish(topic, payload, qos=qos, retain=retain)
         else:
             self.publisher.client.publish(topic, payload=json.dumps(payload), qos=qos, retain=retain)
@@ -31,7 +31,8 @@ def __getattr__(self, name):
         return getattr(self.instance, name)
 
 
-def pub_single(topic, payload, hostname="localhost", port=1883, no_json=False, retain=True):
+def pub_single(topic: str, payload, hostname: str = "localhost", port: int = 1883,
+               no_json: bool = False, retain: bool = True):
     """ Sendet eine einzelne Nachricht an einen Host.
 
         Parameter
@@ -46,10 +47,7 @@ def pub_single(topic, payload, hostname="localhost", port=1883, no_json=False, r
         Kompatibilität mit ISSS, die ramdisk verwenden.
     """
     if hostname == "localhost":
-        Pub().pub(topic, payload, qos=0, retain=retain)
+        Pub().pub(topic, payload, qos=0, no_json=no_json, retain=retain)
         return
 
-    if no_json:
-        publish.single(topic, payload, hostname=hostname, port=port, retain=retain)
-    else:
-        publish.single(topic, json.dumps(payload), hostname=hostname, port=port, retain=retain)
+    publish.single(topic, payload if no_json else json.dumps(payload), hostname=hostname, port=port, retain=retain)

packages/modules/web_themes/standard_legacy/web/smartHome.html

@@ -450,7 +450,7 @@
 			// load scripts synchronously in order specified
 			var scriptsToLoad = [
 				// load mqtt library
-				'js/mqttws31.js',
+				'js/mqtt-5.14.1.js',
 				// some helper functions
 				'helperFunctions.js?ver=20221117',
 				// functions for processing messages