isomorfeus-iodine 0.8.1 → 0.8.2

data/ext/iodine_ext/iodine_connection.c

@@ -518,10 +518,10 @@ static iodine_sub_args_s iodine_subscribe_args(int argc, VALUE *argv) {
     /* single argument must be a Hash / channel name */
     if (TYPE(argv[0]) == T_HASH) {
       rb_opt = argv[0];
-      ret.channel = rb_hash_aref(argv[0], to_id);
+      ret.channel = rb_hash_aref(argv[0], ID2SYM(to_id));
       if (ret.channel == Qnil || ret.channel == Qfalse) {
         /* temporary backport support */
-        ret.channel = rb_hash_aref(argv[0], channel_id);
+        ret.channel = rb_hash_aref(argv[0], ID2SYM(channel_id));
         if (ret.channel != Qnil) {
           FIO_LOG_WARNING("use of :channel in subscribe is deprecated.");
         }
@@ -546,13 +546,16 @@ static iodine_sub_args_s iodine_subscribe_args(int argc, VALUE *argv) {
   Check_Type(ret.channel, T_STRING);
 
   if (rb_opt) {
-    if (rb_hash_aref(rb_opt, as_id) == binary_id) {
+    VALUE tmp = Qnil;
+    if ((tmp = rb_hash_aref(rb_opt, ID2SYM(as_id))) != Qnil &&
+        TYPE(tmp) == T_SYMBOL && rb_sym2id(tmp) == binary_id) {
       ret.binary = 1;
     }
-    if (rb_hash_aref(rb_opt, match_id) == redis_id) {
+    if ((tmp = rb_hash_aref(rb_opt, ID2SYM(match_id))) != Qnil &&
+        TYPE(tmp) == T_SYMBOL && rb_sym2id(tmp) == redis_id) {
       ret.pattern = FIO_MATCH_GLOB;
     }
-    ret.block = rb_hash_aref(rb_opt, handler_id);
+    ret.block = rb_hash_aref(rb_opt, ID2SYM(handler_id));
     if (ret.block != Qnil) {
       IodineStore.add(ret.block);
     }
@@ -900,7 +903,8 @@ void iodine_connection_init(void) {
   IodineStore.add(RAWSymbol);
 
   // define the Connection Class and it's methods
-  ConnectionKlass = rb_define_class_under(IodineModule, "Connection", rb_cObject);
+  ConnectionKlass =
+      rb_define_class_under(IodineModule, "Connection", rb_cObject);
   rb_define_alloc_func(ConnectionKlass, iodine_connection_data_alloc_c);
   rb_define_method(ConnectionKlass, "write", iodine_connection_write, 1);
   rb_define_method(ConnectionKlass, "close", iodine_connection_close, 0);

data/ext/iodine_ext/iodine_http.c

@@ -477,6 +477,10 @@ Handling the HTTP response
 static int for_each_header_data(VALUE key, VALUE val, VALUE h_) {
   http_s *h = (http_s *)h_;
   // fprintf(stderr, "For_each - headers\n");
+  if (TYPE(val) == T_NIL || TYPE(key) == T_NIL)
+    return ST_CONTINUE;
+  if (TYPE(val) == T_ARRAY)
+    goto array_style_multi_value;
   if (TYPE(key) != T_STRING)
     key = IodineCaller.call(key, iodine_to_s_id);
   if (TYPE(key) != T_STRING)
@@ -515,6 +519,14 @@ static int for_each_header_data(VALUE key, VALUE val, VALUE h_) {
   fiobj_free(name);
   // no errors, return 0
   return ST_CONTINUE;
+
+array_style_multi_value:
+  for (size_t i = 0, end = RARRAY_LEN(val); i < end; ++i) {
+    if (for_each_header_data(key, RARRAY_AREF(val, i), h_) == ST_CONTINUE)
+      continue;
+    return ST_STOP;
+  }
+  return ST_CONTINUE;
 }
 
 // writes the body to the response object
@@ -941,15 +953,15 @@ intptr_t iodine_http_listen(iodine_connection_args_s args){
     support_xsendfile = 1;
   }
   IodineStore.add(args.handler);
-  #ifdef __MINGW32__
-    intptr_t uuid = http_listen(
+#ifdef __MINGW32__
+  intptr_t uuid = http_listen(
       args.port.data, args.address.data, .on_request = on_rack_request,
       .on_upgrade = on_rack_upgrade, .udata = (void *)args.handler,
       .timeout = args.timeout, .ws_timeout = args.ping,
       .ws_max_msg_size = args.max_msg, .max_header_size = args.max_headers,
       .on_finish = free_iodine_http, .log = args.log,
       .max_body_size = args.max_body, .public_folder = args.public.data);
-  #else
+#else
   intptr_t uuid = http_listen(
       args.port.data, args.address.data, .on_request = on_rack_request,
       .on_upgrade = on_rack_upgrade, .udata = (void *)args.handler,
@@ -957,7 +969,7 @@ intptr_t iodine_http_listen(iodine_connection_args_s args){
       .ws_max_msg_size = args.max_msg, .max_header_size = args.max_headers,
       .on_finish = free_iodine_http, .log = args.log,
       .max_body_size = args.max_body, .public_folder = args.public.data);
-  #endif
+#endif
   if (uuid == -1)
     return uuid;
 
@@ -1067,11 +1079,11 @@ intptr_t iodine_ws_connect(iodine_connection_args_s args) {
   FIOBJ url_tmp = FIOBJ_INVALID;
   if (!args.url.data) {
     url_tmp = fiobj_str_buf(64);
-  #ifndef __MINGW32__
+#ifndef __MINGW32__
     if (args.tls)
       fiobj_str_write(url_tmp, "wss://", 6);
     else
-  #endif
+#endif
       fiobj_str_write(url_tmp, "ws://", 5);
     if (!is_unix_socket) {
       fiobj_str_write(url_tmp, args.address.data, args.address.len);
@@ -1088,11 +1100,11 @@ intptr_t iodine_ws_connect(iodine_connection_args_s args) {
   }
 
 #ifdef __MINGW32__
-  intptr_t uuid = http_connect(
-      args.url.data, (is_unix_socket ? args.address.data : NULL),
-      .udata = request_data_create(&args),
-      .on_response = ws_client_http_connected,
-      .on_finish = ws_client_http_connection_finished);
+  intptr_t uuid =
+      http_connect(args.url.data, (is_unix_socket ? args.address.data : NULL),
+                   .udata = request_data_create(&args),
+                   .on_response = ws_client_http_connected,
+                   .on_finish = ws_client_http_connection_finished);
 #else
   intptr_t uuid = http_connect(
       args.url.data, (is_unix_socket ? args.address.data : NULL),

data/ext/iodine_ext/websocket_parser.h

@@ -453,6 +453,7 @@ static uint64_t websocket_consume(void *buffer, uint64_t len, void *udata,
       fprintf(stderr, "ERROR: WebSocket protocol error - unmasked data.\n");
 #endif
       websocket_on_protocol_error(udata);
+      return 0;
     }
     /* call callback */
     switch (pos[0] & 15) {

data/ext/iodine_ext/websockets.c

@@ -28,7 +28,8 @@ Feel free to copy, use and enjoy according to the license provided.
 
 #include <websocket_parser.h>
 
-#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) && !defined(__MINGW32__)
+#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) &&                 \
+    !defined(__MINGW32__)
 #include <endian.h>
 #if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) &&                 \
     __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -126,6 +127,8 @@ struct ws_s {
   struct buffer_s buffer;
   /** data length (how much of the buffer actually used). */
   size_t length;
+  /** total data length (including continuation frames). */
+  size_t total_length;
   /** message buffer. */
   FIOBJ msg;
   /** latest text state. */
@@ -154,20 +157,24 @@ static void websocket_on_unwrapped(void *ws_p, void *msg, uint64_t len,
                                    char first, char last, char text,
                                    unsigned char rsv) {
   ws_s *ws = ws_p;
+  if (!ws)
+    return;
   if (last && first) {
     ws->on_message(ws, (fio_str_info_s){.data = msg, .len = len},
                    (uint8_t)text);
     return;
   }
+  if (ws->msg == FIOBJ_INVALID)
+    ws->msg = fiobj_str_buf(len);
+  ws->total_length += len;
   if (first) {
     ws->is_text = (uint8_t)text;
-    if (ws->msg == FIOBJ_INVALID)
-      ws->msg = fiobj_str_buf(len);
-    fiobj_str_resize(ws->msg, 0);
   }
   fiobj_str_write(ws->msg, msg, len);
   if (last) {
     ws->on_message(ws, fiobj_obj2cstr(ws->msg), ws->is_text);
+    fiobj_str_resize(ws->msg, 0);
+    ws->total_length = 0;
   }
 
   (void)rsv;
@@ -183,15 +190,19 @@ static void websocket_on_protocol_ping(void *ws_p, void *msg_, uint64_t len) {
     fio_write2(ws->fd, .data.buffer = buff, .length = len);
   } else {
     if (((ws_s *)ws)->is_client) {
-      fio_write2(ws->fd, .data.buffer = "\x89\x80mask", .length = 2,
+      fio_write2(ws->fd, .data.buffer = "\x8a\x80mask", .length = 6,
                  .after.dealloc = FIO_DEALLOC_NOOP);
     } else {
-      fio_write2(ws->fd, .data.buffer = "\x89\x00", .length = 2,
+      fio_write2(ws->fd, .data.buffer = "\x8a\x00", .length = 2,
                  .after.dealloc = FIO_DEALLOC_NOOP);
     }
   }
+  FIO_LOG_DEBUG("Received ping and sent pong for Websocket %p (%d)", ws_p,
+                (int)(((ws_s *)ws_p)->fd));
 }
 static void websocket_on_protocol_pong(void *ws_p, void *msg, uint64_t len) {
+  FIO_LOG_DEBUG("Received pong for Websocket %p (%d)", ws_p,
+                (int)(((ws_s *)ws_p)->fd));
   (void)len;
   (void)msg;
   (void)ws_p;
@@ -220,6 +231,7 @@ static void ws_ping(intptr_t fd, fio_protocol_s *ws) {
     fio_write2(fd, .data.buffer = "\x89\x00", .length = 2,
                .after.dealloc = FIO_DEALLOC_NOOP);
   }
+  FIO_LOG_DEBUG("Sent ping for Websocket %p (%d)", (void *)ws, (int)fd);
 }
 
 static void on_close(intptr_t uuid, fio_protocol_s *_ws) {
@@ -238,10 +250,10 @@ static uint8_t on_shutdown(intptr_t fd, fio_protocol_s *ws) {
   if (ws && ((ws_s *)ws)->on_shutdown)
     ((ws_s *)ws)->on_shutdown((ws_s *)ws);
   if (((ws_s *)ws)->is_client) {
-    fio_write2(fd, .data.buffer = "\x8a\x80MASK", .length = 6,
+    fio_write2(fd, .data.buffer = "\x88\x80MASK", .length = 6,
                .after.dealloc = FIO_DEALLOC_NOOP);
   } else {
-    fio_write2(fd, .data.buffer = "\x8a\x00", .length = 2,
+    fio_write2(fd, .data.buffer = "\x88\x00", .length = 2,
                .after.dealloc = FIO_DEALLOC_NOOP);
   }
   return 0;
@@ -255,7 +267,7 @@ static void on_data(intptr_t sockfd, fio_protocol_s *ws_) {
       websocket_buffer_peek(ws->buffer.data, ws->length);
   const uint64_t raw_length = info.packet_length + info.head_length;
   /* test expected data amount */
-  if (ws->max_msg_size < raw_length) {
+  if (ws->max_msg_size < raw_length + ws->total_length) {
     /* too big */
     websocket_close(ws);
     return;
@@ -728,8 +740,13 @@ int websocket_write(ws_s *ws, fio_str_info_s msg, uint8_t is_text) {
 }
 /** Closes a websocket connection. */
 void websocket_close(ws_s *ws) {
-  fio_write2(ws->fd, .data.buffer = "\x88\x00", .length = 2,
-             .after.dealloc = FIO_DEALLOC_NOOP);
+  if (ws->is_client) {
+    fio_write2(ws->fd, .data.buffer = "\x88\x80MASK", .length = 6,
+               .after.dealloc = FIO_DEALLOC_NOOP);
+  } else {
+    fio_write2(ws->fd, .data.buffer = "\x88\x00", .length = 2,
+               .after.dealloc = FIO_DEALLOC_NOOP);
+  }
   fio_close(ws->fd);
   return;
 }

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

data/lib/rack/handler/iodine.rb

@@ -1,7 +1,7 @@
 require 'iodine' unless defined?(::Iodine::VERSION)
 
 module Iodine
-  # Iodine's {Iodine::Rack} module provides a Rack complient interface (connecting Iodine to Rack) for an HTTP and Websocket Server.
+  # Iodine's {Iodine::Rack} module provides a Rack compliant interface (connecting Iodine to Rack) for an HTTP and Websocket Server.
   module Rack
 
     # Runs a Rack app, as par the Rack handler requirements.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-iodine
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rackup
@@ -152,7 +152,6 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -177,6 +176,7 @@ files:
 - examples/etag.ru
 - examples/hello.ru
 - examples/pubsub_engine.ru
+- examples/rack3.ru
 - examples/redis.ru
 - examples/shootout.ru
 - examples/sub-protocols.ru
@@ -275,7 +275,7 @@ metadata:
   github_repo: ssh://github.com/isomorfeus/gems
   source_code_uri: https://github.com/isomorfeus/isomorfeus-iodine
 post_install_message: |-
-  Thank you for installing Iodine 0.8.1.
+  Thank you for installing Iodine 0.8.2.
   Remember: if iodine supports your business, it's only fair to give value back (code contributions / donations) to Bo, see https://github.com/boazsegev/iodine
 rdoc_options: []
 require_paths:

data/.travis.yml

@@ -1,32 +0,0 @@
-language: ruby
-arch:
-  - amd64
-  - arm64
-os:
-  - linux
-  # - osx
-before_install:
-  - gem install bundler -v 1.10.6
-  - bundle install
-rvm:
-  - 2.7.1
-  - 2.6.5
-  - 2.5.7
-  - 2.4.9
-  - 2.3.8
-  - 2.2.2
-notifications:
-  email: false
-sudo: required
-dist: xenial
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc
-script:
-  - echo CFLAGS = $CFLAGS
-  - echo cflags = $cflags
-  - bundle exec rake install
-  - env VERBOSE=1 bundle exec rspec --format documentation