proxy_daemon 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5a416d6040e9373aa1122adcc4d8296aabb0a5a
-  data.tar.gz: 71c900c16cc20eee03080fcf5dc753743fac1469
+  metadata.gz: d2b9074ac6f2540105b251e49fb530bfedf864e7
+  data.tar.gz: 814414fde598324b3a3b2a06c2bcd88b2744a340
 SHA512:
-  metadata.gz: f150d04c4b701356fc10f768f504f20c3fdcea86750a39dc84160acec3f35f5f1190d06709990d6bb5d39b23d10c4f555a6be360b21c954f05f7d53021680d00
-  data.tar.gz: 8b0098c2d990165b68cfe172c705dd4de560a1799b7e12ec4a06bf833c003a385c7251d955e3fb4e520b1ba47e22a452d609866d452a3c1ada59eb1041f83917
+  metadata.gz: 4d06f6fa08f208a4537406a82dd359a134b2a8822999636c5bb2e5a58a094f65a00df7135c4d57c162c320b00d909c5acd007f4235972c1bf59002c9e19a416c
+  data.tar.gz: 40c533a7e7930e23fd0b3bb14179bdc86704763878365441143b8062bac340e6ea00a491ee14ded9fb7abcc8c90c12b4afcadbf16db0b3368a377d3520c6a844

data/lib/proxy_daemon/daemon.rb

@@ -5,14 +5,17 @@ require 'colorize'
 
 module ProxyDaemon
   class Daemon
+    attr_accessor :list
+    
     def initialize(script, options)
       @script = script
       @proxies = ((options[:proxies].map { |proxy| proxy.gsub /\s+/, ' ' }) || []).shuffle
       @urls = options[:urls] || []
-      @workers = options[:workers] || 10
+      @workers = [(options[:workers] || 10), @urls.count].min
       @tries = options[:tries] || 4
     
       @threads = []
+      @list = {}
       @semaphore = Mutex.new
     end
   
@@ -37,6 +40,7 @@ module ProxyDaemon
       elsif answer == 'timeout' || answer == 'error'
         raise "Process: '#{answer}'"
       elsif Thread.current[:command] == :url
+        if (buf = answer.match(/^set (.+?)[\s]*:[\s]*?(.+)$/i)); @list[buf[1]] = buf[2] end
         log "Process: #{Thread.current[:url].cyan}: '#{answer.green}'", pipe
       else
         log "Answer: #{answer}".green, pipe
@@ -45,34 +49,44 @@ module ProxyDaemon
   
     def worker
       IO.popen("#{@script}", 'r+') { |p|
-        proxy = getProxy
-        log "Starting loop with new proxy: ".green + "#{(proxy || 'nil').yellow}", p
-        command :proxy, p, proxy
+        if (@script == '-' && p.nil?) # child process
+          if @block.nil?
+            $stderr.puts "[#{Process.pid}]".magenta + ' Empty block for parsing content'.red
+            Kernel.exit!
+          end
+          
+          worker = ProxyDaemon::Worker.new
+          worker.call(&@block)
+        else
+          proxy = getProxy
+          log "Starting loop with new proxy: ".green + "#{(proxy || 'nil').yellow}", p
+          command :proxy, p, proxy
       
-        begin
-          loop do
-            sleep(0.1)
-            url = getUrl
+          begin
+            loop do
+              sleep(0.1)
+              url = getUrl
 
-            if url.nil?
-              finished "Links are finished! exitting...".green, p
-              command :exit, p
-              break
-            else
-              log 'Urls count: ' + "#{@urls.length}".green + ", #{url.green}"
-              Thread.current[:url] = url
-              command :url, p, url
-              listen p
+              if url.nil?
+                finished "Links are finished! exitting...".green, p
+                command :exit, p
+                break
+              else
+                log 'Urls count: ' + "#{@urls.length}".green + ", #{url.green}"
+                Thread.current[:url] = url
+                command :url, p, url
+                listen p
+              end
             end
-          end
         
-          log "Finishing loop".green, p
-        rescue Exception => e
-          @semaphore.synchronize {
-            log "Exception in main: " + "#{e.message.red}, '#{Thread.current[:url]}'".red, p
-            command :exit, p
-            #puts e.backtrace
-          }
+            log "Finishing loop".green, p
+          rescue Exception => e
+            @semaphore.synchronize {
+              log "Exception in main: " + "#{e.message.red}, '#{Thread.current[:url]}'".red, p
+              command :exit, p
+              #puts e.backtrace
+            }
+          end
         end
       }
     
@@ -83,10 +97,16 @@ module ProxyDaemon
       end
     end
   
-    def start
-      puts "[main] Starting " + "#{@workers}".yellow + " workers:"
-      @workers.times { |i| @threads << Thread.new(&(->{worker})) }
-      @threads.each { |t| t.join }
+    def start(&block)
+      @block = block if block_given?
+      
+      begin
+        puts "[main] Starting " + "#{@workers}".yellow + " workers:"
+        @workers.times { |i| @threads << Thread.new(&(->{worker})) }
+        @threads.each { |t| t.join }
+      rescue Interrupt => e
+        puts "[main] Interrupted by user".yellow
+      end
     end
   
   private

data/lib/proxy_daemon/version.rb

@@ -1,3 +1,3 @@
 module ProxyDaemon
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/proxy_daemon/worker.rb

@@ -5,6 +5,8 @@ require 'openssl'
 
 module ProxyDaemon
   class Worker
+    attr_accessor :url
+    
     def initialize
       @client = Net::HTTP.Proxy(nil, nil)
       @url = ''
@@ -17,7 +19,7 @@ module ProxyDaemon
           command = ($stdin.gets || String.new).strip
           
           if command.empty?
-            log "Got empty answer by daemon, exiting...".yellow
+            log "Got empty answer from daemon, exiting...".yellow
             raise Timeout::Error
           end
         }
@@ -67,7 +69,11 @@ module ProxyDaemon
           raise Net::HTTPBadResponse
         end
       
-        answer(parse(@page.body) ? 'ok' : 'error')
+        res = parse(@page.body)
+        
+        if !!res == res || res.nil?; answer(res ? 'ok' : 'error')
+        elsif res.is_a? Array; answer("set #{res[0]}:#{res[1]}")
+        else; answer('error') end
       rescue Timeout::Error, Errno::ETIMEDOUT, Errno::ECONNREFUSED,
       Errno::EINVAL, Errno::ECONNRESET, Errno::ENETUNREACH, SocketError, EOFError,
       TypeError, Net::HTTPExceptions, Net::HTTPBadResponse, OpenSSL::SSL::SSLError => e
@@ -77,7 +83,7 @@ module ProxyDaemon
         log 'Interrupted by user, exiting...'.yellow
         Kernel.exit!
       rescue Exception => e
-        log "rescue in #{'process'.yellow}: #{e.inspect}, #{e.backtrace.reverse.join.red}"
+        log "rescue in #{'process'.yellow}: #{e.inspect},\n#{e.backtrace.reverse.join("\n").red}"
         answer 'error'
       end
     end
@@ -91,10 +97,14 @@ module ProxyDaemon
     end
   
     def parse(body)
-      raise NotImplementedError
+      raise NotImplementedError if @block.nil?
+      
+      @block.call(self, body)
+#      instance_exec body, &@block
     end
 
-    def call
+    def call(&block)
+      @block = block if block_given?
       proxy = nil
 
       loop do
@@ -119,7 +129,6 @@ module ProxyDaemon
       end
     end
   
-  private
     def log(msg)
       $stderr.puts "[child #{Process.pid}]".magenta + " #{msg}"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxy_daemon
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michail Volkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler