agoo 2.5.4 → 2.5.5

data/ext/agoo/graphql.h

@@ -0,0 +1,198 @@
+// Copyright (c) 2018, Peter Ohler, All rights reserved.
+
+#ifndef AGOO_GRAPHQL_H
+#define AGOO_GRAPHQL_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "err.h"
+#include "text.h"
+
+typedef enum {
+    GQL_OBJECT		= (int8_t)1,
+    GQL_FRAG		= (int8_t)2,
+    GQL_INPUT		= (int8_t)3,
+    GQL_UNION		= (int8_t)4,
+    GQL_INTERFACE	= (int8_t)5,
+    GQL_ENUM		= (int8_t)6,
+    GQL_SCALAR		= (int8_t)7,
+    // LIST
+    // NON_NULL
+} gqlKind;
+
+struct _gqlType;
+struct _gqlValue;
+struct _gqlLink;
+struct _gqlField;
+struct _Req;
+struct _gqlDirUse;
+struct _gqlLink;
+
+// Used for references to implemenation entities.
+typedef void*	gqlRef;
+typedef struct _gqlQuery {
+    struct _gqlQuery	*next;
+    struct _gqlValue	*result;
+    struct _gqlDirUse	*dir;
+    // TBD data about a query, mutation, or subscription
+} *gqlQuery;
+
+typedef struct _gqlKeyVal {
+    const char		*key;
+    struct _gqlValue	*value;
+} *gqlKeyVal;
+
+typedef struct _gqlStrLink {
+    struct _gqlStrLink	*next;
+    char		*str;
+} *gqlStrLink;
+
+typedef struct _gqlTypeLink {
+    struct _gqlTypeLink	*next;
+    char		*name;
+    struct _gqlType	*type;
+} *gqlTypeLink;
+
+// Resolve field on a target to a child reference.
+typedef gqlRef			(*gqlResolveFunc)(gqlRef target, const char *fieldName, gqlKeyVal *args);
+
+// Coerce an implemenation reference into a gqlValue.
+typedef struct _gqlValue*	(*gqlCoerceFunc)(gqlRef ref, struct _gqlType *type);
+
+typedef void			(*gqlIterCb)(gqlRef ref, gqlQuery query);
+typedef void			(*gqlIterateFunc)(gqlRef ref, gqlIterCb cb, gqlQuery query);
+
+typedef struct _gqlArg {
+    struct _gqlArg	*next;
+    const char		*name;
+    const char		*desc;
+    const char		*type_name;
+    struct _gqlType	*type;
+    struct _gqlValue	*default_value;
+    struct _gqlDirUse	*dir;
+    bool		required;
+} *gqlArg;
+
+typedef struct _gqlField {
+    struct _gqlField	*next;
+    const char		*name;
+    struct _gqlType	*type; // return type
+    const char		*desc;
+    const char		*reason; // deprecationReason
+    gqlArg		args;
+    struct _gqlDirUse	*dir;
+    gqlResolveFunc	resolve;
+    bool		required;
+    bool		list;
+    bool		not_empty; // list can not be empty, member is required
+    bool		deprecated;
+} *gqlField;
+
+typedef struct _gqlDir {
+    struct _gqlDir	*next;
+    const char		*name;
+    const char		*desc;
+    gqlArg		args;
+    gqlStrLink		locs; // location names
+    bool		locked;
+} *gqlDir;
+
+typedef struct _gqlDirUse {
+    gqlDir		dir;
+    struct _gqlLink	*args;
+} *gqlDirUse;
+
+typedef struct _gqlType {
+    const char	*name;
+    const char	*desc;
+    Text	(*to_json)(Text text, struct _gqlValue *value, int indent, int depth);
+    gqlDirUse	dir;
+    gqlKind	kind;
+    bool	locked; // set by app
+    bool	core;
+    union {
+	struct { // Objects, Fragments, interfaces, and input_objects
+	    gqlField		fields;
+	    union {
+		struct _gqlType	**interfaces; // Objects, null terminated array if not NULL.
+		struct _gqlType	*on;          // Fragment
+	    };
+	};
+	gqlTypeLink		types;	      // Union
+	gqlStrLink		choices;      // Enums
+	// Returns error code. Only for scalars.
+	struct {
+	    int			(*coerce)(Err err, struct _gqlValue *src, struct _gqlType *type);
+	    void		(*destroy)(struct _gqlValue *value);
+	};
+    };
+} *gqlType;
+
+extern int	gql_init(Err err);
+extern void	gql_destroy(); // clear out all
+
+extern gqlType	gql_type_create(Err err, const char *name, const char *desc, int dlen, bool locked, gqlType *interfaces);
+extern gqlType	gql_fragment_create(Err err, const char *name, const char *desc, int dlen, bool locked, gqlType on);
+extern gqlType	gql_input_create(Err err, const char *name, const char *desc, int dlen, bool locked);
+extern gqlType	gql_interface_create(Err err, const char *name, const char *desc, int dlen, bool locked);
+
+extern gqlField	gql_type_field(Err		err,
+			       gqlType		type,
+			       const char	*name,
+			       gqlType		return_type,
+			       const char	*desc,
+			       bool 		required,
+			       bool 		list,
+			       bool 		not_empty,
+			       gqlResolveFunc	resolve);
+
+extern gqlArg	gql_field_arg(Err 		err,
+			      gqlField 		field,
+			      const char 	*name,
+			      gqlType 		type,
+			      const char 	*desc,
+			      struct _gqlValue	*def_value,
+			      bool 		required);
+
+// TBD maybe create then add fields
+// TBD same with op? create then add args
+
+extern gqlType	gql_scalar_create(Err err, const char *name, const char *desc, int dlen, bool locked);
+
+extern gqlDir	gql_directive_create(Err err, const char *name, const char *desc, int dlen, bool locked);
+extern int	gql_directive_on(Err err, gqlDir d, const char *on, int len);
+extern gqlArg	gql_dir_arg(Err 		err,
+			    gqlDir 		dir,
+			    const char 		*name,
+			    const char 		*type_name,
+			    const char	 	*desc,
+			    int			dlen,
+			    struct _gqlValue	*def_value,
+			    bool 		required);
+extern gqlDir	gql_directive_get(const char *name);
+
+extern gqlType	gql_union_create(Err err, const char *name, const char *desc, int dlen, bool locked);
+extern int	gql_union_add(Err err, gqlType type, const char *name, int len);
+
+extern gqlType	gql_enum_create(Err err, const char *name, const char *desc, int dlen, bool locked);
+extern int	gql_enum_add(Err err, gqlType type, const char *value, int len);
+extern int	gql_enum_append(Err err, gqlType type, const char *value, int len);
+
+extern int	gql_type_set(Err err, gqlType type);
+extern gqlType	gql_type_get(const char *name);
+extern void	gql_type_destroy(gqlType type);
+
+extern Text	gql_type_sdl(Text text, gqlType type, bool comments);
+extern Text	gql_directive_sdl(Text text, gqlDir dir, bool comments);
+extern Text	gql_schema_sdl(Text text, bool with_desc, bool all);
+
+extern Text	gql_object_to_json(Text text, struct _gqlValue *value, int indent, int depth);
+extern Text	gql_object_to_graphql(Text text, struct _gqlValue *value, int indent, int depth);
+extern Text	gql_union_to_text(Text text, struct _gqlValue *value, int indent, int depth);
+extern Text	gql_enum_to_text(Text text, struct _gqlValue *value, int indent, int depth);
+
+extern void	gql_dump_hook(struct _Req *req);
+extern void	gql_eval_hook(struct _Req *req);
+
+#endif // AGOO_GRAPHQL_H

