Update endpoints/antibot.js

endpoints/antibot.js

@@ -51,17 +51,11 @@ function normalizeWords(t) {
 }
 
 function convertMixedText(text) {
-  if (!text) return null;
-  
   const romanResult = romanToDecimal(text);
   if (romanResult !== null) {
     return romanResult;
   }
   
-  if (WORD_NUM[text] !== undefined) {
-    return WORD_NUM[text];
-  }
-  
   let converted = '';
   for (let char of text.toLowerCase()) {
     if (CHAR_TO_NUM[char] !== undefined) {
@@ -81,30 +75,55 @@ function convertMixedText(text) {
 function detectNumber(words) {
   if (words.length === 0) return null;
   
+  if (words.length === 1) {
+    const word = words[0];
+    
+    if (/^[0-9]+$/.test(word)) {
+      return parseInt(word);
+    }
+    
+    const romanResult = romanToDecimal(word);
+    if (romanResult !== null) {
+      return romanResult;
+    }
+    
+    if (WORD_NUM[word] !== undefined) {
+      return WORD_NUM[word];
+    }
+    
+    const converted = convertMixedText(word);
+    if (converted !== null) {
+      return converted;
+    }
+  }
+  
   const numbers = [];
   for (let word of words) {
     if (/^[0-9]+$/.test(word)) {
       numbers.push(parseInt(word));
+    } else if (WORD_NUM[word] !== undefined) {
+      numbers.push(WORD_NUM[word]);
     } else {
-      const num = convertMixedText(word);
-      if (num !== null) {
-        numbers.push(num);
+      const romanResult = romanToDecimal(word);
+      if (romanResult !== null) {
+        numbers.push(romanResult);
+      } else {
+        const converted = convertMixedText(word);
+        if (converted !== null) {
+          numbers.push(converted);
+        }
       }
     }
   }
   
-  if (numbers.length === 1) {
-    return numbers[0];
-  }
-  
-  if (numbers.length > 1) {
+  if (numbers.length > 0) {
     return numbers.reduce((a, b) => a + b, 0);
   }
   
   const combined = words.join('');
-  const combinedNum = convertMixedText(combined);
-  if (combinedNum !== null) {
-    return combinedNum;
+  const converted = convertMixedText(combined);
+  if (converted !== null) {
+    return converted;
   }
   
   return null;
@@ -114,7 +133,7 @@ async function readText(b64) {
   const Jimp = await loadJimp();
   const img = await Jimp.read(buf(b64));
 
-  img.greyscale().contrast(1.2).normalize().brightness(0.2);
+  img.greyscale().contrast(1.0).normalize().brightness(0.1);
   
   if (img.bitmap.width > 500) {
     img.resize(500, Jimp.AUTO);
@@ -124,8 +143,8 @@ async function readText(b64) {
   await img.write(tmp);
 
   const res = await Tesseract.recognize(tmp, "eng", {
-    tessedit_char_whitelist: '0123456789IVXLCDMivxlcdmOIZAESGTBQolizasgtbq|',
-    tessedit_pageseg_mode: '7'
+    tessedit_char_whitelist: '0123456789IVXLCDMivxlcdmOIZAESGTBQolizasgtbq| ',
+    tessedit_pageseg_mode: '6'
   });
   
   fs.unlinkSync(tmp);
@@ -134,56 +153,47 @@ async function readText(b64) {
 }
 
 module.exports = async (data) => {
-  try {
-    const mainText = await readText(data.main);
-    const soal = normalizeWords(mainText);  
-    const mainNumber = detectNumber(soal); 
-
-    const botResults = [];
-    for (let b of data.bots) {
-      const raw = await readText(b.img);
-      const tokens = normalizeWords(raw);
-      const num = detectNumber(tokens);
-
-      botResults.push({
-        id: b.id,
-        text: num !== null ? num.toString() : raw
-      });
-    }
+  const mainText = await readText(data.main);
+  const soal = normalizeWords(mainText);  
+
+  const mainNumber = detectNumber(soal); 
+
+  const botResults = [];
+  for (let b of data.bots) {
+    const raw = await readText(b.img);
+    const tokens = normalizeWords(raw);
+    const num = detectNumber(tokens);
+
+    botResults.push({
+      id: b.id,
+      text: tokens.join(" "),
+      number: num
+    });
+  }
 
-    const result = [];
-    if (mainNumber !== null) {
-      const exactMatch = botResults.find(x => x.text === mainNumber.toString());
-      if (exactMatch) {
-        result.push(exactMatch.id);
-      } else {
-        result.push(null);
-      }
+  const result = [];
+  if (mainNumber !== null) {
+    const f = botResults.find(x => x.number === mainNumber);
+    if (f) {
+      result.push(f.id);
     } else {
-      const soalText = mainText.replace(/[^a-z0-9]/g, '');
-      const matches = botResults.filter(bot => {
-        const botText = bot.text.replace(/[^a-z0-9]/g, '');
-        return botText === soalText;
-      });
-      
-      if (matches.length > 0) {
-        result.push(matches[0].id);
+      const totalBot = botResults.reduce((sum, bot) => sum + (bot.number || 0), 0);
+      if (totalBot === mainNumber) {
+        result.push(...botResults.map(bot => bot.id));
       } else {
         result.push(null);
       }
     }
-    
-    return {
-      soal,
-      botResults,
-      result
-    };
-  } catch (error) {
-    console.error('Error in module:', error);
-    return {
-      soal: [],
-      botResults: [],
-      result: [null]
-    };
+  } else {
+    soal.forEach(word => {
+      const f = botResults.find(x => x.text.includes(word));
+      result.push(f ? f.id : null);
+    });
   }
+  
+  return {
+    soal,
+    botResults,
+    result
+  };
 };