@aspiresys/visor 1.1.2 → 1.1.3

package/dist/index.d.ts

@@ -298,18 +298,20 @@ export declare class Visor {
    * on the matched text region.
    *
    * @param text Text to search for.
+   * @param index Index of the text to click.
    *
    * @throws Error if text is not found.
    *
    * @example
    * await visor.clickText("Login");
    */
-    clickText(text: string): Promise<void>;
+    clickText(text: string, index?: number): Promise<void>;
     /**
    * Finds text on screen or inside
    * a specific region using OCR.
    *
    * @param text Text to search for.
+   * @param index Index of the text to search.
    * @param region Optional search region.
    *
    * @returns Matched text region or null.
@@ -318,7 +320,7 @@ export declare class Visor {
    * const region =
    *   await visor.findText("Submit");
    */
-    findText(text: string, region?: {
+    findText(text: string, index?: number, region?: {
         x: number;
         y: number;
         width: number;

package/dist/index.js

@@ -415,14 +415,15 @@ CONF:${m.confidence.toFixed(3)}
    * on the matched text region.
    *
    * @param text Text to search for.
+   * @param index Index of the text to click.
    *
    * @throws Error if text is not found.
    *
    * @example
    * await visor.clickText("Login");
    */
-    async clickText(text) {
-        const region = await (0, text_1.findText)(text);
+    async clickText(text, index = 0) {
+        const region = await (0, text_1.findText)(text, index);
         if (!region) {
             throw new Error(`Text not found: ${text}`);
         }
@@ -433,6 +434,7 @@ CONF:${m.confidence.toFixed(3)}
    * a specific region using OCR.
    *
    * @param text Text to search for.
+   * @param index Index of the text to search.
    * @param region Optional search region.
    *
    * @returns Matched text region or null.
@@ -441,8 +443,8 @@ CONF:${m.confidence.toFixed(3)}
    * const region =
    *   await visor.findText("Submit");
    */
-    async findText(text, region) {
-        return await (0, text_1.findText)(text, region);
+    async findText(text, index = 0, region) {
+        return await (0, text_1.findText)(text, index, region);
     }
     /**
    * Checks whether specific text exists

package/dist/ocr.js

@@ -71,7 +71,9 @@ async function extractTextFromRegion(region) {
         blocks: true,
         hocr: true,
         tsv: true,
-        tessedit_char_whitelist: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.:/@ "
+        tessedit_pageseg_mode: "6",
+        tessedit_char_whitelist: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 .:-/₹$€-,",
+        user_defined_dpi: "300"
     });
     (0, logger_1.log)("[OCR] Extracted Text:");
     (0, logger_1.log)(result.data.text);

package/dist/text.d.ts

@@ -1,5 +1,5 @@
 import { Region } from "./types";
-export declare function findText(text: string, region?: {
+export declare function findText(text: string, index?: number, region?: {
     x: number;
     y: number;
     width: number;

package/dist/text.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findText = findText;
 exports.existsText = existsText;
 const ocr_1 = require("./ocr");
-async function findText(text, region) {
+async function findText(text, index = 0, region) {
     const result = await (0, ocr_1.extractTextFromRegion)(region);
     const tsv = result.tsv;
     if (!tsv) {
@@ -40,29 +40,35 @@ async function findText(text, region) {
             confidence
         });
     }
+    const matches = [];
     for (const key in lineGroups) {
         const words = lineGroups[key];
         words.sort((a, b) => a.x - b.x);
+        const searchWords = text.toLowerCase().split(/\s+/);
         //const combinedText = words.map(w => w.text).join(" ");
         const combinedText = words.map(w => w.text).join(" ").replace(/\s+/g, " ").trim();
         if (combinedText.toLowerCase().replace(/[^a-z0-9 ]/gi, "").includes(text.toLowerCase().replace(/[^a-z0-9 ]/gi, ""))) {
-            const minX = Math.min(...words.map(w => w.x));
-            const minY = Math.min(...words.map(w => w.y));
-            const maxX = Math.max(...words.map(w => w.x + w.width));
-            const maxY = Math.max(...words.map(w => w.y + w.height));
+            const matchedWords = words.filter(w => searchWords.includes(w.text.toLowerCase().replace(/[^a-z0-9]/gi, "")));
+            const regionWords = matchedWords.length > 0 ? matchedWords : words;
+            const minX = Math.min(...regionWords.map(w => w.x));
+            const minY = Math.min(...regionWords.map(w => w.y));
+            const maxX = Math.max(...regionWords.map(w => w.x + w.width));
+            const maxY = Math.max(...regionWords.map(w => w.y + w.height));
             const avgConfidence = words.reduce((sum, w) => sum + w.confidence, 0) / words.length;
-            return {
+            matches.push({
                 x: minX,
                 y: minY,
                 width: maxX - minX,
                 height: maxY - minY,
                 confidence: avgConfidence
-            };
+            });
         }
     }
-    return null;
+    matches.sort((a, b) => a.y - b.y ||
+        a.x - b.x);
+    return matches[index] || null;
 }
 async function existsText(text, region) {
-    const match = await findText(text, region);
+    const match = await findText(text, 0, region);
     return match !== null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspiresys/visor",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {