ruby_home 0.1.23 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a06fe406af9a2d18a8cd3083e97dd84d10cf6ccc447ff3d46527ea5882c22d1
-  data.tar.gz: 3893723e9f2ccf60561bc831a680b715f7216f32c1783bbc3b01bd290212d95a
+  metadata.gz: 6fb157eb26583418aa02ef31fe2b4ed2f8f40f8cb57e46f78e7603cdd531256b
+  data.tar.gz: 5ed756570a2e0f3992a0b4b53eb0521bc94d7c46f55e5318a80e6bf74da27304
 SHA512:
-  metadata.gz: 613563189aaf7dedf4361b8bc8f3a59ed6b98527976c309ccd40ffafc6717cebfd1eb97d792507eddc751b151aaa5c1f047317038475e4a63c96c94da8012a7e
-  data.tar.gz: ac7e43d2580b305a97d8b1354b940cb909cd2a4763bcf629898cb2a59cc817c53b049bd4745c597a80aa84a8072e3157583f1ee9975a4e542b00cb5c37d92d72
+  metadata.gz: a8732ab9a3caa1e9d61a371bbed0495eb523d6e0b1e0c248f1f7f1fc7d6ab6848ccaa8a5105a78214ad4375bb15df57e84df00d664cf4ad554bbab89a53e375d
+  data.tar.gz: 3f0b97b56c9785b1664a5fa7885407a37ae75bce6924f1b8c7dbee6b72ab3037b8037f5872c38e7fad6ed5bd88fa34f73f955a70138774b6b1fe18bfe218956a

data/.travis.yml

@@ -1,3 +1,4 @@
+dist: xenial
 cache: bundler
 language: ruby
 before_install:

data/lib/ruby_home/hap/hap_request.rb

@@ -1,11 +1,14 @@
 module RubyHome
   module HAP
     class HAPRequest < WEBrick::HTTPRequest
-      attr_accessor :session
+      def initialize(config, session:)
+        @session = session
+        super(config)
+      end
 
       def meta_vars
         super.merge(
-          { "REQUEST_SESSION" => session }
+          { "REQUEST_SESSION" => @session }
         )
       end
     end

data/lib/ruby_home/hap/server.rb

@@ -1,90 +1,51 @@
 module RubyHome
   module HAP
-    class Server
-      def initialize(host, port)
-        @port = port
-        @host = host
-        @selector = NIO::Selector.new
-        @status = :running
-      end
-
-      attr_reader :port, :host
-
-      def run
-        puts "Listening on #{host}:#{port}"
-        @server = TCPServer.new(host, port)
-
-        monitor = @selector.register(@server, :r)
-        monitor.value = proc { accept }
-
-        loop do
-          if @status == :running
-            @selector.select { |monitor| monitor.value.call(monitor) }
-          else
-            @selector.close
+    class Server < ::WEBrick::HTTPServer
+      def run(sock)
+        session = Session.new(sock)
+
+        while true
+          req = HAPRequest.new(@config, session: session)
+          res = HAPResponse.new(@config)
+          begin
+            while true
+              break if sock.to_io.wait_readable(0.5)
+              break if @status != :Running
+            end
+            raise ::WEBrick::HTTPStatus::EOFError if @status != :Running
+            raise ::WEBrick::HTTPStatus::EOFError if sock.eof?
+
+            req.parse(session.parse)
+
+            res.request_method = req.request_method
+            res.request_uri = req.request_uri
+            res.request_http_version = req.http_version
+            res.keep_alive = req.keep_alive?
+
+            service(req, res)
+          rescue ::WEBrick::HTTPStatus::EOFError, ::WEBrick::HTTPStatus::RequestTimeout => ex
+            res.set_error(ex)
+          rescue ::WEBrick::HTTPStatus::Error => ex
+            @logger.error(ex.message)
+            res.set_error(ex)
+          rescue ::WEBrick::HTTPStatus::Status => ex
+            res.status = ex.code
+          rescue StandardError => ex
+            @logger.error(ex)
+            res.set_error(ex, true)
+          ensure
+            if req.request_line
+              if req.keep_alive? && res.keep_alive?
+                req.fixup()
+              end
+              res.send_response(session)
+              access_log(@config, req, res)
+            end
           end
+          break unless req.keep_alive?
+          break unless res.keep_alive?
         end
       end
-
-      def shutdown
-        @status = :shutdown
-      end
-
-      private
-
-      SESSIONS = {}
-
-      def accept
-        socket = @server.accept
-        monitor = @selector.register(socket, :r)
-        monitor.value = proc { read(socket) }
-      end
-
-      def upstream
-        @_upstream ||= HTTP::Application.run
-      end
-
-      def webrick_config
-        @_webrick_config ||= WEBrick::Config::HTTP
-      end
-
-      def read(socket)
-        return close(socket) if socket.eof?
-
-        request = HAPRequest.new(webrick_config)
-        response = HAPResponse.new(webrick_config)
-
-        session = SESSIONS[socket] ||= Session.new(socket)
-        request.session = session
-
-        request.parse(session.parse)
-        response.request_method = request.request_method
-        response.request_uri = request.request_uri
-        response.request_http_version = request.http_version
-        response.keep_alive = request.keep_alive?
-
-        upstream.service(request, response)
-
-        if request.request_line
-          if request.keep_alive? && response.keep_alive?
-            request.fixup()
-          end
-          response.send_response(session)
-        end
-
-        return close(socket) unless request.keep_alive?
-        return close(socket) unless response.keep_alive?
-      rescue Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EHOSTUNREACH,
-             Errno::EINVAL, Errno::ENOPROTOOPT, Errno::EPROTO, Errno::ETIMEDOUT
-        close(socket)
-      rescue EOFError
-        close(socket)
-      end
-
-      def close(socket)
-        @selector.deregister(socket)
-        socket.close
-      end
     end
   end
 end

data/lib/ruby_home/hap/server_handler.rb

@@ -0,0 +1,74 @@
+module RubyHome
+  module HAP
+    class RackHandler < ::Rack::Handler::WEBrick
+      def self.run(app, options={})
+        @server = Server.new(options)
+        @server.mount "/", RackHandler, app
+        yield @server if block_given?
+        @server
+      end
+    end
+
+    class ServerHandler
+      def initialize(configuration: )
+        @configuration = configuration
+      end
+
+      def run
+        server.start
+      end
+
+      def shutdown
+        server.shutdown
+      end
+
+      def server
+        @server ||= RackHandler.run(
+          HTTP::Application.rack_builder,
+          server_options
+        )
+      end
+
+      def server_options
+        {
+          Port: port,
+          Host: bind_address,
+          ServerSoftware: 'RubyHome',
+          Logger: server_logger,
+          AccessLog: access_logger
+        }
+      end
+
+      def server_logger
+        if ENV['DEBUG']
+          WEBrick::Log::new(STDOUT, WEBrick::BasicLog::DEBUG)
+        else
+          WEBrick::Log::new("/dev/null", WEBrick::BasicLog::WARN)
+        end
+      end
+
+      def access_logger
+        if ENV['DEBUG']
+          [
+            [ STDOUT, WEBrick::AccessLog::COMMON_LOG_FORMAT ],
+            [ STDOUT, WEBrick::AccessLog::REFERER_LOG_FORMAT ]
+          ]
+        else
+          []
+        end
+      end
+
+      def bind_address
+        configuration.host
+      end
+
+      def port
+        configuration.port
+      end
+
+      attr_reader :configuration
+    end
+  end
+end
+
+

data/lib/ruby_home/http/application.rb

@@ -3,23 +3,14 @@ Dir[File.dirname(__FILE__) + '/controllers/*.rb'].each { |file| require file }
 module RubyHome
   module HTTP
     class Application
-      class << self
-        def run
-          ::Rack::Handler::WEBrick.new(
-            ::WEBrick::HTTPServer.new(DoNotListen: true),
-            rack_builder
-          )
-        end
-
-        def rack_builder
-          ::Rack::Builder.new do
-            map('/accessories') { run AccessoriesController }
-            map('/characteristics') { run CharacteristicsController }
-            map('/identify') { run IdentifyController }
-            map('/pair-setup') { run PairSetupsController }
-            map('/pair-verify') { run PairVerifiesController }
-            map('/pairings') { run PairingsController }
-          end
+      def self.rack_builder
+        ::Rack::Builder.new do
+          map('/accessories') { run AccessoriesController }
+          map('/characteristics') { run CharacteristicsController }
+          map('/identify') { run IdentifyController }
+          map('/pair-setup') { run PairSetupsController }
+          map('/pair-verify') { run PairVerifiesController }
+          map('/pairings') { run PairingsController }
         end
       end
     end

data/lib/ruby_home/version.rb

@@ -1,3 +1,3 @@
 module RubyHome
-  VERSION = '0.1.23'
+  VERSION = '0.2.0'
 end

data/lib/ruby_home.rb

@@ -2,7 +2,6 @@ require 'bindata'
 require 'dnssd'
 require 'facets/hash/slice'
 require 'hkdf'
-require 'nio'
 require 'oj'
 require 'rack'
 require 'rbnacl'
@@ -16,7 +15,15 @@ require 'wisper'
 require 'yaml'
 
 module RubyHome
-  Dir[File.dirname(__FILE__) + '/ruby_home/**/*.rb'].each { |file| require file }
+  [
+    '/ruby_home/hap/**/*.rb',
+    '/ruby_home/http/**/*.rb',
+    '/ruby_home/factories/**/*.rb',
+    '/ruby_home/dns/**/*.rb',
+    '/ruby_home/*.rb'
+  ].each do |pattern|
+    Dir[File.dirname(__FILE__) + pattern].each { |file| require file }
+  end
 
   class << self
     def configuration
@@ -58,7 +65,7 @@ module RubyHome
     end
 
     def hap_server
-      @_hap_server ||= HAP::Server.new(configuration.host, configuration.port)
+      @_hap_server ||= HAP::ServerHandler.new(configuration: configuration)
     end
 
     def greet

data/rubyhome.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dnssd', '~> 3.0'
   spec.add_dependency 'facets', '~> 3.1'
   spec.add_dependency 'hkdf', '~> 0.3.0'
-  spec.add_dependency 'nio4r', '~> 2.3', '>= 2.3.1'
   spec.add_dependency 'oj', '3.7.9'
   spec.add_dependency 'rbnacl', '~> 6.0'
   spec.add_dependency 'ruby_home-srp', '~> 1.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.2.0
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -72,26 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: nio4r
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -296,6 +276,7 @@ files:
 - lib/ruby_home/hap/hap_request.rb
 - lib/ruby_home/hap/hap_response.rb
 - lib/ruby_home/hap/server.rb
+- lib/ruby_home/hap/server_handler.rb
 - lib/ruby_home/hap/session.rb
 - lib/ruby_home/hap/values/base_value.rb
 - lib/ruby_home/hap/values/bool_value.rb