anti_captcha 2.4.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c007c351a8655684c2f4680ead884429b8bea0ebd1fb33568119b15b477fcc76
-  data.tar.gz: 38267b78fb266cbb281a3d28db9cf32633398798a270bdc9e2bbd4f87cc2d84a
+  metadata.gz: 4db85d1586244634fe6f124e9574e93678a2a59138c1ee78c780b61aa699619e
+  data.tar.gz: bdf1e212aa6efdfa2243589d07114050b5796d39c5ecdf16ab7a2cc485ef2124
 SHA512:
-  metadata.gz: 6bd0a5e3759806d4d88285d819a2d18738a47d560d2a4a25ab6497d1a7d12b3e07a34f0e7c2d1ac5755a1b7238a975fc45b49594019076f0fd53584dee67e085
-  data.tar.gz: 43a55d65f865c263b0fa732984a085b92ae5936530f8d6f6cc5a7e619e261629a3c4991907a85838b76968e73827270d3e580938c9adea23280a27a52e000ab4
+  metadata.gz: f1165c9a41a66603e82a698100564c8ed419111d54b73ae909f3ab56a3720046c8487c614147d7570f57211dc0fc979b117fb08407d9333f85add93ebde2da91
+  data.tar.gz: cfa3add2a4cbd04040a74f491eb173fce9da94f47111c9a1a301c176872f18b216cfbef03ab0158c0caae29d67695b89bd8b0511681c58203103066960213634

data/README.md

@@ -2,9 +2,6 @@
 
 AntiCaptcha is a Ruby API for Anti-Captcha - [Anti-Captcha.com](http://getcaptchasolution.com/ipuz16klxh)
 
-> We suggest you to also check the recommended CAPTCHA provider DeathByCaptcha.
-> The gem for this provider is available at https://github.com/infosimples/deathbycaptcha.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -94,8 +91,8 @@ solution.g_recaptcha_response
 solution = client.decode_recaptcha_v3!(
   website_key:   'xyz',
   website_url:   'http://example.com/example=1',
-  min_score:     0.3,
   page_action:   'myverify',
+  min_score:     0.3,   # OPTIONAL
   # is_enterprise: false, # OPTIONAL
 )
 
@@ -122,40 +119,6 @@ solution.g_recaptcha_response
 > About the `min_score` parameter: it's strongly recommended to use a minimum score of `0.3` as higher
 > scores are rare.
 
-#### hCaptcha
-
-```ruby
-solution = client.decode_h_captcha!(
-  website_key:    'xyz',
-  website_url:    'http://example.com/example=1',
-  # proxy_type:     'http',                   # OPTIONAL
-  # proxy_address:  '127.0.0.1',              # OPTIONAL
-  # proxy_port:     '8080',                   # OPTIONAL
-  # proxy_login:    'proxyLoginHere',         # OPTIONAL
-  # proxy_password: 'proxyPasswordHere',      # OPTIONAL
-  # user_agent:     'MODERN_USER_AGENT_HERE', # OPTIONAL
-)
-
-solution.token
-"P0_eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJwYXNza2V5IjoiNnpWV..."
-
-# Or
-
-solution.g_recaptcha_response # Deprecated
-"P0_eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJwYXNza2V5IjoiNnpWV..."
-```
-
-*Parameters:*
-
-- `website_key`: the site key for the hCatpcha.
-- `website_url`: the URL of the page with the hCaptcha challenge.
-- `proxy_type`: optional parameter. Proxy connection protocol.
-- `proxy_address`: optional parameter. The proxy address.
-- `proxy_port`: optional parameter. The proxy port.
-- `proxy_login`: optional parameter. The proxy login.
-- `proxy_password`: optional parameter. The proxy password.
-- `user_agent`: optional parameter. The user agent.
-
 #### FunCaptcha
 
 ```ruby
@@ -177,7 +140,7 @@ solution.token
 *Parameters:*
 
 - `website_key`: the site key for the hCatpcha.
-- `website_url`: the URL of the page with the hCaptcha challenge.
+- `website_url`: the URL of the page with the challenge.
 - `proxy_type`: optional parameter. Proxy connection protocol.
 - `proxy_address`: optional parameter. The proxy address.
 - `proxy_port`: optional parameter. The proxy port.
@@ -242,6 +205,37 @@ solution.v4['captcha_output']
 - `proxy_password`: optional parameter. The proxy password.
 - `user_agent`: optional parameter. The user agent.
 
+#### Cloudflare Turnstile
+
+```ruby
+solution = client.decode_turnstile!(
+  website_key:    'xyz',
+  website_url:    'http://example.com/example=1',
+  # action:         'contact_form',           # OPTIONAL
+  # cdata:          'xyz',                    # OPTIONAL
+  # proxy_type:     'http',                   # OPTIONAL
+  # proxy_address:  '127.0.0.1',              # OPTIONAL
+  # proxy_port:     '8080',                   # OPTIONAL
+  # proxy_login:    'proxyLoginHere',         # OPTIONAL
+  # proxy_password: 'proxyPasswordHere',      # OPTIONAL
+)
+
+solution.token
+"0.vtJqmZnvobaUzK2i2PyKaSqHELYtBZfRoPwMvLMdA81WL_9G0vCO3y2VQVIeVplG0mxYF7uX......."
+```
+
+*Parameters:*
+
+- `website_key`: the site key for the Turnstile.
+- `website_url`: the URL of the page with the Turnstile challenge.
+- `action`: optional parameter. Turnstile challenge unique action.
+- `cdata`: optional parameter. Turnstile challenge cData token.
+- `proxy_type`: optional parameter. Proxy connection protocol.
+- `proxy_address`: optional parameter. The proxy address.
+- `proxy_port`: optional parameter. The proxy port.
+- `proxy_login`: optional parameter. The proxy login.
+- `proxy_password`: optional parameter. The proxy password.
+
 ### 3. Report an incorrectly solved image CAPTCHA for a refund
 
 It is only possible to report incorrectly solved image CAPTCHAs.
@@ -271,11 +265,11 @@ Queue IDs:
 - `18` Recaptcha V3 s0.3
 - `19` Recaptcha V3 s0.7
 - `20` Recaptcha V3 s0.9
-- `21` hCaptcha with proxy
-- `22` hCaptcha without proxy
 - `23` Recaptcha Enterprise V2 with proxy
 - `24` Recaptcha Enterprise V2 without proxy
 - `25` AntiGateTask
+- `26` Turnstile with proxy
+- `27` Turnstile without proxy
 
 ```ruby
 client.get_queue_stats!(queue_id)
@@ -290,7 +284,7 @@ avoid conflicts with other gems.
 
 ### Input image format
 
-Any format you use in the `decode_image!` method (`file`, `path`, `body`, `body64`)
+Any format you use in the `decode_image!` method (`file`, `path`, `body` or `body64`)
 will always be converted to a `body64`, which is a base64-encoded binary string.
 So, if you already have this format on your end, there is no need for convertions
 before calling the API.

data/lib/anti_captcha/client.rb

@@ -4,7 +4,7 @@ module AntiCaptcha
   #
   class Client
     BASE_URL = 'https://api.anti-captcha.com/:action'
-    PROXYABLE_TASKS = %w(RecaptchaV2Task FunCaptchaTask HCaptchaTask GeeTestTask)
+    PROXYABLE_TASKS = %w(RecaptchaV2Task FunCaptchaTask GeeTestTask TurnstileTask)
 
     attr_accessor :client_key, :timeout, :polling
 
@@ -170,22 +170,27 @@ module AntiCaptcha
     end
 
     #
-    # Decodes a HCaptcha CAPTCHA.
+    # Decodes a Geetest CAPTCHA.
     #
-    # @see `AntiCaptcha::Client#decode_h_captcha!`
+    # @see `AntiCaptcha::Client#decode_geetest!`
     #
-    def decode_h_captcha(options, proxy = nil)
-      decode_h_captcha!(options, proxy)
+    def decode_geetest(options, proxy = nil)
+      decode_geetest!(options, proxy)
     rescue
-      AntiCaptcha::HCaptchaSolution.new
+      AntiCaptcha::GeetestSolution.new
     end
 
     #
-    # Decodes a HCaptcha CAPTCHA.
+    # Decodes a Geetest CAPTCHA.
     #
     # @param [Hash] options Options hash.
     #   @option options [String]  :website_url
-    #   @option options [String]  :website_key
+    #   @option options [String]  :gt
+    #   @option options [String]  :challenge
+    #   @option options [String]  :geetest_api_server_subdomain
+    #   @option options [String]  :geetest_get_lib
+    #   @option options [String]  :version
+    #   @option options [String]  :init_parameters
     #
     # @param [Hash] proxy Not mandatory. A hash with configs of the proxy that
     #                     has to be used. Defaults to `nil`.
@@ -197,36 +202,33 @@ module AntiCaptcha
     #   @option proxy [String]  :proxy_password
     #   @option proxy [String]  :user_agent
     #
-    # @return [AntiCaptcha::HCaptchaSolution] The solution of the HCaptcha.
+    # @return [AntiCaptcha::GeetestSolution] The solution of the Geetest.
     #
-    def decode_h_captcha!(options, proxy = nil)
-      task = create_task!('HCaptchaTask', options, proxy)
+    def decode_geetest!(options, proxy = nil)
+      task = create_task!('GeeTestTask', options, proxy)
       task_result = get_task_result!(task['taskId'])
-      AntiCaptcha::HCaptchaSolution.new(task_result)
+      AntiCaptcha::GeetestSolution.new(task_result)
     end
 
     #
-    # Decodes a Geetest CAPTCHA.
+    # Decodes a Turnstile CAPTCHA.
     #
-    # @see `AntiCaptcha::Client#decode_geetest!`
+    # @see `AntiCaptcha::Client#decode_turnstile!`
     #
-    def decode_geetest(options, proxy = nil)
-      decode_geetest!(options, proxy)
+    def decode_turnstile(options, proxy = nil)
+      decode_turnstile!(options, proxy)
     rescue
-      AntiCaptcha::GeetestSolution.new
+      AntiCaptcha::TurnstileSolution.new
     end
 
     #
-    # Decodes a Geetest CAPTCHA.
+    # Decodes a Turnstile CAPTCHA.
     #
     # @param [Hash] options Options hash.
     #   @option options [String]  :website_url
-    #   @option options [String]  :gt
-    #   @option options [String]  :challenge
-    #   @option options [String]  :geetest_api_server_subdomain
-    #   @option options [String]  :geetest_get_lib
-    #   @option options [String]  :version
-    #   @option options [String]  :init_parameters
+    #   @option options [String]  :website_key
+    #   @option options [String]  :action
+    #   @option options [String]  :cdata
     #
     # @param [Hash] proxy Not mandatory. A hash with configs of the proxy that
     #                     has to be used. Defaults to `nil`.
@@ -234,16 +236,14 @@ module AntiCaptcha
     #   @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::GeetestSolution] The solution of the Geetest.
+    # @return [AntiCaptcha::TurnstileSolution] The solution of the Turnstile.
     #
-    def decode_geetest!(options, proxy = nil)
-      task = create_task!('GeeTestTask', options, proxy)
+    def decode_turnstile!(options, proxy = nil)
+      task = create_task!('TurnstileTask', options, proxy)
       task_result = get_task_result!(task['taskId'])
-      AntiCaptcha::GeetestSolution.new(task_result)
+      AntiCaptcha::TurnstileSolution.new(task_result)
     end
 
     # Creates a task for solving the selected CAPTCHA type.
@@ -330,13 +330,6 @@ module AntiCaptcha
           websitePublicKey: options[:website_public_key],
         }
 
-      when 'HCaptchaTask'
-        args[:task] = {
-          type:       'HCaptchaTask',
-          websiteURL: options[:website_url],
-          websiteKey: options[:website_key],
-        }
-
       when 'GeeTestTask'
         args[:task] = {
           type:       'GeeTestTask',
@@ -349,6 +342,15 @@ module AntiCaptcha
         args[:version]                   = options[:version]                      if !options[:version].nil?
         args[:initParameters]            = options[:init_parameters]              if !options[:init_parameters].nil?
 
+      when 'TurnstileTask'
+        args[:task] = {
+          type:           'TurnstileTask',
+          websiteURL:     options[:website_url],
+          websiteKey:     options[:website_key],
+          action:         options[:action],
+          turnstileCData: options[:cdata],
+        }
+
       else
         message = "Invalid task type: '#{type}'."
         raise AntiCaptcha::ArgumentError.new(message)
@@ -419,8 +421,8 @@ module AntiCaptcha
     #                          18 - Recaptcha V3 s0.3
     #                          19 - Recaptcha V3 s0.7
     #                          20 - Recaptcha V3 s0.9
-    #                          21 - hCaptcha Proxy-On
-    #                          22 - hCaptcha Proxyless
+    #                          26 - Turnstile Proxy-On
+    #                          27 - Turnstile Proxyless
     #
     # @return [Hash] Information about the queue.
     #

data/lib/anti_captcha/models/turnstile_solution.rb

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

data/lib/anti_captcha/version.rb

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

data/lib/anti_captcha.rb

@@ -38,6 +38,7 @@ 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/geetest_solution'
+require 'anti_captcha/models/turnstile_solution'
 require 'anti_captcha/models/task_result'
 require 'anti_captcha/client'
 require 'anti_captcha/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anti_captcha
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Infosimples
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,18 +76,18 @@ files:
 - lib/anti_captcha/http.rb
 - lib/anti_captcha/models/fun_captcha_solution.rb
 - lib/anti_captcha/models/geetest_solution.rb
-- lib/anti_captcha/models/h_captcha_solution.rb
 - lib/anti_captcha/models/image_to_text_solution.rb
 - lib/anti_captcha/models/recaptcha_v2_solution.rb
 - lib/anti_captcha/models/recaptcha_v3_solution.rb
 - lib/anti_captcha/models/solution.rb
 - lib/anti_captcha/models/task_result.rb
+- lib/anti_captcha/models/turnstile_solution.rb
 - lib/anti_captcha/version.rb
 homepage: https://github.com/infosimples/anti_captcha
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.5.23
+signing_key: 
 specification_version: 4
 summary: Ruby API for Anti Captcha (CAPTCHA Solver as a Service)
 test_files: []

data/lib/anti_captcha/models/h_captcha_solution.rb

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