two_captcha 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 020a0e50cda97516940c1b430cff1432dad0ce34
-  data.tar.gz: 030416788dfa9f339cc9645e1ed0d2428767da01
+SHA256:
+  metadata.gz: ea861217de7f6655a791908c0a8e8935b36d22fce3eb916e16ac0a8c7ccccef7
+  data.tar.gz: 9e87f7308dd3127a986a9204abd8a640033f19b0f0d87df53edd5e932bfaad90
 SHA512:
-  metadata.gz: 2fe57791572de606158764bddc2aa86856df09649cbf82d386a1965a558c90c1f53c661e92f7d45f280aec6863a592a6ebffa324d2ba2adc26914e2052d01fd7
-  data.tar.gz: 4aac7b9588bef5e641922ccb405ff89ce301b022f50df2071742f89fe1b89753261d43fe9b370fc5af29831ce3ac3a29de23c2b918dea4e675617888b62bdac7
+  metadata.gz: 1f00da9ab5ba1fc674aeb5af1b2423a0ec345ca7ceeac33368a5254277807bf406363aea59350c11938be5f7336154d275b06141b5b58592b004bfaf83817c5f
+  data.tar.gz: c3b9134f597e250de37caf4d6ec24afe70f6a6a507f7f578e24686d934db2ddcc4551c5f137eeb64c3c3bb33a1fa41dcbc00804e5430554d31ab70b081216ff2

data/README.md

@@ -66,10 +66,13 @@ Or install it yourself as:
   captcha = client.captcha('130920620') # with 130920620 as the captcha id
   ```
 
-4. **Report incorrectly solved captcha for refund**
+4. **Report incorrectly (for refund) or correctly (useful for reCAPTCHA v3) solved captcha**
 
   ```ruby
-  client.report!('130920620') # with 130920620 as the captcha id
+  client.report!('130920620', 'reportbad') # with 130920620 as the captcha id
+  # return true if successfully reported
+
+  client.report!('256892751', 'reportgood') # with 256892751 as the captcha id
   # return true if successfully reported
   ```
 
@@ -96,7 +99,7 @@ Or install it yourself as:
   # return an XML string with the current service load.
   ```
 
-## Clickable CAPTCHAs (e.g. "No CAPTCHA reCAPTCHA")
+## reCAPTCHA v2 (e.g. "No CAPTCHA reCAPTCHA")
 
 There are two ways of solving captchas similar to
 [reCAPTCHA v2](https://support.google.com/recaptcha/?hl=en#6262736).
@@ -115,7 +118,7 @@ for more information.
     pageurl: 'http://example.com/example=1'
   }
 
-  client.decode_recaptcha_v2(options)
+  captcha = client.decode_recaptcha_v2(options)
   captcha.text        # Solution of the captcha
   captcha.id          # Numeric ID of the captcha solved by TwoCaptcha
   ```
@@ -165,6 +168,37 @@ The response will be a simple text:
 '61267'
 ```
 
+## reCAPTCHA v3
+
+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.
+
+**It's strongly recommended to use a minimum score of 0.3 as higher scores are extremely rare.**
+
+Please read the [oficial documentation](https://2captcha.com/2captcha-api#solving_recaptchav3)
+for more information.
+
+  ```ruby
+  options = {
+    googlekey: 'xyz',
+    pageurl:   'http://example.com/example=1',
+    action:    'verify',
+    min_score: 0.3
+  }
+
+  captcha = client.decode_recaptcha_v3(options)
+  captcha.text        # Solution of the captcha
+  captcha.id          # Numeric ID of the captcha solved by TwoCaptcha
+  ```
+
+The solution (`captcha.text`) will be a code that validates the form, like the
+following:
+
+  ```ruby
+  "1JJHJ_VuuHAqJKxcaasbTsqw-L1Sm4gD57PTeaEr9-MaETG1vfu2H5zlcwkjsRoZoHxx6V9yUDw8Ig-hYD8kakmSnnjNQd50w_Y_tI3aDLp-s_7ZmhH6pcaoWWsid5hdtMXyvrP9DscDuCLBf7etLle8caPWSaYCpAq9DOTtj5NpSg6-OeCJdGdkjsakFUMeGeqmje87wSajcjmdjl_w4XZBY2zy8fUH6XoAGZ6AeCTulIljBQDObQynKDd-rutPvKNxZasDk-LbhTfw508g1lu9io6jnvm3kbAdnkfZ0x0PkGiUMHU7hnuoW6bXo2Yn_Zt5tDWL7N7wFtY6B0k7cTy73f8er508zReOuoyz2NqL8smDCmcJu05ajkPGt20qzpURMwHaw"
+  ```
+
 ## Notes
 
 #### Thread-safety

data/lib/two_captcha/client.rb

@@ -122,6 +122,55 @@ module TwoCaptcha
       decoded_captcha
     end
 
+    #
+    # Solve reCAPTCHA v3.
+    #
+    # @param [Hash] options Options hash. Check docs for the method decode!.
+    #
+    # @return [TwoCaptcha::Captcha] The solution of the given captcha.
+    #
+    def decode_recaptcha_v3(options = {})
+      decode_recaptcha_v3!(options)
+    rescue TwoCaptcha::Error => ex
+      TwoCaptcha::Captcha.new
+    end
+
+    #
+    # Solve reCAPTCHA v3.
+    #
+    # @param [Hash] options Options hash.
+    # @option options [String]  :googlekey The open key of the site in which recaptcha is installed.
+    # @option options [String]  :pageurl The URL of the page where the recaptcha is encountered.
+    # @option options [String]  :action The action paramenter present on the page that uses recaptcha.
+    # @option options [String]  :min_score The minimum score necessary to pass the challenge.
+    #
+    # @return [TwoCaptcha::Captcha] The solution of the given captcha.
+    #
+    def decode_recaptcha_v3!(options = {})
+      started_at = Time.now
+
+      fail(TwoCaptcha::GoogleKey) if options[:googlekey].empty?
+
+      upload_options = {
+        method:    'userrecaptcha',
+        version:   'v3',
+        googlekey: options[:googlekey],
+        pageurl:   options[:pageurl],
+        action:    options[:action],
+        min_score: options[:min_score]
+      }
+      decoded_captcha = upload(upload_options)
+
+      # pool untill the answer is ready
+      while decoded_captcha.text.to_s.empty?
+        sleep([polling, 10].max) # sleep at least 10 seconds
+        decoded_captcha = captcha(decoded_captcha.id)
+        fail TwoCaptcha::Timeout if (Time.now - started_at) > timeout
+      end
+
+      decoded_captcha
+    end
+
     # Upload a captcha to 2Captcha.
     #
     # This method will not return the solution. It helps on separating concerns.
@@ -167,11 +216,12 @@ module TwoCaptcha
     # Report incorrectly solved captcha for refund.
     #
     # @param [Integer] id Numeric ID of the captcha.
+    # @param [Integer] action 'reportbad' (default) or 'reportgood'.
     #
     # @return [Boolean] true if correctly reported
     #
-    def report!(captcha_id)
-      response = request('res', :get, action: 'reportbad', id: captcha_id)
+    def report!(captcha_id, action = 'reportbad')
+      response = request('res', :get, action: action, id: captcha_id)
       response == 'OK_REPORT_RECORDED'
     end
 

data/lib/two_captcha/version.rb

@@ -1,4 +1,4 @@
 module TwoCaptcha
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
   USER_AGENT = "TwoCaptcha/Ruby v#{VERSION}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: two_captcha
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Rafael Barbolo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby API for 2Captcha (Captcha Solver as a Service)