improve error handling

Author: Sebastian Molenda

pubnub/event_engine/effects.py

@@ -455,6 +455,9 @@ def emit_message(self, invocation: invocations.EmitMessagesInvocation):
             self.message_worker._process_incoming_payload(subscribe_message)
 
     def emit_status(self, invocation: invocations.EmitStatusInvocation):
+        if isinstance(invocation.status, PNStatus):
+            self.pubnub._subscription_manager._listener_manager.announce_status(invocation.status)
+            return
         pn_status = PNStatus()
         pn_status.category = invocation.status
         pn_status.operation = invocation.operation

pubnub/event_engine/models/states.py

@@ -4,6 +4,7 @@
 from pubnub.event_engine.models import events
 from pubnub.exceptions import PubNubException
 from typing import List, Union
+from pubnub.models.consumer.pn_error_data import PNErrorData
 
 
 class PNContext(dict):
@@ -272,6 +273,13 @@ def give_up(self, event: events.HandshakeReconnectGiveupEvent, context: PNContex
         if isinstance(event, Exception) and 'status' in event.reason:
             status_invocation = invocations.EmitStatusInvocation(status=event.reason.status.category,
                                                                  operation=PNOperationType.PNUnsubscribeOperation)
+        elif isinstance(context.reason, PNErrorData):
+            status_invocation = invocations.EmitStatusInvocation(PNStatusCategory.PNConnectionErrorCategory,
+                                                                 context=self._context)
+        elif isinstance(context.reason, PubNubException):
+            status = context.reason.status
+            status.category = PNStatusCategory.PNConnectionErrorCategory
+            status_invocation = invocations.EmitStatusInvocation(status)
         else:
             status_invocation = invocations.EmitStatusInvocation(PNStatusCategory.PNConnectionErrorCategory)
 

pubnub/utils.py

@@ -97,7 +97,10 @@ def is_subscribed_event(status):
 
 def is_unsubscribed_event(status):
     assert isinstance(status, PNStatus)
-    is_disconnect = status.category == PNStatusCategory.PNDisconnectedCategory
+    is_disconnect = status.category in [PNStatusCategory.PNDisconnectedCategory,
+                                        PNStatusCategory.PNUnexpectedDisconnectCategory,
+                                        PNStatusCategory.PNConnectionErrorCategory]
+
     is_unsubscribe = status.category == PNStatusCategory.PNAcknowledgmentCategory \
         and status.operation == PNOperationType.PNUnsubscribeOperation
     return is_disconnect or is_unsubscribe

tests/integrational/asyncio/test_heartbeat.py

@@ -71,3 +71,4 @@ async def test_timeout_event_on_broken_heartbeat():
 
     await pubnub.stop()
     await pubnub_listener.stop()
+    await asyncio.sleep(0.5)