From b57505f0f80f6394f04a041df6e808c857b01d4b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Wed, 8 Jun 2016 10:13:17 +0200 Subject: [PATCH] Improves message formating MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ifde5ff73cd6a73715fd4d6fd58101d9e97a3bef4 Signed-off-by: José Bollo --- src/afb-hreq.c | 13 ++++--------- src/afb-msg-json.c | 46 ++++++++++++++++++++++++++++++++++++++-------- src/afb-msg-json.h | 5 ++++- src/afb-ws-json1.c | 6 ++---- 4 files changed, 48 insertions(+), 22 deletions(-) diff --git a/src/afb-hreq.c b/src/afb-hreq.c index 5f9ca510..4ca8441e 100644 --- a/src/afb-hreq.c +++ b/src/afb-hreq.c @@ -774,20 +774,15 @@ static ssize_t send_json_cb(json_object *obj, uint64_t pos, char *buf, size_t ma static void req_reply(struct afb_hreq *hreq, unsigned retcode, const char *status, const char *info, json_object *resp) { - struct json_object *reply, *request; - const char *token, *uuid, *reqid; + struct json_object *reply; + const char *reqid; struct MHD_Response *response; - token = afb_context_sent_token(&hreq->context); - uuid = afb_context_sent_uuid(&hreq->context); - - reply = afb_msg_json_reply(status, info, resp, token, uuid); - reqid = afb_hreq_get_argument(hreq, long_key_for_reqid); if (reqid == NULL) reqid = afb_hreq_get_argument(hreq, short_key_for_reqid); - if (reqid != NULL && json_object_object_get_ex(reply, "request", &request)) - json_object_object_add (request, short_key_for_reqid, json_object_new_string(reqid)); + + reply = afb_msg_json_reply(status, info, resp, &hreq->context, reqid); response = MHD_create_response_from_callback((uint64_t)strlen(json_object_to_json_string_ext(reply, JSON_C_TO_STRING_PLAIN)), SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put); afb_hreq_reply(hreq, retcode, response, NULL); diff --git a/src/afb-msg-json.c b/src/afb-msg-json.c index 164a6e8f..d5f6f5a5 100644 --- a/src/afb-msg-json.c +++ b/src/afb-msg-json.c @@ -20,40 +20,70 @@ #include #include "afb-msg-json.h" +#include "afb-context.h" -struct json_object *afb_msg_json_reply(const char *status, const char *info, struct json_object *resp, const char *token, const char *uuid) +struct json_object *afb_msg_json_reply(const char *status, const char *info, struct json_object *resp, struct afb_context *context, const char *reqid) { json_object *msg, *request; + const char *token, *uuid; + static json_object *type_reply = NULL; + + msg = json_object_new_object(); + if (resp != NULL) + json_object_object_add(msg, "response", resp); + + if (type_reply == NULL) + type_reply = json_object_new_string("afb-reply"); + json_object_object_add(msg, "jtype", json_object_get(type_reply)); request = json_object_new_object(); + json_object_object_add(msg, "request", request); json_object_object_add(request, "status", json_object_new_string(status)); + if (info != NULL) json_object_object_add(request, "info", json_object_new_string(info)); + + if (reqid != NULL) + json_object_object_add(request, "reqid", json_object_new_string(reqid)); + + token = afb_context_sent_token(context); if (token != NULL) json_object_object_add(request, "token", json_object_new_string(token)); + + uuid = afb_context_sent_uuid(context); if (uuid != NULL) json_object_object_add(request, "uuid", json_object_new_string(uuid)); - msg = json_object_new_object(); - json_object_object_add(msg, "jtype", json_object_new_string("afb-reply")); - json_object_object_add(msg, "request", request); - if (resp != NULL) - json_object_object_add(msg, "response", resp); - return msg; } +struct json_object *afb_msg_json_reply_ok(const char *info, struct json_object *resp, struct afb_context *context, const char *reqid) +{ + return afb_msg_json_reply("success", info, resp, context, reqid); +} + +struct json_object *afb_msg_json_reply_error(const char *status, const char *info, struct afb_context *context, const char *reqid) +{ + return afb_msg_json_reply(status, info, NULL, context, reqid); +} + struct json_object *afb_msg_json_event(const char *event, struct json_object *object) { json_object *msg; + static json_object *type_event = NULL; msg = json_object_new_object(); - json_object_object_add(msg, "jtype", json_object_new_string("afb-event")); + json_object_object_add(msg, "event", json_object_new_string(event)); + if (object != NULL) json_object_object_add(msg, "data", object); + if (type_event == NULL) + type_event = json_object_new_string("afb-event"); + json_object_object_add(msg, "jtype", json_object_get(type_event)); + return msg; } diff --git a/src/afb-msg-json.h b/src/afb-msg-json.h index a90fbb08..53ab0861 100644 --- a/src/afb-msg-json.h +++ b/src/afb-msg-json.h @@ -18,8 +18,11 @@ #pragma once struct json_object; +struct afb_context; -extern struct json_object *afb_msg_json_reply(const char *status, const char *info, struct json_object *resp, const char *token, const char *uuid); +extern struct json_object *afb_msg_json_reply(const char *status, const char *info, struct json_object *resp, struct afb_context *context, const char *reqid); +extern struct json_object *afb_msg_json_reply_ok(const char *info, struct json_object *resp, struct afb_context *context, const char *reqid); +extern struct json_object *afb_msg_json_reply_error(const char *status, const char *info, struct afb_context *context, const char *reqid); extern struct json_object *afb_msg_json_event(const char *event, struct json_object *object); diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c index 88f9b358..c9be94d0 100644 --- a/src/afb-ws-json1.c +++ b/src/afb-ws-json1.c @@ -423,10 +423,8 @@ static void aws_emit(struct afb_ws_json1 *aws, int code, const char *id, size_t static void wsreq_reply(struct afb_wsreq *wsreq, int retcode, const char *status, const char *info, json_object *resp) { - const char *uuid = afb_context_sent_uuid(&wsreq->context); - const char *token = afb_context_sent_token(&wsreq->context); - struct json_object *reply = afb_msg_json_reply(status, info, resp, token, uuid); - aws_emit(wsreq->aws, retcode, wsreq->id, wsreq->idlen, reply, token); + struct json_object *reply = afb_msg_json_reply(status, info, resp, &wsreq->context, NULL); + aws_emit(wsreq->aws, retcode, wsreq->id, wsreq->idlen, reply, afb_context_sent_token(&wsreq->context)); } static void wsreq_fail(struct afb_wsreq *wsreq, const char *status, const char *info) -- 2.16.6