Updated delay handling with mouse and keyboard input

Author: s1hofmann

lib/keyboard.class.spec.ts

@@ -9,15 +9,15 @@ beforeEach(() => {
 });
 
 describe("Keyboard", () => {
-  it("should have a default delay of 20 ms", () => {
+  it("should have a default delay of 500 ms", () => {
     // GIVEN
     const adapterMock = new NativeAdapter();
     const SUT = new Keyboard(adapterMock);
 
     // WHEN
 
     // THEN
-    expect(SUT.config.autoDelayMs).toEqual(20);
+    expect(SUT.config.autoDelayMs).toEqual(500);
   });
 
   it("should pass input strings down to the type call.", () => {
@@ -30,8 +30,10 @@ describe("Keyboard", () => {
     SUT.type(payload);
 
     // THEN
-    expect(adapterMock.type).toHaveBeenCalledTimes(1);
-    expect(adapterMock.type).toHaveBeenCalledWith(payload);
+    expect(adapterMock.type).toHaveBeenCalledTimes(payload.length);
+    for (const char of payload.split("")) {
+      expect(adapterMock.type).toHaveBeenCalledWith(char);
+    }
   });
 
   it("should pass multiple input strings down to the type call.", () => {
@@ -44,8 +46,10 @@ describe("Keyboard", () => {
     SUT.type(...payload);
 
     // THEN
-    expect(adapterMock.type).toHaveBeenCalledTimes(1);
-    expect(adapterMock.type).toHaveBeenCalledWith(payload.join(" "));
+    expect(adapterMock.type).toHaveBeenCalledTimes(payload.join(" ").length);
+    for (const char of payload.join(" ").split("")) {
+      expect(adapterMock.type).toHaveBeenCalledWith(char);
+    }
   });
 
   it("should pass input keys down to the click call.", () => {

lib/keyboard.class.ts

@@ -8,16 +8,23 @@ export class Keyboard {
   }
 
   public config = {
-    autoDelayMs: 20,
+    autoDelayMs: 500,
   };
 
+  private lastAction: number;
+
   constructor(private nativeAdapter: NativeAdapter) {
     this.nativeAdapter.setKeyboardDelay(this.config.autoDelayMs);
+    this.lastAction = Date.now();
   }
 
   public type(...input: string[] | Key[]): Keyboard {
     if (Keyboard.inputIsString(input)) {
-      this.nativeAdapter.type(input.join(" "));
+      for (const char of input.join(" ").split("")) {
+        this.waitForNextTick();
+        this.nativeAdapter.type(char);
+        this.updateTick();
+      }
     } else {
       this.nativeAdapter.click(...input as Key[]);
     }
@@ -33,4 +40,15 @@ export class Keyboard {
     this.nativeAdapter.releaseKey(...keys);
     return this;
   }
+
+  private updateTick() {
+    this.lastAction = Date.now();
+  }
+
+  private waitForNextTick() {
+    let current = Date.now();
+    while (current - this.lastAction < this.config.autoDelayMs) {
+      current = Date.now();
+    }
+  }
 }

lib/mouse.class.spec.ts

@@ -13,6 +13,17 @@ beforeEach(() => {
 const linehelper = new LineHelper();
 
 describe("Mouse class", () => {
+  it("should have a default delay of 500 ms", () => {
+    // GIVEN
+    const adapterMock = new NativeAdapter();
+    const SUT = new Mouse(adapterMock);
+
+    // WHEN
+
+    // THEN
+    expect(SUT.config.autoDelayMs).toEqual(100);
+  });
+
   it("should forward scrollLeft to the native adapter class", () => {
     // GIVEN
     const nativeAdapterMock = new NativeAdapter();

lib/mouse.class.ts

@@ -5,12 +5,15 @@ import { Point } from "./point.class";
 
 export class Mouse {
   public config = {
-    autoDelayMs: 0,
+    autoDelayMs: 100,
     mouseSpeed: 1000,
   };
 
+  private lastAction: number;
+
   constructor(private native: NativeAdapter) {
-    this.native.setMouseDelay(this.config.autoDelayMs);
+    this.native.setMouseDelay(0);
+    this.lastAction = Date.now();
   }
 
   public setPosition(target: Point): Mouse {
@@ -27,50 +30,72 @@ export class Mouse {
     for (let idx = 0; idx < path.length; ++idx) {
       const node = path[idx];
       const minTime = timeSteps[idx];
-      const previous = Date.now();
-      let current = Date.now();
-      while (current - previous < minTime) {
-        current = Date.now();
-      }
+      this.waitForNextTick(minTime);
       this.native.setMousePosition(node);
+      this.updateTick();
     }
     return this;
   }
 
   public leftClick(): Mouse {
+    this.waitForNextTick(this.config.autoDelayMs);
     this.native.leftClick();
+    this.updateTick();
     return this;
   }
 
   public rightClick(): Mouse {
+    this.waitForNextTick(this.config.autoDelayMs);
     this.native.rightClick();
+    this.updateTick();
     return this;
   }
 
   public scrollDown(amount: number): Mouse {
+    this.waitForNextTick(this.config.autoDelayMs);
     this.native.scrollDown(amount);
+    this.updateTick();
     return this;
   }
 
   public scrollUp(amount: number): Mouse {
+    this.waitForNextTick(this.config.autoDelayMs);
     this.native.scrollUp(amount);
+    this.updateTick();
     return this;
   }
 
   public scrollLeft(amount: number): Mouse {
+    this.waitForNextTick(this.config.autoDelayMs);
     this.native.scrollLeft(amount);
+    this.updateTick();
     return this;
   }
 
   public scrollRight(amount: number): Mouse {
+    this.waitForNextTick(this.config.autoDelayMs);
     this.native.scrollRight(amount);
+    this.updateTick();
     return this;
   }
 
   public drag(path: Point[]): Mouse {
+    this.waitForNextTick(this.config.autoDelayMs);
     this.native.pressButton(Button.LEFT);
     this.move(path);
     this.native.releaseButton(Button.LEFT);
+    this.updateTick();
     return this;
   }
+
+  private updateTick() {
+    this.lastAction = Date.now();
+  }
+
+  private waitForNextTick(minTime: number) {
+    let current = Date.now();
+    while (current - this.lastAction < minTime) {
+      current = Date.now();
+    }
+  }
 }

lib/provider/native/robotjs-keyboard-action.class.ts

@@ -141,7 +141,7 @@ export class KeyboardAction implements KeyboardActionProvider {
   }
 
   public type(input: string): void {
-    robot.typeStringDelayed(input, 200);
+    robot.typeString(input);
   }
 
   public click(...keys: Key[]): void {