Merge pull request #1768 from samson0v/master

BACnet connector improvements

Author: imbeacon

thingsboard_gateway/connectors/bacnet/application.py

@@ -32,7 +32,9 @@
     SimpleAckPDU,
     ErrorRejectAbortNack
 )
+from bacpypes3.comm import bind
 
+from thingsboard_gateway.connectors.bacnet.application_service_access_point import ApplicationServiceAccessPoint
 from thingsboard_gateway.connectors.bacnet.device import Device
 from thingsboard_gateway.connectors.bacnet.entities.device_object_config import DeviceObjectConfig
 
@@ -45,6 +47,9 @@ def __init__(self, device_object_config: DeviceObjectConfig, indication_callback
         self.__device_object = DeviceObject(**self.__device_object_config.device_object_config)
         super().__init__(self.__device_object, Address(self.__device_object_config.address))
 
+        self.asap = ApplicationServiceAccessPoint(self.device_object, self.device_info_cache)
+        bind(self, self.asap, self.nsap)
+
         self.__log = logger
         self.__indication_callback = indication_callback
         self.__confirmation_queue = Queue(1_000_000)
@@ -125,17 +130,22 @@ async def get_object_identifiers_without_segmentation(
                 "objectList",
                 array_index=0,
             )
+        except Exception as e:
+            self.__log.error('%s error reading object-list length: %s', device_identifier, e)
+            return []
 
-            for i in range(object_list_length):
+        for i in range(object_list_length):
+            try:
                 object_identifier = await self.read_property(
                     device_address,
                     device_identifier,
                     "objectList",
                     array_index=i + 1,
                 )
                 object_list.append(object_identifier)
-        except ErrorRejectAbortNack as err:
-            self.__log.info(f"{device_identifier} object-list length error/reject: {err}")
+            except Exception as e:
+                self.__log.error('%s error reading object-list[%d]: %s', device_identifier, i + 1, e)
+                continue
 
         return object_list
 

thingsboard_gateway/connectors/bacnet/application_service_access_point.py

@@ -0,0 +1,38 @@
+from bacpypes3.appservice import ApplicationServiceAccessPoint as AppServiceAccessPoint, ServiceAccessPoint
+from bacpypes3.apdu import (
+    APCISequence,
+    APDU,
+    AbortPDU,
+    ComplexAckPDU,
+    ConfirmedRequestPDU,
+    ErrorPDU,
+    RejectPDU,
+    SimpleAckPDU,
+    UnconfirmedRequestPDU,
+)
+
+
+class ApplicationServiceAccessPoint(AppServiceAccessPoint):
+    async def sap_response(self, apdu: APDU) -> None:
+        if isinstance(apdu, SimpleAckPDU):
+            xpdu = apdu
+
+        elif isinstance(
+            apdu, (UnconfirmedRequestPDU, ConfirmedRequestPDU, ComplexAckPDU, ErrorPDU)
+        ):
+            try:
+                xpdu = APCISequence.decode(apdu)
+            except Exception:
+                if isinstance(apdu, UnconfirmedRequestPDU):
+                    return
+
+                if isinstance(apdu, ConfirmedRequestPDU):
+                    return
+
+                xpdu = apdu
+        elif isinstance(apdu, (RejectPDU, AbortPDU)):
+            xpdu = apdu
+        else:
+            raise RuntimeError(f"invalid APDU (10): {type(apdu)}")
+
+        await ServiceAccessPoint.sap_response(self, xpdu)

thingsboard_gateway/connectors/bacnet/device.py

@@ -13,7 +13,7 @@
 #     limitations under the License.
 
 from asyncio import sleep
-from re import escape, match, fullmatch
+from re import escape, match, fullmatch, compile
 from time import monotonic
 
 from bacpypes3.primitivedata import ObjectIdentifier
@@ -119,9 +119,11 @@ def get_address_regex(initial_config_address):
         if pattern == '*:*:*':
             return r'.*'
         elif pattern == '*:*':
-            return r'^([^:,@]+)(:[^:,@]+)?(:(47808))?$'
+            return compile(r'^([^:,@]+)(:[^:,@]+)?(:(47808))?$')
         elif pattern == '*':
-            return r'^(0:[^:,@]+|[^\d:,@][^:,@]*:47808|[^:,@]+)$'
+            return compile(r'^(0:[^:,@]+|[^\d:,@][^:,@]*:47808|[^:,@]+)$')
+        elif match(r"\*:\d+", pattern):
+            return compile(r'^([^:,@]+)(:[^:,@]+)?(:(47808))?$')
         while i < len(pattern):
             if pattern[i] == 'X':
                 while i < len(pattern) and pattern[i] == 'X':