smartware 0.4.4 → 0.4.5

data/config/smartware.yml.sample

@@ -14,4 +14,7 @@ interfaces:
   - name: Printer
     uri: druby://localhost:6005
     driver: Dummy
+  - name: UserInterface
+    uri: druby://localhost:6007
+    driver: Dummy
 connection_timeout: 60

data/lib/smartware.rb

@@ -23,6 +23,7 @@ require 'smartware/interfaces/printer'
 require 'smartware/interfaces/watchdog'
 require 'smartware/interfaces/card_reader'
 require 'smartware/interfaces/pin_pad'
+require 'smartware/interfaces/user_interface'
 require 'smartware/connection_monitor'
 require 'smartware/pub_sub_server'
 require 'smartware/pub_sub_client'
@@ -57,6 +58,10 @@ module Smartware
     Smartware::Client.instance('druby://localhost:6006')
   end
 
+  def self.user_interface
+      Smartware::Client.instance('druby://localhost:6007')
+  end
+
   def self.subscribe(&block)
     Smartware::PubSubClient.destroy_static_client
     client = Smartware::PubSubClient.create_static_client

data/lib/smartware/drivers/pin_pad/zt588.rb

@@ -170,11 +170,13 @@ module Smartware
           @user_data = info[:user_info]
         end
 
+=begin unsafe - enable at your own risk
         def wipe
           control MISC, WIPE
           sleep 3
           initialize_device true
         end
+=end
 
         def restart
           control MISC, RESET
@@ -382,7 +384,7 @@ module Smartware
           if !reload
             if info[:settings][:blank]
               Logging.logger.warn "ZT588: IMK not loaded, pinpad unoperational"
-
+=begin unsafe - enable at your own risk
               imk, tmk = @imk_source.call
 
               return if imk.nil?
@@ -402,14 +404,24 @@ module Smartware
               @post_configuration.call
 
               restart
+=end
             else
-              random    = auth AUTH_GET_CHALLENGE, "0000000000000000"
-              challenge = auth KEY_TMK, random
-              response  = calculate_response challenge, UID
-              check     = calculate_response response, UID
-              verify    = auth AUTH_WITH_TMK, response
-              raise ZT588Error, "verification failed" if check != verify
-              Logging.logger.debug "ZT588: authenticated"
+              [0x10, 0x20, 0x30].each do |key|
+                p key
+                begin
+                  random    = auth AUTH_GET_CHALLENGE, "0000000000000000"
+                  challenge = auth key, random
+                  response  = calculate_response challenge, UID
+                  check     = calculate_response response, UID
+                  verify    = auth AUTH_WITH_TMK, response
+                  raise ZT588Error, "verification failed" if check != verify
+                  Logging.logger.debug "ZT588: authenticated"
+
+                  break
+                rescue => e
+                  p e
+                end
+              end
 
               @device_ready.call
             end

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

@@ -0,0 +1,28 @@
+require "base64"
+
+module Smartware
+  module Driver
+    module UserInterface
+      class Dummy
+
+        SCREENSHOT = Base64.decode64("R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")
+
+        def initialize(config)
+
+        end
+
+        def delete_calibration
+
+        end
+
+        def restart_ui
+
+        end
+
+        def screenshot
+          SCREENSHOT
+        end
+      end
+    end
+  end
+end

data/lib/smartware/drivers/user_interface/x11.rb

