iodine 0.7.57 → 0.7.59

data/ext/iodine/iodine_caller.c

@@ -10,7 +10,7 @@
 static pthread_key_t iodine_GVL_state_key;
 static pthread_once_t iodine_GVL_state_once = PTHREAD_ONCE_INIT;
 static void init_iodine_GVL_state_key(void) {
-  pthread_key_create(&iodine_GVL_state_key, NULL); 
+  pthread_key_create(&iodine_GVL_state_key, NULL);
 }
 static void init_iodine_GVL_state_init(void) {
   uint8_t *gvl = malloc(sizeof(uint8_t));
@@ -47,14 +47,18 @@ static void *iodine_handle_exception(void *ignr) {
     if (TYPE(bt) == T_ARRAY) {
       bt = rb_ary_join(bt, rb_str_new_literal("\n"));
       FIO_LOG_ERROR("Iodine caught an unprotected exception - %.*s: %.*s\n%s",
-                    (int)RSTRING_LEN(exc_class), RSTRING_PTR(exc_class),
-                    (int)RSTRING_LEN(msg), RSTRING_PTR(msg),
+                    (int)RSTRING_LEN(exc_class),
+                    RSTRING_PTR(exc_class),
+                    (int)RSTRING_LEN(msg),
+                    RSTRING_PTR(msg),
                     StringValueCStr(bt));
     } else {
       FIO_LOG_ERROR("Iodine caught an unprotected exception - %.*s: %.*s\n"
                     "No backtrace available.\n",
-                    (int)RSTRING_LEN(exc_class), RSTRING_PTR(exc_class),
-                    (int)RSTRING_LEN(msg), RSTRING_PTR(msg));
+                    (int)RSTRING_LEN(exc_class),
+                    RSTRING_PTR(exc_class),
+                    (int)RSTRING_LEN(msg),
+                    RSTRING_PTR(msg));
     }
     rb_backtrace();
     FIO_LOG_ERROR("\n");
@@ -69,8 +73,12 @@ static void *iodine_handle_exception(void *ignr) {
 /* calls the Ruby each method within the protection block */
 static VALUE iodine_ruby_caller_perform_block(VALUE tsk_) {
   iodine_rb_task_s *task = (void *)tsk_;
-  return rb_block_call(task->obj, task->method, task->argc, task->argv,
-                       task->each_func, task->each_udata);
+  return rb_block_call(task->obj,
+                       task->method,
+                       task->argc,
+                       task->argv,
+                       (rb_block_call_func_t)(task->each_func),
+                       task->each_udata);
 }
 
 /* calls the Ruby method within the protection block */
@@ -83,7 +91,8 @@ static VALUE iodine_ruby_caller_perform(VALUE tsk_) {
 static void *iodine_protect_ruby_call(void *task_) {
   int state = 0;
   VALUE ret = rb_protect(((iodine_rb_task_s *)task_)->protected_task,
-                         (VALUE)(task_), &state);
+                         (VALUE)(task_),
+                         &state);
   if (state) {
     iodine_handle_exception(NULL);
   }
@@ -157,10 +166,13 @@ static VALUE iodine_call2(VALUE obj, ID method, int argc, VALUE *argv) {
 }
 
 /** Calls a Ruby method on a given object, protecting against exceptions. */
-static VALUE iodine_call_block(VALUE obj, ID method, int argc, VALUE *argv,
-                               VALUE udata,
-                               VALUE(each_func)(VALUE block_arg, VALUE udata,
-                                                int argc, VALUE *argv)) {
+static VALUE iodine_call_block(
+    VALUE obj,
+    ID method,
+    int argc,
+    VALUE *argv,
+    VALUE udata,
+    VALUE(each_func)(VALUE block_arg, VALUE udata, int argc, VALUE *argv)) {
   iodine_rb_task_s task = {
       .obj = obj,
       .argc = argc,
@@ -186,7 +198,7 @@ static uint8_t iodine_in_GVL(void) {
 }
 
 /** Forces the GVL state flag. */
-static void iodine_set_GVL(uint8_t state) { 
+static void iodine_set_GVL(uint8_t state) {
   pthread_once(&iodine_GVL_state_once, init_iodine_GVL_state_key);
   uint8_t *iodine_GVL_state = pthread_getspecific(iodine_GVL_state_key);
   if (!iodine_GVL_state) {

data/ext/iodine/iodine_store.c

@@ -1,11 +1,11 @@
-#include "iodine.h"
-
 #include "iodine_store.h"
 
 #include <inttypes.h>
 #include <stdint.h>
 
-#define FIO_SET_NAME fio_store
+#include "iodine.h"
+
+#define FIO_SET_NAME     fio_store
 #define FIO_SET_OBJ_TYPE uintptr_t
 #include <fio.h>
 
@@ -23,13 +23,11 @@ API
 
 /** Adds an object to the storage (or increases it's reference count). */
 static VALUE storage_add(VALUE obj) {
-  if (!obj || obj == Qnil || obj == Qtrue || obj == Qfalse)
-    return obj;
+  if (!obj || obj == Qnil || obj == Qtrue || obj == Qfalse) return obj;
   uintptr_t old = 0;
   fio_lock(&iodine_storage_lock);
   fio_store_overwrite(&iodine_storage, obj, 1, &old);
-  if (old)
-    fio_store_overwrite(&iodine_storage, obj, old + 1, NULL);
+  if (old) fio_store_overwrite(&iodine_storage, obj, old + 1, NULL);
   if (iodine_storage_count_max < fio_store_count(&iodine_storage))
     iodine_storage_count_max = fio_store_count(&iodine_storage);
   fio_unlock(&iodine_storage_lock);
@@ -43,8 +41,7 @@ static VALUE storage_remove(VALUE obj) {
   fio_lock(&iodine_storage_lock);
   uintptr_t old = 0;
   fio_store_remove(&iodine_storage, obj, 0, &old);
-  if (old > 1)
-    fio_store_overwrite(&iodine_storage, obj, old - 1, NULL);
+  if (old > 1) fio_store_overwrite(&iodine_storage, obj, old - 1, NULL);
   fio_unlock(&iodine_storage_lock);
   return obj;
 }
@@ -58,15 +55,22 @@ static void storage_print(void) {
   uintptr_t index = 0;
   FIO_SET_FOR_LOOP(&iodine_storage, pos) {
     if (pos->obj) {
-      fprintf(stderr, "[%" PRIuPTR "] => %" PRIuPTR " X obj %p type %d\n",
-              index++, pos->obj, (void *)pos->hash, TYPE(pos->hash));
+      fprintf(stderr,
+              "[%" PRIuPTR "] => %" PRIuPTR " X obj %p type %d\n",
+              index++,
+              pos->obj,
+              (void *)pos->hash,
+              TYPE(pos->hash));
     }
   }
   fprintf(stderr, "Total of %" PRIuPTR " objects protected form GC\n", index);
   fprintf(stderr,
-          "Storage uses %" PRIuPTR " Hash bins for %" PRIuPTR " objects\n"
+          "Storage uses %" PRIuPTR " Hash bins for %" PRIuPTR
+          " objects\n"
           "The largest collection was %zu objects.\n",
-          iodine_storage.capa, iodine_storage.count, iodine_storage_count_max);
+          iodine_storage.capa,
+          iodine_storage.count,
+          iodine_storage_count_max);
   fio_unlock(&iodine_storage_lock);
 }
 
@@ -85,8 +89,7 @@ GC protection
 /* a callback for the GC (marking active objects) */
 static void storage_mark(void *ignore) {
   (void)ignore;
-  if (FIO_LOG_LEVEL >= FIO_LOG_LEVEL_DEBUG)
-    storage_print();
+  if (FIO_LOG_LEVEL >= FIO_LOG_LEVEL_DEBUG) storage_print();
   fio_lock(&iodine_storage_lock);
   // fio_store_compact(&iodine_storage);
   FIO_SET_FOR_LOOP(&iodine_storage, pos) {
@@ -131,12 +134,13 @@ struct IodineStorage_s IodineStore = {
 /** Initializes the storage unit for first use. */
 void iodine_storage_init(void) {
   fio_store_capa_require(&iodine_storage, 512);
-  VALUE tmp =
-      rb_define_class_under(rb_cObject, "IodineObjectStorage", rb_cObject);
+  VALUE tmp = rb_define_module_under(rb_cObject, "IodineObjectStorage");
   VALUE storage_obj =
       TypedData_Wrap_Struct(tmp, &storage_type_struct, &iodine_storage);
   // rb_global_variable(&iodine_storage_obj);
   rb_ivar_set(IodineModule, rb_intern2("storage", 7), storage_obj);
-  rb_define_module_function(IodineBaseModule, "db_print_protected_objects",
-                            storage_print_rb, 0);
+  rb_define_module_function(IodineBaseModule,
+                            "db_print_protected_objects",
+                            storage_print_rb,
+                            0);
 }

data/ext/iodine/websockets.c

@@ -99,7 +99,7 @@ void free_ws_buffer(ws_s *owner, struct buffer_s buff) {
 Create/Destroy the websocket object (prototypes)
 */
 
-static ws_s *new_websocket();
+static ws_s *new_websocket(intptr_t uuid);
 static void destroy_ws(ws_s *ws);
 
 /*******************************************************************************
@@ -190,19 +190,15 @@ 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 = "\x8a\x80mask", .length = 6,
+      fio_write2(ws->fd, .data.buffer = "\x89\x80mask", .length = 2,
                  .after.dealloc = FIO_DEALLOC_NOOP);
     } else {
-      fio_write2(ws->fd, .data.buffer = "\x8a\x00", .length = 2,
+      fio_write2(ws->fd, .data.buffer = "\x89\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;
@@ -250,10 +246,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 = "\x88\x80MASK", .length = 6,
+    fio_write2(fd, .data.buffer = "\x8a\x80MASK", .length = 6,
                .after.dealloc = FIO_DEALLOC_NOOP);
   } else {
-    fio_write2(fd, .data.buffer = "\x88\x00", .length = 2,
+    fio_write2(fd, .data.buffer = "\x8a\x00", .length = 2,
                .after.dealloc = FIO_DEALLOC_NOOP);
   }
   return 0;
@@ -740,13 +736,8 @@ 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) {
-  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_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.57'.freeze
+  VERSION = '0.7.59'.freeze
 end

data/lib/iodine.rb

@@ -160,6 +160,10 @@ Iodine.on_state(:before_fork)  do
       ActiveRecord::Base.connection.disconnect!
     rescue
     end
+    begin
+      ActiveRecord::Base.connection_pool.disconnect!
+    rescue
+    end
   end
   if defined?(Sequel)
     begin

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.7.57
+  version: 0.7.59
 platform: ruby
 authors:
 - Boaz Segev
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -132,6 +131,7 @@ files:
 - LIMITS.md
 - README.md
 - Rakefile
+- SECURITY.md
 - SPEC-PubSub-Draft.md
 - SPEC-WebSocket-Draft.md
 - bin/console
@@ -251,7 +251,7 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: |-
-  Thank you for installing Iodine 0.7.57.
+  Thank you for installing Iodine 0.7.59.
   Remember: if iodine supports your business, it's only fair to give value back (code contributions / donations).
 rdoc_options: []
 require_paths:
@@ -274,8 +274,7 @@ requirements:
 - Ruby >= 2.5.0 recommended.
 - TLS requires OpenSSL >= 1.1.0.
 - Or Windows with Ruby >= 3.0.0 build with MingW and MingW as compiler.
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: iodine - a fast HTTP / Websocket Server with Pub/Sub support, optimized for
   Ruby MRI on Linux / BSD / Windows