From b0bf43e6a272d42a55158e657bd937cb82fc3d8d Mon Sep 17 00:00:00 2001
From: Evgeny Zinoviev <me@ch1p.io>
Date: Sat, 10 Jun 2023 23:02:34 +0300
Subject: move files, rename home package to homekit

---
 bin/mqtt_node_util.py | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100755 bin/mqtt_node_util.py

(limited to 'bin/mqtt_node_util.py')

diff --git a/bin/mqtt_node_util.py b/bin/mqtt_node_util.py
new file mode 100755
index 0000000..420a87e
--- /dev/null
+++ b/bin/mqtt_node_util.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+import os.path
+import __py_include
+
+from time import sleep
+from typing import Optional
+from argparse import ArgumentParser, ArgumentError
+
+from homekit.config import config
+from homekit.mqtt import MqttNode, MqttWrapper, get_mqtt_modules
+from homekit.mqtt import MqttNodesConfig
+
+mqtt_node: Optional[MqttNode] = None
+mqtt: Optional[MqttWrapper] = None
+
+
+if __name__ == '__main__':
+    nodes_config = MqttNodesConfig()
+
+    parser = ArgumentParser()
+    parser.add_argument('--node-id', type=str, required=True, choices=nodes_config.get_nodes(only_names=True))
+    parser.add_argument('--modules', type=str, choices=get_mqtt_modules(), nargs='*',
+                        help='mqtt modules to include')
+    parser.add_argument('--switch-relay', choices=[0, 1], type=int,
+                        help='send relay state')
+    parser.add_argument('--push-ota', type=str, metavar='OTA_FILENAME',
+                        help='push OTA, receives path to firmware.bin')
+
+    config.load_app(parser=parser, no_config=True)
+    arg = parser.parse_args()
+
+    if arg.switch_relay is not None and 'relay' not in arg.modules:
+        raise ArgumentError(None, '--relay is only allowed when \'relay\' module included in --modules')
+
+    mqtt = MqttWrapper(randomize_client_id=True,
+                       client_id='mqtt_node_util')
+    mqtt_node = MqttNode(node_id=arg.node_id,
+                         node_secret=nodes_config.get_node(arg.node_id)['password'])
+
+    mqtt.add_node(mqtt_node)
+
+    # must-have modules
+    ota_module = mqtt_node.load_module('ota')
+    mqtt_node.load_module('diagnostics')
+
+    if arg.modules:
+        for m in arg.modules:
+            module_instance = mqtt_node.load_module(m)
+            if m == 'relay' and arg.switch_relay is not None:
+                module_instance.switchpower(arg.switch_relay == 1)
+
+    try:
+        mqtt.connect_and_loop(loop_forever=False)
+
+        if arg.push_ota:
+            if not os.path.exists(arg.push_ota):
+                raise OSError(f'--push-ota: file \"{arg.push_ota}\" does not exists')
+            ota_module.push_ota(arg.push_ota, 1)
+
+        while True:
+            sleep(0.1)
+
+    except KeyboardInterrupt:
+        mqtt.disconnect()
-- 
cgit v1.2.3


From 94afba2bb100504c19c271ea10ae7a95058d3e08 Mon Sep 17 00:00:00 2001
From: Evgeny Zinoviev <me@ch1p.io>
Date: Thu, 7 Sep 2023 00:38:21 +0300
Subject: mqtt_node_util: add --legacy-relay option

---
 bin/mqtt_node_util.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'bin/mqtt_node_util.py')

diff --git a/bin/mqtt_node_util.py b/bin/mqtt_node_util.py
index 420a87e..cf451fd 100755
--- a/bin/mqtt_node_util.py
+++ b/bin/mqtt_node_util.py
@@ -23,6 +23,7 @@ if __name__ == '__main__':
                         help='mqtt modules to include')
     parser.add_argument('--switch-relay', choices=[0, 1], type=int,
                         help='send relay state')
+    parser.add_argument('--legacy-relay', action='store_true')
     parser.add_argument('--push-ota', type=str, metavar='OTA_FILENAME',
                         help='push OTA, receives path to firmware.bin')
 
@@ -45,7 +46,10 @@ if __name__ == '__main__':
 
     if arg.modules:
         for m in arg.modules:
-            module_instance = mqtt_node.load_module(m)
+            kwargs = {}
+            if m == 'relay' and arg.legacy_relay:
+                kwargs['legacy_topics'] = True
+            module_instance = mqtt_node.load_module(m, **kwargs)
             if m == 'relay' and arg.switch_relay is not None:
                 module_instance.switchpower(arg.switch_relay == 1)
 
-- 
cgit v1.2.3