X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json.c;h=9387f8d781b5301fda53b7aadb1d3eda8232d9da;hb=82adb27966eace72f810716c19c660efd7c8b15a;hp=a17668884753714e94e3782949572fa99dd5e51a;hpb=56f9ef4581d567248b6f83a3b15f39a0aca42895;p=src%2Fapp-framework-binder.git diff --git a/src/afb-ws-json.c b/src/afb-ws-json.c index a1766888..9387f8d7 100644 --- a/src/afb-ws-json.c +++ b/src/afb-ws-json.c @@ -27,17 +27,17 @@ #include "afb-ws.h" #include "afb-ws-json.h" +#include "afb-msg-json.h" #include "session.h" #include "afb-req-itf.h" #include "afb-apis.h" -static void aws_on_close(struct afb_ws_json *ws, uint16_t code, char *text, size_t size); +static void aws_on_hangup(struct afb_ws_json *ws); static void aws_on_text(struct afb_ws_json *ws, char *text, size_t size); static struct afb_ws_itf aws_itf = { - .on_close = (void*)aws_on_close, - .on_text = (void*)aws_on_text, - .on_binary = NULL, + .on_hangup = (void*)aws_on_hangup, + .on_text = (void*)aws_on_text }; struct afb_wsreq; @@ -52,7 +52,13 @@ struct afb_ws_json struct afb_ws *ws; }; -struct afb_ws_json *afb_ws_json_create(int fd, struct AFB_clientCtx *context, void (*cleanup)(void*), void *closure) +static void aws_send_event(struct afb_ws_json *ws, const char *event, struct json_object *object); + +static const struct afb_event_sender_itf event_sender_itf = { + .send = (void*)aws_send_event +}; + +struct afb_ws_json *afb_ws_json_create(int fd, struct AFB_clientCtx *context, void (*cleanup)(void*), void *cleanup_closure) { struct afb_ws_json *result; @@ -64,7 +70,7 @@ struct afb_ws_json *afb_ws_json_create(int fd, struct AFB_clientCtx *context, vo goto error; result->cleanup = cleanup; - result->cleanup_closure = closure; + result->cleanup_closure = cleanup_closure; result->requests = NULL; result->context = ctxClientGet(context); if (result->context == NULL) @@ -78,8 +84,13 @@ struct afb_ws_json *afb_ws_json_create(int fd, struct AFB_clientCtx *context, vo if (result->ws == NULL) goto error4; + if (0 > ctxClientEventSenderAdd(result->context, (struct afb_event_sender){ .itf = &event_sender_itf, .closure = result })) + goto error5; + return result; +error5: + /* TODO */ error4: json_tokener_free(result->tokener); error3: @@ -91,15 +102,20 @@ error: return NULL; } -static void aws_on_close(struct afb_ws_json *ws, uint16_t code, char *text, size_t size) +static void aws_on_hangup(struct afb_ws_json *ws) { - /* do nothing but free the text */ - free(text); + ctxClientEventSenderRemove(ws->context, (struct afb_event_sender){ .itf = &event_sender_itf, .closure = ws }); + afb_ws_destroy(ws->ws); + json_tokener_free(ws->tokener); + if (ws->cleanup != NULL) + ws->cleanup(ws->cleanup_closure); + free(ws); } #define CALL 2 #define RETOK 3 #define RETERR 4 +#define EVENT 5 struct afb_wsreq { @@ -141,7 +157,10 @@ static const struct afb_req_itf wsreq_itf = { .send = (void*)wsreq_send, .session_create = (void*)wsreq_session_create, .session_check = (void*)wsreq_session_check, - .session_close = (void*)wsreq_session_close + .session_close = (void*)wsreq_session_close, + .context_get = (void*)afb_context_get, + .context_set = (void*)afb_context_set + }; static int aws_wsreq_parse(struct afb_wsreq *r, char *text, size_t size) @@ -264,14 +283,6 @@ static int aws_wsreq_parse(struct afb_wsreq *r, char *text, size_t size) /* done */ r->text = text; r->size = size; -fprintf(stderr, "\n\nONTEXT([%d, %.*s, %.*s/%.*s, %.*s, %.*s])\n\n", - r->code, - (int)r->idlen, r->id, - (int)r->apilen, r->api, - (int)r->verblen, r->verb, - (int)r->objlen, r->obj, - (int)r->toklen, r->tok -); return 1; bad_header: @@ -297,7 +308,7 @@ static void aws_on_text(struct afb_ws_json *ws, char *text, size_t size) wsreq->next = ws->requests; ws->requests = wsreq; - r.data = wsreq; + r.req_closure = wsreq; r.itf = &wsreq_itf; afb_apis_call(r, ws->context, wsreq->api, wsreq->apilen, wsreq->verb, wsreq->verblen); return; @@ -306,7 +317,7 @@ bad_header: free(wsreq); alloc_error: free(text); - afb_ws_close(ws->ws, 1008); + afb_ws_close(ws->ws, 1008, NULL); return; } @@ -317,8 +328,8 @@ static struct json_object *wsreq_json(struct afb_wsreq *wsreq) json_tokener_reset(wsreq->aws->tokener); root = json_tokener_parse_ex(wsreq->aws->tokener, wsreq->obj, (int)wsreq->objlen); if (root == NULL) { - /* lazy discovering !!!! not good TODO improve*/ - root = json_object_new_object(); + /* lazy error detection of json request. Is it to improve? */ + root = json_object_new_string_len(wsreq->obj, (int)wsreq->objlen); } wsreq->root = root; } @@ -373,35 +384,30 @@ static void wsreq_session_close(struct afb_wsreq *wsreq) ctxClientClose(context); } - -static void wsreq_reply(struct afb_wsreq *wsreq, int retcode, const char *status, const char *info, json_object *resp) +static void aws_emit(struct afb_ws_json *aws, int code, const char *id, size_t idlen, struct json_object *data) { - json_object *root, *request, *reply; - const char *message; - - /* builds the answering structure */ - root = json_object_new_object(); - json_object_object_add(root, "jtype", json_object_new_string("afb-reply")); - request = json_object_new_object(); - json_object_object_add(root, "request", request); - json_object_object_add(request, "status", json_object_new_string(status)); - if (info) - json_object_object_add(request, "info", json_object_new_string(info)); - if (resp) - json_object_object_add(root, "response", resp); - - /* make the reply */ - reply = json_object_new_array(); - json_object_array_add(reply, json_object_new_int(retcode)); - json_object_array_add(reply, json_object_new_string_len(wsreq->id, (int)wsreq->idlen)); - json_object_array_add(reply, root); - json_object_array_add(reply, json_object_new_string(wsreq->aws->context->token)); + json_object *msg; + const char *token; + const char *txt; + + /* pack the message */ + msg = json_object_new_array(); + json_object_array_add(msg, json_object_new_int(code)); + json_object_array_add(msg, json_object_new_string_len(id, (int)idlen)); + json_object_array_add(msg, data); + token = aws->context->token; + if (token) + json_object_array_add(msg, json_object_new_string(token)); /* emits the reply */ - message = json_object_to_json_string(reply); - afb_ws_text(wsreq->aws->ws, message, strlen(message)); - json_object_put(reply); + txt = json_object_to_json_string(msg); + afb_ws_text(aws->ws, txt, strlen(txt)); + json_object_put(msg); +} +static void wsreq_reply(struct afb_wsreq *wsreq, int retcode, const char *status, const char *info, json_object *resp) +{ + aws_emit(wsreq->aws, retcode, wsreq->id, wsreq->idlen, afb_msg_json_reply(status, info, resp, NULL, NULL)); /* TODO eliminates the wsreq */ } @@ -426,3 +432,8 @@ static void wsreq_send(struct afb_wsreq *wsreq, char *buffer, size_t size) afb_ws_text(wsreq->aws->ws, buffer, size); } +static void aws_send_event(struct afb_ws_json *aws, const char *event, struct json_object *object) +{ + aws_emit(aws, EVENT, event, strlen(event), afb_msg_json_event(event, object)); +} +