Update server.js

server.js

@@ -1,10 +1,7 @@
 import express from 'express';
 import { chromium } from 'playwright-core';
 import cors from 'cors';
-import { spawn } from 'child_process';
-import { promises as fs } from 'fs';
-import { tmpdir } from 'os';
-import { join } from 'path';
+import { solve } from './solver.js';
 
 const app = express();
 const PORT = process.env.PORT || 7860;
@@ -12,162 +9,6 @@ const PORT = process.env.PORT || 7860;
 app.use(cors());
 app.use(express.json());
 
-async function solveRecaptcha(page) {
-  const startTime = Date.now();
-  
-  await page.waitForTimeout(3000);
-  
-  const frames = page.frames();
-  let recaptchaFrame = null;
-  let bframe = null;
-  
-  for (const frame of frames) {
-    const url = frame.url();
-    if (url.includes('google.com/recaptcha/api2/anchor')) {
-      recaptchaFrame = frame;
-    }
-    if (url.includes('google.com/recaptcha/api2/bframe')) {
-      bframe = frame;
-    }
-  }
-  
-  if (!recaptchaFrame) {
-    await page.waitForTimeout(2000);
-    const updatedFrames = page.frames();
-    for (const frame of updatedFrames) {
-      const url = frame.url();
-      if (url.includes('google.com/recaptcha/api2/anchor')) {
-        recaptchaFrame = frame;
-        break;
-      }
-    }
-  }
-  
-  if (!recaptchaFrame) {
-    throw new Error('reCAPTCHA frame not found');
-  }
-  
-  const checkbox = await recaptchaFrame.$('#recaptcha-anchor');
-  if (!checkbox) {
-    throw new Error('reCAPTCHA checkbox not found');
-  }
-  
-  await checkbox.click();
-  await page.waitForTimeout(2000);
-  
-  const isChecked = await recaptchaFrame.$eval('#recaptcha-anchor', el => 
-    el.getAttribute('aria-checked') === 'true'
-  );
-  
-  if (isChecked) {
-    console.log('[Solver] reCAPTCHA solved with checkbox click');
-    return true;
-  }
-  
-  await page.waitForTimeout(2000);
-  const bframes = page.frames().filter(f => f.url().includes('google.com/recaptcha/api2/bframe'));
-  
-  if (bframes.length === 0) {
-    throw new Error('Challenge frame not found');
-  }
-  
-  bframe = bframes[0];
-  
-  const audioButton = await bframe.$('#recaptcha-audio-button');
-  if (!audioButton) {
-    throw new Error('Audio button not found');
-  }
-  
-  await audioButton.click();
-  await page.waitForTimeout(2000);
-  
-  const audioSource = await bframe.$('#audio-source');
-  if (!audioSource) {
-    throw new Error('Audio source not found');
-  }
-  
-  const audioUrl = await audioSource.getAttribute('src');
-  if (!audioUrl) {
-    throw new Error('Audio URL not found');
-  }
-  
-  const response = await page.context().request.get(audioUrl);
-  const audioBuffer = await response.body();
-  
-  const tempDir = tmpdir();
-  const audioPath = join(tempDir, `audio_${Date.now()}.mp3`);
-  const wavPath = join(tempDir, `audio_${Date.now()}.wav`);
-  
-  await fs.writeFile(audioPath, audioBuffer);
-  
-  await new Promise((resolve, reject) => {
-    const ffmpeg = spawn('ffmpeg', [
-      '-i', audioPath,
-      '-ar', '16000',
-      '-ac', '1',
-      '-y',
-      wavPath
-    ]);
-    
-    ffmpeg.stderr.on('data', (data) => {
-      console.log('[FFmpeg]', data.toString());
-    });
-    
-    ffmpeg.on('close', (code) => {
-      if (code === 0) {
-        resolve();
-      } else {
-        reject(new Error(`FFmpeg exited with code ${code}`));
-      }
-    });
-    
-    ffmpeg.on('error', reject);
-  });
-  
-  let Vosk;
-  try {
-    Vosk = (await import('vosk')).default;
-  } catch (err) {
-    throw new Error('Vosk module not found. Install with: npm install vosk');
-  }
-  
-  const modelPath = '/app/node_modules/recaptcha-solver/model';
-  const model = new Vosk.Model(modelPath);
-  const rec = new Vosk.Recognizer({ model, sampleRate: 16000 });
-  
-  const wavData = await fs.readFile(wavPath);
-  rec.acceptWaveform(wavData);
-  const result = JSON.parse(rec.finalResult());
-  
-  const transcription = result.text.replace(/[^a-z ]/gi, '').trim();
-  
-  console.log('[Solver] Transcription:', transcription);
-  
-  const audioInput = await bframe.$('#audio-response');
-  if (!audioInput) {
-    throw new Error('Audio input not found');
-  }
-  
-  await audioInput.fill(transcription);
-  await page.waitForTimeout(500);
-  
-  const verifyButton = await bframe.$('#recaptcha-verify-button');
-  if (!verifyButton) {
-    throw new Error('Verify button not found');
-  }
-  
-  await verifyButton.click();
-  await page.waitForTimeout(3000);
-  
-  await fs.unlink(audioPath).catch(() => {});
-  await fs.unlink(wavPath).catch(() => {});
-  
-  const solveTime = ((Date.now() - startTime) / 1000).toFixed(2);
-  console.log(`[Solver] Solved in ${solveTime}s`);
-  
-  return true;
-}
-
 app.get('/', (req, res) => {
   res.json({
     status: 'ok',
@@ -221,28 +62,10 @@ app.get('/api/solve', async (req, res) => {
     const page = await context.newPage();
     
     await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 60000 });
-    
-    await page.waitForTimeout(5000);
 
-    const recaptchaExists = await page.evaluate(() => {
-      return !!document.querySelector('iframe[src*="google.com/recaptcha"]');
-    });
-
-    if (!recaptchaExists) {
-      await browser.close();
-      return res.status(404).json({
-        success: false,
-        error: 'No reCAPTCHA detected',
-        message: 'The page does not contain a reCAPTCHA iframe',
-        timestamp: new Date().toISOString()
-      });
-    }
-
-    console.log('[API] reCAPTCHA detected, attempting to solve...');
+    console.log('[API] Attempting to solve reCAPTCHA...');
     
-    await solveRecaptcha(page);
-
-    await page.waitForTimeout(2000);
+    await solve(page);
 
     const solveTime = ((Date.now() - startTime) / 1000).toFixed(2);
     console.log(`[API] reCAPTCHA solved in ${solveTime}s`);
@@ -319,24 +142,9 @@ app.post('/api/solve', async (req, res) => {
     
     const page = await context.newPage();
     await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 60000 });
-    
-    await page.waitForTimeout(5000);
-
-    const recaptchaExists = await page.evaluate(() => {
-      return !!document.querySelector('iframe[src*="google.com/recaptcha"]');
-    });
-
-    if (!recaptchaExists) {
-      await browser.close();
-      return res.status(404).json({
-        success: false,
-        error: 'No reCAPTCHA detected',
-        timestamp: new Date().toISOString()
-      });
-    }
 
     console.log('[API] Attempting to solve reCAPTCHA...');
-    await solveRecaptcha(page);
+    await solve(page);
 
     await page.waitForTimeout(2000);