smartware 0.3.1 → 0.4.3

data/bin/smartware-monitor

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'bundler/setup'
+require 'smartware'
+
+EventMachine.run do
+  Smartware.subscribe do |key, *value|
+    puts "#{key}: #{value.map(&:inspect).join(", ")}"
+  end
+
+  puts "Receiving Smartware events."
+end

data/lib/smartware.rb

@@ -6,6 +6,7 @@ require 'redcarpet'
 require 'stringio'
 require 'eventmachine'
 require 'serialport'
+require 'json'
 
 require 'smartkiosk/common'
 
@@ -25,6 +26,8 @@ require 'smartware/interfaces/printer'
 require 'smartware/interfaces/watchdog'
 require 'smartware/interfaces/card_reader'
 require 'smartware/connection_monitor'
+require 'smartware/pub_sub_server'
+require 'smartware/pub_sub_client'
 
 module Smartware
 
@@ -32,6 +35,10 @@ module Smartware
     yield self
   end
 
+  def self.card_reader
+    Smartware::Client::CardReader
+  end
+
   def self.cash_acceptor
     Smartware::Client::CashAcceptor
   end
@@ -48,4 +55,15 @@ module Smartware
     Smartware::Client::Watchdog
   end
 
+  def self.subscribe(&block)
+    Smartware::PubSubClient.destroy_static_client
+    client = Smartware::PubSubClient.create_static_client
+    client.receiver = block
+    client.start
+    client
+  end
+
+  def self.unsubscribe
+    Smartware::PubSubClient.destroy_static_client
+  end
 end

data/lib/smartware/clients/card_reader.rb

@@ -8,13 +8,6 @@ module Smartware
       DRb.start_service
       @device = DRbObject.new_with_uri('druby://localhost:6004')
 
-      def self.open(limit_min = nil, limit_max = nil)
-        @device.open_session(limit_min, limit_max)
-      end
-
-      def self.close
-        @device.close_session
-      end
 
       def self.status
         @device.status
@@ -32,28 +25,16 @@ module Smartware
         @device.version
       end
 
-      def self.card_inserted?
-        @device.card_inserted?
-      end
-
-      def self.start_accepting
-        @device.start_accepting
+      def self.open
+        @device.open
       end
 
-      def self.stop_accepting
-        @device.stop_accepting
-      end
-
-      def self.eject
-        @device.eject
-      end
-
-      def self.capture
-        @device.capture
+      def self.close
+        @device.close
       end
 
-      def self.read_magstrip
-        @device.read_magstrip
+      def self.card_inserted
+        @device.card_inserted
       end
     end
   end

data/lib/smartware/clients/cash_acceptor.rb

@@ -40,6 +40,13 @@ module Smartware
         @device.cashsum
       end
 
+      def self.insert_casette
+        @device.insert_casette
+      end
+
+      def self.eject_casette
+        @device.eject_casette
+      end
     end
   end
 end

data/lib/smartware/drivers/cash_acceptor/ccnet.rb

@@ -66,7 +66,7 @@ module Smartware
 
         attr_reader   :bill_types
 
-        attr_accessor :escrow, :stacked, :returned, :status
+        attr_accessor :open, :closed, :escrow, :stacked, :returned, :status
         attr_accessor :enabled_types
 
         def initialize(config)
@@ -76,6 +76,8 @@ module Smartware
           @connection = EventMachine.attach @io, CCNETConnection
           @connection.address = 3
 
+          @open = nil
+          @closed = nil
           @escrow = nil
           @stacked = nil
           @returned = nil
@@ -188,6 +190,13 @@ module Smartware
               when IDLING
                 if @enabled_types == 0
                   @connection.command(ENABLE_BILL_TYPES, "\x00" * 6) {}
+
+                  begin
+                    @closed.call
+                  rescue => e
+                    Logging.logger.error "Error in open: #{e}"
+                    e.backtrace.each { |line| Logging.logger.error line }
+                  end
                 end
 
               when UNIT_DISABLED
@@ -219,6 +228,13 @@ module Smartware
                   ]
 
                   @connection.command(ENABLE_BILL_TYPES, mask.pack("C*")) {}
+
+                  begin
+                    @open.call
+                  rescue => e
+                    Logging.logger.error "Error in open: #{e}"
+                    e.backtrace.each { |line| Logging.logger.error line }
+                  end
                 else
                   interval = 0.5
                 end
@@ -273,6 +289,13 @@ module Smartware
           EventMachine.add_timer(interval, &method(:poll))
         end
 
+        def insert_casette
+
+        end
+
+        def eject_casette
+
+        end
       end
     end
   end

data/lib/smartware/drivers/cash_acceptor/dummy.rb

@@ -6,18 +6,28 @@ module Smartware
       class Dummy
         attr_reader   :bill_types
 
-        attr_accessor :escrow, :stacked, :returned, :status
+        attr_accessor :open, :closed, :escrow, :stacked, :returned, :status
         attr_accessor :enabled_types
 
         def initialize(config)
-          @bill_types = []
+          @bill_types = [ 10, 50, 100, 500, 5000 ].map do |value|
+            Interface::CashAcceptor::BillType.new(value, 'RUS')
+          end
 
+          @open = nil
+          @closed = nil
           @escrow = nil
           @stacked = nil
           @returned = nil
           @status = nil
+          @escrow_bill = nil
+          @casette = true
 
-          @enabled_types = nil
+          @enabled_types = 0
+
+          EventMachine.add_periodic_timer 0.5, method(:poll)
+
+          @dummy_state = :power_up
         end
 
         def model
@@ -27,8 +37,81 @@ module Smartware
         def version
           "1.0"
         end
-      end
 
+        def accepting?
+          false
+        end
+
+        def insert_casette
+          @casette = true
+        end
+
+        def eject_casette
+          @casette = false
+        end
+
+        private
+
+        def poll
+          error = nil
+
+          case @dummy_state
+          when :power_up
+            @dummy_state = :initialize
+
+          when :initialize
+            @dummy_state = :disabled
+
+          when :disabled
+            if !@casette
+              @dummy_state = :no_casette
+            elsif @enabled_types != 0
+              @dummy_state = :idle
+              @open.call
+            end
+
+          when :idle
+            if @enabled_types == 0
+              @dummy_state = :disabled
+              @closed.call
+            elsif !@casette
+              @dummy_state = :no_casette
+            else
+              bill, index = @bill_types.each_with_index
+                                       .select { |(obj, index)| enabled_types & (1 << index) != 0 }
+                                       .sample
+
+
+              @dummy_state = :escrow
+              @escrow_bill = bill
+            end
+
+          when :escrow
+            if @escrow.call(@escrow_bill)
+              @dummy_state = :stacking
+            else
+              @dummy_state = :returning
+            end
+
+          when :stacking
+            @dummy_state = :idle
+            @stacked.call @escrow_bill
+
+          when :returning
+            @dummy_state = :idle
+            @return.call @escrow_bill
+
+          when :no_casette
+            error = Interface::CashAcceptor::DROP_CASETTE_OUT_OF_POSITION
+
+            if @casette
+              @dummy_state = :disabled
+            end
+          end
+
+          @status.call error
+        end
+      end
     end
   end
 end

data/lib/smartware/interfaces/card_reader.rb

@@ -18,65 +18,116 @@ module Smartware
         end
       end
 
-      def initialize(config)
+      def initialize(config, service)
         super
 
-        @status[:model] = @device.model
-        @status[:version] = @device.version
+        update_status :model, @device.model
+        update_status :version, @device.version
+        update_status :card_inserted, false, nil, nil, nil
+
+        @state = :inactive
+        @open = false
+        @mutex = Mutex.new
+        @cvar = ConditionVariable.new
+
+        schedule_status
       end
 
-      def card_inserted?
-        @device.status == :card_inserted
-      rescue CardReaderError => e
-        @status[:error] = e.code
-        nil
+      def open
+        @mutex.synchronize do
+          @open = true
+          @cvar.wait(@mutex)
+        end
       end
 
-      def start_accepting
-        @device.accepting = true
-        @status[:error] = nil
-        true
-      rescue CardReaderError => e
-        @status[:error] = e.code
-        false
+      def close
+        @mutex.synchronize do
+          @open = false
+          @cvar.wait(@mutex)
+        end
       end
 
-      def stop_accepting
-        @device.accepting = false
-        @status[:error] = nil
-        true
-      rescue CardReaderError => e
-        @status[:error] = e.code
-        false
+      def card_inserted
+        @status[:card_inserted]
       end
 
-      def eject
-        @device.eject
+      private
 
-        sleep 0.5 while @device.status == :card_at_gate
+      def poll
+        open = nil
+        @mutex.synchronize do
+          open = @open
+          @cvar.broadcast
+        end
 
-        @status[:error] = nil
-        true
-      rescue CardReaderError => e
-        @status[:error] = e.code
-        false
-      end
+        begin
+          status = @device.status
 
-      def capture
-        @device.capture
-        @status[:error] = nil
-        true
-      rescue CardReaderError => e
-        @status[:error] = e.code
-        false
-      end
+          case @state
+          when :failure
+            if status == :ready
+              @state = :inactive
+              update_status :error, nil
+            end
+
+          when :inactive
+            if open
+              @device.accepting = true
+              @state = :waiting_card
+            end
+
+          when :waiting_card
+            if !open
+              @device.accepting = false
+              @device.eject rescue nil
+              @state = :waiting_eject
 
-      def read_magstrip
-        @device.read_magstrip
+            elsif status == :card_inserted
+              @state = :card_inside
+              @device.accepting = false
 
-      rescue CardReaderError => e
-        @status[:error] = e.code
-        nil
+              track1, track2, = @device.read_magstrip
+              if track1.nil? || track2.nil?
+                @device.eject rescue nil
+                @state = :waiting_eject
+              else
+                update_status :card_inserted, true, false, track1, track2
+              end
+            end
+
+          when :card_inside
+            if !open || status != :card_inserted
+              update_status :card_inserted, false, nil, nil, nil
+              @device.eject rescue nil
+              @state = :waiting_eject
+            end
+
+          when :waiting_eject
+            if status == :ready || status == :not_ready
+              if open
+                @state = :waiting_card
+                @device.accepting = true
+              else
+                @state = :inactive
+              end
+            end
+          end
+        rescue CardReaderError => e
+          Logging.logger.error "Card reader error: #{e}"
+
+          @device.eject rescue nil
+          @device.accepting = false rescue nil
+
+          @state = :failure
+          update_status :error, e.code
+        end
+      end
+
+      def schedule_status(ret = nil)
+        EventMachine.add_timer(0.1) do
+          EventMachine.defer(method(:poll),
+                             method(:schedule_status))
+        end
       end
     end
   end

data/lib/smartware/interfaces/cash_acceptor.rb

@@ -33,9 +33,11 @@ module Smartware
         end
       end
 
-      def initialize(config)
+      def initialize(config, service)
         super
 
+        @device.open = method :device_open
+        @device.closed = method :device_closed
         @device.escrow = method :escrow
         @device.stacked = method :stacked
         @device.returned = method :returned
@@ -45,9 +47,8 @@ module Smartware
         @banknotes = {}
         @banknotes.default = 0
 
-        update_status do
-          @status[:casette] = true
-        end
+        update_status :casette, false
+        update_status :accepting, false
 
         Smartware::Logging.logger.info "Cash acceptor monitor started"
       end
@@ -90,7 +91,7 @@ module Smartware
       end
 
       def banknotes
-        update_status { @banknotes }
+        @banknotes
       end
 
       def cashsum
@@ -99,6 +100,14 @@ module Smartware
         end
       end
 
+      def insert_casette
+        @device.insert_casette
+      end
+
+      def eject_casette
+        @device.eject_casette
+      end
+
       private
 
       def limit_satisfied?(sum)
@@ -112,11 +121,11 @@ module Smartware
       def stacked(banknote)
         value = banknote.value
 
-        update_status do
-          @banknotes[value] += 1
-        end
+        @banknotes[value] += 1
 
         Smartware::Logging.logger.debug "cash acceptor: bill stacked, #{value}"
+
+        publish_event :stacked, value
       end
 
       def returned(banknote)
@@ -126,12 +135,23 @@ module Smartware
       end
 
       def status_changed(error)
-        update_status do
-          @status[:error] = error
-          @status[:model] = @device.model
-          @status[:version] = @device.version
-          @status[:casette] = error != DROP_CASETTE_OUT_OF_POSITION
-        end
+        update_status :error, error
+        update_status :model, @device.model
+        update_status :version, @device.version
+        update_status :casette, error != DROP_CASETTE_OUT_OF_POSITION
+        update_status :cashsum, cashsum
+      end
+
+      def device_open
+        Smartware::Logging.logger.debug "Device acknowleged open"
+
+        update_status :accepting, true
+      end
+
+      def device_closed
+        Smartware::Logging.logger.debug "Device acknowleged close"
+
+        update_status :accepting, false
       end
     end
   end

data/lib/smartware/interfaces/interface.rb

@@ -3,34 +3,47 @@ module Smartware
     class Interface
       attr_reader :config
 
-      def initialize(config)
+      def initialize(config, service)
         @config = config
+        @service = service
+
         @status_mutex = Mutex.new
         @status = {
-          model: '',
-          version: ''
+          error: [ nil ],
+          model: [ '' ],
+          version: [ '' ]
         }
 
         iface = @config["name"]
         driver = @config["driver"]
 
-        require "smartware/drivers/#{iface.underscore}/#{driver.underscore}"
+        @iface_id = iface.underscore
+
+        require "smartware/drivers/#{@iface_id}/#{driver.underscore}"
 
         @device = Smartware::Driver.const_get(iface.to_s)
                                    .const_get(driver.to_s)
                                    .new(config)
       end
 
+      def repush_events(connection)
+        @status_mutex.synchronize do
+          @status.each do |key, value|
+            connection.publish_event "#{@iface_id}.#{key}", *value
+          end
+        end
+      end
+
       def error
-        self.status[:error]
+        self.status[:error][0]
       end
 
       def model
-        self.status[:model]
+        self.status[:model][0]
       end
 
       def version
-        self.status[:version]
+        self.status[:version][0]
       end
 
       def status
@@ -39,8 +52,17 @@ module Smartware
 
       protected
 
-      def update_status(&block)
-        @status_mutex.synchronize &block
+      def update_status(key, *value)
+        @status_mutex.synchronize do
+          if @status[key] != value
+            @status[key] = value
+            publish_event key, *value
+          end
+        end
+      end
+
+      def publish_event(key, *data)
+        @service.publish_event "#{@iface_id}.#{key}", *data
       end
     end
   end

data/lib/smartware/interfaces/modem.rb

@@ -3,24 +3,22 @@ module Smartware
     class Modem < Interface
       MODEM_NOT_AVAILABLE = 1
 
-      def initialize(config)
+      def initialize(config, service)
         super
 
-        update_status do
-          @status[:balance] = ''
-          @status[:signal_level] = ''
-        end
+        update_status :balance, ''
+        update_status :signal_level, ''
 
         @session = Thread.new &method(:poll)
         Smartware::Logging.logger.info 'Modem monitor started'
       end
 
       def balance
-        self.status[:balance]
+        self.status[:balance][0]
       end
 
       def signal_level
-        self.status[:signal_level]
+        self.status[:signal_level][0]
       end
 
       private
@@ -30,13 +28,11 @@ module Smartware
           loop do
             @device.tick
 
-            update_status do
-              @status[:signal_level] = @device.signal_level
-              @status[:model] = @device.model
-              @status[:version] = @device.version
-              @status[:error] = @device.error
-              @status[:balance] = @device.balance
-            end
+            update_status :signal_level, @device.signal_level
+            update_status :model, @device.model
+            update_status :version, @device.version
+            update_status :error, @device.error
+            update_status :balance, @device.balance
           end
         rescue => e
           Smartware::Logging.logger.error e.message

data/lib/smartware/interfaces/printer.rb

@@ -7,7 +7,7 @@ module Smartware
       OUT_OF_PAPER = 3
       PAPER_NEAR_END = 1000
 
-      def initialize(config)
+      def initialize(config, service)
         super
 
         @printer_mutex = Mutex.new
@@ -89,11 +89,9 @@ EOS
 
       def query_printer
         @device.query
-        update_status do
-          @status[:error] = @device.error
-          @status[:model] = @device.model
-          @status[:version] = @device.version
-        end
+        update_status :error, @device.error
+        update_status :model, @device.model
+        update_status :version, @device.version
       end
 
       def poll

data/lib/smartware/interfaces/watchdog.rb

@@ -4,22 +4,18 @@ module Smartware
 
       WATCHDOG_NOT_AVAILBLE = 1
 
-      def initialize(config)
+      def initialize(config, service)
         super
 
-        update_status do
-          @status[:error] = nil
-          @status[:model] = @device.model
-          @status[:version] = @device.version
-        end
+        update_status :error, nil
+        update_status :model, @device.model
+        update_status :version, @device.version
       end
 
       def reboot_modem
         @device.reboot_modem
 
-        update_status do
-          @status[:error] = @device.error
-        end
+        update_status :error, @device.error
       end
     end
   end

data/lib/smartware/pub_sub_client.rb

@@ -0,0 +1,69 @@
+require "em/protocols/line_protocol"
+
+module Smartware
+  class PubSubClient
+    class PubSubHandler < EventMachine::Connection
+      include EventMachine::Protocols::LineProtocol
+
+      def initialize(client)
+        @client = client
+      end
+
+      def unbind
+        @client.broken
+      end
+
+      def receive_line(line)
+        data = JSON.load line
+
+        @client.deliver data["key"], *data["args"]
+      end
+    end
+
+    @@static_client = nil
+
+    def self.create_static_client
+      @@static_client = PubSubClient.new
+    end
+
+    def self.destroy_static_client
+      return if @@static_client.nil?
+      @@static_client.stop
+      @@static_client = nil
+    end
+
+    attr_accessor :receiver
+
+    def initialize(host = "localhost", port = 6100)
+      @host = host
+      @port = port
+      @reconnect_timer = nil
+      @connection = nil
+    end
+
+    def start
+      attempt if @connection.nil? && @reconnect_timer.nil?
+    end
+
+    def stop
+      @connection.close_connection unless @connection.nil?
+      EventMachine.cancel_timer @reconnect_timer unless @reconnect_timer.nil?
+    end
+
+    def broken
+      @connection = nil
+      @reconnect_timer = EventMachine.add_timer 1, &method(:attempt)
+    end
+
+    def deliver(key, *args)
+      @receiver.call key, *args
+    end
+
+    private
+
+    def attempt
+      @reconnect_timer = nil
+      @connection = EventMachine.connect @host, @port, PubSubHandler, self
+    end
+  end
+end

data/lib/smartware/pub_sub_server.rb

@@ -0,0 +1,49 @@
+module Smartware
+  class PubSubServer
+    class PubSubConnection < EventMachine::Connection
+      def initialize(server)
+        @server = server
+      end
+
+      def post_init
+        @server.add_connection self
+      end
+
+      def unbind
+        @server.remove_connection self
+      end
+
+      def receive_data(data)
+
+      end
+
+      def publish_event(key, *args)
+        send_data(JSON.dump({ key: key, args: args }) + "\r\n")
+      end
+    end
+
+    attr_accessor :repush
+
+    def initialize(host, port)
+      @repush = nil
+      @connections = Set.new
+
+      EventMachine.start_server host, port, PubSubConnection, self
+    end
+
+    def add_connection(connection)
+      @connections.add connection
+      @repush.call connection
+    end
+
+    def remove_connection(connection)
+      @connections.delete connection
+    end
+
+    def publish_event(key, *args)
+      @connections.each do |connection|
+        connection.publish_event key, *args
+      end
+    end
+  end
+end

data/lib/smartware/service.rb

@@ -5,15 +5,31 @@ module Smartware
     def initialize(config_file)
       @config = YAML.load File.read(config_file)
       @interfaces = []
+      @devices = []
     end
 
     def start
       EventMachine.epoll
       EventMachine.run do
-        @interfaces = @config["interfaces"].map do |config|
-          interface = Smartware::Interface.const_get(config['name']).new config
+        @event_channel = EventMachine::Channel.new
+        @event_channel.subscribe do |(key, args)|
+          @pubsub.publish_event key, *args
+        end
+
+        @pubsub = PubSubServer.new "localhost", (@config["pubsub_port"] || 6100)
+        @pubsub.repush = ->(connection) do
+          @devices.each do |device|
+            device.repush_events connection
+          end
+        end
 
-          DRb::DRbServer.new config["uri"], interface
+        @config["interfaces"].each do |config|
+          interface = Smartware::Interface.const_get(config['name']).new config, self
+          @devices << interface
+
+          if config.include? "uri"
+            @interfaces << DRb::DRbServer.new(config["uri"], interface)
+          end
         end
 
         unless @config["connection_timeout"].nil?
@@ -29,13 +45,16 @@ module Smartware
           end
         end
       end
+    end
 
+    def publish_event(key, *args)
+      @event_channel.push [key, args]
     end
 
     def stop
       @interfaces.each &:stop_service
 
-      EventMachine.stop_event_loop
+      EventMachine.stop
     end
 
     def join
@@ -45,4 +64,3 @@ module Smartware
     end
   end
 end
-

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.3.1"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
@@ -146,6 +146,7 @@ email:
 - boris@roundlake.ru
 executables:
 - smartware
+- smartware-monitor
 - smartware-ppp-helper
 extensions: []
 extra_rdoc_files: []
@@ -156,6 +157,7 @@ files:
 - README.md
 - Rakefile
 - bin/smartware
+- bin/smartware-monitor
 - bin/smartware-ppp-helper
 - config/smartware.yml.sample
 - lib/smartware.rb
@@ -186,6 +188,8 @@ files:
 - lib/smartware/interfaces/watchdog.rb
 - lib/smartware/logging.rb
 - lib/smartware/process_manager.rb
+- lib/smartware/pub_sub_client.rb
+- lib/smartware/pub_sub_server.rb
 - lib/smartware/service.rb
 - lib/smartware/version.rb
 - smartware.gemspec