git - Merge pull request #4 from DinoTools/librouteros_workaround

Workaround for librouteros

routeros_log_exporter/fetcher.py

@@ -9,10 +9,10 @@
 from queue import Queue
 
 from librouteros import connect
-from librouteros.api import Api as RouterOSApi
 
 from .exception import ConfigError
 from .output import Output
+from .routeros import RouterOSApi
 
 logger = logging.getLogger("fetcher")
 
@@ -40,7 +40,7 @@ def __init__(
             ssl_verify_hostname: bool = True
     ):
         super().__init__()
-        self._api = None
+        self._api: Optional[RouterOSApi] = None
         self._message_queue = message_queue
 
         self.hostname = hostname
@@ -163,7 +163,8 @@ def api(self) -> RouterOSApi:
             username=self.username,
             password=self.password,
             ssl_wrapper=ssl_ctx.wrap_socket,
-            port=self.port
+            port=self.port,
+            subclass=RouterOSApi,
         )
         logger.info("Connected")
         return self._api

routeros_log_exporter/routeros.py

@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: PhiBo DinoTools (2024)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from librouteros.api import Api
+from librouteros.exceptions import TrapError, MultiTrapError
+from librouteros.types import (
+    ResponseIter
+)
+
+
+class RouterOSApi(Api):
+    def readResponse(self) -> ResponseIter:
+        """
+        Yield each sentence until !done is received.
+
+        :throws TrapError: If one !trap is received.
+        :throws MultiTrapError: If > 1 !trap is received.
+        """
+        traps = []
+        reply_word = None
+        while reply_word != "!done":
+            reply_word, words = self.readSentence()
+            if reply_word == "!trap":
+                traps.append(TrapError(**words))
+            elif reply_word in ("!re", "!done") and words:
+                yield words
+
+        if len(traps) > 1:
+            raise MultiTrapError(*traps)
+        if len(traps) == 1:
+            raise traps[0]