(#53) Further code cleanup

- Refactored code to get rid of tick method for mouse and keyboard input
- Decreased keyboard typing speed

Author: s1hofmann

lib/keyboard.class.ts

@@ -1,5 +1,6 @@
 import { NativeAdapter } from "./adapter/native.adapter.class";
 import { Key } from "./key.enum";
+import { sleep } from "./sleep.function";
 
 type StringOrKey = string[] | Key[];
 
@@ -10,24 +11,20 @@ const inputIsString = (input: string[] | Key[]): input is string[] => {
 export class Keyboard {
 
   public config = {
-    autoDelayMs: 500,
+    autoDelayMs: 300,
   };
 
-  private lastAction: number;
-
   constructor(private nativeAdapter: NativeAdapter) {
     this.nativeAdapter.setKeyboardDelay(this.config.autoDelayMs);
-    this.lastAction = Date.now();
   }
 
   public type(...input: StringOrKey): Promise<Keyboard> {
     return new Promise<Keyboard>(async (resolve, reject) => {
       try {
         if (inputIsString(input)) {
           for (const char of input.join(" ").split("")) {
-            await this.nextTick();
+            await sleep(this.config.autoDelayMs);
             await this.nativeAdapter.type(char);
-            this.updateTick();
           }
         } else {
           await this.nativeAdapter.click(...input as Key[]);
@@ -60,18 +57,4 @@ export class Keyboard {
       }
     });
   }
-
-  private updateTick() {
-    this.lastAction = Date.now();
-  }
-
-  private async nextTick(): Promise<void> {
-    return new Promise<void>(resolve => {
-      let current = Date.now();
-      while (current - this.lastAction < this.config.autoDelayMs) {
-        current = Date.now();
-      }
-      resolve();
-    });
-  }
 }

lib/mouse.class.ts

@@ -2,18 +2,16 @@ import { NativeAdapter } from "./adapter/native.adapter.class";
 import { Button } from "./button.enum";
 import { MovementType } from "./movementtype.class";
 import { Point } from "./point.class";
+import { sleep } from "./sleep.function";
 
 export class Mouse {
   public config = {
     autoDelayMs: 100,
     mouseSpeed: 1000,
   };
 
-  private lastAction: number;
-
   constructor(private native: NativeAdapter) {
     this.native.setMouseDelay(0);
-    this.lastAction = Date.now();
   }
 
   public async setPosition(target: Point): Promise<Mouse> {
@@ -38,9 +36,8 @@ export class Mouse {
         for (let idx = 0; idx < path.length; ++idx) {
           const node = path[idx];
           const minTime = timeSteps[idx];
-          await this.waitForNextTick(minTime);
+          await sleep(minTime);
           await this.native.setMousePosition(node);
-          await this.updateTick();
         }
         resolve(this);
       } catch (e) {
@@ -51,19 +48,17 @@ export class Mouse {
 
   public async leftClick(): Promise<Mouse> {
     return new Promise<Mouse>(async resolve => {
-      await this.waitForNextTick(this.config.autoDelayMs);
+      await sleep(this.config.autoDelayMs);
       await this.native.leftClick();
-      await this.updateTick();
       resolve(this);
     });
   }
 
   public async rightClick(): Promise<Mouse> {
     return new Promise<Mouse>(async (resolve, reject) => {
       try {
-        await this.waitForNextTick(this.config.autoDelayMs);
+        await sleep(this.config.autoDelayMs);
         await this.native.rightClick();
-        await this.updateTick();
         resolve(this);
       } catch (e) {
         reject(e);
@@ -74,9 +69,8 @@ export class Mouse {
   public async scrollDown(amount: number): Promise<Mouse> {
     return new Promise<Mouse>(async (resolve, reject) => {
       try {
-        await this.waitForNextTick(this.config.autoDelayMs);
+        await sleep(this.config.autoDelayMs);
         await this.native.scrollDown(amount);
-        await this.updateTick();
         resolve(this);
       } catch (e) {
         reject(e);
@@ -87,9 +81,8 @@ export class Mouse {
   public async scrollUp(amount: number): Promise<Mouse> {
     return new Promise<Mouse>(async (resolve, reject) => {
       try {
-        await this.waitForNextTick(this.config.autoDelayMs);
+        await sleep(this.config.autoDelayMs);
         await this.native.scrollUp(amount);
-        await this.updateTick();
         resolve(this);
       } catch (e) {
         reject(e);
@@ -100,9 +93,8 @@ export class Mouse {
   public async scrollLeft(amount: number): Promise<Mouse> {
     return new Promise<Mouse>(async (resolve, reject) => {
       try {
-        await this.waitForNextTick(this.config.autoDelayMs);
+        await sleep(this.config.autoDelayMs);
         await this.native.scrollLeft(amount);
-        await this.updateTick();
         resolve(this);
       } catch (e) {
         reject(e);
@@ -113,9 +105,8 @@ export class Mouse {
   public async scrollRight(amount: number): Promise<Mouse> {
     return new Promise<Mouse>(async (resolve, reject) => {
       try {
-        await this.waitForNextTick(this.config.autoDelayMs);
+        await sleep(this.config.autoDelayMs);
         await this.native.scrollRight(amount);
-        await this.updateTick();
         resolve(this);
       } catch (e) {
         reject(e);
@@ -126,29 +117,14 @@ export class Mouse {
   public async drag(path: Point[]): Promise<Mouse> {
     return new Promise<Mouse>(async (resolve, reject) => {
       try {
-        await this.waitForNextTick(this.config.autoDelayMs);
+        await sleep(this.config.autoDelayMs);
         await this.native.pressButton(Button.LEFT);
         await this.move(path);
         await this.native.releaseButton(Button.LEFT);
-        await this.updateTick();
         resolve(this);
       } catch (e) {
         reject(e);
       }
     });
   }
-
-  private async updateTick() {
-    this.lastAction = Date.now();
-  }
-
-  private async waitForNextTick(minTime: number): Promise<void> {
-    return new Promise<void>(resolve => {
-      let current = Date.now();
-      while (current - this.lastAction < minTime) {
-        current = Date.now();
-      }
-      resolve();
-    });
-  }
 }