yandex-smartcaptcha-solver 1.0.0 → 1.0.1

package/index.js

@@ -3,6 +3,7 @@ const { v4: uuidv4 } = require('uuid');
 const FormData = require('form-data');
 const fs = require('fs');
 const path = require('path');
+const { SocksProxyAgent } = require('socks-proxy-agent');
 
 /**
  * Yandex SmartCaptcha Solver
@@ -51,7 +52,7 @@ class YandexSmartCaptchaSolver {
             siteUrl: config.siteUrl,
             siteKey: config.siteKey,
             host: url.hostname,
-            coreName: config.coreName || null,  // Опциональное имя ядра
+            coreName: config.coreName || null,
             
             // Опции
             userAgent: options.userAgent || 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
@@ -68,7 +69,17 @@ class YandexSmartCaptchaSolver {
             recognizedText: null
         };
         
-        this.axios = axios.create({
+        if (this.config.saveImages && !fs.existsSync(this.config.imagesDir)) {
+            fs.mkdirSync(this.config.imagesDir, { recursive: true });
+        }
+    }
+
+    /**
+     * Создать axios инстанс с опциональным прокси
+     * @private
+     */
+    _createAxiosInstance(proxy = null) {
+        const axiosConfig = {
             headers: {
                 'User-Agent': this.config.userAgent,
                 'Accept': '*/*',
@@ -76,11 +87,22 @@ class YandexSmartCaptchaSolver {
                 'Accept-Encoding': 'gzip, deflate, br'
             },
             timeout: this.config.timeout
-        });
+        };
         
-        if (this.config.saveImages && !fs.existsSync(this.config.imagesDir)) {
-            fs.mkdirSync(this.config.imagesDir, { recursive: true });
+        // Добавляем прокси агент, если указан
+        if (proxy) {
+            const proxyUrl = proxy.username && proxy.password
+                ? `socks5://${proxy.username}:${proxy.password}@${proxy.host}:${proxy.port}`
+                : `socks5://${proxy.host}:${proxy.port}`;
+            
+            const proxyAgent = new SocksProxyAgent(proxyUrl);
+            axiosConfig.httpAgent = proxyAgent;
+            axiosConfig.httpsAgent = proxyAgent;
+            
+            this._log(`Using SOCKS5 proxy: ${proxy.host}:${proxy.port}`, 'info');
         }
+        
+        return axios.create(axiosConfig);
     }
 
     /**
@@ -146,7 +168,7 @@ class YandexSmartCaptchaSolver {
      * Первый запрос к Yandex SmartCaptcha
      * @private
      */
-    async _firstCheck() {
+    async _firstCheck(axiosInstance) {
         this._log('Performing first check request...', 'debug');
 
         const url = `https://smartcaptcha.yandexcloud.net/check?host=${this.config.host}&sitekey=${this.config.siteKey}&href=${encodeURIComponent(this.config.siteUrl)}`;
@@ -161,7 +183,7 @@ class YandexSmartCaptchaSolver {
             'Sec-Fetch-Site': 'same-origin'
         };
 
-        const response = await this.axios.post(url, data, { headers });
+        const response = await axiosInstance.post(url, data, { headers });
         return response.data;
     }
 
@@ -169,7 +191,7 @@ class YandexSmartCaptchaSolver {
      * Второй запрос к Yandex SmartCaptcha
      * @private
      */
-    async _secondCheck(captchaKey) {
+    async _secondCheck(captchaKey, axiosInstance) {
         this._log('Performing second check request...', 'debug');
 
         const url = `https://smartcaptcha.yandexcloud.net/check?host=${this.config.host}&sitekey=${this.config.siteKey}&href=${encodeURIComponent(this.config.siteUrl)}`;
@@ -183,7 +205,7 @@ class YandexSmartCaptchaSolver {
             'Sec-Fetch-Site': 'same-origin'
         };
 
-        const response = await this.axios.post(url, data, { headers });
+        const response = await axiosInstance.post(url, data, { headers });
         return response.data;
     }
 
@@ -191,10 +213,10 @@ class YandexSmartCaptchaSolver {
      * Получить изображение капчи
      * @private
      */
-    async _getImage(imageUrl) {
+    async _getImage(imageUrl, axiosInstance) {
         this._log('Downloading captcha image...', 'debug');
 
-        const response = await this.axios.get(imageUrl, {
+        const response = await axiosInstance.get(imageUrl, {
             responseType: 'arraybuffer',
             headers: {
                 'Referer': 'https://smartcaptcha.yandexcloud.net/'
@@ -298,7 +320,7 @@ class YandexSmartCaptchaSolver {
      * Отправить результат в Yandex
      * @private
      */
-    async _submit(captchaKey, encodedResult) {
+    async _submit(captchaKey, encodedResult, axiosInstance) {
         this._log('Submitting answer to Yandex...', 'info');
 
         // Задержка для имитации человека
@@ -318,37 +340,45 @@ class YandexSmartCaptchaSolver {
             'Sec-Fetch-Site': 'same-origin'
         };
 
-        const response = await this.axios.post(url, data, { headers });
+        const response = await axiosInstance.post(url, data, { headers });
         return response.data;
     }
 
     /**
      * Решить капчу
+     * @param {Object} [proxy] - Настройки SOCKS5 прокси (опционально)
+     * @param {string} [proxy.host] - Хост прокси (например: '127.0.0.1')
+     * @param {number} [proxy.port] - Порт прокси (например: 1080)
+     * @param {string} [proxy.username] - Логин для прокси (опционально)
+     * @param {string} [proxy.password] - Пароль для прокси (опционально)
      * @returns {Promise<Object>} Результат с полями status и token (spravka)
      * @throws {Error} При неудаче
      * @example
-     * const result = await solver.solve();
+     * const result = await solver.solve({ host: '127.0.0.1', port: 1080 });
      * console.log(result); // { status: 'ok', token: 'dD0x...' }
      */
-    async solve() {
+    async solve(proxy = null) {
         let imageBuffer = null;
 
         try {
             this._log('Starting captcha solving process...', 'info');
             
+            // Создаем axios инстанс с прокси
+            const axiosInstance = this._createAxiosInstance(proxy);
+            
             // Генерируем GUID
             const guid = uuidv4();
             this._log(`Generated GUID: ${guid}`, 'debug');
 
             // Первый запрос
-            const firstResponse = await this._firstCheck();
+            const firstResponse = await this._firstCheck(axiosInstance);
             if (!firstResponse.captcha?.key) {
                 throw new Error('No captcha key received from first request');
             }
             this._log('First captcha key received', 'debug');
 
             // Второй запрос
-            const secondResponse = await this._secondCheck(firstResponse.captcha.key);
+            const secondResponse = await this._secondCheck(firstResponse.captcha.key, axiosInstance);
             if (!secondResponse.captcha?.image) {
                 throw new Error('No captcha image URL received');
             }
@@ -357,23 +387,22 @@ class YandexSmartCaptchaSolver {
             this._log('Second captcha key received', 'debug');
 
             // Получаем и распознаем изображение
-            imageBuffer = await this._getImage(secondResponse.captcha.image);
+            imageBuffer = await this._getImage(secondResponse.captcha.image, axiosInstance);
             const recognizedText = await this._recognize(imageBuffer);
             
             // Кодируем и отправляем
             const encodedResult = this._encode(recognizedText);
             this._log(`Encoded result: ${encodedResult}`, 'debug');
             
-            const finalResponse = await this._submit(captchaKey, encodedResult);
+            const finalResponse = await this._submit(captchaKey, encodedResult, axiosInstance);
 
             // Проверяем результат
             if (finalResponse.status === 'ok') {
                 this._log('Captcha solved successfully!', 'info');
                 this._saveImage(imageBuffer, recognizedText, true);
-                
                 return {
                     status: 'ok',
-                    token: finalResponse.token || finalResponse.key
+                    token: finalResponse.spravka
                 };
             } else {
                 // Неудача - сообщаем XEvil
@@ -398,18 +427,19 @@ class YandexSmartCaptchaSolver {
      * Решить капчу с автоматическими повторными попытками
      * @param {number} [maxAttempts=3] - Максимальное количество попыток
      * @param {number} [retryDelay=3000] - Задержка между попытками (мс)
+     * @param {Object} [proxy] - Настройки SOCKS5 прокси (опционально)
      * @returns {Promise<Object>} Результат с полями status и token
      * @throws {Error} Если все попытки неудачны
      * @example
-     * const result = await solver.solveWithRetry(5, 4000);
+     * const result = await solver.solveWithRetry(5, 4000, { host: '127.0.0.1', port: 1080 });
      */
-    async solveWithRetry(maxAttempts = 3, retryDelay = 3000) {
+    async solveWithRetry(maxAttempts = 3, retryDelay = 3000, proxy = null) {
         this._log(`Will attempt to solve up to ${maxAttempts} times`, 'info');
 
         for (let attempt = 1; attempt <= maxAttempts; attempt++) {
             try {
                 this._log(`Attempt ${attempt}/${maxAttempts}`, 'info');
-                const result = await this.solve();
+                const result = await this.solve(proxy);
                 this._log(`Successfully solved on attempt ${attempt}!`, 'info');
                 return result;
             } catch (error) {
@@ -426,4 +456,4 @@ class YandexSmartCaptchaSolver {
     }
 }
 
-module.exports = YandexSmartCaptchaSolver;
+module.exports = YandexSmartCaptchaSolver;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yandex-smartcaptcha-solver",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Automatic Yandex SmartCaptcha solver using XEvil OCR service",
   "main": "index.js",
   "scripts": {