agoo 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c40533edbeaf9a5593680f15a5c7ad41ef5e1575b9235c10faf0ecb906bd472c
-  data.tar.gz: 81c3884669b222a050352386973bc40d79cdce7c748204d85825a684d91ecbe3
+  metadata.gz: 0e446f82a7209a72954bdf44c5f345fd9c5e13384dc75d6ce8faa7149d52f023
+  data.tar.gz: dea80f2d75d1f4affce64efece36dae4f7753e243d085faf8b7f0b2746aea2db
 SHA512:
-  metadata.gz: bc1b0f12bdb19c51a947fa73c981eab8e21b640448363c62d7433138f4320f39a317fc9937f5499398ab7414a15122533af23e2bcc25722bfa26844bdd9c9b7c
-  data.tar.gz: 939c1a7654f453b5d602097b0faed1010291040edddb4a67f99c0b14c50ac2944a45fc87c7e3eb758760a7ba9cf6c02f449aa54cb0daec5fe1864b331e2c1213
+  metadata.gz: 6167c0841ed2f05935998cb861632949b9d437e1c590820477add9d0ef067abd0c1ea1db377279c8f82fd4d58efb6491daf198f979e0fa6dc3f989ba4cd217ef
+  data.tar.gz: da0c4b54ee8f4db509e5e657bd2a919d0df4a314b7c6663d0e2afd0b4e89730fbaad7693f3888cefe984f8ca00d9e04237c5c51218e5d96e0278cc91eb483f5d

data/CHANGELOG.md

@@ -4,6 +4,16 @@ All changes to the Agoo gem are documented here. Releases follow semantic versio
 
 ## [Unreleased]
 
+## [2.10.0] - 2019-08-29
+
+GraphQL subscriptions
+
+### Fixed
+- Rack multiple value header transformation changed to emit multiple entries instead of multiple values.
+
+### Added
+- GraphQL Subscriptions using Websockets and SSE are now supported.
+
 ## [2.9.0] - 2019-07-26
 
 Early hints and sub-domains

data/ext/agoo/con.c

@@ -12,6 +12,7 @@
 #include "domain.h"
 #include "dtime.h"
 #include "hook.h"
+#include "gqlsub.h"
 #include "http.h"
 #include "log.h"
 #include "page.h"
@@ -67,6 +68,7 @@ agoo_con_create(agooErr err, int sock, uint64_t id, agooBind b) {
 	c->timeout = dtime() + CON_TIMEOUT;
 	c->bind = b;
 	c->loop = NULL;
+	pthread_mutex_init(&c->res_lock, 0);
     }
     return c;
 }
@@ -89,18 +91,73 @@ agoo_con_destroy(agooCon c) {
     }
     if (NULL != c->up) {
 	agoo_upgraded_release_con(c->up);
-
 	c->up = NULL;
     }
+    if (NULL != c->gsub) {
+	agoo_server_del_gsub(c->gsub);
+	gql_sub_destroy(c->gsub);
+	c->gsub = NULL;
+    }
     agoo_log_cat(&agoo_con_cat, "Connection %llu closed.", (unsigned long long)c->id);
 
     while (NULL != (res = c->res_head)) {
 	c->res_head = res->next;
 	AGOO_FREE(res);
     }
+    pthread_mutex_destroy(&c->res_lock);
     AGOO_FREE(c);
 }
 
+void
+agoo_con_res_append(agooCon c, agooRes res) {
+    pthread_mutex_lock(&c->res_lock);
+    if (NULL == c->res_tail) {
+	c->res_head = res;
+    } else {
+	c->res_tail->next = res;
+    }
+    c->res_tail = res;
+    pthread_mutex_unlock(&c->res_lock);
+}
+
+static void
+agoo_con_res_prepend(agooCon c, agooRes res) {
+    pthread_mutex_lock(&c->res_lock);
+    res->next = c->res_head;
+    c->res_head = res;
+    if (NULL == c->res_tail) {
+	c->res_tail = res;
+    }
+    pthread_mutex_unlock(&c->res_lock);
+}
+
+static agooRes
+agoo_con_res_pop(agooCon c) {
+    agooRes	res;
+
+    pthread_mutex_lock(&c->res_lock);
+    if (NULL != (res = c->res_head)) {
+	c->res_head = res->next;
+	if (res == c->res_tail) {
+	    c->res_tail = NULL;
+	}
+    }
+    pthread_mutex_unlock(&c->res_lock);
+
+    return res;
+}
+
+static agooRes
+agoo_con_res_peek(agooCon c) {
+    agooRes	res;
+
+    pthread_mutex_lock(&c->res_lock);
+    res = c->res_head;
+    pthread_mutex_unlock(&c->res_lock);
+
+    return res;
+}
+
 const char*
 agoo_con_header_value(const char *header, int hlen, const char *key, int *vlen) {
     // Search for \r then check for \n and then the key followed by a :. Keep
@@ -146,14 +203,9 @@ bad_request(agooCon c, int status, int line) {
 				       "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 {
-	    c->res_tail->next = res;
-	}
-	c->res_tail = res;
+	agoo_con_res_append(c, res);
 	res->close = true;
-	agoo_res_message_push(res, message, true);
+	agoo_res_message_push(res, message);
     }
     return HEAD_ERR;
 }
@@ -177,19 +229,14 @@ page_response(agooCon c, agooPage p, char *hend) {
     if (NULL == (res = agoo_res_create(c))) {
 	return true;
     }
-    if (NULL == c->res_tail) {
-	c->res_head = res;
-    } else {
-	c->res_tail->next = res;
-    }
-    c->res_tail = res;
+    agoo_con_res_append(c, res);
 
     b = strstr(c->buf, "\r\n");
     res->close = should_close(b, (int)(hend - b));
     if (res->close) {
 	c->closing = true;
     }
-    agoo_res_message_push(res, p->resp, true);
+    agoo_res_message_push(res, p->resp);
 
     return false;
 }
@@ -504,12 +551,7 @@ agoo_con_http_read(agooCon c) {
 		    agoo_log_cat(&agoo_error_cat, "memory allocation of response failed on connection %llu.", (unsigned long long)c->id);
 		    return bad_request(c, 500, __LINE__);
 		} else {
-		    if (NULL == c->res_tail) {
-			c->res_head = res;
-		    } else {
-			c->res_tail->next = res;
-		    }
-		    c->res_tail = res;
+		    agoo_con_res_append(c, res);
 		    res->close = should_close(c->req->header.start, c->req->header.len);
 		    if (res->close) {
 			c->closing = true;
@@ -584,6 +626,11 @@ con_ws_read(agooCon c) {
 	    switch (op) {
 	    case AGOO_WS_OP_TEXT:
 	    case AGOO_WS_OP_BIN:
+		if (NULL != c->gsub) {
+		    // GraphQL subscriptions do not accept input on the
+		    // connection.
+		    break;
+		}
 		if (agoo_ws_create_req(c, mlen)) {
 		    return true;
 		}
@@ -648,7 +695,8 @@ con_ws_read(agooCon c) {
 // return false to remove/close connection
 bool
 agoo_con_http_write(agooCon c) {
-    agooText	message = agoo_res_message_peek(c->res_head);
+    agooRes	res = agoo_con_res_pop(c);
+    agooText	message = agoo_res_message_peek(res);
     ssize_t	cnt;
 
     if (NULL == message) {
@@ -684,22 +732,19 @@ agoo_con_http_write(agooCon c) {
     }
     c->wcnt += cnt;
     if (c->wcnt == message->len) { // finished
-	agooRes		res = c->res_head;
 	agooText	next = agoo_res_message_next(res);
 
 	c->wcnt = 0;
 	if (NULL == next && res->final) {
 	    bool	done = res->close;
 
-	    c->res_head = res->next;
-	    if (res == c->res_tail) {
-		c->res_tail = NULL;
-	    }
 	    agoo_res_destroy(res);
 
 	    return !done;
 	}
     }
+    agoo_con_res_prepend(c, res);
+
     return true;
 }
 
@@ -708,7 +753,7 @@ static const char	pong_msg[] = "\x8a\x00";
 
 static bool
 con_ws_write(agooCon c) {
-    agooRes	res = c->res_head;
+    agooRes	res = agoo_con_res_pop(c);
     agooText	message = agoo_res_message_peek(res);
     ssize_t	cnt;
 
@@ -748,18 +793,10 @@ con_ws_write(agooCon c) {
 	    }
 	} else {
 	    agoo_ws_req_close(c);
-	    c->res_head = res->next;
-	    if (res == c->res_tail) {
-		c->res_tail = NULL;
-	    }
 	    agoo_res_destroy(res);
 
 	    return false;
 	}
-	c->res_head = res->next;
-	if (res == c->res_tail) {
-	    c->res_tail = NULL;
-	}
 	return true;
     }
     c->timeout = dtime() + CON_TIMEOUT;
@@ -775,7 +812,7 @@ con_ws_write(agooCon c) {
 	}
 	t = agoo_ws_expand(message);
 	if (t != message) {
-	    agoo_res_message_push(res, t, true);
+	    agoo_res_message_push(res, t);
 	    message = t;
 	}
     }
@@ -795,28 +832,25 @@ con_ws_write(agooCon c) {
     }
     c->wcnt += cnt;
     if (c->wcnt == message->len) { // finished
-	agooRes		res = c->res_head;
 	agooText	next = agoo_res_message_next(res);
 
 	c->wcnt = 0;
 	if (NULL == next && res->final) {
 	    bool	done = res->close;
 
-	    c->res_head = res->next;
-	    if (res == c->res_tail) {
-		c->res_tail = NULL;
-	    }
 	    agoo_res_destroy(res);
 
 	    return !done;
 	}
     }
+    agoo_con_res_prepend(c, res);
+
     return true;
 }
 
 static bool
 con_sse_write(agooCon c) {
-    agooRes	res = c->res_head;
+    agooRes	res = agoo_con_res_pop(c);
     agooText	message = agoo_res_message_peek(res);
     ssize_t	cnt;
 
@@ -834,7 +868,7 @@ con_sse_write(agooCon c) {
 	}
 	t = agoo_sse_expand(message);
 	if (t != message) {
-	    agoo_res_message_push(res, t, true);
+	    agoo_res_message_push(res, t);
 	    message = t;
 	}
     }
@@ -853,22 +887,19 @@ con_sse_write(agooCon c) {
     }
     c->wcnt += cnt;
     if (c->wcnt == message->len) { // finished
-	agooText	next = agoo_res_message_next(c->res_head);
+	agooText	next = agoo_res_message_next(res);
 
 	c->wcnt = 0;
 	if (NULL == next) {
-	    agooRes	res = c->res_head;
 	    bool	done = res->close;
 
-	    c->res_head = res->next;
-	    if (res == c->res_tail) {
-		c->res_tail = NULL;
-	    }
 	    agoo_res_destroy(res);
 
 	    return !done;
 	}
     }
+    agoo_con_res_prepend(c, res);
+
     return true;
 }
 
@@ -883,14 +914,9 @@ publish_pub(agooPub pub, agooConLoop loop) {
 	    agooRes	res = agoo_res_create(up->con);
 
 	    if (NULL != res) {
-		if (NULL == up->con->res_tail) {
-		    up->con->res_head = res;
-		} else {
-		    up->con->res_tail->next = res;
-		}
-		up->con->res_tail = res;
+		agoo_con_res_append(up->con, res);
 		res->con_kind = AGOO_CON_ANY;
-		agoo_res_message_push(res, agoo_text_dup(pub->msg), true);
+		agoo_res_message_push(res, agoo_text_dup(pub->msg));
 		cnt++;
 	    }
 	}
@@ -939,12 +965,7 @@ process_pub_con(agooPub pub, agooConLoop loop) {
 	    agooRes	res = agoo_res_create(up->con);
 
 	    if (NULL != res) {
-		if (NULL == up->con->res_tail) {
-		    up->con->res_head = res;
-		} else {
-		    up->con->res_tail->next = res;
-		}
-		up->con->res_tail = res;
+		agoo_con_res_append(up->con, res);
 		res->con_kind = up->con->bind->kind;
 		res->close = true;
 	    }
@@ -957,14 +978,9 @@ process_pub_con(agooPub pub, agooConLoop loop) {
 	    agooRes	res = agoo_res_create(up->con);
 
 	    if (NULL != res) {
-		if (NULL == up->con->res_tail) {
-		    up->con->res_head = res;
-		} else {
-		    up->con->res_tail->next = res;
-		}
-		up->con->res_tail = res;
+		agoo_con_res_append(up->con, res);
 		res->con_kind = AGOO_CON_ANY;
-		agoo_res_message_push(res, pub->msg, true);
+		agoo_res_message_push(res, pub->msg);
 	    }
 	}
 	break;
@@ -992,8 +1008,9 @@ process_pub_con(agooPub pub, agooConLoop loop) {
 short
 agoo_con_http_events(agooCon c) {
     short	events = 0;
+    agooRes	res = agoo_con_res_peek(c);
 
-    if (NULL != c->res_head && NULL != c->res_head->message) {
+    if (NULL != res && NULL != res->message) {
 	events = POLLIN | POLLOUT;
     } else if (!c->closing) {
 	events = POLLIN;
@@ -1004,8 +1021,9 @@ agoo_con_http_events(agooCon c) {
 static short
 con_ws_events(agooCon c) {
     short	events = 0;
+    agooRes	res = agoo_con_res_peek(c);
 
-    if (NULL != c->res_head && (c->res_head->close || c->res_head->ping || NULL != c->res_head->message)) {
+    if (NULL != res && (res->close || res->ping || NULL != res->message)) {
 	events = POLLIN | POLLOUT;
     } else if (!c->closing) {
 	events = POLLIN;
@@ -1016,8 +1034,9 @@ con_ws_events(agooCon c) {
 static short
 con_sse_events(agooCon c) {
     short	events = 0;
+    agooRes	res = agoo_con_res_peek(c);
 
-    if (NULL != c->res_head && NULL != c->res_head->message) {
+    if (NULL != res && NULL != res->message) {
 	events = POLLOUT;
     }
     return events;
@@ -1026,7 +1045,9 @@ con_sse_events(agooCon c) {
 static bool
 remove_dead_res(agooCon c) {
     agooRes	res;
+    bool	empty;
 
+    pthread_mutex_lock(&c->res_lock);
     while (NULL != (res = c->res_head)) {
 	if (NULL == agoo_res_message_peek(c->res_head) && !c->res_head->close && !c->res_head->ping) {
 	    break;
@@ -1037,7 +1058,10 @@ remove_dead_res(agooCon c) {
 	}
 	agoo_res_destroy(res);
     }
-    return NULL == c->res_head;
+    empty = NULL == c->res_head;
+    pthread_mutex_unlock(&c->res_lock);
+
+    return empty;
 }
 
 static agooReadyIO
@@ -1071,8 +1095,9 @@ con_ready_check(void *ctx, double now) {
 	}
     } else if (AGOO_CON_WS == c->bind->kind || AGOO_CON_SSE == c->bind->kind) {
 	c->timeout = dtime() + CON_TIMEOUT;
-	agoo_ws_ping(c);
-
+	if (AGOO_CON_WS == c->bind->kind) {
+	    agoo_ws_ping(c);
+	}
 	return true;
     } else {
 	c->closing = true;
@@ -1100,9 +1125,10 @@ con_ready_read(agooReady ready, void *ctx) {
 static bool
 con_ready_write(void *ctx) {
     agooCon	c = (agooCon)ctx;
+    agooRes	res = agoo_con_res_peek(c);
 
-    if (NULL != c->res_head) {
-	agooConKind	kind = c->res_head->con_kind;
+    if (NULL != res) {
+	agooConKind	kind = res->con_kind;
 
 	if (NULL != c->bind->write) {
 	    if (c->bind->write(c)) {

data/ext/agoo/con.h

@@ -21,20 +21,21 @@ struct _agooReq;
 struct _agooRes;
 struct _agooBind;
 struct _agooQueue;
+struct _gqlSub;
 
 typedef struct _agooConLoop {
     struct _agooConLoop	*next;
     struct _agooQueue	pub_queue;
     pthread_t		thread;
     int			id;
-    // TBD use mutex for head and tail, volatile also
+
+    // Cache of responses to be reused.
     struct _agooRes	*res_head;
     struct _agooRes	*res_tail;
-
     pthread_mutex_t	lock;
-    
+
 } *agooConLoop;
-    
+
 typedef struct _agooCon {
     struct _agooCon		*next;
     int				sock;
@@ -54,8 +55,10 @@ typedef struct _agooCon {
     struct _agooReq		*req;
     struct _agooRes		*res_head;
     struct _agooRes		*res_tail;
+    pthread_mutex_t		res_lock;
 
     struct _agooUpgraded	*up; // only set for push connections
+    struct _gqlSub		*gsub; // for graphql subscription
     agooConLoop			loop;
 } *agooCon;
 
@@ -66,6 +69,8 @@ extern const char*	agoo_con_header_value(const char *header, int hlen, const cha
 extern agooConLoop	agoo_conloop_create(agooErr err, int id);
 extern void		agoo_conloop_destroy(agooConLoop loop);
 
+extern void		agoo_con_res_append(agooCon c, struct _agooRes *res);
+
 extern bool		agoo_con_http_read(agooCon c);
 extern bool		agoo_con_http_write(agooCon c);
 extern short		agoo_con_http_events(agooCon c);