afb-evt: Refactor processing of broadcasted events

[src/app-framework-binder.git] / src / afb-ws-json1.c

diff --git a/src/afb-ws-json1.c b/src/afb-ws-json1.c
index 315bee8..4f5cb86 100644 (file)
--- a/src/afb-ws-json1.c
+++ b/src/afb-ws-json1.c
@@ -43,13 +43,14 @@ struct afb_ws_json1;
 struct afb_wsreq;
 
 /* predeclaration of websocket callbacks */
-static void aws_on_hangup(struct afb_ws_json1 *ws, struct afb_wsj1 *wsj1);
-static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *verb, struct afb_wsj1_msg *msg);
-static void aws_on_event(struct afb_ws_json1 *ws, const char *event, int eventid, struct json_object *object);
+static void aws_on_hangup_cb(void *closure, struct afb_wsj1 *wsj1);
+static void aws_on_call_cb(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg);
+static void aws_on_push_cb(void *closure, const char *event, int eventid, struct json_object *object);
+static void aws_on_broadcast_cb(void *closure, const char *event, struct json_object *object);
 
 /* predeclaration of wsreq callbacks */
 static void wsreq_destroy(struct afb_xreq *xreq);
-static void wsreq_reply(struct afb_xreq *xreq, int status, json_object *obj);
+static void wsreq_reply(struct afb_xreq *xreq, struct json_object *object, const char *error, const char *info);
 
 /* declaration of websocket structure */
 struct afb_ws_json1
@@ -76,8 +77,8 @@ struct afb_wsreq
 
 /* interface for afb_ws_json1 / afb_wsj1 */
 static struct afb_wsj1_itf wsj1_itf = {
-       .on_hangup = (void*)aws_on_hangup,
-       .on_call = (void*)aws_on_call
+       .on_hangup = aws_on_hangup_cb,
+       .on_call = aws_on_call_cb
 };
 
 /* interface for xreq */
@@ -88,8 +89,8 @@ const struct afb_xreq_query_itf afb_ws_json1_xreq_itf = {
 
 /* the interface for events */
 static const struct afb_evt_itf evt_itf = {
-       .broadcast = (void*)aws_on_event,
-       .push = (void*)aws_on_event
+       .broadcast = aws_on_broadcast_cb,
+       .push = aws_on_push_cb
 };
 
 /***************************************************************
@@ -162,13 +163,15 @@ void afb_ws_json1_unref(struct afb_ws_json1 *ws)
        }
 }
 
-static void aws_on_hangup(struct afb_ws_json1 *ws, struct afb_wsj1 *wsj1)
+static void aws_on_hangup_cb(void *closure, struct afb_wsj1 *wsj1)
 {
+       struct afb_ws_json1 *ws = closure;
        afb_ws_json1_unref(ws);
 }
 
-static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *verb, struct afb_wsj1_msg *msg)
+static void aws_on_call_cb(void *closure, const char *api, const char *verb, struct afb_wsj1_msg *msg)
 {
+       struct afb_ws_json1 *ws = closure;
        struct afb_wsreq *wsreq;
 
        DEBUG("received websocket request for %s/%s: %s", api, verb, afb_wsj1_msg_object_s(msg));
@@ -194,8 +197,8 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve
        afb_wsj1_msg_addref(msg);
        wsreq->msgj1 = msg;
        wsreq->xreq.cred = afb_cred_addref(ws->cred);
-       wsreq->xreq.request.api = api;
-       wsreq->xreq.request.verb = verb;
+       wsreq->xreq.request.called_api = api;
+       wsreq->xreq.request.called_verb = verb;
        wsreq->xreq.json = afb_wsj1_msg_object_j(wsreq->msgj1);
        wsreq->aws = afb_ws_json1_addref(ws);
        wsreq->xreq.listener = wsreq->aws->listener;
@@ -204,8 +207,14 @@ static void aws_on_call(struct afb_ws_json1 *ws, const char *api, const char *ve
        afb_xreq_process(&wsreq->xreq, ws->apiset);
 }
 
-static void aws_on_event(struct afb_ws_json1 *aws, const char *event, int eventid, struct json_object *object)
+static void aws_on_push_cb(void *closure, const char *event, int eventid, struct json_object *object)
 {
+       aws_on_broadcast_cb(closure, event, object);
+}
+
+static void aws_on_broadcast_cb(void *closure, const char *event, struct json_object *object)
+{
+       struct afb_ws_json1 *aws = closure;
        afb_wsj1_send_event_j(aws->wsj1, event, afb_msg_json_event(event, object));
 }
 
@@ -228,13 +237,17 @@ static void wsreq_destroy(struct afb_xreq *xreq)
        free(wsreq);
 }
 
-static void wsreq_reply(struct afb_xreq *xreq, int status, json_object *obj)
+static void wsreq_reply(struct afb_xreq *xreq, struct json_object *object, const char *error, const char *info)
 {
        struct afb_wsreq *wsreq = CONTAINER_OF_XREQ(struct afb_wsreq, xreq);
        int rc;
+       struct json_object *reply;
+
+       /* create the reply */
+       reply = afb_msg_json_reply(object, error, info, &xreq->context);
 
-       rc = (status < 0 ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)(
-                       wsreq->msgj1, obj, afb_context_sent_token(&wsreq->xreq.context));
+       rc = (error ? afb_wsj1_reply_error_j : afb_wsj1_reply_ok_j)(
+                       wsreq->msgj1, reply, afb_context_sent_token(&wsreq->xreq.context));
        if (rc)
                ERROR("Can't send reply: %m");
 }