rest-tor 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f201b4acba40f747a5e9563f43db9b8e69560d45
-  data.tar.gz: cb18946fdf67e37d96b417bc64f1ed824af89658
+  metadata.gz: 2e8915b30c4321b069ab153e473351376943242e
+  data.tar.gz: d1091b5f18c5ab86d234786aa2111871539beda2
 SHA512:
-  metadata.gz: 7074b36afe2ec36598e2288e349c458dcb3d3c5afebaf0b06d443d8b04f48ae83808f9ea8077a81d48aa0990f48d9f88cabab041d93e888405c0ede3bab45ae4
-  data.tar.gz: 23fe7019b7492c38c983e3eca78d4a5e3b756bc56606e29526855b29249948bb65a2b4b14364bbd1fb8ad8d355282a9cb00c5e06c7b4734634fafb11dfd8f719
+  metadata.gz: 75a266319482a39a9ac9df64e140c395aeac2c6ca1fe476d5966974f7afeca8277979920ead6d9ee63a1473159a331ee6976e8deba5d53d272d70ce5529cecdf
+  data.tar.gz: 5736e68c8a496d9c354de9591f9b4bacdfc5c79a4fd9cd63a6e03a3481b55e2426ec13c05da37698aa17826f4b9ee87e7c432cf2120d127e40f294beedc69598

data/README.md

@@ -8,8 +8,17 @@ Tor.request will  take an instance if has tor instanc, otherwise initialize an i
 
 - Web Crawler
 
+## Requirements
+
+- Tor
+
+  Mac os:  brew install tor
+
+  Linux: apt-get install tor
+
 ## Installation
 
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -44,6 +53,14 @@ Or install it yourself as:
       Tor.request(url: '...', mode: :default)  # Priority to use the highest number of successes, default is :default
       Tor.request(url: '...', mode: :order) # in order
 
+      # Customize an mode
+      Tor::Dispatcher.register :custom do
+        Tor.store.all.sort_by do |(port, tor)|
+          tor.c_success
+        end
+      end
+      Tor.request(url: '...', mode: :custom)
+
       # show all instances
       Tor.store.all
       => {"9001"=>#<Tor::Instance:0x007fb7798d2498 @port="9001", @ip="64.113.32.29", @using=nil, @counter=#<Counter success: 5, fail: 1, succss_at: 2017-12-15 19:52:44 +0800, fail_at:2017-12-15 19:52:26 +0800>>}
@@ -52,6 +69,12 @@ Or install it yourself as:
       # Stop instance
       Tor.stop(port)
 
+      # proxy default is true
+      Tor.request(url: 'http://ip.plusor.cn',raw: false, proxy: false)
+      [2017-12-16 16:19:34.545] [95646-70129455200740] Started GET "http://ip.plusor.cn" (port:rest-client | mode:default)
+      [2017-12-16 16:19:34.785] [95646-70129455200740] Completed 200 OK in 0.2s (Size: 15 Bytes)
+       => "172.104.89.163\n"
+
       # Initialize tors
       Tor.init
       I, [2017-12-15T20:40:36.189835 #60422]  INFO -- : Open tor with port:9001
@@ -97,7 +120,6 @@ Or install it yourself as:
 - Optimization code
 - Add config
 - Configurable restart strategy
-- Configurable dispatcher
 
 ## Development
 

data/lib/rest-tor.rb

@@ -7,6 +7,10 @@ Dir.glob(File.expand_path('../rest_tor/**/*.rb', __FILE__)).each { |file| requir
 
 module Tor
   def self.logger
-    Logger.new(STDOUT)
+    Logger.new(STDOUT).tap do |log|
+      log.formatter = proc do |severity, datetime, progname, msg|
+        "[#{datetime.strftime('%Y-%m-%d %H:%M:%S.%3N')}] [#{Process.pid}-#{Thread.current.object_id}] #{msg}\n"
+      end
+    end
   end
 end

data/lib/rest_tor/instance.rb

@@ -93,7 +93,11 @@ module Tor
     end
 
     def avaliable?
-      `ps aux | grep tor | grep RunAsDaemon | grep -v "ps aux" | grep #{port} | awk '{print $2}'`.to_s.strip.to_i > 0
+      begin
+        pid && Process.getpgid( pid ) && true
+      rescue Errno::ESRCH
+        false
+      end
     end
   end
 

data/lib/rest_tor/tor.rb

@@ -23,7 +23,8 @@ module Tor extend self
     @store ||= Redis::HashKey.new('tor', marshal: true).tap { |s| s.send(:extend, Builder) }
   end
 
-  def hold_tor(mode: :default, &block)
+  def hold_tor(mode: :default, rest: false, &block)
+    return yield if rest
     if tor=Thread.current[:tor]
       port = tor.port
     else
@@ -42,25 +43,28 @@ module Tor extend self
 
   def request(options={}, &block)
     url     = options[:url]
-    mode    = options[:mode] || :default
+    mobile  = options[:mobile]
+    proxy   = options[:proxy] == false ? false : true
     raw     = options[:raw].nil? ? true : false
-    method  = options[:method] || :get
+    mode    = options[:mode]    || :default
+    method  = options[:method]  || :get
     payload = options[:payload] || {}
     timeout = options[:timeout] || 10
-    format  = options[:format] || (raw ? :html : :string)
-    mobile  = options[:mobile]
+    format  = options[:format]  || (raw ? :html : :string)
+    headers = options[:headers] || options[:header] || {}
     default_header = { 'User-Agent' => mobile ? MOBILE_AGENT : USER_AGENT }
     time, body = Time.now, nil
 
-    hold_tor(mode: mode) do |port, tor|
-      logger.info "Started #{method.to_s.upcase} #{url.inspect} (port:#{port} | mode:#{mode}"
-      params = {
-        method: method,
-        url: url,
-        payload: payload,
-        proxy: "socks5://127.0.0.1:#{port}",
-        timeout: timeout,
-        headers: default_header.merge(options[:header] || {})
+    hold_tor(mode: mode, rest: !proxy) do |port, tor|
+      logger.info "Started #{method.to_s.upcase} #{url.inspect} (port:#{port || 'rest-client'} | mode:#{mode})"
+      proxy   =  proxy && "socks5://127.0.0.1:#{port}" or nil
+      params  = {
+        method:   method,
+        url:      url,
+        payload:  payload,
+        proxy:    proxy,
+        timeout:  timeout,
+        headers:  default_header.merge(headers)
       }
 
       begin
@@ -68,12 +72,14 @@ module Tor extend self
            yield(res, req, headers ) if block_given?
            res
         end
-        tor.success!
+        tor&.success!
         body = response.body
         logger.info "Completed #{response.try(:code)} OK in #{(Time.now-time).round(1)}s (Size: #{Utils.number_to_human_size(body.bytesize)})"
       rescue Exception => e
         tor.fail!(e)
-        logger.info "#{e.class}: #{e.message}, <Tor#(success: #{tor.counter.success}, fail: #{tor.counter.fail}, port: #{tor.port})>"
+        if tor
+          logger.info "#{e.class}: #{e.message}, <Tor#(success: #{tor.counter.success}, fail: #{tor.counter.fail}, port: #{tor.port})>"
+        end
         raise e
       end
     end

data/lib/rest_tor/version.rb

@@ -1,3 +1,3 @@
 module Tor
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-tor
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - plusor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-15 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client