vhack update

Author: itsfolf

build.gradle

@@ -20,7 +20,7 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.2'
     compile 'ch.qos.logback:logback-classic:1.2.3'
     compile 'com.google.guava:guava:24.0-jre'
-    compile 'net.olympiccode:vHackOSAPI-Java:f0deaaa007'
+    compile 'net.olympiccode:vHackOSAPI-Java:c761a2bb4'
     compile 'io.sentry:sentry:1.7.1'
 }
 mainClassName = "net.olympiccode.vhackos.bot.core.vHackOSBot"

src/main/java/net/olympiccode/vhackos/bot/core/networking/NetworkingService.java

@@ -5,11 +5,9 @@
 import io.sentry.Sentry;
 import net.olympiccode.vhackos.api.entities.AppType;
 import net.olympiccode.vhackos.api.entities.BruteForceState;
-import net.olympiccode.vhackos.api.entities.impl.BruteForceImpl;
 import net.olympiccode.vhackos.api.exceptions.ExploitFailedException;
 import net.olympiccode.vhackos.api.network.BruteForce;
 import net.olympiccode.vhackos.api.network.ExploitedTarget;
-import net.olympiccode.vhackos.api.network.NetworkManager;
 import net.olympiccode.vhackos.bot.core.BotService;
 import net.olympiccode.vhackos.bot.core.vHackOSBot;
 import org.slf4j.Logger;
@@ -18,7 +16,6 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
-import java.nio.channels.NetworkChannel;
 import java.util.ArrayList;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -28,19 +25,15 @@
 public class NetworkingService implements BotService {
     public static ScheduledExecutorService networkingService;
     Logger LOG = LoggerFactory.getLogger("NetworkingService");
+    Cache<String, String> cache = CacheBuilder.newBuilder()
+            .maximumSize(500)
+            .expireAfterWrite(60 * 5 + 30, TimeUnit.SECONDS).build();
 
     public NetworkingService() {
         LOG.info("Creating NetworkingService...");
         networkingService = Executors.newScheduledThreadPool(1, new NetworkingServiceFactory());
     }
 
-    public class NetworkingServiceFactory implements ThreadFactory {
-        public Thread newThread(Runnable r) {
-            return new Thread(r,   "vHackOSBot-NetworkingService");
-        }
-    }
-
-
     @Override
     public ScheduledExecutorService getService() {
         return networkingService;
@@ -54,31 +47,28 @@ public void setup() {
         networkingService.scheduleAtFixedRate(() -> runService(), 0, 60000, TimeUnit.MILLISECONDS);
     }
 
-    Cache<String, String> cache = CacheBuilder.newBuilder()
-            .maximumSize(500)
-       .expireAfterWrite(60*5+30, TimeUnit.SECONDS).build();
-
     public void runService() {
         try {
-            ((ArrayList<BruteForce>)((ArrayList)vHackOSBot.api.getTaskManager().getActiveBrutes()).clone()).forEach(bruteForce -> {
+            ((ArrayList<BruteForce>) ((ArrayList) vHackOSBot.api.getTaskManager().getActiveBrutes()).clone()).forEach(bruteForce -> {
                 if (cache.asMap().containsKey(bruteForce.getIp())) return;
                 if (bruteForce.getState() == BruteForceState.SUCCESS) {
                     cache.put(bruteForce.getIp(), "");
                     ExploitedTarget etarget = bruteForce.exploit();
                     ExploitedTarget.Banking banking = etarget.getBanking();
 
                     if (banking.isBruteForced()) {
-                        long av = banking.getAvaliableMoney();
-                        if (av > 0 && banking.withdraw(NetworkingConfigValues.withdrawPorcentage)) {
-                            LOG.info("Withdrawed " + av + " of " + banking.getTotal() + " from " + etarget.getIp() + ".");
-                        } else {
-                            LOG.error("Failed to withdraw from " + etarget.getIp() + ".");
+                        if (banking.canAttack()) {
+                            long av = banking.getAvaliableMoney();
+                            if (av > 0 && banking.withdraw(NetworkingConfigValues.withdrawPorcentage)) {
+                                LOG.info("Withdrawed " + av + " of " + banking.getTotal() + " from " + etarget.getIp() + ".");
+                            } else {
+                                LOG.error("Failed to withdraw from " + etarget.getIp() + ".");
+                            }
+                            if (eval(etarget)) {
+                                LOG.info("Removing bruteforce from " + etarget.getIp() + ".");
+                                bruteForce.remove();
+                            }
                         }
-                        if (eval(etarget)) {
-                            LOG.info("Removing bruteforce from " + etarget.getIp() + ".");
-                            bruteForce.remove();
-                        }
-
                     } else {
                         if (banking.startBruteForce()) {
                             LOG.info("Started bruteforce at " + etarget.getIp());
@@ -99,20 +89,20 @@ public void runService() {
                 }
             });
             if (vHackOSBot.api.getStats().getExploits() > 0) {
-               int success = 0;
-               int tries = 6 * 3;
+                int success = 0;
+                int tries = 6 * 3;
                 LOG.info("Starting exploits...");
-               while (success < 6 && tries > 0) {
-                   success += scan();
-                   tries--;
-               }
-               LOG.info("Finished exploits, exploited " + success + " targets in " + tries + " tries.");
+                while (success < 6 && tries > 0) {
+                    success += scan();
+                    tries--;
+                }
+                LOG.info("Finished exploits, exploited " + success + " targets in " + tries + " tries.");
             }
         } catch (Exception e) {
             Sentry.capture(e);
+            LOG.warn("The networking service has been shutdown due to an error.");
             e.printStackTrace();
             networkingService.shutdownNow();
-            LOG.warn("The networking service has been shutdown due to an error.");
         }
     }
 
@@ -159,4 +149,10 @@ public boolean eval(ExploitedTarget target) {
         }
         return false;
     }
+
+    public class NetworkingServiceFactory implements ThreadFactory {
+        public Thread newThread(Runnable r) {
+            return new Thread(r, "vHackOSBot-NetworkingService");
+        }
+    }
 }

src/main/java/net/olympiccode/vhackos/bot/core/vHackOSBot.java

@@ -43,7 +43,7 @@ public class vHackOSBot {
     static Logger LOG = LoggerFactory.getLogger("vHackOSBot");
     ConfigFile config = new ConfigFile();
     AdvancedConfigFile advConfig = new AdvancedConfigFile();
-    double curVersion = 1.11;
+    double curVersion = 1.12;
     private long startTime = 0;
 
     public static void main(String[] args) {
@@ -122,7 +122,6 @@ public void run() throws LoginException, InterruptedException {
             if (MiscConfigValues.enabled) miscService.setup();
             if (NetworkingConfigValues.enabled) networkingService.setup();
             maintenanceService.setup();
-            networkingService.getService().shutdownNow();
         } catch (Exception e) {
             Sentry.capture(e);
             e.printStackTrace();