simo 3.1.1__py3-none-any.whl → 3.1.4__py3-none-any.whl

simo/core/management/_hub_template/hub/supervisor.conf

@@ -12,6 +12,7 @@ autostart=true
 autorestart=false
 stopwaitsecs=15
 killasgroup=true
+environment=PYTHONUNBUFFERED=1
 
 
 # using gunicorn for regular requests
@@ -60,6 +61,7 @@ autostart=true
 autorestart=true
 stopwaitsecs=15
 killasgroup=true
+environment=PYTHONUNBUFFERED=1
 
 
 [program:simo-gateways]
@@ -76,14 +78,15 @@ autorestart=true
 stopwaitsecs=15
 killasgroup=true
 stopsignal=INT
+environment=PYTHONUNBUFFERED=1
 
 
-[program:simo-app-mqtt]
+[program:simo-mqtt-control]
 directory={{ project_dir }}/hub/
 command={{ venv_path }}/python manage.py run_app_mqtt_control
 process_name=%(program_name)s
 user=root
-stdout_logfile=/var/log/simo/app_mqtt.log
+stdout_logfile=/var/log/simo/mqtt_control.log
 stdout_logfile_maxbytes=1MB
 stdout_logfile_backups=3
 redirect_stderr=true
@@ -92,13 +95,14 @@ autorestart=true
 stopwaitsecs=15
 killasgroup=true
 stopsignal=INT
+environment=PYTHONUNBUFFERED=1
 
-[program:simo-app-mqtt-fanout]
+[program:simo-mqtt-fanout]
 directory={{ project_dir }}/hub/
 command={{ venv_path }}/python manage.py run_app_mqtt_fanout
 process_name=%(program_name)s
 user=root
-stdout_logfile=/var/log/simo/app_mqtt_fanout.log
+stdout_logfile=/var/log/simo/mqtt_fanout.log
 stdout_logfile_maxbytes=1MB
 stdout_logfile_backups=3
 redirect_stderr=true
@@ -107,6 +111,7 @@ autorestart=true
 stopwaitsecs=15
 killasgroup=true
 stopsignal=INT
+environment=PYTHONUNBUFFERED=1
 
 
 [program:simo-celery-beat]

simo/core/management/commands/on_http_start.py

@@ -56,7 +56,7 @@ def prepare_mosquitto():
             f.write(render_to_string('conf/mosquitto.conf'))
 
     subprocess.run(
-        ['service', 'mosquitto', 'reload'], stdout=subprocess.PIPE
+        ['service', 'mosquitto', 'restart'], stdout=subprocess.PIPE
     )
 
 

simo/core/management/commands/run_app_mqtt_control.py

@@ -21,10 +21,18 @@ class Command(BaseCommand):
         client.username_pw_set('root', settings.SECRET_KEY)
         client.on_connect = self.on_connect
         client.on_message = self.on_message
