integrated libwf_timer and libwf_jsonrpc into libwebfuse-core

lib/webfuse/adapter/impl/operation/close.c

@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <jansson.h>
 
-#include "wf/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/proxy.h"
 #include "webfuse/core/util.h"
 
 void wf_impl_operation_close(

lib/webfuse/adapter/impl/operation/getattr.c

@@ -7,7 +7,7 @@
 #include <sys/stat.h>
 #include <unistd.h> 
 
-#include "wf/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/proxy.h"
 #include "webfuse/core/json_util.h"
 #include "webfuse/core/util.h"
 

lib/webfuse/adapter/impl/operation/lookup.c

@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#include "wf/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/proxy.h"
 #include "webfuse/core/json_util.h"
 #include "webfuse/core/util.h"
 

lib/webfuse/adapter/impl/operation/open.c

@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <jansson.h>
 
-#include "wf/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/proxy.h"
 #include "webfuse/core/util.h"
 #include "webfuse/core/status.h"
 #include "webfuse/core/json_util.h"

lib/webfuse/adapter/impl/operation/read.c

@@ -5,7 +5,7 @@
 #include <limits.h>
 #include <jansson.h>
 
-#include "wf/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/proxy.h"
 #include "webfuse/core/base64.h"
 #include "webfuse/core/json_util.h"
 

lib/webfuse/adapter/impl/operation/readdir.c

@@ -8,7 +8,7 @@
 #include <sys/stat.h>
 #include <unistd.h> 
 
-#include "wf/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/proxy.h"
 #include "webfuse/core/util.h"
 #include "webfuse/core/json_util.h"
 

lib/webfuse/adapter/impl/server_protocol.c

@@ -11,9 +11,9 @@
 #include "webfuse/adapter/impl/credentials.h"
 #include "webfuse/core/status_intern.h"
 
-#include "wf/jsonrpc/request.h"
-#include "wf/timer/manager.h"
-#include "wf/timer/timer.h"
+#include "webfuse/core/jsonrpc/request.h"
+#include "webfuse/core/timer/manager.h"
+#include "webfuse/core/timer/timer.h"
 
 static int wf_impl_server_protocol_callback(
 	struct lws * wsi,

lib/webfuse/adapter/impl/server_protocol.h

@@ -4,8 +4,8 @@
 #include "webfuse/adapter/impl/authenticators.h"
 #include "webfuse/adapter/impl/mountpoint_factory.h"
 #include "webfuse/adapter/impl/session_manager.h"
-#include "wf/jsonrpc/proxy.h"
-#include "wf/jsonrpc/server.h"
+#include "webfuse/core/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/server.h"
 
 #ifndef __cplusplus
 #include <stdbool.h>

lib/webfuse/adapter/impl/session.c

@@ -8,9 +8,9 @@
 #include "webfuse/core/container_of.h"
 #include "webfuse/core/util.h"
 
-#include "wf/jsonrpc/proxy.h"
-#include "wf/jsonrpc/request.h"
-#include "wf/jsonrpc/response.h"
+#include "webfuse/core/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/request.h"
+#include "webfuse/core/jsonrpc/response.h"
 
 #include <libwebsockets.h>
 #include <stddef.h>

lib/webfuse/adapter/impl/session.h

@@ -13,8 +13,8 @@ using std::size_t;
 #include "webfuse/adapter/impl/filesystem.h"
 #include "webfuse/core/slist.h"
 
-#include "wf/jsonrpc/proxy.h"
-#include "wf/jsonrpc/server.h"
+#include "webfuse/core/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/server.h"
 
 #ifdef __cplusplus
 extern "C"

lib/webfuse/core/json_util.c

@@ -1,5 +1,4 @@
 #include "webfuse/core/json_util.h"
-#include "wf/jsonrpc/status.h"
 
 int wf_impl_json_get_int(json_t const * object, char const * key, int default_value)
 {
@@ -14,25 +13,6 @@ int wf_impl_json_get_int(json_t const * object, char const * key, int default_va
 	return result;
 }
 
-static wf_status wf_impl_jsonrc_code_to_status(int code)
-{
-	switch (code)
-	{
-		case WF_JSONRPC_GOOD:
-			return WF_GOOD;
-		case WF_JSONRPC_BAD:
-			return WF_BAD;
-		case WF_JSONRPC_BAD_BUSY:
-			return WF_BAD_BUSY;
-		case WF_JSONRPC_BAD_TIMEOUT:
-			return WF_BAD_TIMEOUT;
-		case WF_JSONRPC_BAD_FORMAT:
-			return WF_BAD_FORMAT;
-		default:
-			return (wf_status) code;
-	}
-}
-
 wf_status 
 wf_impl_jsonrpc_get_status(
 	json_t const * error)
@@ -40,8 +20,7 @@ wf_impl_jsonrpc_get_status(
 	wf_status status = WF_GOOD;
 	if (NULL != error)
 	{
-		int code = wf_impl_json_get_int(error, "code", WF_BAD_FORMAT);
-		status = wf_impl_jsonrc_code_to_status(code);
+		status = wf_impl_json_get_int(error, "code", WF_BAD_FORMAT);
 	}
 
 	return status;

lib/webfuse/core/jsonrpc/error.c

@@ -0,0 +1,27 @@
+#include "webfuse/core/jsonrpc/error.h"
+
+json_t *
+wf_jsonrpc_error(
+    int code,
+    char const * message)
+{
+    json_t * error = json_object();
+    json_object_set_new(error, "code", json_integer(code));
+    json_object_set_new(error, "message", json_string(message));
+
+    return error;
+}
+
+void
+wf_jsonrpc_propate_error(
+    wf_jsonrpc_proxy_finished_fn * finised,
+    void * user_data,
+    int code,
+    char const * message)
+{
+    json_t * error = wf_jsonrpc_error(code, message);
+    finised(user_data, NULL, error);
+
+    json_decref(error);
+}
+

lib/webfuse/core/jsonrpc/error.h

@@ -0,0 +1,29 @@
+#ifndef WF_JSONRPC_ERROR_H
+#define WF_JSONRPC_ERROR_H
+
+#include <jansson.h>
+#include "webfuse/core/jsonrpc/proxy_finished_fn.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern json_t *
+wf_jsonrpc_error(
+    int code,
+    char const * message);
+
+extern void
+wf_jsonrpc_propate_error(
+    wf_jsonrpc_proxy_finished_fn * finised,
+    void * user_data,
+    int code,
+    char const * message);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif

lib/webfuse/core/jsonrpc/method.c

@@ -0,0 +1,24 @@
+#include "webfuse/core/jsonrpc/method.h"
+#include <stdlib.h>
+#include <string.h>
+
+struct wf_jsonrpc_method * wf_jsonrpc_method_create(
+    char const * method_name,
+    wf_jsonrpc_method_invoke_fn * invoke,
+    void * user_data)
+{
+    struct wf_jsonrpc_method * method = malloc(sizeof(struct wf_jsonrpc_method));
+    method->next = NULL;
+    method->name = strdup(method_name);
+    method->invoke = invoke;
+    method->user_data = user_data;
+
+    return method;
+}
+
+void wf_jsonrpc_method_dispose(
+    struct wf_jsonrpc_method * method)
+{
+    free(method->name);
+    free(method);
+}

lib/webfuse/core/jsonrpc/method.h

@@ -0,0 +1,34 @@
+#ifndef WF_JSONRPC_METHOD_H
+#define WF_JSONRPC_METHOD_H
+
+#include "webfuse/core/jsonrpc/method_invoke_fn.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+struct wf_jsonrpc_method
+{
+    struct wf_jsonrpc_method * next;
+    char * name;
+    wf_jsonrpc_method_invoke_fn * invoke;
+    void * user_data;
+};
+
+extern struct wf_jsonrpc_method *
+wf_jsonrpc_method_create(
+    char const * method_name,
+    wf_jsonrpc_method_invoke_fn * invoke,
+    void * user_data);
+
+extern void
+wf_jsonrpc_method_dispose(
+    struct wf_jsonrpc_method * method);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif

lib/webfuse/core/jsonrpc/method_invoke_fn.h

@@ -0,0 +1,24 @@
+#ifndef WF_JSONRPC_METHOD_INVOKE_FN_H
+#define WF_JSONRPC_METHOD_INVOKE_FN_H
+
+#include <jansson.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+struct wf_jsonrpc_request;
+
+typedef void wf_jsonrpc_method_invoke_fn(
+    struct wf_jsonrpc_request * request,
+    char const * method_name,
+    json_t * params,
+    void * user_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif

lib/webfuse/core/jsonrpc/proxy.c

@@ -0,0 +1,224 @@
+#include "webfuse/core/jsonrpc/proxy_intern.h"
+#include "webfuse/core/jsonrpc/response_intern.h"
+#include "webfuse/core/jsonrpc/error.h"
+#include "webfuse/core/status.h"
+
+#include "webfuse/core/timer/timer.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+struct wf_jsonrpc_proxy *
+wf_jsonrpc_proxy_create(
+    struct wf_timer_manager * manager,
+    int timeout,
+    wf_jsonrpc_send_fn * send,
+    void * user_data)
+{
+    struct wf_jsonrpc_proxy * proxy = malloc(sizeof(struct wf_jsonrpc_proxy));
+    wf_jsonrpc_proxy_init(proxy, manager, timeout, send, user_data);
+
+    return proxy;
+}
+
+void wf_jsonrpc_proxy_dispose(
+    struct wf_jsonrpc_proxy * proxy)
+{
+    wf_jsonrpc_proxy_cleanup(proxy);
+    free(proxy);
+}
+
+static void wf_jsonrpc_proxy_on_timeout(
+    struct wf_timer * timer, void * proxy_ptr)
+{
+    struct wf_jsonrpc_proxy * proxy = proxy_ptr;
+
+    if (proxy->request.is_pending)
+    {
+        wf_jsonrpc_proxy_finished_fn * finished = proxy->request.finished;
+        void * user_data = proxy->request.user_data;
+
+        proxy->request.is_pending = false;
+        proxy->request.id = 0;
+        proxy->request.user_data = NULL;
+        proxy->request.finished = NULL;
+        wf_timer_cancel(timer);
+
+        wf_jsonrpc_propate_error(finished, user_data, WF_BAD_TIMEOUT, "Timeout");
+    }
+}
+
+static json_t * wf_jsonrpc_request_create(
+	char const * method,
+	int id,
+	char const * param_info,
+	va_list args)
+{
+	json_t * request = json_object();
+	json_object_set_new(request, "method", json_string(method));
+	json_t * params = json_array();
+	
+	for (char const * param_type = param_info; '\0' != *param_type; param_type++)
+	{
+		switch(*param_type)
+		{
+			case 's':
+			{
+				char const * const value = va_arg(args, char const *);
+				json_array_append_new(params, json_string(value));
+			}
+			break;
+			case 'i':
+			{
+				int const value = va_arg(args, int);
+				json_array_append_new(params, json_integer(value));
+			}
+			break;
+            case 'j':
+            {
+                json_t * const value = va_arg(args, json_t *);
+                json_array_append_new(params, value);
+            }
+            break;
+			default:
+			fprintf(stderr, "fatal: unknown param_type '%c'\n", *param_type);
+            json_decref(params);
+            json_decref(request);
+            return NULL;
+		}
+	}
+	
+
+	json_object_set_new(request, "params", params);
+	if (0 != id)
+	{
+		json_object_set_new(request, "id", json_integer(id));
+	}
+	
+	return request;
+}
+
+void wf_jsonrpc_proxy_init(
+    struct wf_jsonrpc_proxy * proxy,
+    struct wf_timer_manager * timeout_manager,
+    int timeout,
+    wf_jsonrpc_send_fn * send,
+    void * user_data)
+{
+    proxy->send = send;
+    proxy->timeout = timeout;
+    proxy->user_data = user_data;
+    proxy->request.is_pending = false;
+    proxy->request.timer = wf_timer_create(timeout_manager, 
+        &wf_jsonrpc_proxy_on_timeout, proxy);    
+}
+
+void wf_jsonrpc_proxy_cleanup(
+    struct wf_jsonrpc_proxy * proxy)
+{
+    if (proxy->request.is_pending)
+    {
+        void * user_data = proxy->request.user_data;
+        wf_jsonrpc_proxy_finished_fn * finished = proxy->request.finished;
+
+        proxy->request.is_pending = false;
+        proxy->request.finished = NULL;
+        proxy->request.user_data = NULL;
+        proxy->request.id = 0;
+        wf_timer_cancel(proxy->request.timer);
+
+        wf_jsonrpc_propate_error(finished, user_data, WF_BAD, "Bad: cancelled pending request during shutdown");
+    }
+
+    wf_timer_dispose(proxy->request.timer);
+}
+
+void wf_jsonrpc_proxy_invoke(
+	struct wf_jsonrpc_proxy * proxy,
+	wf_jsonrpc_proxy_finished_fn * finished,
+	void * user_data,
+	char const * method_name,
+	char const * param_info,
+	...
+)
+{
+    if (!proxy->request.is_pending)
+    {
+        proxy->request.is_pending = true;
+        proxy->request.finished = finished;
+        proxy->request.user_data = user_data;
+        proxy->request.id = 42;
+        wf_timer_start(proxy->request.timer, proxy->timeout);
+        
+        va_list args;
+        va_start(args, param_info);
+        json_t * request = wf_jsonrpc_request_create(method_name, proxy->request.id, param_info, args);
+        va_end(args);
+
+        bool const is_send = ((NULL != request) && (proxy->send(request, proxy->user_data)));
+        if (!is_send)
+        {
+            proxy->request.is_pending = false;
+            proxy->request.finished = NULL;
+            proxy->request.user_data = NULL;
+            proxy->request.id = 0;
+            wf_timer_cancel(proxy->request.timer);
+
+            wf_jsonrpc_propate_error(finished, user_data, WF_BAD, "Bad: requenst is not sent");
+        }
+
+        if (NULL != request)
+        {
+            json_decref(request);
+        }
+    }
+    else
+    {
+        wf_jsonrpc_propate_error(finished, user_data, WF_BAD_BUSY, "Busy");
+    }
+}
+
+extern void wf_jsonrpc_proxy_notify(
+	struct wf_jsonrpc_proxy * proxy,
+	char const * method_name,
+	char const * param_info,
+	...
+)
+{
+    va_list args;
+    va_start(args, param_info);      
+    json_t * request = wf_jsonrpc_request_create(method_name, 0, param_info, args);
+    va_end(args);
+
+    if (NULL != request)
+    {
+        proxy->send(request, proxy->user_data);
+        json_decref(request);
+    }
+}
+
+
+void wf_jsonrpc_proxy_onresult(
+    struct wf_jsonrpc_proxy * proxy,
+    json_t * message)
+{
+	struct wf_jsonrpc_response response;
+	wf_jsonrpc_response_init(&response, message);
+
+    if ((proxy->request.is_pending) && (response.id == proxy->request.id))
+    {
+        wf_jsonrpc_proxy_finished_fn * finished = proxy->request.finished;
+        void * user_data = proxy->request.user_data;
+
+        proxy->request.is_pending = false;
+        proxy->request.id = 0;
+        proxy->request.user_data = NULL;
+        proxy->request.finished = NULL;
+        wf_timer_cancel(proxy->request.timer);
+
+        finished(user_data, response.result, response.error);
+    }
+
+    wf_jsonrpc_response_cleanup(&response);
+}
+

lib/webfuse/core/jsonrpc/proxy.h

@@ -0,0 +1,74 @@
+#ifndef WF_JSONRPC_PROXY_H
+#define WF_JSONRPC_PROXY_H
+
+#ifndef __cplusplus
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdbool.h>
+#else
+#include <cstdarg>
+#include <cstddef>
+using std::size_t;
+#endif
+
+#include <jansson.h>
+#include "webfuse/core/jsonrpc/send_fn.h"
+#include "webfuse/core/jsonrpc/proxy_finished_fn.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct wf_jsonrpc_proxy;
+struct wf_timer_manager;
+
+extern struct wf_jsonrpc_proxy *
+wf_jsonrpc_proxy_create(
+    struct wf_timer_manager * manager,
+    int timeout,
+    wf_jsonrpc_send_fn * send,
+    void * user_data);
+
+extern void wf_jsonrpc_proxy_dispose(
+    struct wf_jsonrpc_proxy * proxy);
+
+//------------------------------------------------------------------------------
+/// \brief Invokes a method.
+///
+/// Creates a method an sends it using the send function.
+/// Proxy keeps track of method invokation. If no response is returned within
+/// timeout, an error is propagated.
+///
+/// \param proxy pointer to proxy instance
+/// \param finished function which is called exactly once, either on success or
+///                 on failure.
+/// \param method_name name of the method to invoke
+/// \param param_info types of the param (s = string, i = integer, j = json)
+/// \param ... params
+//------------------------------------------------------------------------------
+extern void wf_jsonrpc_proxy_invoke(
+	struct wf_jsonrpc_proxy * proxy,
+	wf_jsonrpc_proxy_finished_fn * finished,
+	void * user_data,
+	char const * method_name,
+	char const * param_info,
+	...
+);
+
+extern void wf_jsonrpc_proxy_notify(
+	struct wf_jsonrpc_proxy * proxy,
+	char const * method_name,
+	char const * param_info,
+	...
+);
+
+extern void wf_jsonrpc_proxy_onresult(
+    struct wf_jsonrpc_proxy * proxy,
+    json_t * message);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif

lib/webfuse/core/jsonrpc/proxy_finished_fn.h

@@ -0,0 +1,20 @@
+#ifndef WF_JSONRPC_PROXY_FINISHED_FN_H
+#define WF_JSONRPC_PROXY_FINISHED_FN_H
+
+#include <jansson.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+typedef void wf_jsonrpc_proxy_finished_fn(
+	void * user_data,
+	json_t const * result,
+    json_t const * error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

lib/webfuse/core/jsonrpc/proxy_intern.h

@@ -0,0 +1,48 @@
+#ifndef WF_JSONRPC_PROXY_INTERN_H
+#define WF_JSONRPC_PROXY_INTERN_H
+
+#include "webfuse/core/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/proxy_finished_fn.h"
+#include "webfuse/core/jsonrpc/send_fn.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+struct wf_timer;
+
+struct wf_jsonrpc_request
+{
+    bool is_pending;
+    wf_jsonrpc_proxy_finished_fn * finished;
+    void * user_data;
+    int id;
+    struct wf_timer * timer;
+};
+
+struct wf_jsonrpc_proxy
+{
+    struct wf_jsonrpc_request request;
+    int timeout;
+    wf_jsonrpc_send_fn * send;
+    void * user_data;
+};
+
+extern void 
+wf_jsonrpc_proxy_init(
+    struct wf_jsonrpc_proxy * proxy,
+    struct wf_timer_manager * manager,
+    int timeout,
+    wf_jsonrpc_send_fn * send,
+    void * user_data);
+
+extern void 
+wf_jsonrpc_proxy_cleanup(
+    struct wf_jsonrpc_proxy * proxy);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

lib/webfuse/core/jsonrpc/request.c

@@ -0,0 +1,81 @@
+#include "webfuse/core/jsonrpc/request.h"
+#include "webfuse/core/jsonrpc/error.h"
+#include <stdlib.h>
+
+struct wf_jsonrpc_request
+{
+    int id;
+    wf_jsonrpc_send_fn * send;
+    void * user_data;
+};
+
+bool
+wf_jsonrpc_is_request(
+    json_t * message)
+{
+    json_t * id = json_object_get(message, "id");
+    json_t * method = json_object_get(message, "method");
+    json_t * params = json_object_get(message, "params");
+
+    return (json_is_integer(id) && json_is_string(method) &&
+            (json_is_array(params) || json_is_object(params)));
+}
+
+
+struct wf_jsonrpc_request *
+wf_jsonrpc_request_create(
+    int id,
+    wf_jsonrpc_send_fn * send,
+    void * user_data)
+{
+    struct wf_jsonrpc_request * request = malloc(sizeof(struct wf_jsonrpc_request));
+    request->id = id;
+    request->send = send;
+    request->user_data = user_data;
+
+    return request;
+}
+
+void
+wf_jsonrpc_request_dispose(
+    struct wf_jsonrpc_request * request)
+{
+    free(request);
+}
+
+void *
+wf_jsonrpc_request_get_userdata(
+    struct wf_jsonrpc_request * request)
+{
+    return request->user_data;
+}
+
+
+void
+wf_jsonrpc_respond(
+    struct wf_jsonrpc_request * request,
+    json_t * result)
+{
+    json_t * response = json_object();
+    json_object_set_new(response, "result", result);
+    json_object_set_new(response, "id", json_integer(request->id));
+
+    request->send(response, request->user_data);
+    json_decref(response);
+    wf_jsonrpc_request_dispose(request);
+}
+
+void wf_jsonrpc_respond_error(
+    struct wf_jsonrpc_request * request,
+    int code,
+    char const * message)
+{
+    json_t * response = json_object();
+    json_object_set_new(response, "error", wf_jsonrpc_error(code, message));
+    json_object_set_new(response, "id", json_integer(request->id));
+
+    request->send(response, request->user_data);
+    json_decref(response);
+    wf_jsonrpc_request_dispose(request);
+}
+

lib/webfuse/core/jsonrpc/request.h

@@ -0,0 +1,53 @@
+#ifndef WF_JSONRPC_REQUEST_H
+#define WF_JSONRPC_REQUEST_H
+
+#ifndef __cplusplus
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdbool.h>
+#else
+#include <cstdarg>
+#include <cstddef>
+using std::size_t;
+#endif
+
+#include <jansson.h>
+#include "webfuse/core/jsonrpc/send_fn.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+struct wf_jsonrpc_request;
+
+extern bool wf_jsonrpc_is_request(
+    json_t * message);
+
+extern struct wf_jsonrpc_request *
+wf_jsonrpc_request_create(
+    int id,
+    wf_jsonrpc_send_fn * send,
+    void * user_data);
+
+extern void wf_jsonrpc_request_dispose(
+    struct wf_jsonrpc_request * request);
+
+extern void * wf_jsonrpc_request_get_userdata(
+    struct wf_jsonrpc_request * request);
+
+extern void wf_jsonrpc_respond(
+    struct wf_jsonrpc_request * request,
+    json_t * result);
+
+extern void wf_jsonrpc_respond_error(
+    struct wf_jsonrpc_request * request,
+    int code,
+    char const * message);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

lib/webfuse/core/jsonrpc/response.c

@@ -0,0 +1,68 @@
+#include "webfuse/core/jsonrpc/response_intern.h"
+#include "webfuse/core/jsonrpc/error.h"
+#include "webfuse/core/status.h"
+
+bool
+wf_jsonrpc_is_response(
+    json_t * message)
+{
+	json_t * id = json_object_get(message, "id");
+	json_t * err = json_object_get(message, "error");
+	json_t * result = json_object_get(message, "result");
+
+	return (json_is_integer(id) && 
+		(json_is_object(err) ||  (NULL != result)));
+}
+
+
+void
+wf_jsonrpc_response_init(
+	struct wf_jsonrpc_response * result,
+	json_t * response)
+{
+	result->id = -1;
+	result->result = NULL;
+	result->error = NULL;
+
+	json_t * id_holder = json_object_get(response, "id");
+	if (!json_is_integer(id_holder))
+	{
+		result->error = wf_jsonrpc_error(WF_BAD_FORMAT, "invalid format: missing id");
+		return;
+	}
+	
+	result->id = json_integer_value(id_holder);
+	result->result = json_object_get(response, "result");
+	if (NULL != result->result)
+	{
+		json_incref(result->result);
+	}
+	else
+	{
+		json_t * error = json_object_get(response, "error");
+		if ((json_is_object(error)) && (json_is_integer(json_object_get(error, "code"))))
+		{
+			result->error = error;
+			json_incref(result->error);
+		}
+		else
+		{
+			result->error = wf_jsonrpc_error(WF_BAD_FORMAT, "invalid format: invalid error object");
+		}
+	}
+}
+
+void
+wf_jsonrpc_response_cleanup(
+	struct wf_jsonrpc_response * response)
+{
+    if (NULL != response->result)
+    {
+        json_decref(response->result);
+    }
+
+    if (NULL != response->error)
+    {
+        json_decref(response->error);
+    }
+}

lib/webfuse/core/jsonrpc/response.h

@@ -0,0 +1,22 @@
+#ifndef WF_JSONRPC_RESPONSE_H
+#define WF_JSONRPC_RESPONSE_H
+
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+#include <jansson.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern bool wf_jsonrpc_is_response(
+    json_t * message);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

lib/webfuse/core/jsonrpc/response_intern.h

@@ -0,0 +1,36 @@
+#ifndef WF_JSONRPC_RESPONSE_INTERN_H
+#define WF_JSONRPC_RESPONSE_INTERN_H
+
+#include "webfuse/core/jsonrpc/response.h"
+
+#ifndef __cplusplus
+#include <stddef.h>
+#else
+#include <cstddef>
+using std::size_t;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct wf_jsonrpc_response
+{
+	json_t * result;	
+	json_t * error;
+	int id;
+};
+
+extern void wf_jsonrpc_response_init(
+	struct wf_jsonrpc_response * response,
+    json_t * message);
+
+extern void wf_jsonrpc_response_cleanup(
+	struct wf_jsonrpc_response * response);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

lib/webfuse/core/jsonrpc/send_fn.h

@@ -0,0 +1,23 @@
+#ifndef WF_JSONRPC_SEND_FN_H
+#define WF_JSONRPC_SEND_FN_H
+
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+#include <jansson.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+typedef bool wf_jsonrpc_send_fn(
+	json_t * request,
+    void * user_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

lib/webfuse/core/jsonrpc/server.c

@@ -0,0 +1,128 @@
+#include "webfuse/core/jsonrpc/server.h"
+#include "webfuse/core/jsonrpc/method.h"
+#include "webfuse/core/jsonrpc/request.h"
+#include "webfuse/core/status.h"
+#include "webfuse/core/util.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+struct wf_jsonrpc_server
+{
+    struct wf_jsonrpc_method * methods;
+};
+
+static void
+wf_jsonrpc_server_init(
+    struct wf_jsonrpc_server * server);
+
+static void
+wf_jsonrpc_server_cleanup(
+    struct wf_jsonrpc_server * server);
+
+struct wf_jsonrpc_server *
+wf_jsonrpc_server_create(void)
+{
+    struct wf_jsonrpc_server * server = malloc(sizeof(struct wf_jsonrpc_server));
+    wf_jsonrpc_server_init(server);
+
+    return server;
+}
+
+void
+wf_jsonrpc_server_dispose(
+    struct wf_jsonrpc_server * server)
+{
+    wf_jsonrpc_server_cleanup(server);
+    free(server);
+}
+
+static void wf_jsonrpc_server_init(
+    struct wf_jsonrpc_server * server)
+{
+    server->methods = NULL;
+}
+
+static void wf_jsonrpc_server_cleanup(
+    struct wf_jsonrpc_server * server)
+{
+    struct wf_jsonrpc_method * current = server->methods;
+    while (NULL != current)
+    {
+        struct wf_jsonrpc_method * next = current->next;
+        wf_jsonrpc_method_dispose(current);
+        current = next;
+    }
+    server->methods = NULL;
+}
+
+void wf_jsonrpc_server_add(
+    struct wf_jsonrpc_server * server,
+    char const * method_name,
+    wf_jsonrpc_method_invoke_fn * invoke,
+    void * user_data)
+{
+    struct wf_jsonrpc_method * method = wf_jsonrpc_method_create(method_name, invoke, user_data);
+    method->next = server->methods;
+    server->methods = method;
+}
+
+static void wf_jsonrpc_server_invalid_method_invoke(
+    struct wf_jsonrpc_request * request,
+    char const * WF_UNUSED_PARAM(method_name),
+    json_t * WF_UNUSED_PARAM(params),
+    void * WF_UNUSED_PARAM(user_data))
+{
+    wf_jsonrpc_respond_error(request, WF_BAD_NOTIMPLEMENTED, "not implemented");
+}
+
+static struct wf_jsonrpc_method const wf_jsonrpc_server_invalid_method = 
+{
+    .next = NULL,
+    .name = "<invalid>",
+    .invoke = &wf_jsonrpc_server_invalid_method_invoke,
+    .user_data = NULL    
+};
+
+static struct wf_jsonrpc_method const *
+wf_jsonrpc_server_get_method(
+    struct wf_jsonrpc_server * server,
+    char const * method_name)
+{
+    struct wf_jsonrpc_method const * current = server->methods;
+    while (NULL != current) 
+    {
+        if (0 == strcmp(method_name, current->name))
+        {
+            return current;
+        }
+
+        current = current->next;
+    }
+
+    return &wf_jsonrpc_server_invalid_method;
+}
+
+void wf_jsonrpc_server_process(
+    struct wf_jsonrpc_server * server,
+    json_t * request_data,
+    wf_jsonrpc_send_fn * send,
+    void * user_data)
+{
+    json_t * method_holder = json_object_get(request_data, "method");
+    json_t * params = json_object_get(request_data, "params");
+    json_t * id_holder = json_object_get(request_data, "id");
+
+    if (json_is_string(method_holder) &&
+        (json_is_array(params) || (json_is_object(params))) &&
+        json_is_integer(id_holder))
+    {
+        char const * method_name = json_string_value(method_holder);
+        int id = json_integer_value(id_holder);
+        struct wf_jsonrpc_request * request = wf_jsonrpc_request_create(id, send, user_data);
+        struct wf_jsonrpc_method const * method = wf_jsonrpc_server_get_method(server, method_name);
+
+        method->invoke(request, method_name, params, method->user_data);
+    }
+}
+

lib/webfuse/core/jsonrpc/server.h

@@ -0,0 +1,45 @@
+#ifndef WF_JSONRPC_SERVER_H
+#define WF_JSONRPC_SERVER_H
+
+#ifndef __cplusplus
+#include <stdarg.h>
+#include <stdbool.h>
+#else
+#include <cstdarg>
+#endif
+
+#include <jansson.h>
+#include "webfuse/core/jsonrpc/method_invoke_fn.h"
+#include "webfuse/core/jsonrpc/send_fn.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+struct wf_jsonrpc_server;
+
+extern struct wf_jsonrpc_server *
+wf_jsonrpc_server_create(void);
+
+extern void
+wf_jsonrpc_server_dispose(
+    struct wf_jsonrpc_server * server);
+
+extern void wf_jsonrpc_server_add(
+    struct wf_jsonrpc_server * server,
+    char const * method_name,
+    wf_jsonrpc_method_invoke_fn * invoke,
+    void * user_data);
+
+extern void wf_jsonrpc_server_process(
+    struct wf_jsonrpc_server * server,
+    json_t * request,
+    wf_jsonrpc_send_fn * send,
+    void * user_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

lib/webfuse/core/timer/manager.c

@@ -0,0 +1,93 @@
+#include "webfuse/core/timer/manager_intern.h"
+#include "webfuse/core/timer/timer_intern.h"
+#include "webfuse/core/timer/timepoint.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+
+struct wf_timer_manager
+{
+    struct wf_timer * timers;
+};
+
+struct wf_timer_manager *
+wf_timer_manager_create(void)
+{
+    struct wf_timer_manager * manager = malloc(sizeof(struct wf_timer_manager));
+    manager->timers = NULL;
+
+    return manager;
+}
+
+void
+wf_timer_manager_dispose(
+    struct wf_timer_manager * manager)
+{
+    struct wf_timer * timer = manager->timers;
+    while (NULL != timer)
+    {
+        struct wf_timer * next = timer->next;
+
+        wf_timer_trigger(timer);
+        timer = next;
+    }
+
+    free(manager);
+}
+
+
+void wf_timer_manager_check(
+    struct wf_timer_manager * manager)
+{
+    struct wf_timer * timer = manager->timers;
+    while (NULL != timer)
+    {
+        struct wf_timer * next = timer->next;
+
+        if (wf_timer_is_timeout(timer))
+        {
+            wf_timer_manager_removetimer(manager, timer);
+            wf_timer_trigger(timer);
+        }
+
+        timer = next;
+    }    
+}
+
+void wf_timer_manager_addtimer(
+    struct wf_timer_manager * manager,
+    struct wf_timer * timer)
+{
+    if (NULL != manager->timers)
+    {
+        manager->timers->prev = timer;
+    }
+
+    timer->next = manager->timers;
+    timer->prev = NULL;
+    manager->timers = timer;
+}
+
+void wf_timer_manager_removetimer(
+    struct wf_timer_manager * manager,
+    struct wf_timer * timer)
+{
+    struct wf_timer * prev = timer->prev;
+    struct wf_timer * next = timer->next;
+
+    if (NULL != prev)
+    {
+        prev->next = next;
+    }
+
+    if (NULL != next)
+    {
+        next->prev = prev;
+    }
+
+    if (manager->timers == timer)
+    {
+        manager->timers = next;
+    }
+}
+

lib/webfuse/core/timer/manager.h

@@ -0,0 +1,27 @@
+#ifndef WF_TIMER_MANAGER_H
+#define WF_TIMER_MANAGER_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+struct wf_timer_manager;
+
+extern struct wf_timer_manager * 
+wf_timer_manager_create(void);
+
+extern void
+wf_timer_manager_dispose(
+    struct wf_timer_manager * manager);
+
+extern void
+wf_timer_manager_check(
+    struct wf_timer_manager * manager);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif

lib/webfuse/core/timer/manager_intern.h

@@ -0,0 +1,26 @@
+#ifndef WF_TIMER_MANAGER_INTERN_H
+#define WF_TIMER_MANAGER_INTERN_H
+
+#include "webfuse/core/timer/manager.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+struct wf_timer;
+
+extern void wf_timer_manager_addtimer(
+    struct wf_timer_manager * manager,
+    struct wf_timer * timer);
+
+extern void wf_timer_manager_removetimer(
+    struct wf_timer_manager * manager,
+    struct wf_timer * timer);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif

lib/webfuse/core/timer/on_timer_fn.h

@@ -0,0 +1,19 @@
+#ifndef WF_TIMER_ON_TIMER_FN_H
+#define WF_TIMER_ON_TIMER_FN_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+struct wf_timer;
+
+typedef void wf_timer_on_timer_fn(
+    struct wf_timer * timer,
+    void * user_data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

lib/webfuse/core/timer/timepoint.c

@@ -0,0 +1,31 @@
+#include "webfuse/core/timer/timepoint.h"
+
+#include <time.h>
+
+#define WF_TIMER_MSEC_PER_SEC  ((wf_timer_timepoint) 1000) 
+#define WF_TIMER_NSEC_PER_MSEC ((wf_timer_timepoint) 1000 * 1000) 
+
+wf_timer_timepoint wf_timer_timepoint_now(void)
+{
+    struct timespec tp;
+    clock_gettime(CLOCK_MONOTONIC, &tp);
+
+    wf_timer_timepoint const now = (tp.tv_sec * WF_TIMER_MSEC_PER_SEC) + (tp.tv_nsec / WF_TIMER_NSEC_PER_MSEC);
+    return now;
+}
+
+wf_timer_timepoint wf_timer_timepoint_in_msec(wf_timer_timediff value)
+{
+    wf_timer_timepoint const now = wf_timer_timepoint_now();
+    wf_timer_timepoint result = now + ((wf_timer_timepoint) value);
+
+    return result;
+}
+
+bool wf_timer_timepoint_is_elapsed(wf_timer_timepoint tp)
+{
+    wf_timer_timepoint const now = wf_timer_timepoint_now();
+    wf_timer_timediff const  diff = (wf_timer_timediff) (tp - now);
+
+    return (0 > diff);
+}

lib/webfuse/core/timer/timepoint.h

@@ -0,0 +1,31 @@
+#ifndef WF_TIMER_TIMEPOINT_H
+#define WF_TIMER_TIMEPOINT_H
+
+#ifndef __cplusplus
+#include <stdbool.h>
+#include <inttypes.h>
+#else
+#include <cinttypes>
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+typedef uint64_t wf_timer_timepoint;
+typedef int64_t wf_timer_timediff;
+
+extern wf_timer_timepoint wf_timer_timepoint_now(void);
+
+extern wf_timer_timepoint wf_timer_timepoint_in_msec(
+    wf_timer_timediff value);
+
+extern bool wf_timer_timepoint_is_elapsed(
+    wf_timer_timepoint timepoint);
+
+#ifdef __cplusplus
+} 
+#endif
+
+#endif

lib/webfuse/core/timer/timer.c

@@ -0,0 +1,67 @@
+#include "webfuse/core/timer/timer_intern.h"
+#include "webfuse/core/timer/manager_intern.h"
+#include "webfuse/core/timer/timepoint.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+struct wf_timer *
+wf_timer_create(
+    struct wf_timer_manager * manager,
+    wf_timer_on_timer_fn * on_timer,
+    void * user_data)
+{
+    struct wf_timer * timer = malloc(sizeof(struct wf_timer));
+    timer->manager = manager;
+    timer->timeout = 0;
+    timer->on_timer = on_timer;
+    timer->user_data = user_data;
+    timer->prev = NULL;
+    timer->next = NULL;
+
+    return timer;
+}
+
+void
+wf_timer_dispose(
+    struct wf_timer * timer)
+{
+    free(timer);
+}
+
+void wf_timer_start(
+    struct wf_timer * timer,
+    int timeout_ms)
+{
+    timer->timeout = wf_timer_timepoint_in_msec(timeout_ms);
+
+    wf_timer_manager_addtimer(timer->manager, timer);
+}
+
+void wf_timer_cancel(
+    struct wf_timer * timer)
+{
+    wf_timer_manager_removetimer(timer->manager, timer);
+
+    timer->timeout = 0;
+}
+
+bool wf_timer_is_timeout(
+    struct wf_timer * timer)
+{
+    return wf_timer_timepoint_is_elapsed(timer->timeout);
+}
+
+
+void wf_timer_trigger(
+    struct wf_timer * timer)
+{
+    if (0 != timer->on_timer)
+    {
+        timer->prev = NULL;
+        timer->next = NULL;
+
+        timer->on_timer(timer, timer->user_data);
+    }
+}

lib/webfuse/core/timer/timer.h

@@ -0,0 +1,37 @@
+#ifndef WF_TIMER_TIMER_H
+#define WF_TIMER_TIMER_H
+
+#include "webfuse/core/timer/on_timer_fn.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+struct wf_timer;
+struct wf_timer_manager;
+
+extern struct wf_timer *
+wf_timer_create(
+    struct wf_timer_manager * manager,
+    wf_timer_on_timer_fn * on_timer,
+    void * user_data);
+
+extern void
+wf_timer_dispose(
+    struct wf_timer * timer);
+
+extern void
+wf_timer_start(
+    struct wf_timer * timer,
+    int timeout_ms);
+
+extern void
+wf_timer_cancel(
+    struct wf_timer * timer);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

lib/webfuse/core/timer/timer_intern.h

@@ -0,0 +1,40 @@
+#ifndef WF_TIMER_TIMER_H
+#define WF_TIMER_TIMER_H
+
+#include "webfuse/core/timer/timer.h"
+#include "webfuse/core/timer/on_timer_fn.h"
+#include "webfuse/core/timer/timepoint.h"
+
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+struct wf_timer
+{
+    struct wf_timer_manager * manager;
+    wf_timer_timepoint timeout;
+    wf_timer_on_timer_fn * on_timer;
+    void * user_data;
+    struct wf_timer * next;
+    struct wf_timer * prev;
+};
+
+extern bool wf_timer_is_timeout(
+    struct wf_timer * timer);
+
+extern void wf_timer_trigger(
+    struct wf_timer * timer);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#endif

lib/webfuse/provider/impl/client_protocol.c

@@ -16,11 +16,11 @@
 #include "webfuse/provider/impl/url.h"
 #include "webfuse/core/protocol_names.h"
 
-#include "wf/timer/manager.h"
+#include "webfuse/core/timer/manager.h"
 
-#include "wf/jsonrpc/response.h"
-#include "wf/jsonrpc/request.h"
-#include "wf/jsonrpc/proxy.h"
+#include "webfuse/core/jsonrpc/response.h"
+#include "webfuse/core/jsonrpc/request.h"
+#include "webfuse/core/jsonrpc/proxy.h"
 
 #define WF_DEFAULT_TIMEOUT (10 * 1000)