@aspiresys/visor 1.1.4 → 1.1.6

package/dist/matcher.js

@@ -9,17 +9,25 @@ exports.findAllMatches = findAllMatches;
 const fs_1 = __importDefault(require("fs"));
 const pngjs_1 = require("pngjs");
 const cv = require("@techstark/opencv-js");
+const templateCache = new Map();
 const sharp_1 = __importDefault(require("sharp"));
 const logger_1 = require("./logger");
 async function loadTemplate(path) {
+    if (templateCache.has(path)) {
+        (0, logger_1.log)(`[CACHE] Template hit: ${path}`);
+        return templateCache.get(path).clone();
+    }
+    (0, logger_1.log)(`[CACHE] Loading template: ${path}`);
     const buffer = fs_1.default.readFileSync(path);
     const processed = await (0, sharp_1.default)(buffer).normalize().sharpen().png().toBuffer();
     const png = pngjs_1.PNG.sync.read(processed);
-    return cv.matFromImageData({
+    const template = cv.matFromImageData({
         data: png.data,
         width: png.width,
-        height: png.height
+        height: png.height,
     });
+    templateCache.set(path, template);
+    return template.clone();
 }
 function resizeTemplate(template, scale) {
     const resized = new cv.Mat();
@@ -33,7 +41,8 @@ function matchTemplate(screen, template, confidence = 0.8) {
     let bestMatch = null;
     for (const scale of scales) {
         const resizedTemplate = resizeTemplate(template, scale);
-        if (resizedTemplate.cols > screen.cols || resizedTemplate.rows > screen.rows) {
+        if (resizedTemplate.cols > screen.cols ||
+            resizedTemplate.rows > screen.rows) {
             resizedTemplate.delete();
             continue;
         }
@@ -42,15 +51,13 @@ function matchTemplate(screen, template, confidence = 0.8) {
         const { maxLoc, maxVal } = cv.minMaxLoc(result);
         (0, logger_1.log)(`[MATCH] Scale ${scale} -> ${maxVal}`);
         result.delete();
-        if (maxVal >= confidence &&
-            (!bestMatch ||
-                maxVal > bestMatch.confidence)) {
+        if (maxVal >= confidence && (!bestMatch || maxVal > bestMatch.confidence)) {
             bestMatch = {
                 x: maxLoc.x,
                 y: maxLoc.y,
                 width: resizedTemplate.cols,
                 height: resizedTemplate.rows,
-                confidence: maxVal
+                confidence: maxVal,
             };
         }
         resizedTemplate.delete();
@@ -70,7 +77,7 @@ function findAllMatches(screen, template, confidence = 0.8) {
                     y,
                     width: template.cols,
                     height: template.rows,
-                    confidence: score
+                    confidence: score,
                 });
             }
         }
@@ -78,7 +85,7 @@ function findAllMatches(screen, template, confidence = 0.8) {
     matches.sort((a, b) => b.confidence - a.confidence);
     const filtered = [];
     for (const match of matches) {
-        const tooClose = filtered.some(existing => {
+        const tooClose = filtered.some((existing) => {
             const dx = Math.abs(existing.x - match.x);
             const dy = Math.abs(existing.y - match.y);
             return dx < 10 && dy < 10;

package/dist/mouse.js

@@ -10,13 +10,11 @@ async function moveToRegion(region) {
     const centerX = Math.floor((region.x + region.width / 2) / scaleFactor);
     const centerY = Math.floor((region.y + region.height / 2) / scaleFactor);
     (0, logger_1.log)("[MOUSE] Moving mouse to:", centerX, centerY);
-    await nut_js_1.mouse.move([
-        new nut_js_1.Point(centerX, centerY)
-    ]);
+    await nut_js_1.mouse.move([new nut_js_1.Point(centerX, centerY)]);
 }
 async function clickRegion(region) {
     await moveToRegion(region);
-    await new Promise(r => setTimeout(r, 200));
+    await new Promise((r) => setTimeout(r, 200));
     await nut_js_1.mouse.click(nut_js_1.Button.LEFT);
     (0, logger_1.log)("[MOUSE] Left click completed");
 }

package/dist/ocr.js

@@ -49,23 +49,22 @@ async function terminateOCR() {
  * - Tesseract OCR
  */
 async function extractTextFromRegion(region) {
-    const buffer = await (0, screenshot_desktop_1.default)({
-        format: "png"
-    });
+    const buffer = await (0, screenshot_desktop_1.default)({ format: "png" });
     let image = (0, sharp_1.default)(buffer);
     if (region) {
         image = image.extract({
-            left: Math.floor(region.x *
-                config_1.visorConfig.scaleFactor),
-            top: Math.floor(region.y *
-                config_1.visorConfig.scaleFactor),
-            width: Math.floor(region.width *
-                config_1.visorConfig.scaleFactor),
-            height: Math.floor(region.height *
-                config_1.visorConfig.scaleFactor)
+            left: Math.floor(region.x * config_1.visorConfig.scaleFactor),
+            top: Math.floor(region.y * config_1.visorConfig.scaleFactor),
+            width: Math.floor(region.width * config_1.visorConfig.scaleFactor),
+            height: Math.floor(region.height * config_1.visorConfig.scaleFactor),
         });
     }
-    const processed = await image.grayscale().normalize().sharpen().png().toBuffer();
+    const processed = await image
+        .grayscale()
+        .normalize()
+        .sharpen()
+        .png()
+        .toBuffer();
     const worker = await getWorker();
     const result = await worker.recognize(processed, {}, {
         blocks: true,
@@ -73,7 +72,7 @@ async function extractTextFromRegion(region) {
         tsv: true,
         tessedit_pageseg_mode: "6",
         tessedit_char_whitelist: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 .:-/₹$€-,",
-        user_defined_dpi: "300"
+        user_defined_dpi: "300",
     });
     (0, logger_1.log)("[OCR] Extracted Text:");
     (0, logger_1.log)(result.data.text);

package/dist/screen.js

@@ -17,7 +17,7 @@ async function captureScreen() {
     return cv.matFromImageData({
         data: png.data,
         width: png.width,
-        height: png.height
+        height: png.height,
     });
 }
 async function saveScreenshot(path) {

package/dist/text.js

@@ -37,7 +37,7 @@ async function findText(text, index = 0, region) {
             y: Number(cols[7]),
             width: Number(cols[8]),
             height: Number(cols[9]),
-            confidence
+            confidence,
         });
     }
     const matches = [];
@@ -46,26 +46,32 @@ async function findText(text, index = 0, region) {
         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 matchedWords = words.filter(w => searchWords.includes(w.text.toLowerCase().replace(/[^a-z0-9]/gi, "")));
+        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 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 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;
             matches.push({
                 x: minX,
                 y: minY,
                 width: maxX - minX,
                 height: maxY - minY,
-                confidence: avgConfidence
+                confidence: avgConfidence,
             });
         }
     }
-    matches.sort((a, b) => a.y - b.y ||
-        a.x - b.x);
+    matches.sort((a, b) => a.y - b.y || a.x - b.x);
     return matches[index] || null;
 }
 async function existsText(text, region) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspiresys/visor",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -13,6 +13,7 @@
     "pngjs": "^7.0.0",
     "screenshot-desktop": "^1.15.1",
     "sharp": "^0.34.5",
+    "systeminformation": "^5.31.7",
     "tesseract.js": "^7.0.0"
   },
   "devDependencies": {