Unify ggipc_subscribe_to_topic handlers

Author: archigup

cpp/priv_include/ggl/ipc/client_c_api.hpp

@@ -27,18 +27,13 @@ GglError ggipc_publish_to_topic_binary_b64(
     GglBuffer topic, GglBuffer b64_payload
 ) noexcept;
 
-typedef struct {
-    void (*json_handler)(
-        GglBuffer topic, GglMap payload, GgIpcSubscriptionHandle handle
-    ) noexcept;
-    void (*binary_handler)(
-        GglBuffer topic, GglBuffer payload, GgIpcSubscriptionHandle handle
-    ) noexcept;
-} GgIpcSubscribeToTopicCallbacks;
+typedef void GgIpcSubscribeToTopicCallback(
+    GglBuffer topic, GglObject payload, GgIpcSubscriptionHandle handle
+);
 
 GglError ggipc_subscribe_to_topic(
     GglBuffer topic,
-    const GgIpcSubscribeToTopicCallbacks *callbacks,
+    GgIpcSubscribeToTopicCallback *callback,
     GgIpcSubscriptionHandle *handle
 ) noexcept;
 

include/ggl/ipc/client.h

@@ -59,23 +59,16 @@ GglError ggipc_publish_to_topic_binary_b64(
     GglBuffer topic, GglBuffer b64_payload
 );
 
-typedef struct {
-    void (*json_handler)(
-        GglBuffer topic, GglMap payload, GgIpcSubscriptionHandle handle
-    );
-    void (*binary_handler)(
-        GglBuffer topic, GglBuffer payload, GgIpcSubscriptionHandle handle
-    );
-} GgIpcSubscribeToTopicCallbacks;
+typedef void GgIpcSubscribeToTopicCallback(
+    GglBuffer topic, GglObject payload, GgIpcSubscriptionHandle handle
+);
 
 /// Subscribe to messages on a local topic
-/// `handlers` must live until the handle is closed.
-/// `json_handler` or `binary_handler` may be NULL if that payload type is not
-/// expected.
-ACCESS(read_only, 2)
+/// Payload will be a map for json messages and a buffer for binary messages.
+NONNULL(2)
 GglError ggipc_subscribe_to_topic(
     GglBuffer topic,
-    const GgIpcSubscribeToTopicCallbacks callbacks[static 1],
+    GgIpcSubscribeToTopicCallback *callback,
     GgIpcSubscriptionHandle *handle
 );
 

src/ipc/client/subscribe_to_topic.c

@@ -20,7 +20,7 @@ static GglError subscribe_to_topic_resp_handler(
     GglBuffer service_model_type,
     GglMap data
 ) {
-    const GgIpcSubscribeToTopicCallbacks *callbacks = ctx;
+    GgIpcSubscribeToTopicCallback *callback = ctx;
 
     if (!ggl_buffer_eq(
             service_model_type,
@@ -88,36 +88,18 @@ static GglError subscribe_to_topic_resp_handler(
 
     GglBuffer topic = ggl_obj_into_buf(*topic_obj);
 
-    if (is_json) {
-        if (callbacks->json_handler == NULL) {
-            GGL_LOGW(
-                "Skipping unhandled JSON payload on local topic %.*s.",
-                (int) topic.len,
-                topic.data
-            );
-            return GGL_ERR_OK;
-        }
-
-        GglMap payload = ggl_obj_into_map(*message_obj);
-        callbacks->json_handler(topic, payload, handle);
-    } else {
-        if (callbacks->json_handler == NULL) {
-            GGL_LOGW(
-                "Skipping unhandled binary payload on local topic %.*s.",
-                (int) topic.len,
-                topic.data
-            );
-            return GGL_ERR_OK;
-        }
+    GglObject payload = *message_obj;
 
-        GglBuffer payload = ggl_obj_into_buf(*message_obj);
-        if (!ggl_base64_decode_in_place(&payload)) {
+    if (!is_json) {
+        GglBuffer payload_buf = ggl_obj_into_buf(*message_obj);
+        if (!ggl_base64_decode_in_place(&payload_buf)) {
             GGL_LOGE("Failed to decode pubsub subscription response payload.");
             return GGL_ERR_INVALID;
         }
-        callbacks->binary_handler(topic, payload, handle);
+        payload = ggl_obj_buf(payload_buf);
     }
 
+    callback(topic, payload, handle);
     return GGL_ERR_OK;
 }
 
@@ -142,7 +124,7 @@ static GglError error_handler(
 
 GglError ggipc_subscribe_to_topic(
     GglBuffer topic,
-    const GgIpcSubscribeToTopicCallbacks callbacks[static 1],
+    GgIpcSubscribeToTopicCallback callback,
     GgIpcSubscriptionHandle *handle
 ) {
     GglMap args = GGL_MAP(ggl_kv(GGL_STR("topic"), ggl_obj_buf(topic)), );
@@ -155,7 +137,7 @@ GglError ggipc_subscribe_to_topic(
         &error_handler,
         NULL,
         &subscribe_to_topic_resp_handler,
-        (void *) callbacks,
+        callback,
         handle
     );
 }