|
@@ -22,28 +22,95 @@
|
22
|
22
|
|
23
|
23
|
package com.dmdirc.addons.ui_web2;
|
24
|
24
|
|
25
|
|
-import spark.Spark;
|
|
25
|
+import com.dmdirc.util.LogUtils;
|
|
26
|
+
|
|
27
|
+import org.eclipse.jetty.server.Handler;
|
|
28
|
+import org.eclipse.jetty.server.Server;
|
|
29
|
+import org.eclipse.jetty.server.handler.ContextHandler;
|
|
30
|
+import org.eclipse.jetty.server.handler.DefaultHandler;
|
|
31
|
+import org.eclipse.jetty.server.handler.HandlerList;
|
|
32
|
+import org.eclipse.jetty.server.handler.ResourceHandler;
|
|
33
|
+import org.eclipse.jetty.servlet.ServletContextHandler;
|
|
34
|
+import org.eclipse.jetty.util.resource.Resource;
|
|
35
|
+import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
|
|
36
|
+import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
|
|
37
|
+import org.slf4j.Logger;
|
|
38
|
+import org.slf4j.LoggerFactory;
|
26
|
39
|
|
27
|
40
|
/**
|
28
|
41
|
* Web server used by the web UI.
|
29
|
42
|
*/
|
30
|
43
|
public class WebServer {
|
31
|
44
|
|
|
45
|
+ private static final Logger LOG = LoggerFactory.getLogger(WebServer.class);
|
|
46
|
+
|
32
|
47
|
private final int port;
|
|
48
|
+ private Server server;
|
33
|
49
|
|
34
|
50
|
public WebServer(final int port) {
|
35
|
51
|
this.port = port;
|
36
|
52
|
}
|
37
|
53
|
|
38
|
54
|
public void start() {
|
39
|
|
- Spark.port(port);
|
40
|
|
- Spark.webSocket("/ws", WebSocketHandler.class);
|
41
|
|
- Spark.staticFileLocation("/www");
|
42
|
|
- Spark.get("/test", (request, response) -> "HELLO");
|
|
55
|
+ server = new Server(port);
|
|
56
|
+
|
|
57
|
+ // Override the context classloader, so that Jetty uses the plugin classloader not the main DMDirc loader.
|
|
58
|
+ final Thread currentThread = Thread.currentThread();
|
|
59
|
+ final ClassLoader classLoader = currentThread.getContextClassLoader();
|
|
60
|
+ currentThread.setContextClassLoader(getClass().getClassLoader());
|
|
61
|
+
|
|
62
|
+ try {
|
|
63
|
+ final ResourceHandler resourceHandler = new ResourceHandler();
|
|
64
|
+ resourceHandler.setWelcomeFiles(new String[]{ "index.html" });
|
|
65
|
+ resourceHandler.setBaseResource(Resource.newClassPathResource("/www"));
|
|
66
|
+
|
|
67
|
+ final ResourceHandler clientResourceHandler = new ResourceHandler();
|
|
68
|
+ clientResourceHandler.setBaseResource(Resource.newClassPathResource("/com/dmdirc/res/"));
|
|
69
|
+ final ContextHandler clientResourceContext = new ContextHandler("/res");
|
|
70
|
+ clientResourceContext.setHandler(clientResourceHandler);
|
|
71
|
+
|
|
72
|
+ final ServletContextHandler wsHandler = new ServletContextHandler();
|
|
73
|
+ wsHandler.setContextPath("/");
|
|
74
|
+ wsHandler.addServlet(WebUiWebSocketServlet.class, "/ws");
|
|
75
|
+
|
|
76
|
+ HandlerList handlers = new HandlerList();
|
|
77
|
+ handlers.setHandlers(new Handler[] {
|
|
78
|
+ resourceHandler,
|
|
79
|
+ clientResourceContext,
|
|
80
|
+ wsHandler,
|
|
81
|
+ new DefaultHandler()
|
|
82
|
+ });
|
|
83
|
+ server.setHandler(handlers);
|
|
84
|
+
|
|
85
|
+ server.start();
|
|
86
|
+ } catch (Exception ex) {
|
|
87
|
+ LOG.error(LogUtils.USER_ERROR, "Unable to start web server", ex);
|
|
88
|
+ server = null;
|
|
89
|
+ } finally {
|
|
90
|
+ // Restore the usual context class loader.
|
|
91
|
+ currentThread.setContextClassLoader(classLoader);
|
|
92
|
+ }
|
43
|
93
|
}
|
44
|
94
|
|
45
|
95
|
public void stop() {
|
46
|
|
- Spark.stop();
|
|
96
|
+ try {
|
|
97
|
+ server.stop();
|
|
98
|
+ } catch (Exception ex) {
|
|
99
|
+ LOG.error(LogUtils.USER_ERROR, "Unable to stop web server", ex);
|
|
100
|
+ }
|
|
101
|
+
|
|
102
|
+ server = null;
|
47
|
103
|
}
|
48
|
104
|
|
|
105
|
+ /**
|
|
106
|
+ * Web Socket Servlet that creates a {@link WebSocketHandler} for each connection.
|
|
107
|
+ */
|
|
108
|
+ public static class WebUiWebSocketServlet extends WebSocketServlet {
|
|
109
|
+
|
|
110
|
+ @Override
|
|
111
|
+ public void configure(final WebSocketServletFactory factory) {
|
|
112
|
+ factory.register(WebSocketHandler.class);
|
|
113
|
+ }
|
|
114
|
+
|
|
115
|
+ }
|
49
|
116
|
}
|