iodine 0.7.41 → 0.7.45

data/ext/iodine/redis_engine.c

@@ -493,6 +493,7 @@ static void redis_pub_ping(intptr_t uuid, fio_protocol_s *pr) {
     return;
   }
   redis_commands_s *cmd = fio_malloc(sizeof(*cmd) + 15);
+  FIO_ASSERT_ALLOC(cmd);
   *cmd = (redis_commands_s){.cmd_len = 14};
   memcpy(cmd->cmd, "*1\r\n$4\r\nPING\r\n\0", 15);
   redis_attach_cmd(r, cmd);
@@ -534,6 +535,7 @@ static void redis_on_connect(intptr_t uuid, void *i_) {
     r = pub2redis(i);
     if (r->auth_len) {
       redis_commands_s *cmd = fio_malloc(sizeof(*cmd) + r->auth_len);
+      FIO_ASSERT_ALLOC(cmd);
       *cmd =
           (redis_commands_s){.cmd_len = r->auth_len, .callback = redis_on_auth};
       memcpy(cmd->cmd, r->auth, r->auth_len);
@@ -638,6 +640,7 @@ static void redis_on_publish_root(const fio_pubsub_engine_s *eng,
                                   uint8_t is_json) {
   redis_engine_s *r = (redis_engine_s *)eng;
   redis_commands_s *cmd = fio_malloc(sizeof(*cmd) + channel.len + msg.len + 96);
+  FIO_ASSERT_ALLOC(cmd);
   *cmd = (redis_commands_s){.cmd_len = 0};
   memcpy(cmd->cmd, "*3\r\n$7\r\nPUBLISH\r\n$", 18);
   char *buf = (char *)cmd->cmd + 18;
@@ -684,7 +687,7 @@ static void redis_on_publish_child(const fio_pubsub_engine_s *eng,
   fio_str_s tmp = FIO_STR_INIT;
   /* by using fio_str_s, short names are allocated on the stack */
   fio_str_info_s tmp_info = fio_str_resize(&tmp, channel.len + 8);
-  fio_u2str64(tmp_info.data, (uint64_t)eng);
+  fio_u2str64(tmp_info.data, (uintptr_t)eng);
   memcpy(tmp_info.data + 8, channel.data, channel.len);
   /* forward publication request to Root */
   fio_publish(.filter = -1, .channel = tmp_info, .message = msg,
@@ -701,7 +704,7 @@ Root Publication Handler
 static void redis_on_internal_publish(fio_msg_s *msg) {
   if (msg->channel.len < 8)
     return; /* internal error, unexpected data */
-  void *en = (void *)fio_str2u64(msg->channel.data);
+  void *en = (void *)(uintptr_t)fio_str2u64(msg->channel.data);
   if (en != msg->udata1)
     return; /* should be delivered by a different engine */
   /* step after the engine data */
@@ -721,8 +724,8 @@ Sending commands using the Root connection
 static void redis_forward_reply(fio_pubsub_engine_s *e, FIOBJ reply,
                                 void *udata) {
   uint8_t *data = udata;
-  fio_pubsub_engine_s *engine = (fio_pubsub_engine_s *)fio_str2u64(data + 0);
-  void *callback = (void *)fio_str2u64(data + 8);
+  fio_pubsub_engine_s *engine = (fio_pubsub_engine_s *)(uintptr_t)fio_str2u64(data + 0);
+  void *callback = (void *)(uintptr_t)fio_str2u64(data + 8);
   if (engine != e || !callback) {
     FIO_LOG_DEBUG("Redis reply not forwarded (callback: %p)", callback);
     return;
@@ -738,7 +741,7 @@ static void redis_forward_reply(fio_pubsub_engine_s *e, FIOBJ reply,
 static void redis_on_internal_cmd(fio_msg_s *msg) {
   // void*(void *)fio_str2u64(msg->msg.data);
   fio_pubsub_engine_s *engine =
-      (fio_pubsub_engine_s *)fio_str2u64(msg->channel.data + 0);
+      (fio_pubsub_engine_s *)(uintptr_t)fio_str2u64(msg->channel.data + 0);
   if (engine != msg->udata1) {
     return;
   }
@@ -756,7 +759,7 @@ static void redis_on_internal_cmd(fio_msg_s *msg) {
 /* Listens on filter `-10 -getpid()` for incoming reply data */
 static void redis_on_internal_reply(fio_msg_s *msg) {
   fio_pubsub_engine_s *engine =
-      (fio_pubsub_engine_s *)fio_str2u64(msg->channel.data + 0);
+      (fio_pubsub_engine_s *)(uintptr_t)fio_str2u64(msg->channel.data + 0);
   if (engine != msg->udata1) {
     FIO_LOG_DEBUG("Redis reply not forwarded (engine mismatch: %p != %p)",
                   (void *)engine, msg->udata1);
@@ -765,8 +768,8 @@ static void redis_on_internal_reply(fio_msg_s *msg) {
   FIOBJ reply;
   fiobj_json2obj(&reply, msg->msg.data, msg->msg.len);
   void (*callback)(fio_pubsub_engine_s *, FIOBJ, void *) = (void (*)(
-      fio_pubsub_engine_s *, FIOBJ, void *))fio_str2u64(msg->channel.data + 8);
-  void *udata = (void *)fio_str2u64(msg->channel.data + 16);
+      fio_pubsub_engine_s *, FIOBJ, void *))(uintptr_t)fio_str2u64(msg->channel.data + 8);
+  void *udata = (void *)(uintptr_t)fio_str2u64(msg->channel.data + 16);
   callback(engine, reply, udata);
   fiobj_free(reply);
 }
@@ -788,9 +791,9 @@ intptr_t redis_engine_send(fio_pubsub_engine_s *engine, FIOBJ command,
   fio_str_s tmp = FIO_STR_INIT;
   fio_str_info_s ti = fio_str_resize(&tmp, 28);
   /* combine metadata */
-  fio_u2str64(ti.data + 0, (uint64_t)engine);
-  fio_u2str64(ti.data + 8, (uint64_t)callback);
-  fio_u2str64(ti.data + 16, (uint64_t)udata);
+  fio_u2str64(ti.data + 0, (uintptr_t)engine);
+  fio_u2str64(ti.data + 8, (uintptr_t)callback);
+  fio_u2str64(ti.data + 16, (uintptr_t)udata);
   fio_u2str32(ti.data + 24, (uint32_t)getpid());
   FIOBJ cmd = fiobj2resp_tmp(command);
   fio_publish(.filter = -2, .channel = ti, .message = fiobj_obj2cstr(cmd),

data/ext/iodine/websockets.c

@@ -17,7 +17,9 @@ Feel free to copy, use and enjoy according to the license provided.
 #include <http.h>
 #include <http_internal.h>
 
+#ifndef __MINGW32__
 #include <arpa/inet.h>
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,7 +28,7 @@ Feel free to copy, use and enjoy according to the license provided.
 
 #include <websocket_parser.h>
 
-#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
+#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) && !defined(__MINGW32__)
 #include <endian.h>
 #if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) &&                 \
     __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -71,6 +73,7 @@ struct buffer_s create_ws_buffer(ws_s *owner) {
   struct buffer_s buff;
   buff.size = WS_INITIAL_BUFFER_SIZE;
   buff.data = malloc(buff.size);
+  FIO_ASSERT_ALLOC(buff.data);
   return buff;
 }
 
@@ -79,7 +82,6 @@ struct buffer_s resize_ws_buffer(ws_s *owner, struct buffer_s buff) {
   void *tmp = realloc(buff.data, buff.size);
   if (!tmp) {
     free_ws_buffer(owner, buff);
-    buff.data = NULL;
     buff.size = 0;
   }
   buff.data = tmp;
@@ -174,6 +176,7 @@ static void websocket_on_protocol_ping(void *ws_p, void *msg_, uint64_t len) {
   ws_s *ws = ws_p;
   if (msg_) {
     void *buff = malloc(len + 16);
+    FIO_ASSERT_ALLOC(buff);
     len = (((ws_s *)ws)->is_client
                ? websocket_client_wrap(buff, msg_, len, 10, 1, 1, 0)
                : websocket_server_wrap(buff, msg_, len, 10, 1, 1, 0));
@@ -305,6 +308,7 @@ Create/Destroy the websocket object
 static ws_s *new_websocket(intptr_t uuid) {
   // allocate the protocol object
   ws_s *ws = malloc(sizeof(*ws));
+  FIO_ASSERT_ALLOC(ws);
   *ws = (ws_s){
       .protocol.ping = ws_ping,
       .protocol.on_data = on_data_first,
@@ -330,7 +334,6 @@ static void destroy_ws(ws_s *ws) {
 void websocket_attach(intptr_t uuid, http_settings_s *http_settings,
                       websocket_settings_s *args, void *data, size_t length) {
   ws_s *ws = new_websocket(uuid);
-  FIO_ASSERT_ALLOC(ws);
   // we have an active websocket connection - prep the connection buffer
   ws->buffer = create_ws_buffer(ws);
   // Setup ws callbacks
@@ -383,6 +386,7 @@ static void websocket_write_impl(intptr_t fd, void *data, size_t len, char text,
                                  char first, char last, char client) {
   if (len <= WS_MAX_FRAME_SIZE) {
     void *buff = fio_malloc(len + 16);
+    FIO_ASSERT_ALLOC(buff);
     len = (client ? websocket_client_wrap(buff, data, len, (text ? 1 : 2),
                                           first, last, 0)
                   : websocket_server_wrap(buff, data, len, (text ? 1 : 2),

data/iodine.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Boaz Segev']
   spec.email         = ['bo@plezi.io']
 
-  spec.summary       = 'iodine - a fast HTTP / Websocket Server with Pub/Sub support, optimized for Ruby MRI on Linux / BSD'
-  spec.description   = 'A fast HTTP / Websocket Server with built-in Pub/Sub support (with or without Redis), static file support and many other features, optimized for Ruby MRI on Linux / BSD / macOS'
+  spec.summary       = 'iodine - a fast HTTP / Websocket Server with Pub/Sub support, optimized for Ruby MRI on Linux / BSD / Windows'
+  spec.description   = 'A fast HTTP / Websocket Server with built-in Pub/Sub support (with or without Redis), static file support and many other features, optimized for Ruby MRI on Linux / BSD / macOS / Windows'
   spec.homepage      = 'https://github.com/boazsegev/iodine'
   spec.license       = 'MIT'
 
@@ -35,10 +35,11 @@ Gem::Specification.new do |spec|
   spec.requirements << 'An updated C compiler.'
   spec.requirements << 'Ruby >= 2.3.8 (Ruby EOL).'
   spec.requirements << 'Ruby >= 2.5.0 recommended.'
-  spec.requirements << 'TLS requires OpenSSL >= 1.1.0'
+  spec.requirements << 'TLS requires OpenSSL >= 1.1.0.'
+  spec.requirements << 'Or Windows with Ruby >= 3.0.0 build with MingW and MingW as compiler.'
 
   # spec.add_development_dependency 'bundler', '>= 1.10', '< 2.0'
-  spec.add_development_dependency 'rake', '~> 12.0', '< 13.0'
+  spec.add_development_dependency 'rake', '>= 12.0', '< 14.0'
   spec.add_development_dependency 'minitest', '>=5', '< 6.0'
   spec.add_development_dependency 'rspec', '>=3.9.0', '< 4.0'
   spec.add_development_dependency 'spec', '>=5.3.0', '< 6.0'

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = '0.7.41'.freeze
+  VERSION = '0.7.45'.freeze
 end

data/lib/rack/handler/iodine.rb

@@ -14,6 +14,12 @@ module Iodine
 
       true
     end
+
+    # patches an assumption by Rack, issue #98 code donated by @Shelvak (Néstor Coppi)
+    def self.shutdown
+      Iodine.stop
+    end
+
     IODINE_RACK_LOADED = true
   end
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.41
+  version: 0.7.45
 platform: ruby
 authors:
 - Boaz Segev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2021-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '14.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ dependencies:
         version: '2.0'
 description: A fast HTTP / Websocket Server with built-in Pub/Sub support (with or
   without Redis), static file support and many other features, optimized for Ruby
-  MRI on Linux / BSD / macOS
+  MRI on Linux / BSD / macOS / Windows
 email:
 - bo@plezi.io
 executables:
@@ -142,6 +142,7 @@ files:
 - bin/poc/config.ru
 - bin/poc/gemfile
 - bin/poc/www/index.html
+- examples/async_task.ru
 - examples/config.ru
 - examples/echo.ru
 - examples/hello.ru
@@ -243,7 +244,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: |-
-  Thank you for installing Iodine 0.7.41.
+  Thank you for installing Iodine 0.7.45.
   Remember: if iodine supports your business, it's only fair to give value back (code contributions / donations).
 rdoc_options: []
 require_paths:
@@ -264,10 +265,11 @@ requirements:
 - An updated C compiler.
 - Ruby >= 2.3.8 (Ruby EOL).
 - Ruby >= 2.5.0 recommended.
-- TLS requires OpenSSL >= 1.1.0
-rubygems_version: 3.1.2
-signing_key: 
+- TLS requires OpenSSL >= 1.1.0.
+- Or Windows with Ruby >= 3.0.0 build with MingW and MingW as compiler.
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: iodine - a fast HTTP / Websocket Server with Pub/Sub support, optimized for
-  Ruby MRI on Linux / BSD
+  Ruby MRI on Linux / BSD / Windows
 test_files: []