smartkiosk-client 0.0.10 → 0.0.16

data/.gitignore

@@ -1,4 +1,5 @@
 pkg/
 db/*.sqlite3
 Gemfile.lock
-tmp/*
+tmp/pids
+tmp/cache

data/Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'pry'
+gem 'pry'

data/app/controllers/payments.rb

@@ -1,30 +1,48 @@
 class Application
   post '/payments' do
     payment = Payment.create! params[:payment]
+
     json (payment.check ? payment.as_json : false)
   end
 
-  post '/payments/:id/open' do
+  post '/payments/:id/open_cash_acceptor' do
     payment = Payment.find(params[:id])
     Smartware.cash_acceptor.open(payment.limit.try('[]', :min), payment.limit.try('[]', :max))
-    json (Smartware.cash_acceptor.error.blank? ? true : false)
+
+    json Smartware.cash_acceptor.error.blank?
   end
 
-  post '/payments/:id/pay' do
-    payment = Payment.find(params[:id])
+  post '/payments/close_cash_acceptor' do
     Smartware.cash_acceptor.close
-    payment.update_attributes :banknotes => Smartware.cash_acceptor.banknotes
-    payment.receipt.print
-    payment.pay
     nil
   end
 
-  get '/payments/cash' do
-    json Smartware.cash_acceptor.sum.to_json
+  post '/payments/open_card_reader' do
+    Smartware.card_reader.open
+    nil
+  end
+
+  post '/payments/close_card_reader' do
+    Smartware.card_reader.close
+    nil
   end
 
-  get '/payments/reset' do
+  post '/payments/:id/pay' do
+    payment = Payment.find(params[:id])
     Smartware.cash_acceptor.close
+
+    if payment.payment_type == 0
+      payment.update_attributes(:banknotes => Smartware.cash_acceptor.banknotes)
+    else
+      payment.update_attributes(
+        :paid_amount => params['payment']['paid_amount'],
+        :card_track1 => params['payment']['card_track1'],
+        :card_track2 => params['payment']['card_track2']
+      )
+    end
+
+    payment.receipt.print
+    payment.pay
     nil
   end
 end

data/app/controllers/terminal.rb

@@ -4,20 +4,7 @@ Application.load 'lib/pinger'
 
 class Application
   get '/terminal' do
-    Terminal.payment_in_progress = params[:payment_in_progress] == 'true'
-
-    result = {
-      :enabled => Terminal.enabled?,
-      :started_at => Terminal.started_at.value
-    }
-
-    modified_at = Terminal.actual_modified_at.change(:usec => 0)
-
-    if params[:modified_at] && (modified_at > DateTime.parse(params[:modified_at]))
-      result[:terminal] = Terminal.as_json
-    end
-
-    json result
+    json Terminal
   end
 
   get '/terminal/condition' do
@@ -48,22 +35,22 @@ class Application
 
   post '/terminal/enable' do
     Terminal.enable
-    json(:state => Terminal.actual_state)
+    json(:state => Terminal.state)
   end
 
   post '/terminal/disable' do
     Terminal.disable
-    json(:state => Terminal.actual_state)
+    json(:state => Terminal.state)
   end
 
   post '/terminal/reload' do
     Terminal.reload
-    json(:state => Terminal.actual_state)
+    json(:state => Terminal.state)
   end
 
   post '/terminal/reboot' do
     Terminal.reboot
-    json(:state => Terminal.actual_state)
+    json(:state => Terminal.state)
   end
 
   get '/terminal/test_connection' do

data/app/models/payment.rb

@@ -13,10 +13,14 @@ class Payment < ActiveRecord::Base
   serialize :banknotes
 
   validates :provider, :presence => true
+  validates :payment_type, :presence => true
 
   before_save do
     if banknotes
       self.paid_amount = banknotes.inject(0){|sum, (nominal, count)| sum + nominal.to_i*count.to_i }
+    end
+
+    if paid_amount
       self.commission_amount = commission_for(self.paid_amount)
     end
   end
@@ -27,7 +31,7 @@ class Payment < ActiveRecord::Base
       r.update_attributes :template => self.receipt_template, 
         :keyword => 'payment',
         :fields => {
-          :recipient => provider.title,
+          :recipient => title,
           :account => account,
           :payment_paid_amount => paid_amount || 0,
           :payment_enrolled_amount => ((paid_amount || 0) - (commission_amount || 0)).round(2),
@@ -50,7 +54,7 @@ class Payment < ActiveRecord::Base
   end
 
   def title
-    provider.title
+    provider.title rescue "-"
   end
 
   def commission_for(amount)

data/app/models/terminal.rb

@@ -1,25 +1,22 @@
 require 'smartware'
+require 'smartguard'
 require 'socket'
 require 'redis'
 require 'redis/objects'
+require 'file-tail'
 
 Application.load 'lib/smartkiosk/config/yaml'
 
 class Terminal
   include Redis::Objects
 
-  value :state, :global => true
-  value :started_at, :global => true, :marshal => true
+  value :actual_state, :global => true
   value :modified_at, :global => true, :marshal => true
   value :payment_in_progress, :global => true
 
   value :support_phone, :global => true
   value :providers_updates, :global => true, :marshal => true
 
-  def self.smartguard
-    DRbObject.new_with_uri(Terminal.config.smartguard_host)
-  end
-
   #
   # STATES
   #
@@ -35,8 +32,12 @@ class Terminal
     self.payment_in_progress.value == "true"
   end
 
-  def self.actual_state
-    self.state.value || 'active'
+  def self.state
+    self.actual_state.value || 'active'
+  end
+
+  def self.state=(value)
+    self.actual_state = value
   end
 
   def self.actual_modified_at
@@ -59,14 +60,11 @@ class Terminal
   end
 
   def self.reload
-    smartguard.restart_async
+    Smartguard::Client.restart_async
   end
 
   def self.reboot
-    self.state = 'rebooting'
-    StartupWorker.perform_async self.name, :enable
-
-    smartguard.reboot_async
+    Smartguard::Client.reboot_async
   end
 
   #
@@ -81,7 +79,7 @@ class Terminal
   end
 
   def self.enabled?
-    self.actual_state == 'active'
+    self.state == 'active'
   end
 
   def self.version
@@ -101,9 +99,8 @@ class Terminal
     Socket.do_not_reverse_lookup = orig
   end
 
-  def self.as_json
+  def self.as_json(*args)
     {
-      :started_at => Terminal.started_at.value,
       :modified_at => Terminal.actual_modified_at,
       :keyword => Terminal.keyword,
       :support_phone => Terminal.support_phone.value,
@@ -113,10 +110,14 @@ class Terminal
     }
   end
 
+  def self.to_json(*args)
+    as_json.to_json
+  end
+
   def self.condition
     {
       :ip => ip,
-      :state => Terminal.actual_state,
+      :state => Terminal.state,
       :banknotes => Payment.merge_banknotes(Payment.uncollected),
       :cash => Payment.merge_cash(Payment.uncollected),
       :providers => {

data/app/workers/orders/acknowledge_worker.rb

@@ -1,7 +1,5 @@
 require 'rest-client'
 
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Orders
   class AcknowledgeWorker
     include Sidekiq::Worker

data/app/workers/orders/complete_worker.rb

@@ -1,7 +1,5 @@
 require 'rest-client'
 
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Orders
   class CompleteWorker
     include Sidekiq::Worker

data/app/workers/orders/disable_worker.rb

@@ -1,5 +1,3 @@
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Orders
   class DisableWorker
     include Sidekiq::Worker

data/app/workers/orders/durable_order_execution.rb

@@ -0,0 +1,47 @@
+module Orders
+  module DurableOrderExecution
+    def safely_execute_order(order_id, &block)
+      pid = Process.fork
+      return unless pid.nil?
+
+      Process.setsid
+
+      begin
+        Smartkiosk::Client::Logging.logger.debug "Started execution of order #{order_id}"
+        yield
+        Smartkiosk::Client::Logging.logger.debug "Completed execution of order #{order_id}"
+
+      rescue => e
+        Smartkiosk::Client::Logging.logger.debug "Execution of order #{order_id} failed: #{e}"
+
+        begin
+          AcknowledgeWorker.perform_async order_id, e.to_s
+        rescue => ne
+          Smartkiosk::Client::Logging.logger.debug "Unable to schedule AcknowlegeWorker #{ne}"
+          sleep 1
+          retry
+        end
+      end
+
+      begin
+        CompleteWorker.perform_async order_id
+      rescue => ne
+        Smartkiosk::Client::Logging.logger.debug "Unable to schedule CompleteWorker: #{ne}"
+        sleep 1
+        retry
+      end
+
+      begin
+        ActiveRecord::Base.connection.reconnect!
+
+        Order.find(order_id).update_attribute(:complete, true)
+      rescue => ne
+        Smartkiosk::Client::Logging.logger.debug "Unable to mark completion: #{ne}"
+        sleep 1
+        retry
+      end
+
+      Process.exit!
+    end
+  end
+end

data/app/workers/orders/enable_worker.rb

@@ -1,5 +1,3 @@
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Orders
   class EnableWorker
     include Sidekiq::Worker

data/app/workers/orders/reboot_worker.rb

@@ -1,18 +1,14 @@
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Orders
   class RebootWorker
     include Sidekiq::Worker
+    include DurableOrderExecution
 
     sidekiq_options :queue => :orders
 
     def perform(order_id)
-      StartupWorker.perform_async self.class.name, :finish, [order_id]
-      Terminal.reboot
-    end
-
-    def self.finish(order_id)
-      Order.find(order_id).complete
+      safely_execute_order(order_id) do
+        Smartguard::Client.reboot
+      end
     end
   end
 end

data/app/workers/orders/reload_worker.rb

@@ -1,18 +1,14 @@
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Orders
   class ReloadWorker
     include Sidekiq::Worker
+    include DurableOrderExecution
 
     sidekiq_options :queue => :orders
 
     def perform(order_id)
-      StartupWorker.perform_async self.class.name, :finish, [order_id]
-      Terminal.reload
-    end
-
-    def self.finish(order_id)
-      Order.find(order_id).complete
+      safely_execute_order(order_id) do
+        Smartguard::Client.restart
+      end
     end
   end
 end

data/app/workers/orders/upgrade_worker.rb

@@ -2,11 +2,10 @@ require 'pathname'
 require 'rubygems'
 require 'fileutils'
 
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Orders
   class UpgradeWorker
     include Sidekiq::Worker
+    include DurableOrderExecution
 
     sidekiq_options :queue => :orders
 
@@ -19,12 +18,12 @@ module Orders
       @base_url      = URI.parse(order.args[3]).scheme.nil? ? "#{Terminal.config.host}#{order.args[3]}"
                                                             : order.args[3]
 
-      @releases_pathname = Terminal.smartguard.releases_path
+      @releases_pathname = Smartguard::Client.releases_path
       @build_pathname    = @releases_pathname.join @build_version.to_s
 
       self.sync!
-      Terminal.smartguard.switch_release @build_version.to_s.to_sym do
-        order.complete
+      safely_execute_order(order_id) do
+        Smartguard::Client.switch_release @build_version.to_s.to_sym
       end
     end
 

data/app/workers/payments/check_worker.rb

@@ -1,7 +1,5 @@
 require 'rest-client'
 
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Payments
   class CheckWorker
     include Sidekiq::Worker
@@ -13,8 +11,9 @@ module Payments
       response = RestClient.post "#{Terminal.config.host}/payments",
                   :provider => payment.provider.keyword,
                   :terminal => Terminal.config.keyword,
-                  :payment  => { 
+                  :payment  => {
                     :account => payment.account,
+                    :payment_type => payment.payment_type,
                     :fields => payment.fields,
                     :session_id => payment.id
                   }
@@ -22,11 +21,11 @@ module Payments
       answer = JSON.parse(response.to_s, :symbolize_names => true)
 
       unless answer[:id].nil?
-        payment.update_attributes :foreign_id  => answer[:id],
-                                  :limit       => answer[:limits].sort_by(&:weight).last,
-                                  :commissions => (answer[:commissions].empty? ? nil : answer[:commissions]),
+        payment.update_attributes :foreign_id       => answer[:id],
+                                  :limit            => answer[:limits].sort_by(&:weight).last,
+                                  :commissions      => (answer[:commissions].empty? ? nil : answer[:commissions]),
                                   :receipt_template => answer[:receipt_template],
-                                  :checked     => true
+                                  :checked          => true
       end
     rescue => e
       Payment.find(payment_id).update_attributes :error => true

data/app/workers/payments/collect_worker.rb

@@ -1,5 +1,3 @@
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Payments
   class CollectWorker
     include Sidekiq::Worker

data/app/workers/payments/pay_worker.rb

@@ -1,7 +1,5 @@
 require 'rest-client'
 
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Payments
   class PayWorker
     include Sidekiq::Worker
@@ -13,9 +11,17 @@ module Payments
       response = RestClient.post "#{Terminal.config.host}/payments/#{payment.foreign_id}/pay",
                                  :provider => payment.provider.keyword,
                                  :terminal => Terminal.config.keyword,
-                                 :payment => { :paid_amount => payment.paid_amount }
+                                 :payment => {
+                                    :paid_amount => payment.paid_amount,
+                                    :card_track1 => payment.card_track1,
+                                    :card_track2 => payment.card_track2
+                                  }
       Sidekiq::Logging.logger.debug "Pay response: #{response.to_s}"
-      payment.update_attributes(:processed => true) if response
+      payment.update_attributes(
+        :processed => true,
+        :card_track1 => nil,
+        :card_track2 => nil
+      ) if response
     end
   end
 end

data/app/workers/ping_worker.rb

@@ -1,7 +1,5 @@
 require 'rest-client'
 
-Application.load 'lib/smartkiosk/sidekiq'
-
 class PingWorker
   include Sidekiq::Worker
 

data/app/workers/sync/icons_worker.rb

@@ -1,7 +1,5 @@
 require 'rest-client'
 
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Sync
   class IconsWorker
     include Sidekiq::Worker

data/app/workers/sync/receipt_templates_worker.rb

@@ -1,7 +1,5 @@
 require 'rest-client'
 
-Application.load 'lib/smartkiosk/sidekiq'
-
 module Sync
   class ReceiptTemplatesWorker
     include Sidekiq::Worker

data/bin/smartkiosk-client

@@ -2,6 +2,7 @@
 
 require 'bundler/setup'
 require 'eventmachine'
+require 'em-websocket'
 require 'thin'
 require 'trollop'
 
@@ -17,6 +18,9 @@ Smartkiosk::Client::Logging.destination = opts[:log] if opts[:log]
 Smartkiosk::Client::Logging.init
 
 EventMachine.run do
+  #
+  # Serving front
+  #
   Thin::Server.start '0.0.0.0', 3001 do
     map '/assets' do
       run Application.sprockets
@@ -24,4 +28,31 @@ EventMachine.run do
     use Smartkiosk::Client::Logging::Middleware
     run Application
   end
+
+  #
+  # Serving WebSockets
+  #
+  @front_orders = EM::Channel.new
+
+  EventMachine.add_periodic_timer 1 do
+    @front_orders.push ['state', Terminal.state].to_json
+  end
+
+  EventMachine.add_periodic_timer 5 do
+    @front_orders.push ['modified_at', Terminal.modified_at].to_json
+  end
+
+  Smartware.subscribe do |key, *value|
+    @front_orders.push ["smartware.#{key}", value].to_json
+  end
+
+  EventMachine::WebSocket.run(:host => '0.0.0.0', :port => 3002) do |ws|
+    ws.onopen {
+      sid = @front_orders.subscribe { |msg| ws.send msg }
+
+      ws.onclose {
+        @front_orders.unsubscribe(sid)
+      }
+    }
+  end
 end

data/config/boot.rb

@@ -9,7 +9,6 @@ require 'sprockets/helpers'
 require 'sinatra/base'
 require 'sinatra/activerecord'
 require 'sinatra/reloader'
-require 'sinatra/json'
 
 module Smartkiosk
   class Client < Sinatra::Base
@@ -25,6 +24,7 @@ module Smartkiosk
       set :sprockets,     Sprockets::Environment.new(root)
       set :database_file, root.join('config/services/database.yml')
       set :views,         [File.expand_path('../../app/views', __FILE__)]
+      set :logging, nil
 
       assets_types.map do |x|
         sprockets.append_path root.join("app/assets/#{x}")
@@ -61,32 +61,28 @@ module Smartkiosk
       data.to_json
     end
 
-    get "/assets/*" do
-      env["PATH_INFO"].sub!(%r{^/assets}, "")
-      settings.sprockets.call(env)
-    end
-
     def self.load(path)
       require File.expand_path File.join('../..', path), __FILE__
     end
 
-    def self.run!(*args)
-      load 'lib/smartkiosk/sidekiq'
-      Sidekiq.startup!
-      super
-    end
-
     def self.load_tasks!
       require "sinatra/activerecord/rake"
       Dir[File.expand_path "../../lib/tasks/*.rb", __FILE__].each {|file| require file}
     end
 
     def self.load_app!
+      load 'lib/smartkiosk/client/logging'
+      load 'lib/patches/sidekiq'
+
+      require_relative "../app/workers/orders/durable_order_execution"
+
       %w(uploaders models workers controllers).each do |dir|
         Dir[File.expand_path "../../app/#{dir}/**/*.rb", __FILE__].each {|file| require file }
       end
 
-      load 'lib/smartkiosk/client/logging'
+      CarrierWave.root = ->() { Application.public_folder }
+
+      self
     end
 
     def self.expand!(path)
@@ -102,5 +98,4 @@ module Smartkiosk
   end
 end
 
-Application = Smartkiosk::Client
-Application.load_app!
+(Application = Smartkiosk::Client).load_app!

data/db/migrate/20130106181548_create_payments.rb

@@ -18,6 +18,10 @@ class CreatePayments < ActiveRecord::Migration
       t.decimal    :paid_amount, :precision => 38, :scale => 2
       t.decimal    :commission_amount, :precision => 38, :scale => 2
 
+      t.integer    :payment_type
+      t.string     :card_track1
+      t.string     :card_track2
+
       t.timestamps
     end
 

data/lib/{smartkiosk → patches}/sidekiq.rb

@@ -10,11 +10,4 @@ module Sidekiq
       end
     end
   end
-
-  def self.startup!
-    jobs = Sidekiq::Queue.new("startup").map do |job|
-      job.delete
-      job.klass.constantize.new.perform(*job.args)
-    end
-  end
 end

data/lib/smartkiosk/client/logging.rb

@@ -1,3 +1,5 @@
+require 'smartkiosk/common'
+
 module Smartkiosk
   class Client
     module Logging extend Smartkiosk::Common::Logging
@@ -10,6 +12,8 @@ module Smartkiosk
 
         def call(env)
           began_at = Time.now
+
+          env['rack.logger'] = Smartkiosk::Client::Logging.logger
           status, header, body = @app.call(env)
           header = Rack::Utils::HeaderHash.new(header)
           log(env, status, header, began_at)

data/lib/smartkiosk/client/version.rb

@@ -2,6 +2,6 @@ require 'sinatra/base'
 
 module Smartkiosk
   class Client < Sinatra::Base
-    VERSION = '0.0.10'
+    VERSION = '0.0.16'
   end
-end
+end