agoo 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0618dff57c263cccb782e0fbccc807bf434815109c3809078ebd4d12570e1bde'
-  data.tar.gz: 2603682170f882a06d20e50ad0d9ab753b927f730331c224ce9e4dcc2cbea581
+  metadata.gz: e352cb4e13de1ea7e2bde18b69084458a22061b34d2e2876a958e6580719e9f5
+  data.tar.gz: fe95bb555e84f531835cf6964266926ee57e585b2aeb1839df3dcf448f08e1b2
 SHA512:
-  metadata.gz: cc4b5878761a72885f79ed8baecfb8bf23b6d516e7035ec97d14e655980432feb3923d8bbeae4824bcbfcb5e61c05562fb5e53fda03afdc40e841cbb2676f9fc
-  data.tar.gz: 159dba44203a4612598949a47e4fbd8f11a99b19dcceb368f1ebab4c65a5c785790163dcdb6998f780b17d0d9836c26087d3a68ae6367376d144007993094fc0
+  metadata.gz: 59e7282f5603b4849ab7e6d5b007099e3533421cb00a305ee89c7709dee1ac75dea40d559adf906800cba06aa23acfb4ce3847d6200fb9f67ddd2f800de6aaf1
+  data.tar.gz: 5133a7c384c40a87e2a4578a25753bd0fbd8f7011e1214a1f52ff71f9573423bc39a1aa53cbd5d63fd0ce2fe0b7b9147f5c22d0bf6738516d881e7617fb0e474

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+### 2.1.3 - 2018-05-16
+
+- Optimized `rackup` to look for files in the root directory before calling rackup as the default. The root is now set to `./public` instead of `.`. The `:rmux` (rack multiplex) turns that off.
+
+### 2.1.2 - 2018-05-15
+
+- Added `#open?` method to the Upgraded (connection client) class.
+
+- Slight improvement performcance serving static assets for Rails.
+
 ### 2.1.1 - 2018-05-11
 
 - Subject can now be Symbols or any other object that responds top `#to_s`.

data/README.md

@@ -41,11 +41,11 @@ performance HTTP server that serves static resource at hundreds of thousands
 of fetchs per second. A a simple hello world Ruby handler at over 100,000
 requests per second on a desktop computer. That places Agoo at about 85 times
 faster than Sinatra and 1000 times faster than Rails. In both cases the
-latency was two orders of magnitude lower or more. Checkout the benchmarks on
-<a href="http://opo.technology/benchmarks.html#web_benchmarks">OpO
-benchmarks</a>. Note that the benchmarks had to use a C program called <a
-href="https://github.com/ohler55/perfer">Perfer</a> to hit the Agoo
-limits. Ruby benchmarks driver could not push Agoo hard enough.
+latency was two orders of magnitude lower or more. Checkout the
+[benchmarks](http://opo.technology/benchmarks.html#web_benchmarks). Note that
+the benchmarks had to use a C program called
+[Perfer](https://github.com/ohler55/perfer) to hit the Agoo limits. Ruby
+benchmarks driver could not push Agoo hard enough.
 
 Agoo supports the [Ruby rack API](https://rack.github.io) which allows for the
 use of rack compatible gems such as Hanami and Rails. Agoo also supports WebSockets and SSE.
@@ -57,8 +57,8 @@ use of rack compatible gems such as Hanami and Rails. Agoo also supports WebSock
   extension](https://github.com/rack/rack/pull/1272) and give it a look and a
   thumbs-up or heart if you like it.
 
-- Agoo now serves Rails static assets 2000 times faster than the default
-  Puma. Thats right, 2000 times faster.
+- Agoo now serves Rails static assets more than 2000 times faster than the
+  default Puma. Thats right, [2000 times faster](misc/rails.md).
 
 ## Releases
 
@@ -69,7 +69,7 @@ the develop branch. Pull requests should be made against the develop branch.
 
 ## Links
 
- - *Documentation*: http://rubydoc.info/gems/agoo
+ - *Documentation*: http://rubydoc.info/gems/agoo or http://www.ohler.com/agoo/doc/index.html
 
  - *GitHub* *repo*: https://github.com/ohler55/agoo
 

data/ext/agoo/con.c

@@ -124,6 +124,31 @@ should_close(const char *header, int hlen) {
     return false;
 }
 
+static bool
+page_response(Con c, Page p, char *hend) {
+    Res 	res;
+    char	*b;
+    
+    if (NULL == (res = res_create(c))) {
+	return true;
+    }
+    if (NULL == c->res_tail) {
+	c->res_head = res;
+    } else {
+	c->res_tail->next = res;
+    }
+    c->res_tail = res;
+
+    b = strstr(c->buf, "\r\n");
+    res->close = should_close(b, (int)(hend - b));
+    if (res->close) {
+	c->closing = true;
+    }
+    res_set_message(res, p->resp);
+
+    return false;
+}
+
 // Returns:
 //  0 - when header has not been read
 //  message length - when length can be determined
@@ -244,26 +269,35 @@ 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)))) {
-	if (NULL == (res = res_create(c))) {
+	if (page_response(c, p, hend)) {
 	    return bad_request(c, 500, __LINE__);
 	}
-	if (NULL == c->res_tail) {
-	    c->res_head = res;
-	} else {
-	    c->res_tail->next = res;
-	}
-	c->res_tail = res;
+	return -mlen;
 
-	b = strstr(c->buf, "\r\n");
-	res->close = should_close(b, (int)(hend - b));
-	if (res->close) {
-	    c->closing = true;
+	// TBD int hook_or_page(method, path, pend, &hook)
+	//  return http status
+	//  0 is not handled
+	//  200 means taken care of
+	//  default (over 200) call bad_request
+    }
+    if (GET == method && the_server.root_first &&
+	       NULL != (p = page_get(&err, &the_server.pages, path, (int)(pend - path)))) {
+	if (page_response(c, p, hend)) {
+	    return bad_request(c, 500, __LINE__);
 	}
-	res_set_message(res, p->resp);
-
 	return -mlen;
-    } else if (NULL == (hook = hook_find(the_server.hooks, method, path, pend))) {
+    }
+    if (NULL == (hook = hook_find(the_server.hooks, method, path, pend))) {
 	if (GET == method) {
+	    if (the_server.root_first) { // already checked
+		if (NULL != the_server.hook404) {
+		    // There would be too many parameters to pass to a
+		    // separate function so just goto the hook processing.
+		    hook = the_server.hook404;
+		    goto HOOKED;
+		}
+		return bad_request(c, 404, __LINE__);
+	    }
 	    if (NULL == (p = page_get(&err, &the_server.pages, path, (int)(pend - path)))) {
 		if (NULL != the_server.hook404) {
 		    // There would be too many parameters to pass to a
@@ -273,23 +307,9 @@ con_header_read(Con c) {
 		}
 		return bad_request(c, 404, __LINE__);
 	    }
-    	    if (NULL == (res = res_create(c))) {
+	    if (page_response(c, p, hend)) {
 		return bad_request(c, 500, __LINE__);
 	    }
-	    if (NULL == c->res_tail) {
-		c->res_head = res;
-	    } else {
-		c->res_tail->next = res;
-	    }
-	    c->res_tail = res;
-
-	    b = strstr(c->buf, "\r\n");
-	    res->close = should_close(b, (int)(hend - b));
-	    if (res->close) {
-		c->closing = true;
-	    }
-	    res_set_message(res, p->resp);
-
 	    return -mlen;
 	}
     }

data/ext/agoo/page.c

@@ -401,11 +401,33 @@ update_contents(Cache cache, Page p) {
     return true;
 }
 
+static Page
+page_check(Err err, Cache cache, Page page) {
+    double	now = dtime();
+
+    if (page->last_check + PAGE_RECHECK_TIME < now) {
+	struct stat	fattr;
+
+	if (0 == stat(page->path, &fattr) && page->mtime != fattr.st_mtime) {
+	    update_contents(cache, page);
+	    if (NULL == page->resp) {
+		page_destroy(page);
+		err_set(err, ERR_NOT_FOUND, "not found.");
+		return NULL;
+	    }
+	}
+	page->last_check = now;
+    }
+    return page;
+}
+
 Page
 page_get(Err err, Cache cache, const char *path, int plen) {
     Page	page;
 
-    // TBD check for .. and ~
+    if (NULL != strstr(path, "../")) {
+	return NULL;
+    }
     if (NULL == (page = cache_get(cache, path, plen))) {
 	Page	old;
 	char	full_path[2048];
@@ -433,21 +455,7 @@ page_get(Err err, Cache cache, const char *path, int plen) {
 	    page_destroy(old);
 	}
     } else {
-	double	now = dtime();
-
-	if (page->last_check + PAGE_RECHECK_TIME < now) {
-	    struct stat	fattr;
-
-	    if (0 == stat(page->path, &fattr) && page->mtime != fattr.st_mtime) {
-		update_contents(cache, page);
-		if (NULL == page->resp) {
-		    page_destroy(page);
-		    err_set(err, ERR_NOT_FOUND, "not found.");
-		    return NULL;
-		}
-	    }
-	    page->last_check = now;
-	}
+	page = page_check(err, cache, page);
     }
     return page;
 }
@@ -457,11 +465,13 @@ group_get(Err err, Cache cache, const char *path, int plen) {
     Page	page = NULL;
     Group	g = NULL;
     char	full_path[2048];
-    Page	old;
     char	*s;
     Dir		d;
+    double	now;
 
-    // TBD check for .. and ~
+    if (NULL != strstr(path, "../")) {
+	return NULL;
+    }
     for (g = cache->groups; NULL != g; g = g->next) {
 	if (g->plen < plen && 0 == strncmp(path, g->path, g->plen) && '/' == path[g->plen]) {
 	    break;
@@ -471,55 +481,54 @@ group_get(Err err, Cache cache, const char *path, int plen) {
 	return NULL;
     }
     for (d = g->dirs; NULL != d; d = d->next) {
-	if (sizeof(full_path) <= d->plen + plen) {
+	if ((int)sizeof(full_path) <= d->plen + plen) {
 	    continue;
 	}
 	s = stpcpy(full_path, d->path);
 	strncpy(s, path + g->plen, plen - g->plen);
 	s += plen - g->plen;
 	*s = '\0';
-	if (0 == access(full_path, R_OK)) {
+	if (NULL != (page = cache_get(cache, full_path, s - full_path))) {
 	    break;
 	}
     }
-    if (NULL == d) {
-	return NULL;
-    }
-    plen = s - full_path;
-    path = full_path;
-    if (NULL == (page = cache_get(cache, path, plen))) {
-	Page	old;
-
-	if (NULL == (page = page_create(path))) {
-	    err_set(err, ERR_MEMORY, "Failed to allocate memory for Page.");
-	    return NULL;
+    if (NULL == page) {
+	for (d = g->dirs; NULL != d; d = d->next) {
+	    if ((int)sizeof(full_path) <= d->plen + plen) {
+		continue;
+	    }
+	    s = stpcpy(full_path, d->path);
+	    strncpy(s, path + g->plen, plen - g->plen);
+	    s += plen - g->plen;
+	    *s = '\0';
+	    if (0 == access(full_path, R_OK)) {
+		break;
+	    }
 	}
-	if (!update_contents(cache, page) || NULL == page->resp) {
-	    page_destroy(page);
-	    err_set(err, ERR_NOT_FOUND, "not found.");
+	if (NULL == d) {
 	    return NULL;
 	}
-	if (NULL != (old = cache_set(cache, path, plen, page))) {
-	    page_destroy(old);
-	}
-    } else {
-	double	now = dtime();
-
-	if (page->last_check + PAGE_RECHECK_TIME < now) {
-	    struct stat	fattr;
-
-	    if (0 == stat(page->path, &fattr) && page->mtime != fattr.st_mtime) {
-		update_contents(cache, page);
-		if (NULL == page->resp) {
-		    page_destroy(page);
-		    err_set(err, ERR_NOT_FOUND, "not found.");
-		    return NULL;
-		}
+	plen = s - full_path;
+	path = full_path;
+	if (NULL == (page = cache_get(cache, path, plen))) {
+	    Page	old;
+
+	    if (NULL == (page = page_create(path))) {
+		err_set(err, ERR_MEMORY, "Failed to allocate memory for Page.");
+		return NULL;
+	    }
+	    if (!update_contents(cache, page) || NULL == page->resp) {
+		page_destroy(page);
+		err_set(err, ERR_NOT_FOUND, "not found.");
+		return NULL;
+	    }
+	    if (NULL != (old = cache_set(cache, path, plen, page))) {
+		page_destroy(old);
 	    }
-	    page->last_check = now;
 	}
+	return page;
     }
-    return page;
+    return page_check(err, cache, page);
 }
 
 Group

data/ext/agoo/server.c

@@ -135,6 +135,7 @@ configure(Err err, int port, const char *root, VALUE options) {
     the_server.listen_thread = 0;
     the_server.con_thread = 0;
     the_server.max_push_pending = 32;
+    the_server.root_first = false;
     if (Qnil != options) {
 	VALUE	v;
 
@@ -159,6 +160,9 @@ configure(Err err, int port, const char *root, VALUE options) {
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("pedantic"))))) {
 	    the_server.pedantic = (Qtrue == v);
 	}
+	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("root_first"))))) {
+	    the_server.root_first = (Qtrue == v);
+	}
 	if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("Port"))))) {
 	    if (rb_cInteger == rb_obj_class(v)) {
 		the_server.port = NUM2INT(v);
@@ -207,7 +211,7 @@ configure(Err err, int port, const char *root, VALUE options) {
  *
  * - *options* [_Hash_] server options
  *
- *   - *:pedantic* [_true_|_false_] if true response header and status codes are check and an exception raised if they violate the rack spec at https://github.com/rack/rack/blob/master/SPEC, https://tools.ietf.org/html/rfc3875#section-4.1.18, or https://tools.ietf.org/html/rfc7230.
+ *   - *:pedantic* [_true_|_false_] if true response header and status codes are checked and an exception raised if they violate the rack spec at https://github.com/rack/rack/blob/master/SPEC, https://tools.ietf.org/html/rfc3875#section-4.1.18, or https://tools.ietf.org/html/rfc7230.
  *
  *   - *:thread_count* [_Integer_] number of ruby worker threads. Defaults to one. If zero then the _start_ function will not return but instead will proess using the thread that called _start_. Usually the default is best unless the workers are making IO calls.
  */

data/ext/agoo/server.h

@@ -23,6 +23,7 @@ typedef struct _Server {
     int			max_push_pending;
     int			port;
     bool		pedantic;
+    bool		root_first;
     atomic_int		running;
     pthread_t		listen_thread;
     pthread_t		con_thread;

data/ext/agoo/upgraded.c

@@ -283,6 +283,24 @@ pending(VALUE self) {
     return INT2NUM(pending);
 }
 
+/* Document-method: open?
+ *
+ * call-seq: open?()
+ *
+ * Returns true if the connection is open and false otherwise.
+ */
+static VALUE
+up_open(VALUE self) {
+    Upgraded	up = get_upgraded(self);
+    int		pending = -1;
+    
+    if (NULL != up) {
+	pending = atomic_load(&up->pending);
+	atomic_fetch_sub(&up->ref_cnt, 1);
+    }
+    return 0 <= pending ? Qtrue : Qfalse;
+}
+
 /* Document-method: protocol
  *
  * call-seq: protocol()
@@ -371,6 +389,7 @@ upgraded_init(VALUE mod) {
     rb_define_method(upgraded_class, "pending", pending, 0);
     rb_define_method(upgraded_class, "protocol", protocol, 0);
     rb_define_method(upgraded_class, "publish", ragoo_publish, 2);
+    rb_define_method(upgraded_class, "open?", up_open, 0);
 
     on_open_id = rb_intern("on_open");
     to_s_id = rb_intern("to_s");

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.1.1'
+  VERSION = '2.1.3'
 end

data/lib/rack/handler/agoo.rb

@@ -10,14 +10,16 @@ module Rack
     # The Rack::Handler::Agoo module is a handler for common rack config.rb files.
     module Agoo
 
-      # Run the server. Options are the same as for Agoo::Server plus a :prot
+      # Run the server. Options are the same as for Agoo::Server plus a :port
       # and :root option.
       def self.run(handler, options={})
 	port = 9292
-	root = '.'
+	root = './public'
+        root_set = false
 	default_handler = nil
 	not_found_handler = nil
 	path_map = {}
+        options[:root_first] = true # the default for rack
 
 	default_handler = handler unless handler.nil?
 	options.each { |k,v|
@@ -26,7 +28,10 @@ module Rack
 	    options.delete(k)
 	  elsif :root == k
 	    root = v
+            root_set = true
 	    options.delete(k)
+	  elsif :rmux == k
+            options[:root_first] = false
 	  elsif k.nil?
 	    not_found_handler = v
 	    options.delete(k)
@@ -46,6 +51,7 @@ module Rack
         begin
           # If Rails is loaded this should work else just ignore.
           ::Agoo::Server.path_group('/assets', Rails.configuration.assets.paths)
+          root = Rails.public_path unless root_set
         rescue Exception
         end
 	unless default_handler.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj