@@ -174,6 +174,7 @@ public Exchange enableMultipart(String location){
         enableMultipart(location, -1L);
         return this;
     }
+
     public Exchange enableMultipart(String location, long maxFileSize){
         request.setAttribute("org.eclipse.jetty.multipartConfig", new MultipartConfigElement(location, maxFileSize, -1L, 0));
         return this;
 
@@ -3,7 +3,13 @@
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
+import org.eclipse.jetty.websocket.server.WebSocketHandler;
+import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
 import org.javawebstack.httpserver.helper.JettyNoLog;
 import org.javawebstack.httpserver.inject.Injector;
 import org.javawebstack.httpserver.helper.HttpMethod;
@@ -17,14 +23,13 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.javawebstack.httpserver.handler.*;
+import org.javawebstack.httpserver.websocket.WebSocket;
 import org.reflections.Reflections;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 public class HTTPServer implements RouteParamTransformerProvider {
 
@@ -44,6 +49,7 @@ public static void main(String[] args) {
     private final List<RequestInterceptor> beforeInterceptors = new ArrayList<>();
     private Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).setDateFormat("yyyy-MM-dd HH:mm:ss").disableHtmlEscaping().create();
     private Injector injector = null;
+    private Map<String, Class> webSockets = new HashMap<>();
 
     public HTTPServer(){
         routeParamTransformers.add(DefaultRouteParamTransformer.INSTANCE);
@@ -75,6 +81,27 @@ public HTTPServer route(HttpMethod method, String pattern, RequestHandler... han
         return this;
     }
 
+    public HTTPServer webSocket(String path, Class webSocketHandler){
+        webSockets.put(path, webSocketHandler);
+        return this;
+    }
+
+    public HTTPServer webSocket(String path, WebSocket webSocketHandler){
+        webSockets.put(path, new Object(){
+            private Session session;
+
+            @OnWebSocketConnect public void onConnect(Session session){
+                this.session = session;
+                webSocketHandler.getWebSocketConnectionEvent().onConnect(session);
+            }
+
+            @OnWebSocketConnect public void onMessage(String message){
+                webSocketHandler.getWebSocketMessageEvent().onMessage(session, message);
+            }
+        }.getClass());
+        return this;
+    }
+
     public HTTPServer notFound(RequestHandler handler){
         notFoundHandler = handler;
         return this;
@@ -149,7 +176,25 @@ public HTTPServer port(int port){
     public HTTPServer start(){
         Log.setLog(new JettyNoLog());
         server = new Server(port);
-        server.setHandler(new HttpHandler());
+        HandlerCollection handlerCollection = new HandlerCollection();
+
+        handlerCollection.addHandler(new HttpHandler());
+
+        webSockets.forEach((path, webSocketHandler)->{
+            ContextHandler contextHandler = new ContextHandler();
+            contextHandler.setHandler(new WebSocketHandler() {
+                @Override
+                public void configure(WebSocketServletFactory webSocketServletFactory) {
+                    webSocketServletFactory.register(webSocketHandler);
+                }
+            });
+            contextHandler.setContextPath(path);
+            handlerCollection.addHandler(contextHandler);
+        });
+
+
+        server.setHandler(handlerCollection);
+
         try {
             server.start();
         }catch (Exception ex){
@@ -210,6 +255,7 @@ public void execute(Exchange exchange){
             }
             exchange.write(transformResponse(notFoundHandler.handle(exchange)));
         }catch(Throwable ex){
+            ex.printStackTrace();
             exchange.write(exceptionHandler.handleBytes(exchange, ex));
         }
         exchange.close();
 
@@ -0,0 +1,48 @@
+package org.javawebstack.httpserver.websocket;
+
+import org.eclipse.jetty.websocket.api.Session;
+
+public class WebSocket {
+    private WebSocketConnectionEvent webSocketConnectionEvent;
+    private WebSocketErrorEvent webSocketErrorEvent;
+    private WebSocketMessageEvent webSocketMessageEvent;
+
+    public WebSocket connect(WebSocketConnectionEvent event){
+        webSocketConnectionEvent = event;
+        return this;
+    }
+
+    public WebSocket message(WebSocketMessageEvent event){
+        webSocketMessageEvent = event;
+        return this;
+    }
+
+    public WebSocket error(WebSocketErrorEvent event){
+        webSocketErrorEvent = event;
+        return this;
+    }
+
+    public interface WebSocketConnectionEvent{
+        void onConnect(Session session);
+    }
+
+    public interface WebSocketErrorEvent{
+        void onError(Session session, Throwable throwable);
+    }
+
+    public interface WebSocketMessageEvent{
+        void onMessage(Session session, String message);
+    }
+
+    public WebSocketConnectionEvent getWebSocketConnectionEvent() {
+        return webSocketConnectionEvent;
+    }
+
+    public WebSocketErrorEvent getWebSocketErrorEvent() {
+        return webSocketErrorEvent;
+    }
+
+    public WebSocketMessageEvent getWebSocketMessageEvent() {
+        return webSocketMessageEvent;
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ public Exchange enableMultipart(String location){`
`174`	`174`	`enableMultipart(location, -1L);`
`175`	`175`	`return this;`
`176`	`176`	`}`
	`177`	`+`
`177`	`178`	`public Exchange enableMultipart(String location, long maxFileSize){`
`178`	`179`	`request.setAttribute("org.eclipse.jetty.multipartConfig", new MultipartConfigElement(location, maxFileSize, -1L, 0));`
`179`	`180`	`return this;`