opal-up 0.0.2 → 0.0.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-up
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-03 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -92,6 +92,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.1.0
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -106,59 +120,87 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.12.0
-description: High performance Rack server for Opal Ruby
+description: High performance Rack server for Opal and Ruby
 email:
 - jan@kursator.de
 executables:
 - up
 - up_bun
 - up_cluster
-- up_node
-- up_node_cluster
-extensions: []
+- up_ruby
+- up_ruby_cluster
+extensions:
+- ext/up_ext/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
 - LICENSE
 - README.md
 - bin/up
 - bin/up_bun
 - bin/up_cluster
-- bin/up_node
-- bin/up_node_cluster
-- example_rack_app/Gemfile
-- example_rack_app/config.ru
-- example_rack_app/rack_app.rb
-- example_roda_app/Gemfile
-- example_roda_app/config.ru
-- example_roda_app/roda_app.rb
-- example_sinatra_app/Gemfile
-- example_sinatra_app/config.ru
-- example_sinatra_app/sinatra_app.rb
+- bin/up_ruby
+- bin/up_ruby_cluster
+- ext/up_ext/App.h
+- ext/up_ext/AsyncSocket.h
+- ext/up_ext/AsyncSocketData.h
+- ext/up_ext/BloomFilter.h
+- ext/up_ext/ChunkedEncoding.h
+- ext/up_ext/ClientApp.h
+- ext/up_ext/HttpContext.h
+- ext/up_ext/HttpContextData.h
+- ext/up_ext/HttpErrors.h
+- ext/up_ext/HttpParser.h
+- ext/up_ext/HttpResponse.h
+- ext/up_ext/HttpResponseData.h
+- ext/up_ext/HttpRouter.h
+- ext/up_ext/Loop.h
+- ext/up_ext/LoopData.h
+- ext/up_ext/MoveOnlyFunction.h
+- ext/up_ext/PerMessageDeflate.h
+- ext/up_ext/ProxyParser.h
+- ext/up_ext/QueryParser.h
+- ext/up_ext/TopicTree.h
+- ext/up_ext/Utilities.h
+- ext/up_ext/WebSocket.h
+- ext/up_ext/WebSocketContext.h
+- ext/up_ext/WebSocketContextData.h
+- ext/up_ext/WebSocketData.h
+- ext/up_ext/WebSocketExtensions.h
+- ext/up_ext/WebSocketHandshake.h
+- ext/up_ext/WebSocketProtocol.h
+- ext/up_ext/bsd.c
+- ext/up_ext/bsd.h
+- ext/up_ext/context.c
+- ext/up_ext/epoll_kqueue.c
+- ext/up_ext/epoll_kqueue.h
+- ext/up_ext/extconf.rb
+- ext/up_ext/internal.h
+- ext/up_ext/libusockets.h
+- ext/up_ext/libuwebsockets.cpp
+- ext/up_ext/libuwebsockets.h
+- ext/up_ext/loop.c
+- 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
 - lib/up/cli.rb
-- lib/up/node/cluster.rb
-- lib/up/node/cluster_cli.rb
-- lib/up/node/rack_cluster.rb
-- lib/up/node/rack_env.rb
-- lib/up/node/rack_server.rb
-- lib/up/node/server.rb
-- lib/up/node/server_cli.rb
+- lib/up/client.rb
 - lib/up/rack_builder_patch.rb
+- 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_env.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
-- opal-up.gemspec
-- up_logo.svg
 homepage: ''
 licenses:
 - MIT
@@ -171,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.gitignore

@@ -1,5 +0,0 @@
-node_modules
-Gemfile.lock
-package-lock.json
-package.json
-*.gem

data/Gemfile

@@ -1,2 +0,0 @@
-source 'https://rubygems.org'
-gemspec

data/bin/up_node

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-if RUBY_ENGINE == 'opal'
-  require 'up/node/server_cli'
-  Up::CLI.call
-else
-  require 'up/cli'
-  Up::CLI.setup_node
-  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_node_cluster

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-if RUBY_ENGINE == 'opal'
-  require 'up/node/cluster_cli'
-  Up::CLI.call
-else
-  require 'up/cli'
-  Up::CLI.setup_node
-  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/example_rack_app/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'opal-up', path: '../'

data/example_rack_app/config.ru

@@ -1,6 +0,0 @@
-require_relative 'rack_app'
-if defined? RubyVM
-  # ensure up contenders use a JIT
-  RubyVM::YJIT.enable
-end
-run RackApp

data/example_rack_app/rack_app.rb

@@ -1,5 +0,0 @@
-class RackApp
-  def self.call(env)
-    [200, {}, [env.to_s]]
-  end
-end

data/example_roda_app/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-gem 'rack', path: '../../rack'
-gem 'opal-up', path: '../'
-gem 'roda', path: '../../roda'

data/example_roda_app/config.ru

@@ -1,6 +0,0 @@
-require_relative 'roda_app'
-if defined? RubyVM
-  # ensure up contenders use a JIT
-  RubyVM::YJIT.enable
-end
-run RodaApp.freeze

data/example_roda_app/roda_app.rb

@@ -1,37 +0,0 @@
-require "roda"
-
-class RodaApp < Roda
-  STDERR.puts "executing route"
-  route do |r|
-    STDERR.puts r
-    # GET / request
-    r.root do
-      r.redirect "/hello"
-    end
-
-    # /hello branch
-    r.on "hello" do
-      # Set variable for all routes in /hello branch
-      @greeting = 'Hello'
-
-      # GET /hello/world request
-      r.get "world" do
-        "#{@greeting} world!"
-      end
-
-      # /hello request
-      r.is do
-        # GET /hello request
-        r.get do
-          "#{@greeting}!"
-        end
-
-        # POST /hello request
-        r.post do
-          puts "Someone said #{@greeting}!"
-          r.redirect
-        end
-      end
-    end
-  end
-end

data/example_sinatra_app/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-gem 'opal', github: 'opal/opal'
-gem 'opal-up', path: '../'
-gem 'sinatra'

data/example_sinatra_app/config.ru

@@ -1,6 +0,0 @@
-require_relative 'sinatra_app'
-if defined? RubyVM
-  # ensure up contenders use a JIT
-  RubyVM::YJIT.enable
-end
-run SinatraApp

data/example_sinatra_app/sinatra_app.rb

@@ -1,7 +0,0 @@
-require 'sinatra/base'
-
-class SinatraApp
-  get '/' do
-    'Hello world!'
-  end
-end

data/lib/up/node/cluster.rb

@@ -1,39 +0,0 @@
-# backtick_javascript: true
-require 'up/node/server'
-
-%x{
-  const cluster = require('node:cluster');
-  const num_workers = require('node:os').availableParallelism();
-}
-
-module Up
-  module Node
-    class Cluster < Up::Node::Server
-      def initialize(app:, host: 'localhost', port: 3000, scheme: 'http', ca_file: nil, cert_file: nil, key_file: nil, workers: nil)
-        super(app: app, host: host, port: port, scheme: scheme, ca_file: ca_file, cert_file: cert_file, key_file: key_file)
-        @workers = workers || `num_workers`
-        @members = []
-      end
-
-      def listen
-        raise "already running" unless @members.empty?
-        %x{
-          if (cluster.isPrimary) {
-            for (let i = 0; i < #@workers; i++) {
-              #@members.push(cluster.fork());
-            }
-          } else {
-            #{super}
-          }
-        }
-      end
-
-      def stop
-        if Up::CLI::stoppable?
-          @members.each { |m| `m.kill()` } 
-          @members.clear
-        end
-      end
-    end
-  end
-end

data/lib/up/node/cluster_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/node/rack_cluster'
-
-module Up
-  module CLI
-    def self.call
-      Up::Node::RackCluster.run(get_app, get_options)
-    end
-  end
-end

data/lib/up/node/rack_env.rb

@@ -1,106 +0,0 @@
-# backtick_javascript: true
-
-require 'logger'
-require 'up/version'
-
-module Up
-  module Node
-    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 HTTP_VERSION 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.hijack'
-                      nil
-                    when 'rack.hijack?'
-                      false
-                    when 'rack.input'
-                      ::IO.new
-                    when 'rack.logger'
-                      ::Logger.new(self['rack.errors'])
-                    when 'rack.multipart.buffer_size'
-                      4096
-                    when 'rack.multipart.tempfile_factory'
-                      proc { |_filename, _content_type| File.new }
-                    when 'rack.response_finished'
-                      []
-                    when 'rack.session'
-                      {}
-                    when 'rack.upgrade'
-                      nil
-                    when 'rack.upgrade?'
-                      nil
-                    when 'rack.url_scheme'
-                      @config[:scheme]
-                    when 'HTTP_VERSION'
-                      `#@reg.httpVersion`
-                    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[key.toLowerCase()]`
-                      else
-                        nil
-                      end
-                    end
-      end
-
-      def req_headers
-        h = {}
-        %x{
-          var hdr, hds = #@req.headers;
-          for (hdr in hds) { h.set(hdr, hdrs[hdr]); }
-        }
-        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

data/lib/up/node/server.rb

@@ -1,84 +0,0 @@
-# backtick_javascript: true
-require 'up/cli'
-require 'up/node/rack_env'
-
-%x{
-  module.paths.push(process.cwd() + '/node_modules');
-  const http = require('node:http');
-  const https = require('node:https');
-  const fs = require('node:fs');
-}
-
-module Up
-  module Node
-    class Server
-      def initialize(app:, host: 'localhost', port: 3000, scheme: 'http', ca_file: nil, cert_file: nil, key_file: nil)
-        @app = app
-        @scheme    = scheme || 'http'
-        raise "unsupported scheme #{@scheme}" unless %w[http https].include?(@scheme)
-        @host      = host || 'localhost'
-        @port      = port&.to_i || 3000
-        @config    = { handler: self.class.name, engine: "node/#{`process.version`}", port: port, scheme: scheme, host: host }.freeze
-        @ca_file   = ca_file
-        @cert_file = cert_file
-        @key_file  = key_file
-        @server = nil
-      end
-
-      %x{
-        self.handle_headers = function(rack_headers, srv_res) {
-          if (rack_headers.$$is_hash) {
-            var header, k, v;
-            for(header of rack_headers) {
-              k = header[0];
-              if (!k.startsWith('rack.')) {
-                v = header[1];
-                if (v.$$is_array) {
-                  v = v.join("\n");
-                }
-                srv_res.setHeader(k, v);
-              }
-            }
-          }
-        }
-
-        self.handle_response = function(parts, srv_res) {
-          if (parts["$respond_to?"]('each')) {
-            #{`parts`.each { |part| `srv_res.write(part)` }}
-          } else if (parts["$respond_to?"]('call')) {
-            srv_res.write(parts.$call());
-          }
-          #{`parts`.close if `parts`.respond_to?(:close)}
-        }
-      }
-
-      def listen
-        raise "already running" if @server
-        %x{
-          const ounr = Opal.Up.Node.RackEnv;
-          const ouns = Opal.Up.Node.Server;
-          function handler(req, res) {
-            const rack_res = #@app.$call(ounr.$new(req, #@config));
-            res.statusCode = rack_res[0];
-            ouns.handle_headers(rack_res[1], res);
-            ouns.handle_response(rack_res[2], res);
-            res.end();
-          }
-          if (#@scheme == 'https') {
-            #@server = https.createServer({ ca: fs.readFileSync(#@ca_file), cert: fs.readFileSync(#@cert_file), key: fs.readFileSync(#@key_file) }, handler);
-          } else {
-            #@server = http.createServer(handler);
-          }
-          #@server.listen(#@port, #@host, () => { console.log(`Server is running on ${#@scheme}://${#@host}:${#@port}`)});
-        }
-      end
-
-      def stop
-        if Up::CLI::stoppable?
-          `#@server.close()`
-          @server = nil
-        end
-      end
-    end
-  end
-end

data/lib/up/node/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/node/rack_server'
-
-module Up
-  module CLI
-    def self.call
-      Up::Node::RackServer.run(get_app, get_options)
-    end
-  end
-end

data/lib/up/u_web_socket/rack_env.rb

@@ -1,101 +0,0 @@
-# backtick_javascript: true
-
-require 'logger'
-require 'up/version'
-
-module Up
-  module UWebSocket
-    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.hijack'
-                      nil
-                    when 'rack.hijack?'
-                      false
-                    when 'rack.input'
-                      ::IO.new
-                    when 'rack.logger'
-                      ::Logger.new(self['rack.errors'])
-                    when 'rack.multipart.buffer_size'
-                      4096
-                    when 'rack.multipart.tempfile_factory'
-                      proc { |_filename, _content_type| File.new }
-                    when 'rack.response_finished'
-                      []
-                    when 'rack.session'
-                      {}
-                    when 'rack.upgrade'
-                      nil
-                    when 'rack.upgrade?'
-                      nil
-                    when 'rack.url_scheme'
-                      @config[:scheme]
-                    when 'PATH_INFO'
-                      `#@req.getUrl()`
-                    when 'QUERY_STRING'
-                      `#@req.getQuery()`
-                    when 'RACK_ERRORS'
-                      self['rack.errors']
-                    when 'RACK_LOGGER'
-                      self['rack.logger']
-                    when 'REQUEST_METHOD'
-                      `#@req.getMethod().toUpperCase()`
-                    when 'SCRIPT_NAME'
-                      ""
-                    when 'SERVER_NAME'
-                      @config[:host]
-                    when 'SERVER_PORT'
-                      @config[:port].to_s
-                    when 'SERVER_PROTOCOL'
-                      `#@req.getHeader('protocol')`
-                    when 'SERVER_SOFTWARE'
-                      "#{@config[:handler]}/#{Up::VERSION} #{@config[:engine]}"
-                    else
-                      if key.start_with?('HTTP_')
-                        key = key[5..].gsub(/_/, '-')
-                        `#@req.getHeader(key.toLowerCase())`
-                      else
-                        nil
-                      end
-                    end
-      end
-
-      def req_headers
-        h = {}
-        `#@req.forEach((k, v) => { h.set(k, v); })`
-        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