da_funk 2.7.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fddf16bc4de572c488ed6a63ee95be2cc7a6c2c
-  data.tar.gz: 4af041d42ac40533c44842a69713a905715f361c
+  metadata.gz: 14a0759211adad87f8e8ef78f3acbe61201e8d68
+  data.tar.gz: 3f421864672af60122049e7e194303faa57d86ab
 SHA512:
-  metadata.gz: e6cd002c845d3b056d0fa132dd031ee5f68aac6f5f57e8b90c9b35540b168221b783de4bd367725352b38d00e3d48e0fd00b789ea4c770316f63ad08732ebc11
-  data.tar.gz: 90747a7835876b2abde831d3c81592f97ddcb2b8be89b18ef78311fd1fb220f228b2fed22ad3abdcd3965dd550fd7cfcefd9f525fcc0511830326619a4717e14
+  metadata.gz: bbd0ea30478678f50460cde1ded710d66e2bbd3a1216a155268659534a6907493828319a0d435ca16e9937f1f76d52c3716ecdb6cb42d660009406297c661d20
+  data.tar.gz: f15f8b1226a9ce6c2445fb564c4ef3ad2e16e3f26c5711d9c734c55ea8c76f57c2df86c772d776fb08ce22d1af3618f31b16a72c7e1f13fb0977db25c90f42ab

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (2.7.1)
+    da_funk (3.0.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake

data/RELEASE_NOTES.md

@@ -1,5 +1,10 @@
 # DaFunk
 
+### 3.0.0 - 2019-02-28
+
+- Replace payment channel interface from WebSocket to HTTP;
+- Support config.dat parameters `transaction_http_enabled`, `transaction_http_host`, `transaction_http_port`.
+
 ### 2.7.1 - 2019-02-16
 
 - Bug fix set payment channel limit disable as default.

data/lib/da_funk/payment_channel.rb

@@ -64,7 +64,12 @@ module DaFunk
       end
     end
 
+    def self.transaction_http?
+      DaFunk::ParamsDat.exists? && DaFunk::ParamsDat.file["transaction_http_enabled"] != "0"
+    end
+
     def self.channel_limit_exceed?
+      return true if transaction_http?
       if payment_channel_limit?
         payment_channel_limit <= Device::Setting.payment_channel_attempts.to_i
       else
@@ -73,7 +78,7 @@ module DaFunk
     end
 
     def self.check(display_message = true)
-      if self.dead? 
+      if self.dead?
         unless self.channel_limit_exceed?
           PaymentChannel.connect(display_message)
           if @client
@@ -144,7 +149,8 @@ module DaFunk
     def initialize(client = nil)
       @host   = Device::Setting.host
       @port   = (Device::Setting.apn == "gprsnac.com.br") ? 32304 : 443
-      @client = client || CwWebSocket::Client.new(@host, @port)
+      @client = client || CwHttpSocket.new(Device::Setting.transaction_http_host,
+                                           Device::Setting.transaction_http_port)
     rescue SocketError, PolarSSL::SSL::Error => e
       self.error(e)
     end
@@ -172,14 +178,18 @@ module DaFunk
     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
+      if self.client.respond_to?(:handshake?)
+        self.client.handshake?
+      else
+        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
-      !! @handshake_response
     end
 
     def check
@@ -203,7 +213,11 @@ module DaFunk
 
     def handshake
       if self.connected?
-        @client.write(PaymentChannel.handshake_message)
+        if self.handshake?
+          true
+        else
+          @client.write(PaymentChannel.handshake_message)
+        end
       end
     end
   end

data/lib/da_funk/version.rb

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

data/lib/device/setting.rb

@@ -2,10 +2,13 @@
 class Device
   class Setting
     FILE_PATH       = "./main/config.dat"
-    HOST_PRODUCTION = "switch.cloudwalk.io"
-    HOST_STAGING    = "switch-staging.cloudwalk.io"
-    PORT_TCP        = "31415"
-    PORT_TCP_SSL    = "31416"
+    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_PORT            = "443"
+    PORT_TCP             = "31415"
+    PORT_TCP_SSL         = "31416"
 
     DEFAULT     = {
       "host"                        => HOST_PRODUCTION,
@@ -56,7 +59,10 @@ class Device
       "company_name"                => "", #SYS
       "metadata_timestamp"          => "",
       "payment_channel_attempts"    => "0",
-      "payment_channel_date"        => ""
+      "payment_channel_date"        => "",
+      "transaction_http_enabled"    => "1",
+      "transaction_http_host"       => HTTP_HOST_PRODUCTION,
+      "transaction_http_port"       => HTTP_PORT
     }
 
     class << self
@@ -92,7 +98,7 @@ class Device
 
     def self.to_production!
       if self.environment != "production"
-        @file.update_attributes("company_name" => "", "environment" => "production", "host" => HOST_PRODUCTION)
+        @file.update_attributes("company_name" => "", "environment" => "production", "host" => HOST_PRODUCTION, "transaction_http_host" => HTTP_HOST_PRODUCTION)
         return true
       end
       false
@@ -100,7 +106,7 @@ class Device
 
     def self.to_staging!
       if self.environment != "staging"
-        @file.update_attributes("company_name" => "", "environment" => "staging", "host" => HOST_STAGING)
+        @file.update_attributes("company_name" => "", "environment" => "staging", "host" => HOST_STAGING, "transaction_http_host" => HTTP_HOST_STAGING)
         return true
       end
       false

metadata

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