da_funk 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b571fe70c3329983a13c4c57ecfb60f86b58b6a8
-  data.tar.gz: 3af0eeeca8b9704bf4efc48637cc38b171e4f794
+  metadata.gz: 7aefd3af4727577071949e1efd5aa5bcff0d6f38
+  data.tar.gz: 0141f8d60bf76607aff1da184eb0c87c15acdd8c
 SHA512:
-  metadata.gz: 4b255d96110b17debd059af8e0aab5fc8051d6577dcb1a864952f7080abb95a766d974b3e51ca6a11f83150030ce863846b6a48557add1f4d4b32d805030fdab
-  data.tar.gz: 0e7c4fc01632c72d4e5bfc028d5148edebe569ebf0644698a59d500cd18931fcd3f6285e160985f932c085842249908cbc9f96bb0d5eb48f1d3fca0d91fee6b3
+  metadata.gz: dccb52cb1b3a1205c7098458e376582bc46e460bdf42a43a4251be7010629265670958e638f4efa27b84d7f878fd659fd77c58124a552a2e44279d5da6e23dc9
+  data.tar.gz: 54f517cd5d93ac182153ae85c88aee12db40394cbebfd95ecbe1e527de3dec11e23d4744efe1bf6c5d403e5c79e2cc71f244ec45d114bf0d0418287f9839476b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (1.6.0)
+    da_funk (1.7.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -14,8 +14,8 @@ GEM
   specs:
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
-    ast (2.3.0)
-    cloudwalk (1.4.3)
+    ast (2.4.0)
+    cloudwalk (1.5.0)
       bundler
       rake
     cloudwalk_handshake (0.12.0)

data/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # DaFunk
 
+### 1.7.0 - 2018-02-09
+
+- Adopt “w” for FileDb and Transaction::Download write operation and improve IO time.
+- Implement ConnectionManagement class based on ParamsDat config.
+- Implement PaymentChannel via websocket.
+
 ### 1.6.0 - 2018-02-01
 
 - Implement Notification#reply.

data/lib/da_funk/connection_management.rb

@@ -0,0 +1,115 @@
+module DaFunk
+  class ConnectionManagement
+    class << self
+      attr_accessor :drops, :primary_timeout
+    end
+    self.drops = 0
+    DEFAULT_DROP_LIMIT = 2
+
+    def self.fallback?
+      if ! Device::Network.connected? && self.fallback_valid? && self.conn_automatic_management? &&
+          Device::Setting.media_primary == Device::Setting.media
+        self.drops += 1
+        if self.drops >= self.conn_fallback_drops_limit
+          return true
+        end
+      end
+      false
+    end
+
+    def self.conn_automatic_management?
+      DaFunk::ParamsDat.exists? && DaFunk::ParamsDat.file["connection_management"] != "0"
+    end
+
+    def self.conn_fallback_drops_limit
+      value = DaFunk::ParamsDat.file["conn_fallback_drops_limit"]
+      if value && ! value.empty?
+        value.to_i
+      else
+        DEFAULT_DROP_LIMIT
+      end
+    end
+
+    def self.conn_fallback_config
+      value = DaFunk::ParamsDat.file["conn_fallback_config"]
+      if value && !value.empty?
+        value
+      end
+    end
+
+    def self.conn_fallback_timer
+      value = DaFunk::ParamsDat.file["conn_fallback_timer"]
+      if value && ! value.empty?
+        return value.to_i
+      end
+      0
+    end
+
+    class << self
+      alias :config :conn_fallback_config
+    end
+
+    def self.primary_try?
+      if ! Device::Setting.media_primary.to_s.empty? && Device::Setting.media_primary != Device::Setting.media
+        if self.primary_timeout.nil?
+          self.schedule_primary_timeout
+        else
+          if Time.now > self.primary_timeout
+            self.schedule_primary_timeout
+            return true
+          end
+        end
+      end
+      false
+    end
+
+    def self.fallback_valid?
+      self.conn_fallback_config && self.conn_fallback_timer &&
+        (self.config.include?("WIFI") || self.config.include?("GPRS"))
+    end
+
+    def self.recover_fallback
+      if self.fallback_valid?
+        self.schedule_primary_timeout
+        media, parameters = self.conn_fallback_config.to_s.split("|", 2)
+
+        if media ==  "WIFI"
+          # WIFI|uclwifinetwork|uclwifisecurity|uclwifichannel|uclwifikey
+          essid, authentication, channel, password = parameters.split("|")
+          configuration = {
+            :network_configured => "1",
+            :authentication     => authentication,
+            :essid              => essid,
+            :wifi_password      => password,
+            :channel            => channel,
+            :cipher             => Device::Network::PARE_CIPHERS_TKIP,
+            :mode               => Device::Network::MODE_STATION,
+            :media              => Device::Network::MEDIA_WIFI
+          }
+          # elsif TODO # ETHERNET|DHCP
+        else
+          # GPRS|APN|USER|PASSWORD
+          apn, user, password = parameters.split("|")
+          configuration = {
+            :network_configured => "1",
+            :apn                => apn,
+            :user               => user,
+            :apn_password       => password,
+            :media              => Device::Network::MEDIA_GPRS
+          }
+        end
+        Device::Setting.update_attributes(configuration)
+      end
+    end
+
+    def self.recover_primary
+      Device::Setting.update_attributes({media: Device::Setting.media_primary})
+    end
+
+    private
+    def self.schedule_primary_timeout
+      self.primary_timeout = (Time.now + self.conn_fallback_timer)
+    end
+  end
+end
+

data/lib/da_funk/payment_channel.rb

@@ -0,0 +1,164 @@
+module DaFunk
+  class PaymentChannel
+    DEFAULT_HEARBEAT = "180"
+
+    class << self
+      attr_accessor :client
+    end
+
+    attr_accessor :handshake_response, :client, :host, :port
+
+    def self.ready?
+      Device::Network.connected? && self.configured?
+    end
+
+    def self.configured?
+      DaFunk::ParamsDat.file["access_token"] &&
+        DaFunk::ParamsDat.file["payment_channel_enabled"] == "1" &&
+        Device::Setting.logical_number
+    end
+
+    def self.handshake_message
+      {
+        "token"     => DaFunk::ParamsDat.file["access_token"],
+        "id"        => Device::Setting.logical_number.to_s,
+        "heartbeat" => Device::Setting.heartbeat || DEFAULT_HEARBEAT
+      }.to_json
+    end
+
+    def self.handshake_success_message
+      {"token" => DaFunk::ParamsDat.file["access_token"]}.to_json
+    end
+
+    def self.connect(display_message = true)
+      if self.dead? && self.ready?
+        self.print_info(I18n.t(:attach_attaching), display_message)
+        @client = PaymentChannel.new
+        self.print_info(I18n.t(:attach_authenticate), display_message)
+        @client.handshake
+      else
+        @client = nil
+      end
+      @client
+    end
+
+    def self.error
+      if self.configured?
+        if ConnectionManagement.fallback?
+          :fallback_communication
+        elsif ConnectionManagement.conn_automatic_management?
+          :attach_registration_fail
+        end
+      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
+          else
+            self.error
+          end
+        else
+          self.error
+        end
+      else
+        if @client
+          @client.check
+        end
+      end
+    end
+
+    def self.dead?
+      ! self.alive?
+    end
+
+    def self.alive?
+      a = Device::Network.connected?
+      a = Device::Network.connected?
+      b = @client if @client
+      c = @client.connected? if @client
+      ContextLog.info "a[#{a}] b[#{b}] c[#{c}]"
+      a && b && c
+    end
+
+    def self.close!
+      @client && @client.close && @client = nil
+    end
+
+    def self.print_info(message, display = true)
+      print_last(message) if display
+    end
+
+    def initialize(client = nil)
+      @host   = Device::Setting.host
+      @port   = (Device::Setting.apn == "gprsnac.com.br") ? 32304 : 443
+      @client = client || CwWebSocket::Client.new(@host, @port)
+    rescue SocketError, PolarSSL::SSL::Error => e
+      self.error(e)
+    end
+
+    def write(value)
+      @client.write(value)
+    end
+
+    def read
+      begin
+        @client.read
+      rescue SocketError, PolarSSL::SSL::Error => e
+        self.error(e)
+      end
+    end
+
+    def close
+      @client.close if @client
+      @client = nil
+      PaymentChannel.client = nil
+    end
+
+    def connected?
+      self.client && self.client.connected?
+    end
+
+    def handshake?
+      if self.connected? && ! @handshake_response
+        timeout = Time.now + Device::Setting.tcp_recv_timeout.to_i
+        loop do
+          break if @handshake_response = self.client.read
+          break if Time.now > timeout || getc(200) == Device::IO::CANCEL
+        end
+      end
+      !! @handshake_response
+    end
+
+    def check
+      if Device::Network.connected? && self.connected? && self.handshake?
+        message = self.read
+      end
+      if message.nil? && ConnectionManagement.primary_try?
+        return :primary_communication
+      end
+      message
+    end
+
+    private
+    def error(exception)
+      if Context.development?
+        ContextLog.exception(exception, exception.backtrace, "PaymentChannel error")
+      end
+      PaymentChannel.client = nil
+      @client = nil
+    end
+
+    def handshake
+      if self.connected?
+        @client.write(PaymentChannel.handshake_message)
+      end
+    end
+  end
+end
+

data/lib/da_funk/transaction/download.rb

@@ -210,7 +210,7 @@ module DaFunk
 
       def partial_download_to_store(filepath, response_size, file_size)
         tmp  = tmp_file(filepath)
-        file = File.open(tmp, "w+")
+        file = File.open(tmp, "w")
 
         if (response_size > 1024)
           file.write(@first_packet[13..-1])

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="1.6.0"
+  VERSION="1.7.0"
 end
 

data/lib/file_db.rb

@@ -30,15 +30,13 @@ class FileDb
   end
 
   def save
-    file_new = File.open(@path, "w+")
-    @hash.each do |line_key, line_value|
-      file_new.puts("#{line_key}=#{line_value}")
+    string = @hash.inject("") do |str, line| #|line_key, line_value|
+      str << "#{line[0]}=#{line[1]}\n"
     end
+    File.open(@path, "w") {|f| f.write(string) }
     true
-  rescue
+  rescue => e
     false
-  ensure
-    file_new.close
   end
 
   def []=(key, value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -154,6 +154,7 @@ files:
 - lib/da_funk.rb
 - lib/da_funk/application.rb
 - lib/da_funk/callback_flow.rb
+- lib/da_funk/connection_management.rb
 - lib/da_funk/engine.rb
 - lib/da_funk/event_handler.rb
 - lib/da_funk/event_listener.rb
@@ -167,6 +168,7 @@ files:
 - lib/da_funk/notification_callback.rb
 - lib/da_funk/notification_event.rb
 - lib/da_funk/params_dat.rb
+- lib/da_funk/payment_channel.rb
 - lib/da_funk/rake_task.rb
 - lib/da_funk/screen.rb
 - lib/da_funk/screen_flow.rb