+        client.on_disconnect = self.on_disconnect
+        # Back off on reconnects to avoid busy-spin during outages
+        client.reconnect_delay_set(min_delay=1, max_delay=30)
+        # Route Paho logs to Python logging for visibility
+        try:
+            client.enable_logger()
+        except Exception:
+            pass
         client.connect(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
         try:
-            while True:
-                client.loop()
+            # Blocking network loop with built-in reconnect/backoff
+            client.loop_forever(retry_first_connection=True)
         finally:
             try:
                 client.disconnect()
@@ -37,6 +45,7 @@ class Command(BaseCommand):
 
     def on_message(self, client, userdata, msg):
         try:
+            print("Control: ", msg.topic)
             parts = msg.topic.split('/')
             # SIMO/user/<user-id>/control/<instance-uid>/Component/<component-id>
             if len(parts) < 7 or parts[0] != 'SIMO' or parts[1] != 'user' or parts[3] != 'control':
@@ -117,6 +126,14 @@ class Command(BaseCommand):
             # Never crash the consumer
             pass
 
+    def on_disconnect(self, client, userdata, rc):
+        # Non-zero rc means unexpected disconnect. Paho will back off and retry.
+        if rc != 0:
+            try:
+                print(f"Control MQTT disconnect rc={rc}; reconnecting with backoff...", file=sys.stderr)
+            except Exception:
+                pass
+
     def respond(self, client, user_id, request_id, ok=True, result=None, error=None):
         if not request_id:
             return

simo/core/management/commands/run_app_mqtt_fanout.py

@@ -21,10 +21,18 @@ class Command(BaseCommand):
         self.client.username_pw_set('root', settings.SECRET_KEY)
         self.client.on_connect = self.on_connect
         self.client.on_message = self.on_message
+        self.client.on_disconnect = self.on_disconnect
+        # Back off on reconnects to avoid busy-spin during outages
+        self.client.reconnect_delay_set(min_delay=1, max_delay=30)
+        # Route Paho logs to Python logging for visibility
+        try:
+            self.client.enable_logger()
+        except Exception:
+            pass
         self.client.connect(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
         try:
-            while True:
-                self.client.loop()
+            # Blocking network loop with built-in reconnect/backoff
+            self.client.loop_forever(retry_first_connection=True)
         finally:
             try:
                 self.client.disconnect()
@@ -36,6 +44,7 @@ class Command(BaseCommand):
 
     def on_message(self, client, userdata, msg):
         try:
+            print("Fanout: ", msg.topic)
             topic_parts = msg.topic.split('/')
             # SIMO/obj-state/<instance-uid>/<Model>/<id>
             if len(topic_parts) < 5 or topic_parts[0] != 'SIMO' or topic_parts[1] != 'obj-state':
@@ -94,3 +103,11 @@ class Command(BaseCommand):
         except Exception:
             # Never crash the consumer
             print('Fanout error:', ''.join(traceback.format_exception(*sys.exc_info())), file=sys.stderr)
+
+    def on_disconnect(self, client, userdata, rc):
+        # Non-zero rc means unexpected disconnect. Paho will back off and retry.
+        if rc != 0:
+            try:
+                print(f"Fanout MQTT disconnect rc={rc}; reconnecting with backoff...", file=sys.stderr)
+            except Exception:
+                pass

simo/users/templates/conf/mosquitto.conf

@@ -3,4 +3,13 @@ allow_anonymous false
 # ....which are stored in the following file
 password_file /etc/mosquitto/mosquitto_users
 
-acl_file /etc/mosquitto/acls.conf
+acl_file /etc/mosquitto/acls.conf
+
+# Ensure WebSocket listener for /mqtt/ via Nginx
+listener 8083 127.0.0.1
+protocol websockets
+
+
+# Ensure local TCP listener for internal services
+listener 1883 127.0.0.1
+

{simo-3.1.1.dist-info → simo-3.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simo
-Version: 3.1.1
+Version: 3.1.4
 Summary: Smart Home Supremacy
 Author-email: "Simon V." <simon@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-3.1.1.dist-info → simo-3.1.4.dist-info}/RECORD

@@ -286,7 +286,7 @@ simo/core/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZ
 simo/core/management/_hub_template/hub/manage.py,sha256=PNNlw3EVeIJDgkG0l-klqoxsKWfTYWG9jzRG0upmAaI,620
 simo/core/management/_hub_template/hub/nginx.conf,sha256=_-ch60oQYXMWmcvYUEbxMvXq9S46exwKmiBaVrxkQ3c,2339
 simo/core/management/_hub_template/hub/settings.py,sha256=4QhvhbtLRxHvAntwqG_qeAAtpDUqKvN4jzw9u3vqff8,361
-simo/core/management/_hub_template/hub/supervisor.conf,sha256=eHdvz98YtxizyPyiJ57-uiTrHGthXdFEN4lybxGBJZk,3492
+simo/core/management/_hub_template/hub/supervisor.conf,sha256=g9Df8scz-FrcLJWSkFzwcEH9yfGR332W_BWXCxxpR_U,3647
 simo/core/management/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
 simo/core/management/_hub_template/hub/wsgi.py,sha256=Lo-huLHnMDTxSmMBOodVFMWBls9poddrV2KRzXU0xGo,280
 simo/core/management/_hub_template/hub/__pycache__/asgi.cpython-312.pyc,sha256=FVjb5whNF2mVopSz71s0Zms8d_b90_4smf84OWWkzDI,396
@@ -297,10 +297,10 @@ simo/core/management/_hub_template/hub/__pycache__/urls.cpython-312.pyc,sha256=d
 simo/core/management/_hub_template/hub/__pycache__/wsgi.cpython-312.pyc,sha256=oA9duba-bsc_OOQnUaz_qiaB-0OcsS5dfjSVHTscrUM,529
 simo/core/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/management/commands/gateways_manager.py,sha256=oHzgC-eV4w_KHkiz6eCAlt3XMIwtS8_7mHDQ4UsU5y0,6967
-simo/core/management/commands/on_http_start.py,sha256=SYhE1d2GJ_tOFLvT9VFLPcXA3Lzz-dw5x3zMWPkdHYI,6278
+simo/core/management/commands/on_http_start.py,sha256=kxtWB3lOSyQA8tVmZRmLmaoVsliy5mhZp9_wwCvkj_A,6279
 simo/core/management/commands/republish_mqtt_state.py,sha256=mc8e7qnhDyC9_fiYr6d0g2s_3wGUXCrLo95-HBIrkOA,2248
-simo/core/management/commands/run_app_mqtt_control.py,sha256=Vopy9BPWRCmHaWwqYkJQE5a_OHCrUfC6LVI2VEB9w2o,4820
-simo/core/management/commands/run_app_mqtt_fanout.py,sha256=NLLE4A6KijvmId8pWD2qYr4VGbM_65Q8UKlbgXhNfIs,3820
+simo/core/management/commands/run_app_mqtt_control.py,sha256=-eDDAXbGtjqN1OK7Ym2FIdP1wVNJYR0DdvIyRzmXPDc,5592
+simo/core/management/commands/run_app_mqtt_fanout.py,sha256=diSEZM_sBQqm4wzzVgBT90Kt8kAhbZm5at2meEMv73M,4605
 simo/core/management/commands/run_gateway.py,sha256=bp0FQQoBeOSoxjHCCMicDL1fxPZZGyLgnq2QKht3bJo,645
 simo/core/management/commands/__pycache__/__init__.cpython-312.pyc,sha256=2Rw8IQ8vlr-wLXgjtc9zACkDD_SWZCxDlbrXw5vfI6o,142
 simo/core/management/commands/__pycache__/__init__.cpython-38.pyc,sha256=WKpfZZpAB9D7U4X6oWQIrU_H-6rUmq8Gl9fj9XaY2fw,178
@@ -11026,7 +11026,7 @@ simo/users/migrations/__pycache__/0043_userdevicereportlog_avg_speed_kmh.cpython
 simo/users/migrations/__pycache__/0044_permissionsrole_is_person.cpython-312.pyc,sha256=ONWJu9MdXkOPlq1exNumEf1iEnCbvIsEul1EW2WMVgA,832
 simo/users/migrations/__pycache__/__init__.cpython-312.pyc,sha256=i3P6nr4OxZF7ZodnxhMfQ4jecJ7O0gsEAnUPiAEtNZ0,134
 simo/users/migrations/__pycache__/__init__.cpython-38.pyc,sha256=NKq7WLgktK8WV1oOqCPbAbdkrPV5GRGhYx4VxxI4dcs,170
-simo/users/templates/conf/mosquitto.conf,sha256=1eIGNuRu4Y3hfAU6qiWix648eCRrw0oOT24PnyFI4ys,189
+simo/users/templates/conf/mosquitto.conf,sha256=Df0-4luyyU5b_WW2XJd0SzDYUccNVvWjKqjoTwEfXc0,361
 simo/users/templates/conf/mosquitto_acls.conf,sha256=e_2GN-5stuOO2QgFmELUCdHzZEF4pd2M7YGTTGpVQYo,369
 simo/users/templates/invitations/authenticated_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/authenticated_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -11034,9 +11034,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-3.1.1.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-3.1.1.dist-info/METADATA,sha256=ZP_qC3cL7BkSgQgvDwKOg6kyjirnyBDdYVIOitaPlEs,2224
-simo-3.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-simo-3.1.1.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-3.1.1.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-3.1.1.dist-info/RECORD,,
+simo-3.1.4.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-3.1.4.dist-info/METADATA,sha256=fdQuK5JIjFNaNn7FMY7R2vbKhlMuFf282kuWRWawPhc,2224
+simo-3.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+simo-3.1.4.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-3.1.4.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-3.1.4.dist-info/RECORD,,