rage-iodine 4.4.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 303b190ec5ec7b3f67818e9c1a3b3b87352547c338685e3af8a319588652e945
-  data.tar.gz: 9060a19940097808b32b0d210a11c2bcc9fc1354d123be5fd6c61f2a9d5f18fa
+  metadata.gz: 658449c4bf690e24a8c0bd0b6b98f0fdaf848aa1cff34d59ea3091e423c81247
+  data.tar.gz: 0bfb9f771695d2132dfd7247908b38deb7c8e9122d3624da441c66db8b98a745
 SHA512:
-  metadata.gz: e98de1cdf973e91d5b2401f112fdc9487625ba90e985399914cf4ce387040255e35c4073d80ad89e6337800777f2d5bc3b89d7909cb4dfdd582afc89d8071309
-  data.tar.gz: b1e68feee5ba155887c7ea7ab9c372bacc3724a79c83849b19f20bdb701b7e4412a90ea90a5e7858566248dd0c01903c2f9e6f7e6272522f9e13e803c031dcfb
+  metadata.gz: 7921a4cc9de1d7234eae0423ad1f0b51b1f953ae4b01b8495f837be05603a12f3889ff06f463a2622bdd841997be585fbb6b611fdac0a7592eec7179ae3064bb
+  data.tar.gz: 7eea1914ceda33dc67be0efebd5007222a604f92b1d4f9f5a884627f43c9978bc67585de34357070485807bec144106110952d74773c3789dc362dbc3d6244f2

data/ext/iodine/http_internal.c

@@ -13,6 +13,47 @@ Internal Request / Response Handlers
 ***************************************************************************** */
 
 static uint64_t http_upgrade_hash = 0;
+
+static inline uint8_t http_accept_item_is_sse(char *item, size_t len) {
+  while (len && (*item == ' ' || *item == '\t')) {
+    ++item;
+    --len;
+  }
+  while (len && (item[len - 1] == ' ' || item[len - 1] == '\t')) {
+    --len;
+  }
+  return (len == 17 && !strncasecmp(item, "text/event-stream", 17));
+}
+
+static inline uint8_t http_accepts_sse(FIOBJ value) {
+  if (!value)
+    return 0;
+  if (FIOBJ_TYPE_IS(value, FIOBJ_T_ARRAY)) {
+    for (size_t i = 0; i < fiobj_ary_count(value); ++i) {
+      if (http_accepts_sse(fiobj_ary_index(value, i)))
+        return 1;
+    }
+    return 0;
+  }
+  fio_str_info_s accept = fiobj_obj2cstr(value);
+  if (!accept.data || !accept.len)
+    return 0;
+
+  size_t i = 0;
+  while (i < accept.len) {
+    size_t start = i;
+    while (i < accept.len && accept.data[i] != ';' && accept.data[i] != ',')
+      ++i;
+    if (http_accept_item_is_sse(accept.data + start, i - start))
+      return 1;
+    while (i < accept.len && accept.data[i] != ',')
+      ++i;
+    if (i < accept.len)
+      ++i;
+  }
+  return 0;
+}
+
 /** Use this function to handle HTTP requests.*/
 void http_on_request_handler______internal(http_s *h,
                                            http_settings_s *settings) {
@@ -38,9 +79,8 @@ void http_on_request_handler______internal(http_s *h,
   if (t)
     goto upgrade;
 
-  if (fiobj_iseq(
-          fiobj_hash_get2(h->headers, fiobj_obj2hash(HTTP_HEADER_ACCEPT)),
-          HTTP_HVALUE_SSE_MIME))
+  if (http_accepts_sse(
+          fiobj_hash_get2(h->headers, fiobj_obj2hash(HTTP_HEADER_ACCEPT))))
     goto eventsource;
   if (settings->public_folder &&
       (fiobj_obj2cstr(h->method).len != 4 || strncasecmp("post", fiobj_obj2cstr(h->method).data, 4))) {

data/ext/iodine/iodine_connection.c

@@ -197,24 +197,7 @@ static VALUE iodine_connection_write(VALUE self, VALUE data) {
                     rb_enc_get(data) == IodineUTF8Encoding);
     return Qtrue;
     break;
-  case IODINE_CONNECTION_SSE:
-/* SSE */
-#if 1
-    http_sse_write(c->info.arg, .data = IODINE_RSTRINFO(data));
-    return Qtrue;
-#else
-    if (rb_enc_get(data) == IodineUTF8Encoding) {
-      http_sse_write(c->info.arg, .data = {.data = RSTRING_PTR(data),
-                                           .len = RSTRING_LEN(data)});
-      return Qtrue;
-    }
-    fprintf(stderr, "WARNING: ignoring an attept to write binary data to "
-                    "non-binary protocol (SSE).\n");
-    return Qfalse;
-// rb_raise(rb_eEncodingError,
-//          "This Connection type requires data to be UTF-8 encoded.");
-#endif
-    break;
+  case IODINE_CONNECTION_SSE: /* SSE - raw bytes, framework handles formatting */
   case IODINE_CONNECTION_RAW: /* fallthrough */
   default: {
     fio_write(c->info.uuid, RSTRING_PTR(data), RSTRING_LEN(data));
@@ -447,9 +430,7 @@ static void iodine_on_pubsub(fio_msg_s *msg) {
       }
       return;
     }
-    case IODINE_CONNECTION_SSE:
-      http_sse_write(data->info.arg, .data = msg->msg);
-      return;
+    case IODINE_CONNECTION_SSE: /* SSE - raw bytes, framework handles formatting */
     default:
       fio_write(data->info.uuid, msg->msg.data, msg->msg.len);
       return;

data/ext/iodine/iodine_http.c

@@ -62,6 +62,8 @@ static ID iodine_call_proc_id;
 static ID fiber_result_var_id;
 static VALUE http_wait_directive;
 static ID fiber_id_method_id;
+static ID iodine_env_var_id;
+static ID iodine_upgrade_var_id;
 
 static VALUE env_template_no_upgrade;
 static VALUE env_template_websockets;
@@ -681,6 +683,8 @@ static inline void *iodine_handle_request_in_GVL(void *handle_) {
 
   if (handle->type == IODINE_HTTP_DEFERRED) {
     rbresponse = rb_ivar_get((VALUE)h->fiber, fiber_result_var_id);
+    env = rb_ivar_get((VALUE)h->fiber, iodine_env_var_id);
+    handle->upgrade = FIX2INT(rb_ivar_get((VALUE)h->fiber, iodine_upgrade_var_id));
   } else {
     // create / register env variable
     env = copy2env(handle);
@@ -698,7 +702,10 @@ static inline void *iodine_handle_request_in_GVL(void *handle_) {
   tmp = rb_ary_entry(rbresponse, 0);
   // rack will return `[:__http_defer__, fiber_to_wait_on]` in case the request needs to be paused
   if (TYPE(tmp) == T_SYMBOL && tmp == http_wait_directive) {
-    h->fiber = (void *)IodineStore.add(rb_ary_entry(rbresponse, 1));
+    VALUE fiber = rb_ary_entry(rbresponse, 1);
+    rb_ivar_set(fiber, iodine_env_var_id, env);
+    rb_ivar_set(fiber, iodine_upgrade_var_id, INT2FIX(handle->upgrade));
+    h->fiber = (void *)IodineStore.add(fiber);
     goto defer;
   }
 
@@ -741,8 +748,7 @@ static inline void *iodine_handle_request_in_GVL(void *handle_) {
   // review each header and write it to the response.
   rb_hash_foreach(response_headers, for_each_header_data, (VALUE)(h));
   // review for upgrade.
-  if (handle->type != IODINE_HTTP_DEFERRED && (intptr_t)h->status < 300 &&
-      ruby2c_review_upgrade(handle, rbresponse, env))
+  if ((intptr_t)h->status < 300 && ruby2c_review_upgrade(handle, rbresponse, env))
     goto external_done;
   // send the request body.
   if (ruby2c_response_send(handle, rbresponse, env))
@@ -882,7 +888,12 @@ static void on_rack_upgrade(http_s *h, char *proto, size_t len) {
   //   return;
   // }
   IodineCaller.enterGVL(iodine_handle_request_in_GVL, &handle);
-  iodine_perform_handle_action(handle);
+
+  if (handle.type == IODINE_HTTP_WAIT) {
+    http_pause(handle.h, http_pause_request_handler);
+  } else {
+    iodine_perform_handle_action(handle);
+  }
   (void)proto;
   (void)len;
 }
@@ -1245,6 +1256,8 @@ void iodine_init_http(void) {
   fiber_result_var_id = rb_intern("@__result");
   http_wait_directive = ID2SYM(rb_intern("__http_defer__"));
   fiber_id_method_id = rb_intern("__get_id");
+  iodine_env_var_id = rb_intern("@__iodine_env");
+  iodine_upgrade_var_id = rb_intern("@__iodine_upgrade");
 
   IodineUTF8Encoding = rb_enc_find("UTF-8");
   IodineBinaryEncoding = rb_enc_find("binary");

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '4.4.0'.freeze
+  VERSION = '5.0.0'.freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rage-iodine
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Boaz Segev
 bindir: exe
 cert_chain: []
-date: 2025-11-28 00:00:00.000000000 Z
+date: 2026-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake