Upstream
/
SubServers-2
mirror of https://github.com/ME1312/SubServers-2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do more work if we are a plugin

This commit is contained in:
ajh123 2022-08-31 20:32:46 +01:00
parent be422420dd
commit 81d9ecd52f
5 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
SubServers.Web/src/net/ME1312/SubServers/Web/ConsolePlugin.java
View File

@ -1,42 +1,31 @@
package net.ME1312.SubServers.Web;
import net.ME1312.Galaxi.Library.Config.YAMLConfig;
import net.ME1312.SubServers.Bungee.Event.SubCreateEvent;
import net.ME1312.SubServers.Bungee.Event.SubSendCommandEvent;
import net.ME1312.SubServers.Bungee.Event.SubStartEvent;
import net.ME1312.SubServers.Bungee.Host.Host;
import net.ME1312.SubServers.Bungee.Host.RemotePlayer;
import net.ME1312.SubServers.Bungee.Host.SubCreator;
import net.ME1312.SubServers.Bungee.Host.SubServer;
import net.ME1312.SubServers.Bungee.Library.Metrics;
import net.ME1312.SubServers.Bungee.SubAPI;
import net.ME1312.SubServers.Bungee.SubProxy;
import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.event.EventHandler;
import net.md_5.bungee.event.EventPriority;
import javax.swing.*;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.logging.Level;
public final class ConsolePlugin extends Plugin implements Listener {
public YAMLConfig config;
private JettyServer jettyServer;
@Override
public void onEnable() {
reload();
try {
reload();
} catch (IOException e) {
e.printStackTrace();
}
new Metrics(this, 3853).addPlatformCharts();
jettyServer = new JettyServer();
try {
jettyServer.start();
jettyServer.start(getProxy());
} catch (Exception e) {
getLogger().log(Level.SEVERE, "An error occurred when enabling the webserver, Plugin disabling...", e);
this.onDisable();
@ -47,33 +36,24 @@ public final class ConsolePlugin extends Plugin implements Listener {
SubAPI.getInstance().addListener(new Runnable() {
@Override
public void run() {
reload();
try {
reload();
} catch (IOException e) {
e.printStackTrace();
}
}
});
}
private void reload() {
private void reload() throws IOException {
jettyServer.reload(true);
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onServerCreate(SubCreateEvent event) {
if (!event.isCancelled()) {
}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onServerStart(SubStartEvent event) {
if (!event.isCancelled()) {
}
}
@Override
public void onDisable() {
try {
jettyServer.server.stop();
jettyServer.stop();
} catch (Exception e) {
getLogger().log(Level.SEVERE, "An error occurred when disabling the plugin", e);
}

2
SubServers.Web/src/net/ME1312/SubServers/Web/ExternalMain.java
View File

@ -3,6 +3,6 @@ package net.ME1312.SubServers.Web;
public class ExternalMain {
public static void main(String[] args) throws Exception {
JettyServer server = new JettyServer();
server.start();
server.start(null);
}
}

61
SubServers.Web/src/net/ME1312/SubServers/Web/JettyServer.java
View File

@ -2,6 +2,7 @@ package net.ME1312.SubServers.Web;
import net.ME1312.Galaxi.Engine.GalaxiEngine;
import net.ME1312.Galaxi.Event.Engine.GalaxiReloadEvent;
import net.ME1312.Galaxi.Event.Engine.GalaxiStopEvent;
import net.ME1312.Galaxi.Library.Config.YAMLConfig;
import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
@ -15,6 +16,7 @@ import net.ME1312.SubData.Client.Encryption.DHE;
import net.ME1312.SubData.Client.Encryption.RSA;
import net.ME1312.SubData.Client.Library.DisconnectReason;
import net.ME1312.SubData.Client.SubDataClient;
import net.ME1312.SubServers.Bungee.SubProxy;
import net.ME1312.SubServers.Host.Executable.SubCreatorImpl;
import net.ME1312.SubServers.Host.Executable.SubLoggerImpl;
import net.ME1312.SubServers.Host.Executable.SubServerImpl;
@ -35,6 +37,7 @@ import java.util.concurrent.TimeUnit;
@App(name = "SubServers.Web", version = "2.19a", authors = "ME1312", website = "https://github.com/ME1312/SubServers-2", description = "Operate subservers from web browsers")
public class JettyServer {
public Server server;
public boolean isPlugin = true;
HashMap<Integer, SubDataClient> subdata = new HashMap<Integer, SubDataClient>();
Pair<Long, Map<String, Map<String, String>>> lang = null;
@ -55,13 +58,17 @@ public class JettyServer {
private boolean reconnect = true;
private boolean running = false;
public void start() throws Exception {
public void start(SubProxy proxy) throws Exception {
if (proxy == null){
isPlugin = false;
}
log = new Logger("SubServers");
info = PluginInfo.load(this);
info.setLogger(log);
engine = GalaxiEngine.init(info);
ConfigUpdater.updateConfig(new File(engine.getRuntimeDirectory(), "config.yml"));
ConfigUpdater.updateConfig(new File(engine.getRuntimeDirectory(), "config.yml"), isPlugin);
config = new YAMLConfig(new File(engine.getRuntimeDirectory(), "config.yml"));
Util.reflect(SubLoggerImpl.class.getDeclaredField("logn"), null, config.get().getMap("Settings").getBoolean("Network-Log", true));
@ -70,6 +77,7 @@ public class JettyServer {
engine.getPluginManager().loadPlugins(new File(engine.getRuntimeDirectory(), "Plugins"));
running = true;
this.isPlugin = isPlugin;
reload(false);
subdata.put(0, null);
@ -117,7 +125,7 @@ public class JettyServer {
public void reload(boolean notifyPlugins) throws IOException {
resetDate = Calendar.getInstance().getTime().getTime();
ConfigUpdater.updateConfig(new File(engine.getRuntimeDirectory(), "config.yml"));
ConfigUpdater.updateConfig(new File(engine.getRuntimeDirectory(), "config.yml"), isPlugin);
config.reload();
if (notifyPlugins) {
@ -126,28 +134,37 @@ public class JettyServer {
}
private void connect(final java.util.logging.Logger log, Pair<DisconnectReason, DataClient> disconnect) throws IOException {
final int reconnect = config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 60);
if (disconnect == null || (this.reconnect && reconnect > 0 && disconnect.key() != DisconnectReason.PROTOCOL_MISMATCH && disconnect.key() != DisconnectReason.ENCRYPTION_MISMATCH)) {
final long reset = resetDate;
final Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::SubData_Reconnect_Handler");
if (disconnect != null) log.info("Attempting reconnect in " + reconnect + " seconds");
timer.scheduleAtFixedRate(new TimerTask() {
@Override
public void run() {
try {
if (reset == resetDate && (subdata.getOrDefault(0, null) == null || subdata.get(0).isClosed())) {
SubDataClient open = subprotocol.open(InetAddress.getByName(config.get().getMap("Settings").getMap("SubData").getString("Address", "127.0.0.1:4391").split(":")[0]),
Integer.parseInt(config.get().getMap("Settings").getMap("SubData").getString("Address", "127.0.0.1:4391").split(":")[1]));
if (!isPlugin) {
final int reconnect = config.get().getMap("Settings").getMap("SubData").getInt("Reconnect", 60);
if (disconnect == null || (this.reconnect && reconnect > 0 && disconnect.key() != DisconnectReason.PROTOCOL_MISMATCH && disconnect.key() != DisconnectReason.ENCRYPTION_MISMATCH)) {
final long reset = resetDate;
final Timer timer = new Timer(SubAPI.getInstance().getAppInfo().getName() + "::SubData_Reconnect_Handler");
if (disconnect != null) log.info("Attempting reconnect in " + reconnect + " seconds");
timer.scheduleAtFixedRate(new TimerTask() {
@Override
public void run() {
try {
if (reset == resetDate && (subdata.getOrDefault(0, null) == null || subdata.get(0).isClosed())) {
SubDataClient open = subprotocol.open(InetAddress.getByName(config.get().getMap("Settings").getMap("SubData").getString("Address", "127.0.0.1:4391").split(":")[0]),
Integer.parseInt(config.get().getMap("Settings").getMap("SubData").getString("Address", "127.0.0.1:4391").split(":")[1]));
if (subdata.getOrDefault(0, null) != null) subdata.get(0).reconnect(open);
subdata.put(0, open);
if (subdata.getOrDefault(0, null) != null) subdata.get(0).reconnect(open);
subdata.put(0, open);
}
timer.cancel();
} catch (IOException e) {
log.info("Connection was unsuccessful, retrying in " + reconnect + " seconds");
}
timer.cancel();
} catch (IOException e) {
log.info("Connection was unsuccessful, retrying in " + reconnect + " seconds");
}
}
}, (disconnect == null)?0: TimeUnit.SECONDS.toMillis(reconnect), TimeUnit.SECONDS.toMillis(reconnect));
}, (disconnect == null) ? 0 : TimeUnit.SECONDS.toMillis(reconnect), TimeUnit.SECONDS.toMillis(reconnect));
}
}
//TODO: do stuff if we are a plugin
}
public void stop() throws Exception {
running = false;
engine.getPluginManager().executeEvent(new GalaxiStopEvent(engine, 0));
server.stop();
}
}

16
SubServers.Web/src/net/ME1312/SubServers/Web/Library/ConfigUpdater.java
View File

@ -22,7 +22,7 @@ public class ConfigUpdater {
*
* @param file File to bring up-to-date
*/
public static void updateConfig(File file) throws IOException {
public static void updateConfig(File file, boolean isPlugin) throws IOException {
YAMLConfig config = new YAMLConfig(file);
YAMLSection existing = config.get().clone();
YAMLSection updated = existing.clone();
@ -67,12 +67,14 @@ public class ConfigUpdater {
settings.set("Web-Port", updated.getMap("Settings", new YAMLSection()).getInt("Web-Port", 8090));
YAMLSection subdata = new YAMLSection();
subdata.set("Name", updated.getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).getString("Name", "undefined"));
subdata.set("Address", updated.getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).getString("Address", "127.0.0.1:4391"));
if (updated.getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).contains("Password")) subdata.set("Password", updated.getMap("Settings").getMap("SubData").getString("Password"));
if (updated.getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).contains("Reconnect")) subdata.set("Reconnect", updated.getMap("Settings").getMap("SubData").getInt("Reconnect"));
settings.set("SubData", subdata);
if (!isPlugin) {
YAMLSection subdata = new YAMLSection();
subdata.set("Name", updated.getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).getString("Name", "undefined"));
subdata.set("Address", updated.getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).getString("Address", "127.0.0.1:4391"));
if (updated.getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).contains("Password")) subdata.set("Password", updated.getMap("Settings").getMap("SubData").getString("Password"));
if (updated.getMap("Settings", new YAMLSection()).getMap("SubData", new YAMLSection()).contains("Reconnect")) subdata.set("Reconnect", updated.getMap("Settings").getMap("SubData").getInt("Reconnect"));
settings.set("SubData", subdata);
}
rewritten.set("Settings", settings);

1
SubServers.Web/src/net/ME1312/SubServers/Web/Logging/SLF4JLoggerProvider.java
View File

@ -1,6 +1,5 @@
package net.ME1312.SubServers.Web.Logging;
import net.ME1312.SubServers.Web.SubAPI;
import org.slf4j.ILoggerFactory;
import org.slf4j.IMarkerFactory;
import org.slf4j.spi.MDCAdapter;