data/ext/agoo/hook.c

@@ -30,6 +30,7 @@ hook_create(Method method, const char *pattern, void *handler, HookType type, Qu
 	hook->handler = handler;
 	hook->type = type;
 	hook->queue = q;
+	hook->no_queue = false;
     }
     return hook;
 }
@@ -57,6 +58,7 @@ hook_func_create(Method method, const char *pattern, void (*func)(Req req), Queu
 	hook->func = func;
 	hook->type = FUNC_HOOK;
 	hook->queue = q;
+	hook->no_queue = false;
     }
     return hook;
 }

data/ext/agoo/hook.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
-#ifndef __AGOO_HOOK_H__
-#define __AGOO_HOOK_H__
+#ifndef AGOO_HOOK_H
+#define AGOO_HOOK_H
 
 #include <stdbool.h>
 
@@ -31,6 +31,7 @@ typedef struct _Hook {
 	void		(*func)(struct _Req *req);
     };
     Queue		queue;
+    bool		no_queue;
 } *Hook;
 
 extern Hook	hook_create(Method method, const char *pattern, void *handler, HookType type, Queue q);
@@ -40,4 +41,4 @@ extern void	hook_destroy(Hook hook);
 extern bool	hook_match(Hook hook, Method method, const Seg seg);
 extern Hook	hook_find(Hook hook, Method method, const Seg seg);
 
