node-native-win-utils 2.2.0 → 2.2.2

package/README.md

@@ -1,684 +1,175 @@
-
-[![License][license-src]][license-href] 
-![Node-API v8 Badge](https://github.com/nodejs/abi-stable-node/blob/doc/assets/Node-API%20v8%20Badge.svg)
+[![License][license-src]][license-href]
+[![Node-API v8](https://raw.githubusercontent.com/nodejs/abi-stable-node/b062e657e639aad36280e0c6f54e181563ef4b19/assets/Node-API%20v8%20Badge.svg)](https://nodejs.org/api/n-api.html)
+[![npm version](https://img.shields.io/npm/v/node-native-win-utils.svg)](https://www.npmjs.com/package/node-native-win-utils)
+[![npm downloads](https://img.shields.io/npm/dm/node-native-win-utils.svg)](https://www.npmjs.com/package/node-native-win-utils)
+[![Platform: Windows only](https://img.shields.io/badge/platform-Windows%20only-blue.svg)](https://github.com/T-Rumibul/node-native-win-utils)
 
 # Node Native Win Utils
 
-  
-
 I did it for myself because I didn't feel like dealing with libraries like 'node-ffi' to implement this functionality. Maybe someone will find it useful. It's WINDOWS OS ONLY
 
-  
-
-This package is a native addon for Node.js that allows you to perform various utility operations on Windows systems. It includes key event listeners, window data retrieval, window screenshot capture functionality, mouse movement, mouse click, mouse drag, and typing functionality, also I included precompiled libs of OpenCV(core, imgcodecs, imgproc)
-
-  
-# Installation
-
-  
 
-You can install the package using npm:
+## Features
 
-  
+- Global keyboard event listener (`keyDown` / `keyUp`)
+- Window information & screenshots
+- Mouse movement, clicks, drag & drop
+- Keyboard emulation (`keyPress`, `typeString`)
+- OpenCV integration (template matching, blur, grayscale, histogram equalization, color manipulation, ROI, drawing)
+- Tesseract OCR text recognition
+- Screen capture
+- Mouse event listener
+- Prebuilt binaries (no Python or build tools required on Windows)
+- ESM + CommonJS support
 
-```shell
+## Requirements
 
-  
+- **Windows 10 or later** (x64)
+- Node.js >= 18 (prebuilts for recent versions via `prebuildify`)
 
-npm  install  node-native-win-utils
-
-  
+## Installation
 
+```bash
+npm install node-native-win-utils
 ```
 
-  
-
-# Usage
-
-  
-
-## Importing the Package
-
-  
-
-To use the package, import the necessary functions, types, and classes:
-
-  
-
-```javascript
+## Usage
 
+```ts
 import {
-
-KeyboardListener
-
-getWindowData,
-
-captureWindow,
-
-captureWindowN,
-
-mouseMove,
-
-mouseClick,
-
-mouseDrag,
-
-typeString,
-
-OpenCV,
-
-} from  "node-native-win-utils";
-
+  KeyboardListener,
+  KeyCodeHelper,
+  KeyListener,
+  getWindowData,
+  captureWindow,
+  captureWindowN,
+  captureScreenToFile,
+  mouseMove,
+  mouseClick,
+  mouseDrag,
+  typeString,
+  keyPress,
+  textRecognition,
+  OpenCV,
+  startMouseListener,
+  stopMouseListener,
+} from "node-native-win-utils";
 ```
 
-  
-
-## Keyboard Event Listener
-
-  
-
-The package provides KeyboardListener singletone class, which allow you to register event listeners for key down and key up events, respectively. The event callbacks receive the `keyCode` as a parameter:
+### Keyboard
 
-  
+```ts
+// Singleton listener
+const listener = KeyboardListener.listener();
+listener.on("keyDown", (data) => console.log("Down:", data.keyName));
+listener.on("keyUp", (data) => console.log("Up:", data.keyName));
 
-```javascript
-
-const listener = KeyboardListener.listener()
-
-listener.on("keyDown", (data: {
-        keyCode: number;
-        keyName: string;
-      }) => {
-//your code
-})
-listener.on("keyUp", (data: {
-        keyCode: number;
-        keyName: string;
-      }) => {
-    //your code
-})
+// Simulate key press
+keyPress(KeyCodeHelper.A);           // once
+keyPress(KeyCodeHelper.Enter, 2);    // twice
 ```
 
-## Key Press
-
-  
-
-The keyPress function allows you to simulate a key press event. Provide the keyCode as a parameter and optionally the number of times to press the key:
-
-  
-
-```javascript
+### Mouse & Typing
 
-keyPress(65); // Press 'A' key once
-
-  
-
-keyPress(65, 3); // Press 'A' key three times
+```ts
+mouseMove(500, 300);
+mouseClick();                    // left click
+mouseClick("right");
+mouseDrag(100, 100, 800, 600, 50); // optional speed
 
+typeString("Hello from Node!", 30); // 30ms delay per char
 ```
 
-## Key Code Helper
-
-  
-
-The KeyCodeHelper enum provides a set of key codes that can be used with key event functions:
-
-  
-
-```javascript
-
-  
-
-import { KeyCodeHelper } from  "node-native-win-utils";
-
-  
-
-console.log(KeyCodeHelper.A); // Outputs the key code for 'A'
-
-```
-
-  
-
-## Window Data
-
-  
-
-The `getWindowData` function retrieves information about a specific window identified by its name. It returns an object with properties `width`, `height`, `x`, and `y`, representing the window dimensions and position:
-
-  
-
-```javascript
-
-const  windowData  =  getWindowData("Window Name");
-
-  
-
-console.log("Window data:", windowData);
-
-  
-
-// Window data: { width: 800, height: 600, x: 50, y: 50 }
-
-```
-
-  
-
-## Window Capture
-
-  
-
-The `captureWindow` function allows you to capture a screenshot of a specific window identified by its name. Provide the window name and the output path as parameters:
-
-  
-
-```javascript
-
-captureWindow("Window Name", "output.png");
-
-  
-
-// Output: output.png with a screenshot of the window
-
-```
-
-  
-
-## Mouse Movement
-
-  
-
-The `mouseMove` function allows you to move the mouse to a specific position on the screen. Provide the `posX` and `posY` coordinates as parameters:
-
-  
-
-```javascript
+### Window Operations
 
-mouseMove(100, 200);
+```ts
+const data = getWindowData("Notepad");
+console.log(data); // { width, height, x, y }
 
+captureWindow("Notepad", "screenshot.png");
+const buffer = captureWindowN("Notepad"); // Buffer
 ```
 
-  
-
-## Mouse Click
-
-  
-
-The `mouseClick` function allows you to perform a mouse click event. Optionally, you can specify the mouse button as a parameter (`"left"`, `"middle"`, or `"right"`). If no button is specified, a left mouse click is performed by default:
-
-  
-
-```javascript
-
-mouseClick(); // Left mouse click
-
-  
-
-mouseClick("right"); // Right mouse click
+### Screen Capture
 
+```ts
+await captureScreenToFile("full-screen.png");
 ```
 
-  
+### Text Recognition (Tesseract OCR)
 
-## Mouse Drag
-
-  
-
-The `mouseDrag` function allows you to simulate dragging the mouse from one position to another. Provide the starting and ending coordinates (`startX`, `startY`, `endX`, `endY`) as parameters. Optionally, you can specify the speed at which the mouse should be dragged:
-
-  
-
-```javascript
-
-mouseDrag(100, 200, 300, 400);
-
-  
-
-mouseDrag(100, 200, 300, 400, 100); // Drag with speed 100
+```ts
+import path from "path";
 
+const text = textRecognition(
+  path.join(__dirname, "traineddata"), // path to .traineddata files
+  "eng",
+  path.join(__dirname, "image.png")
+);
+console.log(text);
 ```
 
-  
+### OpenCV (image processing)
 
-## Typing
+```ts
+import { OpenCV } from "node-native-win-utils";
 
-  
+const img = new OpenCV("image.png"); // or ImageData { width, height, data: Uint8Array }
 
-The `typeString` function allows you to simulate typing a string of characters. Provide the string to type as the `stringToType` parameter. Optionally, you can specify
+// Chainable methods
+const processed = img
+  .blur(5, 5)
+  .bgrToGray()
+  .equalizeHist()
+  .darkenColor([240, 240, 240], [255, 255, 255], 0.5) // lower, upper, factor
+  .drawRectangle([10, 10], [200, 100], [255, 0, 0], 3)
+  .getRegion([50, 50, 300, 200]);
 
-  
-
-a delay between each character (in milliseconds) using the `delay` parameter:
-
-  
-
-```javascript
-
-typeString("Hello, world!");
-
-  
-
-typeString("Hello, world!", 100); // Type with a delay of 100ms between characters
+processed.imwrite("processed.png");
 
+// Template matching
+const match = img.matchTemplate(templateImage, /* method */, /* mask */);
+console.log(match); // { minValue, maxValue, minLocation, maxLocation }
 ```
 
-  
-
-## Key Listener Class
-
-  
-
-The `KeyListener` class extends the EventEmitter class and simplifies working with the `keyDownHandler` and `keyUpHandler` functions. You can register event listeners for the "keyDown" and "keyUp" events using the `on` method:
-
-  
-
-```javascript
-
-const  listener  =  new  KeyListener();
-
-  
-
-listener.on("keyDown", (data) => {
-
-console.log("Key down:", data.keyCode, data.keyName);
+### Mouse Event Listener
 
+```ts
+startMouseListener(({ x, y, type }) => {
+  console.log(`${type} at ${x},${y}`); // move at 400 300
 });
 
-  
-
-// Key down: 8 Backspace
-
-  
-
-listener.on("keyUp", (data) => {
-
-console.log("Key up:", data.keyCode, data.keyName);
-
-});
-
-  
-
-// Key up: 8 Backspace
-
-```
-
-  
-
-## OpenCV
-
-  
-
-The `OpenCV` class extends the capabilities of the native addon package by providing various image processing functionalities. It allows users to perform operations such as matching templates, blurring images, converting color formats, drawing rectangles, getting image regions, and writing images to files.
-
-  
-
-#### Constructor
-
-  
-
-```typescript
-
-const  image  =  new  OpenCV(image: string  |  ImageData)
+mouseClick("left"); // trigger event
 
+// terminates a thread
+stopMouseListener(); 
 ```
 
-  
-
-Creates a new instance of the `OpenCV` class with the specified image data. The `image` parameter can be either a file path (string) or an existing `ImageData` object.
-
-  
-
-#### Properties
-
-  
-
-##### `imageData: ImageData`
-
-  
-
-Holds the underlying image data that will be used for image processing operations.
-
-  
-
-##### `width: number`
-
-  
-
-Read-only property that returns the width of the image in pixels.
-
-  
-
-##### `height: number`
-
-  
-
-Read-only property that returns the height of the image in pixels.
-
-  
-
-#### Methods
-
-  
-
-##### `matchTemplate(template: ImageData, method?: number | null, mask?: ImageData): OpenCV`
-
-  
-
-Matches a template image with the current image and returns a new `OpenCV` instance containing the result.
-
-  
-
--  `template: ImageData`: The template image data to be matched.
-
--  `method?: number | null`: (Optional) The matching method to be used. If not provided, the default method will be used.(currently no implemented)
-
--  `mask?: ImageData`: (Optional) An optional mask image data to be used during the matching process.
-
-  
-
-##### `blur(sizeX: number, sizeY: number): OpenCV`
-
-  
-
-Applies a blur filter to the current image and returns a new `OpenCV` instance containing the blurred result.
-
-  
-
--  `sizeX: number`: The size of the blur kernel in the X direction.
-
--  `sizeY: number`: The size of the blur kernel in the Y direction.
-
-  
-
-##### `bgrToGray(): OpenCV`
-
-  
-
-Converts the current image from the BGR color format to grayscale and returns a new `OpenCV` instance containing the grayscale result.
-
-  
-
-##### `drawRectangle(start: Point, end: Point, rgb: Color, thickness: number): OpenCV`
-
-  
-
-Draws a rectangle on the current image and returns a new `OpenCV` instance containing the modified result.
-
-  
-
--  `start: Point`: The starting point (top-left) of the rectangle.
-
--  `end: Point`: The ending point (bottom-right) of the rectangle.
-
--  `rgb: Color`: The color of the rectangle in the RGB format (e.g., `{ r: 255, g: 0, b: 0 }` for red).
-
--  `thickness: number`: The thickness of the rectangle's border.
-
-  
-
-##### `getRegion(region: ROI): OpenCV`
-
-  
-
-Extracts a region of interest (ROI) from the current image and returns a new `OpenCV` instance containing the extracted region.
-
-  
-
--  `region: ROI`: An object specifying the region of interest with properties `x`, `y`, `width`, `height`.
-
-  
-
-##### `imwrite(path: string): void`
-
-  
-
-Writes the current image to a file specified by the `path`.
-
-  
-
--  `path: string`: The file path where the image will be saved.
-
-  
-
-## Functions
-
-  
-
-| Function        | Parameters                                                                                   | Return Type |
-|-----------------|----------------------------------------------------------------------------------------------|-------------|
-| getWindowData   | `windowName: string`                                                                          | `WindowData`|
-| captureWindow   | `windowName: string, outputPath: string`                                                      | `void`      |
-| mouseMove       | `posX: number, posY: number`                                                                  | `boolean`   |
-| mouseClick      | `button?: "left" \| "middle" \| "right"`                                                      | `boolean`   |
-| mouseDrag       | `startX: number, startY: number, endX: number, endY: number, speed?: number`                  | `boolean`   |
-| typeString      | `stringToType: string, delay?: number`                                                        | `boolean`   |
-| captureWindowN  | `windowName: string`                                                                          | `Buffer`    |
-| keyPress        | `keyCode: number, repeat?: number`                                                            | `boolean`   |
-| textRecognition | `trainedDataPath: string, dataLang: string, imagePath: string`                                | `string`    |
-| captureScreenToFile | `path: string`                                                                            | `boolean`   |
-  
-
-## Examples
-
-  
-
-Here are some examples of using the package:
-
-```javascript
-console.log(textRecognition(path.join(__dirname, 'traineddata'), 'eng', path.join(__dirname, 'images', '1.jpg'))) // ---> <recognized text>
+## Building from source
 
+```bash
+npm install
+npm run build
 ```
 
-```javascript
-
-// Example usage of the OpenCV class
-
-import { OpenCV } from  "node-native-win-utils";
-
-  
-
-const  image  =  new  OpenCV("path/to/image.png");
-
-  
-
-const  template  =  new  OpenCV("path/to/template.png");
-
-const  matchedImage  =  image.matchTemplate(template.imageData);
-
-  
-
-const  blurredImage  =  image.blur(5, 5);
-
-  
-
-const  grayscaleImage  =  image.bgrToGray();
-
-  
-
-const  regionOfInterest  = { x:  100, y:  100, width:  200, height:  150 };
-
-const  regionImage  =  image.getRegion(regionOfInterest);
-
-  
-
-const  redColor  = { r:  255, g:  0, b:  0 };
-
-const  thickRectangle  =  image.drawRectangle(
-
-{ x:  50, y:  50 },
-
-{ x:  150, y:  150 },
-
-redColor,
-
-3
-
-);
-
-  
-
-matchedImage.imwrite("output/matched.png");
-
-blurredImage.imwrite("output/blurred.png");
-
-grayscaleImage.imwrite("output/grayscale.png");
-
-regionImage.imwrite("output/region.png");
-
-thickRectangle.imwrite("output/thick_rectangle.png");
-
+#### Requires:
 ```
-
-  
-
-```javascript
-
-// If you want to aply blur and convert to gray then do it that order:
-
-image.blur(5, 5).bgrToGray();
-
-// Otherwise you will get an error.
-
+Visual Studio Build Tools (C++).
+Python 3
 ```
 
-  
-
-Please note that the above example demonstrates the usage of different methods available in the `OpenCV` class. Make sure to replace `"path/to/image.png"` and `"path/to/template.png"` with actual image file paths.
-
-  
-
-```javascript
-
-import {
-
-getWindowData,
-
-captureWindow,
-
-mouseMove,
-
-mouseClick,
-
-mouseDrag,
-
-typeString,
-
-KeyListener,
-
-} from  "node-native-win-utils";
-
-  
-
-// Retrieve window data
-
-  
-
-const  windowData  =  getWindowData("My Window");
-
-  
-
-console.log("Window data:", windowData);
-
-  
-
-// Window data: { width: 1024, height: 768, x: 100, y: 100 }
-
-  
-
-// Capture window screenshot
-
-  
-
-captureWindow("My Window", "output.png");
-
-  
-
-// Output: output.png with a screenshot of the window
-
-  
-
-// Move the mouse
-
-  
-
-mouseMove(100, 200);
-
-  
-
-// Perform mouse click
-
-  
-
-mouseClick(); // Left mouse click
-
-  
-
-mouseClick("right"); // Right mouse click
-
-  
-
-// Simulate mouse drag
-
-  
-
-mouseDrag(100, 200, 300, 400);
-
-  
-
-mouseDrag(100, 200, 300, 400, 100); // Drag with speed 100
-
-  
-
-// Simulate typing
-
-  
-
-typeString("Hello, world!");
-
-  
-
-typeString("Hello, world!", 100); // Type with a delay of 100ms between characters
-
-  
-
-// Use KeyboardListener class
-
-  
-
-const  listener  =  KeyboardListener.listener();
-
-  
-
-listener.on("keyDown", (data) => {
-
-console.log("Key down:", data.keyCode, data.keyName);
-
-});
-
-  
-
-// Key down: keyCode keyName
-
-  
-
-listener.on("keyUp", (data) => {
-
-console.log("Key up:", data.keyCode, data.keyName);
-
-});
-
-  
-
-// Key up: keyCode keyName
-
-  
-  
-
-```
+## License
+--
 
 [OpenCV License](https://github.com/opencv/opencv/blob/master/LICENSE)
+
 [MIT License](https://github.com/T-Rumibul/node-native-win-utils/blob/main/LICENSE)
   
 
-[license-src]: https://img.shields.io/github/license/nuxt-modules/icon.svg?style=for-the-badge&colorA=18181B&colorB=28CF8D
+[license-src]: https://img.shields.io/badge/License-MIT-yellow.svg
 
 [license-href]: https://github.com/T-Rumibul/node-native-win-utils/blob/main/LICENSE
+
+
+**Made with ❤️ for Windows automation.**  
+Issues / PRs welcome!

package/binding.gyp

@@ -17,6 +17,7 @@
             "libraries": [
                 "dwmapi.lib",
                 "windowsapp.lib",
+                "Shcore.lib",
                 "-lgdi32", 
                 "-lgdiplus",
                 "<!(node -p \"require('path').resolve('libs/libjpeg-turbo.lib')\")",

package/dist/index.d.mts

@@ -80,11 +80,11 @@ export type StartMouseListener = (callback: (data: {
     y: number;
     type: string;
 }) => void) => void;
-export type StopMouseListener = (error: {
+export type StopMouseListener = () => {
     success: boolean;
     error?: string;
     errorCode?: number;
-}) => void;
+};
 export type MatchTemplate = (image: ImageData, template: ImageData, method?: number | null, mask?: ImageData) => MatchData;
 export type Blur = (image: ImageData, sizeX: number, sizeY: number) => ImageData;
 export type BgrToGray = (image: ImageData) => ImageData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-native-win-utils",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "author": "Andrew K.",
   "license": "MIT",
   "repository": "https://github.com/T-Rumibul/node-native-win-utils.git",
@@ -40,7 +40,7 @@
     "install": "node-gyp-build",
     "build": "node-gyp clean && npx prebuildify --napi && node ./buildHelpers/dllCopy.js && npm run buildts",
     "buildts": "node ./buildHelpers/cjsCompatBuild.js",
-    "test": "tap run "
+    "test": "tap run"
   },
   "dependencies": {
     "node-addon-api": "^8.6.0",

package/src/cpp/main.cpp

@@ -6,10 +6,10 @@
 #include <mouse.cpp>
 #include <opencv.cpp>
 #include <tesseract.cpp>
-
+#include <ShellScalingApi.h>
 Napi::Object Init(Napi::Env env, Napi::Object exports)
 {
-    
+    SetProcessDpiAwareness(PROCESS_PER_MONITOR_DPI_AWARE);
     exports.Set("getWindowData", Napi::Function::New(env, GetWindowData));
     exports.Set("captureWindowN", Napi::Function::New(env, CaptureWindow));
     exports.Set("captureScreenAsync", Napi::Function::New(env, CaptureScreenAsync));

package/src/cpp/mouse.cpp

@@ -1,11 +1,36 @@
 // patrially used code from https://github.com/octalmage/robotjs witch is under MIT License Copyright (c) 2014 Jason Stallings
 #include <napi.h>
 #include <windows.h>
+#include <atomic>
+#include <cmath>
 
 HHOOK mouseHook;
 Napi::ThreadSafeFunction tsfn;
 static HANDLE hHookThread = NULL;
-static DWORD  hookThreadId = 0;
+static DWORD hookThreadId = 0;
+static std::atomic_flag listenerRunning = ATOMIC_FLAG_INIT;
+static std::atomic<bool> listenerStopping = false;
+static HANDLE hHookReady = NULL;
+
+struct Position
+{
+    int x;
+    int y;
+};
+
+Position calcAbsolutePosition(int x, int y)
+{
+    int vLeft = GetSystemMetrics(SM_XVIRTUALSCREEN);
+    int vTop = GetSystemMetrics(SM_YVIRTUALSCREEN);
+    int vWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+    int vHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+    if (vWidth <= 1 || vHeight <= 1)
+        return {0, 0}; // No virtual screen
+    int absoluteX = static_cast<int>((static_cast<long long>(x - vLeft) * 65535) / (vWidth - 1));
+    int absoluteY = static_cast<int>((static_cast<long long>(y - vTop) * 65535) / (vHeight - 1));
+    return {absoluteX, absoluteY};
+}
+
 /**
  * Move the mouse to a specific point.
  * @param point The coordinates to move the mouse to (x, y).
@@ -24,13 +49,9 @@ Napi::Value MoveMouse(const Napi::CallbackInfo &info)
     int posX = info[0].As<Napi::Number>();
     int posY = info[1].As<Napi::Number>();
 
-    // Get the screen metrics
-    int screenWidth = GetSystemMetrics(SM_CXSCREEN);
-    int screenHeight = GetSystemMetrics(SM_CYSCREEN);
-
-    // Convert coordinates to absolute values
-    int absoluteX = static_cast<int>((65536 * posX) / screenWidth);
-    int absoluteY = static_cast<int>((65536 * posY) / screenHeight);
+    Position pos = calcAbsolutePosition(posX, posY);
+    int absoluteX = pos.x;
+    int absoluteY = pos.y;
 
     // Move the mouse
     INPUT mouseInput = {0};
@@ -39,9 +60,9 @@ Napi::Value MoveMouse(const Napi::CallbackInfo &info)
     mouseInput.mi.dy = absoluteY;
     mouseInput.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE | MOUSEEVENTF_VIRTUALDESK;
     mouseInput.mi.time = 0; // System will provide the timestamp
-
-    SendInput(1, &mouseInput, sizeof(mouseInput));
-
+    UINT sent = SendInput(1, &mouseInput, sizeof(INPUT));
+    if (sent == 0)
+        return Napi::Boolean::New(env, false);
     return Napi::Boolean::New(env, true);
 }
 
@@ -55,19 +76,22 @@ Napi::Value ClickMouse(const Napi::CallbackInfo &info)
     else
         button = info[0].As<Napi::String>();
 
-    WORD mouseEvent = 0;
+    WORD downFlag = 0, upFlag = 0;
 
     if (button == "left")
     {
-        mouseEvent = MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_LEFTUP;
+        downFlag = MOUSEEVENTF_LEFTDOWN;
+        upFlag = MOUSEEVENTF_LEFTUP;
     }
     else if (button == "right")
     {
-        mouseEvent = MOUSEEVENTF_RIGHTDOWN | MOUSEEVENTF_RIGHTUP;
+        downFlag = MOUSEEVENTF_RIGHTDOWN;
+        upFlag = MOUSEEVENTF_RIGHTUP;
     }
     else if (button == "middle")
     {
-        mouseEvent = MOUSEEVENTF_MIDDLEDOWN | MOUSEEVENTF_MIDDLEUP;
+        downFlag = MOUSEEVENTF_MIDDLEDOWN;
+        upFlag = MOUSEEVENTF_MIDDLEUP;
     }
     else
     {
@@ -76,13 +100,15 @@ Napi::Value ClickMouse(const Napi::CallbackInfo &info)
     }
 
     // Perform the mouse click
-    INPUT mouseInput = {0};
-    mouseInput.type = INPUT_MOUSE;
-    mouseInput.mi.dwFlags = mouseEvent;
-    mouseInput.mi.time = 0; // System will provide the timestamp
-
-    SendInput(1, &mouseInput, sizeof(mouseInput));
-
+    INPUT inputs[2] = {};
+    inputs[0].type = INPUT_MOUSE;
+    inputs[0].mi.dwFlags = downFlag;
+    inputs[1].type = INPUT_MOUSE;
+    inputs[1].mi.dwFlags = upFlag;
+
+    UINT sent = SendInput(2, inputs, sizeof(INPUT));
+    if (sent == 0)
+        return Napi::Boolean::New(env, false);
     return Napi::Boolean::New(env, true);
 }
 
@@ -95,7 +121,7 @@ Napi::Value DragMouse(const Napi::CallbackInfo &info)
         Napi::TypeError::New(env, "You should provide startX, startY, endX, endY").ThrowAsJavaScriptException();
         return env.Null();
     }
-
+    bool success = true;
     int startX = info[0].As<Napi::Number>();
     int startY = info[1].As<Napi::Number>();
     int endX = info[2].As<Napi::Number>();
@@ -105,23 +131,26 @@ Napi::Value DragMouse(const Napi::CallbackInfo &info)
     {
         speed = info[4].As<Napi::Number>();
     }
-
+    // Use pixel coords for timing
+    double pixelDistX = endX - startX;
+    double pixelDistY = endY - startY;
+    double pixelDistance = sqrt(pixelDistX * pixelDistX + pixelDistY * pixelDistY);
+    if (speed <= 0)
+        speed = 1; // guard div/0
+    double duration = pixelDistance / speed;
     // Get the screen metrics
-    int screenWidth = GetSystemMetrics(SM_CXSCREEN);
-    int screenHeight = GetSystemMetrics(SM_CYSCREEN);
 
+    Position startPos = calcAbsolutePosition(startX, startY);
+    Position endPos = calcAbsolutePosition(endX, endY);
     // Convert coordinates to absolute values
-    int absoluteStartX = static_cast<int>((65536 * startX) / screenWidth);
-    int absoluteStartY = static_cast<int>((65536 * startY) / screenHeight);
-    int absoluteEndX = static_cast<int>((65536 * endX) / screenWidth);
-    int absoluteEndY = static_cast<int>((65536 * endY) / screenHeight);
+    int absoluteStartX = startPos.x;
+    int absoluteStartY = startPos.y;
+    int absoluteEndX = endPos.x;
+    int absoluteEndY = endPos.y;
 
     // Calculate the distance and duration based on speed
     double distanceX = absoluteEndX - absoluteStartX;
     double distanceY = absoluteEndY - absoluteStartY;
-    double distance = sqrt(distanceX * distanceX + distanceY * distanceY);
-    double duration = distance / speed;
-
     // Move the mouse to the starting position
     INPUT startMouseInput = {0};
     startMouseInput.type = INPUT_MOUSE;
@@ -130,7 +159,9 @@ Napi::Value DragMouse(const Napi::CallbackInfo &info)
     startMouseInput.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE | MOUSEEVENTF_VIRTUALDESK;
     startMouseInput.mi.time = 0; // System will provide the timestamp
 
-    SendInput(1, &startMouseInput, sizeof(startMouseInput));
+    if (SendInput(1, &startMouseInput, sizeof(INPUT)) == 0)
+        return Napi::Boolean::New(env, false);
+    ;
 
     // Perform mouse button down event
     INPUT mouseDownInput = {0};
@@ -138,7 +169,9 @@ Napi::Value DragMouse(const Napi::CallbackInfo &info)
     mouseDownInput.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
     mouseDownInput.mi.time = 0; // System will provide the timestamp
 
-    SendInput(1, &mouseDownInput, sizeof(mouseDownInput));
+    if (SendInput(1, &mouseDownInput, sizeof(INPUT)) == 0)
+        return Napi::Boolean::New(env, false);
+    ;
 
     // Calculate the number of steps based on the duration and desired speed
     const int steps = 100; // Adjust the number of steps for smoother movement
@@ -148,7 +181,7 @@ Napi::Value DragMouse(const Napi::CallbackInfo &info)
     double stepY = distanceY / steps;
 
     // Move the mouse in increments to simulate dragging with speed control
-    for (int i = 0; i < steps; ++i)
+    for (int i = 0; i <= steps; ++i)
     {
         // Calculate the position for the current step
         int currentX = static_cast<int>(absoluteStartX + (stepX * i));
@@ -162,10 +195,15 @@ Napi::Value DragMouse(const Napi::CallbackInfo &info)
         mouseMoveInput.mi.dwFlags = MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE | MOUSEEVENTF_VIRTUALDESK;
         mouseMoveInput.mi.time = 0; // System will provide the timestamp
 
-        SendInput(1, &mouseMoveInput, sizeof(mouseMoveInput));
+        if (SendInput(1, &mouseMoveInput, sizeof(INPUT)) == 0)
+            return Napi::Boolean::New(env, false);
+        ;
 
         // Sleep for a short duration to control the speed
-        Sleep(static_cast<DWORD>(duration / steps));
+        if (i < steps)
+        {
+            Sleep(static_cast<DWORD>(duration / steps));
+        }
     }
 
     // Perform mouse button up event
@@ -174,15 +212,14 @@ Napi::Value DragMouse(const Napi::CallbackInfo &info)
     mouseUpInput.mi.dwFlags = MOUSEEVENTF_LEFTUP;
     mouseUpInput.mi.time = 0; // System will provide the timestamp
 
-    SendInput(1, &mouseUpInput, sizeof(mouseUpInput));
-
-    return Napi::Boolean::New(env, true);
+    if (SendInput(1, &mouseUpInput, sizeof(INPUT)) == 0)
+        return Napi::Boolean::New(env, false);
+    return Napi::Boolean::New(env, success);
 }
 
-
 LRESULT CALLBACK MouseProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
-    if (nCode >= 0)
+    if (nCode >= 0 && !listenerStopping.load())
     {
         MSLLHOOKSTRUCT *mouse = (MSLLHOOKSTRUCT *)lParam;
 
@@ -226,17 +263,23 @@ LRESULT CALLBACK MouseProc(int nCode, WPARAM wParam, LPARAM lParam)
             jsCallback.Call({event});
         };
 
-        tsfn.BlockingCall(callback);
+        napi_status status = tsfn.NonBlockingCall(callback);
+        if (status != napi_ok)
+        {
+            // tsfn is already closing
+            return CallNextHookEx(mouseHook, nCode, wParam, lParam);
+        }
     }
 
     return CallNextHookEx(mouseHook, nCode, wParam, lParam);
 }
 
-
 DWORD WINAPI HookThread(LPVOID)
 {
     mouseHook = SetWindowsHookEx(WH_MOUSE_LL, MouseProc, NULL, 0);
-
+    SetEvent(hHookReady);
+    if (mouseHook == NULL)
+        return 1;
     MSG msg;
     while (GetMessage(&msg, NULL, 0, 0))
     {
@@ -259,7 +302,7 @@ Napi::Value StartMouseListener(const Napi::CallbackInfo &info)
         return env.Null();
     }
     // Bug fix: prevent double-start leaking a thread and hook
-    if (hHookThread != NULL)
+    if (listenerRunning.test_and_set())
     {
         Napi::TypeError::New(env, "Mouse listener already running").ThrowAsJavaScriptException();
         return env.Null();
@@ -274,12 +317,43 @@ Napi::Value StartMouseListener(const Napi::CallbackInfo &info)
         1);
 
     // Store handle and thread ID so StopMouseListener can signal and wait
+    hHookReady = CreateEvent(NULL, TRUE, FALSE, NULL);
+    if (hHookReady == NULL)
+    {
+        tsfn.Release();
+        listenerRunning.clear();
+        Napi::Error::New(env, "Failed to create sync event").ThrowAsJavaScriptException();
+        return env.Null();
+    }
     hHookThread = CreateThread(NULL, 0, HookThread, NULL, 0, &hookThreadId);
-
+    if (hHookThread == NULL)
+    {
+        tsfn.Release();
+        CloseHandle(hHookReady);
+        hHookReady = NULL;
+        listenerRunning.clear(); // release the guard so caller can retry
+        Napi::Error::New(env, "Failed to create hook thread").ThrowAsJavaScriptException();
+        return env.Null();
+    }
+    WaitForSingleObject(hHookReady, 2000);
+    CloseHandle(hHookReady);
+    hHookReady = NULL;
+    DWORD exitCode = 0;
+    GetExitCodeThread(hHookThread, &exitCode);
+    if (exitCode == 1)
+    {
+        WaitForSingleObject(hHookThread, 1000);
+        CloseHandle(hHookThread);
+        hHookThread = NULL;
+        hookThreadId = 0;
+        tsfn.Release();
+        listenerRunning.clear();
+        Napi::Error::New(env, "Failed to install mouse hook").ThrowAsJavaScriptException();
+        return env.Null();
+    }
     return Napi::Boolean::New(env, true);
 }
 
-
 Napi::Value StopMouseListener(const Napi::CallbackInfo &info)
 {
     Napi::Env env = info.Env();
@@ -292,10 +366,13 @@ Napi::Value StopMouseListener(const Napi::CallbackInfo &info)
         return result;
     }
 
+    listenerStopping.store(true);
     // PostThreadMessage with WM_QUIT breaks the GetMessage loop in HookThread,
     // which then runs UnhookWindowsHookEx and exits
     if (!PostThreadMessage(hookThreadId, WM_QUIT, 0, 0))
     {
+        listenerStopping.store(false);
+        listenerRunning.clear();
         result.Set("success", false);
         result.Set("error", "Failed to signal hook thread");
         result.Set("errorCode", Napi::Number::New(env, GetLastError()));
@@ -306,8 +383,11 @@ Napi::Value StopMouseListener(const Napi::CallbackInfo &info)
     DWORD waitResult = WaitForSingleObject(hHookThread, 3000);
     if (waitResult != WAIT_OBJECT_0)
     {
-        // Thread didn't exit in time — force it and warn
+        // Thread didn't exit in time - kill it
         TerminateThread(hHookThread, 1);
+        // Best-effort: reduce chance a concurrent NonBlockingCall is still
+        // in-flight before tsfn.Release() below. Not a hard guarantee.
+        Sleep(50);
         result.Set("success", false);
         result.Set("error", "Hook thread did not exit cleanly, was forcefully terminated");
     }
@@ -322,6 +402,7 @@ Napi::Value StopMouseListener(const Napi::CallbackInfo &info)
     CloseHandle(hHookThread);
     hHookThread = NULL;
     hookThreadId = 0;
-
+    listenerRunning.clear();
+    listenerStopping.store(false);
     return result;
 }