polyphony 0.96 → 0.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2db26acbbe9457dc3b3fcdd1e34d35e5347a2e67a5c126b9ddea672957ca3318
-  data.tar.gz: ac02e27bd659dafbfe0b68db9b22fc3ca8acb744ff82049dbb2bbea999f7e87e
+  metadata.gz: 1a8218fc4160e0772ee3aada1f72ea9d063724ccf9b0aee7dfa6e9e4d69ebfe4
+  data.tar.gz: 74aae84e991cd4330ad282553061b29e71a6434ce2dafc9985c62feb3a966a68
 SHA512:
-  metadata.gz: e99fb459ea41504df54826634d219f8ef1feea3324fe6c56ab18fc46867728d57f36f4c15a35787e0ba42fe588b10d3e849badfcbee0a720c77bb1d8619e8fc3
-  data.tar.gz: d52ee81b1f1f5a5294cecf09837ccce8cc68f0233d73a0d868326f0a144897542f5ad3e05cc398eb4bf963742fe1fac01a096abf0d77e3201d8c50ca8880e65a
+  metadata.gz: 772d0be4ef2f723fa27cc5ecb8ef9e9b5d012c501a364ab23dce7d145fc6d156d5e219e52e871a2aadb41a397c5fb044c8aaee9b42906f4894ff3447af0e93ba
+  data.tar.gz: b74d6958ea8a77ffee45aed8184091b5ef54cb4fcaca9798351533b13d2f2202f28ab95f56a26e09692bf40f00e723d2df9c99007dbe10631d1c69c523fb3a58

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.97 2023-02-28
+
+- Fix working with IRB (#5)
+
 ## 0.96 2023-02-11
  - Rework Redis client adapter
 - Fix working with Pry (#95, thanks @floriandejonckheere)

data/Rakefile

@@ -12,7 +12,7 @@ task :recompile => [:clean, :compile]
 task :default => [:compile, :test]
 
 task :test do
-  exec 'ruby test/run.rb --verbose'
+  exec 'ruby test/run.rb'
 end
 
 task :stress_test do

data/examples/io/https_server.rb

@@ -18,7 +18,8 @@ puts 'Serving HTTPS on port 1234'
 spin_loop(interval: 1) { STDOUT << '.' }
 
 # server.accept_loop do |socket|
-while (socket = server.accept)
+server.accept_loop do |socket|
+# while (socket = (server.accept)
   spin do
     while (data = socket.gets("\n", 8192))
       if data.chomp.empty?

data/examples/io/https_server_sni.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+require 'localhost/authority'
+
+authority = Localhost::Authority.fetch
+server_ctx = authority.server_context
+server_ctx.servername_cb = proc { |_socket, name| server_ctx  }
+opts = {
+  reuse_addr:     true,
+  dont_linger:    true,
+  secure_context: server_ctx
+}
+
+server = Polyphony::Net.tcp_listen('localhost', 1234, opts)
+
+puts 'Serving HTTPS on port 1234'
+
+# server.accept_loop do |socket|
+server.accept_loop do |socket|
+# while (socket = (server.accept)
+  spin do
+    while (data = socket.gets("\n", 8192))
+      if data.chomp.empty?
+        socket << "HTTP/1.1 200 OK\nConnection: close\nContent-Length: 4\n\nfoo\n"
+        break
+      end
+    end
+  end
+end

data/examples/io/https_server_sni_2.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polyphony'
+require 'localhost/authority'
+
+authority = Localhost::Authority.fetch
+server_ctx = authority.server_context
+
+resolver = spin_loop do
+  name, client = receive
+  client << server_ctx
+end
+
+server_ctx.servername_cb = proc do |_socket, name|
+  resolver << [name, Fiber.current]
+  receive
+end
+
+opts = {
+  reuse_addr:     true,
+  dont_linger:    true,
+  secure_context: server_ctx
+}
+
+server = Polyphony::Net.tcp_listen('localhost', 1234, opts)
+
+puts 'Serving HTTPS on port 1234'
+
+# server.accept_loop do |socket|
+server.accept_loop do |socket|
+# while (socket = (server.accept)
+  spin do
+    while (data = socket.gets("\n", 8192))
+      if data.chomp.empty?
+        socket << "HTTP/1.1 200 OK\nConnection: close\nContent-Length: 4\n\nfoo\n"
+        break
+      end
+    end
+  end
+end

data/examples/pipes/http_server.rb

@@ -3,6 +3,7 @@
 require 'bundler/inline'
 
 gemfile do
+  source 'https://rubygems.org'
   gem 'h1p'
   gem 'polyphony', path: '.'
 end
@@ -22,10 +23,12 @@ def handle_client(conn)
 
       conn << "HTTP/1.1 200 OK\r\nContent-Length: 14\r\n\r\nHello, world!\n"
     end
+  rescue Errno::ECONNRESET
+    # ignore
   rescue H1P::Error
     puts 'Got invalid request, closing connection...'
   ensure
-    conn.close
+    conn.close rescue nil
   end
 end
 

data/lib/polyphony/adapters/irb.rb

@@ -2,46 +2,6 @@
 
 require 'polyphony'
 
-if Object.constants.include?(:Reline)
-  puts "reline"
-  class Reline::ANSI
-    def self.select(read_ios = [], write_ios = [], error_ios = [], timeout = nil)
-      # p [:select, read_ios, timeout]
-      # puts caller.join("\n")
-      raise if read_ios.size > 1
-      raise if write_ios.size > 0
-      raise if error_ios.size > 0
-
-      # p 1
-      fiber = Fiber.current
-      timer = spin do
-        sleep timeout
-        fiber.cancel
-      end
-      # p 2
-      read_ios.each do |io|
-        # p wait: io
-        Polyphony.backend_wait_io(io, false)
-        # p :done_wait
-        return [io]
-      end
-      # p 3
-    rescue Polyphony::Cancel
-      # p :cancel
-      return nil
-    ensure
-      # p :ensure
-      timer.stop
-      # p :ensure_done      
-    end
-  end
-else
-  require_relative './readline'
-
-  # RubyLex patches
-  class ::RubyLex
-    class TerminateLineInput2 < RuntimeError
-    end
-    const_set(:TerminateLineInput, TerminateLineInput2)
-  end
+module Kernel
+  alias_method :gets, :orig_gets
 end

data/lib/polyphony/extensions/io.rb

@@ -131,6 +131,16 @@ class ::IO
     nil
   end
 
+  def ungetc(c)
+    c = c.chr if c.is_a?(Integer)
+    if @read_buffer
+      @read_buffer.prepend(c)
+    else
+      @read_buffer = +c
+    end
+  end
+  alias_method :ungetbyte, :ungetc
+
   alias_method :orig_read, :read
   def read(len = nil, buf = nil, buf_pos = 0)
     if buf
@@ -252,6 +262,8 @@ class ::IO
   end
 
   def wait_readable(timeout = nil)
+    return self if @read_buffer && @read_buffer.size > 0
+
     if timeout
       move_on_after(timeout) do
         Polyphony.backend_wait_io(self, false)

data/lib/polyphony/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Polyphony
-  VERSION = '0.96'
+  VERSION = '0.97'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polyphony
 version: !ruby/object:Gem::Version
-  version: '0.96'
+  version: '0.97'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2023-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -250,6 +250,8 @@ files:
 - examples/io/http1_splice_chunked.rb
 - examples/io/httparty.rb
 - examples/io/https_server.rb
+- examples/io/https_server_sni.rb
+- examples/io/https_server_sni_2.rb
 - examples/io/irb.rb
 - examples/io/net-http.rb
 - examples/io/open.rb