hiredis-client 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8361d7ff360c08fcd386d85ba0cb951fcf6dd978119a078f122a75e13e55751
-  data.tar.gz: bf47f6f6e20b9fd24da10b1139a1ccea9e735b6a2c83848e0f223ee929c18ca0
+  metadata.gz: fc000cc925b26584a60d6a74360cf9b39db974e718c6be6af4f19f7e4ac77051
+  data.tar.gz: f54b30ef2a1310200d60d76e310a1ea750001affe145c0994a59e262934e6865
 SHA512:
-  metadata.gz: cb6761fff1950fbd32a56e576158e5ddff00cdc36bec6e4f04d6fd7e919be885f6c5d88e2e26a8d758e430e94bb78cb9e77cb0dbc651335e4833ab3eaeec1d0c
-  data.tar.gz: 5055f395e2b4495f525ffe0db632622f6ea359ed4e86b4f79e08dac844f41645446598aa0014bca35b296a8bd1b2f0a6e71d062c71399bc73c6a3d5533e66845
+  metadata.gz: d386889884c0a22a1e44ed346f659aa8f95e74be3363ba891b2ac372efb3b02f18bc14e6ccbe347a6e6f3daae3d48cf376dcb10793272db96574233108157177
+  data.tar.gz: e5264e89206c6d5d723cc1b814867c0e9420ec1f904ca6596a23b840bcc2a0ffe3ae5e2ff9e1069e841eb61d3040d5e916a325a8bb1b325a6b7508261a2df224

data/ext/redis_client/hiredis/extconf.rb

@@ -2,72 +2,99 @@
 
 require "mkmf"
 
-if RUBY_ENGINE == "ruby" && !RUBY_PLATFORM.match?(/mswin/)
-  have_func("rb_hash_new_capa", "ruby.h")
+class HiredisConnectionExtconf
+  def configure
+    if RUBY_ENGINE == "ruby" && !RUBY_PLATFORM.match?(/mswin/)
+      configure_extension
+      create_makefile("redis_client/hiredis_connection")
+    else
+      File.write("Makefile", dummy_makefile($srcdir).join)
+    end
+  end
+
+  def configure_extension
+    build_hiredis
 
-  hiredis_dir = File.expand_path('vendor', __dir__)
+    have_func("rb_hash_new_capa", "ruby.h")
 
-  make_program = with_config("make-prog", ENV["MAKE"])
-  make_program ||= case RUBY_PLATFORM
-  when /(bsd|solaris)/
-    'gmake'
-  else
-    'make'
+    $CFLAGS = concat_flags($CFLAGS, "-I#{hiredis_dir}", "-std=c99", "-fvisibility=hidden")
+    $CFLAGS = if ENV["EXT_PEDANTIC"]
+      concat_flags($CFLAGS, "-Werror", "-g")
+    else
+      concat_flags($CFLAGS, "-O3")
+    end
+
+    append_cflags("-Wno-declaration-after-statement") # Older compilers
+    append_cflags("-Wno-compound-token-split-by-macro") # Older rubies on macos
   end
 
-  openssl_include, openssl_lib = dir_config("openssl")
+  def build_hiredis
+    env = {
+      "USE_SSL" => 1,
+      "CFLAGS" => concat_flags(ENV["CFLAGS"], "-fvisibility=hidden"),
+    }
+    env["OPTIMIZATION"] = "-g" if ENV["EXT_PEDANTIC"]
 
-  openssl_include ||= dir_config("opt").first
-    &.split(File::PATH_SEPARATOR)
-    &.detect { |dir| dir.include?("openssl") }
+    env = configure_openssl(env)
 
-  openssl_lib ||= dir_config("opt").last
-    &.split(File::PATH_SEPARATOR)
-    &.detect { |dir| dir.include?("openssl") }
+    env_args = env.map { |k, v| "#{k}=#{v}" }
+    Dir.chdir(hiredis_dir) do
+      unless system(make_program, "static", *env_args)
+        raise "Building hiredis failed"
+      end
+    end
 
-  if (!openssl_include || !openssl_lib) && !have_header("openssl/ssl.h")
-    raise "OpenSSL library could not be found. You might want to use --with-openssl-dir=<dir> option to specify the " \
-      "prefix where OpenSSL is installed."
+    $LDFLAGS = concat_flags($LDFLAGS, "-lssl", "-lcrypto")
+    $libs = concat_flags($libs, "#{hiredis_dir}/libhiredis.a", "#{hiredis_dir}/libhiredis_ssl.a")
   end
 
-  Dir.chdir(hiredis_dir) do
-    flags = ["static", "USE_SSL=1"]
-    if openssl_lib
-      flags << %(CFLAGS="-I#{openssl_include}") << %(SSL_LDFLAGS="-L#{openssl_lib}")
-    end
+  def configure_openssl(original_env)
+    original_env.dup.tap do |env|
+      config = dir_config("openssl")
+      if config.none?
+        config = dir_config("opt").map { |c| detect_openssl_dir(c) }
+      end
 
-    flags << "OPTIMIZATION=-g" if ENV["EXT_PEDANTIC"]
+      unless have_header("openssl/ssl.h")
+        message = "ERROR: OpenSSL library could not be found."
+        if config.none?
+          message += "\nUse --with-openssl-dir=<dir> option to specify the prefix where OpenSSL is installed."
+        end
+        abort message
+      end
 
-    unless system(make_program, *flags)
-      raise "Building hiredis failed"
+      if config.any?
+        env["CFLAGS"] = concat_flags(env["CFLAGS"], "-I#{config.first}")
+        env["SSL_LDFLAGS"] = "-L#{config.last}"
+      end
     end
   end
 
-  $CFLAGS << " -I#{hiredis_dir}"
-  $LDFLAGS << " -lssl -lcrypto"
-  $libs << " #{hiredis_dir}/libhiredis.a #{hiredis_dir}/libhiredis_ssl.a "
-  $CFLAGS << " -std=c99 "
-  if ENV["EXT_PEDANTIC"]
-    $CFLAGS << " -Werror"
-    $CFLAGS << " -g "
-  else
-    $CFLAGS << " -O3 "
+  private
+
+  def detect_openssl_dir(paths)
+    paths
+      &.split(File::PATH_SEPARATOR)
+      &.detect { |dir| dir.include?("openssl") }
   end
 
-  cc_version = `#{RbConfig.expand("$(CC) --version".dup)}`
-  if cc_version.match?(/clang/i) && RUBY_PLATFORM =~ /darwin/
-    $LDFLAGS << ' -Wl,-exported_symbols_list,"' << File.join(__dir__, 'export.clang') << '"'
-    if RUBY_VERSION >= "3.2" && RUBY_PATCHLEVEL < 0
-      $LDFLAGS << " -Wl,-exported_symbol,_ruby_abi_version"
-    end
-  elsif cc_version.match?(/gcc/i)
-    $LDFLAGS << ' -Wl,--version-script="' << File.join(__dir__, 'export.gcc') << '"'
+  def concat_flags(*args)
+    args.compact.join(" ")
   end
 
-  $CFLAGS << " -Wno-declaration-after-statement" # Older compilers
-  $CFLAGS << " -Wno-compound-token-split-by-macro" # Older rubies on macos
+  def hiredis_dir
+    File.expand_path('vendor', __dir__)
+  end
 
-  create_makefile("redis_client/hiredis_connection")
-else
-  File.write("Makefile", dummy_makefile($srcdir).join)
+  def make_program
+    with_config("make-prog", ENV["MAKE"]) ||
+      case RUBY_PLATFORM
+      when /(bsd|solaris)/
+        'gmake'
+      else
+        'make'
+      end
+  end
 end
+
+HiredisConnectionExtconf.new.configure

data/ext/redis_client/hiredis/hiredis_connection.c

@@ -64,8 +64,6 @@ typedef struct {
         rb_raise(rb_eArgError, "NULL found for " # name " when shouldn't be."); \
     }
 
-void hiredis_ssl_context_mark(void *ptr) { }
-
 void hiredis_ssl_context_free(void *ptr) {
     hiredis_ssl_context_t *ssl_context = (hiredis_ssl_context_t *)ptr;
     if (ssl_context->context) {
@@ -83,14 +81,14 @@ static size_t hiredis_ssl_context_memsize(const void *ptr) {
 static const rb_data_type_t hiredis_ssl_context_data_type = {
     .wrap_struct_name = "redis-client:hiredis_ssl_context",
     .function = {
-        .dmark = hiredis_ssl_context_mark,
+        .dmark = NULL,
         .dfree = hiredis_ssl_context_free,
         .dsize = hiredis_ssl_context_memsize,
 #ifdef HAS_GC_COMPACT
         .dcompact = NULL
 #endif
     },
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
 };
 
 static VALUE hiredis_ssl_context_alloc(VALUE klass) {
@@ -482,7 +480,11 @@ static VALUE hiredis_connect_tcp(VALUE self, VALUE host, VALUE port) {
         redisFree(connection->context);
         connection->context = NULL;
     }
-    return hiredis_connect_finish(connection, redisConnectNonBlock(StringValuePtr(host), NUM2INT(port)));
+    redisContext *context = redisConnectNonBlock(StringValuePtr(host), NUM2INT(port));
+    if (context) {
+        redisEnableKeepAlive(context);
+    }
+    return hiredis_connect_finish(connection, context);
 }
 
 static VALUE hiredis_connect_unix(VALUE self, VALUE path) {
@@ -706,7 +708,7 @@ static VALUE hiredis_read(VALUE self) {
         case HIREDIS_CLIENT_TIMEOUT:
             // The timeout might have been expected (e.g. `PubSub#next_event`).
             // we let the caller decide if the connection should be closed.
-            rb_raise(rb_eRedisClientReadTimeoutError, "Unknown Error");
+            rb_raise(rb_eRedisClientReadTimeoutError, "Unknown Error (hiredis_read)");
             break;
     }
 
@@ -726,7 +728,7 @@ static VALUE hiredis_close(VALUE self) {
     return Qnil;
 }
 
-void Init_hiredis_connection(void) {
+RUBY_FUNC_EXPORTED void Init_hiredis_connection(void) {
 #ifdef RUBY_ASSERT
         // Qfalse == NULL, so we can't return Qfalse in `reply_create_bool()`
         RUBY_ASSERT((void *)Qfalse == NULL);

data/ext/redis_client/hiredis/vendor/hiredis.c

@@ -913,7 +913,7 @@ int redisSetTimeout(redisContext *c, const struct timeval tv) {
 
 /* Enable connection KeepAlive. */
 int redisEnableKeepAlive(redisContext *c) {
-    if (redisKeepAlive(c, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
+    if (redisKeepAlive(c, REDIS_KEEPALIVE_TTL, REDIS_KEEPALIVE_INTERVAL) != REDIS_OK)
         return REDIS_ERR;
     return REDIS_OK;
 }

data/ext/redis_client/hiredis/vendor/hiredis.h

@@ -87,6 +87,7 @@ typedef long long ssize_t;
 #define REDIS_NO_AUTO_FREE 0x200
 
 #define REDIS_KEEPALIVE_INTERVAL 15 /* seconds */
+#define REDIS_KEEPALIVE_TTL 120 /* seconds */
 
 /* number of times we retry to connect in the case of EADDRNOTAVAIL and
  * SO_REUSEADDR is being used. */

data/ext/redis_client/hiredis/vendor/net.c

@@ -162,7 +162,7 @@ static int redisSetBlocking(redisContext *c, int blocking) {
     return REDIS_OK;
 }
 
-int redisKeepAlive(redisContext *c, int interval) {
+int redisKeepAlive(redisContext *c, int ttl, int interval) {
     int val = 1;
     redisFD fd = c->fd;
 
@@ -171,28 +171,28 @@ int redisKeepAlive(redisContext *c, int interval) {
         return REDIS_ERR;
     }
 
-    val = interval;
-
 #if defined(__APPLE__) && defined(__MACH__)
+    val = ttl;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }
 #else
 #if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
+    val = interval;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }
 
-    val = interval/3;
-    if (val == 0) val = 1;
+    val = interval;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;
     }
 
-    val = 3;
+    val = (ttl / interval) - 1;
+    if (val <= 0) val = 1;
     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
         return REDIS_ERR;

data/ext/redis_client/hiredis/vendor/net.h

@@ -48,7 +48,7 @@ int redisContextConnectBindTcp(redisContext *c, const char *addr, int port,
                                const struct timeval *timeout,
                                const char *source_addr);
 int redisContextConnectUnix(redisContext *c, const char *path, const struct timeval *timeout);
-int redisKeepAlive(redisContext *c, int interval);
+int redisKeepAlive(redisContext *c, int ttl, int interval);
 int redisCheckConnectDone(redisContext *c, int *completed);
 
 int redisSetTcpNoDelay(redisContext *c);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiredis-client
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.0
 description:
 email:
 - jean.boussier@gmail.com
@@ -33,8 +33,6 @@ extensions:
 extra_rdoc_files: []
 files:
 - README.md
-- ext/redis_client/hiredis/export.clang
-- ext/redis_client/hiredis/export.gcc
 - ext/redis_client/hiredis/extconf.rb
 - ext/redis_client/hiredis/hiredis_connection.c
 - ext/redis_client/hiredis/vendor/.gitignore
@@ -107,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Hiredis binding for redis-client

data/ext/redis_client/hiredis/export.clang

@@ -1 +0,0 @@
-_Init_hiredis_connection

data/ext/redis_client/hiredis/export.gcc

@@ -1,7 +0,0 @@
-hiredis_connection_1.0 { 
-  global: 
-    Init_hiredis_connection;
-    ruby_abi_version;
-  local: 
-    *;
-};