agoo 2.15.8 → 2.15.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02abdb9101a03fc778a6cac9b0ee843e1ba5d174faf33737dec99953f9950651
-  data.tar.gz: 2a59de84f142434913db679a6ea0cbe696f7681b5ff748da8f20cbced2f7358b
+  metadata.gz: a329302a6e94be7ff5873793bc52c5dd6fe31b3913387ad739ec4313938e7248
+  data.tar.gz: 10c1bfbf837b13c1cc40e365dc85b6c2a81a7b7c1fd7006c5042dc6dd1f9103d
 SHA512:
-  metadata.gz: f4126df37e2339f76d007c0d96d5929b4ba50dc0ea65e4a50d7a3577403fe641eaf8054cc48e975b18786b321eddfe022a0994556784c5b33dd93504d9981d00
-  data.tar.gz: 9072e8a005ce5fbc1b033c14cd05990096371d4d885a65a7e1af2684ab5cd13cf745de71ce1b846f1655b7176b179d254aa9369c79200adfe15cfdcc9975e2fc
+  metadata.gz: e632b26c5dde2b454214502bb76211682a23ac1d3f6951fb59340e96198279635da2a89872f139686cec4061d50ae11a3cb4c022ea71644de13113cbd91c377a
+  data.tar.gz: 454fdd7f38f7c0abe43e68a25ca67ac6adfab3ef2cbc99c5778d24e991fe436470a7e684ecc69ea6b9b0da49ce3de6aaa2bd6732c6c008cf6fb81c25181ad29d

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All changes to the Agoo gem are documented here. Releases follow semantic versioning.
 
+## [2.15.9] - 2024-02-26
+
+### Fixed
+
+- Updated to support the most recent version of rack.
+
 ## [2.15.8] - 2023-10-07
 
 ### Fixed

data/ext/agoo/con.c

@@ -26,9 +26,10 @@
 #include "upgraded.h"
 #include "websocket.h"
 
-#define CON_TIMEOUT		10.0
 #define INITIAL_POLL_SIZE	1024
 
+double con_timeout = 30.0;
+
 typedef enum {
     HEAD_AGAIN		= 'A',
     HEAD_ERR		= 'E',
@@ -81,7 +82,7 @@ agoo_con_create(agooErr err, int sock, uint64_t id, agooBind b) {
 	}
 	c->sock = sock;
 	c->id = id;
-	c->timeout = dtime() + CON_TIMEOUT;
+	c->timeout = dtime() + con_timeout;
 	c->bind = b;
 	c->loop = NULL;
 	pthread_mutex_init(&c->res_lock, 0);
@@ -289,6 +290,8 @@ con_header_read(agooCon c, size_t *mlenp) {
     char		*query = NULL;
     char		*qend;
     char		*b;
+    char		*proto;
+    char		*pend;
     size_t		clen = 0;
     long		mlen;
     agooHook		hook = NULL;
@@ -395,7 +398,12 @@ con_header_read(agooCon c, size_t *mlenp) {
     }
     mlen = hend - c->buf + 4 + clen;
     *mlenp = mlen;
-
+    proto = qend;
+    for (; ' ' == *proto; proto++) {
+    }
+    pend = proto;
+    for (; '\r' != *pend; pend++) {
+    }
     if (AGOO_GET == method) {
 	char		root_buf[20148];
 	const char	*root = NULL;
@@ -461,6 +469,8 @@ con_header_read(agooCon c, size_t *mlenp) {
     c->req->query.start = c->req->msg + (query - c->buf);
     c->req->query.len = (int)(qend - query);
     c->req->query.start[c->req->query.len] = '\0';
+    c->req->protocol.start = proto;
+    c->req->protocol.len = (int)(pend - proto);
     c->req->body.start = c->req->msg + (hend - c->buf + 4);
     c->req->body.len = (unsigned int)clen;
     b = strstr(b, "\r\n");
@@ -555,7 +565,7 @@ agoo_con_http_read(agooCon c) {
 	    cnt = recv(c->sock, c->buf + c->bcnt, sizeof(c->buf) - c->bcnt - 1, 0);
 	}
     }
-    c->timeout = dtime() + CON_TIMEOUT;
+    c->timeout = dtime() + con_timeout;
     if (0 >= cnt) {
 	// If nothing read then no need to complain. Just close.
 	if (0 < c->bcnt) {
@@ -658,7 +668,7 @@ agoo_con_http_write(agooCon c) {
     if (NULL == message) {
 	return true;
     }
-    c->timeout = dtime() + CON_TIMEOUT;
+    c->timeout = dtime() + con_timeout;
     if (0 == c->wcnt) {
 	if (agoo_resp_cat.on) {
 	    char	buf[4096];
@@ -736,7 +746,7 @@ con_ws_read(agooCon c) {
     } else {
 	cnt = recv(c->sock, c->buf + c->bcnt, sizeof(c->buf) - c->bcnt - 1, 0);
     }
-    c->timeout = dtime() + CON_TIMEOUT;
+    c->timeout = dtime() + con_timeout;
     if (0 >= cnt) {
 	// If nothing read then no need to complain. Just close.
 	if (0 < c->bcnt) {
@@ -883,7 +893,7 @@ con_ws_write(agooCon c) {
 	}
 	return true;
     }
-    c->timeout = dtime() + CON_TIMEOUT;
+    c->timeout = dtime() + con_timeout;
     if (0 == c->wcnt) {
 	agooText	t;
 
@@ -943,7 +953,7 @@ con_sse_write(agooCon c) {
 
 	return false;
     }
-    c->timeout = dtime() + CON_TIMEOUT *2;
+    c->timeout = dtime() + con_timeout *2;
     if (0 == c->wcnt) {
 	agooText	t;
 
@@ -1177,7 +1187,7 @@ con_ready_check(void *ctx, double now) {
 	    return true;
 	}
     } else if (AGOO_CON_WS == c->bind->kind || AGOO_CON_SSE == c->bind->kind) {
-	c->timeout = dtime() + CON_TIMEOUT;
+	c->timeout = dtime() + con_timeout;
 	if (AGOO_CON_WS == c->bind->kind) {
 	    agoo_ws_ping(c);
 	}

data/ext/agoo/con.h

@@ -20,6 +20,8 @@
 
 #define MAX_HEADER_SIZE	8192
 
+extern double con_timeout;
+
 struct _agooUpgraded;
 struct _agooReq;
 struct _agooRes;

data/ext/agoo/req.c

@@ -71,6 +71,13 @@ agoo_req_port(agooReq r) {
     return (int)strtol(colon + 1, NULL, 10);
 }
 
+const char*
+agoo_req_protocol(agooReq r, int *lenp) {
+    *lenp = r->protocol.len;
+
+    return r->protocol.start;
+}
+
 const char*
 agoo_req_query_value(agooReq r, const char *key, int klen, int *vlenp) {
     const char	*value;

data/ext/agoo/req.h

@@ -31,6 +31,7 @@ typedef struct _agooReq {
     struct _agooUpgraded	*up;
     struct _agooStr		path;
     struct _agooStr		query;
+    struct _agooStr		protocol;
     struct _agooStr		header;
     struct _agooStr		body;
     char			remote[INET6_ADDRSTRLEN];
@@ -43,6 +44,7 @@ typedef struct _agooReq {
 extern agooReq		agoo_req_create(size_t mlen);
 extern void		agoo_req_destroy(agooReq req);
 extern const char*	agoo_req_host(agooReq r, int *lenp);
+extern const char*	agoo_req_protocol(agooReq r, int *lenp);
 extern int		agoo_req_port(agooReq r);
 extern const char*	agoo_req_query_value(agooReq r, const char *key, int klen, int *vlenp);
 extern int		agoo_req_query_decode(char *s, int len);

data/ext/agoo/request.c

@@ -48,6 +48,7 @@ static VALUE	request_method_val = Qundef;
 static VALUE	script_name_val = Qundef;
 static VALUE	server_name_val = Qundef;
 static VALUE	server_port_val = Qundef;
+static VALUE	server_protocol_val = Qundef;
 static VALUE	slash_val = Qundef;
 
 static VALUE	sse_sym;
@@ -218,6 +219,31 @@ server_name(VALUE self) {
     return req_server_name((agooReq)DATA_PTR(self));
 }
 
+static VALUE
+req_server_protocol(agooReq r) {
+    int		len;
+    const char	*protocol;
+
+    if (NULL == r) {
+	rb_raise(rb_eArgError, "Request is no longer valid.");
+    }
+    if (NULL == (protocol = agoo_req_protocol(r, &len))) {
+	return rb_str_new2("HTTP/1.1");
+    }
+    return rb_str_new(protocol, len);
+}
+
+/* Document-method: server_protocol
+ *
+ * call-seq: server_protocol()
+ *
+ * Returns the server or host protocol.
+ */
+static VALUE
+server_protocol(VALUE self) {
+    return req_server_protocol((agooReq)DATA_PTR(self));
+}
+
 static VALUE
 req_server_port(agooReq r) {
     int		len;
@@ -594,6 +620,7 @@ request_env(agooReq req, VALUE self) {
 	rb_hash_aset(env, remote_addr_val, req_remote_addr(req));
 	rb_hash_aset(env, server_port_val, req_server_port(req));
 	rb_hash_aset(env, server_name_val, req_server_name(req));
+	rb_hash_aset(env, server_protocol_val, req_server_protocol(req));
 	fill_headers(req, env);
 	rb_hash_aset(env, rack_version_val, rack_version_val_val);
 	rb_hash_aset(env, rack_url_scheme_val, req_rack_url_scheme(req));
@@ -739,6 +766,7 @@ request_init(VALUE mod) {
     rb_define_method(req_class, "query_string", query_string, 0);
     rb_define_method(req_class, "server_name", server_name, 0);
     rb_define_method(req_class, "server_port", server_port, 0);
+    rb_define_method(req_class, "server_protocol", server_protocol, 0);
     rb_define_method(req_class, "remote_addr", remote_addr, 0);
     rb_define_method(req_class, "rack_version", rack_version, 0);
     rb_define_method(req_class, "rack_url_scheme", rack_url_scheme, 0);
@@ -796,6 +824,7 @@ request_init(VALUE mod) {
     script_name_val = rb_str_new_cstr("SCRIPT_NAME");		rb_gc_register_address(&script_name_val);
     server_name_val = rb_str_new_cstr("SERVER_NAME");		rb_gc_register_address(&server_name_val);
     server_port_val = rb_str_new_cstr("SERVER_PORT");		rb_gc_register_address(&server_port_val);
+    server_protocol_val = rb_str_new_cstr("SERVER_PROTOCOL");		rb_gc_register_address(&server_protocol_val);
     slash_val = rb_str_new_cstr("/");				rb_gc_register_address(&slash_val);
 
     sse_sym = ID2SYM(rb_intern("sse"));				rb_gc_register_address(&sse_sym);

data/ext/agoo/rserver.c

@@ -104,6 +104,7 @@ configure(agooErr err, int port, const char *root, VALUE options) {
     }
     agoo_server.thread_cnt = 0;
     the_rserver.worker_cnt = 1;
+    the_rserver.forker = Qnil;
     the_rserver.uses = NULL;
     atomic_init(&agoo_server.running, 0);
     agoo_server.listen_thread = 0;
@@ -132,6 +133,8 @@ configure(agooErr err, int port, const char *root, VALUE options) {
                 rb_raise(rb_eArgError, "thread_count must be between 1 and %d.", MAX_WORKERS);
             }
         }
+				the_rserver.forker = rb_hash_lookup(options, ID2SYM(rb_intern("fork_wrap")));
+
         if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("poll_timeout"))))) {
             double  timeout = rb_num2dbl(v);
 
@@ -141,6 +144,15 @@ configure(agooErr err, int port, const char *root, VALUE options) {
                 rb_raise(rb_eArgError, "poll_timeout must be between 0.0001 and 1.0.");
             }
         }
+        if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("connection_timeout"))))) {
+            double  timeout = rb_num2dbl(v);
+
+            if (0.1 <= timeout) {
+                con_timeout = timeout;
+            } else {
+                rb_raise(rb_eArgError, "connection_timeout must be greater than 0.1 seconds.");
+            }
+        }
         if (Qnil != (v = rb_hash_lookup(options, ID2SYM(rb_intern("max_push_pending"))))) {
             int mpp = FIX2INT(v);
 
@@ -295,6 +307,8 @@ configure(agooErr err, int port, const char *root, VALUE options) {
  *
  *   - *:poll_timeout* [_Float_] timeout seconds when polling. Default is 0.1. Lower gives faster response times but uses more CPU.
  *
+ *   - *:connection_timeout* [_Float_] timeout seconds for connections. Default is 30.
+ *
  *   - *:bind* [_String_|_Array_] a binding or array of binds. Examples are: "http ://127.0.0.1:6464", "unix:///tmp/agoo.socket", "http ://[::1]:6464, or to not restrict the address "http ://:6464".
  *
  *   - *:graphql* [_String_] path to GraphQL endpoint if support for GraphQL is desired.
@@ -805,6 +819,7 @@ rserver_start(VALUE self) {
     struct _agooErr err = AGOO_ERR_INIT;
     VALUE   agoo = rb_const_get_at(rb_cObject, rb_intern("Agoo"));
     VALUE   v = rb_const_get_at(agoo, rb_intern("VERSION"));
+    ID      after = rb_intern("after");
 
     *the_rserver.worker_pids = getpid();
 
@@ -819,6 +834,13 @@ rserver_start(VALUE self) {
     if (AGOO_ERR_OK != setup_listen(&err)) {
         rb_raise(rb_eIOError, "%s", err.msg);
     }
+		if (1 < the_rserver.worker_cnt && the_rserver.forker != Qnil) {
+				ID	before = rb_intern("before");
+
+				if (rb_respond_to(the_rserver.forker, before)) {
+						rb_funcall(the_rserver.forker, before, 0);
+				}
+		}
     for (i = 1; i < the_rserver.worker_cnt; i++) {
         VALUE rpid = rb_funcall(rb_cObject, rb_intern("fork"), 0);
 
@@ -839,6 +861,9 @@ rserver_start(VALUE self) {
             the_rserver.worker_pids[i] = pid;
         }
     }
+		if (1 < the_rserver.worker_cnt && the_rserver.forker != Qnil && rb_respond_to(the_rserver.forker, after)) {
+				rb_funcall(the_rserver.forker, after, 0);
+		}
     if (AGOO_ERR_OK != agoo_server_start(&err, "Agoo", StringValuePtr(v))) {
         rb_raise(rb_eStandardError, "%s", err.msg);
     }

data/ext/agoo/rserver.h

@@ -18,6 +18,7 @@ typedef struct _rServer {
     int		worker_cnt;
     int		worker_pids[MAX_WORKERS];
     VALUE	*eval_threads; // Qnil terminated
+		VALUE	forker;
     RUse	uses;
 } *RServer;
 

data/ext/agoo/server.c

@@ -149,7 +149,7 @@ listen_loop(void *x) {
                     cnt--;
                     agoo_err_clear(&err);
                 } else {
-                    int con_cnt;
+                    // int con_cnt;
 #ifdef OSX_OS
                     setsockopt(client_sock, SOL_SOCKET, SO_NOSIGPIPE, &optval, sizeof(optval));
 #endif
@@ -163,8 +163,8 @@ listen_loop(void *x) {
                     agoo_log_cat(&agoo_con_cat, "Server with pid %d accepted connection %llu on %s [%d] from %s",
                                  getpid(), (unsigned long long)cnt, b->id, con->sock, con->remote);
 
-                    con_cnt = atomic_fetch_add(&agoo_server.con_cnt, 1);
 										/* TBD
+                    con_cnt = atomic_fetch_add(&agoo_server.con_cnt, 1);
                     if (agoo_server.loop_max > agoo_server.loop_cnt && agoo_server.loop_cnt * LOOP_UP < con_cnt) {
                         add_con_loop();
                     }

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.15.8'
+  VERSION = '2.15.9'
 end

data/lib/agoo.rb

@@ -8,4 +8,5 @@ require 'agoo/graphql'
 require 'rack/handler/agoo'
 require 'agoo/agoo' # C extension
 
+ENV['RACKUP_HANDLER'] = 'Agoo'
 ENV['RACK_HANDLER'] = 'Agoo'

data/lib/rack/handler/agoo.rb

@@ -177,8 +177,14 @@ using the -O NAME[=VALUE] option of rackup. Note that if binds are provided the
 end
 
 begin
-  ::Rack::Handler.register('agoo', 'Rack::Handler::Agoo')
-  ::Rack::Handler.register('Agoo', 'Rack::Handler::Agoo')
+  ::Rackup::Handler.register('agoo', Rack::Handler::Agoo)
+  ::Rackup::Handler.register('Agoo', Rack::Handler::Agoo)
 rescue Exception
+  begin
+    # try the old style
+    ::Rack::Handler.register('agoo', 'Rack::Handler::Agoo')
+    ::Rack::Handler.register('Agoo', 'Rack::Handler::Agoo')
+  rescue Exception
+  end
   # Rack or Rack::Handler.register has not been required.
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.15.8
+  version: 2.15.9
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-07 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Linux or macOS
-rubygems_version: 3.4.10
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: An HTTP server