agoo 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec3fe82e8d4833d543ce7389dbf2c184fefed6ceee8b6ede337dd99588a69c4
-  data.tar.gz: 9b65a945479295f9b3663dd443e96d3f1b053536cf1062d10b6096d4b58cd333
+  metadata.gz: 68f159d050def385814b8fecb4b3d28cd638bedaa658543881a74f2587957260
+  data.tar.gz: 72a2429c4eb44db0ddf7a033d7fde7a7fcdc112e032b9102340d7fb74a92f68b
 SHA512:
-  metadata.gz: 335d419d49420ae7c091a2c89ba46830520be29041cdf18967a588c9bcf63383efbbddced7d65cab96d3d97f835b23b4c1f2a1749c2cb5591d3b66c89bb4af55
-  data.tar.gz: a25b384fcec18a72635a03c2f87218939adebcb3f18f63f912ab9c1e1fdbb04653cbb03f5598dfb3786113ad4496ee213d57d0971eeac254ca354a34253b45e7
+  metadata.gz: bc963d7748c0406fa4e82133af064ec1c97607e3cc6c1695939fc5869b35d83f134b7ae440386f06531e9b65d27fcdb9bbc7db9122bdc5fdb1987f5f049703b3
+  data.tar.gz: fe94670810539c14abba9cdaba57843e1cbd0c8425b72d18d9ac036ee83fc95d513263cac5b2e0156dd94a8a908d70ea26e1fadd50334b7faa7bf5b94c88e38d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+### 2.3.0 - 2018-06-29
+
+- Added an `env` method to the upgrade (Websocket and SSE) client.
+
+- Fixed Websocket bug where a pong caused a hang on the socket.
+
 ### 2.2.2 - 2018-06-05
 
 - Fixed `bin/agoo` which had become out of date.

data/ext/agoo/agoo.c

@@ -7,11 +7,11 @@
 
 #include "debug.h"
 #include "error_stream.h"
-#include "log.h"
 #include "pub.h"
 #include "rack_logger.h"
 #include "request.h"
 #include "response.h"
+#include "rlog.h"
 #include "server.h"
 #include "upgraded.h"
 
@@ -89,7 +89,7 @@ void
 Init_agoo() {
     VALUE	mod = rb_define_module("Agoo");
 
-    log_init(mod);
+    rlog_init(mod);
     error_stream_init(mod);
     rack_logger_init(mod);
     request_init(mod);

data/ext/agoo/con.c

@@ -1,6 +1,8 @@
 // Copyright (c) 2018, Peter Ohler, All rights reserved.
 
 #include <ctype.h>
+#include <netdb.h>
+#include <stdio.h>
 #include <string.h>
 
 #include "con.h"
@@ -10,6 +12,7 @@
 #include "http.h"
 #include "pub.h"
 #include "res.h"
+#include "seg.h"
 #include "server.h"
 #include "sse.h"
 #include "subject.h"
@@ -95,7 +98,7 @@ bad_request(Con c, int status, int line) {
     const char *msg = http_code_message(status);
     
     if (NULL == (res = res_create(c))) {
-	log_cat(&error_cat, "memory allocation of response failed on connection %llu @ %d.", c->id, line);
+	log_cat(&error_cat, "memory allocation of response failed on connection %llu @ %d.", (unsigned long long)c->id, line);
     } else {
 	char	buf[256];
 	int	cnt = snprintf(buf, sizeof(buf), "HTTP/1.1 %d %s\r\nConnection: Close\r\nContent-Length: 0\r\n\r\n", status, msg);
@@ -158,8 +161,7 @@ static long
 con_header_read(Con c) {
     char	*hend = strstr(c->buf, "\r\n\r\n");
     Method	method;
-    char	*path;
-    char	*pend;
+    struct _Seg	path;
     char	*query = NULL;
     char	*qend;
     char	*b;
@@ -177,7 +179,7 @@ con_header_read(Con c) {
     }
     if (req_cat.on) {
 	*hend = '\0';
-	log_cat(&req_cat, "%llu: %s", c->id, c->buf);
+	log_cat(&req_cat, "%llu: %s", (unsigned long long)c->id, c->buf);
 	*hend = '\r';
     }
     for (b = c->buf; ' ' != *b; b++) {
@@ -245,11 +247,11 @@ con_header_read(Con c) {
 	    return bad_request(c, 400, __LINE__);
 	}
     }
-    path = b;
+    path.start = b;
     for (; ' ' != *b; b++) {
 	switch (*b) {
 	case '?':
-	    pend = b;
+	    path.end = b;
 	    query = b + 1;
 	    break;
 	case '\0':
@@ -259,7 +261,7 @@ con_header_read(Con c) {
 	}
     }
     if (NULL == query) {
-	pend = b;
+	path.end = b;
 	query = b;
 	qend = b;
     } else {
@@ -267,20 +269,20 @@ con_header_read(Con c) {
     }
     mlen = hend - c->buf + 4 + clen;
     if (GET == method &&
-	NULL != (p = group_get(&err, &the_server.pages, path, (int)(pend - path)))) {
+	NULL != (p = group_get(&err, &the_server.pages, path.start, (int)(path.end - path.start)))) {
 	if (page_response(c, p, hend)) {
 	    return bad_request(c, 500, __LINE__);
 	}
 	return -mlen;
     }
     if (GET == method && the_server.root_first &&
-	NULL != (p = page_get(&err, &the_server.pages, path, (int)(pend - path)))) {
+	NULL != (p = page_get(&err, &the_server.pages, path.start, (int)(path.end - path.start)))) {
 	if (page_response(c, p, hend)) {
 	    return bad_request(c, 500, __LINE__);
 	}
 	return -mlen;
     }
-    if (NULL == (hook = hook_find(the_server.hooks, method, path, pend))) {
+    if (NULL == (hook = hook_find(the_server.hooks, method, &path))) {
 	if (GET == method) {
 	    if (the_server.root_first) { // already checked
 		if (NULL != the_server.hook404) {
@@ -291,7 +293,7 @@ con_header_read(Con c) {
 		}
 		return bad_request(c, 404, __LINE__);
 	    }
-	    if (NULL == (p = page_get(&err, &the_server.pages, path, (int)(pend - path)))) {
+	    if (NULL == (p = page_get(&err, &the_server.pages, path.start, (int)(path.end - path.start)))) {
 		if (NULL != the_server.hook404) {
 		    // There would be too many parameters to pass to a
 		    // separate function so just goto the hook processing.
@@ -323,8 +325,8 @@ HOOKED:
     c->req->method = method;
     c->req->upgrade = UP_NONE;
     c->req->up = NULL;
-    c->req->path.start = c->req->msg + (path - c->buf);
-    c->req->path.len = (int)(pend - path);
+    c->req->path.start = c->req->msg + (path.start - c->buf);
+    c->req->path.len = (int)(path.end - path.start);
     c->req->query.start = c->req->msg + (query - c->buf);
     c->req->query.len = (int)(qend - query);
     c->req->body.start = c->req->msg + (hend - c->buf + 4);
@@ -334,7 +336,7 @@ HOOKED:
     c->req->header.len = (unsigned int)(hend - b - 2);
     c->req->res = NULL;
     if (NULL != hook) {
-	c->req->handler = hook->handler;
+	c->req->handler = (VALUE)hook->handler;
 	c->req->handler_type = hook->type;
     } else {
 	c->req->handler = Qnil;
@@ -388,7 +390,7 @@ con_http_read(Con c) {
 	// If nothing read then no need to complain. Just close.
 	if (0 < c->bcnt) {
 	    if (0 == cnt) {
-		log_cat(&warn_cat, "Nothing to read. Client closed socket on connection %llu.", c->id);
+		log_cat(&warn_cat, "Nothing to read. Client closed socket on connection %llu.", (unsigned long long)c->id);
 	    } else {
 		log_cat(&warn_cat, "Failed to read request. %s.", strerror(errno));
 	    }
@@ -426,11 +428,11 @@ con_http_read(Con c) {
 		long	mlen;
 
 		if (debug_cat.on && NULL != c->req && NULL != c->req->body.start) {
-		    log_cat(&debug_cat, "request on %llu: %s", c->id, c->req->body.start);
+		    log_cat(&debug_cat, "request on %llu: %s", (unsigned long long)c->id, c->req->body.start);
 		}
 		if (NULL == (res = res_create(c))) {
 		    c->req = NULL;
-		    log_cat(&error_cat, "memory allocation of response failed on connection %llu.", c->id);
+		    log_cat(&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) {
@@ -483,7 +485,7 @@ con_ws_read(Con c) {
 	// If nothing read then no need to complain. Just close.
 	if (0 < c->bcnt) {
 	    if (0 == cnt) {
-		log_cat(&warn_cat, "Nothing to read. Client closed socket on connection %llu.", c->id);
+		log_cat(&warn_cat, "Nothing to read. Client closed socket on connection %llu.", (unsigned long long)c->id);
 	    } else {
 		log_cat(&warn_cat, "Failed to read WebSocket message. %s.", strerror(errno));
 	    }
@@ -511,14 +513,20 @@ con_ws_read(Con c) {
 	    case WS_OP_CLOSE:
 		return true;
 	    case WS_OP_PING:
-		ws_pong(c);
+		if (mlen == (long)c->bcnt) {
+		    ws_pong(c);
+		    c->bcnt = 0;
+		}
 		break;
 	    case WS_OP_PONG:
 		// ignore
+		if (mlen == (long)c->bcnt) {
+		    c->bcnt = 0;
+		}
 		break;
 	    case WS_OP_CONT:
 	    default:
-		log_cat(&error_cat, "WebSocket op 0x%02x not supported on %llu.", op, c->id);
+		log_cat(&error_cat, "WebSocket op 0x%02x not supported on %llu.", op, (unsigned long long)c->id);
 		return true;
 	    }
 	}
@@ -528,9 +536,9 @@ con_ws_read(Con c) {
 	    if (mlen <= (long)c->bcnt) {
 		if (debug_cat.on) {
 		    if (ON_MSG == c->req->method) {
-			log_cat(&debug_cat, "WebSocket message on %llu: %s", c->id, c->req->msg);
+			log_cat(&debug_cat, "WebSocket message on %llu: %s", (unsigned long long)c->id, c->req->msg);
 		    } else {
-			log_cat(&debug_cat, "WebSocket binary message on %llu", c->id);
+			log_cat(&debug_cat, "WebSocket binary message on %llu", (unsigned long long)c->id);
 		    }
 		}
 	    }
@@ -587,17 +595,17 @@ con_http_write(Con c) {
 	    }
 	    memcpy(buf, message->text, hend - message->text);
 	    buf[hend - message->text] = '\0';
-	    log_cat(&resp_cat, "%llu: %s", c->id, buf);
+	    log_cat(&resp_cat, "%llu: %s", (unsigned long long)c->id, buf);
 	}
 	if (debug_cat.on) {
-	    log_cat(&debug_cat, "response on %llu: %s", c->id, message->text);
+	    log_cat(&debug_cat, "response on %llu: %s", (unsigned long long)c->id, message->text);
 	}
     }
     if (0 > (cnt = send(c->sock, message->text + c->wcnt, message->len - c->wcnt, 0))) {
 	if (EAGAIN == errno) {
 	    return false;
 	}
-	log_cat(&error_cat, "Socket error @ %llu.", c->id);
+	log_cat(&error_cat, "Socket error @ %llu.", (unsigned long long)c->id);
 
 	return true;
     }
@@ -633,7 +641,7 @@ con_ws_write(Con c) {
 		if (EAGAIN == errno) {
 		    return false;
 		}
-		log_cat(&error_cat, "Socket error @ %llu.", c->id);
+		log_cat(&error_cat, "Socket error @ %llu.", (unsigned long long)c->id);
 		ws_req_close(c);
 		res_destroy(res);
 	
@@ -644,7 +652,7 @@ con_ws_write(Con c) {
 		if (EAGAIN == errno) {
 		    return false;
 		}
-		log_cat(&error_cat, "Socket error @ %llu.", c->id);
+		log_cat(&error_cat, "Socket error @ %llu.", (unsigned long long)c->id);
 		ws_req_close(c);
 		res_destroy(res);
 	
@@ -671,9 +679,9 @@ con_ws_write(Con c) {
 	
 	if (push_cat.on) {
 	    if (message->bin) {
-		log_cat(&push_cat, "%llu binary", c->id);
+		log_cat(&push_cat, "%llu binary", (unsigned long long)c->id);
 	    } else {
-		log_cat(&push_cat, "%llu: %s", c->id, message->text);
+		log_cat(&push_cat, "%llu: %s", (unsigned long long)c->id, message->text);
 	    }
 	}
 	t = ws_expand(message);
@@ -686,7 +694,7 @@ con_ws_write(Con c) {
 	if (EAGAIN == errno) {
 	    return false;
 	}
-	log_cat(&error_cat, "Socket error @ %llu.", c->id);
+	log_cat(&error_cat, "Socket error @ %llu.", (unsigned long long)c->id);
 	ws_req_close(c);
 	
 	return true;
@@ -695,7 +703,6 @@ con_ws_write(Con c) {
     if (c->wcnt == message->len) { // finished
 	Res	res = c->res_head;
 	bool	done = res->close;
-	int	pending;
 	
 	c->res_head = res->next;
 	if (res == c->res_tail) {
@@ -703,18 +710,7 @@ con_ws_write(Con c) {
 	}
 	c->wcnt = 0;
 	res_destroy(res);
-	if (1 == (pending = atomic_fetch_sub(&c->up->pending, 1))) {
-	    if (NULL != c->up && Qnil != c->up->handler && c->up->on_empty) {
-		Req	req = request_create(0);
-	    
-		req->up = c->up;
-		req->method = ON_EMPTY;
-		req->handler_type = PUSH_HOOK;
-		req->handler = c->up->handler;
-		upgraded_ref(c->up);
-		queue_push(&the_server.eval_queue, (void*)req);
-	    }
-	}
+
 	return done;
     }
     return false;
@@ -736,7 +732,7 @@ con_sse_write(Con c) {
 	Text	t;
 	
 	if (push_cat.on) {
-	    log_cat(&push_cat, "%llu: %s", c->id, message->text);
+	    log_cat(&push_cat, "%llu: %s", (unsigned long long)c->id, message->text);
 	}
 	t = sse_expand(message);
 	if (t != message) {
@@ -748,7 +744,7 @@ con_sse_write(Con c) {
 	if (EAGAIN == errno) {
 	    return false;
 	}
-	log_cat(&error_cat, "Socket error @ %llu.", c->id);
+	log_cat(&error_cat, "Socket error @ %llu.", (unsigned long long)c->id);
 	ws_req_close(c);
 	
 	return true;
@@ -757,7 +753,6 @@ con_sse_write(Con c) {
     if (c->wcnt == message->len) { // finished
 	Res	res = c->res_head;
 	bool	done = res->close;
-	int	pending;
 	
 	c->res_head = res->next;
 	if (res == c->res_tail) {
@@ -765,18 +760,7 @@ con_sse_write(Con c) {
 	}
 	c->wcnt = 0;
 	res_destroy(res);
-	if (1 == (pending = atomic_fetch_sub(&c->up->pending, 1))) {
-	    if (NULL != c->up && Qnil != c->up->handler && c->up->on_empty) {
-		Req	req = request_create(0);
-	    
-		req->up = c->up;
-		req->method = ON_EMPTY;
-		req->handler_type = PUSH_HOOK;
-		req->handler = c->up->handler;
-		upgraded_ref(c->up);
-		queue_push(&the_server.eval_queue, (void*)req);
-	    }
-	}
+
 	return done;
     }
     return false;
@@ -816,7 +800,8 @@ static void
 publish_pub(Pub pub) {
     Upgraded	up;
     const char	*sub = pub->subject->pattern;
-
+    int	cnt = 0;
+    
     for (up = the_server.up_list; NULL != up; up = up->next) {
 	if (NULL != up->con && upgraded_match(up, sub)) {
 	    Res	res = res_create(up->con);
@@ -830,6 +815,7 @@ publish_pub(Pub pub) {
 		up->con->res_tail = res;
 		res->con_kind = CON_ANY;
 		res_set_message(res, text_dup(pub->msg));
+		cnt++;
 	    }
 	}
     }
@@ -852,6 +838,23 @@ static void
 process_pub_con(Pub pub) {
     Upgraded	up = pub->up;
 
+    if (NULL != up) {
+	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 && Qnil != up->handler && up->on_empty) {
+		Req	req = request_create(0);
+	    
+		req->up = up;
+		req->method = ON_EMPTY;
+		req->handler_type = PUSH_HOOK;
+		req->handler = up->handler;
+		upgraded_ref(up);
+		queue_push(&the_server.eval_queue, (void*)req);
+	    }
+	}
+    }
     switch (pub->kind) {
     case PUB_CLOSE:
 	// An close after already closed is used to decrement the reference
@@ -1073,9 +1076,9 @@ con_loop(void *x) {
 	    if (0 != (pp->revents & (POLLERR | POLLHUP | POLLNVAL))) {
 		if (0 < c->bcnt) {
 		    if (0 != (pp->revents & (POLLHUP | POLLNVAL))) {
-			log_cat(&error_cat, "Socket %llu closed.", c->id);
+			log_cat(&error_cat, "Socket %llu closed.", (unsigned long long)c->id);
 		    } else if (!c->closing) {
-			log_cat(&error_cat, "Socket %llu error. %s", c->id, strerror(errno));
+			log_cat(&error_cat, "Socket %llu error. %s", (unsigned long long)c->id, strerror(errno));
 		    }
 		}
 		c->dead = true;
@@ -1113,7 +1116,7 @@ con_loop(void *x) {
 		prev->next = next;
 	    }
 	    ccnt--;
-	    log_cat(&con_cat, "Connection %llu closed.", c->id);
+	    log_cat(&con_cat, "Connection %llu closed.", (unsigned long long)c->id);
 	    con_destroy(c);
 	}
     }

data/ext/agoo/debug.c

@@ -3,9 +3,10 @@
 #include <pthread.h>
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 
-#include <ruby.h>
-#include <ruby/thread.h>
+//#include <ruby.h>
+//#include <ruby/thread.h>
 
 #include "debug.h"
 

data/ext/agoo/extconf.rb

@@ -5,8 +5,10 @@ extension_name = 'agoo'
 dir_config(extension_name)
 
 $CPPFLAGS += " -DPLATFORM_LINUX" if 'x86_64-linux' == RUBY_PLATFORM
-# Travis defaults to an older version of gcc to force a newer version.
-#RbConfig::MAKEFILE_CONFIG['CC'] = "gcc-7" if 'x86_64-linux' == RUBY_PLATFORM
+
+# Adding the __attribute__ flag only works with gcc compilers and even then it
+# does not work to check args with varargs s just remove the check.
+CONFIG['warnflags'].slice!(/ -Wsuggest-attribute=format/)
 
 create_makefile(File.join(extension_name, extension_name))
 

data/ext/agoo/hook.c

@@ -6,52 +6,8 @@
 #include "debug.h"
 #include "hook.h"
 
-static VALUE
-resolve_classname(VALUE mod, const char *classname) {
-    VALUE	clas;
-    ID		ci = rb_intern(classname);
-
-    if (rb_const_defined_at(mod, ci)) {
-	clas = rb_const_get_at(mod, ci);
-    } else {
-	clas = Qundef;
-    }
-    return clas;
-}
-
-static VALUE
-resolve_classpath(const char *name, size_t len) {
-    char	class_name[1024];
-    VALUE	clas;
-    char	*end = class_name + sizeof(class_name) - 1;
-    char	*s;
-    const char	*n = name;
-
-    clas = rb_cObject;
-    for (s = class_name; 0 < len; n++, len--) {
-	if (':' == *n) {
-	    *s = '\0';
-	    n++;
-	    len--;
-	    if (':' != *n) {
-		return Qundef;
-	    }
-	    if (Qundef == (clas = resolve_classname(clas, class_name))) {
-		return Qundef;
-	    }
-	    s = class_name;
-	} else if (end <= s) {
-	    return Qundef;
-	} else {
-	    *s++ = *n;
-	}
-    }
-    *s = '\0';
-    return resolve_classname(clas, class_name);
-}
-
 Hook
-hook_create(Method method, const char *pattern, VALUE handler) {
+hook_create(Method method, const char *pattern, void *handler, HookType type) {
     Hook	hook = (Hook)malloc(sizeof(struct _Hook));
 
     if (NULL != hook) {
@@ -60,67 +16,52 @@ hook_create(Method method, const char *pattern, VALUE handler) {
 	    pattern = "";
 	}
 	hook->next = NULL;
-	if (T_STRING == rb_type(handler)) {
-	    handler = resolve_classpath(StringValuePtr(handler), RSTRING_LEN(handler));
-	    // TBD does class handle it or should an instance be made?
-	    //  
-	}
-	hook->handler = handler;
-	rb_gc_register_address(&handler);
 	hook->pattern = strdup(pattern);
 	DEBUG_ALLOC(mem_hook_pattern, hook->pattern)
 	hook->method = method;
-	if (rb_respond_to(handler, rb_intern("on_request"))) {
-	    hook->type = BASE_HOOK;
-	} else if (rb_respond_to(handler, rb_intern("call"))) {
-	    hook->type = RACK_HOOK;
-	} else if (rb_respond_to(handler, rb_intern("create")) &&
-		   rb_respond_to(handler, rb_intern("read")) &&
-		   rb_respond_to(handler, rb_intern("update")) &&
-		   rb_respond_to(handler, rb_intern("delete"))) {
-	    hook->type = WAB_HOOK;
-	} else {
-	    rb_raise(rb_eArgError, "handler does not have a on_request, or call method nor is it a WAB::Controller");
-	}
+	hook->handler = handler;
+	hook->type = type;
     }
     return hook;
 }
 
 void
 hook_destroy(Hook hook) {
-    DEBUG_FREE(mem_hook_pattern, hook->pattern)
-	DEBUG_FREE(mem_hook, hook)
+    DEBUG_FREE(mem_hook_pattern, hook->pattern);
+    DEBUG_FREE(mem_hook, hook)
     free(hook->pattern);
     free(hook);
 }
 
 bool
-hook_match(Hook hook, Method method, const char *path, const char *pend) {
+hook_match(Hook hook, Method method, const Seg path) {
     const char	*pat = hook->pattern;
+    char	*p = path->start;
+    char	*end = path->end;
 
     if (method != hook->method && ALL != hook->method) {
 	return false;
     }
-    for (; '\0' != *pat && path < pend; pat++) {
-	if (*path == *pat) {
-	    path++;
+    for (; '\0' != *pat && p < end; pat++) {
+	if (*p == *pat) {
+	    p++;
 	} else if ('*' == *pat) {
 	    if ('*' == *(pat + 1)) {
 		return true;
 	    }
-	    for (; path < pend && '/' != *path; path++) {
+	    for (; p < end && '/' != *p; p++) {
 	    }
 	} else {
 	    break;
 	}
     }
-    return '\0' == *pat && path == pend;
+    return '\0' == *pat && p == end;
 }
 
 Hook
-hook_find(Hook hook, Method method, const char *path, const char *pend) {
+hook_find(Hook hook, Method method, const Seg path) {
     for (; NULL != hook; hook = hook->next) {
-	if (hook_match(hook, method, path, pend)) {
+	if (hook_match(hook, method, path)) {
 	    return hook;
 	}
     }