-#endif // __AGOO_HOOK_H__
+#endif // AGOO_HOOK_H

data/ext/agoo/http.c

@@ -494,8 +494,9 @@ http_cleanup() {
     Slot	*sp = key_cache.buckets;
     Slot	s;
     Slot	n;
+    int		i;
 
-    for (int i = BUCKET_SIZE; 0 < i; i--, sp++) {
+    for (i = BUCKET_SIZE; 0 < i; i--, sp++) {
 	for (s = *sp; NULL != s; s = n) {
 	    n = s->next;
 	    DEBUG_FREE(mem_http_slot, s)

data/ext/agoo/http.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
-#ifndef __AGOO_HTTP_H__
-#define __AGOO_HTTP_H__
+#ifndef AGOO_HTTP_H
+#define AGOO_HTTP_H
 
 #include <stdbool.h>
 
@@ -14,4 +14,4 @@ extern int		http_header_ok(Err err, const char *key, int klen, const char *value
 
 extern const char*	http_code_message(int code);
 
-#endif // __AGOO_HTTP_H__
+#endif // AGOO_HTTP_H

data/ext/agoo/kinds.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
-#ifndef __AGOO_KINDS_H__
-#define __AGOO_KINDS_H__
+#ifndef AGOO_KINDS_H
+#define AGOO_KINDS_H
 
 typedef enum {
     CON_ANY	= '\0',
@@ -10,4 +10,4 @@ typedef enum {
     CON_SSE	= 'S',
 } ConKind;
 
-#endif // __AGOO_KINDS_H__
+#endif // AGOO_KINDS_H

data/ext/agoo/log.h

@@ -1,7 +1,7 @@
 // Copyright 2018 by Peter Ohler, All Rights Reserved
 
-#ifndef __AGOO_LOG_H__
-#define __AGOO_LOG_H__
+#ifndef AGOO_LOG_H
+#define AGOO_LOG_H
 
 #include <pthread.h>
 #include <stdarg.h>
@@ -125,4 +125,4 @@ extern void	log_start(bool with_pid);
 
 extern Color	find_color(const char *name);
 
-#endif /* __AGOO_LOG_H__ */
+#endif /* AGOO_LOG_H */

data/ext/agoo/log_queue.h

@@ -1,7 +1,7 @@
 // Copyright 2018 by Peter Ohler, All Rights Reserved
 
-#ifndef __AGOO_LOG_QUEUE_H__
-#define __AGOO_LOG_QUEUE_H__
+#ifndef AGOO_LOG_QUEUE_H
+#define AGOO_LOG_QUEUE_H
 
 #include <stdatomic.h>
 #include <stdbool.h>
@@ -27,4 +27,4 @@ extern opoMsg	queue_pop(Queue q, double timeout);
 extern bool	queue_empty(Queue q);
 extern int	queue_count(Queue q);
 
-#endif /* __AGOO_LOG_QUEUE_H__ */
+#endif /* AGOO_LOG_QUEUE_H */

data/ext/agoo/method.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
-#ifndef __AGOO_METHOD_H__
-#define __AGOO_METHOD_H__
+#ifndef AGOO_METHOD_H
+#define AGOO_METHOD_H
 
 typedef enum {
     CONNECT	= 'C',
@@ -23,4 +23,4 @@ typedef enum {
     ON_ERROR	= 'F', // use for on_error callback
 } Method;
 
-#endif // __AGOO_METHOD_H__
+#endif // AGOO_METHOD_H

data/ext/agoo/page.h

@@ -1,7 +1,7 @@
 // Copyright 2016, 2018 by Peter Ohler, All Rights Reserved
 
-#ifndef __AGOO_PAGE_H__
-#define __AGOO_PAGE_H__
+#ifndef AGOO_PAGE_H
+#define AGOO_PAGE_H
 
 #include <stdint.h>
 #include <time.h>
@@ -43,4 +43,4 @@ extern Page	page_immutable(Err err, const char *path, const char *content, int c
 extern Page	page_get(Err err, const char *path, int plen);
 extern int	mime_set(Err err, const char *key, const char *value);
 
-#endif /* __AGOO_PAGE_H__ */
+#endif /* AGOO_PAGE_H */

data/ext/agoo/pub.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
-#ifndef __AGOO_PUB_H__
-#define __AGOO_PUB_H__
+#ifndef AGOO_PUB_H
+#define AGOO_PUB_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -37,4 +37,4 @@ extern Pub	pub_write(struct _Upgraded *up, const char *message, size_t mlen, boo
 extern Pub	pub_dup(Pub src);
 extern void	pub_destroy(Pub pub);
 
-#endif // __AGOO_PUB_H__
+#endif // AGOO_PUB_H

data/ext/agoo/queue.h

@@ -1,7 +1,7 @@
 // Copyright 2015, 2016, 2018 by Peter Ohler, All Rights Reserved
 
-#ifndef __AGOO_QUEUE_H__
-#define __AGOO_QUEUE_H__
+#ifndef AGOO_QUEUE_H
+#define AGOO_QUEUE_H
 
 #include <stdatomic.h>
 #include <stdbool.h>
@@ -37,4 +37,4 @@ extern int	queue_count(Queue q);
 
 extern void	queue_wakeup(Queue q);
 
-#endif /* __AGOO_QUEUE_H__ */
+#endif /* AGOO_QUEUE_H */

data/ext/agoo/rack_logger.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
-#ifndef __AGOO_RACK_LOGGER_H__
-#define __AGOO_RACK_LOGGER_H__
+#ifndef AGOO_RACK_LOGGER_H
+#define AGOO_RACK_LOGGER_H
 
 #include <ruby.h>
 
@@ -10,4 +10,4 @@
 extern void	rack_logger_init(VALUE mod);
 extern VALUE	rack_logger_new();
 
-#endif // __AGOO_RACK_LOGGER_H__
+#endif // AGOO_RACK_LOGGER_H

data/ext/agoo/req.c

@@ -81,11 +81,11 @@ req_query_value(Req r, const char *key, int klen, int *vlenp) {
 	char	*end;
 
 	if (0 >= klen) {
-	    klen = strlen(key);
+	    klen = (int)strlen(key);
 	}
 	value += klen + 1;
 	if (NULL == (end = index(value, '&'))) {
-	    *vlenp = strlen(value);
+	    *vlenp = (int)strlen(value);
 	} else {
 	    *vlenp = (int)(end - value);
 	}

data/ext/agoo/req.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
-#ifndef __AGOO_REQ_H__
-#define __AGOO_REQ_H__
+#ifndef AGOO_REQ_H
+#define AGOO_REQ_H
 
 #include <stdint.h>
 
@@ -45,4 +45,4 @@ extern const char*	req_host(Req r, int *lenp);
 extern int		req_port(Req r);
 extern const char*	req_query_value(Req r, const char *key, int klen, int *vlenp);
 
-#endif // __AGOO_REQ_H__
+#endif // AGOO_REQ_H

data/ext/agoo/request.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
-#ifndef __AGOO_REQUEST_H__
-#define __AGOO_REQUEST_H__
+#ifndef AGOO_REQUEST_H
+#define AGOO_REQUEST_H
 
 #include <stdint.h>
 
@@ -13,4 +13,4 @@ extern void	request_init(VALUE mod);
 extern VALUE	request_wrap(Req req);
 extern VALUE	request_env(Req req, VALUE self);
 
-#endif // __AGOO_REQUEST_H__
+#endif // AGOO_REQUEST_H

data/ext/agoo/res.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
-#ifndef __AGOO_RES_H__
-#define __AGOO_RES_H__
+#ifndef AGOO_RES_H
+#define AGOO_RES_H
 
 #include <stdatomic.h>
 #include <stdbool.h>
@@ -30,4 +30,4 @@ res_message(Res res) {
     return atomic_load(&res->message);
 }
 
-#endif // __AGOO_RES_H__
+#endif // AGOO_RES_H