Add Cutcaptcha method

Author: dzmitry-duboyski

README.md

@@ -40,6 +40,7 @@ Examples of API requests for different captcha types are available on the [JavaS
     - [Canvas](#canvas)
     - [Rotate](#rotate)
     - [KeyCaptcha](#keycaptcha)
+    - [Cutcaptcha](#cutcaptcha)
   - [Other methods](#other-methods)
     - [goodReport](#goodreport)
     - [badReport](#badreport)
@@ -576,6 +577,26 @@ solver.keyCaptcha({
     webServerSign: '02f7f9669f1269595c4c69bcd4a3c52e',
     webServerSign2: 'd888700f6f324ec0f32b44c32c50bde1'
 })
+.then((res) => {
+    console.log(res);
+})
+.catch((err) => {
+    console.log(err);
+})
+```
+
+### Cutcaptcha
+
+<sup>[API method description.](https://2captcha.com/2captcha-api#cutcaptcha)</sup>
+
+Use this method to solve Cutcaptcha. Returns the response in JSON.
+
+```js
+solver.cutCaptcha({
+    pageurl: "https://mysite.com/page/with/cutcaptcha",
+    misery_key: "098e6a849af406142e3150dbf4e6d0538db2b51f", 
+    api_key: "SAs61IAI",
+})
 .then((res) => {
 console.log(res);
 })

examples/cutcaptcha.js

@@ -0,0 +1,16 @@
+const TwoCaptcha = require("../dist/index.js");
+require('dotenv').config();
+const APIKEY = process.env.APIKEY
+const solver = new TwoCaptcha.Solver(APIKEY);
+
+solver.cutCaptcha({
+    pageurl: "https://mysite.com/page/with/cutcaptcha",
+    miseryKey: "098e6a849af406142e3150dbf4e6d0538db2b51f", 
+    apiKey: "SAs61IAI",
+})
+.then((res) => {
+console.log(res);
+})
+.catch((err) => {
+console.log(err);
+})

src/structs/2captcha.ts

@@ -208,6 +208,15 @@ export interface paramsMTCaptcha {
     proxytype?: string,
 }
 
+export interface paramsCutcaptcha {
+    pageurl: string,
+    miseryKey: string,
+    apiKey: string,
+    pingback?: string,
+    proxy?: string,
+    proxytype?: string
+}
+
 export interface friendlyCaptcha {
     pageurl: string,
     sitekey: string,
@@ -1234,37 +1243,51 @@ public async mtCaptcha(params: paramsMTCaptcha): Promise<CaptchaAnswer> {
 }
 
 /**
- * ### Solves Cutcaptcha
- * 
- * @param {{ pageurl, sitekey, userAgent, pingback, proxy, proxytype}} params Parameters MTCaptcha as an object.
- * @param {string} params.pageurl 	Full `URL` of the page where you see the captcha.
- * @param {string} params.sitekey TThe value of `sitekey` parameter found on the page.  
- * @param {string} params.pingback URL for pingback (callback) response that will be sent when captcha is solved. URL should be registered on the server. [More info here](https://2captcha.com/2captcha-api#pingback).
- * @param {string} params.proxy Format: `login:password@123.123.123.123:3128` You can find more info about proxies [here](https://2captcha.com/2captcha-api#proxies).
- * @param {string} params.proxytype Type of your proxy: `HTTP`, `HTTPS`, `SOCKS4`, `SOCKS5`.
- * 
- * @example 
- * solver.cutCaptcha({
- *   pageurl: "https://service.mtcaptcha.com/mtcv1/demo/index.html",
- *   sitekey: "MTPublic-DemoKey9M"
- * })
- * .then((res) => {
- *   console.log(res);
- *  })
- * .catch((err) => {
- *   console.log(err);
- * })
- */
-public async cutCaptcha(params: paramsMTCaptcha): Promise<CaptchaAnswer> {
-    checkCaptchaParams(params, "mt_captcha")
+     * ### Solves a Cutcaptcha.
+     * 
+     * Use this method to solve Cutcaptcha. Returns the response in JSON.
+     * [Read more about Cutcaptcha](https://2captcha.com/2captcha-api#Cutcaptcha).
+     * 
+     * @param {{ pageurl, miseryKey, apiKey, pingback, proxy, proxytype }} params Parameters for solving Cutcaptcha as an object.
+     * @param {string} params.pageurl The URL where the captcha is located.
+     * @param {string} params.miseryKey The value of `CUTCAPTCHA_MISERY_KEY` variable defined on page.
+     * @param {string} params.apiKey The value of `data-apikey` attribute of iframe's body. Also the name of javascript file included on the page
+     * @param {string} [params.pingback] Optional param. URL for pingback (callback) response when captcha is solved.
+     * @param {string} [params.proxy] Optional param. Proxy to use while solving the captcha. Format: `login:password@123.123.123.123:3128`.
+     * @param {string} [params.proxytype] Optional param. Type of your proxy: `HTTP`, `HTTPS`, `SOCKS4`, `SOCKS5`.
+     * 
+     * @returns {Promise<CaptchaAnswer>} The result from the solve.
+     * @throws APIError
+     * 
+     * @example
+     * solver.cutCaptcha({
+     *   pageurl: "https://mysite.com/page/with/cutcaptcha",
+     *   miseryKey: "098e6a849af406142e3150dbf4e6d0538db2b51f", 
+     *   apiKey: "SAs61IAI",
+     * })
+     * .then((res) => {
+     *     console.log(res);
+     * })
+     * .catch((err) => {
+     *     console.log(err);
+     * })
+     */
+public async cutCaptcha(params: paramsCutcaptcha): Promise<CaptchaAnswer> {
+    params = renameParams(params)
+    checkCaptchaParams(params, "cutcaptcha")
 
     const payload = {
         ...params,
-        method: "mt_captcha",
+        method: "cutcaptcha",
         ...this.defaultPayload,
     }
 
-    const response = await fetch(this.in + utils.objectToURI(payload))
+    const URL = this.in
+    const response = await fetch(URL, {
+        body: JSON.stringify(payload),
+        method: "post",
+        headers: {'Content-Type': 'application/json'}
+    })
     const result = await response.text()
 
     let data;

src/utils/checkCaptchaParams.ts

@@ -1,6 +1,6 @@
 // Captcha methods for which parameter checking is available
 const supportedMethods = ["userrecaptcha", "hcaptcha", "geetest", "geetest_v4","yandex","funcaptcha","lemin","amazon_waf",
-"turnstile", "base64", "capy","datadome", "cybersiara", "mt_captcha", "bounding_box", 'friendly_captcha', 'grid', 'textcaptcha', 'canvas', 'rotatecaptcha', 'keycaptcha']
+"turnstile", "base64", "capy","datadome", "cybersiara", "mt_captcha", "bounding_box", 'friendly_captcha', 'grid', 'textcaptcha', 'canvas', 'rotatecaptcha', 'keycaptcha', 'cutcaptcha']
 
 // Names of required fields that must be contained in the parameters captcha
 const recaptchaRequiredFields =   ['pageurl','googlekey']
@@ -25,6 +25,7 @@ const textCaptchaRequiredFields = ['textcaptcha']
 const canvasRequiredFields =      ['body'] // and textinstructions or imginstructions
 const rotateRequiredFields =      ['body'] 
 const keycaptchaRequiredFields =  ['pageurl', 's_s_c_user_id', 's_s_c_session_id', 's_s_c_web_server_sign', 's_s_c_web_server_sign2'] 
+const cutcaptchaRequiredFields =  ['pageurl', 'misery_key', 'api_key'] 
 
 /**
  * Getting required arguments for a captcha.
@@ -99,6 +100,9 @@ const getRequiredFildsArr = (method: string):Array<string> => {
     case "keycaptcha":
       requiredFieldsArr = keycaptchaRequiredFields
       break;
+    case "cutcaptcha":
+      requiredFieldsArr = cutcaptchaRequiredFields
+      break;
   }
   return requiredFieldsArr
 }

src/utils/renameParams.ts

@@ -29,6 +29,10 @@ export default function renameParams(params: any) {
     "sessionId":"s_s_c_session_id",
     "webServerSign":"s_s_c_web_server_sign",
     "webServerSign2":"s_s_c_web_server_sign2",
+
+    // Cutcaptcha
+    "miseryKey":"misery_key",
+    "apiKey":"api_key",
   }
 
   for(let key in params) {