Surface publish and unsubscribe errors back to Python (#167)

Author: bretambrose

awscrt/mqtt.py

@@ -543,10 +543,11 @@ def unsubscribe(self, topic):
         future = Future()
         packet_id = 0
 
-        def unsuback(packet_id):
-            future.set_result(dict(
-                packet_id=packet_id
-            ))
+        def unsuback(packet_id, error_code):
+            if error_code != 0:
+                future.set_exception(awscrt.exceptions.from_code(error_code))
+            else:
+                future.set_result(dict(packet_id=packet_id))
 
         try:
             packet_id = _awscrt.mqtt_client_connection_unsubscribe(self._binding, topic, unsuback)
@@ -626,10 +627,11 @@ def publish(self, topic, payload, qos, retain=False):
         future = Future()
         packet_id = 0
 
-        def puback(packet_id):
-            future.set_result(dict(
-                packet_id=packet_id
-            ))
+        def puback(packet_id, error_code):
+            if error_code != 0:
+                future.set_exception(awscrt.exceptions.from_code(error_code))
+            else:
+                future.set_result(dict(packet_id=packet_id))
 
         try:
             packet_id = _awscrt.mqtt_client_connection_publish(self._binding, topic, payload, qos.value, retain, puback)

source/mqtt_client_connection.c

@@ -692,7 +692,6 @@ static void s_publish_complete(
     int error_code,
     void *userdata) {
     (void)connection;
-    (void)error_code;
 
     struct publish_complete_userdata *metadata = userdata;
     assert(metadata);
@@ -703,7 +702,7 @@ static void s_publish_complete(
     }
 
     if (metadata->callback != Py_None) {
-        PyObject *result = PyObject_CallFunction(metadata->callback, "(H)", packet_id);
+        PyObject *result = PyObject_CallFunction(metadata->callback, "(Hi)", packet_id, error_code);
         if (result) {
             Py_DECREF(result);
         } else {
@@ -956,7 +955,6 @@ static void s_unsuback_callback(
     int error_code,
     void *userdata) {
     (void)connection;
-    (void)error_code;
 
     PyObject *callback = userdata;
 
@@ -965,7 +963,7 @@ static void s_unsuback_callback(
         return; /* Python has shut down. Nothing matters anymore, but don't crash */
     }
 
-    PyObject *result = PyObject_CallFunction(callback, "(H)", packet_id);
+    PyObject *result = PyObject_CallFunction(callback, "(Hi)", packet_id, error_code);
     if (result) {
         Py_DECREF(result);
     } else {