ruby_home 0.1.5 → 0.1.7

data/lib/ruby_home.rb

@@ -1,14 +1,19 @@
+require 'active_support'
+require 'active_support/core_ext/hash'
 require 'bindata'
 require 'dnssd'
 require 'hkdf'
+require 'nio'
 require 'oj'
 require 'rack'
 require 'rbnacl/libsodium'
-require 'request_store'
 require 'ruby_home-srp'
+require 'securerandom'
 require 'sinatra/base'
+require 'socket'
 require 'webrick'
 require 'wisper'
+require 'yaml'
 
 module RubyHome
   Dir[File.dirname(__FILE__) + '/ruby_home/**/*.rb'].each { |file| require file }
@@ -24,7 +29,7 @@ module RubyHome
 
     def start
       threads << Thread.start { dns_service.register }
-      threads << Thread.start { http_server.run }
+      threads << Thread.start { hap_server.run }
       threads.each(&:join)
     end
 
@@ -37,11 +42,15 @@ module RubyHome
     end
 
     def dns_service
-      @@_dns_service ||= RubyHome::DNS::Service.new(http_server.port)
+      @@_dns_service ||= DNS::Service.new(hap_server.port)
     end
 
-    def http_server
-      @@_http_server ||= RubyHome::HTTP::Application.new
+    def hap_server
+      @@_hap_server ||= HAP::Server.new('0.0.0.0', 4567, socket_store)
+    end
+
+    def socket_store
+      @@_socket_store ||= {}
     end
 
     def greet

data/rubyhome.gemspec

@@ -29,13 +29,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bindata', '~> 2.4', '>= 2.4.3'
   spec.add_dependency 'dnssd', '~> 3.0'
   spec.add_dependency 'hkdf', '~> 0.3.0'
+  spec.add_dependency 'nio4r', '~> 2.3', '>= 2.3.1'
   spec.add_dependency 'oj', '~> 3.4'
   spec.add_dependency 'rbnacl', '~> 5.0'
   spec.add_dependency 'rbnacl-libsodium', '~> 1.0', '>= 1.0.16'
-  spec.add_dependency 'request_store', '~> 1.4', '>= 1.4.1'
   spec.add_dependency 'ruby_home-srp', '~> 1.2'
-  spec.add_dependency 'sinatra', '2.0.3'
-  spec.add_dependency 'wisper', '~> 1.6', '>= 1.6.1'
+  spec.add_dependency 'sinatra', '2.0.4'
+  spec.add_dependency 'wisper', '~> 2.0'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'byebug', '~> 10.0'
   spec.add_development_dependency 'plist', '~> 3.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_home
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Karl Entwistle
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2018-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -73,73 +73,73 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: nio4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        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: '3.4'
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
-  name: rbnacl
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: rbnacl-libsodium
+  name: rbnacl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.16
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.16
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: rbnacl-libsodium
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.0.16
 - !ruby/object:Gem::Dependency
   name: ruby_home-srp
   requirement: !ruby/object:Gem::Requirement
@@ -160,34 +160,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: wisper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +296,6 @@ files:
 - lib/ruby_home/device_id.rb
 - lib/ruby_home/dns/service.rb
 - lib/ruby_home/dns/text_record.rb
-- lib/ruby_home/factories/accessory_factory.rb
 - lib/ruby_home/factories/characteristic_factory.rb
 - lib/ruby_home/factories/default_values/base_value.rb
 - lib/ruby_home/factories/default_values/bool_value.rb
@@ -312,15 +305,22 @@ files:
 - lib/ruby_home/factories/default_values/string_value.rb
 - lib/ruby_home/factories/default_values/uint32_value.rb
 - lib/ruby_home/factories/default_values/uint8_value.rb
+- lib/ruby_home/factories/service_factory.rb
 - lib/ruby_home/factories/templates/characteristic_template.rb
 - lib/ruby_home/factories/templates/service_template.rb
 - lib/ruby_home/greeter.rb
 - lib/ruby_home/hap/accessory.rb
+- lib/ruby_home/hap/accessory_collection.rb
 - lib/ruby_home/hap/characteristic.rb
 - lib/ruby_home/hap/crypto/chacha20poly1305.rb
 - lib/ruby_home/hap/crypto/hkdf.rb
+- lib/ruby_home/hap/crypto/session_key.rb
+- lib/ruby_home/hap/ev_response.rb
+- lib/ruby_home/hap/hap_request.rb
+- lib/ruby_home/hap/hap_response.rb
 - lib/ruby_home/hap/http_decryption.rb
 - lib/ruby_home/hap/http_encryption.rb
+- lib/ruby_home/hap/server.rb
 - lib/ruby_home/hap/service.rb
 - lib/ruby_home/hap/tlv.rb
 - lib/ruby_home/hex_helper.rb
@@ -331,21 +331,18 @@ files:
 - lib/ruby_home/http/controllers/pair_setups_controller.rb
 - lib/ruby_home/http/controllers/pair_verifies_controller.rb
 - lib/ruby_home/http/controllers/pairings_controller.rb
-- lib/ruby_home/http/hap_request.rb
-- lib/ruby_home/http/hap_response.rb
-- lib/ruby_home/http/hap_server.rb
 - lib/ruby_home/http/serializers/accessory_serializer.rb
 - lib/ruby_home/http/serializers/characteristic_serializer.rb
 - lib/ruby_home/http/serializers/characteristic_value_serializer.rb
 - lib/ruby_home/http/serializers/object_serializer.rb
 - lib/ruby_home/http/serializers/service_serializer.rb
+- lib/ruby_home/http/services/socket_notifier.rb
 - lib/ruby_home/http/services/start_srp_service.rb
 - lib/ruby_home/http/services/verify_srp_service.rb
 - lib/ruby_home/identifier_cache.rb
 - lib/ruby_home/password.rb
-- lib/ruby_home/rack/handler/hap_server.rb
+- lib/ruby_home/persistable.rb
 - lib/ruby_home/version.rb
-- lib/ruby_home/yaml_record.rb
 - rubyhome.gemspec
 - sbin/characteristic_generator.rb
 - sbin/service_generator.rb

data/lib/ruby_home/factories/accessory_factory.rb

@@ -1,73 +0,0 @@
-module RubyHome
-  class AccessoryFactory
-    def self.create(service_name, characteristics: {}, **options)
-      new(service_name, options, characteristics).create
-    end
-
-    def initialize(service_name, accessory_options, characteristic_options)
-      @service_name = service_name
-      @accessory_options = accessory_options
-      @characteristic_options = characteristic_options
-    end
-
-    def create
-      yield service if block_given?
-
-      create_accessory_information
-      service.save
-      create_required_characteristics
-      create_optional_characteristics
-
-      service
-    end
-
-    private
-
-      attr_reader :service_name, :accessory_options, :characteristic_options
-
-      def template
-        @template ||= ServiceTemplate.find_by(name: service_name.to_sym)
-      end
-
-      def create_accessory_information
-        unless service_name == :accessory_information
-          AccessoryFactory.create(:accessory_information, accessory_information_params)
-        end
-      end
-
-      def accessory_information_params
-        accessory_options.merge(accessory: service.accessory)
-      end
-
-      def create_required_characteristics
-        template.required_characteristics.map do |characteristic_template|
-          CharacteristicFactory.create(characteristic_template.name, service: service) do |characteristic|
-            value = characteristic_options[characteristic.name]
-            next unless value
-
-            characteristic.value = value
-          end
-        end
-      end
-
-      def create_optional_characteristics
-        template.optional_characteristics.map do |characteristic_template|
-          value = characteristic_options[characteristic_template.name]
-          next unless value
-
-          CharacteristicFactory.create(characteristic_template.name, service: service) do |characteristic|
-            characteristic.value = value
-          end
-        end
-      end
-
-      def service
-        @service ||= Service.new(service_params)
-      end
-
-      def service_params
-        accessory_options[:accessory] ||= Accessory.new
-        accessory_options.merge(template.to_hash)
-      end
-  end
-end

data/lib/ruby_home/http/hap_server.rb

@@ -1,60 +0,0 @@
-module RubyHome
-  module HTTP
-    class HAPServer < WEBrick::HTTPServer
-      def run(socket)
-        while true
-          res = RubyHome::HTTP::HAPResponse.new(@config)
-          req = RubyHome::HTTP::HAPRequest.new(@config)
-          server = self
-          begin
-            timeout = @config[:RequestTimeout]
-            while timeout > 0
-              break if socket.to_io.wait_readable(0.5)
-              break if @status != :Running
-              timeout -= 0.5
-            end
-            raise WEBrick::HTTPStatus::EOFError if timeout <= 0 || @status != :Running
-            raise WEBrick::HTTPStatus::EOFError if socket.eof?
-            req.parse(socket)
-            res.received_encrypted_request = req.received_encrypted_request?
-            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?
-            server = lookup_server(req) || self
-            if callback = server[:RequestCallback]
-              callback.call(req, res)
-            elsif callback = server[:RequestHandler]
-              msg = ':RequestHandler is deprecated, please use :RequestCallback'
-              @logger.warn(msg)
-              callback.call(req, res)
-            end
-            server.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(socket)
-              server.access_log(@config, req, res)
-            end
-          end
-
-          break if @http_version < '1.1'
-          break unless req.keep_alive?
-          break unless res.keep_alive?
-        end
-      end
-    end
-  end
-end

data/lib/ruby_home/rack/handler/hap_server.rb

@@ -1,21 +0,0 @@
-module RubyHome
-  module Rack
-    module Handler
-      class HAPServer < ::Rack::Handler::WEBrick
-        def self.run(app, options={})
-          environment  = ENV['RACK_ENV'] || 'development'
-          default_host = environment == 'development' ? 'localhost' : nil
-
-          options[:BindAddress] = options.delete(:Host) || default_host
-          options[:Port] ||= 8080
-          options[:Logger] = WEBrick::Log.new("/dev/null")
-          options[:AccessLog] = []
-          @server = HTTP::HAPServer.new(options)
-          @server.mount '/', Handler::HAPServer, app
-          yield @server  if block_given?
-          @server.start
-        end
-      end
-    end
-  end
-end