Fixed string detection during notification callback

pyads/connection.py

@@ -77,6 +77,9 @@
     adsSyncDelDeviceNotificationReqEx,
     adsSyncSetTimeoutEx,
     ADSError,
+    get_value_from_ctype_data,
+    type_is_wstring,
+    type_is_string,
 )
 from .structs import (
     AmsAddr,
@@ -1019,9 +1022,9 @@ def parse_notification(
             addressof(contents) + SAdsNotificationHeader.data.offset
         )
         value: Any
-        if plc_datatype == PLCTYPE_STRING:
-            # read only until null-termination character
-            value = bytearray(data).split(b"\0", 1)[0].decode("utf-8")
+        if type_is_string(plc_datatype) or type_is_wstring(plc_datatype):
+            # Re-use string parsing from pyads_ex: (but doesn't work for other types)
+            value = get_value_from_ctype_data(data, plc_datatype)
 
         elif plc_datatype is not None and issubclass(plc_datatype, Structure):
             value = plc_datatype()

pyads/pyads_ex.py

@@ -266,7 +266,11 @@ def get_value_from_ctype_data(read_data: Optional[Any], plc_type: Type) -> Any:
         return None
 
     if type_is_string(plc_type):
-        return read_data.value.decode("utf-8")
+        if hasattr(read_data, "value"):
+            return read_data.value.decode("utf-8")
+        return bytes(read_data).decode("utf-8").rstrip("\x00")
+        # `read_data.value` does not always exist, and without it all the null
+        # terminators needs to be removed after decoding
 
     if type_is_wstring(plc_type):
         # `read_data.value` also exists, but could be wrong - explicitly decode instead: