Skip to content

fix mqtt class #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FedDam merged 1 commit into from
Nov 22, 2024
Merged

fix mqtt class #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Used as a wrapper dependency in the Home Assistant integration.
Version
-------

0.3.4
0.3.5

Installation
------------
Expand Down
20 changes: 12 additions & 8 deletions microBeesPy/mqtt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import logging
import paho.mqtt.client as mqtt
import asyncio

_LOGGER = logging.getLogger(__name__)

class MicrobeesMqtt:
"""Class to handle MQTT communication with the microBees platform."""

def __init__(self, broker, port, username, password, client_id, on_message_callback=None):
self.broker = broker
self.port = port
Expand All @@ -21,7 +22,7 @@ def __init__(self, broker, port, username, password, client_id, on_message_callb
# Use the new API for setting callbacks
self.client.on_connect = self._on_connect
self.client.on_disconnect = self._on_disconnect
self.client.on_message = self._on_message if on_message_callback else None
self.client.on_message = self._on_message

def _on_connect(self, client, userdata, flags, rc):
"""Handle connection to the broker."""
Expand All @@ -30,15 +31,18 @@ def _on_connect(self, client, userdata, flags, rc):

def _on_disconnect(self, client, userdata, rc):
"""Handle disconnection from the broker."""
if rc != 0:
_LOGGER.warning(f"Disconnected from MQTT broker with error code {rc}")

def _on_message(self, client, userdata, message):
"""Handle incoming messages."""
if self.on_message_callback:
self.on_message_callback(message)
loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
loop.run_until_complete(self.on_message_callback(message))

def connect(self):
"""Connect to the MQTT broker."""
self.client.connect(self.broker, self.port)
self.client.loop_start()

def disconnect(self):
"""Disconnect from the MQTT broker."""
Expand All @@ -52,6 +56,6 @@ def publish(self, topic, payload, qos=0):
"""Publish a message to a topic."""
self.client.publish(topic, payload, qos)

def loop_forever(self):
"""Start the network loop."""
self.client.loop_forever()
async def async_loop(self):
"""Run the MQTT loop in an asyncio-friendly way."""
self.client.loop_forever()
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
setup(
name='microBeesPy',
packages=find_packages(),
version='0.3.4',
version='0.3.5',
long_description=readme,
keywords='microbees',
long_description_content_type="text/markdown",
Expand Down