opal-up 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2ff34f74e1bd316c697965755add74c90000899b4f6c1f28ed260764e1cd39a
-  data.tar.gz: 6d770d34e96f0196f7fed27a0f8ceba019bdb9e8d3ec7422b4d1525e85c482c4
+  metadata.gz: e93a1ac4cfc5ff09d0e1d6d61fbb4d5e9d1c3798df8dcadba8925b8050e95bf5
+  data.tar.gz: 40dffea08fef4cebb727334402bc6047f233a0cba6545a49cf9de8d6237b85aa
 SHA512:
-  metadata.gz: a2d8f327479eb1f4b32c8d137fcbbf580313a446452f6bc3711478318cacc37724f0778ddf021bd286d1c1639a268f2dcf7d3068fd3d7bf38f8bf7ce06133273
-  data.tar.gz: a5b122ed77934fd1d8a06bf64ff3075b44fa57497302fe5ed6b9734c1a8dfc804540f561c79a50760b488f5052eec7143998dea3c091ac06d54821868e07a90d
+  metadata.gz: 18cddc9768c2659ed8f3396d76d8b7d13eca3f4c4181b8e80b2baab04c2bb0630e0aa0b7a9dc2dc79d345288036eb1e5c715fb252bea0c93de6daf584eafb808
+  data.tar.gz: fd4a765163a1255f6f905f7bc42af1f8412e37998e079282cfc6f3bdc480ecb07bdff58d0d04354d9a6d79f93c5a207e65c09e246a60e781a8c551440860d9b9

data/README.md

@@ -17,8 +17,6 @@ Racer:            14536.88 req/s   8.94 ms        15354.14 req/s   8.44 ms
 Agoo:             49078.57 req/s   2.54 ms        89022.91 req/s   1.51 ms
 Iodine:           59116.53 req/s   2.11 ms <<<   134267.79 req/s   0.93 ms
 Up! bun:           3900.44 req/s  32.00 ms        47334.16 req/s   2.64 ms
-Up! ruby:         22144.33 req/s   5.64 ms        58704.09 req/s   2.14 ms
-Up! uWS:           6540.62 req/s  19.09 ms        78384.93 req/s   1.59 ms
 Up! ruby cluster: 53641.29 req/s   2.35 ms       128237.52 req/s   0.97 ms
 Up! uWS cluster:  20143.62 req/s   6.20 ms       152353.97 req/s   0.82 ms <<<
 
@@ -34,11 +32,8 @@ Racer 0.1.3, defaults
 Unicorn 6.1.0, 4 workers
 Agoo 2.15.8, 4 workers, 4 threads
 Iodine 0.7.57, 4 workers, 1 thread
-Up! uWS 0.0.4, 1 worker
-Up! Node 0.0.4, 1 worker
-Up! Ruby 0.0.4, 1 worker
+Up! bun 0.0.4, 1 worker
 Up! uWS cluster 0.0.4, 4 workers
-Up! Node cluster 0.0.4, 4 workers
 Up! Ruby cluster 0.0.4, 4 workers
 
 running the example_rack_app from this repo, benchmarked with:
@@ -74,11 +69,9 @@ For a Gemfile available from rubygems:
 
 Available with `bundle exec` within the example apps or if this gem is included in your Gemfile:
 
-- `up` - starts a single worker server using Opal with uWebSockets
-- `up_cluster` - starts a cluster of workers using Opal with uWebSockets, fastest server
+- `up` - starts a cluster of workers using Opal with uWebSockets, fastest server
 - `up_bun` - starts single worker server using Bun, requires Opal bun support from [PR#2622](https://github.com/opal/opal/pull/2622)
-- `up_ruby` - starts a single worker using Ruby with uWebSockets in a native extension, does not support the --secure option/TLS
-- `up_ruby_cluster` - starts a cluster of workers using Ruby with uWebSockets in a native extension, does not support the --secure options/TLS
+- `up_ruby` - starts a cluster of workers using Ruby with uWebSockets in a native extension, does not support the --secure options/TLS
 
 ```
 Usage: up [options]
@@ -92,6 +85,7 @@ When using secure sockets, the -a, -c and -k options must be provided
     -c, --cert-file FILE             File with the servers certificate
     -k, --key-file FILE              File with the servers certificate
     -l, --log-file FILE              Log file
+    -p, --pid-file FILE              PID file
     -v, --version                    Show version
     -w, --workers NUMBER             For clusters, the number of workers to run. Default: number of processors
 ```

data/bin/up

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 if RUBY_ENGINE == 'opal'
-  require 'up/u_web_socket/server_cli'
+  require 'up/u_web_socket/cluster_cli'
   Up::CLI.call
 else
   require 'up/cli'

data/bin/up_ruby

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require 'up/cli'
-require 'up/ruby/server_cli'
+require 'up/ruby/cluster_cli'
 Up::CLI.call

data/lib/up/bun/server.rb

@@ -14,7 +14,10 @@ module Up
 
   module Bun
     class Server
-      def initialize(app:, host: 'localhost', port: 3000, scheme: 'http', ca_file: nil, cert_file: nil, key_file: nil, logger: Logger.new(STDERR))
+      def initialize(app:, host: 'localhost', port: 3000, scheme: 'http',
+                     ca_file: nil, cert_file: nil, key_file: nil,
+                     pid_file: nil,
+                     logger: Logger.new(STDERR))
         @app = app
         @scheme    = scheme || 'http'
         raise "unsupported scheme #{@scheme}" unless %w[http https].include?(@scheme)
@@ -24,6 +27,7 @@ module Up
         @ca_file   = ca_file
         @cert_file = cert_file
         @key_file  = key_file
+        @pid_file  = pid_file
         @default_input = StringIO.new('', 'r')
         @server    = nil
         @logger    = logger
@@ -54,9 +58,12 @@ module Up
           return body;
         }
       }
+
       def listen
         raise "already running" if @server
         ::Up.instance_variable_set(:@instance, self)
+        File.write(@pid_file, `process.pid.toString()`) if @pid_file
+        puts "Server PID: #{`process.pid`}"
         %x{
           const oubs = Opal.Up.Bun.Server;
           const ouwc = Opal.Up.Client;

data/lib/up/cli.rb

@@ -35,6 +35,9 @@ module Up
         on('-l', '--log-file FILE', String, 'Log file') do |log_file|
           options[:logger] = Logger.new(File.new(log_file, 'a+'))
         end
+        on('-p', '--pid-file FILE', String, 'PID file') do |pid_file|
+          options[:pid_file] = pid_file
+        end
         on('-v', '--version', 'Show version') do
           puts "Up! v#{Up::VERSION}"
           exit

data/lib/up/ruby/cluster.rb

@@ -7,8 +7,12 @@ require 'up_ext'
 module Up
   module Ruby
     class Cluster < Up::Ruby::Server
-      def initialize(app:, host: 'localhost', port: 3000, scheme: 'http', ca_file: nil, cert_file: nil, key_file: nil, logger: Logger.new(STDERR), workers: nil)
+      def initialize(app:, host: 'localhost', port: 3000, scheme: 'http',
+                     ca_file: nil, cert_file: nil, key_file: nil,
+                     pid_file: nil,
+                     logger: Logger.new(STDERR), workers: nil)
         super(app: app, host: host, port: port)
+        @pid_file = pid_file
         @secret = Random.uuid
         @workers = workers || Etc.nprocessors
         @members = []
@@ -24,6 +28,8 @@ module Up
             super
           end
         end
+        File.write(@pid_file, Process.pid.to_s) if @pid_file
+        puts "Server PID: #{Process.pid}"
         unless @member_id
           install_signal_handlers
           Process.waitall
@@ -33,6 +39,7 @@ module Up
       def stop
         if Up::CLI::stoppable?
           kill_members
+          super
         end
       end
 
@@ -49,6 +56,10 @@ module Up
           warn "\nReceived CTRL-C!"
           kill_members
         end
+        Signal.trap('TERM') do
+          warn "\nReceived TERM signal!"
+          kill_members
+        end
       end
 
       def kill_members

data/lib/up/u_web_socket/cluster.rb

@@ -4,15 +4,20 @@ require 'up/u_web_socket/server'
 %x{
   const process = require('node:process');
   const cluster = require('node:cluster');
+  const filesys = require('node:fs') ;
   const num_workers = require('node:os').availableParallelism();
 }
 
 module Up
   module UWebSocket
     class Cluster < Up::UWebSocket::Server
-      def initialize(app:, host: 'localhost', port: 3000, scheme: 'http', ca_file: nil, cert_file: nil, key_file: nil, logger: Logger.new(STDERR), workers: nil)
+      def initialize(app:, host: 'localhost', port: 3000, scheme: 'http',
+                     ca_file: nil, cert_file: nil, key_file: nil,
+                     pid_file: nil,
+                     logger: Logger.new(STDERR), workers: nil)
         super(app: app, host: host, port: port, scheme: scheme, ca_file: ca_file, cert_file: cert_file, key_file: key_file, logger: logger)
         @workers = workers || `num_workers`
+        @pid_file = pid_file
         @members = []
       end
 
@@ -21,6 +26,10 @@ module Up
         ::Up.instance_variable_set(:@instance, self)
         %x{
           if (cluster.isPrimary) {
+            #{
+              File.write(@pid_file, `process.pid.toString()`) if @pid_file
+              puts "Server PID: #{`process.pid`}"
+            }
             cluster.on('message', (worker, message, handle) => {
               if (message.c && message.m) {
                 for (let member of #@members) {

data/lib/up/u_web_socket/cluster_cli.rb

@@ -1,4 +1,5 @@
 require 'opal/platform'
+require 'nodejs'
 require 'nodejs/file'
 require 'nodejs/require'
 require 'opal-parser'

data/lib/up/u_web_socket/server.rb

@@ -74,7 +74,7 @@ module Up
           env.set('PATH_INFO', req.getUrl());
           req.forEach((k, v) => {
             let h = k.toUpperCase().replaceAll('-', '_');
-            if (h[0] === 'C' && (h === 'CONTENT_TYPE || h === 'CONTENT_LENGTH')) {
+            if (h[0] === 'C' && (h === 'CONTENT_TYPE' || h === 'CONTENT_LENGTH')) {
               env.set(h, v) ;
             } else {
               env.set('HTTP_' + h, v) ;

data/lib/up/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-up
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -106,9 +106,7 @@ email:
 executables:
 - up
 - up_bun
-- up_cluster
 - up_ruby
-- up_ruby_cluster
 extensions:
 - ext/up_ext/extconf.rb
 extra_rdoc_files: []
@@ -117,9 +115,7 @@ files:
 - README.md
 - bin/up
 - bin/up_bun
-- bin/up_cluster
 - bin/up_ruby
-- bin/up_ruby_cluster
 - ext/up_ext/App.h
 - ext/up_ext/AsyncSocket.h
 - ext/up_ext/AsyncSocketData.h
@@ -171,14 +167,10 @@ files:
 - lib/up/ruby/cluster.rb
 - lib/up/ruby/cluster_cli.rb
 - lib/up/ruby/rack_cluster.rb
-- lib/up/ruby/rack_server.rb
-- lib/up/ruby/server_cli.rb
 - lib/up/u_web_socket/cluster.rb
 - lib/up/u_web_socket/cluster_cli.rb
 - lib/up/u_web_socket/rack_cluster.rb
-- lib/up/u_web_socket/rack_server.rb
 - lib/up/u_web_socket/server.rb
-- lib/up/u_web_socket/server_cli.rb
 - lib/up/version.rb
 homepage: https://github.com/janbiedermann/up
 licenses:

data/bin/up_cluster

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-if RUBY_ENGINE == 'opal'
-  require 'up/u_web_socket/cluster_cli'
-  Up::CLI.call
-else
-  require 'up/cli'
-  Up::CLI.setup_u_web_socket
-  lib_dir = File.expand_path("#{__dir__}/../lib")
-  gems = Up::CLI.get_gems_for_cmd
-  Kernel.exec("opal -Rnodejs -E -I. -I#{lib_dir} -g rack #{gems} #{__FILE__} -- #{ARGV.join(' ')}")
-end

data/bin/up_ruby_cluster

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'up/cli'
-require 'up/ruby/cluster_cli'
-Up::CLI.call

data/lib/up/ruby/rack_server.rb

@@ -1,25 +0,0 @@
-require 'up_ext'
-
-module Up
-  module Ruby
-    module RackServer
-      def self.run(app, options = {})
-        raise "already running" if @server
-        @server = Up::Ruby::Server.new(app: app, **options).listen
-        true
-      end
-
-      def self.shutdown
-        @server&.stop
-        @server = nil
-      end
-    end
-  end
-end
-
-ENV['RACK_HANDLER'] ||= 'up'
-
-begin
-  ::Rackup::Handler.register('up', Up::Ruby::RackServer) if defined?(::Rackup::Handler)
-rescue StandardError
-end

data/lib/up/ruby/server_cli.rb

@@ -1,10 +0,0 @@
-require 'rack/builder'
-require 'up/ruby/rack_server'
-
-module Up
-  module CLI
-    def self.call
-      Up::Ruby::RackServer.run(get_app, get_options)
-    end
-  end
-end

data/lib/up/u_web_socket/rack_server.rb

@@ -1,25 +0,0 @@
-require 'up/u_web_socket/server'
-
-module Up
-  module UWebSocket
-    module RackServer
-      def self.run(app, options = {})
-        raise "already running" if @server
-        @server = Up::UWebSocket::Server.new(app: app, **options).listen
-        true
-      end
-
-      def self.shutdown
-        @server&.stop
-        @server = nil
-      end
-    end
-  end
-end
-
-ENV['RACK_HANDLER'] ||= 'up'
-
-begin
-  ::Rackup::Handler.register('up', Up::UWebSocket::RackServer) if defined?(::Rackup::Handler)
-rescue StandardError
-end

data/lib/up/u_web_socket/server_cli.rb

@@ -1,15 +0,0 @@
-require 'opal/platform'
-require 'nodejs/file'
-require 'nodejs/require'
-require 'opal-parser'
-require 'rack/builder'
-require 'up/rack_builder_patch'
-require 'up/u_web_socket/rack_server'
-
-module Up
-  module CLI
-    def self.call
-      Up::UWebSocket::RackServer.run(get_app, get_options)
-    end
-  end
-end