From 62a5bbbe0fb4f070b7cabf44de1cbcb2c7f71a17 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 2 Mar 2018 13:20:06 -0500 Subject: [PATCH] runelite-client: add client session manager --- .../runelite/client/ClientSessionManager.java | 101 ++++++++++++++++++ .../java/net/runelite/client/RuneLite.java | 7 ++ 2 files changed, 108 insertions(+) create mode 100644 runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java diff --git a/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java b/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java new file mode 100644 index 0000000000..76cb3e05d5 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java @@ -0,0 +1,101 @@ +/* + * Copyright (c) 2018, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client; + +import java.io.IOException; +import java.util.UUID; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.extern.slf4j.Slf4j; +import net.runelite.http.api.session.SessionClient; + +@Singleton +@Slf4j +public class ClientSessionManager +{ + private final SessionClient sessionClient = new SessionClient(); + private final ScheduledExecutorService executorService; + + private ScheduledFuture scheduledFuture; + private UUID sessionId; + + + @Inject + ClientSessionManager(ScheduledExecutorService executorService) + { + this.executorService = executorService; + } + + public void start() + { + try + { + sessionId = sessionClient.open(); + log.debug("Opened session {}", sessionId); + } + catch (IOException ex) + { + log.warn("error opening session", ex); + } + + scheduledFuture = executorService.scheduleWithFixedDelay(this::ping, 1, 1, TimeUnit.MINUTES); + } + + public void shutdown() + { + scheduledFuture.cancel(true); + } + + private void ping() + { + try + { + if (sessionId == null) + { + sessionId = sessionClient.open(); + log.debug("Opened session {}", sessionId); + return; + } + } + catch (IOException ex) + { + log.warn(null, ex); + } + + try + { + sessionClient.ping(sessionId); + } + catch (IOException ex) + { + log.warn("Resetting session", ex); + sessionId = null; + } + + } +} diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index a3e6af2849..78ba1b710f 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -95,6 +95,9 @@ public class RuneLite @Inject private DiscordService discordService; + + @Inject + private ClientSessionManager clientSessionManager; Client client; ClientUI gui; @@ -173,6 +176,9 @@ public class RuneLite // Start plugins pluginManager.startCorePlugins(); + + // Start client session + clientSessionManager.start(); // Load the session, including saved configuration sessionManager.loadSession(); @@ -201,6 +207,7 @@ public class RuneLite public void shutdown() { + clientSessionManager.shutdown(); discordService.close(); }