da_funk 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a0759211adad87f8e8ef78f3acbe61201e8d68
-  data.tar.gz: 3f421864672af60122049e7e194303faa57d86ab
+  metadata.gz: 834613e7d4ad7c55f0c83ee2cf316e29d931f411
+  data.tar.gz: 52ec5afb74d88719e669e393d85e34914492a212
 SHA512:
-  metadata.gz: bbd0ea30478678f50460cde1ded710d66e2bbd3a1216a155268659534a6907493828319a0d435ca16e9937f1f76d52c3716ecdb6cb42d660009406297c661d20
-  data.tar.gz: f15f8b1226a9ce6c2445fb564c4ef3ad2e16e3f26c5711d9c734c55ea8c76f57c2df86c772d776fb08ce22d1af3618f31b16a72c7e1f13fb0977db25c90f42ab
+  metadata.gz: 2861468ccdcaece406d166ffb87b0e5ce7ee535478d6d87273f488f3f71fb5baa7734202eb67f0216bc9f907744d6c22741a4796cdf4476ca75ce3426ab6601d
+  data.tar.gz: f0132ee913e4e745facb147bd41d2bdb43d491ea53b2ec728fdb0de4a7234d4a54a22000506ccbb7eb1ba9cd65150a56120522b0e0b945e511ed2c326f9373aa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.0.0)
+    da_funk (3.1.1)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -12,13 +12,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    archive-zip (0.11.0)
+    archive-zip (0.12.0)
       io-like (~> 0.3.0)
     ast (2.4.0)
     cloudwalk (1.14.0)
       bundler
       rake
-    cloudwalk_handshake (0.13.2)
+    cloudwalk_handshake (1.2.0)
     funky-emv (0.20.2)
       funky-tlv (~> 0.2)
     funky-simplehttp (0.5.0)
@@ -28,7 +28,7 @@ GEM
     parallel (1.13.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
-    posxml_parser (2.14.0)
+    posxml_parser (2.15.0)
       funky-emv (~> 0.3)
     powerpack (0.1.2)
     rainbow (3.0.0)

data/RELEASE_NOTES.md

@@ -1,5 +1,15 @@
 # DaFunk
 
+### 3.1.1 - 2019-03-14
+
+- Bug fix attach helper loop image and decrease display time to 200ms;
+- Bugfix flag PaymentChannel::transaction_http use PaymentChannel didn’t change to payment channel approach when demand;
+- Bug fix extend timeout to PaymentChannel handshake.
+
+### 3.1.0 - 2019-03-12
+
+- Replace host config for http.
+
 ### 3.0.0 - 2019-02-28
 
 - Replace payment channel interface from WebSocket to HTTP;

data/lib/da_funk/helper.rb

@@ -113,14 +113,16 @@ module DaFunk
       time = timeout != 0 ? Time.now + timeout / 1000 : Time.now
       processing = Hash.new(keep: true)
       interation = 0
+      files      = options[:bmps][:attach_loop] if options && options[:bmps].is_a?(Hash)
+      max        = (files.size - 1) if files
+
       while(processing[:keep] && processing[:key] != Device::IO::CANCEL) do
-        if options && options[:bmps] && files = options[:bmps][:attach_loop]
+        if files
           Device::Display.print_bitmap(files[interation])
-          max = files.size - 1
-          interation = (max >= interation) ? 0 : interation + 1
+          interation = (max >= interation) ? interation + 1 : 0
         end
         if processing[:keep] = block.call(processing)
-          processing[:key] = getc(300)
+          processing[:key] = getc(200)
         end
         break if time < Time.now
       end

data/lib/da_funk/payment_channel.rb

@@ -6,7 +6,7 @@ module DaFunk
       attr_accessor :client
     end
 
-    attr_accessor :handshake_response, :client, :host, :port
+    attr_accessor :handshake_response, :handshake_request, :client, :host, :port
 
     def self.ready?
       Device::Network.connected? && self.configured?
@@ -149,8 +149,12 @@ module DaFunk
     def initialize(client = nil)
       @host   = Device::Setting.host
       @port   = (Device::Setting.apn == "gprsnac.com.br") ? 32304 : 443
-      @client = client || CwHttpSocket.new(Device::Setting.transaction_http_host,
-                                           Device::Setting.transaction_http_port)
+      if PaymentChannel.transaction_http?
+        @client = client || CwHttpSocket.new(Device::Setting.transaction_http_host,
+                                             Device::Setting.transaction_http_port)
+      else
+        @client = client || CwWebSocket::Client.new(@host, @port)
+      end
     rescue SocketError, PolarSSL::SSL::Error => e
       self.error(e)
     end
@@ -181,7 +185,7 @@ module DaFunk
       if self.client.respond_to?(:handshake?)
         self.client.handshake?
       else
-        if self.connected? && ! @handshake_response
+        if self.connected? && @handshake_request && ! @handshake_response
           timeout = Time.now + Device::Setting.tcp_recv_timeout.to_i
           loop do
             break if @handshake_response = self.client.read
@@ -216,7 +220,8 @@ module DaFunk
         if self.handshake?
           true
         else
-          @client.write(PaymentChannel.handshake_message)
+          @handshake_request = PaymentChannel.handshake_message
+          @client.write(handshake_request)
         end
       end
     end

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.0.0"
+  VERSION="3.1.1"
 end
 

data/lib/device/setting.rb

@@ -4,8 +4,8 @@ class Device
     FILE_PATH       = "./main/config.dat"
     HOST_PRODUCTION      = "switch.cloudwalk.io"
     HOST_STAGING         = "switch-staging.cloudwalk.io"
-    HTTP_HOST_PRODUCTION = "switch-http.cloudwalk.io"
-    HTTP_HOST_STAGING    = "switch-http-staging.cloudwalk.io"
+    HTTP_HOST_PRODUCTION = "pos.cloudwalk.io"
+    HTTP_HOST_STAGING    = "pos-staging.cloudwalk.io"
     HTTP_PORT            = "443"
     PORT_TCP             = "31415"
     PORT_TCP_SSL         = "31416"

metadata

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