(#403) Both pressButton and releaseButton now respect configured …

…autoDelay (#404)
nut-tree · May 17, 2022 · a148207 · a148207
1 parent b410d7f
commit a148207
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 0 deletions.
diff --git a/lib/mouse.class.spec.ts b/lib/mouse.class.spec.ts
@@ -177,6 +177,50 @@ describe("Mouse class", () => {
             expect(pressed).toBe(SUT);
             expect(released).toBe(SUT);
         });
+
+        describe("autoDelayMs", () => {
+            it("pressButton should respect configured delay", async () => {
+                // GIVEN
+                const SUT = new MouseClass(providerRegistryMock);
+                const delay = 100;
+                SUT.config.autoDelayMs = delay;
+
+                const mouseMock = jest.fn();
+                providerRegistryMock.getMouse = jest.fn(() => mockPartial<MouseProviderInterface>({
+                    setMouseDelay: jest.fn(),
+                    pressButton: mouseMock
+                }));
+
+                // WHEN
+                const start = Date.now();
+                await SUT.pressButton(Button.LEFT);
+                const duration = Date.now() - start;
+
+                // THEN
+                expect(duration).toBeGreaterThanOrEqual(delay);
+            });
+
+            it("releaseButton should respect configured delay", async () => {
+                // GIVEN
+                const SUT = new MouseClass(providerRegistryMock);
+                const delay = 100;
+                SUT.config.autoDelayMs = delay;
+
+                const mouseMock = jest.fn();
+                providerRegistryMock.getMouse = jest.fn(() => mockPartial<MouseProviderInterface>({
+                    setMouseDelay: jest.fn(),
+                    releaseButton: mouseMock
+                }));
+
+                // WHEN
+                const start = Date.now();
+                await SUT.releaseButton(Button.LEFT);
+                const duration = Date.now() - start;
+
+                // THEN
+                expect(duration).toBeGreaterThanOrEqual(delay);
+            });
+        });
     });
 
     describe("click and doubleClick", () => {

diff --git a/lib/mouse.class.ts b/lib/mouse.class.ts
@@ -187,6 +187,7 @@ export class MouseClass {
     public async pressButton(btn: Button): Promise<MouseClass> {
         return new Promise<MouseClass>(async (resolve, reject) => {
             try {
+                await sleep(this.config.autoDelayMs);
                 await this.providerRegistry.getMouse().pressButton(btn);
                 resolve(this);
             } catch (e) {
@@ -202,6 +203,7 @@ export class MouseClass {
     public async releaseButton(btn: Button): Promise<MouseClass> {
         return new Promise<MouseClass>(async (resolve, reject) => {
             try {
+                await sleep(this.config.autoDelayMs);
                 await this.providerRegistry.getMouse().releaseButton(btn);
                 resolve(this);
             } catch (e) {
@@ -217,6 +219,7 @@ export class MouseClass {
     public async click(btn: Button): Promise<MouseClass> {
         return new Promise<MouseClass>(async (resolve, reject) => {
             try {
+                await sleep(this.config.autoDelayMs);
                 await this.providerRegistry.getMouse().click(btn);
                 resolve(this);
             } catch (e) {
@@ -232,6 +235,7 @@ export class MouseClass {
     public async doubleClick(btn: Button): Promise<MouseClass> {
         return new Promise<MouseClass>(async (resolve, reject) => {
             try {
+                await sleep(this.config.autoDelayMs);
                 await this.providerRegistry.getMouse().doubleClick(btn);
                 resolve(this);
             } catch (e) {