smartware 0.1.23 → 0.1.24

data/bin/smartware

@@ -2,6 +2,7 @@
 
 trap 'TTIN' do
   Thread.list.each do |thread|
+    puts "Thread #{thread}:"
     if thread.backtrace
       puts thread.backtrace.join("\n")
     else
@@ -10,6 +11,12 @@ trap 'TTIN' do
   end
 end
 
+require "rubygems"
+begin
+  require "bundler/setup"
+rescue
+end
+
 require 'smartware/service'
 require 'dante'
 

data/bin/smartware-ppp-helper

@@ -0,0 +1,39 @@
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "bundler/setup"
+require "cmux"
+
+device, apn = ARGV
+
+io = CMUX::IO::open_tty device
+begin
+  chatter = CMUX::ModemChatter.new io
+
+  complete = false
+
+  chatter.command("+CGDCONT=1,\"IP\",\"#{apn}\";D*99***1#", 30) do |resp|
+    if resp.failure?
+      warn "GPRS activation failed: #{resp.error}"
+
+      exit 1
+    else
+      complete = true
+    end
+  end
+
+  until complete
+    CMUX::ModemChatter.poll [ chatter ]
+  end
+ensure
+  io.close
+end
+
+Process.exec "/usr/sbin/pppd",
+              device, "115200",
+              "nodetach", "file", "/etc/ppp/options",
+              pgroup: true,
+              in: :close,
+              out: :close,
+              err: :close,
+              close_others: true

data/lib/smartware/clients/cash_acceptor.rb

@@ -28,6 +28,10 @@ module Smartware
         @device.model
       end
 
+      def self.version
+        @device.version
+      end
+
       def self.banknotes
         @device.banknotes
       end

data/lib/smartware/clients/modem.rb

@@ -16,6 +16,10 @@ module Smartware
         @device.model
       end
 
+      def self.version
+        @device.version
+      end
+
       def self.balance
         @device.balance
       end

data/lib/smartware/clients/printer.rb

@@ -20,6 +20,12 @@ module Smartware
         'No device'
       end
 
+      def self.version
+        @device.version
+      rescue => e
+        'No device'
+      end
+
       def self.test
         @device.test
       rescue => e

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

@@ -84,6 +84,11 @@ module Smartware
           -1
         end
 
+        def version
+          # TODO: implement this
+          "not implemented"
+        end
+
         def error
           res = poll
           ack

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

@@ -13,6 +13,11 @@ module Smartware
           "Generic cash acceptor"
         end
 
+        def version
+          # TODO: implement this
+          "not implemented"
+        end
+
         def cassette?
           true
         end

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

@@ -5,14 +5,18 @@ module Smartware
 
       class Dummy
 
-        def initialize(port)
-          @port = port
+        def initialize(config)
+          @port = config
         end
 
         def model
           'Generic modem'
         end
 
+        def version
+          '8 Ultimate'
+        end
+
         def error
           false
         end
@@ -22,10 +26,13 @@ module Smartware
           "#{res} dbm"
         end
 
-        def ussd(code="*100#")
+        def balance
           "Сервис временно недоступен"
         end
 
+        def tick
+          sleep 10
+        end
       end
 
     end

data/lib/smartware/drivers/modem/standard.rb

@@ -1,85 +1,213 @@
 # coding: utf-8
-require 'serialport'
+require 'cmux'
 
 module Smartware
   module Driver
     module Modem
 
       class Standard
+        attr_reader :error, :model, :balance, :version
 
-        ERRORS = {
-            "-1" => -1, # invalid device answer
-            "10" => 10, # invalid ussd answer
-            "20" => 20, # invalid modem model
-            "21" => 21, # invalid modem signal level
-        }
-
-        def initialize(port)
-          @sp = SerialPort.new(port, 115200, 8, 1, SerialPort::NONE)
-          @sp.read_timeout = 100
+        def initialize(config)
+          @config = config
+          @state = :closed
+          @error = "not initialized yet"
+          @mux = nil
+          @status_channel = nil
+          @info_requested = false
+          @model = "GSM modem"
+          @version = ""
+          @signal = "+CSQ: 99,99"
+          @ussd_interval = 0
+          @balance = nil
+          @ppp_state = :stopped
+          @ppp_pid = nil
         end
 
-        def error
-          @error ||= false
+        def signal_level
+          value = @signal.gsub("+CSQ: ",'').split(',')[0].to_i
+          "#{(-113 + value * 2)} dbm"
         end
 
-        def model
-          res = send 'ATI'
-          res.shift
-          res.pop
-          res.join(' ')
-        rescue
-          @error = ERRORS["20"]
+        def tick
+          begin
+            modem_tick
+            ppp_tick
+
+            wait_for_event
+          rescue => e
+            Smartware::Logging.logger.error "uncatched exception in modem monitor: #{e}"
+          end
         end
 
-        #
-        # Returns signal level in dbm
-        #
-        def signal_level
-          res = send 'AT+CSQ'
-          value = res[1].gsub("+CSQ: ",'').split(',')[0].to_i
-          "#{(-113 + value * 2)} dbm"
-        rescue
-          @error = ERRORS["21"]
-          return false
+        def unsolicited(type, fields)
+          case type
+          when "CUSD"
+            ussd *fields
+          end
         end
 
-        #
-        # Method send ussd to operator and return only valid answer body
-        # Returns modem balance by default, it works for MTS and Megafon, use *102# for Beeline
-        # Do not call with method synchronously from app, method waits USSD answer some time,
-        # Use some scheduler and buffer for balance value
-        #
-        # Valid ussd answer sample: ["", "+CUSD: 2,\"003100310035002C003000300440002E00320031002E00330031002004310430043B002E0020\",72", "OK"]
-        #
-        def ussd(code="*100#")
-          res = self.send("AT+CUSD=1,\"*100#\",15").reject{|i| i[0..4] != '+CUSD'}[0]
-          if res
-            ussd_body = res.split(",")[1].gsub('"','') # Parse USSD message body
-            ussd_body.scan(/\w{4}/).map{|i| [i.hex].pack("U") }.join.strip # Encode USSD message from broken ucs2 to utf-8
+        def ussd(mode, string = nil, dcs = nil)
+          if mode != "0"
+            Smartware::Logging.logger.warn "USSD completed with mode #{mode}, expected 0"
+          end
+
+          if string
+            @balance = string.scan(/\w{4}/)
+            .map! { |i| [ i.hex ].pack("U") }
+            .join
+            .strip
           else
-            @error = ERRORS["10"]
-            false
+            @balance = nil
+          end
+        end
+
+        private
+
+        def modem_tick
+          case @state
+          when :closed
+            Smartware::Logging.logger.info "trying to open modem"
+
+            begin
+              @mux = CMUX::MUX.new @config["device"]
+              @state = :open
+              @status_channel = @mux.allocate(@config["status_channel"]).open
+              @chatter = CMUX::ModemChatter.new @status_channel
+              @chatter.subscribe "CUSD", self
+              @error = false
+              @ussd_interval = 0
+              Smartware::Logging.logger.info "modem ready"
+            rescue => e
+              close_modem "unable to open modem: #{e}"
+            end
+
+          when :open
+            modem_works = nil
+
+            begin
+              @chatter.command("+CGMM;+CGMR;+CSQ", 3) do |resp|
+                modem_works = resp.success?
+
+                if modem_works
+                  resp.response.reject! &:empty?
+                  @model, @version, @signal = resp.response
+                end
+              end
+
+              while modem_works.nil?
+                CMUX::ModemChatter.poll [ @chatter ]
+              end
+            rescue => e
+              modem_works = false
+            end
+
+            if modem_works
+              if @config.include?("balance_ussd") && @ussd_interval == 0
+                @ussd_interval = @config["balance_interval"]
+                begin
+                  @chatter.command("+CUSD=1,\"#{@config["balance_ussd"]}\",15", 1)
+                rescue => e
+                  close_modem "USSD request failed: #{e}"
+                end
+              else
+                @ussd_interval -= 1
+              end
+            else
+              close_modem "modem is not responding"
+            end
+          end
+        end
+
+        def ppp_tick
+          case @ppp_state
+          when :stopped
+            if @state == :open
+              Smartware::Logging.logger.info "trying to start pppd"
+              begin
+                @ppp_channel = @mux.allocate @config["ppp_channel"]
+
+                @ppp_pid = Process.spawn "smartware-ppp-helper",
+                    @ppp_channel.device,
+                    @config["apn"]
+                @ppp_state = :running
+
+                Smartware::Logging.logger.info "started pppd, PID #{@ppp_pid}"
+                Smartware::ProcessManager.track @ppp_pid, method(:ppp_died)
+
+              rescue => e
+                begin
+                  @ppp_channel.close
+                rescue
+                end
+
+                @ppp_channel = nil
+                @ppp_pid = nil
+                @ppp_state = :stopped
+
+                Smartware::Logging.logger.warn "cannot start pppd: #{e.to_s}"
+              end
+            end
+
+          when :running
+            if @ppp_pid.nil?
+              Smartware::Logging.logger.warn "pppd died"
+              begin
+                @ppp_channel.close
+              rescue
+              end
+
+              @ppp_channel = nil
+              @ppp_state = :stopped
+            end
           end
         end
 
-        def send(cmd)
-          @error = false
-          @sp.write "#{ cmd }\r\n"
-          read_port(@sp)
+        def ppp_died(pid)
+          # will be handled by the event loop a moment later
+          @ppp_pid = nil
         end
 
-        def read_port(io, read_timeout = 0.25)
-          return ERRORS["-1"] unless io
-          answer = ''
-          while IO.select [io], [], [], read_timeout
-            chr = io.getc.chr
-            answer << chr
+        def wait_for_event
+          if @state == :open
+            begin
+              CMUX::ModemChatter.poll [ @chatter ], @config["poll_interval"]
+            rescue => e
+              close_modem "modem poll failed: #{e}"
+            end
+          else
+            sleep @config["poll_interval"]
           end
-          answer.split(/[\r\n]+/)
+
         end
-      end
 
+        def close_modem(reason)
+          Smartware::Logging.logger.warn "#{reason}"
+
+          @error = reason
+
+          begin
+            @mux.close
+          rescue
+          end
+
+          begin
+            @chatter.unsubscribe "CUSD", self
+          rescue
+          end
+
+          @info_requested = false
+          @mux = nil
+          @chatter = nil
+          @status_channel = nil
+          @ppp_state = :stopped
+          unless @ppp_pid.nil?
+            Smartware::ProcessManager.untrack @ppp_pid
+            @ppp_pid = nil # PPP will die by itself, because we closed the mux.
+          end
+          @state = :closed
+        end
+      end
     end
   end
 end

data/lib/smartware/interfaces/cash_acceptor.rb

@@ -70,6 +70,10 @@ module Smartware
         @status[:model]
       end
 
+      def self.version
+        @status[:version]
+      end
+
       def self.cashsum
         @banknotes.inject(0){ |result, (key, value)| result + key.to_i*value.to_i }
       end
@@ -120,6 +124,7 @@ module Smartware
                 when 'monitor'
                   @status[:error] = @device.error || ''
                   @status[:model] = @device.model
+                  @status[:version] = @device.version
                   @status[:cassette] = @device.cassette?
                   @commands.shift
                 else

data/lib/smartware/interfaces/modem.rb

@@ -1,19 +1,20 @@
 require 'drb'
-require 'smartware/drivers/modem/standard'
 require 'smartware/drivers/modem/dummy'
+require 'smartware/drivers/modem/standard'
 
 module Smartware
   module Interface
 
     module Modem
-
       @configured = false
       @status = {}
 
-      def self.configure!(port=nil, driver=nil)
+      def self.configure!
+        Smartware::Logging.logger.debug "Creating modem"
         @device = Smartware::Driver::Modem.const_get(
             Smartware::Service.config['modem_driver']).new(
-            Smartware::Service.config['modem_port'])
+            Smartware::Service.config['modem_config'])
+        Smartware::Logging.logger.debug "Starting modem"
         @session.kill if @session
         @session = self.poll_status!
         @configured = true
@@ -37,6 +38,10 @@ module Smartware
         @status[:model]
       end
 
+      def self.version
+        @status[:version]
+      end
+
       def self.balance
         @status[:balance]
       end
@@ -48,16 +53,19 @@ module Smartware
       private
         def self.poll_status!
           t = Thread.new do
-            loop do
-              @status[:signal_level] = @device.signal_level
-              sleep 1
-              @status[:model] = @device.model
-              sleep 1
-              @status[:error] = @device.error || ''
-              sleep 3
-              balance = @device.ussd("*100#")
-              @status[:balance] = balance if balance
-              sleep 10
+            begin
+              loop do
+                @device.tick
+
+                @status[:signal_level] = @device.signal_level
+                @status[:model] = @device.model
+                @status[:version] = @device.version
+                @status[:error] = @device.error || ''
+                @status[:balance] = @device.balance
+              end
+            rescue => e
+              Smartware::Logging.logger.error e.message
+              Smartware::Logging.logger.error e.backtrace.join("\n")
             end
           end
         end

data/lib/smartware/interfaces/printer.rb

@@ -35,6 +35,10 @@ module Smartware
         @status[:model]
       end
 
+      def self.version
+        @status[:version]
+      end
+
       def self.print(filepath)
         @queue << filepath unless filepath.nil?
       end
@@ -50,6 +54,7 @@ module Smartware
               if @queue.empty?
                 @status[:error] = @device.error || ''
                 @status[:model] = @device.model
+                @status[:version] = @device.version
               else
                 begin
                   `lpr #{@queue[0]}`

data/lib/smartware/service.rb

@@ -11,15 +11,27 @@ module Smartware
 
     def self.start(config_file)
       $stdout.sync = true
-      
+
       @config = YAML.load File.read(File.expand_path(config_file))
 
       Smartware::Logging.logger = Logger.new($stdout)
       Smartware::Logging.logger.info "Smartware started at #{Time.now}"
 
-      @threads = %w(smartware/interfaces/cash_acceptor
-                      smartware/interfaces/printer
-                      smartware/interfaces/modem).inject([]){|arr, iface| arr << Thread.new{ require iface } }
+
+      @threads = %w(smartware/interfaces/modem
+                    smartware/interfaces/cash_acceptor
+                    smartware/interfaces/printer
+                 ).inject([]) do |arr, iface|
+                        arr << Thread.new do
+                          begin
+                            require iface
+                          rescue => e
+                            Smartware::Logging.logger.fatal "During startup of #{iface}:"
+                            Smartware::Logging.logger.fatal e.message
+                            Smartware::Logging.logger.fatal e.backtrace.join("\n")
+                          end
+                        end
+                      end
 
       @threads.map(&:join)
     rescue => e
@@ -34,5 +46,43 @@ module Smartware
     end
 
   end
+
+  module ProcessManager
+    def self.track(pid, method)
+      @tracked ||= {}
+      @tracked[pid] = method
+    end
+
+    def self.untrack(pid)
+      @tracked ||= {}
+      @tracked.delete pid
+    end
+
+    def self.handle_sigchld(signal)
+      pids = []
+      @tracked ||= {}
+
+      begin
+        loop do
+          pid = Process.wait(-1, Process::WNOHANG)
+
+          break if pid == 0
+
+          pids << pid
+        end
+      rescue
+      end
+
+      pids.each do |pid|
+        tracker = @tracked[pid]
+        unless tracker.nil?
+          @tracked.delete pid
+          tracker.call pid
+        end
+      end
+    end
+  end
+
+  trap 'CHLD', ProcessManager.method(:handle_sigchld)
 end
 

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.1.23"
+  VERSION = "0.1.24"
 end

data/smartware.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'serialport'
   gem.add_dependency 'dante'
-
+  gem.add_dependency 'cmux'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serialport
@@ -44,12 +44,29 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cmux
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Smartware is the Smartkiosk hardware control daemon
 email:
 - e.sudarchikov@roundlake.ru
 - boris@roundlake.ru
 executables:
 - smartware
+- smartware-ppp-helper
 extensions: []
 extra_rdoc_files: []
 files:
@@ -59,6 +76,7 @@ files:
 - README.md
 - Rakefile
 - bin/smartware
+- bin/smartware-ppp-helper
 - lib/smartware.rb
 - lib/smartware/clients/cash_acceptor.rb
 - lib/smartware/clients/modem.rb
@@ -101,4 +119,3 @@ signing_key:
 specification_version: 3
 summary: Smartware is the Smartkiosk hardware control daemon
 test_files: []
-has_rdoc: