Merge pull request 'Update dependency org.apache.logging.log4j:log4j-core to v2.24.3' (#3) from renovate/org.apache.logging.log4j-log4j-core-2.x into main

Reviewed-on: #3

.drone.yml

@@ -1,27 +1,32 @@
 kind: pipeline
-name: default
+name: verify
 platform:
   os: linux
   arch: arm64
 
+trigger:
+  event:
+    - push
+    - pull_request
+
 steps:
   # test if it compiles correctly
   - name: build
-    image: maven:3-eclipse-temurin-17
+    image: maven:3-eclipse-temurin-21
     commands:
       - mvn verify --no-transfer-progress -DskipTests=true -Dmaven.javadoc.skip=true -B -V
 
   # run unit tests
   - name: test
-    image: maven:3-eclipse-temurin-17
+    image: maven:3-eclipse-temurin-21
     commands:
       - mvn test --no-transfer-progress -B -V
 
   # run code analysis
   - name: code-analysis
-    image: maven:3-eclipse-temurin-17
+    image: maven:3-eclipse-temurin-21
     commands:
-      - mvn sonar:sonar --no-transfer-progress -Dsonar.projectKey=$SONAR_PROJECT_KEY -Dsonar.host.url=$SONAR_INSTANCE_URL -Dsonar.login=$SONAR_LOGIN_KEY -B -V
+      - mvn sonar:sonar --no-transfer-progress -Dsonar.projectKey=$SONAR_PROJECT_KEY -Dsonar.host.url=$SONAR_INSTANCE_URL -Dsonar.token=$SONAR_LOGIN_KEY -B -V
     environment:
       SONAR_PROJECT_KEY:
         from_secret: sonar_project_key
@@ -29,3 +34,32 @@ steps:
         from_secret: sonar_instance_url
       SONAR_LOGIN_KEY:
         from_secret: sonar_login_key
+
+---
+
+kind: pipeline
+name: deploy
+type: docker
+platform:
+  os: linux
+  arch: arm64
+
+trigger:
+  event:
+    - promote
+  target:
+    - production
+
+steps:
+  # skip all previous steps because they were already ran in the "build" phase; we don't need to re-analyze the code.
+
+  # upload to maven repository
+  - name: maven-deploy
+    image: maven:3-eclipse-temurin-21
+    commands:
+      - mvn deploy --no-transfer-progress -DskipTests=true -Dmaven.javadoc.skip=true -B -V -gs settings.xml -Dmaven.repo.username=$MAVEN_REPO_USERNAME -Dmaven.repo.password=$MAVEN_REPO_PASSWORD
+    environment:
+      MAVEN_REPO_USERNAME:
+        from_secret: maven_repo_username
+      MAVEN_REPO_PASSWORD:
+        from_secret: maven_repo_password

pom.xml

@@ -6,11 +6,11 @@
 
     <groupId>wtf.beatrice</groupId>
     <artifactId>autosqueal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>0.0.5-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -18,13 +18,13 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.23.1</version>
+            <version>2.24.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.23.1</version>
+            <version>2.24.3</version>
         </dependency>
 
         <dependency>
@@ -34,8 +34,26 @@
         </dependency>
     </dependencies>
 
+    <distributionManagement>
+        <repository>
+            <id>nexus-releases</id>
+            <name>Nexus Releases Repository</name>
+            <url>https://nexus.beatrice.wtf/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>nexus-snapshots</id>
+            <name>Nexus Snapshots Repository</name>
+            <url>https://nexus.beatrice.wtf/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>5.0.0.4389</version>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
@@ -61,4 +79,23 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>central</id>
+            <url>https://repo1.maven.org/maven2/</url>
+        </repository>
+
+        <repository>
+            <id>sonatype-nexus-releases</id>
+            <url>https://oss.sonatype.org/content/repositories/releases</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>sonatype-nexus-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </pluginRepository>
+    </pluginRepositories>
+
 </project>

readme.md

@@ -1,6 +1,38 @@
-# autosqueal
+# [autosqueal](https://git.beatrice.wtf/Tools/autosqeal)
 [![Build Status](https://drone.beatrice.wtf/api/badges/Tools/autosqeal/status.svg?ref=refs/heads/main)](https://drone.beatrice.wtf/Tools/autosqeal)
+[![Quality Gate Status](https://sonar.beatrice.wtf/api/project_badges/measure?project=autosqueal&metric=alert_status&token=sqb_49dde556c032d0130640ea1e48875905b158d368)](https://sonar.beatrice.wtf/dashboard?id=autosqueal)
 [![Reliability Rating](https://sonar.beatrice.wtf/api/project_badges/measure?project=autosqueal&metric=reliability_rating&token=sqb_49dde556c032d0130640ea1e48875905b158d368)](https://sonar.beatrice.wtf/dashboard?id=autosqueal)
 [![Security Rating](https://sonar.beatrice.wtf/api/project_badges/measure?project=autosqueal&metric=security_rating&token=sqb_49dde556c032d0130640ea1e48875905b158d368)](https://sonar.beatrice.wtf/dashboard?id=autosqueal)
 [![Maintainability Rating](https://sonar.beatrice.wtf/api/project_badges/measure?project=autosqueal&metric=sqale_rating&token=sqb_49dde556c032d0130640ea1e48875905b158d368)](https://sonar.beatrice.wtf/dashboard?id=autosqueal)
 [![Lines of Code](https://sonar.beatrice.wtf/api/project_badges/measure?project=autosqueal&metric=ncloc&token=sqb_49dde556c032d0130640ea1e48875905b158d368)](https://sonar.beatrice.wtf/dashboard?id=autosqueal)
+  
+  
+*little java tool to automatically perform mouse actions*  
+  
+## supported systems  
+| system    | support    |
+|-----------|------------|
+| macOS     | ✅ complete |
+| GNU/Linux | ⏳ planned  |
+| Windows   | ⏳ planned  |
+  
+## building  
+**required tools**  
+ - java 21 sdk  
+ - git  
+ - maven  
+  
+**build steps**  
+ 1. clone the official repository linked below using `git clone`.  
+ 2. `cd` into the directory and run `mvn clean package`.  
+ 3. you will find a runnable jar with dependencies in the `target/` folder.  
+ 4. run the built jar file with `java -jar target/autosqueal-*-dependencies.jar`.
+  
+## support  
+| category            | info                                                          |
+|---------------------|---------------------------------------------------------------|
+| official repository | [gitea src](https://git.beatrice.wtf/Tools/autosqeal.git)     |
+| mirror repository   | [github src](https://github.com/mind-overflow/autosqueal.git) |
+| build status        | [drone-ci](https://drone.beatrice.wtf/Tools/autosqeal)        |
+| dev email           | [hello@beatrice.wtf](mailto:hello@beatrice.wtf)               |
+

renovate.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}

settings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
+
+    <servers>
+        <server>
+            <id>nexus-snapshots</id>
+            <username>${maven.repo.username}</username>
+            <password>${maven.repo.password}</password>
+        </server>
+        <server>
+            <id>nexus-releases</id>
+            <username>${maven.repo.username}</username>
+            <password>${maven.repo.password}</password>
+        </server>
+    </servers>
+
+</settings>
+

src/main/java/wtf/beatrice/autosqueal/Main.java

@@ -4,25 +4,18 @@ import com.github.kwhat.jnativehook.GlobalScreen;
 import com.github.kwhat.jnativehook.NativeHookException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import wtf.beatrice.autosqueal.util.RunnerUtil;
 import wtf.beatrice.autosqueal.listener.KeyPressListener;
 import wtf.beatrice.autosqueal.ui.MainWindow;
 
-import java.awt.*;
-import java.util.Timer;
-
 public class Main {
 
-    private static boolean running = true;
-
     private static final Logger LOGGER = LogManager.getLogger(Main.class);
+    private static final MainWindow mainWindow = new MainWindow();
 
     public static void main(String[] args) {
         LOGGER.info("Hello world!");
 
         registerJNativeHook();
-
-        MainWindow mainWindow = new MainWindow();
         mainWindow.init();
     }
 
@@ -41,4 +34,8 @@ public class Main {
         }
     }
 
+    public static MainWindow getMainWindow() {
+        return mainWindow;
+    }
+
 }

src/main/java/wtf/beatrice/autosqueal/controls/CursorMover.java

@@ -14,14 +14,14 @@ public class CursorMover extends TimerTask
 {
 
     private static final Logger LOGGER = LogManager.getLogger(CursorMover.class);
-    private final Random RANDOM;
+    private final Random random;
 
     private static final int LOOPS_BEFORE_CLICK = 5;
 
     private int iteration = 0;
 
     public CursorMover() {
-        RANDOM = new SecureRandom();
+        random = new SecureRandom();
     }
 
     @Override
@@ -41,14 +41,24 @@ public class CursorMover extends TimerTask
             destX = RunnerUtil.SCREEN_WIDTH - 5;
             destY = 5;
 
+            try {
                 singleStepMovementTask = new SingleStepMovementTask(destX, destY, true);
+            } catch (AWTException e) {
+                LOGGER.error(e);
+                return;
+            }
 
             iteration = 0;
         } else {
-            destX = RANDOM.nextInt(RunnerUtil.SCREEN_WIDTH);
+            destX = random.nextInt(RunnerUtil.SCREEN_WIDTH);
-            destY = RANDOM.nextInt(RunnerUtil.SCREEN_HEIGHT);
+            destY = random.nextInt(RunnerUtil.SCREEN_HEIGHT);
 
+            try {
                 singleStepMovementTask = new SingleStepMovementTask(destX, destY, false);
+            } catch (AWTException e) {
+                LOGGER.error(e);
+                return;
+            }
 
             iteration++;
         }

src/main/java/wtf/beatrice/autosqueal/controls/SingleStepMovementTask.java

@@ -24,7 +24,7 @@ public class SingleStepMovementTask extends TimerTask {
     boolean click;
 
 
-    public SingleStepMovementTask(int destinationX, int destinationY, boolean click) {
+    public SingleStepMovementTask(int destinationX, int destinationY, boolean click) throws AWTException {
 
         this.click = click;
 
@@ -52,11 +52,7 @@ public class SingleStepMovementTask extends TimerTask {
         LOGGER.info("Len: [{}, {}]", lengthX, lengthY);
         LOGGER.info("Step: [{}, {}]", stepX, stepY);
 
-        try {
         robot = new Robot();
-        } catch (AWTException e) {
-            throw new RuntimeException(e);
-        }
 
     }
 
@@ -85,7 +81,7 @@ public class SingleStepMovementTask extends TimerTask {
                     Thread.sleep(200);
                 } catch (InterruptedException e) {
                     LOGGER.error(e);
-                    return;
+                    Thread.currentThread().interrupt();
                 }
             }
 

src/main/java/wtf/beatrice/autosqueal/listener/CursorMoveListener.java

@@ -11,9 +11,6 @@ public class CursorMoveListener extends TimerTask {
     private int oldX;
     private int oldY;
 
-    private int newX;
-    private int newY;
-
     private int loops;
     private boolean isUserAway;
 
@@ -28,8 +25,8 @@ public class CursorMoveListener extends TimerTask {
 
     @Override
     public void run() {
-        newX = MouseInfo.getPointerInfo().getLocation().x;
+        int newX = MouseInfo.getPointerInfo().getLocation().x;
-        newY = MouseInfo.getPointerInfo().getLocation().y;
+        int newY = MouseInfo.getPointerInfo().getLocation().y;
 
         if(newX != oldX || newY != oldY) {
             // cursor has been moved

src/main/java/wtf/beatrice/autosqueal/listener/KeyPressListener.java

@@ -6,6 +6,7 @@ import com.github.kwhat.jnativehook.keyboard.NativeKeyEvent;
 import com.github.kwhat.jnativehook.keyboard.NativeKeyListener;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import wtf.beatrice.autosqueal.Main;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,7 +18,8 @@ public class KeyPressListener implements NativeKeyListener
 
     @Override
     public void nativeKeyPressed(NativeKeyEvent e) {
-        LOGGER.info("Key Pressed: {}", NativeKeyEvent.getKeyText(e.getKeyCode()));
+        String key = NativeKeyEvent.getKeyText(e.getKeyCode());
+        LOGGER.info("Key Pressed: {}", key);
 
         if (e.getKeyCode() == NativeKeyEvent.VC_ESCAPE) {
             try {
@@ -34,7 +36,8 @@ public class KeyPressListener implements NativeKeyListener
 
     @Override
     public void nativeKeyReleased(NativeKeyEvent e) {
-        LOGGER.info("Key Released: {}", NativeKeyEvent.getKeyText(e.getKeyCode()));
+        String key = NativeKeyEvent.getKeyText(e.getKeyCode());
+        LOGGER.info("Key Released: {}", key);
 
         pressedKeysIds.remove((Integer) e.getKeyCode());
 
@@ -50,7 +53,7 @@ public class KeyPressListener implements NativeKeyListener
 
             LOGGER.warn("Received shutdown keystroke: {}", keys);
 
-            System.exit(0);
+            Main.getMainWindow().toggleRunning();
         }
     }
 }

src/main/java/wtf/beatrice/autosqueal/ui/MainWindow.java

@@ -1,14 +1,15 @@
 package wtf.beatrice.autosqueal.ui;
 
+import com.github.kwhat.jnativehook.keyboard.NativeKeyEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import wtf.beatrice.autosqueal.controls.CursorMover;
 import wtf.beatrice.autosqueal.listener.CursorMoveListener;
 import wtf.beatrice.autosqueal.util.RunnerUtil;
+import wtf.beatrice.autosqueal.util.SystemUtil;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
 import java.awt.image.BufferedImage;
 import java.util.Timer;
 
@@ -16,69 +17,121 @@ public class MainWindow
 {
     private static final Logger LOGGER = LogManager.getLogger(MainWindow.class);
 
-    private static final int WINDOW_HEIGHT = 600;
+    private static final int WINDOW_HEIGHT = 700;
     private static final int WINDOW_WIDTH = 800;
 
-    private final Timer TIMER_RUNNER = new Timer();
+    private Timer timerRunner = new Timer();
-
+    private CursorMover cursorMover = new CursorMover();
-    private CursorMover cursorMover = null;
+    private Button toggleButton;
-
-
-    public MainWindow() {
-    }
 
     public void init() {
+
         JFrame frame = new JFrame();
         frame.setSize(new Dimension(WINDOW_WIDTH, WINDOW_HEIGHT));
+        frame.setTitle("autosqueal");
+        frame.setResizable(false);
 
-        Button toggleButton = new Button("Start");
+        toggleButton = new Button();
-        toggleButton.setBounds(new Rectangle((WINDOW_WIDTH / 2) - 40, WINDOW_HEIGHT - 60, 80, 30));
+        toggleButton.setBounds(new Rectangle((WINDOW_WIDTH / 2) - 60, WINDOW_HEIGHT - 60, 120, 30));
-        toggleButton.addActionListener(e -> toggleRunning(toggleButton));
+        toggleButton.addActionListener(e -> toggleRunning());
         frame.add(toggleButton);
+        toggleRunning();
 
         int bordersPx = 10;
         int rescaleRateo = ((WINDOW_WIDTH - (2 * bordersPx)) * 100) / RunnerUtil.SCREEN_WIDTH;
         int rescaleWidth = RunnerUtil.SCREEN_WIDTH * rescaleRateo / 100;
         int rescaleHeight = RunnerUtil.SCREEN_HEIGHT * rescaleRateo / 100;
-        JLabel imageLabel = new JLabel(getScreenCapture(rescaleWidth, rescaleHeight));
+        JLabel imageLabel = new JLabel(new ImageIcon(getScreenCapture(rescaleWidth, rescaleHeight)));
         imageLabel.setBounds(new Rectangle(bordersPx, bordersPx, rescaleWidth, rescaleHeight));
         frame.add(imageLabel);
 
+        Image preciseScreenshot = getPreciseScreenshot();
+        JLabel timestampLabel = new JLabel(new ImageIcon(preciseScreenshot));
+        timestampLabel.setBounds(new Rectangle(bordersPx, bordersPx + rescaleHeight + bordersPx, 100, 30));
+        frame.add(timestampLabel);
+
+
         frame.setLayout(null);
         frame.setVisible(true);
     }
 
-    private ImageIcon getScreenCapture(int rescaleWidth, int rescaleHeight) {
+    private Image getScreenCapture(int rescaleWidth, int rescaleHeight) {
+
+            Image fullImage = getScreenCapture();
+            return fullImage.getScaledInstance(rescaleWidth, rescaleHeight, Image.SCALE_FAST);
+    }
+
+    public Image getPreciseScreenshot() {
+
+        if(SystemUtil.getHostSystem().equals(SystemUtil.OperatingSystem.MAC_OS)) {
+            BufferedImage screenshot = getScreenCapture();
+            return screenshot.getSubimage(RunnerUtil.SCREEN_WIDTH - 100,0, 100, 30);
+        }
 
-        try {
-            Robot robot = new Robot();
-            BufferedImage fullImage = robot.createScreenCapture(new Rectangle(RunnerUtil.SCREEN_WIDTH, RunnerUtil.SCREEN_HEIGHT));
-            Image image = fullImage.getScaledInstance(rescaleWidth, rescaleHeight, Image.SCALE_FAST);
-            return new ImageIcon(image);
-        } catch (AWTException e) {
-            LOGGER.error("Robot initialization error", e);
         return null;
     }
+
+    public BufferedImage getScreenCapture() {
+        try {
+            Robot robot = new Robot();
+            return robot.createScreenCapture(new Rectangle(RunnerUtil.SCREEN_WIDTH, RunnerUtil.SCREEN_HEIGHT));
+        } catch (AWTException e) {
+            LOGGER.error("Robot initialization error", e);
         }
 
-    private void toggleRunning(Button button) {
+        return null;
+    }
+
+    public BufferedImage getBufferedImage(Image img) {
+        if (img instanceof BufferedImage image)
+        {
+            return image;
+        }
+
+        // Create a buffered image with transparency
+        BufferedImage bimage = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_ARGB);
+
+        // Draw the image on to the buffered image
+        Graphics2D bGr = bimage.createGraphics();
+        bGr.drawImage(img, 0, 0, null);
+        bGr.dispose();
+
+        // Return the buffered image
+        return bimage;
+    }
+
+    public void toggleRunning() {
+
+        String label;
 
         if (cursorMover == null) {
+            timerRunner = new Timer();
             CursorMoveListener cursorMoveListener = new CursorMoveListener();
-            TIMER_RUNNER.schedule(cursorMoveListener, 0L, 1000L);
+            timerRunner.schedule(cursorMoveListener, 0L, 1000L);
 
             cursorMover = new CursorMover();
-            TIMER_RUNNER.schedule(cursorMover, 1000L, RunnerUtil.SECONDS_BETWEEN_MOVES * 1000L);
+            timerRunner.schedule(cursorMover, 1000L, RunnerUtil.SECONDS_BETWEEN_MOVES * 1000L);
 
-            button.setLabel("Stop");
+            label = "Stop [" +
+                    NativeKeyEvent.getKeyText(NativeKeyEvent.VC_CONTROL) +
+                    "][" +
+                    NativeKeyEvent.getKeyText(NativeKeyEvent.VC_ALT) +
+                    "]";
         }
         else {
-            TIMER_RUNNER.cancel();
+            timerRunner.cancel();
 
             cursorMover = null;
 
-            button.setLabel("Start");
+            label = "Start [" +
+                    NativeKeyEvent.getKeyText(NativeKeyEvent.VC_CONTROL) +
+                    "][" +
+                    NativeKeyEvent.getKeyText(NativeKeyEvent.VC_ALT) +
+                    "]";
+        }
+
+        toggleButton.setLabel(label);
+
     }
 
 }
-}

src/main/java/wtf/beatrice/autosqueal/util/RunnerUtil.java

@@ -4,6 +4,10 @@ import java.awt.*;
 
 public class RunnerUtil {
 
+    private RunnerUtil() {
+        throw new AssertionError("The RunnerUtil class is not intended to be instantiated.");
+    }
+
     public static final int SECONDS_BETWEEN_MOVES = 10;
 
     public static final int SCREEN_HEIGHT = Toolkit.getDefaultToolkit().getScreenSize().height;

src/main/java/wtf/beatrice/autosqueal/util/SystemUtil.java

@@ -0,0 +1,26 @@
+package wtf.beatrice.autosqueal.util;
+
+import java.util.Locale;
+
+public class SystemUtil
+{
+
+    public static OperatingSystem getHostSystem() {
+        String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
+        if (osName.contains("win")) {
+            return OperatingSystem.WINDOWS;
+        } else if (osName.contains("nix") ||
+                osName.contains("nux") ||
+                osName.contains("aix")) {
+            return OperatingSystem.LINUX;
+        } else if (osName.contains("mac")) {
+            return OperatingSystem.MAC_OS;
+        } else {
+            return OperatingSystem.UNKNOWN;
+        }
+    }
+
+    public enum OperatingSystem {
+        WINDOWS, LINUX, MAC_OS, UNKNOWN;
+    }
+}

src/main/resources/log4j2.xml

@@ -4,9 +4,6 @@
         <Console name="ConsoleAppender" target="SYSTEM_OUT">
             <PatternLayout pattern="[%d{HH:mm:ss.SSS}] [%t] %-4level | %logger{36} - %msg%n" />
         </Console>
-        <File name="FileAppender" fileName="application-${date:yyyyMMdd}.log" immediateFlush="false" append="true">
-            <PatternLayout pattern="[%d{yyy-MM-dd HH:mm:ss.SSS}] [%t] %-4level | %logger{36} - %msg%n"/>
-        </File>
     </Appenders>
     <Loggers>
         <Root level="debug">