anti_captcha 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12cd907f440f2218170c3b2ddfe61d140c19b4da58c62f9998aa772c58a38ef8
-  data.tar.gz: cf69837b0cbc5fc593c756a57536ccbb2b5876c2c5c380bc61f798f6c4d4be9e
+  metadata.gz: 714b5c0e2058c2056e0b0a0fcdf41c0c07147f29b690bbf49132cc7ffbca976e
+  data.tar.gz: 3c7942ec7d1a4a747a53fa690be368466e84ce0e9baefe9877a6fb33a4d034bb
 SHA512:
-  metadata.gz: 652ff3b4be305495b84f793a2049e65fa67af2a5614d2e80c1ec69a25a9817727c83c6511c1fc762319f406fd03457f6316cb2e356d598b5bd79743717c851ce
-  data.tar.gz: 1ab34d03b69a5964ac1cdbf73337aeb60524b303b403a1fd81542a1722c441a2ae045c9e2303b20c5c601f5e8cf15ccd7849fd0b046df3b8e23cb348e993cf18
+  metadata.gz: db68e12ba53274a19e85a0babc1236a640b59c844b5e87781afdda0f3648e98fb3c64e37047f21a4a7443e5a6d5533347b5d9aad9de172651d782568b22abd52
+  data.tar.gz: 8001df4b7668af35346bc00fcde615f369b5ae38b87b31f59704ff60c68028d4113c553b7c90258801cf3c7a3dfd358b6fc5c1f220d66fada7f1f9c31374f529

data/README.md

@@ -74,10 +74,17 @@ Or install it yourself as:
 5. **Get current stats of a queue.**
 
   Queue IDs:
-  - `1` Standart ImageToText, English language.
-  - `2` Standart ImageToText, Russian language.
-  - `5` Recaptcha NoCaptcha tasks.
-  - `6` Recaptcha Proxyless task.
+  - `1`  Standart ImageToText, English language.
+  - `2`  Standart ImageToText, Russian language.
+  - `5`  Recaptcha NoCaptcha tasks.
+  - `6`  Recaptcha Proxyless task.
+  - `7`  Funcaptcha task.
+  - `10` Funcaptcha Proxyless task.
+  - `18` Recaptcha V3 s0.3
+  - `19` Recaptcha V3 s0.7
+  - `20` Recaptcha V3 s0.9
+  - `21` hCaptcha Proxy-On
+  - `22` hCaptcha Proxyless
 
   ```ruby
   client.get_queue_stats!(queue_id)
@@ -171,6 +178,29 @@ Or install it yourself as:
   "1JJHJ_VuuHAqJKxcaasbTsqw-L1Sm4gD57PTeaEr9-MaETG1vfu2H5zlcwkjsRoZoHxx6V9yUDw8Ig-hYD8kakmSnnjNQd50w_Y_tI3aDLp-s_7ZmhH6pcaoWWsid5hdtMXyvrP9DscDuCLBf7etLle8caPWSaYCpAq9DOTtj5NpSg6-OeCJdGdkjsakFUMeGeqmje87wSajcjmdjl_w4XZBY2zy8fUH6XoAGZ6AeCTulIljBQDObQynKDd-rutPvKNxZasDk-LbhTfw508g1lu9io6jnvm3kbAdnkfZ0x0PkGiUMHU7hnuoW6bXo2Yn_Zt5tDWL7N7wFtY6B0k7cTy73f8er508zReOuoyz2NqL8smDCmcJu05ajkPGt20qzpURMwHaw"
   ```
 
+9. **hCaptcha**
+
+  This method allows you to solve hCaptcha.
+
+  There are two methods available:
+
+  - `decode_h_captcha`: solves hCaptcha CAPTCHAs. It doesn't raise exceptions.
+  - `decode_h_captcha!`: solves hCaptcha CAPTCHAs. It may raise an error if something goes wrong.
+
+  **Send the `website_key` and `website_url` parameters**
+
+  This method requires no browser emulation. You can send two parameters that
+  identify the website in which the CAPTCHA is found.
+
+  ```ruby
+  options = {
+    website_key: 'xyz',
+    website_url: 'http://example.com/example=1'
+  }
+
+  solution = client.decode_h_captcha!(options)
+  solution.g_recaptcha_response # Solution of the captcha
+  ```
 
 ## Notes
 

data/lib/anti_captcha.rb

@@ -36,6 +36,7 @@ require 'anti_captcha/models/image_to_text_solution'
 require 'anti_captcha/models/no_captcha_solution'
 require 'anti_captcha/models/recaptcha_v3_solution'
 require 'anti_captcha/models/fun_captcha_solution'
+require 'anti_captcha/models/h_captcha_solution'
 require 'anti_captcha/models/task_result'
 require 'anti_captcha/client'
 require 'anti_captcha/version'

data/lib/anti_captcha/client.rb

@@ -4,8 +4,8 @@ module AntiCaptcha
   #
   class Client
     BASE_URL = 'https://api.anti-captcha.com/:action'
-    PROXYABLE_TASKS = %w(NoCaptchaTask FunCaptchaTask)
-    SUPPORTED_TASKS = %w(ImageToTextTask NoCaptchaTask FunCaptchaTask)
+    PROXYABLE_TASKS = %w(NoCaptchaTask FunCaptchaTask HCaptchaTask)
+    SUPPORTED_TASKS = %w(ImageToTextTask NoCaptchaTask FunCaptchaTask HCaptchaTask)
 
     attr_accessor :client_key, :timeout, :polling
 
@@ -167,6 +167,42 @@ module AntiCaptcha
       AntiCaptcha::FunCaptchaSolution.new(task_result)
     end
 
+    #
+    # Decodes a HCaptcha CAPTCHA.
+    #
+    # @see `AntiCaptcha::Client#decode_h_captcha!`
+    #
+    def decode_h_captcha(options, proxy = nil)
+      decode_h_captcha!(options, proxy)
+    rescue
+      AntiCaptcha::HCaptchaSolution.new
+    end
+
+    #
+    # Decodes a HCaptcha CAPTCHA.
+    #
+    # @param [Hash] options Options hash.
+    #   @option options [String]  :website_url
+    #   @option options [String]  :website_key
+    #
+    # @param [Hash] proxy Not mandatory. A hash with configs of the proxy that
+    #                     has to be used. Defaults to `nil`.
+    #   @option proxy [String]  :proxy_type
+    #   @option proxy [String]  :proxy_address
+    #   @option proxy [String]  :proxy_port
+    #   @option proxy [String]  :proxy_login
+    #   @option proxy [String]  :proxy_login
+    #   @option proxy [String]  :proxy_password
+    #   @option proxy [String]  :user_agent
+    #
+    # @return [AntiCaptcha::HCaptchaSolution] The solution of the HCaptcha.
+    #
+    def decode_h_captcha!(options, proxy = nil)
+      task = create_task!('HCaptchaTask', options, proxy)
+      task_result = get_task_result!(task['taskId'])
+      AntiCaptcha::HCaptchaSolution.new(task_result)
+    end
+
     # Creates a task for solving the selected CAPTCHA type.
     #
     # @param [String] type The type of the CAPTCHA.
@@ -249,10 +285,17 @@ module AntiCaptcha
           websitePublicKey: options[:website_public_key],
         }
 
+      when 'HCaptchaTask'
+        args[:task] = {
+          type: 'HCaptchaTask',
+          websiteURL: options[:website_url],
+          websiteKey: options[:website_key],
+        }
+
       else
         message = "Invalid task type: '#{type}'. Allowed types: " +
           "#{SUPPORTED_TASKS.join(', ')}"
-        raise AntiCaptcha.raise_error(message)
+        raise AntiCaptcha::ArgumentError.new(message)
       end
 
       if PROXYABLE_TASKS.include?(type)
@@ -281,7 +324,7 @@ module AntiCaptcha
     # @return [Hash] Information about the task.
     #
     def get_task_result!(task_id)
-      raise AntiCaptcha.raise_error('taskId not received from Anti Captcha.') unless task_id
+      raise AntiCaptcha::Error.new('taskId not received from Anti Captcha.') unless task_id
 
       started_at = Time.now
 
@@ -317,6 +360,11 @@ module AntiCaptcha
     #                          6  - Recaptcha Proxyless task.
     #                          7  - Funcaptcha task.
     #                          10 - Funcaptcha Proxyless task.
+    #                          18 - Recaptcha V3 s0.3
+    #                          19 - Recaptcha V3 s0.7
+    #                          20 - Recaptcha V3 s0.9
+    #                          21 - hCaptcha Proxy-On
+    #                          22 - hCaptcha Proxyless
     #
     # @return [Hash] Information about the queue.
     #

data/lib/anti_captcha/models/h_captcha_solution.rb

@@ -0,0 +1,13 @@
+module AntiCaptcha
+  class HCaptchaSolution < AntiCaptcha::Solution
+    attr_accessor :g_recaptcha_response
+
+    def initialize(task_result = nil)
+      super
+
+      if task_result
+        @g_recaptcha_response = task_result.api_result['solution']['gRecaptchaResponse']
+      end
+    end
+  end
+end

data/lib/anti_captcha/version.rb

@@ -1,4 +1,4 @@
 module AntiCaptcha
-  VERSION = "2.2.2"
+  VERSION = "2.3.0"
   USER_AGENT = "AntiCaptcha/Ruby v#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anti_captcha
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Infosimples
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ files:
 - lib/anti_captcha/errors.rb
 - lib/anti_captcha/http.rb
 - lib/anti_captcha/models/fun_captcha_solution.rb
+- lib/anti_captcha/models/h_captcha_solution.rb
 - lib/anti_captcha/models/image_to_text_solution.rb
 - lib/anti_captcha/models/no_captcha_solution.rb
 - lib/anti_captcha/models/recaptcha_v3_solution.rb