@aspiresys/visor 1.0.1 → 1.1.0

package/dist/app.js

@@ -63,9 +63,7 @@ async function openApp(target) {
         if (!resolved) {
             throw new Error(`App not found: ${target}`);
         }
-        const firstPath = resolved
-            .split("\n")[0]
-            .trim();
+        const firstPath = resolved.split("\n")[0].trim();
         (0, logger_1.log)(`[APP] Resolved path: ${firstPath}`);
         (0, child_process_1.exec)(`start "" "${firstPath}"`);
         await new Promise(r => setTimeout(r, 5000));

package/dist/index.js

@@ -162,7 +162,7 @@ class Visor {
    */
     async find(image, confidence = 0.8) {
         const screen = await (0, screen_1.captureScreen)();
-        const template = (0, matcher_1.loadTemplate)((0, path_1.resolveImagePath)(image));
+        const template = await (0, matcher_1.loadTemplate)((0, path_1.resolveImagePath)(image));
         try {
             return (0, matcher_1.matchTemplate)(screen, template, confidence);
         }
@@ -217,7 +217,7 @@ class Visor {
    */
     async findAll(image, confidence = 0.8) {
         const screen = await (0, screen_1.captureScreen)();
-        const template = (0, matcher_1.loadTemplate)((0, path_1.resolveImagePath)(image));
+        const template = await (0, matcher_1.loadTemplate)((0, path_1.resolveImagePath)(image));
         try {
             return (0, matcher_1.findAllMatches)(screen, template, confidence);
         }
@@ -914,7 +914,7 @@ CONF:${m.confidence.toFixed(3)}
         const screen = await (0, screen_1.captureScreen)();
         try {
             for (const image of images) {
-                const template = (0, matcher_1.loadTemplate)((0, path_1.resolveImagePath)(image));
+                const template = await (0, matcher_1.loadTemplate)((0, path_1.resolveImagePath)(image));
                 try {
                     const region = (0, matcher_1.matchTemplate)(screen, template, confidence);
                     if (region) {

package/dist/matcher.d.ts

@@ -1,4 +1,4 @@
 import { Region } from "./types";
-export declare function loadTemplate(path: string): any;
+export declare function loadTemplate(path: string): Promise<any>;
 export declare function matchTemplate(screen: any, template: any, confidence?: number): Region | null;
 export declare function findAllMatches(screen: any, template: any, confidence?: number): Region[];

package/dist/matcher.js

@@ -9,30 +9,53 @@ exports.findAllMatches = findAllMatches;
 const fs_1 = __importDefault(require("fs"));
 const pngjs_1 = require("pngjs");
 const cv = require("@techstark/opencv-js");
-function loadTemplate(path) {
+const sharp_1 = __importDefault(require("sharp"));
+const logger_1 = require("./logger");
+async function loadTemplate(path) {
     const buffer = fs_1.default.readFileSync(path);
-    const png = pngjs_1.PNG.sync.read(buffer);
+    const processed = await (0, sharp_1.default)(buffer).normalize().sharpen().png().toBuffer();
+    const png = pngjs_1.PNG.sync.read(processed);
     return cv.matFromImageData({
         data: png.data,
         width: png.width,
         height: png.height
     });
 }
+function resizeTemplate(template, scale) {
+    const resized = new cv.Mat();
+    const newWidth = Math.max(1, Math.floor(template.cols * scale));
+    const newHeight = Math.max(1, Math.floor(template.rows * scale));
+    cv.resize(template, resized, new cv.Size(newWidth, newHeight), 0, 0, scale < 1 ? cv.INTER_AREA : cv.INTER_CUBIC);
+    return resized;
+}
 function matchTemplate(screen, template, confidence = 0.8) {
-    const result = new cv.Mat();
-    cv.matchTemplate(screen, template, result, cv.TM_CCOEFF_NORMED);
-    const { maxLoc, maxVal } = cv.minMaxLoc(result);
-    result.delete();
-    if (maxVal < confidence) {
-        return null;
+    const scales = Array.from({ length: 11 }, (_, i) => Number((0.5 + i * 0.1).toFixed(2)));
+    let bestMatch = null;
+    for (const scale of scales) {
+        const resizedTemplate = resizeTemplate(template, scale);
+        if (resizedTemplate.cols > screen.cols || resizedTemplate.rows > screen.rows) {
+            resizedTemplate.delete();
+            continue;
+        }
+        const result = new cv.Mat();
+        cv.matchTemplate(screen, resizedTemplate, result, cv.TM_CCOEFF_NORMED);
+        const { maxLoc, maxVal } = cv.minMaxLoc(result);
+        (0, logger_1.log)(`[MATCH] Scale ${scale} -> ${maxVal}`);
+        result.delete();
+        if (maxVal >= confidence &&
+            (!bestMatch ||
+                maxVal > bestMatch.confidence)) {
+            bestMatch = {
+                x: maxLoc.x,
+                y: maxLoc.y,
+                width: resizedTemplate.cols,
+                height: resizedTemplate.rows,
+                confidence: maxVal
+            };
+        }
+        resizedTemplate.delete();
     }
-    return {
-        x: maxLoc.x,
-        y: maxLoc.y,
-        width: template.cols,
-        height: template.rows,
-        confidence: maxVal
-    };
+    return bestMatch;
 }
 function findAllMatches(screen, template, confidence = 0.8) {
     const result = new cv.Mat();

package/dist/mouse.js

@@ -7,10 +7,8 @@ const config_1 = require("./config");
 const logger_1 = require("./logger");
 async function moveToRegion(region) {
     const scaleFactor = config_1.visorConfig.scaleFactor;
-    const centerX = Math.floor((region.x + region.width / 2)
-        / scaleFactor);
-    const centerY = Math.floor((region.y + region.height / 2)
-        / scaleFactor);
+    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)

package/dist/ocr.js

@@ -65,12 +65,7 @@ async function extractTextFromRegion(region) {
                 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,

package/dist/path.js

@@ -7,8 +7,7 @@ exports.resolveImagePath = resolveImagePath;
 const path_1 = __importDefault(require("path"));
 const config_1 = require("./config");
 function resolveImagePath(image) {
-    if (image.includes("/") ||
-        image.includes("\\")) {
+    if (image.includes("/") || image.includes("\\")) {
         return image;
     }
     return path_1.default.join(config_1.visorConfig.imagePath, image);

package/dist/screen.js

@@ -8,12 +8,12 @@ exports.saveScreenshot = saveScreenshot;
 const screenshot_desktop_1 = __importDefault(require("screenshot-desktop"));
 const pngjs_1 = require("pngjs");
 const fs_1 = __importDefault(require("fs"));
+const sharp_1 = __importDefault(require("sharp"));
 const cv = require("@techstark/opencv-js");
 async function captureScreen() {
-    const buffer = await (0, screenshot_desktop_1.default)({
-        format: "png"
-    });
-    const png = pngjs_1.PNG.sync.read(buffer);
+    const buffer = await (0, screenshot_desktop_1.default)({ format: "png" });
+    const processed = await (0, sharp_1.default)(buffer).normalize().sharpen().png().toBuffer();
+    const png = pngjs_1.PNG.sync.read(processed);
     return cv.matFromImageData({
         data: png.data,
         width: png.width,
@@ -21,8 +21,6 @@ async function captureScreen() {
     });
 }
 async function saveScreenshot(path) {
-    const img = await (0, screenshot_desktop_1.default)({
-        format: "png"
-    });
+    const img = await (0, screenshot_desktop_1.default)({ format: "png" });
     fs_1.default.writeFileSync(path, img);
 }

package/dist/text.js

@@ -31,9 +31,7 @@ async function findText(text, region) {
         });
     }
     //console.log(words);
-    const match = words.find(w => w.text
-        .toLowerCase()
-        .includes(text.toLowerCase()));
+    const match = words.find(w => w.text.toLowerCase().includes(text.toLowerCase()));
     if (!match) {
         return null;
     }

package/package.json

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