@@ -0,0 +1,94 @@
+require "chunky_png"
+require "oily_png"
+
+module Smartware
+  module Driver
+    module UserInterface
+      class X11
+        def initialize(config)
+          @user = config["user"]
+          @display = config["display"]
+        end
+
+        def delete_calibration
+          File.delete "/home/#{@user}/.calibration_data" rescue nil
+          File.delete "/home/#{@user}/.monitors" rescue nil
+        end
+
+        def restart_ui
+          system "pkill", "-U", @user, "xinit"
+        end
+
+        def screenshot
+          mine_pipe, xwd_pipe = IO.pipe
+          png = nil
+
+          begin
+            pid = Process.spawn({
+              "DISPLAY"    => @display,
+              "XAUTHORITY" => "/home/#{@user}/.Xauthority"
+            }, "xwd", "-root", in: :close, out: xwd_pipe)
+
+            xwd_pipe.close
+            xwd_pipe = nil
+
+
+            header_size, file_version,
+            pixmap_format, pixmap_depth, pixmap_width, pixmap_height,
+            xoffset, byteorder, bitmap_unit, bitmap_bit_order, bitmap_pad,
+            bits_per_pixel, bytes_per_line, visual_class,
+            red_mask, green_mask, blue_mask, bits_per_rgb,
+            number_of_colors, color_map_entires,
+            window_width, window_height, window_x, window_y, window_border_width =
+              mine_pipe.read(4 * 25).unpack("N*")
+
+            raise "Only direct color images are supported" if (visual_class != 5 && visual_class != 4)
+
+            mine_pipe.read((header_size + number_of_colors * 12) - 4 * 25)
+
+            initial = Array.new pixmap_width, pixmap_height
+
+            case bits_per_pixel
+            when 24
+              0.upto(pixmap_height - 1) do |y|
+                line = mine_pipe.read(bytes_per_line)
+                                .slice(0, bits_per_pixel / 8 * pixmap_width)
+
+                0.upto(pixmap_width - 1) do |x|
+                  initial[y * pixmap_width + x] =
+                      (line.getbyte(x * 3 + 2) << 24) |
+                      (line.getbyte(x * 3 + 1) << 16) |
+                      (line.getbyte(x * 3 + 0) << 8) |
+                      0xFF
+                end
+              end
+
+            when 32
+              0.upto(pixmap_height - 1) do |y|
+                line = mine_pipe.read(bytes_per_line)
+                                .slice(0, bits_per_pixel / 8 * pixmap_width)
+
+                0.upto(pixmap_width - 1) do |x|
+                  pix, = line.slice(x * 4, 4).unpack("V")
+                  initial[y * pixmap_width + x] = ((pix & 0xFFFFFF) << 8) | 0xFF
+                end
+              end
+
+            else
+              raise "Unsupported bpp: #{bits_per_pixel}"
+            end
+
+            png = ChunkyPNG::Image.new pixmap_width, pixmap_height, initial
+
+            png.to_datastream.to_blob
+          rescue => e
+            "!error: #{e}"
+          ensure
+            mine_pipe.close
+            xwd_pipe.close unless xwd_pipe.nil?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/smartware/interfaces/user_interface.rb

@@ -0,0 +1,46 @@
+module Smartware
+  module Interface
+    class UserInterface < Interface
+
+      def initialize(config, service)
+        super
+
+        update_status :error, nil
+        update_status :model, ''
+        update_status :version, ''
+        update_status :screenshot_pending, false
+
+        @screenshot_data = nil
+      end
+
+      def delete_calibration
+        Logging.logger.info "Deleting calibration data"
+        @device.delete_calibration
+      end
+
+      def restart_ui
+        Logging.logger.info "Restarting user interface"
+        @device.restart_ui
+      end
+
+      def request_screenshot
+        Logging.logger.info "Requested screenshot"
+
+        EventMachine.defer @device.method(:screenshot), ->(data) do
+          @screenshot_data = data
+          update_status :screenshot_pending, true
+        end
+
+        nil
+      end
+
+      def retrieve_screenshot
+        data = @screenshot_data
+        @screenshot_data = nil
+        update_status :screenshot_pending, false
+
+        data
+      end
+    end
+  end
+end

data/lib/smartware/version.rb

@@ -1,3 +1,3 @@
 module Smartware
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/smartware.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'redcarpet'
   gem.add_dependency 'digest-crc'
   gem.add_dependency 'eventmachine'
+  gem.add_dependency 'chunky_png'
+  gem.add_dependency 'oily_png'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartware
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
@@ -141,6 +141,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chunky_png
+  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'
+- !ruby/object:Gem::Dependency
+  name: oily_png
+  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
@@ -180,6 +212,8 @@ files:
 - lib/smartware/drivers/pin_pad/zt588.rb
 - lib/smartware/drivers/printer/dummy.rb
 - lib/smartware/drivers/printer/esc_pos.rb
+- lib/smartware/drivers/user_interface/dummy.rb
+- lib/smartware/drivers/user_interface/x11.rb
 - lib/smartware/drivers/watchdog/dummy.rb
 - lib/smartware/drivers/watchdog/watchdog_daemon.rb
 - lib/smartware/interfaces/card_reader.rb
@@ -188,6 +222,7 @@ files:
 - lib/smartware/interfaces/modem.rb
 - lib/smartware/interfaces/pin_pad.rb
 - lib/smartware/interfaces/printer.rb
+- lib/smartware/interfaces/user_interface.rb
 - lib/smartware/interfaces/watchdog.rb
 - lib/smartware/logging.rb
 - lib/smartware/process_manager.rb