Removed setMaxPortShift(int) method, added setPort(IntStream) instead

Author: LatvianModder

.github/workflows/build.yml

@@ -13,20 +13,39 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+
       - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '21'
           cache: gradle
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
-      - name: Build and Publish with Gradle
+
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build -x test --stacktrace --no-daemon
+
+      - name: Publish to latvian.dev Maven
         uses: gradle/gradle-build-action@v2
         env:
+          MAVEN_URL: 'https://maven.latvian.dev/releases'
+          MAVEN_USERNAME: 'lat'
           MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
-          SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
         with:
-          arguments: build -x test publish --stacktrace --no-daemon
+          arguments: publish --stacktrace --no-daemon
+
+      - name: Publish to saps.dev Maven
+        uses: gradle/gradle-build-action@v2
+        env:
+          MAVEN_URL: 'https://maven.saps.dev/releases'
+          MAVEN_USERNAME: 'latvian'
+          MAVEN_TOKEN: ${{ secrets.SAPS_TOKEN }}
+        with:
+          arguments: publish --stacktrace --no-daemon

build.gradle

@@ -51,22 +51,12 @@ publishing {
 	}
 
 	repositories {
-		if (ENV.MAVEN_TOKEN) {
+		if (ENV.MAVEN_URL && ENV.MAVEN_USERNAME && ENV.MAVEN_TOKEN) {
 			maven {
-				url "https://maven.latvian.dev/releases"
+				url = ENV.MAVEN_URL
 				credentials {
-					username = "lat"
-					password = "${ENV.MAVEN_TOKEN}"
-				}
-			}
-		}
-
-		if (ENV.SAPS_TOKEN) {
-			maven {
-				url "https://maven.saps.dev/releases"
-				credentials {
-					username = "latvian"
-					password = "${ENV.SAPS_TOKEN}"
+					username = ENV.MAVEN_USERNAME
+					password = ENV.MAVEN_TOKEN
 				}
 			}
 		}

src/main/java/dev/latvian/apps/tinyserver/HTTPConnection.java

@@ -121,7 +121,7 @@ protected void closed(StatusCode reason) {
 	}
 
 	protected void error(Throwable error) {
-		if (!(error instanceof SocketTimeoutException || error instanceof ClosedChannelException)) {
+		if (!(error instanceof SocketTimeoutException || error instanceof ClosedChannelException || error instanceof IOException io && "Broken pipe".equals(io.getMessage()))) {
 			error.printStackTrace();
 		}
 	}

src/main/java/dev/latvian/apps/tinyserver/HTTPServer.java

@@ -34,10 +34,12 @@
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 public class HTTPServer<REQ extends HTTPRequest> implements Runnable, ServerRegistry<REQ> {
 	private static final Object DUMMY = new Object();
+	private static final int[] DEFAULT_PORTS = {8080};
 
 	private final Supplier<REQ> requestFactory;
 	private final Map<HTTPMethod, HandlerList<REQ>> handlers;
@@ -48,8 +50,7 @@ public class HTTPServer<REQ extends HTTPRequest> implements Runnable, ServerRegi
 	//private Selector selector;
 	private ServerSocketChannel serverSocketChannel;
 	private String address;
-	private int port = 8080;
-	private int maxPortShift = 0;
+	private int[] ports = DEFAULT_PORTS;
 	private boolean daemon = false;
 	private int bufferSize = 0;
 	private int maxKeepAliveConnections = 100;
@@ -74,11 +75,11 @@ public void setAddress(String address) {
 	}
 
 	public void setPort(int port) {
-		this.port = port;
+		this.ports = new int[]{port};
 	}
 
-	public void setMaxPortShift(int maxPortShift) {
-		this.maxPortShift = Math.max(maxPortShift, 0);
+	public void setPort(IntStream range) {
+		this.ports = range.toArray();
 	}
 
 	public void setDaemon(boolean daemon) {
@@ -104,12 +105,17 @@ public boolean isRunning() {
 	public int start() {
 		if (serverSocketChannel != null) {
 			throw new IllegalStateException("Server is already running");
+		} else if (ports.length == 0) {
+			return -1;
 		}
 
 		int boundPort = -1;
 
-		try {
+		Arrays.sort(ports);
+		int minPort = ports[0];
+		int maxPort = ports[ports.length - 1];
 
+		try {
 			serverSocketChannel = ServerSocketChannel.open();
 			serverSocketChannel.configureBlocking(false);
 
@@ -121,7 +127,7 @@ public int start() {
 
 			var inetAddress = address == null ? null : InetAddress.getByName(address);
 
-			for (int i = port; i <= port + maxPortShift; i++) {
+			for (int i : ports) {
 				try {
 					socket.bind(new InetSocketAddress(inetAddress, i));
 					boundPort = i;
@@ -137,7 +143,7 @@ public int start() {
 		}
 
 		if (boundPort == -1) {
-			throw new BindFailedException(port, port + maxPortShift);
+			throw new BindFailedException(minPort, maxPort);
 		}
 
 		startThread();

src/test/java/dev/latvian/apps/tinyserver/test/TestConnection.java

@@ -4,6 +4,7 @@
 import dev.latvian.apps.tinyserver.HTTPServer;
 import dev.latvian.apps.tinyserver.StatusCode;
 
+import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SocketChannel;
@@ -28,6 +29,8 @@ protected void closed(StatusCode reason) {
 	protected void error(Throwable error) {
 		if (error instanceof SocketTimeoutException || error instanceof ClosedChannelException) {
 			System.out.println("\u001B[31mConnection " + this + " timed out\u001B[0m");
+		} else if (error instanceof IOException io && "Broken pipe".equals(io.getMessage())) {
+			System.out.println("\u001B[31mConnection " + this + " terminated\u001B[0m");
 		} else {
 			error.printStackTrace();
 		}

src/test/java/dev/latvian/apps/tinyserver/test/TinyServerTest.java

@@ -13,6 +13,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public class TinyServerTest {
 	public static TestServer server;
@@ -22,8 +23,7 @@ public static void main(String[] args) throws IOException {
 		server = new TestServer();
 		server.setServerName("TinyServer Test");
 		server.setAddress("127.0.0.1");
-		server.setPort(8080);
-		server.setMaxPortShift(10);
+		server.setPort(IntStream.range(8080, 8080 + 10));
 		server.setDaemon(false);
 		server.setKeepAliveTimeout(Duration.ofSeconds(5L));
 		server.setMaxKeepAliveConnections(5);
@@ -51,7 +51,7 @@ public static void main(String[] args) throws IOException {
 
 		wsHandler = server.ws("/console/{console-type}", TestWSSession::new);
 
-		System.out.println("Started server at https://localhost:" + server.start());
+		System.out.println("Started server at http://localhost:" + server.start());
 
 		while (server.isRunning()) {
 			var sb = new StringBuilder();