tamashii-agent 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c9539d12e037a7109e01d2f764d549edc309f0e
-  data.tar.gz: 7223ba91ffcbf0ec1e8f65850107d9d47aefe5c6
+  metadata.gz: '08de7a4e07004aa1fc2e0c3296d87c702fcb2e94'
+  data.tar.gz: bb089239efddb15e7f105042dbe972baa83b213e
 SHA512:
-  metadata.gz: '0059b4a439dedff1ad3ba7b16a98f854c8ce26827ed0750a9a080518587a461824a21f0611dea28e9ee3c38cec2ead99a6c32a06168a8c56b6098cf0c18ab566'
-  data.tar.gz: 007bd445e6a400c9b5c56ff8dbd73c78778963a2d74c56cc6218bb81297ea8052ffcbcf30039bcfa6bf84ff75e0a66eeae2bdb05728a63b0013aeabbd7f50772
+  metadata.gz: 44930b14acf4795f00ed470ebd5053b6a037b376645918dfc6343a1d7160dbbf12482672c4e750c5ce5ef2b3ca45a7ed987ccf792fb18a6d6e8eca2d3191947e
+  data.tar.gz: 4abad42266ef5bf48f4f8a578af8e927c5492b36b03acef06e535411c3602cdee44842228fcadfbe94bca7c368784fc11e3d87cdc890c515716c590d5e52682a

data/lib/tamashii/agent/buzzer.rb

@@ -5,7 +5,7 @@ require 'tamashii/agent/adapter/buzzer'
 module Tamashii
   module Agent
     class Buzzer < Component
-      def initialize
+      def initialize(master)
         super
         @buzzer = Adapter::Buzzer.object
         logger.debug "Using buzzer instance: #{@buzzer.class}"

data/lib/tamashii/agent/card_reader.rb

@@ -1,4 +1,5 @@
 require 'mfrc522'
+require 'concurrent'
 
 require 'tamashii/agent/component'
 require 'tamashii/agent/event'
@@ -8,13 +9,28 @@ require 'tamashii/agent/adapter/card_reader'
 module Tamashii
   module Agent
     class CardReader < Component
+
+      ERROR_RESET_TIMER = 5
+
       def initialize(master)
-        super()
-        @master = master
+        super
         @reader = Adapter::CardReader.object
         logger.debug "Using card_reader instance: #{@reader.class}"
       end
 
+      def reset_error_timer
+        return unless @error_timer_task
+        @error_timer_task.cancel
+        @error_timer_task = nil
+        logger.info "Error timer is reset"
+      end
+
+      def set_error_timer
+        return if @error_timer_task && !@error_timer_task.unscheduled?
+        logger.info "Error timer is set"
+        @error_timer_task = Concurrent::ScheduledTask.execute(ERROR_RESET_TIMER) { restart_current_component_async }
+      end
+
       # override
       def worker_loop
         loop do
@@ -39,10 +55,13 @@ module Tamashii
         begin
           uid, sak = @reader.picc_select
           process_uid(uid.join("-"))
+          reset_error_timer
         rescue CommunicationError, UnexpectedDataError => e
           logger.error "Error when selecting card: #{e.message}"
+          set_error_timer
         rescue => e
           logger.error "GemError when selecting card: #{e.message}"
+          set_error_timer
         end
         @reader.picc_halt
         true
@@ -57,6 +76,11 @@ module Tamashii
       def process_event(event)
         # silent is gold
       end
+
+      def clean_up
+        super
+        @reader.shutdown
+      end
     end
   end
 end

data/lib/tamashii/agent/component.rb

@@ -7,7 +7,8 @@ module Tamashii
     class Component
       include Common::Loggable
 
-      def initialize
+      def initialize(master)
+        @master = master
         @event_queue = Queue.new
       end
 
@@ -28,6 +29,10 @@ module Tamashii
         ev
       end
 
+      def restart_current_component_async
+        @master.send_event(Event.new(Event::RESTART_COMPONENT, self.class))
+      end
+
       def process_event(event)
         logger.debug "Got event: #{event.type}, #{event.body}"
       end

data/lib/tamashii/agent/connection.rb

@@ -76,19 +76,19 @@ module Tamashii
       attr_reader :url
       attr_reader :master
 
-      def initialize(master, host, port)
-        super()
-        @master = master
-        @url = "#{Config.use_ssl ? "wss" : "ws"}://#{host}:#{port}/#{Config.entry_point}"
+      def initialize(master)
+        super
+        @host = @master.host
+        @port = @master.port
+        @url = "#{Config.use_ssl ? "wss" : "ws"}://#{@host}:#{@port}/#{Config.entry_point}"
         self.reset
 
-        @host = host
-        @port = port
         @tag = 0
 
         @future_ivar_pool = Concurrent::Map.new
         @driver_lock = Mutex.new
 
