agoo 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a78c4278726e4fc90aad77fa83029fdfa2cbdf84d72796947ae5c22d30165e1
-  data.tar.gz: 8a3eb7eca852c6811270b7a6697a94184675e231f88f7c35848431b8495c166b
+  metadata.gz: e5771b6b916b39b35a7ddb198b3c80191b69cfd0f0d8d8fd792d1a1b90cc741c
+  data.tar.gz: 2503a29f723db8fa63b0a3bb6f64879046f4f31b2d15c594d4e22e5c2d745e44
 SHA512:
-  metadata.gz: bc450f5bd00d4f256ddd31ccd29ad0075093403e41ff9d1bde7f3924796a32600ac9b6032452989f56b84303b44ee4f5663adce6d09eb3908cc2eef38b337f5e
-  data.tar.gz: a66662a930ec96e99ac91a15981add0ea63a484df8d0e488e6915e2f4ca7c55cb939c5775f0619e64dea87f2a9b2fdd6d311bcc31338d72693bc230c45b8fbdc
+  metadata.gz: 0deeaf2727b3c729229420953662854de902e8a173d7a0ccabbe9e42ea2d2d269c66275520e8950c73f4ef7a758b271456f753695aea0bc8492cf1fbb66fbde9
+  data.tar.gz: 4fe4ce7b04976e446f9f0f3c051e360041c70d6a65d2d6bb1f5ab30c9cec1955326ead8caed0a66bd5f403ada280d61c645eca3509e5568c73940a034258d51a

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+### 2.8.0 - 2019-02-19
+
+Extend GraphQL
+
+- Add support for the Graphql `extend` functionality.
+
+- Add the ID base scalar type.
+
+- Use `schema` SDL element instead of `type schema`.
+
 ### 2.7.0 - 2019-01-29
 
 Static asset header rules functionality added.

data/ext/agoo/agoo.c

@@ -1,10 +1,13 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
+#include <errno.h>
 #include <signal.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <ruby.h>
 
+#include "atomic.h"
 #include "debug.h"
 #include "error_stream.h"
 #include "graphql.h"
@@ -21,10 +24,19 @@
 
 extern void	graphql_init(VALUE mod);
 
+sig_atomic_t		agoo_stop = 0;
+
+static atomic_int	shutdown_started = AGOO_ATOMIC_INT_INIT(0);
+
 void
 agoo_shutdown() {
-    rserver_shutdown(Qnil);
-    agoo_log_close();
+    if (0 == atomic_fetch_add(&shutdown_started, 1)) {
+	rserver_shutdown(Qnil);
+	agoo_log_close();
+	gql_destroy();
+	debug_report();
+	exit(0);
+    }
 }
 
 /* Document-method: shutdown
@@ -36,8 +48,6 @@ agoo_shutdown() {
 static VALUE
 ragoo_shutdown(VALUE self) {
     agoo_shutdown();
-    gql_destroy();
-    debug_report();
 
     return Qnil;
 }
@@ -79,15 +89,7 @@ ragoo_unsubscribe(VALUE self, VALUE subject) {
 
 static void
 sig_handler(int sig) {
-#ifdef MEM_DEBUG
-    rb_gc();
-#endif
-    agoo_shutdown();
-    gql_destroy();
-    debug_report();
-    // Use exit instead of rb_exit as rb_exit segfaults most of the time.
-    //rb_exit(0);
-    exit(0);
+    agoo_stop = 1;
 }
 
 /* Document-module: Agoo
@@ -112,12 +114,15 @@ Init_agoo() {
     rb_define_module_function(mod, "publish", ragoo_publish, 2);
     rb_define_module_function(mod, "unsubscribe", ragoo_unsubscribe, 1);
 
-    signal(SIGINT, sig_handler);
-    signal(SIGTERM, sig_handler);
-    signal(SIGPIPE, SIG_IGN);
+    if (SIG_ERR == signal(SIGINT, sig_handler) ||
+	SIG_ERR == signal(SIGTERM, sig_handler) ||
+	SIG_ERR == signal(SIGPIPE, SIG_IGN) ||
+
+	// This causes sleeps and queue pops to return immediately and it can be
+	// called very frequently on mac OS with multiple threads. Something seems
+	// to get stuck.
+	SIG_ERR == signal(SIGVTALRM, SIG_IGN)) {
 
-    // This causes sleeps and queue pops to return immediately and is can be
-    // called all the time on mac OS with multiple threads. Something seems to
-    // get stuck.
-    signal(SIGVTALRM, SIG_IGN);
+	rb_raise(rb_eStandardError, "%s", strerror(errno));
+    }
 }

data/ext/agoo/con.c

@@ -88,7 +88,7 @@ agoo_con_destroy(agooCon c) {
     }
     if (NULL != c->up) {
 	agoo_upgraded_release_con(c->up);
-	
+
 	c->up = NULL;
     }
     agoo_log_cat(&agoo_con_cat, "Connection %llu closed.", (unsigned long long)c->id);
@@ -108,7 +108,7 @@ agoo_con_header_value(const char *header, int hlen, const char *key, int *vlen)
     const char	*hend = header + hlen;
     const char	*value;
     int		klen = (int)strlen(key);
-    
+
     while (h < hend) {
 	if (0 == strncmp(key, h, klen) && ':' == h[klen]) {
 	    h += klen + 1;
@@ -118,7 +118,7 @@ agoo_con_header_value(const char *header, int hlen, const char *key, int *vlen)
 	    for (; '\r' != *h && '\0' != *h; h++) {
 	    }
 	    *vlen = (int)(h - value);
- 
+
 	    return value;
 	}
 	for (; h < hend; h++) {
@@ -135,7 +135,7 @@ static HeadReturn
 bad_request(agooCon c, int status, int line) {
     agooRes	res;
     const char *msg = agoo_http_code_message(status);
-    
+
     if (NULL == (res = agoo_res_create(c))) {
 	agoo_log_cat(&agoo_error_cat, "memory allocation of response failed on connection %llu @ %d.",
 		     (unsigned long long)c->id, line);
@@ -144,7 +144,7 @@ bad_request(agooCon c, int status, int line) {
 	int		cnt = snprintf(buf, sizeof(buf),
 				       "HTTP/1.1 %d %s\r\nConnection: Close\r\nContent-Length: 0\r\n\r\n", status, msg);
 	agooText	message = agoo_text_create(buf, cnt);
-	
+
 	if (NULL == c->res_tail) {
 	    c->res_head = res;
 	} else {
@@ -161,7 +161,7 @@ static bool
 should_close(const char *header, int hlen) {
     const char	*v;
     int		vlen = 0;
-    
+
     if (NULL != (v = agoo_con_header_value(header, hlen, "Connection", &vlen))) {
 	return (5 == vlen && 0 == strncasecmp("Close", v, 5));
     }
@@ -172,7 +172,7 @@ static bool
 page_response(agooCon c, agooPage p, char *hend) {
     agooRes 	res;
     char	*b;
-    
+
     if (NULL == (res = agoo_res_create(c))) {
 	return true;
     }
@@ -253,7 +253,7 @@ agoo_con_header_read(agooCon c, size_t *mlenp) {
 	const char	*v;
 	int		vlen = 0;
 	char		*vend;
-	
+
 	if (3 == b - c->buf && 0 == strncmp("PUT", c->buf, 3)) {
 	    method = AGOO_PUT;
 	} else if (4 == b - c->buf && 0 == strncmp("POST", c->buf, 4)) {
@@ -345,7 +345,7 @@ agoo_con_header_read(agooCon c, size_t *mlenp) {
 		    return bad_request(c, 500, __LINE__);
 		}
 		return HEAD_HANDLED;
-	    }	    
+	    }
 	    if (NULL == agoo_server.hook404) {
 		return bad_request(c, 404, __LINE__);
 	    }
@@ -445,7 +445,7 @@ agoo_con_http_read(agooCon c) {
 
 	    switch (agoo_con_header_read(c, &mlen)) {
 	    case HEAD_AGAIN:
-		// Try again the next time. Didn't read enough.. 
+		// Try again the next time. Didn't read enough..
 		return false;
 	    case HEAD_OK:
 		// req was created
@@ -528,7 +528,7 @@ con_ws_read(agooCon c) {
     ssize_t	cnt;
     uint8_t	*b;
     uint8_t	op;
-    long	mlen;	
+    long	mlen;
 
     if (NULL != c->req) {
 	cnt = recv(c->sock, c->req->msg + c->bcnt, c->req->mlen - c->bcnt, 0);
@@ -667,7 +667,7 @@ agoo_con_http_write(agooCon c) {
     if (c->wcnt == message->len) { // finished
 	agooRes	res = c->res_head;
 	bool	done = res->close;
-	
+
 	c->res_head = res->next;
 	if (res == c->res_tail) {
 	    c->res_tail = NULL;
@@ -700,11 +700,11 @@ con_ws_write(agooCon c) {
 		}
 		len = snprintf(msg, sizeof(msg) - 1, "Socket error @ %llu.", (unsigned long long)c->id);
 		push_error(c->up, msg, len);
-		
+
 		agoo_log_cat(&agoo_error_cat, "Socket error @ %llu.", (unsigned long long)c->id);
 		agoo_ws_req_close(c);
 		agoo_res_destroy(res);
-	
+
 		return false;
 	    }
 	} else if (res->pong) {
@@ -720,7 +720,7 @@ con_ws_write(agooCon c) {
 		agoo_log_cat(&agoo_error_cat, "Socket error @ %llu.", (unsigned long long)c->id);
 		agoo_ws_req_close(c);
 		agoo_res_destroy(res);
-	
+
 		return false;
 	    }
 	} else {
@@ -742,7 +742,7 @@ con_ws_write(agooCon c) {
     c->timeout = dtime() + CON_TIMEOUT;
     if (0 == c->wcnt) {
 	agooText	t;
-	
+
 	if (agoo_push_cat.on) {
 	    if (message->bin) {
 		agoo_log_cat(&agoo_push_cat, "%llu binary", (unsigned long long)c->id);
@@ -767,14 +767,14 @@ con_ws_write(agooCon c) {
 	push_error(c->up, msg, len);
 	agoo_log_cat(&agoo_error_cat, "Socket error @ %llu.", (unsigned long long)c->id);
 	agoo_ws_req_close(c);
-	
+
 	return false;
     }
     c->wcnt += cnt;
     if (c->wcnt == message->len) { // finished
 	agooRes	res = c->res_head;
 	bool	done = res->close;
-	
+
 	c->res_head = res->next;
 	if (res == c->res_tail) {
 	    c->res_tail = NULL;
@@ -801,7 +801,7 @@ con_sse_write(agooCon c) {
     c->timeout = dtime() + CON_TIMEOUT *2;
     if (0 == c->wcnt) {
 	agooText	t;
-	
+
 	if (agoo_push_cat.on) {
 	    agoo_log_cat(&agoo_push_cat, "%llu: %s %p", (unsigned long long)c->id, message->text, (void*)res);
 	}
@@ -821,14 +821,14 @@ con_sse_write(agooCon c) {
 	len = snprintf(msg, sizeof(msg) - 1, "Socket error @ %llu.", (unsigned long long)c->id);
 	push_error(c->up, msg, len);
 	agoo_log_cat(&agoo_error_cat, "Socket error @ %llu.", (unsigned long long)c->id);
-	
+
 	return false;
     }
     c->wcnt += cnt;
     if (c->wcnt == message->len) { // finished
 	agooRes	res = c->res_head;
 	bool	done = res->close;
-	
+
 	c->res_head = res->next;
 	if (res == c->res_tail) {
 	    c->res_tail = NULL;
@@ -885,12 +885,12 @@ process_pub_con(agooPub pub, agooConLoop loop) {
 
     if (NULL != up && NULL != up->con && up->con->loop == loop) {
 	int	pending;
-	
+
 	// TBD Change pending to be based on length of con queue
 	if (1 == (pending = atomic_fetch_sub(&up->pending, 1))) {
 	    if (NULL != up && agoo_server.ctx_nil_value != up->ctx && up->on_empty) {
 		agooReq	req = agoo_req_create(0);
-	    
+
 		req->up = up;
 		req->method = AGOO_ON_EMPTY;
 		req->hook = agoo_hook_create(AGOO_NONE, NULL, up->ctx, PUSH_HOOK, &agoo_server.eval_queue);
@@ -961,7 +961,7 @@ process_pub_con(agooPub pub, agooConLoop loop) {
 short
 agoo_con_http_events(agooCon c) {
     short	events = 0;
-    
+
     if (NULL != c->res_head && NULL != agoo_res_message(c->res_head)) {
 	events = POLLIN | POLLOUT;
     } else if (!c->closing) {
@@ -1029,7 +1029,7 @@ con_ready_check(void *ctx, double now) {
     agooCon	c = (agooCon)ctx;
 
     if (c->dead || 0 == c->sock) {
-	if (remove_dead_res(c)) {	
+	if (remove_dead_res(c)) {
 	    return false;
 	}
     } else if (0.0 == c->timeout || now < c->timeout) {
@@ -1106,7 +1106,7 @@ static struct _agooHandler	con_handler = {
     .read = con_ready_read,
     .write = con_ready_write,
     .error = NULL,
-    .destroy = con_ready_destroy, 
+    .destroy = con_ready_destroy,
 };
 
 static agooReadyIO
@@ -1119,7 +1119,7 @@ con_queue_ready_read(agooReady ready, void *ctx) {
     agooConLoop		loop = (agooConLoop)ctx;
     struct _agooErr	err = AGOO_ERR_INIT;
     agooCon		c;
-    
+
     agoo_queue_release(&agoo_server.con_queue);
     while (NULL != (c = (agooCon)agoo_queue_pop(&agoo_server.con_queue, 0.0))) {
 	c->loop = loop;
@@ -1136,8 +1136,8 @@ static struct _agooHandler	con_queue_handler = {
     .check = NULL,
     .read = con_queue_ready_read,
     .write = NULL,
-    .error = NULL, 
-    .destroy = NULL, 
+    .error = NULL,
+    .destroy = NULL,
 };
 
 static bool
@@ -1157,8 +1157,8 @@ static struct _agooHandler	pub_queue_handler = {
     .check = NULL,
     .read = pub_queue_ready_read,
     .write = NULL,
-    .error = NULL, 
-    .destroy = NULL, 
+    .error = NULL,
+    .destroy = NULL,
 };
 
 void*
@@ -1170,7 +1170,7 @@ agoo_con_loop(void *x) {
     agooCon		c;
     int			con_queue_fd = agoo_queue_listen(&agoo_server.con_queue);
     int			pub_queue_fd = agoo_queue_listen(&loop->pub_queue);
-    
+
     if (NULL == ready) {
 	agoo_log_cat(&agoo_error_cat, "Failed to create connection manager. %s", err.msg);
 	exit(EXIT_FAILURE);
@@ -1184,7 +1184,7 @@ agoo_con_loop(void *x) {
 	return NULL;
     }
     atomic_fetch_add(&agoo_server.running, 1);
-    
+
     while (agoo_server.active) {
 	while (NULL != (c = (agooCon)agoo_queue_pop(&agoo_server.con_queue, 0.0))) {
 	    c->loop = loop;
@@ -1215,7 +1215,7 @@ agoo_conloop_create(agooErr err, int id) {
 	AGOO_ERR_MEM(err, "connection thread");
     } else {
 	int	stat;
-	
+
 	loop->next = NULL;
 	if (AGOO_ERR_OK != agoo_queue_multi_init(err, &loop->pub_queue, 256, true, false)) {
 	    AGOO_FREE(loop);
@@ -1240,7 +1240,7 @@ agoo_conloop_create(agooErr err, int id) {
 void
 agoo_conloop_destroy(agooConLoop loop) {
     agooRes	res;
-    
+
     agoo_queue_cleanup(&loop->pub_queue);
     while (NULL != (res = loop->res_head)) {
 	loop->res_head = res->next;

data/ext/agoo/error_stream.c

@@ -25,13 +25,12 @@ error_stream_new() {
     ErrorStream	es = (ErrorStream)AGOO_MALLOC(sizeof(struct _errorStream));
 
     if (NULL == es) {
-	// Error stream is optional. If it is not there is still meets the
-	// specs. Better not to break everything if this fails.
-	return Qnil;
+	rb_raise(rb_eNoMemError, "Failed to allocate memory for the error stream.");
     }
     es->server = NULL;
-    es->text = agoo_text_allocate(1024);
-    
+    if (NULL == (es->text = agoo_text_allocate(1024))) {
+	rb_raise(rb_eNoMemError, "Failed to allocate memory for the error stream.");
+    }
     return Data_Wrap_Struct(es_class, NULL, es_free, es);
 }
 
@@ -48,7 +47,9 @@ es_puts(VALUE self, VALUE str) {
 
     es->text = agoo_text_append(es->text, StringValuePtr(str), (int)RSTRING_LEN(str));
     es->text = agoo_text_append(es->text, "\n", 1);
-
+    if (NULL == es->text) {
+	rb_raise(rb_eNoMemError, "Failed to allocate memory for the error stream puts.");
+    }
     return Qnil;
 }
 
@@ -62,9 +63,10 @@ static VALUE
 es_write(VALUE self, VALUE str) {
     ErrorStream	es = (ErrorStream)DATA_PTR(self);
     int		cnt = (int)RSTRING_LEN(str);
-    
-    es->text = agoo_text_append(es->text, StringValuePtr(str), cnt);
 
+    if (NULL == (es->text = agoo_text_append(es->text, StringValuePtr(str), cnt))) {
+	rb_raise(rb_eNoMemError, "Failed to allocate memory for the error stream puts.");
+    }
     return INT2NUM(cnt);
 }
 

data/ext/agoo/gqlcobj.c

@@ -7,6 +7,31 @@
 #include "debug.h"
 #include "gqlcobj.h"
 #include "gqleval.h"
+#include "gqlvalue.h"
+#include "graphql.h"
 
 
+gqlType
+gql_cobj_ref_type(gqlRef ref) {
+    gqlCobj	obj = (gqlCobj)ref;
+
+    if (NULL != obj && NULL != obj->clas) {
+	return gql_type_get(obj->clas->name);
+    }
+    return NULL;
+}
+
+int
+gql_cobj_resolve(agooErr err, gqlDoc doc, gqlRef target, gqlField field, gqlSel sel, gqlValue result, int depth) {
+    gqlCobj	obj = (gqlCobj)target;
+    gqlCmethod	method;
+
+    for (method = obj->clas->methods; NULL != method->key; method++) {
+	if (0 == strcmp(method->key, sel->name)) {
+	    return method->func(err, doc, obj, field, sel, result, depth);
+	}
+    }
+    return agoo_err_set(err, AGOO_ERR_EVAL, "%s is not a field on %s.", sel->name, obj->clas->name);
+}
+
 // TBD when a type is created, add a cobj to it