modified web server to bind to 0.0.0.0 to allow external access

.gitignore

@@ -1,5 +1,13 @@
+# Python environment, setuptools, build
 venv
-.idea
-/test/clients.json
 *.pyc
-*.egg-info
+*.egg-info
+deb_dist
+dist
+
+# PyCharm
+.idea
+
+# Project generated test files
+/test/clients.json
+*.json

requirements.txt

@@ -1,2 +1,10 @@
+pip~=20.2.4
+setuptools~=50.3.2
+stdeb3~=0.9.0.post2
 paho-mqtt~=1.5.1
-setuptools~=50.3.1
+Jinja2~=2.11.2
+Werkzeug~=1.0.1
+itsdangerous~=1.1.0
+click~=7.1.2
+MarkupSafe~=1.1.1
+Flask~=1.1.2

setup.cfg

@@ -1,19 +1,29 @@
 [metadata]
 name = torchsub
-version = 0.0.1
+version = 0.0.3
 author = Benjamin Dweck
 author_email = [email protected]
-url = http://git.rudefox.io/bj/torch-subscriber-simple
+description = TORch Simple Subscriber
+url = https://git.rudefox.io/bj/torch-subscriber-simple
 classifiers =
     Programming Language :: Python :: 3
     License :: OSI Approved :: MIT License
 
 [options]
 packages = find:
-install_requires = paho-mqtt~=1.5.1
+install_requires =
+    paho-mqtt~=1.5.1
+    setuptools~=50.3.1
+    pip~=20.2.3
+    Jinja2~=2.11.2
+    Werkzeug~=1.0.1
+    itsdangerous~=1.1.0
+    click~=7.1.2
+    MarkupSafe~=1.1.1
+    Flask~=1.1.1
 
 [options.entry_points]
 console_scripts = torch-sub=torchsub.torch_sub:main
 
 [options.packages.find]
-exclude=test
+exclude=test

torch-sub.conf

@@ -0,0 +1,15 @@
+##############################################################################
+#  Sample torch-sub.conf file
+##############################################################################
+
+[mqtt]
+#Topic is required
+Topic=torch/+/wake
+
+[database]
+#Filename is optional and defaults to 'clients.json'
+Filename=torch_clients.json
+
+[web]
+#Port is optional and defaults to 8080
+Port=3434

torchsub/torch_sub.py

@@ -7,6 +7,8 @@ import threading
 
 import paho.mqtt.subscribe as mqtt
 
+from torchsub import torch_sub_webserver
+
 database_filename = "clients.json"
 database_lock = threading.Lock()
 
@@ -15,10 +17,6 @@ database_lock = threading.Lock()
 def update_client_record(client, userdata, message):
     database_lock.acquire()
 
-    if not os.path.exists(database_filename):
-        with open(database_filename, 'w') as database_blank:
-            json.dump({}, database_blank)
-
     with open(database_filename, 'r') as infile:
         database = json.load(infile)
 
@@ -47,6 +45,8 @@ class Config:
         self.broker_port = None
         self.topic = None
         self.tls = None
+        self.database_file = database_filename
+        self.web_port = 8080
         parser = self.do_cli_argument_parsing()
         (config_path, config_filename) = self.get_config_path(parser.parse_args())
         print("Using torch configuration path: " + config_path)
@@ -98,10 +98,26 @@ class Config:
                 'certfile': cert_file,
                 'keyfile': key_file
             }
+        if config.has_section('database'):
+            self.database_file = config['database'].get('Filename', fallback=database_filename)
+        if config.has_section('web'):
+            self.web_port = config['web'].getint('Port', fallback=self.web_port)
 
 
 def main():
     config = Config()
+
+    global database_filename
+    database_filename = config.database_file
+
+    if not os.path.exists(database_filename):
+        with open(database_filename, 'w') as database_blank:
+            json.dump({}, database_blank)
+
+    threading.Thread(target=torch_sub_webserver.app.run,
+                     args=("0.0.0.0", config.web_port),
+                     daemon=True).start()
+
     subscribe(config.broker_hostname,
               config.broker_port,
               config.topic,

torchsub/torch_sub_webserver.py

@@ -0,0 +1,15 @@
+from flask import Flask
+
+from torchsub import torch_sub
+
+app = Flask(__name__)
+
+
+@app.route('/clients', methods=['GET'])
+def clients():
+    with open(torch_sub.database_filename, 'r') as database:
+        return app.response_class(
+            response=database.read(),
+            status=200,
+            mimetype='application/json'
+        )