da_funk 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc30826554a11dfaf3bbb100d86d787684418e0c
-  data.tar.gz: 0fbdfdd49b382a5e542c6020f9cd9d05f06451eb
+  metadata.gz: 1a9b18a63ef6156f2c772c44cf926521b453cd1e
+  data.tar.gz: 55670ae7ca118b9d79b93ccfa8a1d6979b508bfa
 SHA512:
-  metadata.gz: 1a73f1e049079c3df3969534c161777701857e62db34baab0ff1aead39335617a11c0e178f17e611337daf225eeeb588b476756cf5c13eea1a07a64cc68c431a
-  data.tar.gz: 9259b39ec57cb2e4a41f87e16a5a1e38fae4d3849cfa886eb69380df4e2bea21c999386b324685fba0e15502ea8a58caec7c426e93f6e27e0fb21e2c50464462
+  metadata.gz: '091b2c8dde539fd1cb97fd003e5f1e1cf95e63df0c11b90d514379b035e2d23140c49b5aac03a293af865daf30fce329bf57b3325e6448722d4ff2f0555fe246'
+  data.tar.gz: fa45b38e6cd37cfd121d021863237f16b52baa24c7c8d9735a4459c0931be63cd9da9ef7b3f0a401da367a373360d82039ef45a71e93fed6d4bc5e13e5c19af0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (2.6.0)
+    da_funk (2.7.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -28,7 +28,7 @@ GEM
     parallel (1.13.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
-    posxml_parser (2.13.1)
+    posxml_parser (2.14.0)
       funky-emv (~> 0.3)
     powerpack (0.1.2)
     rainbow (3.0.0)

data/RELEASE_NOTES.md

@@ -1,5 +1,13 @@
 # DaFunk
 
+### 2.7.0 - 2019-02-16
+
+- Execute ThreadScheduler::keep_alive every engine check
+- Refresh every file on every FileDb set method if key is boot, this is a temporary fix to avoid edit problem between threads;
+- Add Device::Setting attributes, payment_channel_attempts - To count channels in a day; payment_channel_date - Connection day;
+- Implement Device::Setting::payment_channel_set_attempts, it’s a simple helper to set both payment_channel_date and payment_channel_attempts;
+- Implement channel connection limit configuration.
+
 ### 2.6.0 - 2019-02-14
 
 - Support to Device::Runtime::reload on Engine stop.

data/lib/da_funk/engine.rb

@@ -2,6 +2,7 @@ module DaFunk
   class Engine
     def self.check
       DaFunk::EventListener.check
+      ThreadScheduler.keep_alive
     end
 
     def self.app_loop(&block)

data/lib/da_funk/payment_channel.rb

@@ -52,19 +52,41 @@ module DaFunk
       end
     end
 
+    def self.payment_channel_limit?
+      DaFunk::ParamsDat.exists? && DaFunk::ParamsDat.file["payment_channel_check_limit"] != "0"
+    end
+
+    def self.payment_channel_limit
+      if DaFunk::ParamsDat.exists?
+        DaFunk::ParamsDat.file["payment_channel_limit"].to_i
+      else
+        0
+      end
+    end
+
+    def self.channel_limit_exceed?
+      if payment_channel_limit?
+        payment_channel_limit <= Device::Setting.payment_channel_attempts.to_i
+      else
+        false
+      end
+    end
+
     def self.check(display_message = true)
-      if self.dead?
-        PaymentChannel.connect(display_message)
-        if @client
-          self.print_info(I18n.t(:attach_waiting), display_message)
-          if message = @client.check || @client.handshake?
-            self.print_info(I18n.t(:attach_connected), display_message)
-            message
+      if self.dead? 
+        unless self.channel_limit_exceed?
+          PaymentChannel.connect(display_message)
+          if @client
+            self.print_info(I18n.t(:attach_waiting), display_message)
+            if message = @client.check || @client.handshake?
+              self.print_info(I18n.t(:attach_connected), display_message)
+              message
+            else
+              self.error
+            end
           else
             self.error
           end
-        else
-          self.error
         end
       else
         if @client
@@ -91,11 +113,27 @@ module DaFunk
       print_last(message) if display
     end
 
-    def self.create
-      if @client == Context::CommunicationChannel
-        @client = Context::CommunicationChannel
+    def self.payment_channel_increment_attempts
+      number = Device::Setting.payment_channel_attempts.to_i
+      date   = Device::Setting.payment_channel_date
+      if date.to_s.empty?
+        Device::Setting.payment_channel_set_attempts(Time.now)
       else
+        year, mon, day = date.split("-")
+        if day.to_i == Time.now.day
+          Device::Setting.payment_channel_set_attempts(nil, number + 1)
+        else
+          Device::Setting.payment_channel_set_attempts(Time.now)
+        end
+      end
+    end
+
+    def self.create
+      if @client != Context::CommunicationChannel
+        payment_channel_increment_attempts
         @client = PaymentChannel.new
+      else
+        @client.connect
       end
     end
 

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="2.6.0"
+  VERSION="2.7.0"
 end
 

data/lib/device/setting.rb

@@ -18,7 +18,7 @@ class Device
       "sim_pin"                     => "", #GPRS
       "sim_slot"                    => "0", #GPRS
       "sim_dual"                    => "0", #GPRS
-      "wifi_password"                    => "", #WIFI
+      "wifi_password"               => "", #WIFI
       "authentication"              => "", #WIFI
       "essid"                       => "", #WIFI
       "bssid"                       => "", #WIFI
@@ -54,7 +54,9 @@ class Device
       "heartbeat"                   => "", #SYS
       "boot"                        => "1", #SYS
       "company_name"                => "", #SYS
-      "metadata_timestamp"          => ""
+      "metadata_timestamp"          => "",
+      "payment_channel_attempts"    => "0",
+      "payment_channel_date"        => ""
     }
 
     class << self
@@ -120,6 +122,21 @@ class Device
       end
     end
 
+    # helper
+    def self.payment_channel_set_attempts(time = nil, attempts = nil)
+      if time
+        str = "%d-%02d-%02d"
+        update_attributes({
+          "payment_channel_date"     => (str % [time.year, time.mon, time.day]),
+          "payment_channel_attempts" => (attempts || 1)
+        })
+      else
+        update_attributes({
+          "payment_channel_attempts" => (attempts || 1)
+        })
+      end
+    end
+
     # Custom Attributes
     def self.tcp_recv_timeout
       DaFunk::ParamsDat.file["tcp_recv_timeout"] || method_missing(:tcp_recv_timeout)

data/lib/file_db.rb

@@ -41,6 +41,9 @@ class FileDb
 
   def []=(key, value)
     value = value.to_s
+    # reload if boot is key to avoid initial change problem between threads
+    # TODO: Refactoring config.dat handling between threads
+    open if key == "boot"
     old = @hash[key.to_s]
     ret = @hash[key.to_s] = value
     save if old != value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake