opal-up 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bb6a2cde4f3f4cc8415d17f9d6c471dd5a991cf8ef3a588c528370b4330683d
-  data.tar.gz: 697d463336883f4259a27804239642fca35915f7991de7cc92260b6adcda44e1
+  metadata.gz: d2ff34f74e1bd316c697965755add74c90000899b4f6c1f28ed260764e1cd39a
+  data.tar.gz: 6d770d34e96f0196f7fed27a0f8ceba019bdb9e8d3ec7422b4d1525e85c482c4
 SHA512:
-  metadata.gz: '09e5af566f909d626a00e0b865b5bb7d7e717d7488f7111a5cc6b9fd8ad2b53d2c9e9aa651492ff76e6ef5eb61da63f208d719af2a593b458033b1eec3a90a10'
-  data.tar.gz: f96190488e44fac00d338f639b9167e80ac0a48cd9ee108a75474e99d982834514b94f4a01c8769ef399091c6cab2c6e54381e3e1e524215b2a028a8039abf75
+  metadata.gz: a2d8f327479eb1f4b32c8d137fcbbf580313a446452f6bc3711478318cacc37724f0778ddf021bd286d1c1639a268f2dcf7d3068fd3d7bf38f8bf7ce06133273
+  data.tar.gz: a5b122ed77934fd1d8a06bf64ff3075b44fa57497302fe5ed6b9734c1a8dfc804540f561c79a50760b488f5052eec7143998dea3c091ac06d54821868e07a90d

data/ext/up_ext/up_ext.c

@@ -1,6 +1,7 @@
 #include "libusockets.h"
 #include "libuwebsockets.h"
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <ruby.h>
 #include <ruby/encoding.h>
 #include <signal.h>
@@ -13,6 +14,12 @@
 #define MAX_HEADER_KEY_LEN 255
 #define INTERNAL_PUBLISH_PATH "/__up__cluster__publish__"
 
+#undef close
+
+#ifndef MSG_MORE
+#define MSG_MORE 0
+#endif
+
 static VALUE mUp;
 static VALUE mRuby;
 static VALUE cServer;
@@ -126,8 +133,8 @@ typedef struct server_s {
   VALUE env_template;
   VALUE body;
   VALUE env;
-  int workers;
-  int member_id;
+  long workers;
+  long member_id;
   char secret[37];
 } server_s;
 
@@ -210,9 +217,9 @@ static int up_internal_res_header_handler(VALUE key, VALUE data, VALUE arg) {
       return ST_CONTINUE;
   }
   char *key_s = RSTRING_PTR(key);
-  int key_len = RSTRING_LEN(key);
+  long key_len = RSTRING_LEN(key);
   char *data_s = RSTRING_PTR(data);
-  int data_len = RSTRING_LEN(data);
+  long data_len = RSTRING_LEN(data);
 
   if (key_len > MAX_HEADER_KEY_LEN)
     key_len = MAX_HEADER_KEY_LEN;
@@ -479,8 +486,7 @@ static void up_client_cluster_publish(char *scrt, int st, VALUE channel,
        MSG_DONTROUTE | MSG_MORE);
   send(st, boundary_disposition, strlen(boundary_disposition),
        MSG_DONTROUTE | MSG_MORE);
-  send(st, RSTRING_PTR(message), RSTRING_LEN(message),
-       MSG_DONTROUTE | MSG_MORE);
+  send(st, RSTRING_PTR(message), RSTRING_LEN(message), MSG_DONTROUTE);
 
   // char read_buf[256];
   // if (read(st, read_buf, 256)) {
@@ -490,7 +496,7 @@ static void up_client_cluster_publish(char *scrt, int st, VALUE channel,
 }
 
 static void up_internal_publish_to_member(server_s *s, VALUE channel,
-                                          VALUE message, int member_idx) {
+                                          VALUE message, long member_idx) {
   struct sockaddr_in member_addr = {.sin_addr.s_addr = inet_addr("127.0.0.1"),
                                     .sin_family = AF_INET};
   int st = socket(AF_INET, SOCK_STREAM, 0);
@@ -521,7 +527,7 @@ static VALUE up_client_publish(VALUE self, VALUE channel, VALUE message) {
     if (s->member_id > 0) {
 
       // publish to cluster members
-      int i;
+      long i;
       for (i = 1; i <= s->workers; i++) {
         if (i != s->member_id)
           up_internal_publish_to_member(s, channel, message, i);
@@ -672,7 +678,7 @@ static void up_ws_close_handler(uws_websocket_t *ws, int code,
   VALUE rhandler = rb_ivar_get(*client, at_handler);
   if (rb_respond_to(rhandler, id_on_close))
     rb_funcall(rhandler, id_on_close, 1, *client);
-  // rb_gc_unregister_address(client);
+  rb_gc_unregister_address(client);
   DATA_PTR(*client) = NULL;
   free(client);
 }
@@ -729,7 +735,7 @@ static void up_ws_upgrade_handler(uws_res_t *res, uws_req_t *req,
     // upgrade
 
     VALUE *client = malloc(sizeof(VALUE));
-    // rb_gc_register_address(client);
+    rb_gc_register_address(client);
     *client = rb_class_new_instance(0, NULL, cClient);
     rb_ivar_set(*client, at_env, renv);
     rb_ivar_set(*client, at_open, false);
@@ -836,8 +842,10 @@ static VALUE up_server_listen(VALUE self) {
     s->secret[36] = '\0';
     uws_app_any(USE_SSL, s->app, INTERNAL_PUBLISH_PATH,
                 up_internal_publish_handler, (void *)s);
-    uws_app_listen_config_t config_internal = {
-        .port = config.port + s->member_id, .host = "localhost", .options = 0};
+    uws_app_listen_config_t config_internal = {.port = config.port +
+                                                       (int)s->member_id,
+                                               .host = "localhost",
+                                               .options = 0};
     uws_app_listen_with_config(false, s->app, config_internal,
                                up_server_cluster_listen_handler, NULL);
   } else {
@@ -885,7 +893,7 @@ static VALUE up_server_publish(VALUE self, VALUE channel, VALUE message) {
                 RSTRING_PTR(message), RSTRING_LEN(message), TEXT, false);
     if (s->member_id > 0) {
       // publish to cluster members
-      int i;
+      long i;
       for (i = 1; i <= s->workers; i++) {
         if (i != s->member_id)
           up_internal_publish_to_member(s, channel, message, i);

data/lib/up/ruby/cluster.rb

@@ -12,6 +12,7 @@ module Up
         @secret = Random.uuid
         @workers = workers || Etc.nprocessors
         @members = []
+        @localhost_addr = TCPSocket.getaddress('localhost')
       end
 
       def listen
@@ -64,7 +65,7 @@ module Up
 
       def members_alive?
         @workers.times do |i|
-          TCPSocket.new('localhost', @port + i + 1).close
+          TCPSocket.new(@localhost_addr , @port + i + 1).close
         end
         true
       rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL

data/lib/up/version.rb

@@ -1,3 +1,3 @@
 module Up
-  VERSION = '0.0.9'.freeze
+  VERSION = '0.0.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-up
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-18 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger