tamashii-agent 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ce0f567235e489eae3966f715bcc87bba005ce1
-  data.tar.gz: 4717c3ae733bd52914b4d1de710e5f231c3083ee
+  metadata.gz: bfc8a55dfec1ccbc0d4d7f6c26fb1331120b9924
+  data.tar.gz: 5ecc7b988ce09c76058a48c410d1b3d7d5bf1afa
 SHA512:
-  metadata.gz: 408c8942b660d449076376cfd794e92417d3b364d81ee568bade4ef3287ae1db6debee661cb4eb7031ee244bec129590b8d6019b0d016f18b1f0b19ea3f312a4
-  data.tar.gz: dccdd1ae3140365b90e695d293d954786916d82714ea570c6457668e4f08c813b3475df771bb3a52230e21c8bf086ea91d87e9a8d4f58d868392fe3c9bb089a3
+  metadata.gz: 8689f7b4ed689a28abe1137bab775e80e78a6ec01f8958c2bce1fe3e0f812a2d06b421deb32ac4337283d719d698a1df41ac72147e8d4ef822aef6f97b2723d3
+  data.tar.gz: 7ba6892db8cd54b5a8eb1333302ee470552a65c8b40f093625fa29b7b800a5a4eac3dc57d3f63d97bf6c1b0988e6245f0720445ab2eef12c76c5b6e5cb716a29

data/bin/console

@@ -7,8 +7,8 @@ require "tamashii/agent"
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require "pry"
+Pry.start
 
-require "irb"
-IRB.start
+#require "irb"
+#IRB.start

data/lib/tamashii/agent/adapter/lcd.rb

@@ -0,0 +1,22 @@
+require 'tamashii/agent/adapter/base'
+require 'tamashii/agent/device/lcd'
+require 'tamashii/agent/device/fake_lcd'
+
+module Tamashii
+  module Agent
+    module Adapter
+      # :nodoc:
+      class LCD < Base
+        class << self
+          def real_class
+            Device::LCD
+          end
+
+          def fake_class
+            Device::FakeLCD
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tamashii/agent/buzzer.rb

@@ -1,4 +1,5 @@
 require 'tamashii/agent/component'
+require 'tamashii/agent/event'
 require 'tamashii/agent/adapter/buzzer'
 
 module Tamashii
@@ -10,11 +11,11 @@ module Tamashii
         logger.debug "Using buzzer instance: #{@buzzer.class}"
       end
 
-      def process_event(ev_type, ev_body)
-        case ev_type
-        when EVENT_BEEP
-          logger.debug "Beep: #{ev_body}"
-          case ev_body
+      def process_event(event)
+        case event.type
+        when Event::BEEP
+          logger.debug "Beep: #{event.body}"
+          case event.body
           when "ok"
             @buzzer.play_ok
           when "no"

data/lib/tamashii/agent/card_reader.rb

@@ -1,6 +1,7 @@
 require 'mfrc522'
 
 require 'tamashii/agent/component'
+require 'tamashii/agent/event'
 require 'tamashii/agent/adapter/card_reader'
 
 
@@ -17,19 +18,23 @@ module Tamashii
       # override
       def worker_loop
         loop do
-          handle_io
-          handle_card
+          if !handle_new_event(true)
+            # no event available
+            sleep 0.1
+          end
+          if handle_card
+            # card is sent, sleep to prevent duplicate sent
+            sleep 1.0
+          else
+            # no card available
+            sleep 0.1
+          end
         end
       end
 
-      def handle_io
-        ready = @selector.select(0.1)
-        ready.each { |m| m.value.call } if ready
-      end
-
       def handle_card
         # read card
-        return unless @reader.picc_request(MFRC522::PICC_REQA)
+        return false unless @reader.picc_request(MFRC522::PICC_REQA)
 
         begin
           uid, sak = @reader.picc_select
@@ -40,15 +45,16 @@ module Tamashii
           logger.error "GemError when selecting card: #{e.message}"
         end
         @reader.picc_halt
+        true
       end
 
       def process_uid(uid)
         logger.info "New card detected, UID: #{uid}"
-        @master.send_event(EVENT_CARD_DATA, uid)
+        @master.send_event(Event.new(Event::CARD_DATA, uid))
       end
 
       # override
-      def process_event(ev_type, ev_body)
+      def process_event(event)
         # silent is gold
       end
     end

data/lib/tamashii/agent/common.rb

@@ -4,10 +4,5 @@ module Tamashii
   module Agent
     module Common
     end
-    EVENT_BEEP = 1
-    EVENT_SYSTEM_COMMAND = 2
-    EVENT_AUTH_RESULT = 3
-    EVENT_CARD_DATA = 4
-    EVENT_CONNECTION_NOT_READY = 255
   end
 end

data/lib/tamashii/agent/component.rb

@@ -1,5 +1,6 @@
-require 'nio'
 require 'tamashii/agent/common'
+require 'tamashii/agent/event'
+
 
 module Tamashii
   module Agent
@@ -7,27 +8,33 @@ module Tamashii
       include Common::Loggable
 
       def initialize
-        @pipe_r, @pipe_w = IO.pipe
+        @event_queue = Queue.new
       end
 
-      def send_event(type, body)
-        str = [type, body.bytesize].pack("Cn") + body
-        @pipe_w.write(str)
+      def send_event(event)
+        @event_queue.push(event)
       end
 
-      def receive_event
-        ev_type, ev_size = @pipe_r.read(3).unpack("Cn")
-        ev_body = @pipe_r.read(ev_size)
-        process_event(ev_type, ev_body)
+      def check_new_event(non_block = false)
+        @event_queue.pop(non_block)
+      rescue ThreadError => e
+        nil
+      end
+      
+      def handle_new_event(non_block = false)
+        if ev = check_new_event(non_block)
+          process_event(ev)
+        end
+        ev
       end
 
-      def process_event(ev_type, ev_body)
-        logger.debug "Got event: #{ev_type}, #{ev_body}"
+      def process_event(event)
+        logger.debug "Got event: #{event.type}, #{event.body}"
       end
 
       # worker
       def run
-        @thr = Thread.start { run_worker_loop }
+        @worker_thr = Thread.start { run_worker_loop }
       end
 
       def run!
@@ -36,36 +43,31 @@ module Tamashii
       
       def stop
         logger.info "Stopping component"
-        @thr.exit if @thr
-        @thr = nil
+        stop_threads
         clean_up
       end
 
+      def stop_threads
+        @worker_thr.exit if @worker_thr
+        @worker_thr = nil
+      end
+
       def clean_up
       end
 
       def run_worker_loop
-        create_selector
-        register_event_io
         worker_loop
       end
 
       # a default implementation
       def worker_loop
         loop do
-          ready = @selector.select
-          ready.each { |m| m.value.call } if ready
+          if !handle_new_event
+            logger.error "Thread error. Worker loop terminated"
+            break
+          end
         end
       end
-      
-      def register_event_io
-        _monitor = @selector.register(@pipe_r, :r)
-        _monitor.value = method(:receive_event)
-      end
-
-      def create_selector
-        @selector = NIO::Selector.new
-      end
     end
   end
 end

data/lib/tamashii/agent/config.rb

@@ -10,6 +10,10 @@ module Tamashii
       register :entry_point, "/tamashii"
       register :manager_host, "localhost"
       register :manager_port, 3000
+      register :connection_timeout, 3
+
+      register :lcd_path, '/dev/i2c-1'
+      register :lcd_address, 0x27
 
       def auth_type(type = nil)
         return @auth_type ||= :none if type.nil?

data/lib/tamashii/agent/connection.rb

@@ -2,18 +2,52 @@ require 'socket'
 require 'websocket/driver'
 require 'aasm'
 require 'openssl'
+require 'json'
+require 'concurrent'
+require 'nio'
 
 require 'tamashii/common'
 
 require 'tamashii/agent/config'
+require 'tamashii/agent/event'
 require 'tamashii/agent/component'
-require 'tamashii/agent/request_pool'
 
 require 'tamashii/agent/handler'
 
 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
+
+        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
+
       include AASM
 
       aasm do
@@ -41,7 +75,6 @@ module Tamashii
 
       attr_reader :url
       attr_reader :master
-      attr_reader :request_pool
 
       def initialize(master, host, port)
         super()
@@ -53,57 +86,70 @@ module Tamashii
         @port = port
         @tag = 0
 
-        @request_pool = RequestPool.new
-        @request_pool.set_handler(:request_timedout, method(:handle_request_timedout))
-        @request_pool.set_handler(:request_meet, method(:handle_request_meet))
-        @request_pool.set_handler(:send_request, method(:handle_send_request))
+        @future_ivar_pool = Concurrent::Map.new
+        @driver_lock = Mutex.new
 
+        setup_resolver
+      end
+
+      def create_selector
+        @selector = NIO::Selector.new
+      end
+
+      def setup_resolver
         env_data = {connection: self}
         Resolver.config do
           [Type::REBOOT, Type::POWEROFF, Type::RESTART, Type::UPDATE].each do |type|
             handle type,  Handler::System, env_data
           end
+          [Type::LCD_MESSAGE, Type::LCD_SET_IDLE_TEXT].each do |type|
+            handle type,  Handler::LCD, env_data
+          end
           handle Type::BUZZER_SOUND,  Handler::Buzzer, env_data
-          handle Type::RFID_RESPONSE_JSON,  Handler::RequestPoolResponse, env_data
+          handle Type::RFID_RESPONSE_JSON,  Handler::RemoteResponse, env_data
         end
       end
 
-      def handle_request_timedout(req)
-        @master.send_event(EVENT_CONNECTION_NOT_READY, "Connection not ready for #{req.ev_type}:#{req.ev_body}")
-      end
-
-      def handle_request_meet(req, res)
-        logger.debug "Got packet: #{res.ev_type}: #{res.ev_body}"
-        case res.ev_type
-        when Type::RFID_RESPONSE_JSON
-          json = JSON.parse(res.ev_body)
-          handle_card_result(json)
-        else
-          logger.warn "Unhandled packet result: #{res.ev_type}: #{res.ev_body}"
-        end
+      def on_request_timeout(ev_type, ev_body)
+        @master.send_event(Event.new(Event::CONNECTION_NOT_READY, "Connection not ready for #{ev_type}:#{ev_body}"))
       end
 
       def handle_card_result(result)
         if result["auth"]
-          @master.send_event(EVENT_BEEP, "ok")
+          @master.send_event(Event.new(Event::BEEP, "ok"))
         else
-          @master.send_event(EVENT_BEEP, "no")
+          @master.send_event(Event.new(Event::BEEP, "no"))
+        end
+        if result["message"]
+          @master.send_event(Event.new(Event::LCD_MESSAGE, result["message"]))
         end
       end
 
-      def handle_send_request(req)
+      def try_send_request(ev_type, ev_body)
         if self.ready?
-          @driver.binary(Packet.new(req.ev_type, @tag, req.wrap_body).dump)
+          @driver_lock.synchronize do
+            @driver.binary(Packet.new(ev_type, @tag, ev_body).dump)
+          end
           true
         else
           false
         end
       end
 
-      # override
-      def worker_loop
+      def stop_threads
+        super
+        @websocket_thr.exit if @websocket_thr
+        @websocket_thr = nil
+      end
+
+      def run
+        super
+        @websocket_thr = Thread.start { run_websocket_loop }
+      end
+
+      def run_websocket_loop
+        create_selector
         loop do
-          @request_pool.update
           ready = @selector.select(1)
           ready.each { |m| m.value.call } if ready
           if @io.nil?
@@ -218,11 +264,75 @@ module Tamashii
         end
       end
 
-      def process_event(ev_type, ev_body)
-        case ev_type
-        when EVENT_CARD_DATA
-          req = RequestPool::Request.new(Type::RFID_NUMBER , ev_body, ev_body)
-          @request_pool.add_request(req)
+      # override
+      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)
+        end
+      end
+
+      def schedule_task_runner(id, ev_type, ev_body, start_time, times)
+        logger.debug "Schedule send attemp #{id} : #{times + 1} time(s)"
+        if try_send_request(ev_type, ev_body)
+          # Request sent, do nothing
+          logger.debug "Request sent for id = #{id}"
+        else
+          if Time.now - start_time < Config.connection_timeout
+            # Re-schedule self
+            logger.warn "Reschedule #{id} after 1 sec"
+            schedule_next_task(1, id,  ev_type, ev_body, start_time, times + 1)
+          else
+            # This job is expired. Do nothing
+            logger.warn "Abort scheduling #{id}"
+          end
+        end
+      end
+
+      def schedule_next_task(interval, id, ev_type, ev_body, start_time, times)
+        Concurrent::ScheduledTask.execute(interval, args: [id, ev_type, ev_body, start_time, times], &method(:schedule_task_runner))
+      end
+
+      def create_request_scheduler_task(id, ev_type, ev_body)
+        schedule_next_task(0, id, ev_type, ev_body, Time.now, 0)
+      end
+
+      def create_request_async(id, ev_type, ev_body)
+        req = Concurrent::Future.new do
+          # Create IVar for store result
+          ivar = Concurrent::IVar.new
+          @future_ivar_pool[id] = ivar
+          # Schedule to get the result
+          create_request_scheduler_task(id, ev_type, ev_body)
+          # Wait for result
+          if result = ivar.value(Config.connection_timeout)
+            # IVar is already removed from pool
+            result
+          else
+            # Manually remove IVar
+            # Any fulfill at this point is useless
+            logger.error "Timeout when getting IVar for #{id}"
+            @future_ivar_pool.delete(id)
+            raise RequestTimeoutError, "Request Timeout"
+          end
+        end
+        req.add_observer(RequestObserver.new(self, id, ev_type, ev_body, req))
+        req.execute
+        req
+      end
+
+      def new_remote_request(id, ev_type, ev_body)
+        # enqueue if not exists
+        if !@future_ivar_pool[id]
+          create_request_async(id, ev_type, ev_body)
+          logger.debug "Request created: #{id}"
+        else
+          logger.warn "Duplicated id: #{id}, ignored"
         end
       end
 
@@ -235,6 +345,20 @@ module Tamashii
       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}"
+        result = JSON.parse(wrapped_ev_body)
+        id = result["id"]
+        ev_body = result["ev_body"]
+        # fetch ivar and delete it
+        if ivar = @future_ivar_pool.delete(id)
+          ivar.set(ev_type: ev_type, ev_body: ev_body)
+        else
+          logger.warn "IVar #{id} not in pool"
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,30 @@
+module Tamashii
+  module Agent
+    module Device
+      # :nodoc:
+      class FakeLCD
+        WIDTH = 16
+
+        attr_accessor :backlight
+
+        def initialize
+          @backlight = true
+        end
+
+        def print_message(message)
+          lines = message.lines.map{|l| l.delete("\n")}
+          puts "LCD Display(BACKLIGHT: #{@backlight}):"
+          puts lines.take(2).map { |line| print_line(line) }.join("\n")
+        end
+
+        private
+
+        def print_line(message)
+          message = '' unless message
+          message = message.ljust(WIDTH, ' ')
+          message.split('').take(WIDTH).join('')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,86 @@
+require 'i2c'
+
+module Tamashii
+  module Agent
+    module Device
+      # :nodoc:
+      class LCD
+        WIDTH = 16
+
+        OP_CHR = 1
+        OP_CMD = 0
+
+        LINES  = [
+          0x80,
+          0xC0
+        ].freeze
+
+        BACKLIGHT_ON = 0x08
+        BACKLIGHT_OFF = 0x00
+
+        ENABLE = 0b00000100
+
+        PULSE = 0.0005
+        DELAY = 0.0005
+
+        attr_accessor :backlight
+
+        def initialize
+          @lcd = I2C.create(Config.lcd_path)
+          @address = Config.lcd_address
+          @backlight = true
+
+          byte(0x33, OP_CMD)
+          byte(0x32, OP_CMD)
+          byte(0x06, OP_CMD)
+          byte(0x0C, OP_CMD)
+          byte(0x28, OP_CMD)
+          byte(0x01, OP_CMD)
+          sleep(DELAY)
+        end
+
+        def print_message(message)
+          lines = message.lines.map{|l| l.delete("\n")}
+          2.times.each { |line| print_line(lines[line], LINES[line]) }
+        end
+
+        private
+
+        def backlight_mode
+          return BACKLIGHT_ON if @backlight
+          BACKLIGHT_OFF
+        end
+
+        def print_line(message, line)
+          message = '' unless message
+          message = message.ljust(WIDTH, ' ')
+          byte(line, OP_CMD)
+          WIDTH.times.each { |pos| byte(message[pos].ord, OP_CHR) }
+        end
+
+        def write(bits)
+          @lcd.write(@address, bits)
+        end
+
+        def byte(bits, mode)
+          high = mode | (bits & 0xF0) | backlight_mode
+          low = mode | (bits << 4) & 0xF0 | backlight_mode
+
+          write(high)
+          toggle(high)
+
+          write(low)
+          toggle(low)
+        end
+
+        def toggle(bits)
+          sleep(DELAY)
+          write(bits | ENABLE)
+          sleep(PULSE)
+          write(bits & ~ENABLE)
+          sleep(DELAY)
+        end
+      end
+    end
+  end
+end

data/lib/tamashii/agent/event.rb

@@ -0,0 +1,27 @@
+module Tamashii
+  module Agent
+    class Event
+
+      BEEP = 1
+      SYSTEM_COMMAND = 2
+      AUTH_RESULT = 3
+      CARD_DATA = 4
+      LCD_MESSAGE = 5
+      LCD_SET_IDLE_TEXT = 6
+
+      CONNECTION_NOT_READY = 255
+      
+      attr_reader :type, :body
+
+      def initialize(type, body)
+        @type = type
+        @body = body
+        self.freeze
+      end
+
+      def ==(other)
+        @type == other.type && @body == other.body
+      end
+    end
+  end
+end

data/lib/tamashii/agent/handler/buzzer.rb

@@ -1,4 +1,4 @@
-require 'tamashii/agent/common'
+require 'tamashii/agent/event'
 require 'tamashii/agent/handler/base'
 
 module Tamashii
@@ -6,7 +6,7 @@ module Tamashii
     module Handler
       class Buzzer < Base
         def resolve(data)
-          @master.send_event(EVENT_BEEP, data)
+          @master.send_event(Event.new(Event::BEEP, data))
         end
       end
     end

data/lib/tamashii/agent/handler/lcd.rb

@@ -0,0 +1,19 @@
+require 'tamashii/agent/event'
+require 'tamashii/agent/handler/base'
+
+module Tamashii
+  module Agent
+    module Handler
+      class LCD < Base
+        def resolve(data)
+          case type
+          when Type::LCD_MESSAGE
+            @master.send_event(Event.new(Event::LCD_MESSAGE, data))
+          when Type::LCD_SET_IDLE_TEXT
+            @master.send_event(Event.new(Event::LCD_SET_IDLE_TEXT, data))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tamashii/agent/handler/remote_response.rb

@@ -0,0 +1,13 @@
+require 'tamashii/agent/handler/base'
+
+module Tamashii
+  module Agent
+    module Handler
+      class RemoteResponse < Base
+        def resolve(data)
+          @connection.handle_remote_response(self.type, data)
+        end
+      end
+    end
+  end
+end

data/lib/tamashii/agent/handler/system.rb

@@ -1,4 +1,4 @@
-require 'tamashii/agent/common'
+require 'tamashii/agent/event'
 require 'tamashii/agent/handler/base'
 
 module Tamashii
@@ -6,7 +6,7 @@ module Tamashii
     module Handler
       class System < Base
         def resolve(data)
-          @master.send_event(EVENT_SYSTEM_COMMAND, type.to_s)
+          @master.send_event(Event.new(Event::SYSTEM_COMMAND, type.to_s))
         end
       end
     end

data/lib/tamashii/agent/handler.rb

@@ -1,6 +1,7 @@
-require 'tamashii/agent/handler/request_pool_response'
+require 'tamashii/agent/handler/remote_response'
 require 'tamashii/agent/handler/system'
 require 'tamashii/agent/handler/buzzer'
+require 'tamashii/agent/handler/lcd'
 
 module Tamashii
   module Agent

data/lib/tamashii/agent/lcd.rb

@@ -0,0 +1,72 @@
+require 'concurrent'
+
+require 'tamashii/agent/common'
+require 'tamashii/agent/event'
+require 'tamashii/agent/adapter/lcd'
+
+
+
+module Tamashii
+  module Agent
+    class LCD < Component
+      def initialize
+        super
+        load_lcd_device
+        @device_lock = Mutex.new
+        @idle_message = "[Tamashii]\nIdle..."
+        logger.debug "Using LCD instance: #{@lcd.class}"
+        @lcd.print_message("Initializing\nPlease wait...")
+        schedule_to_print_idle
+      end
+
+      def load_lcd_device
+        @lcd = Adapter::LCD.object
+      rescue => e
+        logger.error "Unable to load LCD instance: #{Adapter::LCD.current_class}"
+        logger.error "Use #{Adapter::LCD.fake_class} instead"
+        @lcd = Adapter::LCD.fake_class.new
+      end
+
+      def schedule_to_print_idle(delay = 5)
+        @back_to_idle_task = Concurrent::ScheduledTask.execute(delay) do
+          @device_lock.synchronize do
+            @lcd.print_message(@idle_message)
+          end
+        end
+      end
+
+      def process_event(event)
+        case event.type
+        when Event::LCD_MESSAGE
+          logger.debug "Show message: #{event.body}"
+          @back_to_idle_task&.cancel
+          @device_lock.synchronize do
+            @lcd.print_message(event.body)
+            schedule_to_print_idle
+          end
+        when Event::LCD_SET_IDLE_TEXT
+          logger.debug "Idle text set to #{event.body}"
+          @idle_message = event.body
+          @device_lock.synchronize do
+            @lcd.print_message(event.body)
+          end
+        end
+      end
+
+      def clear_screen
+        @device_lock.synchronize do
+          @lcd.print_message("")
+        end
+      end
+
+      def clean_up
+        clear_screen
+        super
+      end
+    end
+  end
+end
+
+
+
+

data/lib/tamashii/agent/master.rb

@@ -1,6 +1,9 @@
+require 'tamashii/agent/common'
 require 'tamashii/agent/connection'
+require 'tamashii/agent/lcd'
 require 'tamashii/agent/buzzer'
 require 'tamashii/agent/card_reader'
+require 'tamashii/agent/event'
 
 require 'thread'
 
@@ -41,6 +44,7 @@ module Tamashii
         @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)
       end
 
@@ -53,12 +57,12 @@ module Tamashii
       end
 
       # override
-      def process_event(ev_type, ev_body)
+      def process_event(event)
         super
-        case ev_type
-        when EVENT_SYSTEM_COMMAND
-          logger.info "System command code: #{ev_body}"
-          case ev_body.to_i
+        case event.type
+        when Event::SYSTEM_COMMAND
+          logger.info "System command code: #{event.body}"
+          case event.body.to_i
           when Tamashii::Type::REBOOT
             system_reboot
           when Tamashii::Type::POWEROFF
