Merge branch 'feature-mouse-circular-move' into 'master'

Feature: Add new circular movement for mouse pointer

See merge request group-bear/mouse-automove!2

Author: aizuddindeyn

README.md

@@ -9,24 +9,37 @@ Since download was blocked, so anti-idle application could not be downloaded and
 Therefore, the app was born, so that I could make a coffee with ease of mind.
 
 ## Introduction
-**mouse-automove** is simple Java application that uses Java AWT **Robot API** to move mouse randomly.
-- Pure Java 8 SDK only, without any other API library.
+**mouse-automove** is a simple Java application that uses Java AWT **Robot API** to move the mouse pointer.
+- Pure Java 8 SDK only, without any other 3rd party API library.
 - Shutdown hook to close the timer properly with its queued task.
 - Pause / resume the timer with 'p' keyboard input.
+- Exit the application 'e' keyboard input.
 
+## Features
 ### Randomization Features
-- Randomize the interval in seconds for each mouse movement, between 15 seconds to 60 seconds.
-- Currently, two types of mouse movement set:
-  - Mouse moved at random point on screen.
-  - Mouse moved at edge of screen.
-- Mouse move randomly:
-  - Random number of movement per, between 3 and 10.
-  - Random point on screen but linked from previous.
-- Mouse move on edge:
-  - Move from current mouse position to edge of screen.
+- Randomize the interval in seconds for each mouse pointer movement, between 15 seconds to 60 seconds.
+- Currently, three types of mouse pointer movement set:
+  - Mouse pointer moved to random point on screen.
+  - Mouse pointer moved at edge of screen.
+  - Mouse pointer moved in circular motion from middle point of screen.
+
+### Movement
+- Mouse pointer move randomly:
+  - Random number of movement per set, between 3 and 10.
+  - Random point on screen, but each will be linked from previous.
+  - Return to original mouse pointer position when finished.
+- Mouse pointer move on edge:
+  - Move mouse pointer from current position to top left corner of screen.
   - Move to each corner of screen, and make it a round.
   - Random number of round, between 1 and 3.
-  - Return to original mouse position when finished.
+  - Return to original mouse pointer position when finished.
+- Mouse pointer move in circular motion:
+  - Move mouse pointer from current position to the middle of screen.
+  - Radius of circle is calculated based on screen height and width.
+  - Move to 0<sup>o</sup> along positive x-axis, based on radius.
+  - Move in full circular motion from 0<sup>o</sup> until 360<sup>o</sup>.
+  - Random number of circular round, between 1 and 3.
+  - Return to middle of screen and back to original mouse pointer position when finished.
 
 ## Java API
 Significant Java SDK API that was used:
@@ -50,11 +63,14 @@ Script folder was provided with batch/shell scripts to compile and run.
 ./script/run.bat
 ./script/run.sh
 ```
-Type 'p' in console and press 'Enter' to pause or resume.
+
+During application started:
+- Type 'p' in console and press 'Enter' to pause or resume.
+- Type 'e' in console and press 'Enter' to exit.
 
 ## Development
 Next plan:
-- Create a mouse move to perform circular motion from center screen.
+- Create configurable properties for number of intervals, random step, and rounds for edge and circular movement.
 
 Pull request are welcome. Do contact me to learn more.
 

src/com/aizuddindeyn/mouse/MouseApplication.java

@@ -4,47 +4,46 @@
  */
 package com.aizuddindeyn.mouse;
 
-import java.text.MessageFormat;
-import java.util.Scanner;
+import java.awt.AWTException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author aizuddindeyn
  * @date 11/7/2020
  */
 public class MouseApplication {
 
-    private static final Scanner SCANNER = new Scanner(System.in);
+    private static final ScheduledExecutorService EXECUTOR = Executors.newSingleThreadScheduledExecutor();
 
     public static void main(String[] args) {
         MouseUtils.log("Starting application");
 
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {
             MouseInstance.getInstance().stop();
-            SCANNER.close();
+            MousePrompt.getScanner().close();
+            EXECUTOR.shutdown();
             MouseUtils.log("Stopping application");
         }));
 
+        try {
+            MouseRobot.init();
+        } catch (AWTException ex) {
+            MouseUtils.logErr("Failed to initialize robot: " + ex.getMessage());
+            Runtime.getRuntime().exit(1);
+        }
+
         MouseInstance.getInstance().start();
 
-        while (true) {
-            try {
-                String status = (MouseInstance.getInstance().isStarted()) ? "started" : "paused";
-                String action = (MouseInstance.getInstance().isStarted()) ? "pause" : "resume";
-                System.out.println();
-                System.out.print(MessageFormat.format("App {0}. Press 'p' and Enter to {1}: ", status, action));
-                String input = SCANNER.next();
-                // Type 'p' to pause or resume
-                if ((input != null && !input.isEmpty()) && 'p' == input.charAt(0)) {
-                    if (MouseInstance.getInstance().isStarted()) {
-                        MouseInstance.getInstance().stop();
-                    } else {
-                        MouseInstance.getInstance().start();
-                    }
-                }
-
-            } catch (Exception ex) {
-                MouseUtils.logErr(ex.getMessage());
-            }
+        EXECUTOR.schedule(new MouseRunnable(EXECUTOR), MouseUtils.EXECUTOR_DELAY, TimeUnit.MILLISECONDS);
+    }
+
+    static void startStop(boolean started) {
+        if (started) {
+            MouseInstance.getInstance().stop();
+        } else {
+            MouseInstance.getInstance().start();
         }
     }
 }

src/com/aizuddindeyn/mouse/MouseInstance.java

@@ -4,66 +4,54 @@
  */
 package com.aizuddindeyn.mouse;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Timer;
 
 /**
  * @author aizuddindeyn
  * @date 11/7/2020
  */
-public class MouseInstance {
+class MouseInstance {
 
     private static final MouseInstance INSTANCE = new MouseInstance();
 
-    private static final Map<Integer, MouseMove> MOVE_MAP = new HashMap<>();
-
     private Timer timer;
 
     private boolean started = false;
 
-    static {
-        MOVE_MAP.put(1, new MouseMoveRandom());
-        MOVE_MAP.put(2, new MouseMoveEdge());
-    }
-
     private MouseInstance() {
         // Singleton
     }
 
-    public static MouseInstance getInstance() {
+    static MouseInstance getInstance() {
         return INSTANCE;
     }
 
-    public synchronized void start() {
+    synchronized void start() {
         timer = new Timer();
         MouseUtils.log("Timer started");
 
-        new MouseTask(timer, INSTANCE).run();
         started = true;
+        timer.schedule(new MouseTask(timer, INSTANCE), 1500L);
     }
 
-    public synchronized void stop() {
+    synchronized void stop() {
         timer.cancel();
         started = false;
         MouseUtils.log("Timer stopped");
     }
 
-    public void execute() {
+    void execute() {
         try {
-            int type = MouseRandom.getSecureRandom().nextInt(MOVE_MAP.size()) + 1;
-            MouseMove move = MOVE_MAP.get(type);
-            if (move != null) {
-                MouseUtils.log("Move: " + move.getClass().getSimpleName());
-                move.move();
-            }
+            int index = MouseRandom.getSecureRandom().nextInt(MouseMoveEnum.getEnumMap().size());
+            MouseMoveEnum enums = MouseMoveEnum.values()[index];
+            MouseMoveEnum.getEnumMap().get(enums).move();
 
         } catch (Exception ex) {
             MouseUtils.logErr(ex.getMessage());
         }
     }
 
-    public synchronized boolean isStarted() {
+    synchronized boolean isStarted() {
         return started;
     }
 }

src/com/aizuddindeyn/mouse/MouseMove.java

@@ -11,20 +11,24 @@
  * @author aizuddindeyn
  * @date 11/7/2020
  */
-public interface MouseMove {
+interface MouseMove {
 
     void move() throws Exception;
 
-    default void moveMouse(Point origin, Point target) throws Exception {
-        Robot robot = new Robot();
+    default void move(Point origin, Point target) throws Exception {
         double dx = (target.getX() - origin.getX()) / MouseUtils.MOVE_TIMES;
         double dy = (target.getY() - origin.getY()) / MouseUtils.MOVE_TIMES;
         double dt = 1;
         for (int step = 1; step < MouseUtils.MOVE_TIMES; step++) {
             Thread.sleep((int) dt);
             int x = ((int) (origin.getX() + dx * step));
             int y = ((int) (origin.getY() + dy * step));
-            robot.mouseMove(x, y);
+            move(new Point(x, y));
         }
     }
+
+    default void move(Point target) throws Exception {
+        Robot robot = MouseRobot.getInstance();
+        robot.mouseMove(target.x, target.y);
+    }
 }

src/com/aizuddindeyn/mouse/MouseMoveCircular.java

@@ -0,0 +1,56 @@
+/*
+ * Owned by aizuddindeyn
+ * Visit https://gitlab.com/group-bear/mouse-automation
+ */
+package com.aizuddindeyn.mouse;
+
+import java.awt.Dimension;
+import java.awt.Point;
+
+import static com.aizuddindeyn.mouse.MouseUtils.CIRCLE_ROUND_MAX;
+
+/**
+ * @author aizuddindeyn
+ * @date 11/7/2020
+ */
+class MouseMoveCircular implements MouseMove {
+
+    @Override
+    public void move() throws Exception {
+        Point original = MouseUtils.getMouseLocation();
+        Dimension screen = MouseUtils.getScreenResolution();
+
+        // Calculating best radius based on screen size
+        int radiusOnHeight = screen.height / 3;
+        int radiusOnWidth = screen.width / 3;
+        int radius = Math.min(radiusOnHeight, radiusOnWidth);
+
+        int round = MouseRandom.getSecureRandom().nextInt(CIRCLE_ROUND_MAX) + 1;
+
+        int midX = (screen.width / 2) + 1;
+        int midY = (screen.height / 2) + 1;
+        Point center = new Point(midX, midY);
+
+        move(original, center);
+
+        Dimension firstPoint = calculateCircle(0, radius);
+        move(center, new Point(center.x + firstPoint.width, center.y + firstPoint.height));
+
+        for (int i = 1; i <= 360 * round; i++) {
+            Thread.sleep(10);
+            Dimension d = calculateCircle(i, radius);
+            move(new Point(center.x + d.width, center.y + d.height));
+        }
+
+        move(MouseUtils.getMouseLocation(), center);
+        move(center, original);
+    }
+
+    Dimension calculateCircle(int degree, int radius) {
+        double rad = Math.toRadians(degree);
+        double x = radius * (Math.cos(rad));
+        double y = radius * (Math.sin(rad));
+
+        return new Dimension((int) x, (int) y);
+    }
+}

src/com/aizuddindeyn/mouse/MouseMoveEdge.java

@@ -16,7 +16,7 @@
  * @author aizuddindeyn
  * @date 11/7/2020
  */
-public class MouseMoveEdge implements MouseMove {
+class MouseMoveEdge implements MouseMove {
 
     @Override
     public void move() throws Exception {
@@ -25,7 +25,6 @@ public void move() throws Exception {
         Dimension screen = MouseUtils.getScreenResolution();
 
         int round = MouseRandom.getSecureRandom().nextInt(EDGE_ROUND_MAX) + 1;
-        MouseUtils.log("Round: " + round);
 
         List<Point> targets = new ArrayList<>();
         for (int i = 1; i <= round; i++) {
@@ -39,7 +38,7 @@ public void move() throws Exception {
 
         Point current = p;
         for (Point target : targets) {
-            moveMouse(current, target);
+            move(current, target);
             current = target;
         }
     }

src/com/aizuddindeyn/mouse/MouseMoveEnum.java

@@ -0,0 +1,44 @@
+/*
+ * Owned by aizuddindeyn
+ * Visit https://gitlab.com/group-bear/mouse-automation
+ */
+package com.aizuddindeyn.mouse;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+/**
+ * @author aizuddindeyn
+ * @date 11/7/2020
+ */
+public enum MouseMoveEnum {
+
+    RANDOM(new MouseMoveRandom()),
+
+    EDGE(new MouseMoveEdge()),
+
+    CIRCLE(new MouseMoveCircular()),
+    ;
+
+    private static final Map<MouseMoveEnum, MouseMove> ENUM_MAP = new EnumMap<>(MouseMoveEnum.class);
+
+    private final MouseMove move;
+
+    static {
+        for (MouseMoveEnum e : MouseMoveEnum.values()) {
+            ENUM_MAP.put(e, e.getMove());
+        }
+    }
+
+    MouseMoveEnum(MouseMove move) {
+        this.move = move;
+    }
+
+    MouseMove getMove() {
+        return move;
+    }
+
+    static Map<MouseMoveEnum, MouseMove> getEnumMap() {
+        return ENUM_MAP;
+    }
+}

src/com/aizuddindeyn/mouse/MouseMoveRandom.java

@@ -14,7 +14,7 @@
  * @author aizuddindeyn
  * @date 11/7/2020
  */
-public class MouseMoveRandom implements MouseMove {
+class MouseMoveRandom implements MouseMove {
 
     @Override
     public void move() throws Exception {
@@ -24,7 +24,6 @@ public void move() throws Exception {
 
         int step = RANDOM_STEP_MIN +
                 (MouseRandom.getSecureRandom().nextInt(RANDOM_STEP_MAX - RANDOM_STEP_MIN) + 1);
-        MouseUtils.log("Step: " + step);
 
         int x = p.x;
         int y = p.y;
@@ -35,9 +34,10 @@ public void move() throws Exception {
                 y2 = MouseRandom.getSecureRandom().nextInt(screen.height);
             } while (x2 == x && y2 == y);
 
-            moveMouse(new Point(x, y), new Point(x2, y2));
+            move(new Point(x, y), new Point(x2, y2));
             x = x2;
             y = y2;
         }
+        move(MouseUtils.getMouseLocation(), p);
     }
 }