tamashii-agent 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd9d5c6f30e60812fe77bb31c1c4f867bbdf5ac
-  data.tar.gz: 6c2b99fe269bb5592d7277b42fafdaf9ff788aa4
+  metadata.gz: 5de4cba829b0eab020881898175c0dabd45f9a94
+  data.tar.gz: 1700db0dc1f111c39871a195a1fc82919ceef6a7
 SHA512:
-  metadata.gz: 3d3809a9b2b9d9d9a8cc562f0b20f2dc20f1ea6d0409cb971057da8c504e8684d233c944ae02abb546ee1242a5d3257dc4d80c420fd1b6d94494fded47b3ec3c
-  data.tar.gz: 22efd47ced899ab7a920325ff033d3382c3db2375993bbdb09556c79440040924d355c825bd31f003918452e0ad3178fd98477873fb3a5f28eacd4faa941b7d9
+  metadata.gz: d5eb697ea55e98cb2fc0dac672e2e4946bb7ba7388255120cc09e9c6cf116f64877df28fabbb7d1a01310494410d88142395e5b55813eefa6f81f54c6ca7f20b
+  data.tar.gz: 9d8d9ddd661cb0989a082b9dbba74cf5e645102eab9a8b7289ec8296330bcd937508bc8631ad233753f17cfcbc0d33da0bdd41dc67f1dda044362bcb1b9efa54

data/lib/tamashii/agent/config.rb

@@ -1,15 +1,10 @@
 require 'tamashii/common'
+require 'tamashii/client'
 module Tamashii
   module Agent
     class Config < Tamashii::Config
       AUTH_TYPES = [:none, :token]
 
-      register :log_file, STDOUT
-      register :use_ssl, false
-      register :auth_type, :none
-      register :entry_point, "/tamashii"
-      register :manager_host, "localhost"
-      register :manager_port, 3000
       register :connection_timeout, 3
 
       register :localtime, "+08:00"
@@ -18,6 +13,7 @@ module Tamashii
       register :lcd_address, 0x27
       register :lcd_animation_delay, 1
 
+
       def auth_type(type = nil)
         return @auth_type ||= :none if type.nil?
         return unless AUTH_TYPES.include?(type)
@@ -26,8 +22,21 @@ module Tamashii
 
       def log_level(level = nil)
         return Agent.logger.level if level.nil?
+        Client.config.log_level(level)
         Agent.logger.level = level
       end
+
+      def log_file(value = nil)
+        return @log_file ||= STDOUT if value.nil?
+        Client.config.log_file(value)
+        @log_file = value
+      end
+
+      [:use_ssl, :host, :port, :entry_point].each do |method_name|
+        define_method(method_name) do |*args|
+          Tamashii::Client.config.send(method_name, *args)
+        end
+      end
     end
   end
 end

data/lib/tamashii/agent/connection.rb

@@ -1,10 +1,6 @@
-require 'socket'
-require 'websocket/driver'
 require 'aasm'
-require 'openssl'
 require 'json'
 require 'concurrent'
-require 'nio'
 
 require 'tamashii/common'
 
@@ -14,54 +10,25 @@ require 'tamashii/agent/component'
 
 require 'tamashii/agent/handler'
 
+require 'tamashii/client'
+
 module Tamashii
   module Agent
     class Connection < Component
 
-      class RequestTimeoutError < RuntimeError; end
-
-      class RequestObserver
-        include Common::Loggable
-        def initialize(connection, id, ev_type, ev_body, future)
-          @connection = connection
-          @id = id
-          @ev_type = ev_type
-          @ev_body = ev_body
-          @future = future
-        end
+      autoload :RequestObserver, 'tamashii/agent/connection/request_observer'
 
-        def update(time, ev_data, reason)
-          if @future.fulfilled?
-            res_ev_type = ev_data[:ev_type]
-            res_ev_body = ev_data[:ev_body]
-            case res_ev_type
-            when Type::RFID_RESPONSE_JSON
-              logger.debug "Handled: #{res_ev_type}: #{res_ev_body}"
-              @connection.handle_card_result(JSON.parse(res_ev_body))
-            else
-              logger.warn "Unhandled packet result: #{res_ev_type}: #{res_ev_body}"
-            end
-          else
-            logger.error "#{@id} Failed with #{reason}"
-            @connection.on_request_timeout(@ev_type, @ev_body)
-          end
-        end
-      end
+      class RequestTimeoutError < RuntimeError; end
 
       include AASM
 
       aasm do
         state :init, initial: true