@@ -68,30 +72,35 @@ module Tamashii
           when Tamashii::Type::UPDATE
             system_update
           end
-        when EVENT_CONNECTION_NOT_READY
-          broadcast_event(EVENT_BEEP, "error")
+        when Event::CONNECTION_NOT_READY
+          broadcast_event(Event.new(Event::BEEP, "error"))
         else
-          broadcast_event(ev_type, ev_body)
+          broadcast_event(event)
         end
       end
 
+      def show_message(message)
+        logger.info message
+        broadcast_event(Event.new(Event::LCD_MESSAGE, message))
+      end
+
       def system_reboot
-        logger.info "Rebooting..."
+        show_message "Rebooting"
         system("reboot &")
       end
 
       def system_poweroff
-        logger.info "Powering Off..."
+        show_message "Powering  Off"
         system("poweroff &")
       end
 
       def system_restart
-        logger.info "Restarting..."
+        show_message "Restarting"
         system("systemctl restart tamashii-agent.service &")
       end
 
       def system_update
-        logger.info "Updating..."
+        show_message("Updating")
         system("gem update tamashii-agent")
         system_restart
       end
@@ -105,9 +114,9 @@ module Tamashii
       end
 
 
-      def broadcast_event(ev_type, ev_body)
+      def broadcast_event(event)
         @components.each_value do |c|
-          c.send_event(ev_type, ev_body)
+          c.send_event(event)
         end
       end
     end

data/lib/tamashii/agent/version.rb

@@ -1,5 +1,5 @@
 module Tamashii
   module Agent
-    VERSION = "0.1.11"
+    VERSION = "0.2.0"
   end
 end

data/lib/tamashii/agent.rb

@@ -1,4 +1,3 @@
-require "tamashii/common"
 require "tamashii/agent/version"
 require "tamashii/agent/master"
 require "tamashii/agent/config"

data/tamashii-agent.gemspec

@@ -35,12 +35,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "pry"
 
 
-  spec.add_runtime_dependency "tamashii-common" 
+  spec.add_runtime_dependency "tamashii-common"
   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 "i2c"
   spec.add_runtime_dependency "aasm"
+  spec.add_runtime_dependency "concurrent-ruby"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamashii-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors:
 - 蒼時弦也
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tamashii-common
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +180,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i2c
+  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: aasm
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +208,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  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'
 description: The agent module for RubyConfTW checkin system.
 email:
 - elct9620@frost.tw
@@ -205,6 +247,7 @@ files:
 - lib/tamashii/agent/adapter/base.rb
 - lib/tamashii/agent/adapter/buzzer.rb
 - lib/tamashii/agent/adapter/card_reader.rb
+- lib/tamashii/agent/adapter/lcd.rb
 - lib/tamashii/agent/buzzer.rb
 - lib/tamashii/agent/card_reader.rb
 - lib/tamashii/agent/common.rb
@@ -214,16 +257,18 @@ files:
 - lib/tamashii/agent/connection.rb
 - lib/tamashii/agent/device/fake_buzzer.rb
 - lib/tamashii/agent/device/fake_card_reader.rb
+- lib/tamashii/agent/device/fake_lcd.rb
+- lib/tamashii/agent/device/lcd.rb
 - lib/tamashii/agent/device/pi_buzzer.rb
+- lib/tamashii/agent/event.rb
 - lib/tamashii/agent/handler.rb
 - lib/tamashii/agent/handler/base.rb
 - lib/tamashii/agent/handler/buzzer.rb
-- lib/tamashii/agent/handler/request_pool_response.rb
+- lib/tamashii/agent/handler/lcd.rb
+- lib/tamashii/agent/handler/remote_response.rb
 - lib/tamashii/agent/handler/system.rb
+- lib/tamashii/agent/lcd.rb
 - lib/tamashii/agent/master.rb
-- lib/tamashii/agent/request_pool.rb
-- lib/tamashii/agent/request_pool/request.rb
-- lib/tamashii/agent/request_pool/response.rb
 - lib/tamashii/agent/version.rb
 - tamashii-agent.gemspec
 homepage: https://github.com/5xruby/tamashii-agent

data/lib/tamashii/agent/handler/request_pool_response.rb

@@ -1,14 +0,0 @@
-require 'tamashii/agent/handler/base'
-require 'tamashii/agent/request_pool'
-
-module Tamashii
-  module Agent
-    module Handler
-      class RequestPoolResponse < Base
-        def resolve(data)
-          @connection.request_pool.add_response(RequestPool::Response.new(self.type, data))
-        end
-      end
-    end
-  end
-end

data/lib/tamashii/agent/request_pool/request.rb

@@ -1,38 +0,0 @@
-require 'json'
-module Tamashii
-  module Agent
-    class RequestPool
-      class Request
-        attr_accessor :id
-        attr_accessor :ev_type
-        attr_accessor :ev_body
-        attr_accessor :state
-
-        STATE_PENDING = :pending
-        STATE_SENT = :sent
-
-        def initialize(ev_type, ev_body, id)
-          @ev_type = ev_type
-          @ev_body = ev_body
-          @id = id
-          @state = STATE_PENDING
-        end
-
-        def wrap_body
-          {
-            id: @id,
-            ev_body: @ev_body
-          }.to_json
-        end
-
-        def sent!
-          @state = STATE_SENT
-        end
-
-        def sent?
-          @state == STATE_SENT
-        end
-      end
-    end
-  end
-end

data/lib/tamashii/agent/request_pool/response.rb

@@ -1,18 +0,0 @@
-require 'json'
-module Tamashii
-  module Agent
-    class RequestPool
-      class Response
-        attr_accessor :ev_type, :ev_body, :id
-
-        def initialize(ev_type, wrapped_body)
-          @ev_type = ev_type
-          data = JSON.parse(wrapped_body)
-          @id = data["id"]
-          @ev_body = data["ev_body"]
-        end
-
-      end
-    end
-  end
-end

data/lib/tamashii/agent/request_pool.rb

@@ -1,80 +0,0 @@
-require 'tamashii/agent/common'
-require 'tamashii/agent/request_pool/request'
-require 'tamashii/agent/request_pool/response'
-
-
-module Tamashii
-  module Agent
-    class RequestPool
-      include Common::Loggable
-      def initialize
-        @pool = {}
-        @handlers = {}
-      end
-
-      def set_handler(sym, method)
-         @handlers[sym] = method      
-      end
-
-      def call_handler(sym, *args)
-        if handle?(sym)
-          @handlers[sym].call(*args)
-        else
-          logger.warn "WARN: un-handled event: #{sym}"
-        end
-      end
-
-      def handle?(sym)
-        @handlers.has_key? sym
-      end
-
-      def add_request(req, timedout = 3)
-        @pool[req.id] = {req: req, timestamp: Time.now, timedout: timedout}
-        try_send_request(req)
-      end
-
-      def add_response(res)
-        # find the same id
-        req_data = @pool[res.id]
-        if req_data
-          @pool.delete(res.id)
-          call_handler(:request_meet, req_data[:req], res)
-        else
-          # unmatched response
-          # discard
-          logger.warn "WARN: un-matched response (id=#{res.id}): #{res.inspect}"
-        end
-      end
-
-      def update
-        process_pending
-        check_timedout
-      end
-      
-      def check_timedout
-        now = Time.now
-        @pool.each do |id, req_data|
-          if now - req_data[:timestamp] >= req_data[:timedout]
-            # timedout
-            @pool.delete(id)
-            call_handler(:request_timedout, req_data[:req])
-          end
-        end
-      end
-
-      def process_pending
-        @pool.each_value do |data|
-          try_send_request(data[:req]) unless data[:req].sent?
-        end
-      end
-
-      def try_send_request(req)
-        if handle?(:send_request)
-          req.sent! if call_handler(:send_request, req)
-        end
-      end
-    end
-  end
-end
-
-