Merge branch 'create-tests'

Author: guFalcon

pom.xml

@@ -10,7 +10,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>websocket-server</artifactId>
-	<version>1.0.19</version>
+	<version>1.1.1</version>
 	<name>WebsocketServer</name>
 	<packaging>jar</packaging>
 
@@ -40,6 +40,13 @@
 			<artifactId>oauth-token-manager</artifactId>
 			<version>1.0.11</version>
 		</dependency>
+		<!-- Test dependencies -->
+		<dependency>
+			<groupId>org.eclipse.jetty.websocket</groupId>
+			<artifactId>websocket-client</artifactId>
+			<version>9.4.38.v20210224</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -63,5 +70,12 @@
 				</plugin>
 			</plugins>
 		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.2.5</version>
+			</plugin>
+		</plugins>
 	</build>
 </project>

src/main/java/info/unterrainer/websocketserver/WebsocketServer.java

@@ -48,18 +48,21 @@ public WebsocketServer(Javalin server, WsExceptionHandler<Exception> exceptionHa
 		this("", server, exceptionHandler);
 	}
 
+	/// There is no exception-handler-chain in Javalin, so we have to do it ourselves.
+	/// This means, if you provide your own exception handler, it will be called first,
+	/// then the default one will be called, which just logs the exception.
 	public WebsocketServer(String name, Javalin server, WsExceptionHandler<Exception> exceptionHandler) {
 		this.name = name;
 		try {
 			wss = server;
 			if (wss == null)
 				wss = Javalin.create();
 
-			if (exceptionHandler != null)
-				wss.wsException(Exception.class, exceptionHandler);
-
 			wss.wsException(Exception.class, (e, ctx) -> {
 				log.error("(" + name + ") Uncaught websocket-exception in Websocket-Server: {}", e);
+				if (exceptionHandler != null) {
+			        exceptionHandler.handle(e, ctx);
+			    }
 			});
 		} catch (Exception e) {
 			log.error("(" + name + ") Error initializing Websocket-Server.", e);
@@ -131,6 +134,12 @@ public WebsocketServer start(int port) {
 		log.debug("(" + name + ") Websocket server started on port: {}", port);
 		return this;
 	}
+	
+	public WebsocketServer stop() {
+		wss.stop();
+		log.debug("(" + name + ") Websocket server stopped.");
+		return this;
+	}
 
 	public WebsocketServer ws(String path, Consumer<WsHandler> ws) {
 		wss.ws(path, ws, new HashSet<>());
@@ -146,8 +155,8 @@ public WebsocketServer wsOauth(String path, WsOauthHandlerBase handler) {
 		handler.setTokenHandler(tokenManager);
 		wss.ws(path, ws -> {
 			ws.onConnect(handler::onConnect);
-			ws.onMessage(handler::onMessage);
-			ws.onBinaryMessage(handler::onBinaryMessage);
+			ws.onMessage(handler::onMsg);
+			ws.onBinaryMessage(handler::onBinaryMsg);
 			ws.onClose(handler::onClose);
 			ws.onError(handler::onError);
 		});

src/main/java/info/unterrainer/websocketserver/WsHandlerBase.java

@@ -12,7 +12,7 @@ public abstract class WsHandlerBase {
 
 	public abstract void onMsg(WsMessageContext ctx) throws Exception;
 
-	public abstract void onBinaryMessage(WsBinaryMessageContext ctx) throws Exception;
+	public abstract void onBinaryMsg(WsBinaryMessageContext ctx) throws Exception;
 
 	public abstract void onClose(WsCloseContext ctx) throws Exception;
 

src/main/java/info/unterrainer/websocketserver/WsOauthHandlerBase.java

@@ -69,6 +69,7 @@ public void removeClient(Session session) {
 		log.debug("(" + name + ") Removing client: [{}]", session.getRemoteAddress());
 		clientsConnected.removeIf(client -> client.session.equals(session));
 		clientsQuarantined.removeIf(client -> client.session.equals(session));
+		tenantIdsBySession.remove(session);
 	}
 
 	public WsConnectContext getClient(Session session) {
@@ -93,6 +94,10 @@ public boolean isConnected(Session session) {
 
 	@Override
 	public void onConnect(WsConnectContext ctx) throws Exception {
+		handleConnect(ctx);
+	}
+	
+	protected void handleConnect(WsConnectContext ctx) throws Exception {
 		log.debug("(" + name + ") New client tries to connect: [{}]", ctx.session.getRemoteAddress());
 		String token = ctx.header("Authorization");
 		if (token == null || token.isEmpty()) {
@@ -116,9 +121,10 @@ public void onConnect(WsConnectContext ctx) throws Exception {
 
 	@Override
 	public void onMsg(WsMessageContext ctx) throws Exception {
+		handleMessage(ctx);
 	}
 
-	public final void onMessage(WsMessageContext ctx) throws Exception {
+	protected void handleMessage(WsMessageContext ctx) throws Exception {
 		log.debug("(" + name + ") Received from [{}]: [{}]", ctx.session.getRemoteAddress(), ctx.message());
 		if (isQuarantined(ctx.session)) {
 			log.warn(
@@ -152,7 +158,11 @@ public final void onMessage(WsMessageContext ctx) throws Exception {
 	}
 
 	@Override
-	public void onBinaryMessage(WsBinaryMessageContext ctx) throws Exception {
+	public void onBinaryMsg(WsBinaryMessageContext ctx) throws Exception {
+		handleBinaryMessage(ctx);
+	}
+	
+	protected void handleBinaryMessage(WsBinaryMessageContext ctx) throws Exception {
 		log.debug("(" + name + ") Received binary message from [{}]: [{}] bytes", ctx.session.getRemoteAddress(),
 				ctx.data().length);
 		if (isQuarantined(ctx.session)) {
@@ -162,16 +172,25 @@ public void onBinaryMessage(WsBinaryMessageContext ctx) throws Exception {
 			ctx.session.close(1000, "(" + name + ") Unauthorized access from quarantined client");
 			return;
 		}
+		onBinaryMsg(ctx);
 	}
 
 	@Override
 	public void onClose(WsCloseContext ctx) throws Exception {
+		handleClose(ctx);
+	}
+	
+	protected void handleClose(WsCloseContext ctx) throws Exception {
 		log.debug("(" + name + ") Disconnected client: [{}]", ctx.session.getRemoteAddress());
 		removeClient(ctx.session);
 	}
 
 	@Override
 	public void onError(WsErrorContext ctx) throws Exception {
+		handleError(ctx);
+	}
+	
+	protected void handleError(WsErrorContext ctx) throws Exception {
 		Throwable t = ctx.error();
 		if (t instanceof EOFException || t instanceof IOException) {
 			log.debug("(" + name + ") Client disconnected [{}].", ctx.session.getRemoteAddress());

…websocketserver/WebSocketServerTest.java …ketserver/WebSocketServerManualTest.javasrc/test/java/info/unterrainer/websocketserver/WebSocketServerTest.java renamed to src/test/java/info/unterrainer/websocketserver/WebSocketServerManualTest.java src/test/java/info/unterrainer/websocketserver/WebSocketServerTest.java renamed to src/test/java/info/unterrainer/websocketserver/WebSocketServerManualTest.java

@@ -1,6 +1,6 @@
 package info.unterrainer.websocketserver;
 
-public class WebSocketServerTest {
+public class WebSocketServerManualTest {
 
 	public static void main(String[] args) {
 		WebsocketServer server = new WebsocketServer("https://keycloak.lan.elite-zettl.at", "Cms");