-        state :connecting
         state :auth_pending
         state :ready
 
-        event :connect do
-          transitions from: :init, to: :connecting, after: Proc.new { logger.info "Start connecting" }
-        end
-
         event :auth_request do
-          transitions from: :connecting, to: :auth_pending, after: Proc.new { logger.info "Sending authentication request" }
+          transitions from: :init, to: :auth_pending, after: Proc.new { logger.info "Sending authentication request" }
         end
 
         event :auth_success do
@@ -78,24 +45,19 @@ module Tamashii
 
       def initialize(master)
         super
-        @host = @master.host
-        @port = @master.port
-        @url = "#{Config.use_ssl ? "wss" : "ws"}://#{@host}:#{@port}/#{Config.entry_point}"
+
         self.reset
+        @client = Tamashii::Client::Base.new
 
         @tag = 0
 
         @future_ivar_pool = Concurrent::Map.new
-        @driver_lock = Mutex.new
 
         @last_error_report_time = Time.now
+        setup_callbacks
         setup_resolver
       end
 
-      def create_selector
-        @selector = NIO::Selector.new
-      end
-
       def setup_resolver
         env_data = {connection: self}
         Resolver.config do
@@ -127,9 +89,7 @@ module Tamashii
 
       def try_send_request(ev_type, ev_body)
         if self.ready?
-          @driver_lock.synchronize do
-            @driver.binary(Packet.new(ev_type, @tag, ev_body).dump)
-          end
+          @client.transmit(Packet.new(ev_type, @tag, ev_body).dump)
           true
         else
           false
@@ -138,113 +98,43 @@ module Tamashii
 
       def stop_threads
         super
-        @websocket_thr.exit if @websocket_thr
-        @websocket_thr = nil
+        @client.close
       end
 
-      def run
-        super
-        @websocket_thr = Thread.start { run_websocket_loop }
-      end
-
-      def run_websocket_loop
-        create_selector
-        loop do
-          ready = @selector.select(1)
-          ready.each { |m| m.value.call } if ready
-          if @io.nil?
-            @io = try_create_socket
-            if @io
-              # socket io opened
-              register_socket_io
-              # start ws
-              start_web_driver
-            end
-          end
-        end
-      end
 
       def send_auth_request
         # TODO: other types of auth
-        @driver.binary(Packet.new(Type::AUTH_TOKEN, 0, [Type::CLIENT[:agent], @master.serial_number,Config.token].join(",")).dump)
+        if @client.transmit(Packet.new(Type::AUTH_TOKEN, 0, [Type::CLIENT[:agent], @master.serial_number,Config.token].join(",")).dump)
+          logger.debug "Auth sent!"	
+        else
+          logger.error "Cannot sent auth request!"
+	end
       end
 
