vhack update & freeze fix

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:dev-SNAPSHOT'
+    compile 'net.olympiccode:vHackOSAPI-Java:8fa096f72b'
     compile 'io.sentry:sentry:1.7.1'
 }
 mainClassName = "net.olympiccode.vhackos.bot.core.vHackOSBot"

src/main/java/net/olympiccode/vhackos/bot/core/config/AdvancedConfigFile.java

@@ -26,6 +26,11 @@ public AdvancedConfigFile() {
 JsonObject configJson = new JsonObject();
     File file = new File("advanced.json");
     Logger LOG = LoggerFactory.getLogger("vHackOSBot-ConfigAdv");
+
+    public JsonObject getConfigJson() {
+        return configJson;
+    }
+
     public void setupConfig() {
         LOG.info("Loading advanced config...");
         long time = System.currentTimeMillis();

src/main/java/net/olympiccode/vhackos/bot/core/config/AdvancedConfigValues.java

@@ -7,6 +7,9 @@ public class AdvancedConfigValues {
     @AdvancedConfigOption(path = "loglevel", defaultValue = "info", options = {"all", "debug", "error", "info", "off", "trace", "warn"})
     public static String logLevel;
 
-    @AdvancedConfigOption(path = "networking.runTime", defaultValue = "3000", options = {""})
-    public static int a;
+    @AdvancedConfigOption(path = "login.accesstoken", defaultValue = "---", options = {""})
+    public static String token;
+
+    @AdvancedConfigOption(path = "login.uid", defaultValue = "---", options = {""})
+    public static String uid;
 }

src/main/java/net/olympiccode/vhackos/bot/core/config/ConfigFile.java

@@ -27,6 +27,10 @@ public ConfigFile() {
         LOG.info("Creating ConfigFile...");
     }
 
+    public JsonObject getConfigJson() {
+        return configJson;
+    }
+
     public void setupConfig() {
         LOG.info("Loading config...");
         long time = System.currentTimeMillis();

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

@@ -52,8 +52,8 @@ public void setup() {
     }
 
     Cache<String, String> cache = CacheBuilder.newBuilder()
-            .maximumSize(300)
-       .expireAfterWrite(30, TimeUnit.MINUTES).build();
+            .maximumSize(500)
+       .expireAfterWrite(60*5+30, TimeUnit.SECONDS).build();
 
     public void runService() {
         try {
@@ -97,9 +97,13 @@ public void runService() {
             });
             if (vHackOSBot.api.getStats().getExploits() > 0) {
                int success = 0;
-               while (success < 6) {
+               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.");
             }
         } catch (Exception e) {
             Sentry.capture(e);

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

@@ -8,6 +8,7 @@
 import net.olympiccode.vhackos.api.vHackOSAPIBuilder;
 import net.olympiccode.vhackos.api.vHackOSInfo;
 import net.olympiccode.vhackos.bot.core.config.AdvancedConfigFile;
+import net.olympiccode.vhackos.bot.core.config.AdvancedConfigValues;
 import net.olympiccode.vhackos.bot.core.config.ConfigFile;
 import net.olympiccode.vhackos.bot.core.config.ConfigValues;
 import net.olympiccode.vhackos.bot.core.misc.MiscConfigValues;
@@ -95,17 +96,19 @@ public void run() throws LoginException, InterruptedException {
             LOG.error("Please set your login data in the config file");
             System.exit(0);
         }
-        api = new vHackOSAPIBuilder().setUsername(ConfigValues.username).setPassword(ConfigValues.password).buildBlocking();
+            api = new vHackOSAPIBuilder().setUsername(ConfigValues.username).setPassword(ConfigValues.password).buildBlocking();
         Sentry.getContext().setUser(
                 new UserBuilder().setUsername(ConfigValues.username).build()
         );
         Sentry.getContext().recordBreadcrumb(
                 new BreadcrumbBuilder().setMessage("Service setup").build()
         );
         try {
+            startTime = System.currentTimeMillis();
             if (UpdateConfigValues.enabled) updateService.setup();
             if (MiscConfigValues.enabled) miscService.setup();
             if (NetworkingConfigValues.enabled) networkingService.setup();
+
         } catch (Exception e) {
             Sentry.capture(e);
             e.printStackTrace();
@@ -127,7 +130,7 @@ public void run() throws LoginException, InterruptedException {
                         break;
                     case "stats":
                         System.out.println("Username: " + api.getStats().getUsername() + SEPARATOR + "Money: " + api.getStats().getMoney() + SEPARATOR + "Netcoins: " + api.getStats().getNetcoins() +
-                                "\n" + "Exploits: " + api.getStats().getExploits() + SEPARATOR + "IP: " + api.getStats().getIpAddress() + "\n" +
+                                "\n" + "Exploits: " + api.getStats().getExploits() + SEPARATOR + "IP: " + api.getStats().getIpAddress() + SEPARATOR + " Running for: " + getRunningTime() + "\n" +
                                 "Level: " + api.getStats().getLevel() + getProgressBar());
                         break;
                     case "tasks":
@@ -173,6 +176,13 @@ private String getTimeLeft() {
                 TimeUnit.MILLISECONDS.toMinutes(millis) - TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(millis)),
                 TimeUnit.MILLISECONDS.toSeconds(millis) - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(millis)));
     }
+    private long startTime = 0;
+    private String getRunningTime() {
+        long millis = System.currentTimeMillis() - startTime;
+        return String.format("%02d:%02d:%02d", TimeUnit.MILLISECONDS.toHours(millis),
+                TimeUnit.MILLISECONDS.toMinutes(millis) - TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(millis)),
+                TimeUnit.MILLISECONDS.toSeconds(millis) - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(millis)));
+    }
 
     private String getProgressBar() {
         long barnum = (Math.round(api.getStats().getLevelPorcentage() / 10)) - 1;