Refactor PublishToTopic APIs

Author: archigup

include/ggl/ipc/client.h

@@ -62,7 +62,7 @@ GglError ggipc_update_config(
 /// base64 encoding will allocate 4 bytes for every 3 payload bytes.
 /// Additionally, up to 128 bytes may be allocated for an error message.
 GglError ggipc_publish_to_topic_binary(
-    int conn, GglBuffer topic, GglBuffer payload, GglArena *alloc
+    int conn, GglBuffer topic, GglBuffer payload, GglArena alloc
 );
 
 GglError ggipc_publish_to_topic_obj(

src/ipc/client/publish_to_topic.c

@@ -14,34 +14,23 @@
 #include <string.h>
 #include <stdint.h>
 
-// TODO: use GglByteVec for payload to allow in-place base64 encoding.
-GglError ggipc_publish_to_topic_binary(
-    int conn, GglBuffer topic, GglBuffer payload, GglArena *alloc
+static GglError publish_to_topic_common(
+    int conn, GglBuffer topic, GglMap publish_message
 ) {
-    GglBuffer encoded_payload;
-    GglError ret = ggl_base64_encode(payload, alloc, &encoded_payload);
-    if (ret != GGL_ERR_OK) {
-        return ret;
-    }
-    GglMap binary_message
-        = GGL_MAP(ggl_kv(GGL_STR("message"), ggl_obj_buf(encoded_payload)));
-    GglMap publish_message
-        = GGL_MAP(ggl_kv(GGL_STR("binaryMessage"), ggl_obj_map(binary_message))
-        );
     GglMap args = GGL_MAP(
         ggl_kv(GGL_STR("topic"), ggl_obj_buf(topic)),
         ggl_kv(GGL_STR("publishMessage"), ggl_obj_map(publish_message))
     );
 
+    GglArena error_alloc = ggl_arena_init(GGL_BUF((uint8_t[128]) { 0 }));
     GglIpcError remote_error = GGL_IPC_ERROR_DEFAULT;
-    GglObject resp;
-    ret = ggipc_call(
+    GglError ret = ggipc_call(
         conn,
         GGL_STR("aws.greengrass#PublishToTopic"),
         GGL_STR("aws.greengrass#PublishToTopicRequest"),
         args,
-        alloc,
-        &resp,
+        &error_alloc,
+        NULL,
         &remote_error
     );
     if (ret == GGL_ERR_REMOTE) {
@@ -60,40 +49,29 @@ GglError ggipc_publish_to_topic_binary(
     return ret;
 }
 
+GglError ggipc_publish_to_topic_binary(
+    int conn, GglBuffer topic, GglBuffer payload, GglArena alloc
+) {
+    GglBuffer encoded_payload;
+    GglError ret = ggl_base64_encode(payload, &alloc, &encoded_payload);
+    if (ret != GGL_ERR_OK) {
+        return ret;
+    }
+    GglMap binary_message
+        = GGL_MAP(ggl_kv(GGL_STR("message"), ggl_obj_buf(encoded_payload)));
+    GglMap publish_message
+        = GGL_MAP(ggl_kv(GGL_STR("binaryMessage"), ggl_obj_map(binary_message))
+        );
+
+    return publish_to_topic_common(conn, topic, publish_message);
+}
+
 GglError ggipc_publish_to_topic_obj(
     int conn, GglBuffer topic, GglObject payload
 ) {
     GglMap json_message = GGL_MAP(ggl_kv(GGL_STR("message"), payload));
     GglMap publish_message
         = GGL_MAP(ggl_kv(GGL_STR("jsonMessage"), ggl_obj_map(json_message)));
-    GglMap args = GGL_MAP(
-        ggl_kv(GGL_STR("topic"), ggl_obj_buf(topic)),
-        ggl_kv(GGL_STR("publishMessage"), ggl_obj_map(publish_message))
-    );
-
-    GglArena error_alloc = ggl_arena_init(GGL_BUF((uint8_t[128]) { 0 }));
-    GglIpcError remote_error = GGL_IPC_ERROR_DEFAULT;
-    GglError ret = ggipc_call(
-        conn,
-        GGL_STR("aws.greengrass#PublishToTopic"),
-        GGL_STR("aws.greengrass#PublishToTopicRequest"),
-        args,
-        &error_alloc,
-        NULL,
-        &remote_error
-    );
-    if (ret == GGL_ERR_REMOTE) {
-        if (remote_error.error_code == GGL_IPC_ERR_UNAUTHORIZED_ERROR) {
-            GGL_LOGE(
-                "Component unauthorized: %.*s",
-                (int) remote_error.message.len,
-                remote_error.message.data
-            );
-            return GGL_ERR_UNSUPPORTED;
-        }
-        GGL_LOGE("Server error.");
-        return GGL_ERR_FAILURE;
-    }
 
-    return ret;
+    return publish_to_topic_common(conn, topic, publish_message);
 }