@aspiresys/visor 1.3.3 → 1.3.5

package/dist/display.js

@@ -3,14 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWindowsScaleFactor = getWindowsScaleFactor;
 const child_process_1 = require("child_process");
 function getWindowsScaleFactor() {
+    const widthCmd = `powershell -NoProfile -Command "(Get-CimInstance -ClassName Win32_VideoController).CurrentHorizontalResolution"`;
+    const logicalCmd = `powershell -NoProfile -Command "Add-Type -AssemblyName System.Windows.Forms; [System.Windows.Forms.Screen]::PrimaryScreen.Bounds.Width"`;
     try {
-        const output = (0, child_process_1.execSync)('reg query "HKCU\\Control Panel\\Desktop\\WindowMetrics" /v AppliedDPI', { encoding: "utf8" });
-        const match = output.match(/AppliedDPI\s+REG_DWORD\s+0x([0-9a-f]+)/i);
-        if (match) {
-            const dpi = parseInt(match[1], 16);
-            return dpi / 96;
+        const hardwareWidth = parseInt((0, child_process_1.execSync)(widthCmd).toString().trim(), 10);
+        const logicalWidth = parseInt((0, child_process_1.execSync)(logicalCmd).toString().trim(), 10);
+        if (!hardwareWidth || !logicalWidth)
+            return 1;
+        const calculatedScale = Math.round((hardwareWidth / logicalWidth) * 100);
+        return calculatedScale / 100;
+    }
+    catch (error) {
+        try {
+            const regCmd = `powershell -NoProfile -Command "(Get-ItemProperty 'HKCU:\\Control Panel\\Desktop\\PerMonitorSettings\\*').DpiScale | Select-Object -First 1"`;
+            const regVal = parseInt((0, child_process_1.execSync)(regCmd).toString().trim(), 10);
+            if (!isNaN(regVal)) {
+                const indexMap = { 0: 100, 1: 125, 2: 150, 3: 175, 4: 200 };
+                return (indexMap[regVal] || 100) / 100;
+            }
+        }
+        catch (e) {
+            return 1;
         }
+        return 1;
     }
-    catch (e) { }
-    return 1;
 }

package/dist/index.js

@@ -14,6 +14,7 @@ const path_1 = require("./path");
 const display_1 = require("./display");
 const logger_1 = require("./logger");
 const console_1 = require("console");
+const templateMetadata_1 = require("./templateMetadata");
 class Visor {
     constructor() {
         this.mouse = nut_js_1.mouse;
@@ -316,8 +317,9 @@ class Visor {
         const screen = await (0, screen_1.captureScreen)();
         const template = await (0, matcher_1.loadTemplate)((0, path_1.resolveImagePath)(image));
         const scaleFactor = config_1.visorConfig.scaleFactor;
+        const metadata = (0, templateMetadata_1.loadTemplateMetadata)((0, path_1.resolveImagePath)(image));
         try {
-            const result = (0, matcher_1.matchTemplate)(screen, template, confidence);
+            const result = (0, matcher_1.matchTemplate)(screen, template, confidence, metadata);
             if (result) {
                 (0, logger_1.log)(`[FIND] Actual coords: (${Math.floor(result.x * scaleFactor)}, ${Math.floor(result.y * scaleFactor)})`);
             }

package/dist/matcher.d.ts

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

package/dist/matcher.js

@@ -16,6 +16,7 @@ const cv = require("@techstark/opencv-js");
 const templateCache = new Map();
 const types_1 = require("./types");
 const logger_1 = require("./logger");
+const config_1 = require("./config");
 async function loadTemplate(path) {
     if (templateCache.has(path)) {
         (0, logger_1.log)(`[CACHE] Template hit: ${path}`);
@@ -49,9 +50,23 @@ function resizeTemplate(template, 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) {
+function matchTemplate(screen, template, confidence = 0.8, metadata) {
+    (0, logger_1.log)("Screen:", screen.cols, "x", screen.rows);
+    (0, logger_1.log)("Template:", template.cols, "x", template.rows);
+    const result = new cv.Mat();
     const start = Date.now();
-    const scales = [1.0, 0.9, 1.1, 0.8, 1.2, 0.7, 1.3, 0.6, 1.4, 0.5, 1.5];
+    const scales = (() => {
+        if (metadata) {
+            const widthRatio = screen.cols / metadata.capturedResolution.width;
+            const heightRatio = screen.rows / metadata.capturedResolution.height;
+            const resolutionRatio = (widthRatio + heightRatio) / 2;
+            const dpiRatio = config_1.visorConfig.scaleFactor / metadata.capturedScaleFactor;
+            const predictedScale = resolutionRatio * dpiRatio;
+            (0, logger_1.log)(`[MATCH] Predicted scale: ${predictedScale.toFixed(3)}`);
+            return [predictedScale, predictedScale * 0.95, predictedScale * 1.05, predictedScale * 0.9, predictedScale * 1.1];
+        }
+        return [1.0, 1.25, 1.5, 1.75, 2.0, 0.75, 0.5];
+    })();
     let bestMatch = null;
     for (const scale of scales) {
         const resizedTemplate = resizeTemplate(template, scale);
@@ -141,7 +156,7 @@ function findAllInspectorMatches(screen, template, confidence = 0.8) {
 function matchInspectorTemplate(screen, template, confidence = 0.8, multiScale = false) {
     if (multiScale) {
         const start = Date.now();
-        const scales = [1.0, 0.9, 1.1, 0.8, 1.2, 0.7, 1.3, 0.6, 1.4, 0.5, 1.5];
+        const scales = [1.0, 1.25, 1.5, 1.75, 2.0, 0.75, 0.5];
         let bestMatch = null;
         for (const scale of scales) {
             const resizedTemplate = resizeTemplate(template, scale);

package/dist/templateMetadata.d.ts

@@ -0,0 +1 @@
+export declare function loadTemplateMetadata(path: string): any;

package/dist/templateMetadata.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadTemplateMetadata = loadTemplateMetadata;
+const fs_1 = __importDefault(require("fs"));
+function loadTemplateMetadata(path) {
+    const metadataPath = path.replace(/\.png$/i, ".properties.json");
+    if (!fs_1.default.existsSync(metadataPath)) {
+        return null;
+    }
+    return JSON.parse(fs_1.default.readFileSync(metadataPath, "utf-8"));
+}

package/inspector/main.js

@@ -4,7 +4,8 @@ const {
 	app,
 	BrowserWindow,
 	ipcMain,
-	dialog
+	dialog,
+	screen
 } = require("electron");
 
 const fs = require("fs");
@@ -103,6 +104,23 @@ ipcMain.handle("save-template",
 					selection.height
 				)
 			}).toFile(inspectorCopy);
+		const display = screen.getPrimaryDisplay();
+		const metadata = {
+			capturedResolution: {
+				width: Math.round(display.size.width * display.scaleFactor),
+				height: Math.round(display.size.height * display.scaleFactor)
+			},
+			templateSize: {
+				width: Math.round(selection.width),
+				height: Math.round(selection.height)
+			},
+			capturedScaleFactor: display.scaleFactor,
+			capturedAt: new Date().toISOString()
+		};
+		const outputMetadataPath = output.replace(/\.png$/i, ".properties.json");
+		fs.writeFileSync(outputMetadataPath, JSON.stringify(metadata, null, 2));
+		const metadataPath = inspectorCopy.replace(/\.png$/i, ".properties.json");
+		fs.writeFileSync(metadataPath, JSON.stringify(metadata, null, 2));
 		return output;
 	}
 );

package/inspector/src/renderer.js

@@ -90,13 +90,14 @@ canvas.addEventListener("mousemove",
 canvas.addEventListener("mouseup",
 	() => {
 		selecting = false;
+		document.getElementById("mousex").innerHTML = Math.round(startX);
+		document.getElementById("mousey").innerHTML = Math.round(startY);
 		document.getElementById("mousew").innerHTML = Math.round(Math.abs(endX - startX));
 		document.getElementById("mouseh").innerHTML = Math.round(Math.abs(endY - startY));
 		console.log(startX, startY, endX, endY);
 	}
 );
 
-
 saveBtn.addEventListener("click",
 	async () => {
 		if (startX === undefined || startY === undefined || endX === undefined || endY === undefined) {

package/package.json

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

package/readme.md

@@ -169,6 +169,8 @@ By default Visor evaluates templates across multiple scale levels and automatica
 
 Supported environments include:
 
+* 050% scaling
+* 075% scaling
 * 100% scaling
 * 125% scaling
 * 150% scaling