iodine 0.7.46 → 0.7.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a2b1c5f8f5b6ec1d2259cf33e2cde27e3811a2df5715fa3463891062db2c9ae
-  data.tar.gz: 8b1140297cdbf2501ab145712b5cccce06beb1d7350d0d4d7176e86053d5255a
+  metadata.gz: 1dad2816193abeda90adf195c3c9cfcaa53eb9a1c5f1e4ad8364be45cd10bc2f
+  data.tar.gz: 02e35b8bbdf6516d210bd8cfc012035a1de2ec3a783e4346152bead0186ba668
 SHA512:
-  metadata.gz: 96ce75b3a7ef9548e33e73438b4aaf785a41594b4dec4a214081699c556c60512a54a231748de3f1478f622cb540fd67d3afd6bb87cc1bc38ee32471ab4ce016
-  data.tar.gz: 40d9d0e4499fd59e7e25f37f300c246c4f9d645246c31a4af7b28f622699a8c12861e0a884ecfd1274451e0a24f5b28be212748286023ff75e6ceb406b6031db
+  metadata.gz: bca7fb5be56837c4a729cef3f755ee4fa8a5a289d448961e01f9449a6e3d76865b03956d7525802a2a1c3768da61b4b8cf8a6088ca63ed57e3b966575e95fb51
+  data.tar.gz: f2fcb35e2cd7452dbeb7fb20bbe5deb3f661e8a3f3ec387d878a858732a414d3d383320164a8a3164be0cdebf900a14360e60d87488c5d61e5b8105ada6270d8

data/CHANGELOG.md

@@ -6,6 +6,18 @@ Please notice that this change log contains changes for upcoming releases as wel
 
 ## Changes:
 
+#### Change log v.0.7.49
+
+**Fix**: Fixes an issue where named arguments for `subscribe` might not be properly recognized.
+
+#### Change log v.0.7.48 (2022-06-28)
+
+**Fix**: Fixes an issue with `pong` WebSocket frames when a client sends a WebSocket `ping`. Credit to Lucas Kuan (@lucaskuan) for finding this issue and for PR #124.
+
+#### Change log v.0.7.47 (2022-05-11)
+
+**Fix**: Fixes an issue that causes `Rack::Lint` to complain about `SERVER_PORT` being an empty string. Credit to @adam12 (Adam Daniels) for PR #108 and issue #107.
+
 #### Change log v.0.7.46 (2022-05-06)
 
 **Fix**: Fixes the (erroneous) default insertion of the `last-modified` header in order to both better express the intent of RFC 2616 and prevent conflict with the `Rack::ETag` middleware. Credit to @raxoft (Patrik Rak) for opening issue #122.

data/examples/config.ru

@@ -12,6 +12,9 @@
 #
 #      ab -c 2000 -t 5 -n 1000000 -k http://127.0.0.1:3000/
 #      wrk -c2000 -d5 -t12 http://localhost:3000/
+#
+# Test websocket echo using the browser. For example:
+#      ws = new WebSocket("ws://localhost:3000"); ws.onmessage = function(e) {console.log("Got message!"); console.log(e.data);}; ws.onclose = function(e) {console.log("closed")}; ws.onopen = function(e) {ws.send("hi");};
 
 
 # A simple router - Checks for Websocket Upgrade and answers HTTP.

data/ext/iodine/fio.c

@@ -3689,7 +3689,8 @@ closed:
   return -1;
 
 flush_rw_hook:
-  flushed = uuid_data(uuid).rw_hooks->flush(uuid, uuid_data(uuid).rw_udata);
+  if(uuid_data(uuid).rw_hooks)
+    flushed = uuid_data(uuid).rw_hooks->flush(uuid, uuid_data(uuid).rw_udata);
   fio_unlock(&uuid_data(uuid).sock_lock);
   if (!flushed)
     return 0;
@@ -3749,7 +3750,8 @@ size_t fio_flush_all(void) {
     return 0;
   size_t count = 0;
   for (uintptr_t i = 0; i <= fio_data->max_protocol_fd; ++i) {
-    if ((fd_data(i).open || fd_data(i).packet) && fio_flush(fd2uuid(i)) > 0)
+    if ((fd_data(i).open || fd_data(i).packet) &&
+        fd_data(i).rw_hooks && fio_flush(fd2uuid(i)) > 0)
       ++count;
   }
   return count;

data/ext/iodine/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);
     }

data/ext/iodine/iodine_http.c

@@ -369,7 +369,6 @@ static inline VALUE copy2env(iodine_http_request_handle_s *handle) {
   if (*pos == 0) {
     rb_hash_aset(env, SERVER_NAME,
                  rb_enc_str_new(tmp.data, tmp.len, IodineBinaryEncoding));
-    rb_hash_aset(env, SERVER_PORT, QUERY_ESTRING);
   } else {
     rb_hash_aset(
         env, SERVER_NAME,
@@ -869,7 +868,6 @@ static void initialize_env_template(void) {
   rb_hash_aset(env_template_no_upgrade, REMOTE_ADDR, QUERY_STRING);
   rb_hash_aset(env_template_no_upgrade, REQUEST_METHOD, QUERY_STRING);
   rb_hash_aset(env_template_no_upgrade, SERVER_NAME, QUERY_STRING);
-  rb_hash_aset(env_template_no_upgrade, SERVER_PORT, QUERY_ESTRING);
   rb_hash_aset(env_template_no_upgrade, SERVER_PROTOCOL, QUERY_STRING);
 
   /* WebSocket upgrade support */

data/ext/iodine/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/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.7.46'.freeze
+  VERSION = '0.7.49'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.46
+  version: 0.7.49
 platform: ruby
 authors:
 - Boaz Segev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -245,7 +245,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: |-
-  Thank you for installing Iodine 0.7.46.
+  Thank you for installing Iodine 0.7.49.
   Remember: if iodine supports your business, it's only fair to give value back (code contributions / donations).
 rdoc_options: []
 require_paths: