hiredis-client 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 767ca647924d14a2509280e51bee10968a669b9ea1e2df60f4fee4c8be4d3f0f
-  data.tar.gz: eebad74d4427e86f5c94ec6d83e0cb5aa55bd2826fd150190d5a0fabd4c64fea
+  metadata.gz: d85790ae197a6affc3f442a07dc13207b600821dba1a840b773aa54e6dd9b6df
+  data.tar.gz: 5e4e61dfa45511e1ebe56681fa55ef121900155b1a5db8724f45a23111dbcb21
 SHA512:
-  metadata.gz: ca70fbf8254d7101b8b63ffb223d0530b8c7fb2854cb667ff0093f62fb10be848ca9153b123bf5a5ae1988bf61b63f0afcd7abb0b552e7ae35c5f52ac1aa2e1f
-  data.tar.gz: 1affad896f66ddd864619b1786586f0d9f352aa741f873d6ca69cbb37b41a37020c7c9391f8431011a532f49346f5d8712bca32be2c15d5ade449cafa3c2b421
+  metadata.gz: 19be40f01d83e960305cc29b719578124f4a11189c60431c4a9337174a462c2ede846c00a53d166485ddc4208f68c4641263d03533fad783998ad64685941e4b
+  data.tar.gz: b1ee30444e242333a3920acb864f943523312b6ad34eeec3bd09cef421c611d4b26267bf1a7d61559fba66055bbd08afd8a75b417c63080afa5bb2bc73efaf7d

data/ext/redis_client/hiredis/hiredis_connection.c

@@ -36,9 +36,12 @@
 #include <errno.h>
 #include <sys/socket.h>
 #include <stdbool.h>
+#include <unistd.h>
+#include <fcntl.h> 
 #include "hiredis.h"
 #include "net.h"
 #include "hiredis_ssl.h"
+#include <poll.h>
 
 #if !defined(RUBY_ASSERT)
 #  define RUBY_ASSERT(condition) ((void)0)
@@ -797,6 +800,120 @@ static VALUE hiredis_close(VALUE self) {
     return Qnil;
 }
 
+static VALUE hiredis_reopen(VALUE self) {
+    CONNECTION(self, connection);
+    if (!connection->context) {
+        return Qfalse;
+    }
+
+    if (connection->context->fd == REDIS_INVALID_FD) {
+        return Qfalse;
+    }
+
+    int null_fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+    if (null_fd <= 0) {
+        return Qfalse;
+    }
+
+    int rc = dup2(null_fd, connection->context->fd);
+    if (close(null_fd) < 0) {
+        return Qfalse;
+    }
+
+    if (rc < 0) {
+        return Qfalse;
+    }
+
+    return Qtrue;
+}
+
+static inline double diff_timespec_ms(const struct timespec *time1, const struct timespec *time0) {
+  return ((time1->tv_sec - time0->tv_sec) * 1000.0)
+      + (time1->tv_nsec - time0->tv_nsec) / 1000000.0;
+}
+
+static inline int timeval_to_msec(struct timeval duration) {
+    return duration.tv_sec * 1000 + duration.tv_usec / 1000;
+}
+
+typedef struct {
+    hiredis_connection_t *connection;
+    struct timespec start;
+    struct timespec end;
+    int return_value;
+} hiredis_measure_round_trip_delay_args_t;
+
+static const size_t pong_length = 7;
+
+static void *hiredis_measure_round_trip_delay_safe(void *_args) {
+    hiredis_measure_round_trip_delay_args_t *args = _args;
+    hiredis_connection_t *connection = args->connection;
+    redisReader *reader = connection->context->reader;
+
+    if (reader->len - reader->pos != 0) {
+        args->return_value = REDIS_ERR;
+        return NULL;
+    }
+
+    redisAppendFormattedCommand(connection->context, "PING\r\n", 6);
+
+    clock_gettime(CLOCK_MONOTONIC, &args->start);
+
+    int wdone = 0;
+    do {
+        if (redisBufferWrite(connection->context, &wdone) == REDIS_ERR) {
+            args->return_value = REDIS_ERR;
+            return NULL;
+        }
+    } while (!wdone);
+
+    struct pollfd   wfd[1];
+    wfd[0].fd     = connection->context->fd;
+    wfd[0].events = POLLIN;
+    int retval = poll(wfd, 1, timeval_to_msec(connection->read_timeout));
+    if (retval == -1) {
+        args->return_value = REDIS_ERR_IO;
+        return NULL;
+    } else if (!retval) {
+        args->return_value = REDIS_ERR_IO;
+        return NULL;
+    }
+
+    redisBufferRead(connection->context);
+
+    if (reader->len - reader->pos != pong_length) {
+        args->return_value = REDIS_ERR;
+        return NULL;
+    }
+
+    if (strncmp(reader->buf + reader->pos, "+PONG\r\n", pong_length) != 0) {
+        args->return_value = REDIS_ERR;
+        return NULL;
+    }
+    reader->pos += pong_length;
+
+    clock_gettime(CLOCK_MONOTONIC, &args->end);
+    args->return_value = REDIS_OK;
+    return NULL;
+}
+
+static VALUE hiredis_measure_round_trip_delay(VALUE self) {
+    CONNECTION(self, connection);
+    ENSURE_CONNECTED(connection);
+
+    hiredis_measure_round_trip_delay_args_t args = {
+        .connection = connection,
+    };
+    rb_thread_call_without_gvl(hiredis_measure_round_trip_delay_safe, &args, RUBY_UBF_IO, 0);
+
+    if (args.return_value != REDIS_OK) {
+        hiredis_raise_error_and_disconnect(connection, rb_eRedisClientReadTimeoutError);
+        return Qnil; // unreachable;
+    }
+
+    return DBL2NUM(diff_timespec_ms(&args.end, &args.start));
+}
+
 RUBY_FUNC_EXPORTED void Init_hiredis_connection(void) {
     // Qfalse == NULL, so we can't return Qfalse in `reply_create_bool()`
     RUBY_ASSERT((void *)Qfalse == NULL);
@@ -843,6 +960,8 @@ RUBY_FUNC_EXPORTED void Init_hiredis_connection(void) {
     rb_define_private_method(rb_cHiredisConnection, "_read", hiredis_read, 0);
     rb_define_private_method(rb_cHiredisConnection, "flush", hiredis_flush, 0);
     rb_define_private_method(rb_cHiredisConnection, "_close", hiredis_close, 0);
+    rb_define_private_method(rb_cHiredisConnection, "_reopen", hiredis_reopen, 0);
+    rb_define_method(rb_cHiredisConnection, "measure_round_trip_delay", hiredis_measure_round_trip_delay, 0);
 
     VALUE rb_cHiredisSSLContext = rb_define_class_under(rb_cHiredisConnection, "SSLContext", rb_cObject);
     rb_define_alloc_func(rb_cHiredisSSLContext, hiredis_ssl_context_alloc);

data/lib/redis_client/hiredis_connection.rb

@@ -10,6 +10,17 @@ class RedisClient
 
     class << self
       def ssl_context(ssl_params)
+        unless ssl_params[:ca_file] || ssl_params[:ca_path]
+          default_ca_file = OpenSSL::X509::DEFAULT_CERT_FILE
+          default_ca_path = OpenSSL::X509::DEFAULT_CERT_DIR
+
+          if File.readable? default_ca_file
+            ssl_params[:ca_file] = default_ca_file
+          elsif File.directory? default_ca_path
+            ssl_params[:ca_path] = default_ca_path
+          end
+        end
+
         HiredisConnection::SSLContext.new(
           ca_file: ssl_params[:ca_file],
           ca_path: ssl_params[:ca_path],
@@ -42,6 +53,11 @@ class RedisClient
       super
     end
 
+    def discard
+      _reopen
+      close
+    end
+
     def reconnect
       reconnected = begin
         _reconnect(@config.path, @config.ssl_context)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiredis-client
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-08-01 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.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 description:
 email:
 - jean.boussier@gmail.com
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Hiredis binding for redis-client