X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-stub-ws.c;h=11cad076913e60b61c5dfb2eae145933cef66773;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=164759271ac9f9d172ca124c59010ff6cacb9bd7;hpb=d45426257d5149c735e33e3055220625a919e7bc;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index 16475927..11cad076 100644
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,6 @@
 
 #define _GNU_SOURCE
 
-#define NO_PLUGIN_VERBOSE_MACRO
-
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
@@ -34,9 +32,7 @@
 
 #include <json-c/json.h>
 
-#include <afb/afb-event.h>
-
-#include "afb-common.h"
+#include <afb/afb-event-x2.h>
 
 #include "afb-session.h"
 #include "afb-cred.h"
@@ -47,76 +43,25 @@
 #include "afb-context.h"
 #include "afb-evt.h"
 #include "afb-xreq.h"
+#include "afb-token.h"
+#include "afb-error-text.h"
 #include "verbose.h"
+#include "fdev.h"
 #include "jobs.h"
+#include "u16id.h"
 
 struct afb_stub_ws;
 
-
-/******************* handling subcalls *****************************/
-
-/**
- * Structure on server side for recording pending
- * subcalls.
- */
-struct server_subcall
-{
-	struct server_subcall *next;	/**< next subcall for the client */
-	uint32_t subcallid;		/**< the subcallid */
-	void (*callback)(void*, int, struct json_object*); /**< callback on completion */
-	void *closure;			/**< closure of the callback */
-};
-
 /**
- * Structure for sending back replies on client side
- */
-struct client_subcall
-{
-	struct afb_stub_ws *stubws;	/**< stub descriptor */
-	uint32_t subcallid;		/**< subcallid for the reply */
-};
-
-/*
- * structure for recording calls on client side
- */
-struct client_call {
-	struct client_call *next;	/* the next call */
-	struct afb_stub_ws *stubws;	/* the stub_ws */
-	struct afb_xreq *xreq;		/* the request handle */
-	uint32_t msgid;			/* the message identifier */
-};
-
-/*
- * structure for a ws request
+ * structure for a ws request: requests on server side
  */
 struct server_req {
-	struct afb_xreq xreq;		/* the xreq */
-	struct afb_stub_ws *stubws;	/* the client of the request */
-	struct afb_proto_ws_call *call;	/* the incoming call */
+	struct afb_xreq xreq;		/**< the xreq */
+	struct afb_stub_ws *stubws;	/**< the client of the request */
+	struct afb_proto_ws_call *call;	/**< the incoming call */
 };
 
-/*
- * structure for recording events on client side
- */
-struct client_event
-{
-	struct client_event *next;
-	struct afb_eventid *eventid;
-	int id;
-	int refcount;
-};
-
-/*
- * structure for recording describe requests
- */
-struct client_describe
-{
-	struct afb_stub_ws *stubws;
-	struct jobloop *jobloop;
-	struct json_object *result;
-};
-
-/*
+/**
  * structure for jobs of describing
  */
 struct server_describe
@@ -125,50 +70,73 @@ struct server_describe
 	struct afb_proto_ws_describe *describe;
 };
 
-/*
- * structure for recording sessions
- */
-struct server_session
-{
-	struct server_session *next;
-	struct afb_session *session;
-};
-
 /******************* stub description for client or servers ******************/
 
 struct afb_stub_ws
 {
-	/* count of references */
-	int refcount;
-
-	/* resource control */
-	pthread_mutex_t mutex;
-
 	/* protocol */
 	struct afb_proto_ws *proto;
 
-	/* listener for events (server side) */
-	struct afb_evt_listener *listener;
-
-	/* event replica (client side) */
-	struct client_event *events;
-
-	/* credentials (server side) */
-	struct afb_cred *cred;
-
-	/* sessions (server side) */
-	struct server_session *sessions;
-
 	/* apiset */
 	struct afb_apiset *apiset;
 
 	/* on hangup callback */
 	void (*on_hangup)(struct afb_stub_ws *);
 
+	union {
+		/* server side */
+		struct {
+			/* listener for events */
+			struct afb_evt_listener *listener;
+
+			/* sessions */
+			struct server_session *sessions;
+
+			/* credentials of the client */
+			struct afb_cred *cred;
+
+			/* event from server */
+			struct u16id2bool *event_flags;
+
+			/* transmitted sessions */
+			struct u16id2ptr *session_proxies;
+
+			/* transmitted tokens */
+			struct u16id2ptr *token_proxies;
+		};
+
+		/* client side */
+		struct {
+			/* event from server */
+			struct u16id2ptr *event_proxies;
+
+			/* transmitted sessions */
+			struct u16id2bool *session_flags;
+
+			/* transmitted tokens */
+			struct u16id2bool *token_flags;
+
+			/* robustify */
+			struct {
+				struct fdev *(*reopen)(void*);
+				void *closure;
+				void (*release)(void*);
+			} robust;
+		};
+	};
+
+	/* count of references */
+	unsigned refcount;
+
+	/* type of the stub: 0=server, 1=client */
+	uint8_t is_client;
+
 	/* the api name */
-	char apiname[1];
+	char apiname[];
 };
 
+static struct afb_proto_ws *afb_stub_ws_create_proto(struct afb_stub_ws *stubws, struct fdev *fdev, uint8_t server);
+
 /******************* ws request part for server *****************/
 
 /* decrement the reference count of the request and free/release it on falling to null */
@@ -177,348 +145,382 @@ static void server_req_destroy_cb(struct afb_xreq *xreq)
 	struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
 
 	afb_context_disconnect(&wreq->xreq.context);
-	afb_cred_unref(wreq->xreq.cred);
 	json_object_put(wreq->xreq.json);
 	afb_proto_ws_call_unref(wreq->call);
 	afb_stub_ws_unref(wreq->stubws);
 	free(wreq);
 }
 
-static void server_req_success_cb(struct afb_xreq *xreq, struct json_object *obj, const char *info)
+static void server_req_reply_cb(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info)
 {
 	int rc;
 	struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
 
-	rc = afb_proto_ws_call_success(wreq->call, obj, info);
+	rc = afb_proto_ws_call_reply(wreq->call, obj, error, info);
 	if (rc < 0)
-		ERROR("error while sending success");
+		ERROR("error while sending reply");
 	json_object_put(obj);
 }
 
-static void server_req_fail_cb(struct afb_xreq *xreq, const char *status, const char *info)
-{
-	int rc;
-	struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
-
-	rc = afb_proto_ws_call_fail(wreq->call, status, info);
-	if (rc < 0)
-		ERROR("error while sending fail");
-}
-
-static void server_req_subcall_cb(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *cb_closure)
+static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_event_x2 *event)
 {
 	int rc;
 	struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
 
-	rc = afb_proto_ws_call_subcall(wreq->call, api, verb, args, callback, cb_closure);
-	if (rc < 0)
-		ERROR("error while sending subcall");
-}
-
-static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_eventid *event)
-{
-	int rc;
-	struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
-
-	rc = afb_evt_eventid_add_watch(wreq->stubws->listener, event);
+	rc = afb_evt_listener_watch_x2(wreq->stubws->listener, event);
 	if (rc >= 0)
-		rc = afb_proto_ws_call_subscribe(wreq->call,  afb_evt_eventid_fullname(event), afb_evt_eventid_id(event));
+		rc = afb_proto_ws_call_subscribe(wreq->call,  afb_evt_event_x2_id(event));
 	if (rc < 0)
 		ERROR("error while subscribing event");
 	return rc;
 }
 
-static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_eventid *event)
+static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event_x2 *event)
 {
-	int rc, rc2;
+	int rc;
 	struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
 
-	rc = afb_proto_ws_call_unsubscribe(wreq->call,  afb_evt_eventid_fullname(event), afb_evt_eventid_id(event));
-	rc2 = afb_evt_eventid_remove_watch(wreq->stubws->listener, event);
-	if (rc >= 0 && rc2 < 0)
-		rc = rc2;
+	rc = afb_proto_ws_call_unsubscribe(wreq->call,  afb_evt_event_x2_id(event));
 	if (rc < 0)
 		ERROR("error while unsubscribing event");
 	return rc;
 }
 
 static const struct afb_xreq_query_itf server_req_xreq_itf = {
-	.success = server_req_success_cb,
-	.fail = server_req_fail_cb,
+	.reply = server_req_reply_cb,
 	.unref = server_req_destroy_cb,
-	.subcall = server_req_subcall_cb,
 	.subscribe = server_req_subscribe_cb,
 	.unsubscribe = server_req_unsubscribe_cb
 };
 
 /******************* client part **********************************/
 
-/* search the event */
-static struct client_event *client_event_search(struct afb_stub_ws *stubws, uint32_t eventid, const char *name)
+static struct afb_proto_ws *client_get_proto(struct afb_stub_ws *stubws)
 {
-	struct client_event *ev;
-
-	ev = stubws->events;
-	while (ev != NULL && (ev->id != eventid || 0 != strcmp(afb_evt_eventid_fullname(ev->eventid), name)))
-		ev = ev->next;
+	struct fdev *fdev;
+	struct afb_proto_ws *proto;
 
-	return ev;
+	proto = stubws->proto;
+	if (proto == NULL && stubws->robust.reopen) {
+		fdev = stubws->robust.reopen(stubws->robust.closure);
+		if (fdev != NULL)
+			proto = afb_stub_ws_create_proto(stubws, fdev, 0);
+	}
+	return proto;
 }
 
-/* on call, propagate it to the ws service */
-static void client_call_cb(void * closure, struct afb_xreq *xreq)
+static int client_make_ids(struct afb_stub_ws *stubws, struct afb_proto_ws *proto, struct afb_context *context, uint16_t *sessionid, uint16_t *tokenid)
 {
-	struct afb_stub_ws *stubws = closure;
+	int rc, rc2;
+	uint16_t sid, tid;
 
-	afb_proto_ws_client_call(stubws->proto, xreq->request.verb, afb_xreq_json(xreq), afb_session_uuid(xreq->context.session), xreq);
-	afb_xreq_unhooked_addref(xreq);
-}
+	rc = 0;
 
