Cleaned up files

Updated libraries, and cleaned up code for performance purposes.
Delete nightly.yml
2026-05-31 17:31:55 +00:00 · 2023-12-04 08:55:01 -05:00 · 2023-12-04 08:54:48 -05:00 · 2023-10-30 10:41:45 -04:00 · 2023-10-30 10:38:01 -04:00 · 2023-10-30 10:37:36 -04:00
30 changed files with 170 additions and 452 deletions
@@ -1,6 +1,8 @@
 on:
  push:
-    branches: ["**"]
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 jobs:
  build:
@@ -26,4 +28,4 @@ jobs:
        uses: actions/upload-artifact@v2
        with:
          name: AntiVPN
-          path: Assembly/target/Assembly-*.jar
+          path: Assembly/target/Assembly-*.jar
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>AntiVPN</artifactId>
-    <groupId>dev.brighten.antivpn</groupId>
-    <version>1.9.0</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>Assembly</artifactId>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.4</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <relocations>
-                <relocation>
-                  <pattern>org.yaml.snakeyaml</pattern>
-                  <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>com.google</pattern>
-                  <shadedPattern>dev.brighten.antivpn.shaded.com.google</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>cc.funkemunky.utils</groupId>
-      <artifactId>lombok</artifactId>
-      <version>1.18.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <properties>
-    <maven.compiler.target>8</maven.compiler.target>
-    <maven.compiler.source>8</maven.compiler.source>
-  </properties>
-</project>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>AntiVPN</artifactId>
        <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.0</version>
+        <version>1.9.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -35,8 +35,8 @@
                                    <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
                                </relocation>
                                <relocation>
-                                    <pattern>com.google</pattern>
-                                    <shadedPattern>dev.brighten.antivpn.shaded.com.google</shadedPattern>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.shaded.com.google.common</shadedPattern>
                                </relocation>
                            </relocations>
                        </configuration>
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>AntiVPN</artifactId>
-    <groupId>dev.brighten.antivpn</groupId>
-    <version>1.9.0</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>Bukkit</artifactId>
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
-        <configuration>
-          <source>8</source>
-          <target>8</target>
-          <compilerArgument>-XDignore.symbol.file</compilerArgument>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.4</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <minimizeJar>true</minimizeJar>
-              <relocations>
-                <relocation>
-                  <pattern>org.bstats</pattern>
-                  <shadedPattern>dev.brighten.antivpn.bukkit.org.bstats</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.yaml.snakeyaml</pattern>
-                  <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
-                </relocation>
-                <relocation>
-                  <pattern>com.google</pattern>
-                  <shadedPattern>dev.brighten.antivpn.shaded.com.google</shadedPattern>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.github.spigot</groupId>
-      <artifactId>1.13.2</artifactId>
-      <version>1.13.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>dev.brighten.antivpn</groupId>
-      <artifactId>Common</artifactId>
-      <version>1.9.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>cc.funkemunky.utils</groupId>
-      <artifactId>lombok</artifactId>
-      <version>1.18.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <properties>
-    <maven.compiler.target>8</maven.compiler.target>
-    <maven.compiler.source>8</maven.compiler.source>
-  </properties>
-</project>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>AntiVPN</artifactId>
        <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.0</version>
+        <version>1.9.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -46,8 +46,8 @@
                                    <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
                                </relocation>
                                <relocation>
-                                    <pattern>com.google</pattern>
-                                    <shadedPattern>dev.brighten.antivpn.shaded.com.google</shadedPattern>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.shaded.com.google.common</shadedPattern>
                                </relocation>
                            </relocations>
                        </configuration>
@@ -78,7 +78,7 @@
        <dependency>
            <groupId>dev.brighten.antivpn</groupId>
            <artifactId>Common</artifactId>
-            <version>1.9.0</version>
+            <version>1.9.2</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -11,24 +11,22 @@ import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;

+import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;

 public class BukkitListener extends VPNExecutor implements Listener {
-
-    private BukkitTask cacheResetTask;
    private final Cache<UUID, VPNResponse> responseCache = CacheBuilder.newBuilder()
            .expireAfterWrite(5, TimeUnit.MINUTES)
-            .maximumSize(10000)
+            .maximumSize(2000)
            .build();

    @Override
@@ -37,22 +35,9 @@ public class BukkitListener extends VPNExecutor implements Listener {
                .registerEvents(this, BukkitPlugin.pluginInstance);
    }

-    @Override
-    public void runCacheReset() {
-        // Reset cache every 20 minutes
-        cacheResetTask = new BukkitRunnable() {
-            public void run() {
-                resetCache();
-            }
-        }.runTaskTimerAsynchronously(BukkitPlugin.pluginInstance, 24000, 24000);
-
-        HandlerList.unregisterAll(this);
-        threadExecutor.shutdown();
-    }
-
    @Override
    public void shutdown() {
-        if(cacheResetTask != null && !cacheResetTask.isCancelled()) cacheResetTask.cancel();
+
    }

    @Override
@@ -116,18 +101,22 @@ public class BukkitListener extends VPNExecutor implements Listener {
                                            event.getPlayer().getUniqueId().toString());
                                    return;
                                }
-
-                                //If the IP is whitelisted, we don't want to kick them
-                                if(AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getAddress().getAddress()
-                                        .getHostAddress())) {
-                                   log("IP is whitelisted: %s",
-                                            event.getPlayer().getAddress().getAddress().getHostAddress());
-                                    return;
+                                {
+                                    //If the IP is whitelisted, we don't want to kick them
+                                    InetSocketAddress address = event.getPlayer().getAddress();
+                                    if (address != null){
+                                        InetAddress address1 = address.getAddress();
+                                        if (address1 != null && AntiVPN.getInstance().getExecutor().isWhitelisted(address1.getHostAddress())) {
+                                            log("IP is whitelisted: %s",
+                                                    address1.getHostAddress());
+                                            return;
+                                        }
+                                    }
                                }

                                // If the countryList() size is zero, no need to check.
                                // Running country check first
-                                if(AntiVPN.getInstance().getVpnConfig().countryList().size() > 0
+                                if(!AntiVPN.getInstance().getVpnConfig().countryList().isEmpty()
                                        // This bit of code will decide whether or not to kick the player
                                        // If it contains the code and it is set to whitelist, it will not kick as they are equal
                                        // and vise versa. However, if the contains does not match the state, it will kick.
@@ -135,7 +124,7 @@ public class BukkitListener extends VPNExecutor implements Listener {
                                        .contains(result.getCountryCode())
                                        != AntiVPN.getInstance().getVpnConfig().whitelistCountries()) {
                                    //Using our built in kicking system if no commands are configured
-                                    if(AntiVPN.getInstance().getVpnConfig().countryKickCommands().size() == 0) {
+                                    if(AntiVPN.getInstance().getVpnConfig().countryKickCommands().isEmpty()) {
                                        final String kickReason = AntiVPN.getInstance().getVpnConfig()
                                                .countryVanillaKickReason();
                                        // Kicking our player
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>AntiVPN</artifactId>
-    <groupId>dev.brighten.antivpn</groupId>
-    <version>1.9.0</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>Bungee</artifactId>
-  <build>
-    <resources>
-      <resource>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
-        <configuration>
-          <source>8</source>
-          <target>8</target>
-          <compilerArgument>-XDignore.symbol.file</compilerArgument>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <relocations>
-            <relocation>
-              <pattern>org.bstats</pattern>
-              <shadedPattern>dev.brighten.antivpn.bungee.org.bstats</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>org.yaml.snakeyaml</pattern>
-              <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>com.google</pattern>
-              <shadedPattern>dev.brighten.antivpn.shaded.com.google</shadedPattern>
-            </relocation>
-          </relocations>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>dev.brighten.antivpn</groupId>
-      <artifactId>Common</artifactId>
-      <version>1.9.0</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>snakeyaml</artifactId>
-          <groupId>org.yaml</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>guava</artifactId>
-          <groupId>com.google.guava</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.github.bungee</groupId>
-      <artifactId>BungeeCord-1.8</artifactId>
-      <version>1.8</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>cc.funkemunky.utils</groupId>
-      <artifactId>lombok</artifactId>
-      <version>1.18.0</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <properties>
-    <maven.compiler.target>8</maven.compiler.target>
-    <maven.compiler.source>8</maven.compiler.source>
-  </properties>
-</project>
-
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>AntiVPN</artifactId>
        <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.0</version>
+        <version>1.9.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -71,7 +71,7 @@
        <dependency>
            <groupId>dev.brighten.antivpn</groupId>
            <artifactId>Common</artifactId>
-            <version>1.9.0</version>
+            <version>1.9.2</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -26,7 +26,7 @@ public class BungeeListener extends VPNExecutor implements Listener {

    private final Cache<UUID, VPNResponse> responseCache = CacheBuilder.newBuilder()
            .expireAfterWrite(5, TimeUnit.MINUTES)
-            .maximumSize(10000)
+            .maximumSize(2000)
            .build();

    @Override
@@ -35,12 +35,6 @@ public class BungeeListener extends VPNExecutor implements Listener {
                .registerListener(BungeePlugin.pluginInstance, this);
    }

-    @Override
-    public void runCacheReset() {
-        cacheResetTask = BungeePlugin.pluginInstance.getProxy().getScheduler().schedule(BungeePlugin.pluginInstance,
-                this::resetCache, 20, 20, TimeUnit.MINUTES);
-    }
-
    @Override
    public void shutdown() {
        if(cacheResetTask != null) {
@@ -4,8 +4,6 @@ import dev.brighten.antivpn.AntiVPN;
 import lombok.val;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.TabExecutor;
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>AntiVPN</artifactId>
        <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.0</version>
+        <version>1.9.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -46,8 +46,8 @@
                                    <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
                                </relocation>
                                <relocation>
-                                    <pattern>com.google</pattern>
-                                    <shadedPattern>dev.brighten.antivpn.shaded.com.google</shadedPattern>
+                                    <pattern>com.google.common</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.shaded.com.google.common</shadedPattern>
                                </relocation>
                            </relocations>
                        </configuration>
@@ -72,33 +72,33 @@

    <dependencies>
        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.30</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.2.0</version>
            <type>jar</type>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.h2database</groupId>
            <artifactId>h2</artifactId>
-            <version>2.1.214</version>
+            <version>2.2.224</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.yaml</groupId>
            <artifactId>snakeyaml</artifactId>
-            <version>1.30</version>
+            <version>2.2</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>32.1.3-jre</version>
        </dependency>
        <dependency>
            <groupId>org.mongodb</groupId>
            <artifactId>mongo-java-driver</artifactId>
-            <version>3.12.11</version>
+            <version>3.12.14</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>
@@ -31,9 +31,9 @@ import java.util.List;

@Getter
@Setter(AccessLevel.PRIVATE)
-@MavenLibrary(groupId = "com.h2database", artifactId ="h2", version = "2.1.214")
-@MavenLibrary(groupId = "org.mongodb", artifactId = "mongo-java-driver", version = "3.12.11")
-@MavenLibrary(groupId = "mysql", artifactId = "mysql-connector-java", version = "8.0.30")
+@MavenLibrary(groupId = "com.h2database", artifactId ="h2", version = "2.2.224")
+@MavenLibrary(groupId = "org.mongodb", artifactId = "mongo-java-driver", version = "3.12.14")
+@MavenLibrary(groupId = "com.mysql", artifactId = "mysql-connector-j", version = "8.2.0")
 public class AntiVPN {

    private static AntiVPN INSTANCE;
@@ -1,36 +1,37 @@
 package dev.brighten.antivpn.api;

+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import dev.brighten.antivpn.AntiVPN;
-import dev.brighten.antivpn.utils.EvictingMap;
-import dev.brighten.antivpn.web.objects.VPNResponse;
 import dev.brighten.antivpn.utils.json.JSONException;
 import dev.brighten.antivpn.web.FunkemunkyAPI;
+import dev.brighten.antivpn.web.objects.VPNResponse;
 import lombok.Getter;

 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.logging.Level;

 public abstract class VPNExecutor {
-    public static ExecutorService threadExecutor = Executors.newSingleThreadExecutor();
+    public static ScheduledExecutorService threadExecutor = Executors.newScheduledThreadPool(2);

-    public static final Map<String, VPNResponse> responseCache = new EvictingMap<>(5000);
    @Getter
    private final Set<UUID> whitelisted = Collections.synchronizedSet(new HashSet<>());
    @Getter
    private final Set<String> whitelistedIps = Collections.synchronizedSet(new HashSet<>());

+    private final Cache<String, VPNResponse> responseCache = CacheBuilder.newBuilder()
+            .expireAfterWrite(20, TimeUnit.MINUTES)
+            .maximumSize(4000)
+            .build();
+
    public abstract void registerListeners();

-    public abstract void runCacheReset();
-
-    public void resetCache() {
-        responseCache.clear();
-    }
-
    public abstract void shutdown();

    public abstract void log(Level level, String log, Object... objects);
@@ -52,60 +53,42 @@ public abstract class VPNExecutor {
    }

    public void checkIp(String ip, boolean cachedResults, Consumer<VPNResponse> result) {
-        threadExecutor.execute(() -> result.accept(responseCache.compute(ip, (key, val) -> {
-            if(val == null) {
-                Optional<VPNResponse> cachedRes = AntiVPN.getInstance().getDatabase().getStoredResponse(ip);
-
-                if(cachedRes.isPresent()) return cachedRes.get();
-                else {
-                    try {
-                        VPNResponse response =  FunkemunkyAPI
-                                .getVPNResponse(ip, AntiVPN.getInstance().getVpnConfig().getLicense(), cachedResults);
-
-                        if(response.isSuccess()) {
-                            AntiVPN.getInstance().getDatabase().cacheResponse(response);
-                        } else {
-                            log("Query to VPN API failed! Reason: " + response.getFailureReason());
-                        }
-
-                        return response;
-                    } catch (JSONException | IOException e) {
-                        log("Query to VPN API failed! Reason: Java Exception");
-                        e.printStackTrace();
-                    }
+        threadExecutor.execute(() -> {
+            if(cachedResults) {
+                try {
+                    result.accept(responseCache.get(ip, () -> checkIp(ip)));
+                } catch (ExecutionException e) {
+                    log("Failed to process checkIp() method! Reason: " + e.getMessage());
+                    result.accept(VPNResponse.FAILED_RESPONSE);
                }
+            } else {
+                result.accept(checkIp(ip));
            }
-
-            return val;
-        })));
-    }
-
-    public VPNResponse checkIp(String ip, boolean cachedResults) {
-        return responseCache.compute(ip, (key, val) -> {
-            if(val == null) {
-                Optional<VPNResponse> cachedRes = AntiVPN.getInstance().getDatabase().getStoredResponse(ip);
-
-                if(cachedRes.isPresent()) return cachedRes.get();
-                else {
-                    try {
-                        VPNResponse response =  FunkemunkyAPI
-                                .getVPNResponse(ip, AntiVPN.getInstance().getVpnConfig().getLicense(), cachedResults);
-
-                        if(response.isSuccess()) {
-                            threadExecutor.execute(() -> AntiVPN.getInstance().getDatabase().cacheResponse(response));
-                        } else {
-                            log("Query to VPN API failed! Reason: " + response.getFailureReason());
-                        }
-
-                        return response;
-                    } catch (JSONException | IOException e) {
-                        log("Query to VPN API failed! Reason: Java Exception");
-                        e.printStackTrace();
-                    }
-                }
-            }
-
-            return val;
        });
    }
+
+    public VPNResponse checkIp(String ip) {
+        Optional<VPNResponse> cachedRes = AntiVPN.getInstance().getDatabase().getStoredResponse(ip);
+
+        if(cachedRes.isPresent()) {
+            return cachedRes.get();
+        }
+        else {
+            try {
+                VPNResponse response = FunkemunkyAPI
+                        .getVPNResponse(ip, AntiVPN.getInstance().getVpnConfig().getLicense(), true);
+
+                if (response.isSuccess()) {
+                    AntiVPN.getInstance().getDatabase().cacheResponse(response);
+                } else {
+                    log("Query to VPN API failed! Reason: " + response.getFailureReason());
+                }
+
+                return response;
+            } catch (JSONException | IOException e) {
+                log("Query to VPN API failed! Reason: " + e.getMessage());
+                return VPNResponse.FAILED_RESPONSE;
+            }
+        }
+    }
 }
@@ -2,7 +2,6 @@ package dev.brighten.antivpn.command;

 import dev.brighten.antivpn.api.APIPlayer;

-import java.util.Objects;
 import java.util.Optional;

 public interface CommandExecutor {
@@ -1,7 +1,6 @@
 package dev.brighten.antivpn.command.impl;

 import dev.brighten.antivpn.AntiVPN;
-import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.command.Command;
 import dev.brighten.antivpn.command.CommandExecutor;

@@ -47,7 +46,6 @@ public class ClearCacheCommand extends Command {
    @Override
    public String execute(CommandExecutor executor, String[] args) {
        AntiVPN.getInstance().getDatabase().clearResponses();
-        VPNExecutor.responseCache.clear();
        return "&aCleared all cached API response information!";
    }

@@ -1,13 +1,8 @@
 package dev.brighten.antivpn.command.impl;

 import dev.brighten.antivpn.AntiVPN;
-import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.command.Command;
 import dev.brighten.antivpn.command.CommandExecutor;
-import dev.brighten.antivpn.database.local.H2VPN;
-import dev.brighten.antivpn.database.mongo.MongoVPN;
-import dev.brighten.antivpn.database.sql.MySqlVPN;
-import dev.brighten.antivpn.message.VpnString;

 import java.util.Collections;
 import java.util.List;
@@ -58,9 +53,6 @@ public class ReloadCommand extends Command {

        AntiVPN.getInstance().getMessageHandler().reloadStrings();

-        // Clearing the local response cache
-        VPNExecutor.responseCache.clear();
-
        AntiVPN.getInstance().reloadDatabase();

        return AntiVPN.getInstance().getMessageHandler().getString("command-reload-complete").getMessage();
@@ -20,34 +20,20 @@ import java.util.function.Consumer;

 public class H2VPN implements VPNDatabase {

-    private Thread whitelistedThread;
-
    public H2VPN() {
-        whitelistedThread = new Thread(() -> {
-            try {
-                Thread.sleep(TimeUnit.SECONDS.toMillis(2));
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            while (true) {
-                // Updating from database
-                if (AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
-                    AntiVPN.getInstance().getExecutor().getWhitelisted().clear();
-                    AntiVPN.getInstance().getExecutor().getWhitelisted()
-                            .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelisted());
-                    AntiVPN.getInstance().getExecutor().getWhitelistedIps().clear();
-                    AntiVPN.getInstance().getExecutor().getWhitelistedIps()
-                            .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelistedIps());
-                }
-                try {
-                    Thread.sleep(TimeUnit.SECONDS.toMillis(4));
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
+        VPNExecutor.threadExecutor.scheduleAtFixedRate(() -> {
+            if(!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return;

-        whitelistedThread.start();
+            //Refreshing whitelisted players
+            AntiVPN.getInstance().getExecutor().getWhitelisted().clear();
+            AntiVPN.getInstance().getExecutor().getWhitelisted()
+                    .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelisted());
+
+            //Refreshing whitlisted IPs
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps().clear();
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps()
+                    .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelistedIps());
+        }, 2, 30, TimeUnit.SECONDS);
    }

    @Override
@@ -23,8 +23,22 @@ public class MongoVPN implements VPNDatabase {

    private MongoCollection<Document> settingsDocument, cacheDocument;
    private MongoClient client;
-    private MongoDatabase antivpnDatabase;

+    public MongoVPN() {
+        VPNExecutor.threadExecutor.scheduleAtFixedRate(() -> {
+            if(!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) return;
+
+            //Refreshing whitelisted players
+            AntiVPN.getInstance().getExecutor().getWhitelisted().clear();
+            AntiVPN.getInstance().getExecutor().getWhitelisted()
+                    .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelisted());
+
+            //Refreshing whitlisted IPs
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps().clear();
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps()
+                    .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelistedIps());
+        }, 2, 30, TimeUnit.SECONDS);
+    }
    @Override
    public Optional<VPNResponse> getStoredResponse(String ip) {
        Document rdoc = cacheDocument.find(Filters.eq("ip", ip)).first();
@@ -192,18 +206,20 @@ public class MongoVPN implements VPNDatabase {

    @Override
    public void init() {
-        if(AntiVPN.getInstance().getVpnConfig().mongoDatabaseURL().length() > 0) { //URL
+        if(!AntiVPN.getInstance().getVpnConfig().mongoDatabaseURL().isEmpty()) { //URL
            ConnectionString cs = new ConnectionString(AntiVPN.getInstance().getVpnConfig().mongoDatabaseURL());
            MongoClientSettings settings = MongoClientSettings.builder().applyConnectionString(cs).build();
            client = MongoClients.create(settings);
        } else {
            MongoClientSettings.Builder settingsBld = MongoClientSettings.builder().readPreference(ReadPreference.nearest())
-                    .applyToClusterSettings(builder -> {
-                        builder.hosts(Collections.singletonList(new ServerAddress(AntiVPN.getInstance().getVpnConfig().getIp(),
-                                AntiVPN.getInstance().getVpnConfig().getPort())));
-                    });
+                    .applyToClusterSettings(builder -> builder.
+                            hosts(Collections.singletonList(
+                                    new ServerAddress(
+                                            AntiVPN.getInstance().getVpnConfig().getIp(),
+                                            AntiVPN.getInstance().getVpnConfig().getPort())
+                            )));
            if(AntiVPN.getInstance().getVpnConfig().useDatabaseCreds()) {
-                settingsBld = settingsBld.credential(MongoCredential
+                settingsBld.credential(MongoCredential
                        .createCredential(AntiVPN.getInstance().getVpnConfig().getUsername(),
                                AntiVPN.getInstance().getVpnConfig().getDatabaseName(),
                                AntiVPN.getInstance().getVpnConfig().getPassword().toCharArray()));
@@ -211,7 +227,7 @@ public class MongoVPN implements VPNDatabase {

            client = MongoClients.create(settingsBld.build());
        }
-        antivpnDatabase = client.getDatabase(AntiVPN.getInstance().getVpnConfig().getDatabaseName());
+        MongoDatabase antivpnDatabase = client.getDatabase(AntiVPN.getInstance().getVpnConfig().getDatabaseName());

        settingsDocument = antivpnDatabase.getCollection("settings");
        if(settingsDocument.listIndexes().first() == null) {
@@ -20,34 +20,20 @@ import java.util.function.Consumer;

 public class MySqlVPN implements VPNDatabase {

-    private Thread whitelistedThread;
-
    public MySqlVPN() {
-        whitelistedThread = new Thread(() -> {
-            try {
-                Thread.sleep(TimeUnit.SECONDS.toMillis(2));
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            while (true) {
-                // Updating from database
-                if (AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
-                    AntiVPN.getInstance().getExecutor().getWhitelisted().clear();
-                    AntiVPN.getInstance().getExecutor().getWhitelisted()
-                            .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelisted());
-                    AntiVPN.getInstance().getExecutor().getWhitelistedIps().clear();
-                    AntiVPN.getInstance().getExecutor().getWhitelistedIps()
-                            .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelistedIps());
-                }
-                try {
-                    Thread.sleep(TimeUnit.SECONDS.toMillis(4));
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
+        VPNExecutor.threadExecutor.scheduleAtFixedRate(() -> {
+            if(!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return;

-        whitelistedThread.start();
+            //Refreshing whitelisted players
+            AntiVPN.getInstance().getExecutor().getWhitelisted().clear();
+            AntiVPN.getInstance().getExecutor().getWhitelisted()
+                    .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelisted());
+
+            //Refreshing whitlisted IPs
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps().clear();
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps()
+                    .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelistedIps());
+        }, 2, 30, TimeUnit.SECONDS);
    }

    @Override
@@ -104,7 +104,7 @@ public abstract class URLClassLoaderAccess {
    /**
     * Accesses using sun.misc.Unsafe, supported on Java 9+.
     *
-     * @author Vaishnav Anil (https://github.com/slimjar/slimjar)
+     * @author Vaishnav Anil (<a href="https://github.com/slimjar/slimjar">...</a>)
     */
    private static class Unsafe extends URLClassLoaderAccess {
        private static final sun.misc.Unsafe UNSAFE;
@@ -14,14 +14,13 @@

 package dev.brighten.antivpn.utils;

-import static java.util.Objects.requireNonNull;
-
 import java.io.Serializable;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
+
+import static dev.brighten.antivpn.utils.NullnessCasts.uncheckedCastNullableTToT;
 import static dev.brighten.antivpn.utils.Preconditions.checkArgument;
 import static dev.brighten.antivpn.utils.Preconditions.checkNotNull;
-import static dev.brighten.antivpn.utils.NullnessCasts.uncheckedCastNullableTToT;
 import static java.util.Objects.requireNonNull;

 /**
@@ -23,17 +23,17 @@ public class YamlConfiguration extends ConfigurationProvider
        @Override
        protected Yaml initialValue()
        {
-            Representer representer = new Representer()
+            DumperOptions options = new DumperOptions();
+            options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
+            Representer representer = new Representer(options)
            {
                {
                    representers.put( Configuration.class, data -> represent( ( (Configuration) data ).self ));
                }
            };

-            DumperOptions options = new DumperOptions();
-            options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
            representer.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-            return new Yaml( new Constructor(), representer, options );
+            return new Yaml( new Constructor(new LoaderOptions()), representer, options );
        }
    };

@@ -1,10 +1,10 @@
 package dev.brighten.antivpn.web;

-import dev.brighten.antivpn.web.objects.QueryResponse;
-import dev.brighten.antivpn.web.objects.VPNResponse;
 import dev.brighten.antivpn.utils.json.JSONException;
 import dev.brighten.antivpn.utils.json.JSONObject;
 import dev.brighten.antivpn.utils.json.JsonReader;
+import dev.brighten.antivpn.web.objects.QueryResponse;
+import dev.brighten.antivpn.web.objects.VPNResponse;

 import java.io.IOException;

@@ -2,7 +2,9 @@ package dev.brighten.antivpn.web.objects;

 import dev.brighten.antivpn.utils.json.JSONException;
 import dev.brighten.antivpn.utils.json.JSONObject;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;

@Data
@AllArgsConstructor
@@ -39,14 +41,18 @@ public class VPNResponse {
     *
     * @param json String
     * @return VPNResponse
-     * @throws JSONException
     */
    public static VPNResponse fromJson(String json) throws JSONException {
        return fromJson(new JSONObject(json));
    }

+    public static final VPNResponse FAILED_RESPONSE = VPNResponse.builder()
+            .success(false)
+            .failureReason("Internal plugin API error.")
+            .build();
+
    /**
-     * Formats response from https://funkemunky.cc/vpn into {@link VPNResponse} for project use.
+     * Formats response from <a href="https://funkemunky.cc/vpn">...</a> into {@link VPNResponse} for project use.
     *
     * @param jsonObject JSONObject
     * @return VPNResponse
@@ -1,3 +1,5 @@
+[![Project Map](https://sourcespy.com/shield.svg)](https://sourcespy.com/github/funkemunkyantivpn/)
+
 # AntiVPN
 An antivpn plugin utilizing the KauriVPN API

@@ -5,7 +5,7 @@
    <parent>
        <artifactId>AntiVPN</artifactId>
        <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.0</version>
+        <version>1.9.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -28,7 +28,7 @@
        <dependency>
            <groupId>dev.brighten.antivpn</groupId>
            <artifactId>Common</artifactId>
-            <version>1.9.0</version>
+            <version>1.9.2</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>AntiVPN</artifactId>
        <groupId>dev.brighten.antivpn</groupId>
-        <version>1.9.0</version>
+        <version>1.9.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -33,7 +33,7 @@
        <dependency>
            <groupId>dev.brighten.antivpn</groupId>
            <artifactId>Common</artifactId>
-            <version>1.9.0</version>
+            <version>1.9.2</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
@@ -71,10 +71,6 @@
                            <pattern>org.yaml.snakeyaml</pattern>
                            <shadedPattern>dev.brighten.antivpn.shaded.org.yaml.snakeyaml</shadedPattern>
                        </relocation>
-                        <relocation>
-                            <pattern>com.google</pattern>
-                            <shadedPattern>dev.brighten.antivpn.shaded.com.google</shadedPattern>
-                        </relocation>
                    </relocations>
                </configuration>
                <executions>
@@ -22,7 +22,7 @@ public class VelocityListener extends VPNExecutor {
    private ScheduledTask cacheResetTask;
    private final Cache<UUID, VPNResponse> responseCache = CacheBuilder.newBuilder()
            .expireAfterWrite(5, TimeUnit.MINUTES)
-            .maximumSize(10000)
+            .maximumSize(2000)
            .build();


@@ -63,7 +63,7 @@ public class VelocityListener extends VPNExecutor {
                                    if (result.isSuccess()) {
                                        // If the countryList() size is zero, no need to check.
                                        // Running country check first
-                                        if (AntiVPN.getInstance().getVpnConfig().countryList().size() > 0
+                                        if (!AntiVPN.getInstance().getVpnConfig().countryList().isEmpty()
                                                && !(AntiVPN.getInstance().getExecutor()
                                                .isWhitelisted(event.getPlayer().getUniqueId()) //Is exempt
                                                //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
@@ -77,7 +77,7 @@ public class VelocityListener extends VPNExecutor {
                                                .contains(result.getCountryCode())
                                                != AntiVPN.getInstance().getVpnConfig().whitelistCountries()) {
                                            //Using our built in kicking system if no commands are configured
-                                            if (AntiVPN.getInstance().getVpnConfig().countryKickCommands().size() == 0) {
+                                            if (AntiVPN.getInstance().getVpnConfig().countryKickCommands().isEmpty()) {
                                                final String kickReason = AntiVPN.getInstance().getVpnConfig()
                                                        .countryVanillaKickReason();
                                                // Kicking our player
@@ -152,14 +152,6 @@ public class VelocityListener extends VPNExecutor {
                });
    }

-    @Override
-    public void runCacheReset() {
-        cacheResetTask = VelocityPlugin.INSTANCE.getServer().getScheduler()
-                .buildTask(VelocityPlugin.INSTANCE, this::resetCache)
-                .repeat(20, TimeUnit.MINUTES)
-                .schedule();
-    }
-
    @Override
    public void shutdown() {
        if (cacheResetTask != null) {
@@ -12,6 +12,7 @@ import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;

 public class VelocityCommand implements SimpleCommand {
@@ -78,7 +79,10 @@ public class VelocityCommand implements SimpleCommand {
                            .mapToObj(i -> args[i + 1]).toArray(String[]::new));
                }
            }
+        }else if (children.length > 0){ // && args.length == 0 is always true here
+            return Arrays.stream(children).map(Command::name).collect(Collectors.toList());
        }
+
        return command.tabComplete(new VelocityCommandExecutor(sender), "alias", args);
    }

@@ -7,7 +7,7 @@
    <groupId>dev.brighten.antivpn</groupId>
    <artifactId>AntiVPN</artifactId>
    <packaging>pom</packaging>
-    <version>1.9.0</version>
+    <version>1.9.2</version>

    <modules>
        <module>Common</module>
Author	SHA1	Message	Date
funkemunky	2bdd7d2c34	Cleaned up files	2023-12-04 08:55:01 -05:00
funkemunky	31a9412c0a	Updated libraries, and cleaned up code for performance purposes.	2023-12-04 08:54:48 -05:00
Dawson Hessler	7f96c49ce8	Delete nightly.yml	2023-10-30 10:41:45 -04:00
Dawson Hessler	7b3f9fc6ae	Update nightly.yml	2023-10-30 10:38:01 -04:00
Dawson Hessler	edd08b27ce	Update maven.yml	2023-10-30 10:37:36 -04:00
Dawson Hessler	158045217e	Create nightly.yml	2023-10-30 10:37:01 -04:00
Dawson	63bdb0a4da	Merge pull request #45 from funkemunky/dependabot/maven/Common/com.google.guava-guava-32.0.0-jre Bump com.google.guava:guava from 31.1-jre to 32.0.0-jre in /Common	2023-10-30 10:27:05 -04:00
Dawson	b9e23ba34e	Updating to only run on commits and pull requests to main	2023-10-30 10:26:26 -04:00
dependabot[bot]	9f6b0f8b27	Bump com.google.guava:guava from 31.1-jre to 32.0.0-jre in /Common Bumps [com.google.guava:guava](https://github.com/google/guava) from 31.1-jre to 32.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-30 14:24:01 +00:00
Dawson	fec1dcdef1	Merge pull request #29 from funkemunky/dependabot/maven/Common/org.yaml-snakeyaml-2.0 Bump snakeyaml from 1.30 to 2.0 in /Common	2023-10-30 10:23:21 -04:00
Dawson Hessler	c062e3d910	Tested and correcting dependency issues	2023-10-30 10:20:49 -04:00
Dawson Hessler	a79fb1fe9a	Updating more vulnerable depends	2023-10-30 10:14:15 -04:00
Dawson Hessler	d224efce3c	Updating depends to make it work	2023-10-30 10:12:14 -04:00
Dawson Hessler	a2554c2bba	Merge branch 'master' into dependabot/maven/Common/org.yaml-snakeyaml-2.0	2023-10-30 10:06:28 -04:00
Dawson	70bfb4e83d	Merge pull request #42 from C0D3-M4513R/master Fix PR #35	2023-10-30 10:06:07 -04:00
Dawson	bc666447c5	Merge pull request #43 from C0D3-M4513R/patch-bukkit-banned-whitelist Add null checks to ip check on login	2023-10-30 10:05:51 -04:00
Dawson Hessler	26cfc3e3f8	Update maven.yml	2023-10-30 10:03:04 -04:00
Dawson Hessler	7974b24271	Revert "Revert "Revert "Update maven.yml""" This reverts commit `87cdd57383`.	2023-10-30 10:02:30 -04:00
Dawson Hessler	87cdd57383	Revert "Revert "Update maven.yml"" This reverts commit `6fe928ca14`.	2023-10-30 10:02:17 -04:00
Dawson Hessler	6fe928ca14	Revert "Update maven.yml" This reverts commit `d461b5945b`.	2023-10-30 10:02:02 -04:00
Dawson Hessler	dae9111a34	Revert "Merge branch 'master' of https://github.com/funkemunky/AntiVPN " This reverts commit `f4d6fc2b4b`, reversing changes made to `d461b5945b`.	2023-10-30 10:01:50 -04:00
Dawson Hessler	f4d6fc2b4b	Merge branch 'master' of https://github.com/funkemunky/AntiVPN	2023-10-30 10:00:12 -04:00
Dawson Hessler	d461b5945b	Update maven.yml	2023-10-30 09:59:50 -04:00
Dawson	c6303ec1b2	Merge pull request #44 from funkemunky/funkemunky-patch-1 Updating build action to run on pull request	2023-10-30 09:57:55 -04:00
Dawson Hessler	ca8fb24134	Caching maven repos properly	2023-10-30 09:54:58 -04:00
Dawson	5e37d2c371	Updating to run on pull request	2023-10-30 09:50:47 -04:00
Dawson Hessler	48c6dd63ee	Revert "Merge pull request #35 from C0D3-M4513R/patch-1" This reverts commit `db1cdad4e1`, reversing changes made to `9f66570088`.	2023-10-30 09:48:04 -04:00
C0D3 M4513R	50e7059597	Add null checks to ip check on login Supersedes: #41 Fixes: #39	2023-10-18 05:57:22 +02:00
C0D3 M4513R	464b02f416	Fix PR #35	2023-10-18 05:45:27 +02:00
Dawson	db1cdad4e1	Merge pull request #35 from C0D3-M4513R/patch-1	2023-10-17 18:58:31 -04:00
Dawson	9f66570088	Merge pull request #37 from C0D3-M4513R/command-suggestion	2023-10-17 18:57:47 -04:00
Dawson	5f0b2796b3	Merge pull request #40 from alexkarezin/master	2023-10-17 18:56:42 -04:00
Alex Karezin	be5eb4e953	Update README.md by adding a link to repository map Adding a link to the high-level diagrams including module, library dependency and others (https://sourcespy.com/github/funkemunkyantivpn/). Built directly from source and updated on schedule. Intended to simplify developer's introduction to the project. In the spirit of transparency - I am the author of the diagrams. Hope contributors find it useful.	2023-07-31 14:43:20 -04:00
C0D3 M4513R	dde81b0495	Bump version	2023-07-14 13:35:50 +02:00
C0D3 M4513R	cbc00b79e2	Add command suggestion for empty args	2023-07-14 13:31:36 +02:00
C0D3 M4513R	3b2a463e58	Update PlanCommand.java	2023-07-14 13:17:47 +02:00
Dawson Hessler	96e48594d8	Fixing velocity loading issues	2023-07-12 08:45:39 -04:00
dependabot[bot]	903dd8e73e	Bump snakeyaml from 1.30 to 2.0 in /Common Bumps [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 1.30 to 2.0. - [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-2.0..snakeyaml-1.30) --- updated-dependencies: - dependency-name: org.yaml:snakeyaml dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-02-28 19:31:59 +00:00