polyphony 0.17 → 0.19

data/test/test_io.rb

@@ -15,19 +15,19 @@ class IOTest < MiniTest::Test
     count = 0
     msg = nil
     [
-      coproc {
+      spin {
         @o.write("hello")
         @o.close
       },
 
-      coproc {
+      spin {
         while count < 5
           sleep 0.01
           count += 1
         end
       }, 
 
-      coproc {
+      spin {
         msg = @i.read
       }
     ].each(&:await)
@@ -118,7 +118,7 @@ class IOClassMethodsTest < MiniTest::Test
 
   def test_popen
     counter = 0
-    timer = coproc {
+    timer = spin {
       throttled_loop(200) { counter += 1 }
     }
 

data/test/test_kernel.rb

@@ -11,7 +11,7 @@ class KernelTest < MiniTest::Test
 
   def test_system_method
     counter = 0
-    timer = coproc {
+    timer = spin {
       throttled_loop(200) { counter += 1 }
     }
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.17'
+  version: '0.19'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: modulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: localhost
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.4
 - !ruby/object:Gem::Dependency
-  name: websocket
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 5.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 5.11.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -137,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
-  name: hiredis
+  name: websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 1.2.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 1.2.8
 description: 
 email: ciconia@gmail.com
 executables: []
@@ -203,10 +217,14 @@ files:
 - examples/core/thread_cancel.rb
 - examples/core/thread_pool.rb
 - examples/core/throttle.rb
+- examples/core/timeout.rb
 - examples/fs/read.rb
 - examples/http/config.ru
 - examples/http/happy_eyeballs.rb
 - examples/http/http_client.rb
+- examples/http/http_get.rb
+- examples/http/http_parse_experiment.rb
+- examples/http/http_proxy.rb
 - examples/http/http_server.js
 - examples/http/http_server.rb
 - examples/http/http_server_forked.rb
@@ -231,11 +249,18 @@ files:
 - examples/interfaces/redis_pubsub_perf.rb
 - examples/io/cat.rb
 - examples/io/echo_client.rb
+- examples/io/echo_pipe.rb
 - examples/io/echo_server.rb
 - examples/io/echo_server_with_timeout.rb
 - examples/io/echo_stdin.rb
+- examples/io/httparty.rb
+- examples/io/httparty_multi.rb
+- examples/io/httparty_threaded.rb
 - examples/io/io_read.rb
+- examples/io/irb.rb
+- examples/io/net-http.rb
 - examples/io/system.rb
+- examples/io/tcpsocket.rb
 - examples/performance/perf_multi_snooze.rb
 - examples/performance/perf_snooze.rb
 - examples/performance/thread-vs-fiber/polyphony_server.rb
@@ -249,6 +274,7 @@ files:
 - ext/ev/io.c
 - ext/ev/libev.h
 - ext/ev/signal.c
+- ext/ev/socket.c
 - ext/ev/timer.c
 - ext/libev/Changes
 - ext/libev/LICENSE
@@ -284,11 +310,10 @@ files:
 - lib/polyphony/fs.rb
 - lib/polyphony/http.rb
 - lib/polyphony/http/agent.rb
-- lib/polyphony/http/http1.rb
-- lib/polyphony/http/http1_request.rb
-- lib/polyphony/http/http2.rb
-- lib/polyphony/http/http2_request.rb
+- lib/polyphony/http/http1_adapter.rb
+- lib/polyphony/http/http2_adapter.rb
 - lib/polyphony/http/rack.rb
+- lib/polyphony/http/request.rb
 - lib/polyphony/http/server.rb
 - lib/polyphony/line_reader.rb
 - lib/polyphony/net.rb
@@ -326,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'Polyphony: Fiber-based Concurrency for Ruby'

data/lib/polyphony/http/http1.rb

@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-
-export :call
-
-require 'http/parser'
-
-Request = import('./http1_request')
-HTTP2 = import('./http2')
-
-class Http::Parser
-  def async!
-    self.on_message_complete = proc { @request_complete = true }
-    self
-  end
-
-  def parse(data)
-    self << data
-    return nil unless @request_complete
-
-    @request_complete = nil
-    self
-  end
-end
-
-# Sets up parsing and handling of request/response cycle
-# @param socket [Net::Socket] socket
-# @param handler [Proc] request handler
-# @return [void]
-def call(socket, opts, &handler)
-  ctx = connection_context(socket, opts, handler)
-  ctx[:parser].on_body = proc { |chunk| handle_body_chunk(ctx, chunk) }
-
-  loop do
-    data = socket.readpartial(8192)
-    break unless data
-    if ctx[:parser].parse(data)
-      break unless handle_request(ctx)
-      snooze
-    end
-  end
-rescue IOError, SystemCallError => e
-  # do nothing
-ensure
-  socket.close
-end
-
-# Returns a context hash for the given socket. This hash contains references
-# related to the connection and its current state
-# @param socket [Net::Socket] socket
-# @param handler [Proc] request handler
-# @return [Hash]
-def connection_context(socket, opts, handler)
-  {
-    can_upgrade:  true,
-    upgrade:      opts[:upgrade],
-    count:        0,
-    socket:       socket,
-    handler:      handler,
-    parser:       Http::Parser.new.async!,
-    body:         nil
-  }
-end
-
-# Adds given chunk to request body
-# @param ctx [Hash] connection context
-# @return [void]
-def handle_body_chunk(context, chunk)
-
-  context[:body] ||= +''
-  context[:body] << chunk
-end
-
-# Handles request, upgrading the connection if possible
-# @param ctx [Hash] connection context
-# @return [boolean] true if HTTP 1 loop should continue handling socket
-def handle_request(ctx)
-  return nil if ctx[:can_upgrade] && upgrade_connection(ctx)
-
-  # allow upgrading the connection only on first request
-  ctx[:can_upgrade] = false
-  request = Request.new(ctx[:socket], ctx[:parser], ctx[:body])
-  ctx[:handler].(request)
-  
-  if ctx[:parser].keep_alive?
-    ctx[:body] = nil
-    true
-  else
-    nil
-  end
-end
-
-# Upgrades an HTTP 1 connection to HTTP/2 or other protocol on client request
-# @param ctx [Hash] connection context
-# @return [Boolean] true if connection was upgraded
-def upgrade_connection(ctx)
-  upgrade_protocol = ctx[:parser].headers['Upgrade']
-  return false unless upgrade_protocol
-
-  if ctx[:upgrade] && ctx[:upgrade][upgrade_protocol.to_sym]
-    ctx[:upgrade][upgrade_protocol.to_sym].(ctx[:socket], ctx[:parser].headers)
-    return true
-  end
-
-  return false unless upgrade_protocol == 'h2c'
-  
-  # upgrade to HTTP/2
-  request = http2_upgraded_request(ctx)
-  body = ctx[:body] || ''
-  HTTP2.upgrade(ctx[:socket], ctx[:handler], request, body)
-  true
-end
-
-# Returns a request hash for handling by upgraded HTTP 2 connection
-# @param ctx [Hash] connection context
-# @return [Hash]
-def http2_upgraded_request(ctx)
-  headers = ctx[:parser].headers
-  headers.merge(
-    ':scheme'     => 'http',
-    ':method'     => ctx[:parser].http_method,
-    ':authority'  => headers['Host'],
-    ':path'       => ctx[:parser].request_url
-  )
-end

data/lib/polyphony/http/http1_request.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-export_default :Request
-
-require 'uri'
-
-class Request
-  def initialize(conn, parser, body)
-    @conn         = conn
-    @parser       = parser
-    @method       = parser.http_method
-    @request_url  = parser.request_url
-    @body         = body
-  end
-
-  def http_version
-    1
-  end
-
-  def method
-    @method ||= @parser.http_method
-  end
-
-  def path
-    @uri ||= URI.parse(@parser.request_url || '')
-    @path ||= @uri.path
-  end
-
-  def query
-    @uri ||= URI.parse(@parser.request_url || '')
-    return @query if @query
-  
-    if (q = @uri.query)
-      @query = q.split('&').each_with_object({}) do |kv, h|
-        k, v = kv.split('=')
-        h[k.to_sym] = URI.decode_www_form_component(v)
-      end
-    else
-      @query = {}
-    end
-  end
-
-  def headers
-    @headers ||= @parser.headers
-  end
-
-  EMPTY_HASH = {}
-
-  def respond(chunk, headers = EMPTY_HASH)
-    status = headers.delete(':status') || 200
-    data = format_head(headers)
-    if chunk
-      data << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n0\r\n\r\n"
-    end
-    @conn << data
-  end
-
-  def format_head(headers)
-    status = headers[':status'] || 200
-    data = +"HTTP/1.1 #{status}\r\nTransfer-Encoding: chunked\r\n"
-    headers.each do |k, v|
-      next if k =~ /^:/
-      if v.is_a?(Array)
-        v.each { |o| data << "#{k}: #{o}\r\n" }
-      else
-        data << "#{k}: #{v}\r\n"
-      end
-    end
-    data << "\r\n"
-  end
-
-  def write_head(headers = EMPTY_HASH)
-    @conn << format_head(headers)
-  end
-
-  def write(chunk)
-    data = +"#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
-  end
-
-  def finish
-    @conn << "0\r\n\r\n"
-  end
-end