-      def start_web_driver
-        # TODO: Improve below code
-        @driver = WebSocket::Driver.client(self)
-        @driver.on :open, proc { |e|
+      def setup_callbacks
+        @client.on :open, proc {
           logger.info "Server opened"
           self.auth_request
           send_auth_request
         }
-        @driver.on :close, proc { |e|
-          logger.info "Server closed"
-          close_socket_io
+        @client.on :close, proc {
+          # Note: this only called when normally receive the WS close message
+          logger.info "Server closed normally"
+        }
+        @client.on :socket_closed, proc {
+          # Note: called when low-level IO is closed
+          logger.info "Server socket closed"
           self.reset
         }
-        @driver.on :message, proc { |e|
-          pkt = Packet.load(e.data)
+        @client.on :message, proc { |data| 
+          pkt = Packet.load(data)
           process_packet(pkt) if pkt
         }
-        @driver.on :error, proc { |e|
+        @client.on :error, proc { |e|
           logger.error("#{e.message}")
         }
-        @driver.start
-        self.connect
-      end
-
-      def register_socket_io
-        _monitor = @selector.register(@io, :r)
-        _monitor.value = proc do
-          begin
-            msg = @io.read_nonblock(4096, exception: false)
-            next if msg == :wait_readable
-            if msg.nil?
-              # socket closed
-              logger.info "No message received from server. Connection reset"
-              close_socket_io
-              self.reset
-              sleep 1
-            else
-              @driver.parse(msg)
-            end
-          rescue => e
-            logger.error "#{e.message}"
-            logger.debug "Backtrace:"
-            e.backtrace.each {|msg| logger.debug msg}
-          end
-        end
-      end
-
-      def try_create_socket
-        logger.info "try to open socket..."
-        if Time.now - @last_error_report_time > 5.0
-          @master.send_event(Event.new(Event::LCD_MESSAGE, "Initializing\nConnection..."))
-          @last_error_report_time = Time.now
-        end
-        if Config.use_ssl
-          OpenSSL::SSL::SSLSocket.new(TCPSocket.new(@host, @port)).connect
-        else
-          TCPSocket.new(@host, @port)
-        end
-      rescue
-        nil
       end
 
-      def close_socket_io
-        logger.info "Socket IO Closed and Deregistered"
-        @selector.deregister(@io)
-        @io.close
-        @io = nil
-      end
-
-      def write(string)
-        @io.write(string)
-      rescue
-        logger.error "Write Error"
-        close_socket_io
-        self.reset
-      end
 
       def process_packet(pkt)
         if self.auth_pending?
@@ -345,16 +235,6 @@ module Tamashii
         end
       end
 
-      def clean_up
-        super
-        if @io
-          @driver.close
-          close_socket_io
-        end
-      rescue => e
-        logger.warn "Error occured when clean up: #{e.to_s}"
-      end
-
       # When data is back 
       def handle_remote_response(ev_type, wrapped_ev_body)
         logger.debug "Remote packet back: #{ev_type} #{wrapped_ev_body}"

data/lib/tamashii/agent/connection/request_observer.rb

@@ -0,0 +1,39 @@
+require 'tamashii/common'
+
+module Tamashii
+  module Agent
+    class Connection
+      class RequestObserver
+
+        include Common::Loggable
+        def initialize(connection, id, ev_type, ev_body, future)
+          @connection = connection
+          @id = id
+          @ev_type = ev_type
+          @ev_body = ev_body
+          @future = future
+        end
+
+        def update(time, ev_data, reason)
+          if @future.fulfilled?
+            res_ev_type = ev_data[:ev_type]
+            res_ev_body = ev_data[:ev_body]
+            case res_ev_type
+            when Type::RFID_RESPONSE_JSON
+              logger.debug "Handled: #{res_ev_type}: #{res_ev_body}"
+              @connection.handle_card_result(JSON.parse(res_ev_body))
+            else
+              logger.warn "Unhandled packet result: #{res_ev_type}: #{res_ev_body}"
+            end
+          else
+            logger.error "#{@id} Failed with #{reason}"
+            @connection.on_request_timeout(@ev_type, @ev_body)
+          end
+        end
+      end
+    end
+  end
+end
+
+
+

data/lib/tamashii/agent/version.rb

@@ -1,5 +1,5 @@
 module Tamashii
   module Agent
-    VERSION = "0.2.8"
+    VERSION = "0.3.0"
   end
 end

data/tamashii-agent.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
 
 
   spec.add_runtime_dependency "tamashii-common", ">=0.1.6"
+  spec.add_runtime_dependency "tamashii-client"
   spec.add_runtime_dependency "websocket-driver"
   spec.add_runtime_dependency "nio4r"
   spec.add_runtime_dependency "pi_piper"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamashii-agent
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - 蒼時弦也
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,6 +138,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: tamashii-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -269,6 +283,7 @@ files:
 - lib/tamashii/agent/component.rb
 - lib/tamashii/agent/config.rb
 - lib/tamashii/agent/connection.rb
+- lib/tamashii/agent/connection/request_observer.rb
 - lib/tamashii/agent/device/fake_buzzer.rb
 - lib/tamashii/agent/device/fake_card_reader.rb
 - lib/tamashii/agent/device/fake_lcd.rb
@@ -304,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The agent module for RubyConfTW checkin system.