mia/bumper
1
0
Fork 0
Code Issues 47 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Forward to correct recipient #121

Open
edenhaus wants to merge 10 commits from edenhaus/wip-proxyRequests into wip-proxyRequests
pull from: edenhaus/wip-proxyRequests
merge into: mia:wip-proxyRequests
Conversation 0 Commits 10 Files changed 6 +8 -4
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2f61eef73e - Show all commits

12
bumper/mqttserver.py
View file

@ -3,6 +3,8 @@
import logging import logging
import asyncio import asyncio
import os import os
from typing import Dict
import hbmqtt import hbmqtt
import websockets import websockets
from hbmqtt.broker import Broker from hbmqtt.broker import Broker
@ -227,7 +229,9 @@ class MQTTServer:
mqttserverlog.exception("{}".format(e)) mqttserverlog.exception("{}".format(e))
class BumperProxyModeMQTTClient(MQTTClient): class BumperProxyModeMQTTClient(MQTTClient):
ecohelpername = ""
eco_helper_names: Dict[str, str] = {}
async def _connect_coro(self): #Override default to ignore ssl verification async def _connect_coro(self): #Override default to ignore ssl verification
kwargs = dict() kwargs = dict()
@ -326,7 +330,7 @@ class BumperProxyModeMQTTClient(MQTTClient):
topic = message.topic topic = message.topic
ttopic = topic.split("/") ttopic = topic.split("/")
if ttopic[1] == "p2p": if ttopic[1] == "p2p":
self.ecohelpername = ttopic[3] self.eco_helper_names[ttopic[10]] = ttopic[3]
ttopic[3] = "proxyhelper" ttopic[3] = "proxyhelper"
topic = "/".join(ttopic) topic = "/".join(ttopic)
proxymodelog.info(f"MQTT Proxy Client - Converted Topic From {message.topic} TO {topic}") proxymodelog.info(f"MQTT Proxy Client - Converted Topic From {message.topic} TO {topic}")
@ -341,7 +345,7 @@ class BumperProxyModeMQTTClient(MQTTClient):
proxymodelog.error(f"MQTT Proxy Client - get_msg Exception - {e}") proxymodelog.error(f"MQTT Proxy Client - get_msg Exception - {e}")
class BumperMQTTServer_Plugin: class BumperMQTTServer_Plugin:
proxyclients = {} proxyclients: Dict[str, BumperProxyModeMQTTClient] = {}
def __init__(self, context): def __init__(self, context):
self.context = context self.context = context
try: try:
@ -519,7 +523,7 @@ class BumperMQTTServer_Plugin:
if not str(message.topic).split("/")[3] == "proxyhelper": # if from proxyhelper, don't send back to ecovacs...yet if not str(message.topic).split("/")[3] == "proxyhelper": # if from proxyhelper, don't send back to ecovacs...yet
if str(message.topic).split("/")[6] == "proxyhelper": if str(message.topic).split("/")[6] == "proxyhelper":
ttopic = message.topic.split("/") ttopic = message.topic.split("/")
ttopic[6] = self.proxyclients[client_id].ecohelpername ttopic[6] = self.proxyclients[client_id].eco_helper_names.pop(ttopic[10], "")
ttopic_join = "/".join(ttopic) ttopic_join = "/".join(ttopic)
proxymodelog.info(f"MQTT Proxy Client - Bot Message Converted Topic From {message.topic} TO {ttopic_join} with message: {msgdata}") proxymodelog.info(f"MQTT Proxy Client - Bot Message Converted Topic From {message.topic} TO {ttopic_join} with message: {msgdata}")
else: else: