Merge pull request #478 from csmith/master

Web UI work.

build.gradle

@@ -103,7 +103,7 @@ subprojects {
         }
 
         from { configurations.bundle.minus(configurations.provided).collect { it.isDirectory() ? it : zipTree(it) } } {
-            exclude 'META-INF/**'
+            exclude 'META-INF/*'
         }
     }
 

ui_web2/build.gradle

@@ -1,4 +1,8 @@
 dependencies {
-  bundle group: 'com.sparkjava', name: 'spark-core', version: '2.5'
-  bundle group: 'com.google.code.gson', name: 'gson', 'version': '2.5'
+    bundle group: 'com.google.code.gson', name: 'gson', version: '2.5'
+
+    bundle group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.3.9.v20160517'
+    bundle group: 'org.eclipse.jetty.websocket', name: 'websocket-server', version: '9.3.9.v20160517'
+    bundle group: 'org.eclipse.jetty.websocket', name: 'websocket-servlet', version: '9.3.9.v20160517'
+
 }

ui_web2/src/main/java/com/dmdirc/addons/ui_web2/InitialStateProducer.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_web2;
 
-import com.dmdirc.addons.ui_web2.serialisers.BackBufferSerializer;
+import com.dmdirc.addons.ui_web2.serialisers.BackBufferSimpleSerializer;
 import com.dmdirc.addons.ui_web2.serialisers.WindowModelSerialiser;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.WindowManager;
@@ -50,7 +50,7 @@ public class InitialStateProducer {
             final WindowModelSerialiser windowSerialiser) {
         serialiser = new GsonBuilder()
                 .registerTypeHierarchyAdapter(WindowModel.class, windowSerialiser)
-                .registerTypeAdapter(BackBuffer.class, new BackBufferSerializer())
+                .registerTypeAdapter(BackBuffer.class, new BackBufferSimpleSerializer())
                 .create();
         this.windowManager = windowManager;
     }
@@ -60,6 +60,7 @@ public class InitialStateProducer {
         return serialiser.toJson(state);
     }
 
+    /** Class to serialize and pass to the client with initial state. */
     private static class InitialState {
 
         private final Collection<WindowModel> windows;
@@ -71,6 +72,7 @@ public class InitialStateProducer {
         public Collection<WindowModel> getWindows() {
             return Collections.unmodifiableCollection(windows);
         }
+
     }
 
 }

ui_web2/src/main/java/com/dmdirc/addons/ui_web2/WebServer.java

@@ -22,28 +22,95 @@
 
 package com.dmdirc.addons.ui_web2;
 
-import spark.Spark;
+import com.dmdirc.util.LogUtils;
+
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
+import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Web server used by the web UI.
  */
 public class WebServer {
 
+    private static final Logger LOG = LoggerFactory.getLogger(WebServer.class);
+
     private final int port;
+    private Server server;
 
     public WebServer(final int port) {
         this.port = port;
     }
 
     public void start() {
-        Spark.port(port);
-        Spark.webSocket("/ws", WebSocketHandler.class);
-        Spark.staticFileLocation("/www");
-        Spark.get("/test", (request, response) -> "HELLO");
+        server = new Server(port);
+
+        // Override the context classloader, so that Jetty uses the plugin classloader not the main DMDirc loader.
+        final Thread currentThread = Thread.currentThread();
+        final ClassLoader classLoader = currentThread.getContextClassLoader();
+        currentThread.setContextClassLoader(getClass().getClassLoader());
+
+        try {
+            final ResourceHandler resourceHandler = new ResourceHandler();
+            resourceHandler.setWelcomeFiles(new String[]{ "index.html" });
+            resourceHandler.setBaseResource(Resource.newClassPathResource("/www"));
+
+            final ResourceHandler clientResourceHandler = new ResourceHandler();
+            clientResourceHandler.setBaseResource(Resource.newClassPathResource("/com/dmdirc/res/"));
+            final ContextHandler clientResourceContext = new ContextHandler("/res");
+            clientResourceContext.setHandler(clientResourceHandler);
+
+            final ServletContextHandler wsHandler = new ServletContextHandler();
+            wsHandler.setContextPath("/");
+            wsHandler.addServlet(WebUiWebSocketServlet.class, "/ws");
+
+            HandlerList handlers = new HandlerList();
+            handlers.setHandlers(new Handler[] {
+                    resourceHandler,
+                    clientResourceContext,
+                    wsHandler,
+                    new DefaultHandler()
+            });
+            server.setHandler(handlers);
+
+            server.start();
+        } catch (Exception ex) {
+            LOG.error(LogUtils.USER_ERROR, "Unable to start web server", ex);
+            server = null;
+        } finally {
+            // Restore the usual context class loader.
+            currentThread.setContextClassLoader(classLoader);
+        }
     }
 
     public void stop() {
-        Spark.stop();
+        try {
+            server.stop();
+        } catch (Exception ex) {
+            LOG.error(LogUtils.USER_ERROR, "Unable to stop web server", ex);
+        }
+
+        server = null;
     }
 
+    /**
+     * Web Socket Servlet that creates a {@link WebSocketHandler} for each connection.
+     */
+    public static class WebUiWebSocketServlet extends WebSocketServlet {
+
+        @Override
+        public void configure(final WebSocketServletFactory factory) {
+            factory.register(WebSocketHandler.class);
+        }
+
+    }
 }

ui_web2/src/main/java/com/dmdirc/addons/ui_web2/serialisers/BackBufferSerializer.java

@@ -38,8 +38,7 @@ import java.lang.reflect.Type;
 public class BackBufferSerializer implements JsonSerializer<BackBuffer> {
 
     @Override
-    public JsonElement serialize(final BackBuffer src, final Type typeOfSrc,
-            final JsonSerializationContext context) {
+    public JsonElement serialize(final BackBuffer src, final Type typeOfSrc, final JsonSerializationContext context) {
         final JsonArray res = new JsonArray();
         final IRCDocument document = src.getDocument();
         for (int i = 0; i < document.getNumLines(); i++) {

ui_web2/src/main/java/com/dmdirc/addons/ui_web2/serialisers/BackBufferSimpleSerializer.java

@@ -0,0 +1,24 @@
+package com.dmdirc.addons.ui_web2.serialisers;
+
+import com.dmdirc.ui.messages.BackBuffer;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+
+/**
+ * Serializes a {@link BackBuffer} without including the full content.
+ */
+public class BackBufferSimpleSerializer implements JsonSerializer<BackBuffer> {
+
+    @Override
+    public JsonElement serialize(final BackBuffer src, final Type typeOfSrc, final JsonSerializationContext context) {
+        final JsonObject res = new JsonObject();
+        res.addProperty("lines", src.getDocument().getNumLines());
+        return res;
+    }
+
+}

ui_web2/src/main/java/com/dmdirc/addons/ui_web2/serialisers/WindowModelSerialiser.java

@@ -47,9 +47,9 @@ public class WindowModelSerialiser implements JsonSerializer<WindowModel> {
     }
 
     @Override
-    public JsonElement serialize(final WindowModel src, final Type typeOfSrc,
-            final JsonSerializationContext context) {
+    public JsonElement serialize(final WindowModel src, final Type typeOfSrc, final JsonSerializationContext context) {
         final JsonObject res = new JsonObject();
+        res.addProperty("id", src.getId());
         res.addProperty("name", src.getName());
         res.addProperty("icon", src.getIcon());
         res.addProperty("title", src.getTitle());

ui_web2/src/main/resources/META-INF/services/org.eclipse.jetty.http.HttpFieldPreEncoder

@@ -1 +0,0 @@
-org.eclipse.jetty.http.Http1FieldPreEncoder