da_funk 3.28.0 → 3.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 489f56230d69c2a02818b0e7ca0b33e9a5c425281c79def3a8c5c2361f213c95
-  data.tar.gz: e135956873a9b50834d1672409fa9a3366647348b1da50859285a5c2289eff6a
+  metadata.gz: 58cb59f7b97099d4e94b66bdf46f9cfc7e4f39893cf88b56b23b352476f3bb2f
+  data.tar.gz: 2c81b4d5a3226c0c5d3cc25176625183f5a3766bea7a120b134604bfb030dc16
 SHA512:
-  metadata.gz: 26fa00576ee5e90f59da9391bd13eaaf46cad4aa513d2d679f8e1de23d4190ba269c734a40b443ee954360436932f66d1a6ac691e5de72d2c58c838a50108f72
-  data.tar.gz: 1c5de9a5fd5da14b6ee2c2d92a5af01f8227ff5e17bd4129fe4d6fecebbded54a9553502a17115e75c1237f8574f147f3d0aad7653ee7b8718e85e4d95a98c02
+  metadata.gz: dcea670e59016cb7b6a6b297239130ee3a9ff372a94acc8edd4f31a623a6db842f9a43d3cf92ff8253eb77108055ad213d82f12645f572f40548968d435ec7ec
+  data.tar.gz: bde518c1731e7ae15d864f87f423d518672ea856251263092f408875c8c6d8c4acc52f023015c90edbb9cc917b15243539e37c7f7f093684837718c8accac798

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.28.0)
+    da_funk (3.30.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -18,7 +18,7 @@ GEM
     cloudwalk (1.15.0)
       bundler
       rake
-    cloudwalk_handshake (1.20.0)
+    cloudwalk_handshake (1.21.3)
       funky-simplehttp (~> 0.6)
     funky-emv (1.4.1)
       funky-tlv (~> 0.2)
@@ -27,25 +27,25 @@ GEM
     funky-tlv (0.2.3)
     io-like (0.3.1)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     posxml_parser (2.26.0)
       funky-emv (~> 1)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.2)
     rexml (3.2.4)
-    rubocop (0.90.0)
+    rubocop (1.1.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.0.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.4.0)
-      parser (>= 2.7.1.4)
+    rubocop-ast (1.1.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     unicode-display_width (1.7.0)
     yard (0.9.25)

data/RELEASE_NOTES.md

@@ -1,5 +1,32 @@
 # DaFunk
 
+### 3.30.0 - 2020-11-16
+
+- Replace GPRS icon to 3G;
+- Added new method main_image_format on Device::Display;
+- Use main_image_format method to get the image name instead adapter;
+- Added new class DaFunk::Transaction::Reversal.
+
+### 3.29.1 - 2020-11-04
+
+- Fix battery charging status. When power supply is connected the SDK always returns 50% of battery, in this case it won't show the percentage until the SDK returns 100%.
+
+### 3.29.0 - 2020-11-03
+
+- Added support to Ruby SecureRandom;
+- Update cloudwalk_handshake (1.21.3).
+
+### 3.28.2 - 2020-10-07
+
+- Added support of params.dat file restore if it was corrupted;
+- Wait 3 seconds before restart after main update;
+- Fixed method_missing exception;
+
+### 3.28.1 - 2020-09-26
+
+- Close socket in case of ssl exceptions;
+- Do not assign nil to PaymentChannel#current and client on error because this is already being done on PaymentChannel#close.
+
 ### 3.28.0 - 2020-09-25
 
 - Check if system update file is present after device restart in order to continue with system update process;

data/Rakefile

@@ -53,9 +53,11 @@ FILES = FileList[
   "lib/da_funk/application.rb",
   "lib/da_funk/transaction/iso.rb",
   "lib/da_funk/transaction/download.rb",
+  "lib/da_funk/transaction/reversal.rb",
   "lib/da_funk/notification_event.rb",
   "lib/da_funk/notification_callback.rb",
   "lib/da_funk/notification.rb",
+  "lib/da_funk/secure_random.rb",
 
   "lib/device.rb",
   "lib/device/audio.rb",

data/lib/da_funk/helper/status_bar.rb

@@ -123,7 +123,7 @@ module DaFunk
             self.signal = sig
 
             if Device::Network.gprs?
-              Device::Display.print_status_bar(SLOT_MEDIA, "./shared/GPRS.png")
+              Device::Display.print_status_bar(SLOT_MEDIA, "./shared/3G.png")
               Device::Display.print_status_bar(SLOT_SIGNAL_LEVEL,
                                                get_image_path(:gprs, self.signal))
             elsif Device::Network.wifi?
@@ -146,8 +146,13 @@ module DaFunk
           self.battery = bat
           self.power   = dock
 
-          Device::Display.print_status_bar(SLOT_BATTERY_PERCENTUAL,
-                                           get_image_path(:battery_percentual, self.battery))
+          if self.power && self.battery == 50
+            Device::Display.print_status_bar(SLOT_BATTERY_PERCENTUAL, nil)
+          else
+            percentual = get_image_path(:battery_percentual, self.battery)
+            Device::Display.print_status_bar(SLOT_BATTERY_PERCENTUAL, percentual)
+          end
+
           if self.power
             Device::Display.print_status_bar(
               SLOT_BATTERY_LEVEL, get_image_path(:battery_charge, self.battery))

data/lib/da_funk/params_dat.rb

@@ -5,7 +5,7 @@ module DaFunk
     include DaFunk::Helper
 
     class << self
-      attr_accessor :file, :apps, :valid, :files
+      attr_accessor :file, :apps, :valid, :files, :checksum
     end
 
     self.apps = Array.new
@@ -20,9 +20,19 @@ module DaFunk
     end
 
     def self.setup
+      @checksum = calculate_checksum
       @file = FileDb.new(FILE_NAME)
     end
 
+    def self.calculate_checksum
+      Device::Crypto.crc16_hex(File.read(FILE_NAME)) if exists?
+    end
+
+    def self.corrupted?
+      return true unless exists?
+      @checksum != calculate_checksum
+    end
+
     def self.exists?
       File.exists?(FILE_NAME)
     end
@@ -153,6 +163,7 @@ module DaFunk
       Device::Display.clear
       if File.exists?('./shared/init_reboot.bmp')
         Device::Display.print_bitmap('./shared/init_reboot.bmp')
+        getc(3000)
       else
         I18n.pt(:admin_main_update_message)
         3.times do |i|

data/lib/da_funk/payment_channel.rb

@@ -231,8 +231,7 @@ module DaFunk
       if Context.development?
         ContextLog.exception(exception, exception.backtrace, "PaymentChannel error")
       end
-      PaymentChannel.current = nil
-      @client = nil
+      self.close
     end
 
     def handshake

data/lib/da_funk/secure_random.rb

@@ -0,0 +1,17 @@
+module DaFunk
+  class SecureRandom
+    CHARS = [('a'..'z'), ('A'..'Z')].map(&:to_a).flatten
+
+    def self.random_bytes(n = nil)
+      n = n ? n.to_int : 16
+      (0...n).map { CHARS[rand(CHARS.length)] }.join
+    end
+
+    def self.uuid
+      bytes = random_bytes.unpack('NnnnnN')
+      bytes[2] = (bytes[2] & 0x0fff) | 0x4000
+      bytes[3] = (bytes[3] & 0x3fff) | 0x8000
+      "%08x-%04x-%04x-%04x-%04x%08x" % bytes
+    end
+  end
+end

data/lib/da_funk/transaction/reversal.rb

@@ -0,0 +1,13 @@
+module DaFunk
+  class Transaction
+    class Reversal
+      def self.filename
+        DaFunk::ParamsDat.file['reversal_file_name'] || 'cw_reversal_transact.dat'
+      end
+
+      def self.exists?
+        File.exists? "./shared/#{filename}"
+      end
+    end
+  end
+end

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.28.0"
+  VERSION="3.30.0"
 end
 

data/lib/device/display.rb

@@ -71,13 +71,22 @@ class Device
     end
 
     def self.main_image
-      if adapter.respond_to?(:main_image) &&
-        File.exists?("./shared/#{adapter.main_image}")
-        adapter.main_image
+      file = main_image_format
+      if File.exists?("./shared/#{file}")
+        file
       else
         MAIN_BMP
       end
     end
+
+    private
+    def self.main_image_format
+      if DaFunk::Transaction::Reversal.exists?
+        "main_#{Device::System.model}_reversal.bmp"
+      else
+        "main_#{Device::System.model}.bmp"
+      end
+    end
   end
 end
 

data/lib/device/setting.rb

@@ -152,16 +152,16 @@ class Device
 
     # Custom Attributes
     def self.tcp_recv_timeout
-      DaFunk::ParamsDat.file["tcp_recv_timeout"] || method_missing(:tcp_recv_timeout)
+      DaFunk::ParamsDat.file["tcp_recv_timeout"] || @file&.dig("tcp_recv_timeout")
     end
 
     def self.attach_gprs_timeout
-      value = (DaFunk::ParamsDat.file["attach_gprs_timeout"] || method_missing(:attach_gprs_timeout))
+      value = (DaFunk::ParamsDat.file["attach_gprs_timeout"] || @file&.dig("attach_gprs_timeout"))
       value.to_s.empty? ? nil : value.to_s.to_i
     end
 
     def self.heartbeat
-      DaFunk::ParamsDat.file["heartbeat"] || method_missing(:heartbeat)
+      DaFunk::ParamsDat.file["heartbeat"] || @file&.dig("heartbeat")
     end
 
     def self.logical_number

data/test/unit/da_funk/secure_random.rb

@@ -0,0 +1,18 @@
+class SecureRandomTest < DaFunk::Test.case
+  def setup
+    @uuid = DaFunk::SecureRandom.uuid
+    @random_bytes = DaFunk::SecureRandom.random_bytes
+  end
+
+  def test_uuid
+    assert_equal(36, @uuid.size)
+
+    # Check time_hi_and_version and clock_seq_hi_res bits (RFC 4122 4.4)
+    assert_equal('4', @uuid[14])
+    assert_include(%w'8 9 a b', @uuid[19])
+  end
+
+  def test_random_bytes
+    assert_equal(16, @random_bytes.size)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.28.0
+  version: 3.30.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -174,10 +174,12 @@ files:
 - lib/da_funk/rake_task.rb
 - lib/da_funk/screen.rb
 - lib/da_funk/screen_flow.rb
+- lib/da_funk/secure_random.rb
 - lib/da_funk/struct.rb
 - lib/da_funk/test.rb
 - lib/da_funk/transaction/download.rb
 - lib/da_funk/transaction/iso.rb
+- lib/da_funk/transaction/reversal.rb
 - lib/da_funk/version.rb
 - lib/device.rb
 - lib/device/audio.rb
@@ -220,6 +222,7 @@ files:
 - test/resources/shared/bitmap_gp.dat
 - test/test_helper.rb
 - test/unit/da_funk/event_listener_test.rb
+- test/unit/da_funk/secure_random.rb
 - test/unit/da_funk/struct_test.rb
 - test/unit/da_funk/support_test.rb
 - test/unit/device/application_test.rb
@@ -269,6 +272,7 @@ test_files:
 - test/resources/shared/bitmap_gp.dat
 - test/test_helper.rb
 - test/unit/da_funk/event_listener_test.rb
+- test/unit/da_funk/secure_random.rb
 - test/unit/da_funk/struct_test.rb
 - test/unit/da_funk/support_test.rb
 - test/unit/device/application_test.rb