Update plugins/cloudflare-bypass.js

plugins/cloudflare-bypass.js

@@ -1,104 +1,79 @@
 const axios = require('axios');
 
-const BASE_URL = 'https://herzaj-turnstile-solver.hf.space';
-
-async function callBypassAPI(url, sitekey) {
-    try {
-        const submitResponse = await axios.get(`${BASE_URL}/turnstile`, {
-            params: {
-                url: url,
-                sitekey: sitekey
-            },
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json'
-            }
-        });
-
-        const submitData = submitResponse.data;
-
-        if (!submitData.task_id) {
-            throw new Error('Failed to get task_id from API');
-        }
-
-        const taskId = submitData.task_id;
-
-        await new Promise(resolve => setTimeout(resolve, 5000));
-
-        const resultResponse = await axios.get(`${BASE_URL}/result`, {
-            params: {
-                id: taskId
-            },
-            headers: {
-                'Accept': 'application/json'
-            }
-        });
-
-        const resultData = resultResponse.data;
-
-        if (resultData.value) {
-            return {
-                token: resultData.value,
-                solved_time: resultData.elapsed_time
-            };
-        }
-
-        throw new Error('Failed to get token from result');
-
-    } catch (error) {
-        throw error;
-    }
-}
-
 const handler = async (req, res) => {
-    try {
-        const { url, sitekey } = req.query;
+  try {
+    const { site_url, site_key, key } = req.query;
+
+    if (!site_url || !site_key || !key) {
+      return res.status(400).json({
+        author: 'Herza',
+        success: false,
+        error: 'Missing required parameters: site_url, site_key, or key'
+      });
+    }
 
-        if (!url) {
-            return res.status(400).json({
-                success: false,
-                error: 'Missing required parameter: url'
-            });
-        }
+    const solverUrl = `https://herzaj-turnstile-solver.hf.space/turnstile?url=${encodeURIComponent(site_url)}&sitekey=${encodeURIComponent(site_key)}`;
+    
+    const firstResponse = await axios.get(solverUrl, {
+      timeout: 30000
+    });
+
+    const taskId = firstResponse.data?.task_id;
+    if (!taskId) {
+      return res.status(400).json({
+        author: 'Herza',
+        success: false,
+        error: 'Failed to obtain task_id from solver service'
+      });
+    }
 
-        if (!sitekey) {
-            return res.status(400).json({
-                success: false,
-                error: 'Missing required parameter: sitekey'
-            });
-        }
+    await new Promise(resolve => setTimeout(resolve, 8000));
 
-        const result = await callBypassAPI(url, sitekey);
-        const solvedAt = new Date().toISOString();
+    const resultUrl = `https://herzaj-turnstile-solver.hf.space/result?id=${encodeURIComponent(taskId)}`;
+    
+    const secondResponse = await axios.get(resultUrl, {
+      timeout: 30000
+    });
 
-        return res.json({
-            author: "Herza",
-            success: true,
-            data: {
-                token: result.token,
-                solved_at: solvedAt,
-                solved_time: result.solved_time
-            }
-        });
+    const { elapsed_time, value } = secondResponse.data;
 
-    } catch (error) {
-        res.status(500).json({
-            success: false,
-            error: error.message,
-            timestamp: new Date().toISOString()
-        });
+    if (!value) {
+      return res.status(400).json({
+        author: 'Herza',
+        success: false,
+        error: 'Failed to retrieve token value from solver service'
+      });
     }
+
+    return res.json({
+      author: 'Herza',
+      success: true,
+      data: {
+        elapsed_time,
+        value,
+        site_url,
+        site_key
+      }
+    });
+
+  } catch (error) {
+    return res.status(500).json({
+      author: 'Herza',
+      success: false,
+      error: error.message
+    });
+  }
 };
 
 module.exports = {
-    name: 'Cloudflare Bypass',
-    description: 'Bypass Cloudflare Turnstile protection',
-    type: 'GET',
-    routes: ['api/tools/bypass'],
-    tags: ['security', 'bypass', 'turnstile'],
-    parameters: ['url', 'sitekey'],
-    limit: 8,
-    enabled: true,
-    main: ['tools'],
-    handler
+  name: 'Cloudflare Turnstile Bypass',
+  description: 'Generate Cloudflare Turnstile tokens with custom site URL and site key',
+  type: 'GET',
+  routes: ['api/tools/bypasscf'],
+  tags: ['utility', 'turnstile', 'solver'],
+  parameters: ['site_url', 'site_key', 'key'],
+  enabled: true,
+  main: ['tools'],
+  limit: 8,
+  handler
 };