netsoul 2.3.8 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4da6956f4acf8e95a6182d863b70b77303a34336
-  data.tar.gz: b9ddab1e1a4671f079b900d37ad569eee619cc23
+  metadata.gz: ce61d62c759a9b3ac31c5d52983338bbd65b0af2
+  data.tar.gz: 2e1c9c803753c4f67b4e96275c9dc4b61d318e7f
 SHA512:
-  metadata.gz: 20de678da3bae0ea2c8d25ab331d92196d5be88051d0c3a22873e323c02ad9dfc7014dbbffbf63fd482cbe3fa77ccba6b9791ff939fe682f124b236b6ff0e531
-  data.tar.gz: d20a995bc0be5a1e3fa3f7c432328949acd806ae584bffe91e7d5895175e8a07f51db4d4b51749882dba71121a7e06be93b6d37c55a653a71723e5988a131211
+  metadata.gz: aca72b67b7f9ebecb39a4ab49eca5542609559b24e92afbbefa064b9cda12f6daa493f8f31cc308fe0d9716444fff267270dad1a154e32b36a2ce4ca93733193
+  data.tar.gz: 16e50ef0bd6948f831c5c5e0472dda9e11aeba8d9816d38d390bd536d275e3231f5518551a3a55bd58379301b92a8a33d5589289d67d0bd459ab85b8bae29c01

data/bin/netsoul-ruby

@@ -47,22 +47,28 @@ end
 retry_count = 10
 retry_wait_time = 1.0
 RETRY_WAIT_FACTOR = 2.0 # Each time retry is called in Exception block, current 'retry_wait_time' is increased with this factor
+
+include Netsoul::Logging
 begin
   c = Netsoul::Client.new options[:user_opts]
   c.connect
   if c.started
+    log :info, '[connection:ok] successfully connected to the Netsoul server'
     trap_interrupt c
     retry_count = 10
     retry_wait_time = 1.0
     loop do
       res = c.get
-      c.send res if res.to_s.match(/^ping.*/)
-      sleep 1
+      res != 'nothing'.freeze ? log(:info, "[get ] #{res}") : log(:warn, '[get ] (<was empty!!!>)'.freeze)
+      if res.to_s.match(/^ping.*/)
+        c.send res
+        log :info, "[send] #{res}"
+      end
     end
   end
 rescue => e
-  puts "[ERROR]: #{e}"
-  puts "[RETRY_COUNT]: #{retry_count}"
+  log :error, "[EXCEPTION!!]: #{e}"
+  log :error, "[RETRY_COUNT]: #{retry_count}"
   begin c.disconnect; end
   if retry_count > 0
     retry_count -= 1

data/lib/netsoul/client.rb

@@ -5,7 +5,6 @@ require 'socket'
 
 module Netsoul
   class Client
-    include Logging
     attr_reader :started
     SOCKET_READ_TIMEOUT = 12 * 60
     SOCKET_WRITE_TIMEOUT = 1 * 60
@@ -55,37 +54,35 @@ module Netsoul
 
     def disconnect
       send(Message.ns_exit)
-    ensure
       close
+    ensure
+      @started = false
     end
 
     def send(str)
       _, sock = IO.select(nil, [@socket], nil, SOCKET_WRITE_TIMEOUT)
-      raise Netsoul::SocketError, 'Timeout or raise on write socket'.freeze if sock.nil? || sock.empty?
       s = sock.first
-      if s
-        s.puts str
-        s.flush
-      end
-      log :info, "[send] #{str.chomp}"
+      raise Netsoul::SocketError, 'Timeout or raise on write socket'.freeze unless s
+      s.puts str
+      s.flush
     end
 
     def get
       sock, = IO.select([@socket], nil, nil, SOCKET_READ_TIMEOUT)
-      raise Netsoul::SocketError, 'Timeout or raise on read socket'.freeze if sock.nil? || sock.empty?
-      res = sock.first.gets
-      if res
-        log :info, "[get ] #{res.chomp}"
+      s = sock.first
+      raise Netsoul::SocketError, 'Timeout or raise on read socket'.freeze unless s
+      res = s.gets.chomp
+      if !res.empty?
         res
       else
         'nothing'.freeze # Send some string and permit IO.select to thrown exception if something goes wrong.
       end
     end
 
+    private
+
     def close
       @socket.close if @socket
-    ensure
-      @started = false
     end
   end
 end

data/lib/netsoul/message.rb

@@ -7,10 +7,10 @@ require 'uri'
 module Netsoul
   class Message
     class << self
-      def _standard_auth_string(c)
-        str = c.user_connection_info[:md5_hash].dup
-        str << "-#{c.user_connection_info[:client_ip]}"
-        str << "/#{c.user_connection_info[:client_port]}#{c.socks_password}"
+      def _standard_auth_string(config)
+        str = config.user_connection_info[:md5_hash].dup
+        str << "-#{config.user_connection_info[:client_ip]}"
+        str << "/#{config.user_connection_info[:client_port]}#{config.socks_password}"
         Digest::MD5.hexdigest(str)
       end
 

data/lib/netsoul/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Netsoul
-  VERSION = '2.3.8'.freeze
+  VERSION = '2.4.1'.freeze
 end

metadata

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