agoo 2.2.2 → 2.3.0

data/ext/agoo/rlog.h

@@ -0,0 +1,11 @@
+// Copyright 2018 by Peter Ohler, All Rights Reserved
+
+#ifndef __AGOO_RLOG_H__
+#define __AGOO_RLOG_H__
+
+#include <ruby.h>
+#include "log.h"
+
+extern void	rlog_init(VALUE mod);
+
+#endif /* __AGOO_RLOG_H__ */

data/ext/agoo/seg.h

@@ -0,0 +1,11 @@
+// Copyright (c) 2018, Peter Ohler, All rights reserved.
+
+#ifndef __AGOO_SEG_H__
+#define __AGOO_SEG_H__
+
+typedef struct _Seg {
+    char	*start;
+    char	*end;
+} *Seg;
+
+#endif // __AGOO_SEG_H__

data/ext/agoo/server.c

@@ -74,6 +74,9 @@ server_mark(void *ptr) {
 	if (Qnil != up->handler) {
 	    rb_gc_mark(up->handler);
 	}
+	if (Qnil != up->env) {
+	    rb_gc_mark(up->env);
+	}
 	if (Qnil != up->wrap) {
 	    rb_gc_mark(up->wrap);
 	}
@@ -423,6 +426,17 @@ rescue_error(VALUE x) {
 	res_set_message(req->res, message);
 	queue_wakeup(&the_server.con_queue);
     } else {
+	// TBD should the backtrace be included in the log?
+/*
+	volatile VALUE	bt = rb_funcall(info, rb_intern("backtrace"), 0);
+	int		blen = RARRAY_LEN(bt);
+	int		i;
+	VALUE		rline;
+	
+	for (i = 0; i < blen; i++) {
+	    rline = rb_ary_entry(bt, i);
+	}
+*/
 	log_cat(&error_cat, "%s: %s", classname, ms);
     }
     return Qfalse;
@@ -585,7 +599,7 @@ handle_rack_inner(void *x) {
 		break;
 	    }
 	    req->handler_type = PUSH_HOOK;
-	    upgraded_create(req->res->con, req->handler);
+	    upgraded_create(req->res->con, req->handler, request_env(req));
 	    t->len = snprintf(t->text, 1024, "HTTP/1.1 101 %s\r\n", status_msg);
 	    t = ws_add_headers(req, t);
 	    break;
@@ -597,7 +611,7 @@ handle_rack_inner(void *x) {
 		break;
 	    }
 	    req->handler_type = PUSH_HOOK;
-	    upgraded_create(req->res->con, req->handler);
+	    upgraded_create(req->res->con, req->handler, request_env(req));
 	    t = sse_upgrade(req, t);
 	    res_set_message(req->res, t);
 	    queue_wakeup(&the_server.con_queue);
@@ -674,12 +688,12 @@ handle_push_inner(void *x) {
 
     switch (req->method) {
     case ON_MSG:
-	if (req->up->on_msg) { // TBD move this to earlier
+	if (req->up->on_msg) {
 	    rb_funcall(req->handler, on_message_id, 2, req->up->wrap, rb_str_new(req->msg, req->mlen));
 	}
 	break;
     case ON_BIN:
-	if (req->up->on_msg) { // TBD move this to earlier
+	if (req->up->on_msg) {
 	    volatile VALUE	rstr = rb_str_new(req->msg, req->mlen);
 
 	    rb_enc_associate(rstr, rb_ascii8bit_encoding());
@@ -917,7 +931,7 @@ handle(VALUE self, VALUE method, VALUE pattern, VALUE handler) {
     } else {
 	rb_raise(rb_eArgError, "invalid method");
     }
-    if (NULL == (hook = hook_create(meth, pat, handler))) {
+    if (NULL == (hook = rhook_create(meth, pat, handler))) {
 	rb_raise(rb_eStandardError, "out of memory.");
     } else {
 	Hook	h;
@@ -931,7 +945,7 @@ handle(VALUE self, VALUE method, VALUE pattern, VALUE handler) {
 	} else {
 	    the_server.hooks = hook;
 	}
-	rb_gc_register_address(&hook->handler);
+	rb_gc_register_address((VALUE*)&hook->handler);
     }
     return Qnil;
 }
@@ -945,10 +959,10 @@ handle(VALUE self, VALUE method, VALUE pattern, VALUE handler) {
  */
 static VALUE
 handle_not_found(VALUE self, VALUE handler) {
-    if (NULL == (the_server.hook404 = hook_create(GET, "/", handler))) {
+    if (NULL == (the_server.hook404 = rhook_create(GET, "/", handler))) {
 	rb_raise(rb_eStandardError, "out of memory.");
     }
-    rb_gc_register_address(&the_server.hook404->handler);
+    rb_gc_register_address((VALUE*)&the_server.hook404->handler);
     
     return Qnil;
 }

data/ext/agoo/server.h

@@ -9,7 +9,7 @@
 
 #include <ruby.h>
 
-#include "hook.h"
+#include "rhook.h"
 #include "log.h"
 #include "page.h"
 #include "queue.h"

data/ext/agoo/types.h

@@ -3,25 +3,6 @@
 #ifndef __AGOO_TYPES_H__
 #define __AGOO_TYPES_H__
 
-typedef enum {
-    CONNECT	= 'C',
-    DELETE	= 'D',
-    GET		= 'G',
-    HEAD	= 'H',
-    OPTIONS	= 'O',
-    POST	= 'P',
-    PUT		= 'U',
-    PATCH	= 'T',
-    ALL		= 'A',
-    NONE	= '\0',
-
-    ON_MSG	= 'M', // use for on_message callback
-    ON_BIN	= 'B', // use for on_message callback with binary (ASCII8BIT)
-    ON_CLOSE	= 'X', // use for on_close callback
-    ON_SHUTDOWN	= 'S', // use for on_shotdown callback
-    ON_EMPTY	= 'E', // use for on_drained callback
-} Method;
-
 typedef enum {
     CON_ANY	= '\0',
     CON_HTTP	= 'H',

data/ext/agoo/upgraded.c

@@ -334,7 +334,7 @@ protocol(VALUE self) {
 }
 
 Upgraded
-upgraded_create(Con c, VALUE obj) {
+upgraded_create(Con c, VALUE obj, VALUE env) {
     Upgraded	up = (Upgraded)malloc(sizeof(struct _Upgraded));
 
     if (!the_server.active) {
@@ -344,6 +344,7 @@ upgraded_create(Con c, VALUE obj) {
 	DEBUG_ALLOC(mem_upgraded, up);
 	up->con = c;
 	up->handler = obj;
+	up->env = env;
 	atomic_init(&up->pending, 0);
 	atomic_init(&up->ref_cnt, 1); // start with 1 for the Con reference
 	up->on_empty = rb_respond_to(obj, rb_intern("on_drained"));
@@ -374,6 +375,16 @@ upgraded_create(Con c, VALUE obj) {
 // Use the publish from the Agoo module.
 extern VALUE	ragoo_publish(VALUE self, VALUE subject, VALUE message);
 
+static VALUE
+env(VALUE self) {
+    Upgraded	up = get_upgraded(self);
+
+    if (NULL != up) {
+	return up->env;
+    }
+    return Qnil;
+}
+
 /* Document-module: Agoo::Upgraded
  *
  * Adds methods to a handler of WebSocket and SSE connections.
@@ -390,6 +401,7 @@ upgraded_init(VALUE mod) {
     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);
+    rb_define_method(upgraded_class, "env", env, 0);
 
     on_open_id = rb_intern("on_open");
     to_s_id = rb_intern("to_s");

data/ext/agoo/upgraded.h

@@ -16,6 +16,7 @@ typedef struct _Upgraded {
     struct _Con		*con;
     VALUE		handler;
     VALUE		wrap;
+    VALUE		env;
     atomic_int		pending;
     atomic_int		ref_cnt;
     struct _Subject	*subjects;
@@ -26,7 +27,7 @@ typedef struct _Upgraded {
 } *Upgraded;
 
 extern void	upgraded_init(VALUE mod);
-extern Upgraded	upgraded_create(struct _Con *c, VALUE obj);
+extern Upgraded	upgraded_create(struct _Con *c, VALUE obj, VALUE env);
 extern void	upgraded_release(Upgraded up);
 extern void	upgraded_release_con(Upgraded up);
 

data/ext/agoo/websocket.c

@@ -126,7 +126,7 @@ ws_calc_len(Con c, uint8_t *buf, size_t cnt) {
     uint64_t	plen;
 
     if (0 == (0x80 & *b)) {
-	log_cat(&error_cat, "FIN must be 1. Websocket continuation not implemented on connection %llu.", c->id);
+	log_cat(&error_cat, "FIN must be 1. Websocket continuation not implemented on connection %llu.", (unsigned long long)c->id);
 	return -1;
     }
     b++;
@@ -213,7 +213,7 @@ ws_ping(Con c) {
     Res	res;
     
     if (NULL == (res = res_create(c))) {
-	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);
     } else {
 	if (NULL == c->res_tail) {
 	    c->res_head = res;
@@ -232,7 +232,7 @@ ws_pong(Con c) {
     Res	res;
     
     if (NULL == (res = res_create(c))) {
-	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);
     } else {
 	if (NULL == c->res_tail) {
 	    c->res_head = res;

data/lib/agoo/version.rb

@@ -1,5 +1,5 @@
 
 module Agoo
   # Agoo version.
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agoo
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -66,6 +66,7 @@ files:
 - ext/agoo/log.c
 - ext/agoo/log.h
 - ext/agoo/log_queue.h
+- ext/agoo/method.h
 - ext/agoo/page.c
 - ext/agoo/page.h
 - ext/agoo/pub.c
@@ -80,6 +81,11 @@ files:
 - ext/agoo/res.h
 - ext/agoo/response.c
 - ext/agoo/response.h
+- ext/agoo/rhook.c
+- ext/agoo/rhook.h
+- ext/agoo/rlog.c
+- ext/agoo/rlog.h
+- ext/agoo/seg.h
 - ext/agoo/server.c
 - ext/agoo/server.h
 - ext/agoo/sha1.c
@@ -140,7 +146,7 @@ signing_key:
 specification_version: 4
 summary: An HTTP server
 test_files:
+- test/log_test.rb
 - test/rack_handler_test.rb
 - test/base_handler_test.rb
 - test/static_test.rb
-- test/log_test.rb