netsoul 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f924c44cf5fac236ba67f786746bd346324ab7a
-  data.tar.gz: 613d0e50f6b7f6f612571972eda5b755c363da08
+  metadata.gz: a04003bb02b749e6d569cc7958e4b14155f84dde
+  data.tar.gz: 59c4229498648f7a182682d30b0a1352aae48b2e
 SHA512:
-  metadata.gz: 394843b7c4b32c47bfb16e3ef2e1e38e6ed4aa3e1b08c07d716be3443ea1797376801c79ac16f5a2d23db1ff99dfa8ca737e4ede8abdecadc066f5fe6b435bf0
-  data.tar.gz: f3a73c0fb7bd3b8fb8d7cf4374915f4abe224c23d948b8c5dd677f9d2c2a7328424aad5d34cd991b410e58ad44d558d980c906c14c1a0d057e1d74991ae7e6cf
+  metadata.gz: 639b6d93e72d9a9e9d9adb8472ba70eade8f37ca188abe4dcd4876093caf585faec60f8ff34b57d93bb1f01e6631a48b34d296524ace1389da9af3f68d897fc2
+  data.tar.gz: cd6256097bf4783465d8714097938d7473267125024d4ba456fd96640ab70161a33070d43c25f4c2ba0fc4d032eb0c1ce208e84cbeaa9b73c43b040a5380d5c5

data/bin/netsoul-ruby

@@ -13,6 +13,9 @@ module Netsoul
   class Client
     include Logging
 
+    SOCKET_READ_TIMEOUT = 10 * 60
+    SOCKET_WRITE_TIMEOUT = 10
+
     attr_reader :started
 
     def initialize(*args)
@@ -46,10 +49,8 @@ module Netsoul
     def connect
       @sock = TCPSocket.new(@config.server_host, @config.server_port)
       fail Netsoul::SocketError, 'Could not open a socket. Connection is unavailable.'.freeze unless @sock
-
       _cmd, _socket_num, md5_hash, client_ip, client_port, _server_timestamp = sock_get.split
       @config.build_user_connection_info md5_hash: md5_hash, client_ip: client_ip, client_port: client_port
-
       auth_ag
       auth_method
       auth_status
@@ -63,12 +64,16 @@ module Netsoul
     end
 
     def sock_send(str)
+      _, sock = IO.select(nil, [@sock], nil, SOCKET_WRITE_TIMEOUT)
+      fail Netsoul::SocketError, 'Timeout or fail on write socket' if sock.nil? || sock.empty?
+      sock.first.puts str
       log :info, "[send] #{str.chomp}"
-      @sock.puts str
     end
 
     def sock_get
-      res = @sock.gets
+      sock, = IO.select([@sock], nil, nil, SOCKET_READ_TIMEOUT)
+      fail Netsoul::SocketError, 'Timeout or fail on read socket' if sock.nil? || sock.empty?
+      res = sock.first.gets
       log :info, "[get ] #{res.chomp}"
       res
     end
@@ -113,8 +118,8 @@ unless options.include?(:config)
 end
 
 retry_count = 10
-retry_wait_time = 1.0
-RETRY_WAIT_FACTOR = 1.25 # Each time retry is called in Exception, current 'retry_wait_time' is increased with this factor
+retry_wait_time = 10.0
+RETRY_WAIT_FACTOR = 1.50 # Each time retry is called in Exception, current 'retry_wait_time' is increased with this factor
 begin
   c = Netsoul::Client.new options[:user_opts]
   c.connect
@@ -127,15 +132,18 @@ begin
       sleep 1
     end
   end
+rescue Interrupt
+  c.disconnect if c.started
+  puts '!!! [SIGINT] !!!'
+  exit 42
 rescue => e
-  puts "[ERROR]: #{e}"
-  puts "[RETRY_COUNT]: #{retry_count}"
+  puts "[ERROR]: #{e} - [RETRY_COUNT]: #{retry_count}"
   c.disconnect
   c = nil
   if retry_count > 0
     retry_count -= 1
     retry_wait_time *= RETRY_WAIT_FACTOR
-    sleep retry_wait_time
-    retry
+    sleep(retry_wait_time) && retry
   end
+  exit 42
 end

data/lib/netsoul/version.rb

@@ -1,3 +1,3 @@
 module Netsoul
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netsoul
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Christian Kakesa