refactor api dim

bumper/plugins/bumper_confserver_api_dim.py

@@ -0,0 +1,81 @@
+"""Api dim plugin module."""
+import json
+import logging
+import random
+import string
+from typing import Iterable
+
+from aiohttp import web
+from aiohttp.web_exceptions import HTTPInternalServerError
+from aiohttp.web_request import Request
+from aiohttp.web_response import Response
+from aiohttp.web_routedef import AbstractRouteDef
+
+import bumper
+from bumper.db import bot_get
+from bumper.models import ERR_COMMON
+from bumper.plugins import WebserverPlugin, WebserverSubApi
+
+
+# pylint: disable=no-self-use
+class ApiDimPlugin(WebserverPlugin):
+    """Api dim plugin."""
+
+    sub_api = WebserverSubApi.API
+
+    @property
+    def routes(self) -> Iterable[AbstractRouteDef]:
+        """Plugin routes."""
+        return [
+            web.route(
+                "*",
+                "/dim/devmanager.do",
+                self._handle_dim_devmanager,
+                name="portal_api_dim_devmanager",
+            ),
+        ]
+
+    async def _handle_dim_devmanager(self, request: Request) -> Response:
+        # Used in EcoVacs Home App
+        try:
+            json_body = json.loads(await request.text())
+
+            randomid = "".join(random.sample(string.ascii_letters, 6))
+            did = ""
+            if "toId" in json_body:  # Its a command
+                did = json_body["toId"]
+
+            if did != "":
+                bot = bot_get(did)
+                if bot["company"] == "eco-ng" and bot["mqtt_connection"]:
+                    retcmd = await bumper.mqtt_helperbot.send_command(
+                        json_body, randomid
+                    )
+                    body = retcmd
+                    logging.debug(f"Send Bot - {json_body}")
+                    logging.debug(f"Bot Response - {body}")
+                    return web.json_response(body)
+
+                # No response, send error back
+                logging.error(
+                    "No bots with DID: {} connected to MQTT".format(json_body["toId"])
+                )
+                body = {"id": randomid, "errno": ERR_COMMON, "ret": "fail"}
+                return web.json_response(body)
+
+            if "td" in json_body:  # Seen when doing initial wifi config
+                if json_body["td"] == "PollSCResult":
+                    body = {"ret": "ok"}
+                    return web.json_response(body)
+
+                if json_body["td"] == "HasUnreadMsg":  # EcoVacs Home
+                    body = {"ret": "ok", "unRead": False}
+                    return web.json_response(body)
+
+                if json_body["td"] == "ReceiveShareDevice":  # EcoVacs Home
+                    body = {"ret": "ok"}
+                    return web.json_response(body)
+        except Exception:  # pylint: disable=broad-except
+            logging.error("Unexpected exception occurred", exc_info=True)
+
+        raise HTTPInternalServerError

bumper/plugins/bumper_confserver_portal_dim.py

@@ -1,73 +0,0 @@
-import json
-import logging
-import random
-import string
-
-from aiohttp import web
-
-import bumper
-from bumper.db import bot_get
-from bumper.models import ERR_COMMON
-from bumper.plugins import ConfServerApp
-
-
-class portal_api_dim(ConfServerApp):
-    def __init__(self):
-        self.name = "portal_api_dimr"
-        self.plugin_type = "sub_api"
-        self.sub_api = "portal_api"
-
-        self.routes = [
-            web.route(
-                "*",
-                "/dim/devmanager.do",
-                self.handle_dim_devmanager,
-                name="portal_api_dim_devmanager",
-            ),
-        ]
-
-    async def handle_dim_devmanager(self, request):  # Used in EcoVacs Home App
-        try:
-            json_body = json.loads(await request.text())
-
-            randomid = "".join(random.sample(string.ascii_letters, 6))
-            did = ""
-            if "toId" in json_body:  # Its a command
-                did = json_body["toId"]
-
-            if did != "":
-                bot = bot_get(did)
-                if bot["company"] == "eco-ng" and bot["mqtt_connection"] == True:
-                    retcmd = await bumper.mqtt_helperbot.send_command(
-                        json_body, randomid
-                    )
-                    body = retcmd
-                    logging.debug(f"Send Bot - {json_body}")
-                    logging.debug(f"Bot Response - {body}")
-                    return web.json_response(body)
-                else:
-                    # No response, send error back
-                    logging.error(
-                        "No bots with DID: {} connected to MQTT".format(
-                            json_body["toId"]
-                        )
-                    )
-                    body = {"id": randomid, "errno": ERR_COMMON, "ret": "fail"}
-                    return web.json_response(body)
-
-            else:
-                if "td" in json_body:  # Seen when doing initial wifi config
-                    if json_body["td"] == "PollSCResult":
-                        body = {"ret": "ok"}
-                        return web.json_response(body)
-
-                    if json_body["td"] == "HasUnreadMsg":  # EcoVacs Home
-                        body = {"ret": "ok", "unRead": False}
-                        return web.json_response(body)
-
-                    if json_body["td"] == "ReceiveShareDevice":  # EcoVacs Home
-                        body = {"ret": "ok"}
-                        return web.json_response(body)
-
-        except Exception as e:
-            logging.exception(f"{e}")