opal-up 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46fd760653d3303f32429a4dfd767c4d93ac56817393785d7da35632ab2d4ad2
-  data.tar.gz: a809d96c97f31441dd51c8e5c87aeaee47059835718f62de3217b38348d7d111
+  metadata.gz: 3bb6a2cde4f3f4cc8415d17f9d6c471dd5a991cf8ef3a588c528370b4330683d
+  data.tar.gz: 697d463336883f4259a27804239642fca35915f7991de7cc92260b6adcda44e1
 SHA512:
-  metadata.gz: 6cd09583959a4340bafda2c118a570df793884fc2813e2b93a251f26220e243910263093c3ff24ac8f9dcc337af5cf1c152f5c9a491e58a5dcc32d035ef5c545
-  data.tar.gz: 7e45708e9f770ea45dd463dd5bf39075d7d241fe73d0ea60d638e6d80369dec4ae16661b9187525b522440133fa0272df62ca1c982bb132737807c9e05dae6f3
+  metadata.gz: '09e5af566f909d626a00e0b865b5bb7d7e717d7488f7111a5cc6b9fd8ad2b53d2c9e9aa651492ff76e6ef5eb61da63f208d719af2a593b458033b1eec3a90a10'
+  data.tar.gz: f96190488e44fac00d338f639b9167e80ac0a48cd9ee108a75474e99d982834514b94f4a01c8769ef399091c6cab2c6e54381e3e1e524215b2a028a8039abf75

data/ext/up_ext/Loop.h

@@ -21,8 +21,8 @@
 /* The loop is lazily created per-thread and run with run() */
 
 #include "LoopData.h"
+#include "libusockets.h"
 #include <iostream>
-#include <libusockets.h>
 
 namespace uWS {
 struct Loop {

data/ext/up_ext/WebSocketProtocol.h

@@ -18,7 +18,7 @@
 #ifndef UWS_WEBSOCKETPROTOCOL_H
 #define UWS_WEBSOCKETPROTOCOL_H
 
-#include <libusockets.h>
+#include "libusockets.h"
 
 #include <cstdint>
 #include <cstdlib>

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;
@@ -142,9 +143,17 @@ static void up_internal_req_header_handler(const char *h, size_t h_len,
   }
 
   header_key[h_len + 5] = '\0';
-  rb_hash_aset((VALUE)renv,
-               rb_enc_str_new(header_key, h_len + 5, binary_encoding),
-               rb_enc_str_new(v, v_len, binary_encoding));
+  if (header_key[5] == 'C' &&
+      ((strncmp(header_key + 5, "CONTENT_TYPE", 12) == 0) ||
+       (strncmp(header_key + 5, "CONTENT_LENGTH", 14) == 0))) {
+    rb_hash_aset((VALUE)renv,
+                 rb_enc_str_new(header_key + 5, h_len, binary_encoding),
+                 rb_enc_str_new(v, v_len, binary_encoding));
+  } else {
+    rb_hash_aset((VALUE)renv,
+                 rb_enc_str_new(header_key, h_len + 5, binary_encoding),
+                 rb_enc_str_new(v, v_len, binary_encoding));
+  }
 }
 
 static void up_server_prepare_env(VALUE renv, uws_req_t *req) {
@@ -629,6 +638,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;
 }
 
@@ -918,15 +929,6 @@ void up_setup_rack_env_template(void) {
   // A common object interface for logging messages
   up_hash_set(rack_env_template, "rack.logger", default_logger);
 
-  // An Integer hint to the multipart parser as to what chunk size to use for
-  // reads and writes.
-  up_hash_set(rack_env_template, "rack.multipart.buffer_size", INT2FIX(4096));
-
-  // An object responding to #call with two arguments, the filename and
-  // content_type given for the multipart form field, and returning an IO-like
-  // object that responds to #<< and optionally #rewind.
-  // up_hash_set(rack_env_template, "rack.multipart.tempfile_factory", Qnil);
-
   // An array of callables run by the server after the response has been
   // processed.
   // up_hash_set(rack_env_template, "rack.response_finished", Qnil);
@@ -969,6 +971,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");

data/lib/up/bun/server.rb

@@ -27,7 +27,6 @@ module Up
         @default_input = StringIO.new('', 'r')
         @server    = nil
         @logger    = logger
-        @t_factory = proc { |filename, _content_type| File.new(filename, 'a+') }
       end
 
       %x{
@@ -78,8 +77,6 @@ module Up
                 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);
               if (upgrade) {
                 env.set('rack.upgrade?', #{:websocket});
               }
@@ -92,7 +89,14 @@ module Up
               env.set('QUERY_STRING', "");
               env.set('REQUEST_METHOD', req.method);
               env.set('PATH_INFO', req.url);
-              req.headers.forEach((k, v) => { env.set('HTTP_' + k.toUpperCase().replaceAll('-', '_'), v) });
+              req.headers.forEach((k, v) => { 
+                let h = k.toUpperCase().replaceAll('-', '_');
+                if (h[0] === 'C' && (h === 'CONTENT_TYPE || h === 'CONTENT_LENGTH')) {
+                  env.set(h, v) ;
+                } else {
+                  env.set('HTTP_' + h, v) ;
+                }
+              });
               const rack_res = #@app.$call(env);
               if (upgrade) {
                 const handler = env.get('rack.upgrade');

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

@@ -33,7 +33,6 @@ module Up
         @default_input = StringIO.new('', 'r')
         @server    = nil
         @logger    = logger
-        @t_factory = proc { |filename, _content_type| File.new(filename, 'a+') }
       end
 
       %x{
@@ -64,8 +63,6 @@ module Up
           env.set('rack.errors',#{STDERR});
           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', ins.t_factory);
           env.set('rack.url_scheme', ins.scheme);
           env.set('SCRIPT_NAME', "");
           env.set('SERVER_PROTOCOL', 'HTTP/1.1');
@@ -75,7 +72,14 @@ module Up
           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) });
+          req.forEach((k, v) => {
+            let h = k.toUpperCase().replaceAll('-', '_');
+            if (h[0] === 'C' && (h === 'CONTENT_TYPE || h === 'CONTENT_LENGTH')) {
+              env.set(h, v) ;
+            } else {
+              env.set('HTTP_' + h, v) ;
+            }
+          });
           return env;
         }
       }

data/lib/up/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-up
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Jan Biedermann
@@ -162,7 +162,6 @@ files:
 - ext/up_ext/loop_data.h
 - ext/up_ext/socket.c
 - ext/up_ext/up_ext.c
-- lib/up/bun/rack_env.rb
 - lib/up/bun/rack_server.rb
 - lib/up/bun/server.rb
 - lib/up/bun/server_cli.rb

data/lib/up/bun/rack_env.rb

@@ -1,92 +0,0 @@
-# backtick_javascript: true
-
-require 'logger'
-require 'up/version'
-
-module Up
-  module Bun
-    class RackEnv < ::Hash
-      RACK_VARS = %w[rack.errors rack.hijack rack.hijack? rack.input rack.logger
-                    rack.multipart.buffer_size rack.multipart.tempfile_factory
-                    rack.response_finished
-                    rack.session rack.upgrade rack.upgrade? rack.url_scheme
-                    HTTP_ACCEPT HTTP_ACCEPT_ENCODING HTTP_ACCEPT_LANGUAGE
-                    HTTP_CONNECTION HTTP_HOST HTTP_USER_AGENT PATH_INFO QUERY_STRING REQUEST_METHOD
-                    SCRIPT_NAME SERVER_NAME SERVER_PROTOCOL SERVER_SOFTWARE]
-      def initialize(req, config)
-        @req = req
-        @config = config
-      end
-
-      def [](key)
-        return super(key) if key?(key)
-        self[key] = case key
-                    when 'rack.errors'
-                      STDERR
-                    when 'rack.logger'
-                      @config[:logger]
-                    when 'rack.multipart.buffer_size'
-                      4096
-                    when 'rack.multipart.tempfile_factory'
-                      proc { |_filename, _content_type| File.new }
-                    when 'rack.session'
-                      {}
-                    when 'rack.url_scheme'
-                      @config[:scheme]
-                    when 'PATH_INFO'
-                      `#@req.url`
-                    when 'QUERY_STRING'
-                      ""
-                    when 'RACK_ERRORS'
-                      self['rack.errors']
-                    when 'RACK_LOGGER'
-                      self['rack.logger']
-                    when 'REQUEST_METHOD'
-                      `#@req.method`
-                    when 'SCRIPT_NAME'
-                      ""
-                    when 'SERVER_NAME'
-                      @config[:host]
-                    when 'SERVER_PORT'
-                      @config[:port].to_s
-                    when 'SERVER_PROTOCOL'
-                      ""
-                    when 'SERVER_SOFTWARE'
-                      "#{@config[:handler]}/#{Up::VERSION} #{@config[:engine]}"
-                    else
-                      if key.start_with?('HTTP_')
-                        key = key[5..].gsub(/_/, '-')
-                        `#@req.headers.get(key.toLowerCase())`
-                      else
-                        nil
-                      end
-                    end
-      end
-
-      def req_headers
-        h = {}
-        %x{
-          var hdr, hds = #@req.headers;
-          for (hdr of hds) { h.set(hdr[0], hdr[1]); }
-        }
-        h
-      end
-
-      def each
-        unless @got_them_all
-          RACK_VARS.each { |k| self[k] unless self.key?(k) }
-          @got_them_all = true
-        end
-        super
-      end
-
-      def to_s
-        unless @got_them_all
-          RACK_VARS.each { |k| self[k] unless self.key?(k) }
-          @got_them_all = true
-        end
-        super
-      end
-    end
-  end
-end