anti_captcha 2.3.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714b5c0e2058c2056e0b0a0fcdf41c0c07147f29b690bbf49132cc7ffbca976e
-  data.tar.gz: 3c7942ec7d1a4a747a53fa690be368466e84ce0e9baefe9877a6fb33a4d034bb
+  metadata.gz: 7911a78f0b2ccdcb075555ea6ea96aa2abc6914311b792a4b2579ec1a3bc8901
+  data.tar.gz: f2e2df9d4ba1042fed67fed6d670dd6c22fc097f0856fa61e1da17a74483043c
 SHA512:
-  metadata.gz: db68e12ba53274a19e85a0babc1236a640b59c844b5e87781afdda0f3648e98fb3c64e37047f21a4a7443e5a6d5533347b5d9aad9de172651d782568b22abd52
-  data.tar.gz: 8001df4b7668af35346bc00fcde615f369b5ae38b87b31f59704ff60c68028d4113c553b7c90258801cf3c7a3dfd358b6fc5c1f220d66fada7f1f9c31374f529
+  metadata.gz: f1915d353fe91b85276cb5ace41c09b3762b8313c2903ab064f2f9fdb6572b151bfd2357f6a80f6883e4922773aeb096d3cca57c2939b309f093ef4f844cf181
+  data.tar.gz: cf6cdc10ac27031ccd362d8fb15da2af3d4e77cc849a4ab905854c831977b20c89a38fd47cad502f778d6b359493a45d4add2d0f5512f1984b0dcda23822e3a7

data/README.md

@@ -1,8 +1,6 @@
-Developed by [Infosimples](https://infosimples.com).
-
 # AntiCaptcha
 
-AntiCaptcha is a Ruby API for Anti-Captcha - [Anti-Captcha.com](http://getcaptchasolution.com/ipuz16klxh).
+AntiCaptcha is a Ruby API for Anti-Captcha - [Anti-Captcha.com](http://getcaptchasolution.com/ipuz16klxh)
 
 ## Installation
 
@@ -14,215 +12,322 @@ gem 'anti_captcha'
 
 And then execute:
 
-    $ bundle
+```bash
+$ bundle
+````
 
 Or install it yourself as:
 
-    $ gem install anti_captcha
+```bash
+$ gem install anti_captcha
+````
 
 ## Usage
 
-1. **Create a client**
-
-  ```ruby
-  # Create a client
-  client = AntiCaptcha.new('my_key')
-  ```
-
-2. **Solve Image CAPTCHA**
-
-  There are two methods available:
+### 1. Create a client
 
-  - `decode_image`: solves image CAPTCHAs. It doesn't raise exceptions.
-  - `decode_image!`: solves image CAPTCHAs. It may raise an `AntiCaptcha::Error` if something goes wrong.
-
-  If the solution is not available, an empty solution object will be returned.
-
-  ```ruby
-  solution = client.decode_image!(path: 'path/to/my/captcha/file')
-  solution.text                # CAPTCHA solution.
-  solution.url                 # Image URL.
-  solution.task_result.task_id # The ID of the task.
-  ```
-
-  You can also specify *file*, *body* and *body64* when decoding an image.
+```ruby
+client = AntiCaptcha.new('my_key')
+```
 
-  ```ruby
-  client.decode_image!(file: File.open('path/to/my/captcha/file', 'rb'))
+### 2. Solve a CAPTCHA
 
-  client.decode_image!(body: File.open('path/to/my/captcha/file', 'rb').read)
+There are two types of methods available: `decode_*` and `decode_*!`:
 
-  client.decode_image!(body64: Base64.encode64(File.open('path/to/my/captcha/file', 'rb').read))
-  ```
+- `decode_*` does not raise exceptions.
+- `decode_*!` may raise a `AntiCaptcha::Error` if something goes wrong.
 
-  > Internally, the gem will always convert the image to body64 (binary base64 encoded).
+If the solution is not available, an empty solution object will be returned.
 
-3. **Report incorrectly solved image CAPTCHA for refund**
+```ruby
+solution = client.decode_image!(path: 'path/to/my/captcha/file')
+solution.text                # CAPTCHA solution
+solution.url                 # Image URL
+solution.task_result.task_id # The task ID
+```
 
-  It is only possible to report incorrectly solved image CAPTCHAs.
+#### Image CAPTCHA
 
-  ```ruby
-  client.report_incorrect_image_catpcha!(task_id)
-  ```
+You can specify `file`, `body` or `body64` when decoding an image.
 
-4. **Get your account balance**
+```ruby
+client.decode_image!(file: File.open('path/to/my/captcha/file', 'rb'))
+client.decode_image!(body: File.open('path/to/my/captcha/file', 'rb').read)
+client.decode_image!(body64: Base64.encode64(File.open('path/to/my/captcha/file', 'rb').read))
+```
 
-  ```ruby
-  client.get_balance!
-  ```
+#### reCAPTCHA v2
 
-5. **Get current stats of a queue.**
+```ruby
+solution = client.decode_recaptcha_v2!(
+  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.g_recaptcha_response
+"03AOPBWq_RPO2vLzyk0h8gH0cA2X4v3tpYCPZR6Y4yxKy1s3Eo7CHZRQntxrd..."
+```
 
-  Queue IDs:
-  - `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
+*Parameters:*
 
-  ```ruby
-  client.get_queue_stats!(queue_id)
-  ```
+- `website_key`: the Google website key for the reCAPTCHA.
+- `website_url`: the URL of the page with the reCAPTCHA 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.
 
-6. **Clickable CAPTCHAs (e.g. "No CAPTCHA reCAPTCHA")**
+#### reCAPTCHA v3
 
-  This method allows you to solve CAPTCHAs similar to
-  [reCAPTCHA v2](https://support.google.com/recaptcha/?hl=en#6262736).
+```ruby
+solution = client.decode_recaptcha_v3!(
+  website_key:   'xyz',
+  website_url:   'http://example.com/example=1',
+  page_action:   'myverify',
+  min_score:     0.3,   # OPTIONAL
+  # is_enterprise: false, # OPTIONAL
+)
+
+solution.g_recaptcha_response
+"03AOPBWq_RPO2vLzyk0h8gH0cA2X4v3tpYCPZR6Y4yxKy1s3Eo7CHZRQntxrd..."
+```
 
-  There are two methods available:
+*Parameters:*
 
-  - `decode_nocaptcha`: solves NoCaptcha CAPTCHAs. It doesn't raise exceptions.
-  - `decode_nocaptcha!`: solves NoCaptcha CAPTCHAs. It may raise an `AntiCaptcha::Error` if something goes wrong.
+- `website_key`: the Google website key for the reCAPTCHA.
+- `website_url`: the URL of the page with the reCAPTCHA challenge.
+- `action`: the action name used by the CAPTCHA.
+- `min_score`: optional parameter. The minimal score needed for the CAPTCHA resolution. Defaults to `0.3`.
+- `is_enterprise`: optional parameter. Set to `true` if you are solving a reCAPTCHA v3 Enterprise. Defaults to `false`.
 
-  **Send the `website_key` and `website_url` parameters**
+> About the `action` parameter: in order to find out what this is, you need to inspect the JavaScript
+> code of the website looking for a call to the `grecaptcha.execute` function.
+>
+> ```javascript
+> // Example
+> grecaptcha.execute('6Lc2fhwTAAAAAGatXTzFYfvlQMI2T7B6ji8UVV_f', { action: "examples/v3scores" })
+> ````
 
-  This method requires no browser emulation. You can send two parameters that
-  identify the website in which the CAPTCHA is found.
+> About the `min_score` parameter: it's strongly recommended to use a minimum score of `0.3` as higher
+> scores are rare.
 
-  ```ruby
-  options = {
-    website_key: 'xyz',
-    website_url: 'http://example.com/example=1'
-  }
+#### hCaptcha
 
-  solution = client.decode_nocaptcha!(options)
-  solution.g_recaptcha_response # Solution of the captcha
-  ```
+```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..."
+```
 
-  The solution (`solution.g_recaptcha_response`) will be a code that validates
-  the form, like the following:
+*Parameters:*
 
-  ```ruby
-  "1JJHJ_VuuHAqJKxcaasbTsqw-L1Sm4gD57PTeaEr9-MaETG1vfu2H5zlcwkjsRoZoHxx6V9yUDw8Ig-hYD8kakmSnnjNQd50w_Y_tI3aDLp-s_7ZmhH6pcaoWWsid5hdtMXyvrP9DscDuCLBf7etLle8caPWSaYCpAq9DOTtj5NpSg6-OeCJdGdkjsakFUMeGeqmje87wSajcjmdjl_w4XZBY2zy8fUH6XoAGZ6AeCTulIljBQDObQynKDd-rutPvKNxZasDk-LbhTfw508g1lu9io6jnvm3kbAdnkfZ0x0PkGiUMHU7hnuoW6bXo2Yn_Zt5tDWL7N7wFtY6B0k7cTy73f8er508zReOuoyz2NqL8smDCmcJu05ajkPGt20qzpURMwHaw"
-  ```
+- `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.
 
-7. **FunCaptcha**
+#### FunCaptcha
 
-  This method allows you to solve FunCaptcha.
+```ruby
+solution = client.decode_fun_captcha!(
+  website_public_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
+"380633616d817f2b8.2351188603|r=ap-southeast-2|met..."
+```
 
-  **Send the `website_public_key` and `website_url` parameters**
+*Parameters:*
 
-  This method requires no browser emulation. You can send two parameters that
-  identify the website in which the CAPTCHA is found.
+- `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.
 
-  ```ruby
-  options = {
-    website_public_key: 'xyz',
-    website_url: 'http://example.com/example=1',
-    language_pool: '...'
-  }
+#### Geetest
 
-  solution = client.decode_fun_captcha(options)
-  solution.token # Solution of the captcha
-  ```
+```ruby
+solution = client.decode_geetest!(
+  website_url:         'http://mywebsite.com/geetest/test.php',
+  gt:                  '874703612e5cac182812a00e273aad0d',
+  challenge:           'a559b82bca2c500101a1c8a4f4204742',
+  # 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
+)
 
-8. **reCAPTCHA V3**
+solution.v3['challenge']
+"3c1c5153aa48011e92883aed820069f3hj"
 
-  This method allows you to solve [reCAPTCHA v3](https://developers.google.com/recaptcha/docs/v3).
+solution.v3['validate']
+"47ad5a0a6eb98a95b2bcd9e9eecc8272"
 
-  There are two methods available:
+solution.v3['seccode']
+"83fa4f2d23005fc91c3a015a1613f803|jordan"
 
-  - `decode_recaptcha_v3`: solves reCAPTCHA v3. It doesn't raise exceptions.
-  - `decode_recaptcha_v3!`: solves reCAPTCHA v3. It may raise an `AntiCaptcha::Error` if something goes wrong.
+# Or
 
-  **Send the `website_key`, `website_url`, `min_score` and `page_action` parameters**
+solution.v4['captcha_id']
+"fcd636b4514bf7ac4143922550b3008b"
 
-  This method requires no browser emulation. You can send four parameters that
-  identify the website in which the CAPTCHA is found and the minimum score (0.3, 0.5 or 0.7) you
-  desire.
+solution.v4['lot_number']
+"354ab6dd4e594fdc903074c4d8d37b24"
 
-  **It's strongly recommended to use a minimum score of 0.3 as higher scores are extremely rare.**
+solution.v4['pass_token']
+"b645946a654e60218c7922b74b3b5ee8e8717e8fd3cd51..."
 
-  ```ruby
-  options = {
-    website_key: 'xyz',
-    website_url: 'http://example.com/example=1',
-    min_score:   0.3,
-    page_action: 'myverify'
-  }
+solution.v4['gen_time']
+"1649921519"
 
-  solution = client.decode_recaptcha_v3!(options)
-  solution.g_recaptcha_response # Solution of the captcha
-  ```
+solution.v4['captcha_output']
+"cFPIALDXSop8Ri2mPABbRWzNBs86N8D4vNUTuVa7wN7E..."
+```
+*Parameters:*
+
+- `website_url`: URL of a target web page. It can be located anywhere on the web site, even in a member's area.
+- `gt`: the domain's public key.
+- `challenge`: changing token key. Make sure you grab a fresh one for each captcha.
+- `geetest_api_server_subdomain`: optional parameter. API subdomain. May be required for some implementations.
+- `geetest_get_lib`: optional parameter. Required for some implementations. Send the JSON encoded into a string. The value can be traced in the browser's developer tools. Put a breakpoint before calling the "initGeetest" function.
+- `version`: optional parameter. Version number. Default version is 3. Supported versions: 3 and 4.
+- `init_parameters`: optional parameter. Additional initialization parameters for version 4.
+- `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.
+
+#### Cloudflare Turnstile
 
-  The solution (`solution.g_recaptcha_response`) will be a code that validates
-  the form, like the following:
+```ruby
+solution = client.decode_turnstile!(
+  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
+)
+
+solution.token
+"0.vtJqmZnvobaUzK2i2PyKaSqHELYtBZfRoPwMvLMdA81WL_9G0vCO3y2VQVIeVplG0mxYF7uX......."
+```
 
-  ```ruby
-  "1JJHJ_VuuHAqJKxcaasbTsqw-L1Sm4gD57PTeaEr9-MaETG1vfu2H5zlcwkjsRoZoHxx6V9yUDw8Ig-hYD8kakmSnnjNQd50w_Y_tI3aDLp-s_7ZmhH6pcaoWWsid5hdtMXyvrP9DscDuCLBf7etLle8caPWSaYCpAq9DOTtj5NpSg6-OeCJdGdkjsakFUMeGeqmje87wSajcjmdjl_w4XZBY2zy8fUH6XoAGZ6AeCTulIljBQDObQynKDd-rutPvKNxZasDk-LbhTfw508g1lu9io6jnvm3kbAdnkfZ0x0PkGiUMHU7hnuoW6bXo2Yn_Zt5tDWL7N7wFtY6B0k7cTy73f8er508zReOuoyz2NqL8smDCmcJu05ajkPGt20qzpURMwHaw"
-  ```
+*Parameters:*
 
-9. **hCaptcha**
+- `website_key`: the site key for the Turnstile.
+- `website_url`: the URL of the page with the Turnstile 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.
 
-  This method allows you to solve hCaptcha.
+### 3. Report an incorrectly solved image CAPTCHA for a refund
 
-  There are two methods available:
+It is only possible to report incorrectly solved image CAPTCHAs.
 
-  - `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.
+```ruby
+client.report_incorrect_image_catpcha!(task_id)
+```
 
-  **Send the `website_key` and `website_url` parameters**
+### 4. Get your account balance
 
-  This method requires no browser emulation. You can send two parameters that
-  identify the website in which the CAPTCHA is found.
+```ruby
+client.get_balance!
+```
 
-  ```ruby
-  options = {
-    website_key: 'xyz',
-    website_url: 'http://example.com/example=1'
-  }
+### 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
+- `7`  Funcaptcha task
+- `10` Funcaptcha Proxyless task
+- `12` GeeTest with proxy
+- `13` GeeTest without proxy
+- `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
 
-  solution = client.decode_h_captcha!(options)
-  solution.g_recaptcha_response # Solution of the captcha
-  ```
+```ruby
+client.get_queue_stats!(queue_id)
+```
 
 ## Notes
 
-#### Ruby dependencies
+### Ruby dependencies
 
 AntiCaptcha doesn't require specific dependencies. That saves you memory and
 avoid conflicts with other gems.
 
-#### Input image format
+### Input image format
 
-Any format you use in the decode method (file, path, body, body64) will always
-be converted to a body64, which is a binary base64 encoded string. So, if you
-already have this format available on your side, there's no need to do
-convertions before calling the API.
+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.
 
 > Our recomendation is to never convert your image format, unless needed. Let
 > the gem convert internally. It may save you resources (CPU, memory and IO).
 
-#### Versioning
+### Versioning
 
 AntiCaptcha gem uses [Semantic Versioning](http://semver.org/).
 
 # License
 
-MIT License. Copyright (C) 2011-2015 Infosimples. https://infosimples.com/
+MIT License. Copyright (C) 2011-2022 Infosimples. https://infosimples.com/

data/anti_captcha.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", ">= 2.2.33"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/anti_captcha/client.rb

@@ -4,8 +4,7 @@ module AntiCaptcha
   #
   class Client
     BASE_URL = 'https://api.anti-captcha.com/:action'
-    PROXYABLE_TASKS = %w(NoCaptchaTask FunCaptchaTask HCaptchaTask)
-    SUPPORTED_TASKS = %w(ImageToTextTask NoCaptchaTask FunCaptchaTask HCaptchaTask)
+    PROXYABLE_TASKS = %w(RecaptchaV2Task FunCaptchaTask HCaptchaTask GeeTestTask TurnstileTask)
 
     attr_accessor :client_key, :timeout, :polling
 
@@ -14,7 +13,7 @@ module AntiCaptcha
     #
     # @param [String] client_key The key of the Anti Captcha account.
     # @param [Hash]   options  Options hash.
-    # @option options [Integer] :timeout (60) Seconds before giving up of a
+    # @option options [Integer] :timeout (120) Seconds before giving up of a
     #                                         captcha being solved.
     # @option options [Integer] :polling  (5) Seconds before checking answer
     #                                         again.
@@ -23,7 +22,7 @@ module AntiCaptcha
     #
     def initialize(client_key, options = {})
       self.client_key = client_key
-      self.timeout    = options[:timeout] || 60
+      self.timeout    = options[:timeout] || 120
       self.polling    = options[:polling] || 5
     end
 
@@ -75,18 +74,19 @@ module AntiCaptcha
     end
 
     #
-    # Decodes a NoCaptcha CAPTCHA.
+    # Decodes a reCAPTCHA v2 (NoCaptcha).
     #
-    # @see `AntiCaptcha::Client#decode_nocaptcha!`
+    # @see `AntiCaptcha::Client#decode_recaptcha_v2!`
     #
-    def decode_nocaptcha(options, proxy = nil)
-      decode_nocaptcha!(options, proxy)
+    def decode_recaptcha_v2(options, proxy = nil)
+      decode_recaptcha_v2!(options, proxy)
     rescue
-      AntiCaptcha::NoCaptchaSolution.new
+      AntiCaptcha::RecaptchaV2Solution.new
     end
+    alias :decode_nocaptcha :decode_recaptcha_v2
 
     #
-    # Decodes a NoCaptcha CAPTCHA.
+    # Decodes a reCAPTCHA v2 (NoCaptcha).
     #
     # @param [Hash] options Options hash.
     #   @option options [String]  :website_url
@@ -103,16 +103,17 @@ module AntiCaptcha
     #   @option proxy [String]  :proxy_password
     #   @option proxy [String]  :user_agent
     #
-    # @return [AntiCaptcha::NoCaptchaSolution] The solution of the NoCaptcha.
+    # @return [AntiCaptcha::RecaptchaV2Solution] The solution of the reCAPTCHA v2.
     #
-    def decode_nocaptcha!(options, proxy = nil)
-      task = create_task!('NoCaptchaTask', options, proxy)
+    def decode_recaptcha_v2!(options, proxy = nil)
+      task = create_task!('RecaptchaV2Task', options, proxy)
       task_result = get_task_result!(task['taskId'])
-      AntiCaptcha::NoCaptchaSolution.new(task_result)
+      AntiCaptcha::RecaptchaV2Solution.new(task_result)
     end
+    alias :decode_nocaptcha! :decode_recaptcha_v2!
 
     #
-    # Decodes a reCAPTCHA V3.
+    # Decodes a reCAPTCHA v3.
     #
     # @see `AntiCaptcha::Client#decode_recaptcha_v3!`
     #
@@ -123,17 +124,18 @@ module AntiCaptcha
     end
 
     #
-    # Decodes a reCAPTCHA V3. Proxy is not supported.
+    # Decodes a reCAPTCHA v3. Proxy is not supported.
     #
     # @param [Hash] options Options hash.
     #   @option options [String]  :website_url
     #   @option options [String]  :website_key
     #   @option options [String]  :min_score (one of 0.3, 0,5 or 0.7)
     #   @option options [String]  :page_action
+    #   @option options [String]  :is_enterprise
     #   @option options [String]  :language_pool
     #
     # @return [AntiCaptcha::RecaptchaV3Solution] The solution of
-    #                                            the reCAPTCHA V3.
+    #                                            the reCAPTCHA v3.
     #
     def decode_recaptcha_v3!(options)
       task = create_task!('RecaptchaV3TaskProxyless', options)
@@ -203,6 +205,81 @@ module AntiCaptcha
       AntiCaptcha::HCaptchaSolution.new(task_result)
     end
 
+    #
+    # Decodes a Geetest CAPTCHA.
+    #
+    # @see `AntiCaptcha::Client#decode_geetest!`
+    #
+    def decode_geetest(options, proxy = nil)
+      decode_geetest!(options, proxy)
+    rescue
+      AntiCaptcha::GeetestSolution.new
+    end
+
+    #
+    # Decodes a Geetest 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
+    #
+    # @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::GeetestSolution] The solution of the Geetest.
+    #
+    def decode_geetest!(options, proxy = nil)
+      task = create_task!('GeeTestTask', options, proxy)
+      task_result = get_task_result!(task['taskId'])
+      AntiCaptcha::GeetestSolution.new(task_result)
+    end
+
+    #
+    # Decodes a Turnstile CAPTCHA.
+    #
+    # @see `AntiCaptcha::Client#decode_turnstile!`
+    #
+    def decode_turnstile(options, proxy = nil)
+      decode_turnstile!(options, proxy)
+    rescue
+      AntiCaptcha::TurnstileSolution.new
+    end
+
+    #
+    # Decodes a Turnstile 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_password
+    #
+    # @return [AntiCaptcha::TurnstileSolution] The solution of the Turnstile.
+    #
+    def decode_turnstile!(options, proxy = nil)
+      task = create_task!('TurnstileTask', options, proxy)
+      task_result = get_task_result!(task['taskId'])
+      AntiCaptcha::TurnstileSolution.new(task_result)
+    end
+
     # Creates a task for solving the selected CAPTCHA type.
     #
     # @param [String] type The type of the CAPTCHA.
@@ -262,9 +339,9 @@ module AntiCaptcha
           comment:   options[:comment],
         }
 
-      when 'NoCaptchaTask'
+      when 'RecaptchaV2Task'
         args[:task] = {
-          type:       'NoCaptchaTask',
+          type:       'RecaptchaV2Task',
           websiteURL: options[:website_url],
           websiteKey: options[:website_key],
         }
@@ -272,11 +349,13 @@ module AntiCaptcha
       when 'RecaptchaV3TaskProxyless'
         args[:task] = {
           type: 'RecaptchaV3TaskProxyless',
-          websiteURL: options[:website_url],
-          websiteKey: options[:website_key],
-          minScore:   options[:min_score].to_f,
-          pageAction: options[:page_action],
+          websiteURL:   options[:website_url],
+          websiteKey:   options[:website_key],
+          minScore:     (options[:min_score] || 0.3).to_f,
+          pageAction:   options[:page_action],
         }
+        args[:isEnterprise] = options[:is_enterprise] if [true, false].include?(options[:is_enterprise])
+
 
       when 'FunCaptchaTask'
         args[:task] = {
@@ -287,14 +366,32 @@ module AntiCaptcha
 
       when 'HCaptchaTask'
         args[:task] = {
-          type: 'HCaptchaTask',
+          type:       'HCaptchaTask',
+          websiteURL: options[:website_url],
+          websiteKey: options[:website_key],
+        }
+
+      when 'GeeTestTask'
+        args[:task] = {
+          type:       'GeeTestTask',
+          websiteURL: options[:website_url],
+          gt:          options[:gt],
+          challenge:   options[:challenge],
+        }
+        args[:geetestApiServerSubdomain] = options[:geetest_api_server_subdomain] if !options[:geetest_api_server_subdomain].nil?
+        args[:geetestGetLib]             = options[:geetest_get_lib]              if !options[:geetest_get_lib].nil?
+        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],
         }
 
       else
-        message = "Invalid task type: '#{type}'. Allowed types: " +
-          "#{SUPPORTED_TASKS.join(', ')}"
+        message = "Invalid task type: '#{type}'."
         raise AntiCaptcha::ArgumentError.new(message)
       end
 
@@ -365,6 +462,8 @@ module AntiCaptcha
     #                          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/geetest_solution.rb

@@ -0,0 +1,30 @@
+module AntiCaptcha
+  class GeetestSolution < AntiCaptcha::Solution
+    attr_accessor :v3, :v4
+
+    def initialize(task_result = nil)
+      super
+
+      if task_result
+        solution = task_result.api_result['solution']
+
+        if solution['pass_token']
+          @v4 = {
+            'captcha_id'     => solution['captcha_id'],
+            'lot_number'     => solution['lot_number'],
+            'pass_token'     => solution['pass_token'],
+            'gen_time'       => solution['gen_time'],
+            'captcha_output' => solution['captcha_output'],
+          }
+
+        else
+          @v3 = {
+            'challenge' => solution['challenge'],
+            'validate'  => solution['validate'],
+            'seccode'   => solution['seccode'],
+          }
+        end
+      end
+    end
+  end
+end

data/lib/anti_captcha/models/h_captcha_solution.rb

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

data/lib/anti_captcha/models/{no_captcha_solution.rb → recaptcha_v2_solution.rb}

@@ -1,5 +1,5 @@
 module AntiCaptcha
-  class NoCaptchaSolution < AntiCaptcha::Solution
+  class RecaptchaV2Solution < AntiCaptcha::Solution
     attr_accessor :g_recaptcha_response, :g_recaptcha_response_md5
 
     def initialize(task_result = nil)

data/lib/anti_captcha/models/task_result.rb

@@ -1,7 +1,7 @@
 module AntiCaptcha
   class TaskResult < AntiCaptcha::Model
     attr_accessor :task_id, :error_id, :error_code, :error_description, :status,
-    :cost, :ip, :create_time, :end_time, :solve_count, :api_result
+                  :cost, :ip, :create_time, :end_time, :solve_count, :api_result
 
     def initialize(api_result, task_id)
       @task_id = task_id

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.3.0"
+  VERSION = "2.5.0"
   USER_AGENT = "AntiCaptcha/Ruby v#{VERSION}"
 end

data/lib/anti_captcha.rb

@@ -33,10 +33,12 @@ require 'anti_captcha/http'
 require 'anti_captcha/errors'
 require 'anti_captcha/models/solution'
 require 'anti_captcha/models/image_to_text_solution'
-require 'anti_captcha/models/no_captcha_solution'
+require 'anti_captcha/models/recaptcha_v2_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/geetest_solution'
+require 'anti_captcha/models/turnstile_solution'
 require 'anti_captcha/models/task_result'
 require 'anti_captcha/client'
 require 'anti_captcha/version'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: anti_captcha
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Infosimples
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -75,12 +75,14 @@ files:
 - lib/anti_captcha/errors.rb
 - 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/no_captcha_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:
@@ -101,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: Ruby API for Anti Captcha (CAPTCHA Solver as a Service)