X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-ws-json.c;h=2e68d277eb015ef7c88b0a5fc5b9dd13370efab6;hb=1e8edd92a04281bddc86fff3db5b407943504aed;hp=a34142c99e449041f7a8491545b679707fe50fd0;hpb=46d9538587a3521caa1e3b20bf337a53ed400777;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-ws-json.c b/src/afb-ws-json.c
index a34142c9..2e68d277 100644
--- a/src/afb-ws-json.c
+++ b/src/afb-ws-json.c
@@ -23,21 +23,22 @@
 #include <errno.h>
 #include <string.h>
 
-#include <json.h>
+#include <json-c/json.h>
 
 #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"
+#include "afb-context.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;
@@ -47,27 +48,33 @@ struct afb_ws_json
 	void (*cleanup)(void*);
 	void *cleanup_closure;
 	struct afb_wsreq *requests;
-	struct AFB_clientCtx *context;
+	struct AFB_clientCtx *session;
 	struct json_tokener *tokener;
 	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_listener_itf event_listener_itf = {
+	.send = (void*)aws_send_event
+};
+
+struct afb_ws_json *afb_ws_json_create(int fd, struct AFB_clientCtx *session, void (*cleanup)(void*), void *cleanup_closure)
 {
 	struct afb_ws_json *result;
 
 	assert(fd >= 0);
-	assert(context != NULL);
+	assert(session != NULL);
 
 	result = malloc(sizeof * result);
 	if (result == NULL)
 		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)
+	result->session = ctxClientAddRef(session);
+	if (result->session == NULL)
 		goto error2;
 
 	result->tokener = json_tokener_new();
@@ -78,12 +85,17 @@ struct afb_ws_json *afb_ws_json_create(int fd, struct AFB_clientCtx *context, vo
 	if (result->ws == NULL)
 		goto error4;
 
+	if (0 > ctxClientEventListenerAdd(result->session, (struct afb_event_listener){ .itf = &event_listener_itf, .closure = result }))
+		goto error5;
+
 	return result;
 
+error5:
+	afb_ws_destroy(result->ws);
 error4:
 	json_tokener_free(result->tokener);
 error3:
-	ctxClientPut(result->context);
+	ctxClientUnref(result->session);
 error2:
 	free(result);
 error:
@@ -91,18 +103,26 @@ 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);
+	ctxClientEventListenerRemove(ws->session, (struct afb_event_listener){ .itf = &event_listener_itf, .closure = ws });
+	afb_ws_destroy(ws->ws);
+	json_tokener_free(ws->tokener);
+	if (ws->cleanup != NULL)
+		ws->cleanup(ws->cleanup_closure);
+	ctxClientUnref(ws->session);
+	free(ws);
 }
 
 #define CALL 2
 #define RETOK 3
 #define RETERR 4
+#define EVENT 5
 
 struct afb_wsreq
 {
+	struct afb_context context;
+	int refcount;
 	struct afb_ws_json *aws;
 	struct afb_wsreq *next;
 	char *text;
@@ -121,15 +141,14 @@ struct afb_wsreq
 	struct json_object *root;
 };
 
+static void wsreq_addref(struct afb_wsreq *wsreq);
+static void wsreq_unref(struct afb_wsreq *wsreq);
 static struct json_object *wsreq_json(struct afb_wsreq *wsreq);
 static struct afb_arg wsreq_get(struct afb_wsreq *wsreq, const char *name);
 static void wsreq_fail(struct afb_wsreq *wsreq, const char *status, const char *info);
 static void wsreq_success(struct afb_wsreq *wsreq, struct json_object *obj, const char *info);
 static const char *wsreq_raw(struct afb_wsreq *wsreq, size_t *size);
-static void wsreq_send(struct afb_wsreq *wsreq, char *buffer, size_t size);
-static int wsreq_session_create(struct afb_wsreq *wsreq);
-static int wsreq_session_check(struct afb_wsreq *wsreq, int refresh);
-static void wsreq_session_close(struct afb_wsreq *wsreq);
+static void wsreq_send(struct afb_wsreq *wsreq, const char *buffer, size_t size);
 
 
 static const struct afb_req_itf wsreq_itf = {
@@ -139,12 +158,10 @@ static const struct afb_req_itf wsreq_itf = {
 	.fail = (void*)wsreq_fail,
 	.raw = (void*)wsreq_raw,
 	.send = (void*)wsreq_send,
-	.session_create = (void*)wsreq_session_create,
-	.session_check = (void*)wsreq_session_check,
-	.session_close = (void*)wsreq_session_close,
 	.context_get = (void*)afb_context_get,
-	.context_set = (void*)afb_context_set
-
+	.context_set = (void*)afb_context_set,
+	.addref = (void*)wsreq_addref,
+	.unref = (void*)wsreq_unref
 };
 
 static int aws_wsreq_parse(struct afb_wsreq *r, char *text, size_t size)
@@ -267,14 +284,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:
@@ -296,23 +305,44 @@ static void aws_on_text(struct afb_ws_json *ws, char *text, size_t size)
 		goto bad_header;
 
 	/* fill and record the request */
+	if (wsreq->tok != NULL)
+		wsreq->tok[wsreq->toklen] = 0;
+	afb_context_init(&wsreq->context, ws->session, wsreq->tok);
+	if (!wsreq->context.invalidated)
+		wsreq->context.validated = 1;
+	wsreq->refcount = 1;
 	wsreq->aws = ws;
 	wsreq->next = ws->requests;
 	ws->requests = wsreq;
 
-	r.req_closure = wsreq;
+	r.closure = wsreq;
 	r.itf = &wsreq_itf;
-	afb_apis_call(r, ws->context, wsreq->api, wsreq->apilen, wsreq->verb, wsreq->verblen);
+	afb_apis_call(r, &wsreq->context, wsreq->api, wsreq->apilen, wsreq->verb, wsreq->verblen);
+	wsreq_unref(wsreq);
 	return;
 
 bad_header:
 	free(wsreq);
 alloc_error:
 	free(text);
-	afb_ws_close(ws->ws, 1008);
+	afb_ws_close(ws->ws, 1008, NULL);
 	return;
 }
 
+static void wsreq_addref(struct afb_wsreq *wsreq)
+{
+	wsreq->refcount++;
+}
+
+static void wsreq_unref(struct afb_wsreq *wsreq)
+{
+	if (--wsreq->refcount == 0) {
+		afb_context_disconnect(&wsreq->context);
+		free(wsreq->text);
+		free(wsreq);
+	}
+}
+
 static struct json_object *wsreq_json(struct afb_wsreq *wsreq)
 {
 	struct json_object *root = wsreq->root;
@@ -320,8 +350,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;
 	}
@@ -345,67 +375,29 @@ static struct afb_arg wsreq_get(struct afb_wsreq *wsreq, const char *name)
 	return arg;
 }
 
-static int wsreq_session_create(struct afb_wsreq *wsreq)
-{
-	struct AFB_clientCtx *context = wsreq->aws->context;
-	if (context->created)
-		return 0;
-	return wsreq_session_check(wsreq, 1);
-}
-
-static int wsreq_session_check(struct afb_wsreq *wsreq, int refresh)
+static void aws_emit(struct afb_ws_json *aws, int code, const char *id, size_t idlen, struct json_object *data, const char *token)
 {
-	struct AFB_clientCtx *context = wsreq->aws->context;
+	json_object *msg;
+	const char *txt;
 
-	if (wsreq->tok == NULL)
-		return 0;
+	/* 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);
+	if (token)
+		json_object_array_add(msg, json_object_new_string(token));
 
-	if (!ctxTokenCheckLen (context, wsreq->tok, wsreq->toklen))
-		return 0;
-
-	if (refresh) {
-		ctxTokenNew (context);
-	}
-
-	return 1;
-}
-
-static void wsreq_session_close(struct afb_wsreq *wsreq)
-{
-	struct AFB_clientCtx *context = wsreq->aws->context;
-	ctxClientClose(context);
+	/* emits the 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)
 {
-	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));
-
-	/* emits the reply */
-	message = json_object_to_json_string(reply);
-	afb_ws_text(wsreq->aws->ws, message, strlen(message));
-	json_object_put(reply);
-
-	/* TODO eliminates the wsreq */
+	const char *token = afb_context_sent_token(&wsreq->context);
+	aws_emit(wsreq->aws, retcode, wsreq->id, wsreq->idlen, afb_msg_json_reply(status, info, resp, token, NULL), token);
 }
 
 static void wsreq_fail(struct afb_wsreq *wsreq, const char *status, const char *info)
@@ -424,8 +416,13 @@ static const char *wsreq_raw(struct afb_wsreq *wsreq, size_t *size)
 	return wsreq->obj;
 }
 
-static void wsreq_send(struct afb_wsreq *wsreq, char *buffer, size_t size)
+static void wsreq_send(struct afb_wsreq *wsreq, const 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), NULL);
+}
+