@2captcha/captcha-solver 1.1.1 → 1.3.0

package/dist/utils/checkCaptchaParams.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // 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'];
+    "turnstile", "base64", "capy", "datadome", "cybersiara", "mt_captcha", "bounding_box", 'friendly_captcha', 'grid',
+    'textcaptcha', 'canvas', 'rotatecaptcha', 'keycaptcha', 'cutcaptcha', 'tencent', 'atb_captcha', 'audio'];
 // Names of required fields that must be contained in the parameters captcha
 const recaptchaRequiredFields = ['pageurl', 'googlekey'];
 const hcaptchaRequiredFields = ['pageurl', 'sitekey'];
@@ -17,11 +18,19 @@ const turnstileRequiredFields = ['pageurl', 'sitekey'];
 const base64RequiredFields = ['body'];
 const capyPuzzleRequiredFields = ['captchakey'];
 const dataDomeRequiredFields = ['pageurl', 'captcha_url', 'userAgent', 'proxy', 'proxytype'];
-const сyberSiARARequiredFields = ['pageurl', 'master_url_id', 'userAgent'];
-const mtСaptchaRequiredFields = ['pageurl', 'sitekey'];
+const cyberSiARARequiredFields = ['pageurl', 'master_url_id', 'userAgent'];
+const mtCaptchaRequiredFields = ['pageurl', 'sitekey'];
 const boundingBoxRequiredFields = ['image']; // and textinstructions or imginstructions
 const friendlyCaptchaFields = ['pageurl', 'sitekey'];
 const gridRequiredFields = ['body']; // and textinstructions or imginstructions
+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'];
+const tencentRequiredFields = ['pageurl', 'app_id'];
+const atbCaptchaRequiredFields = ['pageurl', 'app_id', 'api_server'];
+const audioRequiredFields = ['body', 'lang'];
 /**
  * Getting required arguments for a captcha.
  *
@@ -71,10 +80,10 @@ const getRequiredFildsArr = (method) => {
             requiredFieldsArr = dataDomeRequiredFields;
             break;
         case "cybersiara":
-            requiredFieldsArr = сyberSiARARequiredFields;
+            requiredFieldsArr = cyberSiARARequiredFields;
             break;
         case "mt_captcha":
-            requiredFieldsArr = mtСaptchaRequiredFields;
+            requiredFieldsArr = mtCaptchaRequiredFields;
             break;
         case "bounding_box":
             requiredFieldsArr = boundingBoxRequiredFields;
@@ -82,10 +91,42 @@ const getRequiredFildsArr = (method) => {
         case "friendly_captcha":
             requiredFieldsArr = friendlyCaptchaFields;
             break;
+        case "textcaptcha":
+            requiredFieldsArr = textCaptchaRequiredFields;
+            break;
+        case "canvas":
+            requiredFieldsArr = canvasRequiredFields;
+            break;
+        case "rotatecaptcha":
+            requiredFieldsArr = rotateRequiredFields;
+            break;
+        case "keycaptcha":
+            requiredFieldsArr = keycaptchaRequiredFields;
+            break;
+        case "cutcaptcha":
+            requiredFieldsArr = cutcaptchaRequiredFields;
+            break;
+        case "tencent":
+            requiredFieldsArr = tencentRequiredFields;
+            break;
+        case "atb_captcha":
+            requiredFieldsArr = atbCaptchaRequiredFields;
+            break;
+        case "audio":
+            requiredFieldsArr = audioRequiredFields;
+            break;
     }
     return requiredFieldsArr;
 };
 /**
+ * ### Captcha Required Parameters Check.
+ *
+ * Checking required captcha parameters before sending.
+ * This function checks for required fields in the provided captcha parameters.
+ * Throws an error if the specified method is not supported or if required fields are missing.
+ *
+ * Note: The `checkCaptchaParams()` function should be called after `renameParams()`, if function `renameParams()` is used.
+ *
  * @param { Object } params Captcha parameters that need to be checked.
  * @returns true | false | Error
  * @example
@@ -109,22 +150,14 @@ function checkCaptchaParams(params, method) {
             isCorrectCaptchaParams = true;
         }
     });
-    if (method === "bounding_box") {
-        if (params.hasOwnProperty('textinstructions') || params.hasOwnProperty('imginstructions')) {
-            isCorrectCaptchaParams = true;
-        }
-        else {
-            isCorrectCaptchaParams = false;
-            throw new Error(`Error when check params captcha.\nNot found "textinstructions" or "imginstructions" field in the Object. One of this field is required for "bounding_box" method. Please add field "textinstructions" or "imginstructions" in object and try again.\nPlease correct your code for the "bounding_box" method according to the code examples.`);
-        }
-    }
-    if (method === "grid") {
+    //The parameters `textinstructions` and `imginstructions` are mandatory for the methods `bounding_box`, `grid`, and `canvas`.
+    if (method === "bounding_box" || method === "grid" || method === "canvas") {
         if (params.hasOwnProperty('textinstructions') || params.hasOwnProperty('imginstructions')) {
             isCorrectCaptchaParams = true;
         }
         else {
             isCorrectCaptchaParams = false;
-            throw new Error(`Error when check params captcha.\nNot found "textinstructions" or "imginstructions" field in the Object. One of this field is required for "Grid" method. Please add field "textinstructions" or "imginstructions" in object and try again.\nPlease correct your code for the "Grid" method according to the code examples.`);
+            throw new Error(`Error when check params captcha.\nNot found "textinstructions" or "imginstructions" field in the Object. One of this field is required for "${method}" method. Please add field "textinstructions" or "imginstructions" to captcha parameters.`);
         }
     }
     return isCorrectCaptchaParams;

package/dist/utils/renameParams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renameParams.d.ts","sourceRoot":"","sources":["../../src/utils/renameParams.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,EAAE,GAAG,OAwB/C"}
+{"version":3,"file":"renameParams.d.ts","sourceRoot":"","sources":["../../src/utils/renameParams.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,EAAE,GAAG,OA0C/C"}

package/dist/utils/renameParams.js

@@ -16,12 +16,26 @@ function renameParams(params) {
     * Captcha parameters that need to be renamed before sent to the API.
     */
     const replaceParams = {
+        // Grid
         "cols": "recaptchacols",
         "rows": "recaptcharows",
         "minClicks": "min_clicks",
         "maxClicks": "max_clicks",
         "canSkip": "can_no_answer",
-        "previousId": "previousID"
+        "previousId": "previousID",
+        "imgType": "img_type",
+        // KeyCaptcha
+        "userId": "s_s_c_user_id",
+        "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",
+        // Tencent
+        "appId": "app_id",
+        // atbCAPTCHA
+        "apiServer": "api_server",
     };
     for (let key in params) {
         if (replaceParams.hasOwnProperty(key)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2captcha/captcha-solver",
-  "version": "1.1.1",
+  "version": "1.3.0",
   "description": "JavaScript library for easy integration with the API of 2captcha captcha solving service to bypass reCAPTCHA, hCaptcha, funcaptcha, geetest and solve any other captchas.",
   "main": "dist/index.js",
   "repository": {