+        @last_error_report_time = Time.now
         setup_resolver
       end
 
@@ -218,6 +218,10 @@ module Tamashii
 
       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
@@ -250,6 +254,7 @@ module Tamashii
               self.auth_success
             else
               logger.error "Authentication failed. Delay for 3 seconds"
+              @master.send_event(Event.new(Event::LCD_MESSAGE, "Fatal Error\nAuth Failed"))
               sleep 3
             end
           else
@@ -268,12 +273,16 @@ module Tamashii
       def process_event(event)
         case event.type
         when Event::CARD_DATA
-          id = event.body
-          wrapped_body = {
-            id: id,
-            ev_body: event.body
-          }.to_json
-          new_remote_request(id, Type::RFID_NUMBER, wrapped_body)
+          if self.ready?
+            id = event.body
+            wrapped_body = {
+              id: id,
+              ev_body: event.body
+            }.to_json
+            new_remote_request(id, Type::RFID_NUMBER, wrapped_body)
+          else
+            @master.send_event(Event.new(Event::CONNECTION_NOT_READY, "Connection not ready for #{event.type}:#{event.body}"))
+          end
         end
       end
 

data/lib/tamashii/agent/device/fake_card_reader.rb

@@ -30,6 +30,9 @@ module Tamashii
 
         def picc_halt(*args)
         end
+
+        def shutdown(*args)
+        end
       end
     end
   end

data/lib/tamashii/agent/event.rb

@@ -9,7 +9,10 @@ module Tamashii
       LCD_MESSAGE = 5
       LCD_SET_IDLE_TEXT = 6
 
+      RESTART_COMPONENT = 254
       CONNECTION_NOT_READY = 255
+
+      
       
       attr_reader :type, :body
 

data/lib/tamashii/agent/lcd.rb

@@ -9,7 +9,7 @@ require 'tamashii/agent/adapter/lcd'
 module Tamashii
   module Agent
     class LCD < Component
-      def initialize
+      def initialize(master)
         super
         load_lcd_device
         @device_lock = Mutex.new

data/lib/tamashii/agent/master.rb

@@ -12,9 +12,10 @@ module Tamashii
     class Master < Component
 
       attr_reader :serial_number
+      attr_reader :host, :port
 
       def initialize(host, port)
-        super()
+        super(self)
         logger.info "Starting Tamashii::Agent #{Tamashii::Agent::VERSION} in #{Config.env} mode"
         @host = host
         @port = port
@@ -42,10 +43,10 @@ module Tamashii
 
       def create_components
         @components = {}
-        @components[:connection] = create_component(Connection, self, @host, @port)
-        @components[:buzzer] = create_component(Buzzer)
-        @components[:lcd] = create_component(LCD)
-        @components[:card_reader] = create_component(CardReader, self)
+        create_component(Connection, self)
+        create_component(Buzzer, self)
+        create_component(LCD, self)
+        create_component(CardReader, self)
       end
 
       def create_component(class_name, *args)
@@ -53,9 +54,22 @@ module Tamashii
         logger.info "Starting component: #{class_name}"
         yield c if block_given?
         c.run
+        @components[class_name] = c
+        
         c
       end
 
+      def restart_component(class_name)
+        if old_component = @components[class_name]
+          logger.info "Stopping component: #{class_name}"
+          old_component.stop # TODO: set timeout for stopping?
+          logger.info "Restarting component: #{class_name}"
+          create_component(class_name, self)
+        else
+          logger.error "Rstart component failed: unknown component #{name}"
+        end
+      end
+
       # override
       def process_event(event)
         super
@@ -74,6 +88,9 @@ module Tamashii
           end
         when Event::CONNECTION_NOT_READY
           broadcast_event(Event.new(Event::BEEP, "error"))
+          broadcast_event(Event.new(Event::LCD_MESSAGE, "Fatal Error\nConnection Error"))
+        when Event::RESTART_COMPONENT
+          restart_component(event.body)
         else
           broadcast_event(event)
         end

data/lib/tamashii/agent/version.rb

@@ -1,5 +1,5 @@
 module Tamashii
   module Agent
-    VERSION = "0.2.1"
+    VERSION = "0.2.3"
   end
 end

data/tamashii-agent.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "websocket-driver"
   spec.add_runtime_dependency "nio4r"
   spec.add_runtime_dependency "pi_piper"
-  spec.add_runtime_dependency "mfrc522"
+  spec.add_runtime_dependency "tamashii-mfrc522"
   spec.add_runtime_dependency "i2c"
   spec.add_runtime_dependency "aasm"
   spec.add_runtime_dependency "concurrent-ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamashii-agent
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - 蒼時弦也
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -167,7 +167,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mfrc522
+  name: tamashii-mfrc522
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="