Enable parallel http server downloads

Author: ago1024

modules/mods/httpserver/src/dist/httpserver.properties

@@ -17,3 +17,5 @@ depend.ondemand=true
 # Sets a different address for the HTTP server to bind to. Can be 0.0.0.0 to
 # bind to all interfaces. Default is external ip in server settings.
 #internalServerAddress=
+# Maximum number of threads to server downloads in parallel
+#maxThreads=50

modules/mods/httpserver/src/main/java/org/gotti/wurmunlimited/mods/httpserver/HttpServerMod.java

@@ -9,17 +9,19 @@
 import org.gotti.wurmunlimited.modloader.interfaces.Initable;
 import org.gotti.wurmunlimited.modloader.interfaces.ModEntry;
 import org.gotti.wurmunlimited.modloader.interfaces.ModListener;
+import org.gotti.wurmunlimited.modloader.interfaces.ServerShutdownListener;
 import org.gotti.wurmunlimited.modloader.interfaces.ServerStartedListener;
 import org.gotti.wurmunlimited.modloader.interfaces.WurmServerMod;
 
-public class HttpServerMod implements WurmServerMod, Initable, Configurable, ServerStartedListener, ModListener {
+public class HttpServerMod implements WurmServerMod, Initable, Configurable, ServerStartedListener, ServerShutdownListener, ModListener {
 
 	private Logger logger = Logger.getLogger(HttpServerMod.class.getName());
 
 	private int serverPort = 0;
 	private String publicServerAddress = null;
 	private String internalServerAddress = null;
 	private int publicServerPort = 0;
+	private int maxThreads = 50;
 
 	@Override
 	public void init() {
@@ -31,13 +33,16 @@ public void configure(Properties properties) {
 		this.publicServerPort = Integer.parseInt(properties.getProperty("publicServerPort", Integer.toString(publicServerPort)));
 		this.publicServerAddress = properties.getProperty("publicServerAddress");
 		this.internalServerAddress = properties.getProperty("internalServerAddress");
+		this.maxThreads = Integer.parseInt(properties.getProperty("maxThreads", Integer.toString(maxThreads)));
 
 		logger.info("serverPort: " + serverPort);
 		logger.info("publicServerAddress: " + publicServerAddress);
 		logger.info("publicServerPort: " + publicServerPort);
 		logger.info("internalServerAddress: " + internalServerAddress);
+		logger.info("maxThreads: " + maxThreads);
 
 		ModHttpServerImpl.getInstance().configure(this.internalServerAddress, this.serverPort, this.publicServerAddress, this.publicServerPort);
+		ModHttpServerImpl.getInstance().setMaxThreads(maxThreads);
 	}
 
 	@Override
@@ -49,6 +54,15 @@ public void onServerStarted() {
 		}
 	}
 
+	@Override
+	public void onServerShutdown() {
+		try {
+			ModHttpServerImpl.getInstance().stop();
+		} catch (IOException e) {
+			logger.log(Level.SEVERE, e.getMessage(), e);
+		}
+	}
+	
 	@Override
 	public void modInitialized(ModEntry<?> entry) {
 		ModHttpServerImpl.getInstance().addModEntry(entry);

modules/mods/httpserver/src/main/java/org/gotti/wurmunlimited/mods/httpserver/ModHttpServerImpl.java

@@ -41,6 +41,7 @@ private static class Handler {
 	private int publicServerPort = 0;
 	private String publicServerAddress = null;
 	private String internalServerAddress = null;
+	private int maxThreads = 10;
 
 	private PackServer packServer;
 
@@ -105,15 +106,38 @@ public String serve(WurmServerMod mod, Pattern regex, Path file) {
 		return serve(mod, regex, path -> readFile(file));
 	}
 
+	/**
+	 * Start the http server
+	 * @throws IOException
+	 */
 	protected void start() throws IOException {
-		this.packServer = new PackServer(port, publicServerAddress, publicServerPort, internalServerAddress) {
+		this.packServer = new PackServer(port, publicServerAddress, publicServerPort, internalServerAddress, maxThreads) {
 			@Override
 			protected InputStream getStream(String path) throws IOException {
 				return handle(path);
 			}
 		};
 	}
 
+	/**
+	 * Stop the http server
+	 * @throws IOException
+	 */
+	protected void stop() throws IOException {
+		if (this.packServer != null) {
+			this.packServer.stop();
+			this.packServer = null;
+		}
+	}
+	
+	/**
+	 * Set maximum number of threads serving parallel downloads
+	 * @param maxThreads maximum number of thread
+	 */
+	protected void setMaxThreads(int maxThreads) {
+		this.maxThreads = maxThreads;
+	}
+	
 	private InputStream handle(String path) {
 		for (Handler handler : handlers) {
 			final Matcher matcher = handler.modName.matcher(path);
@@ -142,6 +166,9 @@ public boolean isRunning() {
 
 	@Override
 	public URI getUri() throws URISyntaxException {
-		return packServer.getUri();
+		if (packServer != null) {
+			return packServer.getUri();
+		}
+		return null;
 	}
 }

modules/mods/httpserver/src/main/java/org/gotti/wurmunlimited/mods/httpserver/PackServer.java

@@ -7,6 +7,10 @@
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -15,16 +19,19 @@
 import com.sun.net.httpserver.HttpServer;
 import com.wurmonline.server.Server;
 
+@SuppressWarnings("restriction")
 public abstract class PackServer {
 
-	private Logger logger = Logger.getLogger(PackServer.class.getName());
+	private final Logger logger = Logger.getLogger(PackServer.class.getName());
 
-	private HttpServer httpServer;
+	private final HttpServer httpServer;
 
 	private final String publicServerAddress;
 	private final int publicServerPort;
 
-	public PackServer(int port, String publicServerAddress, int publicServerPort, String internalServerAddress) throws IOException {
+	private final ExecutorService executor;
+	
+	public PackServer(int port, String publicServerAddress, int publicServerPort, String internalServerAddress, int maxThreads) throws IOException {
 
 		this.publicServerAddress = publicServerAddress;
 		this.publicServerPort = publicServerPort;
@@ -34,9 +41,12 @@ public PackServer(int port, String publicServerAddress, int publicServerPort, St
 			addr = InetAddress.getByAddress(Server.getInstance().getExternalIp());
 		else
 			addr = InetAddress.getByName(internalServerAddress);
+		
+		executor = new ThreadPoolExecutor(0, maxThreads, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>());
 
 		InetSocketAddress address = new InetSocketAddress(addr, port);
 		httpServer = HttpServer.create(address, 0);
+		httpServer.setExecutor(executor);
 		httpServer.createContext("/", new HttpHandler() {
 
 			@Override
@@ -83,5 +93,14 @@ public URI getUri() throws URISyntaxException {
 		return new URI("http", null, address, port, "/", null, null);
 	}
 
+	public void stop() throws IOException {
+		httpServer.stop(0);
+		executor.shutdown();
+		try {
+			executor.awaitTermination(60, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {
+			throw new IOException(e);
+		}
+	}
 
 }