-static void client_on_description_cb(void *closure, struct json_object *data)
-{
-	struct client_describe *desc = closure;
+	/* get the session */
+	if (!context->session)
+		sid = 0;
+	else {
+		sid = afb_session_id(context->session);
+		rc2 = u16id2bool_set(&stubws->session_flags, sid, 1);
+		if (rc2 < 0)
+			rc = rc2;
+		else if (rc2 == 0)
+			rc = afb_proto_ws_client_session_create(proto, sid, afb_session_uuid(context->session));
+	}
 
-	desc->result = data;
-	jobs_leave(desc->jobloop);
+	/* get the token */
+	if (!context->token)
+		tid = 0;
+	else {
+		tid = afb_token_id(context->token);
+		rc2 = u16id2bool_set(&stubws->token_flags, tid, 1);
+		if (rc2 < 0)
+			rc = rc2;
+		else if (rc2 == 0) {
+			rc2 = afb_proto_ws_client_token_create(proto, tid, afb_token_string(context->token));
+			if (rc2 < 0)
+				rc = rc2;
+		}
+	}
+
+	*sessionid = sid;
+	*tokenid = tid;
+	return rc;
 }
 
-static void client_send_describe_cb(int signum, void *closure, struct jobloop *jobloop)
+/* on call, propagate it to the ws service */
+static void client_api_call_cb(void * closure, struct afb_xreq *xreq)
 {
-	struct client_describe *desc = closure;
+	int rc;
+	struct afb_stub_ws *stubws = closure;
+	struct afb_proto_ws *proto;
+	uint16_t sessionid;
+	uint16_t tokenid;
 
-	if (signum)
-		jobs_leave(jobloop);
-	else {
-		desc->jobloop = jobloop;
-		afb_proto_ws_client_describe(desc->stubws->proto, client_on_description_cb, desc);
+	proto = client_get_proto(stubws);
+	if (proto == NULL) {
+		afb_xreq_reply(xreq, NULL, afb_error_text_disconnected, NULL);
+		return;
+	}
+
+	rc = client_make_ids(stubws, proto, &xreq->context, &sessionid, &tokenid);
+	if (rc >= 0) {
+		afb_xreq_unhooked_addref(xreq);
+		rc = afb_proto_ws_client_call(
+				proto,
+				xreq->request.called_verb,
+				afb_xreq_json(xreq),
+				sessionid,
+				tokenid,
+				xreq,
+				xreq_on_behalf_cred_export(xreq));
+	}
+	if (rc < 0) {
+		afb_xreq_reply(xreq, NULL, afb_error_text_internal_error, "can't send message");
+		afb_xreq_unhooked_unref(xreq);
 	}
 }
 
 /* get the description */
-static struct json_object *client_describe_cb(void * closure)
+static void client_api_describe_cb(void * closure, void (*describecb)(void *, struct json_object *), void *clocb)
 {
-	struct client_describe desc;
+	struct afb_stub_ws *stubws = closure;
+	struct afb_proto_ws *proto;
 
-	/* synchronous job: send the request and wait its result */
-	desc.stubws = closure;
-	desc.result = NULL;
-	jobs_enter(NULL, 0, client_send_describe_cb, &desc);
-	return desc.result;
+	proto = client_get_proto(stubws);
+	if (proto)
+		afb_proto_ws_client_describe(proto, describecb, clocb);
+	else
+		describecb(clocb, NULL);
 }
 
 /******************* server part: manage events **********************************/
 
-static void server_event_add(void *closure, const char *event, int eventid)
+static void server_event_add_cb(void *closure, const char *event, uint16_t eventid)
 {
+	int rc;
 	struct afb_stub_ws *stubws = closure;
 
-	afb_proto_ws_server_event_create(stubws->proto, event, eventid);
+	if (stubws->proto != NULL) {
+		rc = u16id2bool_set(&stubws->event_flags, eventid, 1);
+		if (rc == 0) {
+			rc = afb_proto_ws_server_event_create(stubws->proto, eventid, event);
+			if (rc < 0)
+				u16id2bool_set(&stubws->event_flags, eventid, 0);
+		}
+	}
 }
 
-static void server_event_remove(void *closure, const char *event, int eventid)
+static void server_event_remove_cb(void *closure, const char *event, uint16_t eventid)
 {
 	struct afb_stub_ws *stubws = closure;
 
-	afb_proto_ws_server_event_remove(stubws->proto, event, eventid);
+	if (stubws->proto != NULL) {
+		if (u16id2bool_set(&stubws->event_flags, eventid, 0))
+			afb_proto_ws_server_event_remove(stubws->proto, eventid);
+	}
 }
 
-static void server_event_push(void *closure, const char *event, int eventid, struct json_object *object)
+static void server_event_push_cb(void *closure, const char *event, uint16_t eventid, struct json_object *object)
 {
 	struct afb_stub_ws *stubws = closure;
 
-	afb_proto_ws_server_event_push(stubws->proto, event, eventid, object);
+	if (stubws->proto != NULL && u16id2bool_get(stubws->event_flags, eventid))
+		afb_proto_ws_server_event_push(stubws->proto, eventid, object);
 	json_object_put(object);
 }
 
-static void server_event_broadcast(void *closure, const char *event, int eventid, struct json_object *object)
+static void server_event_broadcast_cb(void *closure, const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop)
 {
 	struct afb_stub_ws *stubws = closure;
 
-	afb_proto_ws_server_event_broadcast(stubws->proto, event, object);
+	if (stubws->proto != NULL)
+		afb_proto_ws_server_event_broadcast(stubws->proto, event, object, uuid, hop);
 	json_object_put(object);
 }
 
 /*****************************************************/
 
-static void on_reply_success(void *closure, void *request, struct json_object *result, const char *info)
-{
-	struct afb_xreq *xreq = request;
-
-	afb_xreq_success(xreq, result, *info ? info : NULL);
-	afb_xreq_unhooked_unref(xreq);
-}
-
-static void on_reply_fail(void *closure, void *request, const char *status, const char *info)
+static void client_on_reply_cb(void *closure, void *request, struct json_object *object, const char *error, const char *info)
 {
 	struct afb_xreq *xreq = request;
 
-	afb_xreq_fail(xreq, status, *info ? info : NULL);
+	afb_xreq_reply(xreq, object, error, info);
 	afb_xreq_unhooked_unref(xreq);
 }
 
-static void on_event_create(void *closure, const char *event_name, int event_id)
+static void client_on_event_create_cb(void *closure, uint16_t event_id, const char *event_name)
 {
 	struct afb_stub_ws *stubws = closure;
-	struct client_event *ev;
-
+	struct afb_event_x2 *event;
+	int rc;
+	
 	/* check conflicts */
-	ev = client_event_search(stubws, event_id, event_name);
-	if (ev != NULL) {
-		ev->refcount++;
-		return;
-	}
-
-	/* no conflict, try to add it */
-	ev = malloc(sizeof *ev);
-	if (ev != NULL) {
-		ev->eventid = afb_evt_eventid_create(event_name);
-		if (ev->eventid != NULL) {
-			ev->refcount = 1;
-			ev->id = event_id;
-			ev->next = stubws->events;
-			stubws->events = ev;
-			return;
+	event = afb_evt_event_x2_create(event_name);
+	if (event == NULL)
+		ERROR("can't create event %s, out of memory", event_name);
+	else {
+		rc = u16id2ptr_add(&stubws->event_proxies, event_id, event);
+		if (rc < 0) {
+			ERROR("can't record event %s", event_name);
+			afb_evt_event_x2_unref(event);
 		}
-		free(ev);
 	}
-	ERROR("can't create event %s, out of memory", event_name);
 }
 
-static void on_event_remove(void *closure, const char *event_name, int event_id)
+static void client_on_event_remove_cb(void *closure, uint16_t event_id)
 {
 	struct afb_stub_ws *stubws = closure;
-	struct client_event *ev, **prv;
-
-	/* check conflicts */
-	ev = client_event_search(stubws, event_id, event_name);
-	if (ev == NULL)
-		return;
-
-	/* decrease the reference count */
-	if (--ev->refcount)
-		return;
-
-	/* unlinks the event */
-	prv = &stubws->events;
-	while (*prv != ev)
-		prv = &(*prv)->next;
-	*prv = ev->next;
+	struct afb_event_x2 *event;
+	int rc;
 
-	/* destroys the event */
-	afb_evt_eventid_unref(ev->eventid);
-	free(ev);
+	rc = u16id2ptr_drop(&stubws->event_proxies, event_id, (void**)&event);
+	if (rc == 0 && event)
+		afb_evt_event_x2_unref(event);
 }
 
-static void on_event_subscribe(void *closure, void *request, const char *event_name, int event_id)
+static void client_on_event_subscribe_cb(void *closure, void *request, uint16_t event_id)
 {
 	struct afb_stub_ws *stubws = closure;
 	struct afb_xreq *xreq = request;
-	struct client_event *ev;
-
-	/* check conflicts */
-	ev = client_event_search(stubws, event_id, event_name);
-	if (ev == NULL)
-		return;
+	struct afb_event_x2 *event;
+	int rc;
 
-	if (afb_xreq_subscribe(xreq, ev->eventid) < 0)
+	rc = u16id2ptr_get(stubws->event_proxies, event_id, (void**)&event);
+	if (rc < 0 || !event || afb_xreq_subscribe(xreq, event) < 0)
 		ERROR("can't subscribe: %m");
 }
 
-static void on_event_unsubscribe(void *closure, void *request, const char *event_name, int event_id)
+static void client_on_event_unsubscribe_cb(void *closure, void *request, uint16_t event_id)
 {
 	struct afb_stub_ws *stubws = closure;
 	struct afb_xreq *xreq = request;
-	struct client_event *ev;
-
-	/* check conflicts */
-	ev = client_event_search(stubws, event_id, event_name);
-	if (ev == NULL)
-		return;
+	struct afb_event_x2 *event;
+	int rc;
 
-	if (afb_xreq_unsubscribe(xreq, ev->eventid) < 0)
+	rc = u16id2ptr_get(stubws->event_proxies, event_id, (void**)&event);
+	if (rc < 0 || !event || afb_xreq_unsubscribe(xreq, event) < 0)
 		ERROR("can't unsubscribe: %m");
 }
 
-static void on_event_push(void *closure, const char *event_name, int event_id, struct json_object *data)
+static void client_on_event_push_cb(void *closure, uint16_t event_id, struct json_object *data)
 {
 	struct afb_stub_ws *stubws = closure;
-	struct client_event *ev;
+	struct afb_event_x2 *event;
+	int rc;
 
-	/* check conflicts */
-	ev = client_event_search(stubws, event_id, event_name);
-	if (ev)
-		afb_evt_eventid_push(ev->eventid, data);
+	rc = u16id2ptr_get(stubws->event_proxies, event_id, (void**)&event);
+	if (rc >= 0 && event)
+		rc = afb_evt_event_x2_push(event, data);
 	else
 		ERROR("unreadable push event");
+	if (rc <= 0)
+		afb_proto_ws_client_event_unexpected(stubws->proto, event_id);
 }
 
-static void on_event_broadcast(void *closure, const char *event_name, struct json_object *data)
+static void client_on_event_broadcast_cb(void *closure, const char *event_name, struct json_object *data, const uuid_binary_t uuid, uint8_t hop)
 {
-	afb_evt_broadcast(event_name, data);
+	afb_evt_rebroadcast(event_name, data, uuid, hop);
 }
 
-static void client_subcall_reply_cb(void *closure, int status, json_object *object, struct afb_request *request)
+/*****************************************************/
+
+static struct afb_session *server_add_session(struct afb_stub_ws *stubws, uint16_t sessionid, const char *sessionstr)
 {
-	struct afb_proto_ws_subcall *subcall = closure;
-	afb_proto_ws_subcall_reply(subcall, status, object);
+	struct afb_session *session;
+	int rc, created;
+
+	session = afb_session_get(sessionstr, AFB_SESSION_TIMEOUT_DEFAULT, &created);
+	if (session == NULL)
+		ERROR("can't create session %s, out of memory", sessionstr);
+	else {
+		afb_session_set_autoclose(session, 1);
+		rc = u16id2ptr_add(&stubws->session_proxies, sessionid, session);
+		if (rc < 0) {
+			ERROR("can't record session %s", sessionstr);
+			afb_session_unref(session);
+			session = NULL;
+		}
+	}
+	return session;
 }
 
-static void on_subcall(void *closure, struct afb_proto_ws_subcall *subcall, void *request, const char *api, const char *verb, struct json_object *args)
+static void server_on_session_create_cb(void *closure, uint16_t sessionid, const char *sessionstr)
 {
-	struct afb_xreq *xreq = request;
+	struct afb_stub_ws *stubws = closure;
 
-	afb_xreq_subcall(xreq, api, verb, args, client_subcall_reply_cb, subcall);
+	server_add_session(stubws, sessionid, sessionstr);
 }
 
-/*****************************************************/
+static void server_on_session_remove_cb(void *closure, uint16_t sessionid)
+{
+	struct afb_stub_ws *stubws = closure;
+	struct afb_session *session;
+	int rc;
+	
+	rc = u16id2ptr_drop(&stubws->event_proxies, sessionid, (void**)&session);
+	if (rc == 0 && session)
+		afb_session_unref(session);
+}
 
-static void record_session(struct afb_stub_ws *stubws, struct afb_session *session)
+static void server_on_token_create_cb(void *closure, uint16_t tokenid, const char *tokenstr)
 {
-	struct server_session *s, **prv;
+	struct afb_stub_ws *stubws = closure;
+	struct afb_token *token;
+	int rc;
 
-	/* search */
-	prv = &stubws->sessions;
-	while ((s = *prv)) {
-		if (s->session == session)
-			return;
-		if (afb_session_is_closed(s->session)) {
-			*prv = s->next;
-			afb_session_unref(s->session);
-			free(s);
+	rc = afb_token_get(&token, tokenstr);
+	if (rc < 0)
+		ERROR("can't create token %s, out of memory", tokenstr);
+	else {
+		rc = u16id2ptr_add(&stubws->token_proxies, tokenid, token);
+		if (rc < 0) {
+			ERROR("can't record token %s", tokenstr);
+			afb_token_unref(token);
 		}
-		else
-			prv = &s->next;
 	}
+}
 
-	/* create */
-	s = malloc(sizeof *s);
-	if (s) {
-		s->session = afb_session_addref(session);
-		s->next = stubws->sessions;
-		stubws->sessions = s;
-	}
+static void server_on_token_remove_cb(void *closure, uint16_t tokenid)
+{
+	struct afb_stub_ws *stubws = closure;
+	struct afb_token *token;
+	int rc;
+	
+	rc = u16id2ptr_drop(&stubws->event_proxies, tokenid, (void**)&token);
+	if (rc == 0 && token)
+		afb_token_unref(token);
 }
 
-static void release_sessions(struct afb_stub_ws *stubws)
+static void server_on_event_unexpected_cb(void *closure, uint16_t eventid)
 {
-	struct server_session *s;
+	struct afb_stub_ws *stubws = closure;
 
-	while((s = stubws->sessions)) {
-		stubws->sessions = s->next;
-		afb_session_unref(s->session);
-		free(s);
-	}
+	afb_evt_listener_unwatch_id(stubws->listener, eventid);
 }
 
-/*****************************************************/
-
-static void on_call(void *closure, struct afb_proto_ws_call *call, const char *verb, struct json_object *args, const char *sessionid)
+static void server_on_call_cb(void *closure, struct afb_proto_ws_call *call, const char *verb, struct json_object *args, uint16_t sessionid, uint16_t tokenid, const char *user_creds)
 {
 	struct afb_stub_ws *stubws = closure;
 	struct server_req *wreq;
+	struct afb_session *session;
+	struct afb_token *token;
+	int rc;
 
 	afb_stub_ws_addref(stubws);
 
+	/* get tokens and sessions */
+	rc = u16id2ptr_get(stubws->session_proxies, sessionid, (void**)&session);
+	if (rc < 0) {
+		if (sessionid != 0)
+			goto no_session;
+		session = server_add_session(stubws, sessionid, NULL);
+		if (!session)
+			goto out_of_memory;
+	}
+	if (!tokenid || u16id2ptr_get(stubws->token_proxies, tokenid, (void**)&token) < 0)
+		token = NULL;
+
 	/* create the request */
 	wreq = malloc(sizeof *wreq);
 	if (wreq == NULL)
@@ -529,120 +531,129 @@ static void on_call(void *closure, struct afb_proto_ws_call *call, const char *v
 	wreq->call = call;
 
 	/* init the context */
-	if (afb_context_connect(&wreq->xreq.context, sessionid, NULL) < 0)
-		goto unconnected;
-	wreq->xreq.context.validated = 1;
-	record_session(stubws, wreq->xreq.context.session);
-	if (wreq->xreq.context.created)
-		afb_session_set_autoclose(wreq->xreq.context.session, 1);
+	afb_context_init(&wreq->xreq.context, session, token, stubws->cred);
+	afb_context_on_behalf_import(&wreq->xreq.context, user_creds);
 
 	/* makes the call */
-	wreq->xreq.cred = afb_cred_addref(stubws->cred);
-	wreq->xreq.request.api = stubws->apiname;
-	wreq->xreq.request.verb = verb;
+	wreq->xreq.request.called_api = stubws->apiname;
+	wreq->xreq.request.called_verb = verb;
 	wreq->xreq.json = args;
 	afb_xreq_process(&wreq->xreq, stubws->apiset);
 	return;
 
-unconnected:
-	free(wreq);
 out_of_memory:
+no_session:
 	json_object_put(args);
 	afb_stub_ws_unref(stubws);
-	afb_proto_ws_call_fail(call, "internal-error", NULL);
+	afb_proto_ws_call_reply(call, NULL, afb_error_text_internal_error, NULL);
 	afb_proto_ws_call_unref(call);
 }
 
-static void server_describe_sjob(int signum, void *closure)
+static void server_on_description_cb(void *closure, struct json_object *description)
 {
-	struct json_object *obj;
-	struct server_describe *desc = closure;
-
-	/* get the description if possible */
-	obj = !signum ? afb_apiset_describe(desc->stubws->apiset, desc->stubws->apiname) : NULL;
-
-	/* send it */
-	afb_proto_ws_describe_put(desc->describe, obj);
-	json_object_put(obj);
-	afb_stub_ws_unref(desc->stubws);
+	struct afb_proto_ws_describe *describe = closure;
+	afb_proto_ws_describe_put(describe, description);
+	json_object_put(description);
 }
 
-static void server_describe_job(int signum, void *closure)
-{
-	server_describe_sjob(signum, closure);
-	free(closure);
-}
 
-static void on_describe(void *closure, struct afb_proto_ws_describe *describe)
+static void server_on_describe_cb(void *closure, struct afb_proto_ws_describe *describe)
 {
-	struct server_describe *desc, sdesc;
 	struct afb_stub_ws *stubws = closure;
 
-	/* allocate (if possible) and init */
-	desc = malloc(sizeof *desc);
-	if (desc == NULL)
-		desc = &sdesc;
-	desc->stubws = stubws;
-	desc->describe = describe;
-	afb_stub_ws_addref(stubws);
-
-	/* process */
-	if (desc == &sdesc)
-		jobs_call(NULL, 0, server_describe_sjob, desc);
-	else {
-		if (jobs_queue(NULL, 0, server_describe_job, desc) < 0)
-			jobs_call(NULL, 0, server_describe_job, desc);
-	}
+	afb_apiset_describe(stubws->apiset, stubws->apiname, server_on_description_cb, describe);
 }
 
 /*****************************************************/
 
 static const struct afb_proto_ws_client_itf client_itf =
 {
-	.on_reply_success = on_reply_success,
-	.on_reply_fail = on_reply_fail,
-	.on_event_create = on_event_create,
-	.on_event_remove = on_event_remove,
-	.on_event_subscribe = on_event_subscribe,
-	.on_event_unsubscribe = on_event_unsubscribe,
-	.on_event_push = on_event_push,
-	.on_event_broadcast = on_event_broadcast,
-	.on_subcall = on_subcall
+	.on_reply = client_on_reply_cb,
+	.on_event_create = client_on_event_create_cb,
+	.on_event_remove = client_on_event_remove_cb,
+	.on_event_subscribe = client_on_event_subscribe_cb,
+	.on_event_unsubscribe = client_on_event_unsubscribe_cb,
+	.on_event_push = client_on_event_push_cb,
+	.on_event_broadcast = client_on_event_broadcast_cb,
 };
 
-static const struct afb_proto_ws_server_itf server_itf =
-{
-	.on_call = on_call,
-	.on_describe = on_describe
+static struct afb_api_itf client_api_itf = {
+	.call = client_api_call_cb,
+	.describe = client_api_describe_cb
 };
 
-static struct afb_api_itf ws_api_itf = {
-	.call = client_call_cb,
-	.describe = client_describe_cb
+static const struct afb_proto_ws_server_itf server_itf =
+{
+	.on_session_create = server_on_session_create_cb,
+	.on_session_remove = server_on_session_remove_cb,
+	.on_token_create = server_on_token_create_cb,
+	.on_token_remove = server_on_token_remove_cb,
+	.on_call = server_on_call_cb,
+	.on_describe = server_on_describe_cb,
+	.on_event_unexpected = server_on_event_unexpected_cb
 };
 
 /* the interface for events pushing */
-static const struct afb_evt_itf server_evt_itf = {
-	.broadcast = server_event_broadcast,
-	.push = server_event_push,
-	.add = server_event_add,
-	.remove = server_event_remove
+static const struct afb_evt_itf server_event_itf = {
+	.broadcast = server_event_broadcast_cb,
+	.push = server_event_push_cb,
+	.add = server_event_add_cb,
+	.remove = server_event_remove_cb
 };
 
+/*****************************************************/
 /*****************************************************/
 
-static void drop_all_events(struct afb_stub_ws *stubws)
+static void release_all_sessions_cb(void*closure, uint16_t id, void *ptr)
 {
-	struct client_event *ev, *nxt;
+	struct afb_session *session = ptr;
+	afb_session_unref(session);
+}
 
-	ev = stubws->events;
-	stubws->events = NULL;
+static void release_all_tokens_cb(void*closure, uint16_t id, void *ptr)
+{
+	struct afb_token *token = ptr;
+	afb_token_unref(token);
+}
 
-	while (ev) {
-		nxt = ev->next;
-		afb_evt_eventid_unref(ev->eventid);
-		free(ev);
-		ev = nxt;
+static void release_all_events_cb(void*closure, uint16_t id, void *ptr)
+{
+	struct afb_event_x2 *eventid = ptr;
+	afb_evt_event_x2_unref(eventid);
+}
+
+/* disconnect */
+static void disconnect(struct afb_stub_ws *stubws)
+{
+	struct u16id2ptr *i2p;
+	struct u16id2bool *i2b;
+
+	afb_proto_ws_unref(__atomic_exchange_n(&stubws->proto, NULL, __ATOMIC_RELAXED));
+	if (stubws->is_client) {
+		i2p = __atomic_exchange_n(&stubws->event_proxies, NULL, __ATOMIC_RELAXED);
+		if (i2p) {
+			u16id2ptr_forall(i2p, release_all_events_cb, NULL);
+			u16id2ptr_destroy(&i2p);
+		}
+		i2b = __atomic_exchange_n(&stubws->session_flags, NULL, __ATOMIC_RELAXED);
+		u16id2bool_destroy(&i2b);
+		i2b = __atomic_exchange_n(&stubws->token_flags, NULL, __ATOMIC_RELAXED);
+		u16id2bool_destroy(&i2b);
+	} else {
+		afb_evt_listener_unref(__atomic_exchange_n(&stubws->listener, NULL, __ATOMIC_RELAXED));
+		afb_cred_unref(__atomic_exchange_n(&stubws->cred, NULL, __ATOMIC_RELAXED));
+		i2b = __atomic_exchange_n(&stubws->event_flags, NULL, __ATOMIC_RELAXED);
+		u16id2bool_destroy(&i2b);
+		i2p = __atomic_exchange_n(&stubws->session_proxies, NULL, __ATOMIC_RELAXED);
+		if (i2p) {
+			u16id2ptr_forall(i2p, release_all_sessions_cb, NULL);
+			u16id2ptr_destroy(&i2p);
+		}
+		i2p = __atomic_exchange_n(&stubws->token_proxies, NULL, __ATOMIC_RELAXED);
+		if (i2p) {
+			u16id2ptr_forall(i2p, release_all_tokens_cb, NULL);
+			u16id2ptr_destroy(&i2p);
+		}
 	}
 }
 
@@ -651,51 +662,71 @@ static void on_hangup(void *closure)
 {
 	struct afb_stub_ws *stubws = closure;
 
-	if (stubws->on_hangup)
-		stubws->on_hangup(stubws);
+	if (stubws->proto) {
+		afb_stub_ws_addref(stubws);
+		disconnect(stubws);
+		if (stubws->on_hangup)
+			stubws->on_hangup(stubws);
+		afb_stub_ws_unref(stubws);
+	}
+}
 
-	release_sessions(stubws);
+static int enqueue_processing(struct afb_proto_ws *proto, void (*callback)(int signum, void* arg), void *arg)
+{
+	return jobs_queue(proto, 0, callback, arg);
 }
 
 /*****************************************************/
 
-static struct afb_stub_ws *afb_stub_ws_create(int fd, const char *apiname, struct afb_apiset *apiset, int client)
+static struct afb_proto_ws *afb_stub_ws_create_proto(struct afb_stub_ws *stubws, struct fdev *fdev, uint8_t is_client)
+{
+	struct afb_proto_ws *proto;
+
+	stubws->proto = proto = is_client
+		  ? afb_proto_ws_create_client(fdev, &client_itf, stubws)
+		  : afb_proto_ws_create_server(fdev, &server_itf, stubws);
+	if (proto) {
+		afb_proto_ws_on_hangup(proto, on_hangup);
+		afb_proto_ws_set_queuing(proto, enqueue_processing);
+	}
+
+	return proto;
+}
+
+static struct afb_stub_ws *afb_stub_ws_create(struct fdev *fdev, const char *apiname, struct afb_apiset *apiset, uint8_t is_client)
 {
 	struct afb_stub_ws *stubws;
 
-	stubws = calloc(1, sizeof *stubws + strlen(apiname));
+	stubws = calloc(1, sizeof *stubws + 1 + strlen(apiname));
 	if (stubws == NULL)
 		errno = ENOMEM;
 	else {
-		if (client)
-			stubws->proto = afb_proto_ws_create_client(afb_common_get_event_loop(), fd, &client_itf, stubws);
-		else
-			stubws->proto = afb_proto_ws_create_server(afb_common_get_event_loop(), fd, &server_itf, stubws);
-		if (stubws->proto != NULL) {
+		if (afb_stub_ws_create_proto(stubws, fdev, is_client)) {
+			stubws->refcount = 1;
+			stubws->is_client = is_client;
 			strcpy(stubws->apiname, apiname);
 			stubws->apiset = afb_apiset_addref(apiset);
-			stubws->refcount = 1;
-			afb_proto_ws_on_hangup(stubws->proto, on_hangup);
 			return stubws;
 		}
 		free(stubws);
 	}
+	fdev_unref(fdev);
 	return NULL;
 }
 
-struct afb_stub_ws *afb_stub_ws_create_client(int fd, const char *apiname, struct afb_apiset *apiset)
+struct afb_stub_ws *afb_stub_ws_create_client(struct fdev *fdev, const char *apiname, struct afb_apiset *apiset)
 {
-	return afb_stub_ws_create(fd, apiname, apiset, 1);
+	return afb_stub_ws_create(fdev, apiname, apiset, 1);
 }
 
-struct afb_stub_ws *afb_stub_ws_create_server(int fd, const char *apiname, struct afb_apiset *apiset)
+struct afb_stub_ws *afb_stub_ws_create_server(struct fdev *fdev, const char *apiname, struct afb_apiset *apiset)
 {
 	struct afb_stub_ws *stubws;
 
-	stubws = afb_stub_ws_create(fd, apiname, apiset, 0);
+	stubws = afb_stub_ws_create(fdev, apiname, apiset, 0);
 	if (stubws) {
-		stubws->cred = afb_cred_create_for_socket(fd);
-		stubws->listener = afb_evt_listener_create(&server_evt_itf, stubws);
+		stubws->cred = afb_cred_create_for_socket(fdev_fd(fdev));
+		stubws->listener = afb_evt_listener_create(&server_event_itf, stubws);
 		if (stubws->listener != NULL)
 			return stubws;
 		afb_stub_ws_unref(stubws);
@@ -705,12 +736,15 @@ struct afb_stub_ws *afb_stub_ws_create_server(int fd, const char *apiname, struc
 
 void afb_stub_ws_unref(struct afb_stub_ws *stubws)
 {
-	if (!__atomic_sub_fetch(&stubws->refcount, 1, __ATOMIC_RELAXED)) {
-		drop_all_events(stubws);
-		afb_evt_listener_unref(stubws->listener);
-		release_sessions(stubws);
-		afb_proto_ws_unref(stubws->proto);
-		afb_cred_unref(stubws->cred);
+	if (stubws && !__atomic_sub_fetch(&stubws->refcount, 1, __ATOMIC_RELAXED)) {
+
+		if (stubws->is_client) {
+			stubws->robust.reopen = NULL;
+			if (stubws->robust.release)
+				stubws->robust.release(stubws->robust.closure);
+		}
+
+		disconnect(stubws);
 		afb_apiset_unref(stubws->apiset);
 		free(stubws);
 	}
@@ -721,7 +755,7 @@ void afb_stub_ws_addref(struct afb_stub_ws *stubws)
 	__atomic_add_fetch(&stubws->refcount, 1, __ATOMIC_RELAXED);
 }
 
-void afb_stub_ws_on_hangup(struct afb_stub_ws *stubws, void (*on_hangup)(struct afb_stub_ws*))
+void afb_stub_ws_set_on_hangup(struct afb_stub_ws *stubws, void (*on_hangup)(struct afb_stub_ws*))
 {
 	stubws->on_hangup = on_hangup;
 }
@@ -731,14 +765,14 @@ const char *afb_stub_ws_name(struct afb_stub_ws *stubws)
 	return stubws->apiname;
 }
 
-struct afb_api afb_stub_ws_client_api(struct afb_stub_ws *stubws)
+struct afb_api_item afb_stub_ws_client_api(struct afb_stub_ws *stubws)
 {
-	struct afb_api api;
+	struct afb_api_item api;
 
-	assert(!stubws->listener); /* check client */
+	assert(stubws->is_client); /* check client */
 	api.closure = stubws;
-	api.itf = &ws_api_itf;
-	api.group = NULL;
+	api.itf = &client_api_itf;
+	api.group = stubws; /* serialize for reconnections */
 	return api;
 }
 
@@ -747,3 +781,14 @@ int afb_stub_ws_client_add(struct afb_stub_ws *stubws, struct afb_apiset *apiset
 	return afb_apiset_add(apiset, stubws->apiname, afb_stub_ws_client_api(stubws));
 }
 
+void afb_stub_ws_client_robustify(struct afb_stub_ws *stubws, struct fdev *(*reopen)(void*), void *closure, void (*release)(void*))
+{
+	assert(stubws->is_client); /* check client */
+
+	if (stubws->robust.release)
+		stubws->robust.release(stubws->robust.closure);
+
+	stubws->robust.reopen = reopen;
+	stubws->robust.closure = closure;
+	stubws->robust.release = release;
+}