Auto restart on error

itsfolf · itsfolf · commit e77809622a23 · 2018-03-30T00:54:16.000+01:00
Automatically restart on error
diff --git a/src/main/java/net/olympiccode/vhackos/bot/core/misc/MaintenanceService.java b/src/main/java/net/olympiccode/vhackos/bot/core/misc/MaintenanceService.java
@@ -0,0 +1,59 @@
+package net.olympiccode.vhackos.bot.core.misc;
+
+import net.olympiccode.vhackos.bot.core.BotService;
+import net.olympiccode.vhackos.bot.core.vHackOSBot;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+
+public class MaintenanceService implements BotService {
+    ScheduledExecutorService mainService;
+    Logger LOG = LoggerFactory.getLogger("MainService");
+    public MaintenanceService() {
+        LOG.info("Creating MainService...");
+        mainService = Executors.newScheduledThreadPool(1, new MainServiceFactory());
+    }
+
+    @Override
+    public ScheduledExecutorService getService() {
+        return mainService;
+    }
+
+    @Override
+    public void setup() {
+        LOG.info("Setting up MainSerice...");
+        mainService.scheduleAtFixedRate(() -> runService(), 60000 * 5, 60000 * 5, TimeUnit.MILLISECONDS);
+    }
+
+    int miscAttempts = 0;
+    int netAttempts = 0;
+    int upAttempts = 0;
+    @Override
+    public void runService() {
+       if (vHackOSBot.miscService.miscService.isTerminated() || vHackOSBot.miscService.miscService.isTerminated() && miscAttempts < 4) {
+           miscAttempts++;
+           LOG.info("Restarting MiscSerivce has it stopped due to an error (Attempt " + miscAttempts + ")");
+           vHackOSBot.miscService.setup();
+       }
+        if (vHackOSBot.networkingService.getService().isTerminated() || vHackOSBot.networkingService.getService().isTerminated() && netAttempts < 4) {
+            netAttempts++;
+            LOG.info("Restarting NetworkingSerivce has it stopped due to an error (Attempt " + netAttempts + ")");
+            vHackOSBot.networkingService.setup();
+        }
+        if (vHackOSBot.updateService.getService().isTerminated() || vHackOSBot.updateService.getService().isTerminated() && upAttempts < 4) {
+            upAttempts++;
+            LOG.info("Restarting UpdateSerivce has it stopped due to an error (Attempt " + upAttempts + ")");
+            vHackOSBot.updateService.setup();
+        }
+    }
+
+    public class MainServiceFactory implements ThreadFactory {
+        public Thread newThread(Runnable r) {
+            return new Thread(r, "vHackOSBot-MainService");
+        }
+    }
+}
diff --git a/src/main/java/net/olympiccode/vhackos/bot/core/misc/MiscService.java b/src/main/java/net/olympiccode/vhackos/bot/core/misc/MiscService.java
@@ -29,6 +29,9 @@ public ScheduledExecutorService getService() {
 
     public void setup() {
         LOG.info("Setting up MiscSerice...");
+        if (miscService.isTerminated() || miscService.isShutdown()) {
+            miscService = Executors.newScheduledThreadPool(1, new MiscServiceFactory());
+        }
         miscService.scheduleAtFixedRate(() -> runLongService(), 0, 60000 * 60, TimeUnit.MILLISECONDS);
         miscService.scheduleAtFixedRate(() -> runService(), 0, 60000 * 5, TimeUnit.MILLISECONDS);
     }
diff --git a/src/main/java/net/olympiccode/vhackos/bot/core/networking/NetworkingService.java b/src/main/java/net/olympiccode/vhackos/bot/core/networking/NetworkingService.java
@@ -48,6 +48,9 @@ public ScheduledExecutorService getService() {
 
     public void setup() {
         LOG.info("Setting up NetworkingSerice...");
+        if (networkingService.isTerminated() || networkingService.isShutdown()) {
+            networkingService = Executors.newScheduledThreadPool(1, new NetworkingServiceFactory());
+        }
         networkingService.scheduleAtFixedRate(() -> runService(), 0, 60000, TimeUnit.MILLISECONDS);
     }
 
diff --git a/src/main/java/net/olympiccode/vhackos/bot/core/updating/UpdateService.java b/src/main/java/net/olympiccode/vhackos/bot/core/updating/UpdateService.java
@@ -35,6 +35,9 @@ public ScheduledExecutorService getService() {
 
     public void setup() {
         LOG.info("Setting up UpdateSerice...");
+        if (updateService.isTerminated() || updateService.isShutdown()) {
+            updateService = Executors.newScheduledThreadPool(1, new UpdateServiceFactory());
+        }
         updateService.scheduleAtFixedRate(()->runService(), 0, 30000, TimeUnit.MILLISECONDS);
     }
 
diff --git a/src/main/java/net/olympiccode/vhackos/bot/core/vHackOSBot.java b/src/main/java/net/olympiccode/vhackos/bot/core/vHackOSBot.java
@@ -11,6 +11,7 @@
 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.MaintenanceService;
 import net.olympiccode.vhackos.bot.core.misc.MiscConfigValues;
 import net.olympiccode.vhackos.bot.core.misc.MiscService;
 import net.olympiccode.vhackos.bot.core.networking.NetworkingConfigValues;
@@ -19,6 +20,7 @@
 import net.olympiccode.vhackos.bot.core.updating.UpdateService;
 import okhttp3.Request;
 import okhttp3.Response;
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,10 +39,10 @@ public class vHackOSBot {
     static Logger LOG = LoggerFactory.getLogger("vHackOSBot");
     ConfigFile config = new ConfigFile();
     AdvancedConfigFile advConfig = new AdvancedConfigFile();
-    BotService updateService = new UpdateService();
-    MiscService miscService = new MiscService();
-    BotService networkingService = new NetworkingService();
-
+    public static BotService updateService = new UpdateService();
+    public static MiscService miscService = new MiscService();
+    public static BotService networkingService = new NetworkingService();
+    public static BotService maintenanceService = new MaintenanceService();
     public static void main(String[] args) {
         try {
             new vHackOSBot().run();
@@ -49,7 +51,7 @@ public static void main(String[] args) {
         } catch (InterruptedException e) {
             LOG.error("There was a problem initializing the vHackOSBot.");
         } catch (RuntimeException e) {
-            if (e.getMessage().contains("vhack account has been banned")) {
+            if (e.getMessage() != null && e.getMessage().contains("vhack account has been banned")) {
                 LOG.error("Your vhack account has been banned.");
                 System.exit(0);
             } else {
@@ -101,6 +103,7 @@ public void run() throws LoginException, InterruptedException {
         } else {
             api = new vHackOSAPIBuilder().setUsername(ConfigValues.username).setPassword(ConfigValues.password).buildBlocking();
         }
+        checkForUpdates();
           advConfig.getConfigJson().addProperty("login.accesstoken", ((vHackOSAPIImpl) api).getAccessToken());
         advConfig.getConfigJson().addProperty("login.uid", ((vHackOSAPIImpl) api).getUid());
         advConfig.save();
@@ -115,7 +118,8 @@ public void run() throws LoginException, InterruptedException {
             if (UpdateConfigValues.enabled) updateService.setup();
             if (MiscConfigValues.enabled) miscService.setup();
             if (NetworkingConfigValues.enabled) networkingService.setup();
-
+            maintenanceService.setup();
+            networkingService.getService().shutdownNow();
         } catch (Exception e) {
             Sentry.capture(e);
             e.printStackTrace();
@@ -149,7 +153,8 @@ public void run() throws LoginException, InterruptedException {
                     case "services":
                         System.out.println("NetworkingService: " + getStatus(networkingService.getService()) + "\n" +
                                 "UpdateService: " + getStatus(updateService.getService()) + "\n" +
-                                "MiscService: " + getStatus(miscService.getService()));
+                                "MiscService: " + getStatus(miscService.getService()) + "\n" +
+                                 "MainService: " + getStatus(maintenanceService.getService()));
                         break;
                     case "apps":
                         System.out.println("-------------------\n" + api.getAppManager().getApps().stream().map(app -> app.getType().getName() + ": " + (app.isInstalled() ? app.getLevel() : "Not installed")).collect(Collectors.joining("\n")) + "\n-------------------");
@@ -205,18 +210,24 @@ private String getProgressBar() {
         builder.append("] " + api.getStats().getLevelPorcentage() + "%");
         return builder.toString();
     }
-
+    double curVersion = 1.8;
     public void checkForUpdates() {
-        //
-        //
-        Request request = (new Request.Builder()).url("https://api.github.com/repos/OlympicCode/vHackOSBot-Java/releases/latest").addHeader("user-agent", "Dalvik/1.6.0 (Linux; U; Android 4.4.4; SM-N935F Build/KTU84P)").addHeader("Accept-Encoding", "gzip").build();
+        Request request = (new Request.Builder()).url("https://api.github.com/repos/OlympicCode/vHackOSBot-Java/releases/latest").addHeader("user-agent", "Dalvik/1.6.0 (Linux; U; Android 4.4.4; SM-N935F Build/KTU84P)").build();
         try {
             Response r = ((vHackOSAPIImpl) api).getRequester().getHttpClient().newCall(request).execute();
             if (r.isSuccessful()) {
-                JSONObject json = new JSONObject(r.body());
+                String s = r.body().string();
+                JSONObject json = new JSONObject(s);
+                double version = json.getDouble("tag_name");
+                if (version != curVersion) {
+                    LOG.info("ATTENTION: An update is avaliable for vHackOSBot: " + version + " (Running " + curVersion + ")");
+                }
+
             }
         } catch (IOException e) {
             e.printStackTrace();
+        } catch (JSONException e) {
+            e.printStackTrace();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ public ScheduledExecutorService getService() {`
`29`	`29`
`30`	`30`	`public void setup() {`
`31`	`31`	`LOG.info("Setting up MiscSerice...");`
	`32`	`+ if (miscService.isTerminated() \|\| miscService.isShutdown()) {`
	`33`	`+ miscService = Executors.newScheduledThreadPool(1, new MiscServiceFactory());`
	`34`	`+ }`
`32`	`35`	`miscService.scheduleAtFixedRate(() -> runLongService(), 0, 60000 * 60, TimeUnit.MILLISECONDS);`
`33`	`36`	`miscService.scheduleAtFixedRate(() -> runService(), 0, 60000 * 5, TimeUnit.MILLISECONDS);`
`34`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,9 @@ public ScheduledExecutorService getService() {`
`48`	`48`
`49`	`49`	`public void setup() {`
`50`	`50`	`LOG.info("Setting up NetworkingSerice...");`
	`51`	`+ if (networkingService.isTerminated() \|\| networkingService.isShutdown()) {`
	`52`	`+ networkingService = Executors.newScheduledThreadPool(1, new NetworkingServiceFactory());`
	`53`	`+ }`
`51`	`54`	`networkingService.scheduleAtFixedRate(() -> runService(), 0, 60000, TimeUnit.MILLISECONDS);`
`52`	`55`	`}`
`53`	`56`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@ public ScheduledExecutorService getService() {`
`35`	`35`
`36`	`36`	`public void setup() {`
`37`	`37`	`LOG.info("Setting up UpdateSerice...");`
	`38`	`+ if (updateService.isTerminated() \|\| updateService.isShutdown()) {`
	`39`	`+ updateService = Executors.newScheduledThreadPool(1, new UpdateServiceFactory());`
	`40`	`+ }`
`38`	`41`	`updateService.scheduleAtFixedRate(()->runService(), 0, 30000, TimeUnit.MILLISECONDS);`
`39`	`42`	`}`
`40`	`43`