opal-up 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e47b86e6f54cbdb8ecf23cf5b6c759127ac30a8f4f00764e39eeca57ca94e52d
-  data.tar.gz: 6d93f3b96474fb1c18fadeb5a46083241947691470a0c3f7d36dc7025e1116de
+  metadata.gz: cb3a4f16540780758e686bbd53c9ab5467b85988bd83a990b05ab54b124c2d2d
+  data.tar.gz: 292c74cb7b0771cf807af2b1ebc221707f2b92bd28ca2e1271038b242aa94fc5
 SHA512:
-  metadata.gz: 25d3c86c354d50656b266995a0d235460e6d9c45b1853d33d363636e1bead3b4539b8a068fee0cbfd58b27d2160759b2f1823ae039c2ce0c15793f6a95fd0541
-  data.tar.gz: d3a6dd3a8e854a1ba75cfc297ecb5b4153c04b3814185add67424bcfd7574538d4365aebbd1006967e798d7af155ad0b98582955eb4f8c2e1f5633448d474433
+  metadata.gz: 4fbbd939aa7c268d503953c9d7b36d92071c23ae498df1c948acb6886007a66eb60218766528fbb6f5fe1016cdd77890a039533c40fbe3baad8594cca77f8e2d
+  data.tar.gz: da01a9584cd43ec5d5c2b97cad04c2bf6895ec029e5e34f4614a9381010788009c97f09c5b8e832913befbb6fb2b3b9157f1baeeff280cbd3e527bb61b4450e6

data/README.md

@@ -99,7 +99,6 @@ When using secure sockets, the -a, -c and -k options must be provided
 
 Up! implements the [Rack Spec as of Rack 3.0](https://github.com/rack/rack/blob/main/SPEC.rdoc) with the following differences:
 - `rack.hijack` is not implemented, but `rack.upgrade` instead is, see "Websockets" below
-- `rack.input` is currently still missing
 - Tempfile support is currently incomplete, affecting a few keys in the Rack Env ('tempfile' missing in Opal).
 - Some Rack modules/classes still have issues when run in Opal and may not work as expected
 

data/ext/up_ext/up_ext.c

@@ -26,6 +26,7 @@ static ID at_instance;
 static ID at_member_id;
 static ID at_members;
 static ID at_open;
+static ID at_port;
 static ID at_protocol;
 static ID at_secret;
 static ID at_server;
@@ -37,6 +38,7 @@ static ID id_close;
 static ID id_each;
 static ID id_host;
 static ID id_logger;
+static ID id_new;
 static ID id_on_close;
 static ID id_on_drained;
 static ID id_on_message;
@@ -122,6 +124,8 @@ typedef struct server_s {
   VALUE port;
   VALUE logger;
   VALUE env_template;
+  VALUE body;
+  VALUE env;
   int workers;
   int member_id;
   char secret[37];
@@ -283,6 +287,43 @@ typedef struct publish_data_s {
   server_s *s;
 } publish_data_s;
 
+static void up_internal_call_app(server_s *s, uws_res_t *res, VALUE env) {
+  // call app
+  VALUE rres = rb_funcall(s->rapp, id_call, 1, env);
+
+  if (TYPE(rres) != T_ARRAY)
+    goto response_error;
+
+  // response status
+  VALUE rstatus = rb_ary_entry(rres, 0);
+  if (!up_internal_set_response_status(res, rstatus))
+    goto response_error;
+
+  // collect headers
+  VALUE rheaders = rb_ary_entry(rres, 1);
+  if (TYPE(rheaders) != T_HASH)
+    goto response_error;
+  rb_hash_foreach(rheaders, up_internal_res_header_handler, (VALUE)res);
+
+  // collect response body
+  VALUE rparts = rb_ary_entry(rres, 2);
+  up_internal_collect_response_body(res, rparts);
+
+  // end response
+  uws_res_end_without_body(USE_SSL, res, false);
+
+  // close resources if necessary
+  if (rb_respond_to(rparts, id_close))
+    rb_funcall(rparts, id_close, 0);
+
+  return;
+response_error:
+  fprintf(stderr, "response error\n");
+  uws_res_end_without_body(USE_SSL, res, false);
+}
+
+static void up_internal_abort_data(uws_res_t *res, void *arg) {}
+
 static void up_internal_process_publish_post_data(uws_res_t *res,
                                                   const char *chunk,
                                                   size_t chunk_length,
@@ -299,9 +340,22 @@ static void up_internal_process_publish_post_data(uws_res_t *res,
       break;
     }
   }
-  if (channel_length > 0 && message_length > 0) {
+  if (channel_length > 0 && message_length > 0)
     uws_publish(USE_SSL, s->app, channel_start, channel_length, message_start,
                 message_length, TEXT, false);
+}
+
+static void up_internal_process_post_data(uws_res_t *res, const char *chunk,
+                                          size_t chunk_length, bool is_end,
+                                          void *arg) {
+  server_s *s = (server_s *)arg;
+  rb_str_cat(s->body, chunk, chunk_length);
+  if (is_end) {
+    // set rack.input
+    rb_hash_aset(s->env, rack_input, rb_funcall(cStringIO, id_new, 1, s->body));
+    up_internal_call_app(s, res, s->env);
+    s->body = Qnil;
+    s->env = Qnil;
   }
 }
 
@@ -322,48 +376,25 @@ static void up_internal_publish_handler(uws_res_t *res, uws_req_t *req,
   }
 }
 
-static void up_server_request_handler(uws_res_t *res, uws_req_t *req,
-                                      void *arg) {
+static void up_server_any_handler(uws_res_t *res, uws_req_t *req, void *arg) {
   // prepare rack env
   server_s *s = (server_s *)arg;
-  VALUE renv = rb_hash_dup(s->env_template);
-  up_server_prepare_env(renv, req);
-
-  // call app
-  VALUE rres = rb_funcall(s->rapp, id_call, 1, renv);
-  if (TYPE(rres) != T_ARRAY)
-    goto response_error;
-
-  // response status
-  VALUE rstatus = rb_ary_entry(rres, 0);
-  if (!up_internal_set_response_status(res, rstatus))
-    goto response_error;
-
-  // collect headers
-  VALUE rheaders = rb_ary_entry(rres, 1);
-  if (TYPE(rheaders) != T_HASH)
-    goto response_error;
-  rb_hash_foreach(rheaders, up_internal_res_header_handler, (VALUE)res);
-
-  // collect response body
-  VALUE rparts = rb_ary_entry(rres, 2);
-  up_internal_collect_response_body(res, rparts);
-
-  // end response
-  uws_res_end_without_body(USE_SSL, res, false);
+  VALUE env = rb_hash_dup(s->env_template);
+  up_server_prepare_env(env, req);
+  up_internal_call_app(s, res, env);
+  RB_GC_GUARD(env);
+}
 
-  // close resources if necessary
-  if (rb_respond_to(rparts, id_close))
-    rb_funcall(rparts, id_close, 0);
+static void up_server_post_handler(uws_res_t *res, uws_req_t *req, void *arg) {
+  // prepare rack env
+  server_s *s = (server_s *)arg;
+  s->env = rb_hash_dup(s->env_template);
+  up_server_prepare_env(s->env, req);
 
-  return;
-  RB_GC_GUARD(rstatus);
-  RB_GC_GUARD(rheaders);
-  RB_GC_GUARD(rres);
-  RB_GC_GUARD(renv);
-response_error:
-  fprintf(stderr, "response error\n");
-  uws_res_end_without_body(USE_SSL, res, false);
+  // receive POST data
+  s->body = rb_enc_str_new("", 0, utf8_encoding);
+  uws_res_on_data(USE_SSL, res, up_internal_process_post_data, (void *)s);
+  uws_res_on_aborted(USE_SSL, res, up_internal_abort_data, NULL);
 }
 
 static void
@@ -599,6 +630,8 @@ static VALUE up_server_init(int argc, VALUE *argv, VALUE self) {
   s->port = rport;
   s->logger = rargs[3];
 
+  rb_ivar_set(self, at_port, s->port);
+
   return self;
 }
 
@@ -613,8 +646,8 @@ void up_ws_drain_handler(uws_websocket_t *ws, void *user_data) {
 
 void up_ws_ping_handler(uws_websocket_t *ws, const char *message, size_t length,
                         void *user_data) {
-  /* You don't need to handle this one, we automatically respond to pings as per
-   * standard */
+  /* You don't need to handle this one, we automatically respond to pings as
+   * per standard */
 }
 
 void up_ws_pong_handler(uws_websocket_t *ws, const char *message, size_t length,
@@ -807,7 +840,8 @@ static VALUE up_server_listen(VALUE self) {
     sigemptyset(&upclcl.sa_mask);
     sigaction(SIGINT, &upclcl, NULL);
   }
-  uws_app_any(USE_SSL, s->app, "/*", up_server_request_handler, (void *)s);
+  uws_app_post(USE_SSL, s->app, "/*", up_server_post_handler, (void *)s);
+  uws_app_any(USE_SSL, s->app, "/*", up_server_any_handler, (void *)s);
   uws_ws(USE_SSL, s->app, "/*",
          (uws_socket_behavior_t){.compression = DISABLED,
                                  .maxPayloadLength = 5 * 1024 * 1024,
@@ -938,6 +972,7 @@ void Init_up_ext(void) {
   at_member_id = rb_intern("@member_id");
   at_members = rb_intern("@members");
   at_open = rb_intern("@open");
+  at_port = rb_intern("@port");
   at_protocol = rb_intern("@protocol");
   at_secret = rb_intern("@secret");
   at_server = rb_intern("@server");
@@ -949,6 +984,7 @@ void Init_up_ext(void) {
   id_each = rb_intern("each");
   id_host = rb_intern("host");
   id_logger = rb_intern("logger");
+  id_new = rb_intern("new");
   id_on_close = rb_intern("on_close");
   id_on_drained = rb_intern("on_drained");
   id_on_message = rb_intern("on_message");
@@ -980,14 +1016,14 @@ void Init_up_ext(void) {
   rb_gc_register_address(&cLogger);
   cLogger = rb_const_get(rb_cObject, rb_intern("Logger"));
   rb_gc_register_address(&default_logger);
-  default_logger = rb_funcall(cLogger, rb_intern("new"), 1, rb_stderr);
+  default_logger = rb_funcall(cLogger, id_new, 1, rb_stderr);
 
   rb_require("stringio");
 
   rb_gc_register_address(&cStringIO);
   cStringIO = rb_const_get(rb_cObject, rb_intern("StringIO"));
   rb_gc_register_address(&default_input);
-  default_input = rb_funcall(cStringIO, rb_intern("new"), 1, empty_string);
+  default_input = rb_funcall(cStringIO, id_new, 1, empty_string);
 
   up_setup_rack_env_template();
 

data/lib/up/bun/server.rb

@@ -1,5 +1,6 @@
 # backtick_javascript: true
 require 'logger'
+require 'stringio'
 require 'up/cli'
 require 'up/client'
 
@@ -23,7 +24,7 @@ module Up
         @ca_file   = ca_file
         @cert_file = cert_file
         @key_file  = key_file
-        @default_input = IO.new
+        @default_input = StringIO.new('', 'r')
         @server    = nil
         @logger    = logger
         @t_factory = proc { |filename, _content_type| File.new(filename, 'a+') }
@@ -65,11 +66,17 @@ module Up
             port: #@port,
             hostname: #@host,
             development: false,
-            fetch(req, server) {
+            async fetch(req, server) {
               const upgrade = req.headers.get('Upgrade');
               const env = new Map();
               env.set('rack.errors',#{STDERR});
-              env.set('rack.input', #@default_input);
+              if (req.method === 'POST') {
+                let body = await req.text();
+                console.log('received: ', body);
+                env.set('rack.input', #{StringIO.new(`body`)});
+              } else {
+                env.set('rack.input', #@default_input);
+              }
               env.set('rack.logger', #@logger);
               env.set('rack.multipart.buffer_size', 4096);
               env.set('rack.multipart.tempfile_factory', #@t_factory);

data/lib/up/ruby/cluster.rb

@@ -1,6 +1,7 @@
 # backtick_javascript: true
 require 'etc'
 require 'random/formatter'
+require 'socket'
 require 'up_ext'
 
 module Up
@@ -38,8 +39,10 @@ module Up
 
       def install_signal_handlers
         Signal.trap('CHLD') do
-          warn "\nError: a cluster member died!"
-          kill_members
+          unless members_alive?
+            warn "\nError: a cluster worker died!"
+            kill_members
+          end
         end
         Signal.trap('INT') do
           warn "\nReceived CTRL-C!"
@@ -49,7 +52,7 @@ module Up
 
       def kill_members
         Signal.trap('CHLD', 'IGNORE')
-        STDERR.print "Stopping workers: "
+        STDERR.print "Stopping all workers: "
         @members.each do |mid|
           Process.kill('INT', mid) rescue nil
           STDERR.print '.'
@@ -58,6 +61,15 @@ module Up
         warn "\nCluster stopped."
         Signal.trap('CHLD', 'DEFAULT')
       end
+
+      def members_alive?
+        @workers.times do |i|
+          TCPSocket.new('localhost', @port + i + 1).close
+        end
+        true
+      rescue Errno::ECONNREFUSED, Errno::EADDRNOTAVAIL
+        false
+      end
     end
   end
 end

data/lib/up/u_web_socket/server.rb

@@ -1,5 +1,6 @@
 # backtick_javascript: true
 require 'logger'
+require 'stringio'
 require 'up/cli'
 require 'up/client'
 
@@ -29,7 +30,7 @@ module Up
         @ca_file   = ca_file
         @cert_file = cert_file
         @key_file  = key_file
-        @default_input = IO.new
+        @default_input = StringIO.new('', 'r')
         @server    = nil
         @logger    = logger
         @t_factory = proc { |filename, _content_type| File.new(filename, 'a+') }
@@ -58,20 +59,20 @@ module Up
           #{`parts`.close if `parts`.respond_to?(:close)}
         }
 
-        self.prepare_env = function(req) {
+        self.prepare_env = function(req, ins) {
           const env = new Map();
           env.set('rack.errors',#{STDERR});
-          env.set('rack.input', #@default_input);
-          env.set('rack.logger', #@logger);
+          env.set('rack.input', ins.default_input);
+          env.set('rack.logger', ins.logger);
           env.set('rack.multipart.buffer_size', 4096);
-          env.set('rack.multipart.tempfile_factory', #@t_factory);
-          env.set('rack.url_scheme', #@scheme);
+          env.set('rack.multipart.tempfile_factory', ins.t_factory);
+          env.set('rack.url_scheme', ins.scheme);
           env.set('SCRIPT_NAME', "");
           env.set('SERVER_PROTOCOL', 'HTTP/1.1');
           env.set('HTTP_VERSION', 'HTTP/1.1');
-          env.set('SERVER_NAME', #@host);
-          env.set('SERVER_PORT', #@port);
-          env.set('QUERY_STRING', req.getQuery());
+          env.set('SERVER_NAME', ins.host);
+          env.set('SERVER_PORT', ins.port);
+          env.set('QUERY_STRING', req.getQuery() || '');
           env.set('REQUEST_METHOD', req.getMethod().toUpperCase());
           env.set('PATH_INFO', req.getUrl());
           req.forEach((k, v) => { env.set('HTTP_' + k.toUpperCase().replaceAll('-', '_'), v) });
@@ -91,8 +92,24 @@ module Up
           } else {
             #@server = uws.App();
           }
+          #@server.post('/*', (res, req) => {
+            const env = ouws.prepare_env(req, self);
+            let buffer = Buffer.from('');
+            res.onData((chunk, is_last) => {
+              buffer = Buffer.concat([buffer, Buffer.from(chunk)]);
+              if (is_last === true) {
+                env.set('rack.input', #{StringIO.new(`buffer.toString()`)});
+                const rack_res = #@app.$call(env);
+                res.writeStatus(rack_res[0].toString() + ' OK');
+                ouws.handle_headers(rack_res[1], res);
+                ouws.handle_response(rack_res[2], res);
+                res.end();
+              }
+            });
+            res.onAborted(() => {});
+          });
           #@server.any('/*', (res, req) => {
-            const rack_res = #@app.$call(ouws.prepare_env(req));
+            const rack_res = #@app.$call(ouws.prepare_env(req, self));
             res.writeStatus(rack_res[0].toString() + ' OK');
             ouws.handle_headers(rack_res[1], res);
             ouws.handle_response(rack_res[2], res);
@@ -136,7 +153,7 @@ module Up
             },
             sendPingsAutomatically: true,
             upgrade: (res, req, context) => {
-              const env = ouws.prepare_env(req);
+              const env = ouws.prepare_env(req, self);
               env.set('rack.upgrade?', #{:websocket});
               const rack_res = #@app.$call(env);
               const handler = env.get('rack.upgrade');

data/lib/up/version.rb

@@ -1,3 +1,3 @@
 module Up
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-up
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Jan Biedermann