Major update museumsvictoria#81: HTTP and WebSocket ports unified

Feature thanks to automatic.com.au; co-authored-by: @morimoriysmoon and @justparking

Normally an additional arbitrary TCP socket was used as a WebSocket endpoint. This update avoids the additional port by adding WebSocket funcionality onto the main HTTP port.

nodel-framework/src/main/java/org/nanohttpd/protocols/http/ClientHandler.java

@@ -0,0 +1,108 @@
+package org.nanohttpd.protocols.http;
+
+/*
+ * ALTERED FROM ORIGINAL
+ *
+ * #%L
+ * NanoHttpd-Core
+ * %%
+ * Copyright (C) 2012 - 2016 nanohttpd
+ * %%
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * 3. Neither the name of the nanohttpd nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.util.logging.Level;
+
+import org.nanohttpd.protocols.http.tempfiles.ITempFileManager;
+import org.nodel.diagnostics.Diagnostics;
+import org.nodel.diagnostics.SharableMeasurementProvider;
+
+/**
+ * The runnable that will be used for every new client connection.
+ */
+public class ClientHandler implements Runnable {
+
+    /**
+     * (not from original code)
+     */
+    private final static SharableMeasurementProvider s_httpServerConnections = Diagnostics.shared().registerSharableCounter("Nodel HTTP server.Connections", false);
+
+    private final NanoHTTPD httpd;
+
+    private final InputStream inputStream;
+
+    private final Socket acceptSocket;
+
+    public ClientHandler(NanoHTTPD httpd, InputStream inputStream, Socket acceptSocket) {
+        this.httpd = httpd;
+        this.inputStream = inputStream;
+        this.acceptSocket = acceptSocket;
+    }
+
+    public void close() {
+        NanoHTTPD.safeClose(this.inputStream);
+        NanoHTTPD.safeClose(this.acceptSocket);
+    }
+
+    @Override
+    public void run() {
+        s_httpServerConnections.incr();
+
+        OutputStream outputStream = null;
+        try {
+            outputStream = this.acceptSocket.getOutputStream();
+            ITempFileManager tempFileManager = httpd.getTempFileManagerFactory().create();
+            HTTPSession session = new HTTPSession(httpd, tempFileManager, this.inputStream, outputStream, this.acceptSocket);
+            while (!this.acceptSocket.isClosed()) {
+                session.execute();
+            }
+        } catch (Exception e) {
+            // When the socket is closed by the client,
+            // we throw our own SocketException
+            // to break the "keep alive" loop above. If
+            // the exception was anything other
+            // than the expected SocketException OR a
+            // SocketTimeoutException, print the
+            // stacktrace
+            if (!(e instanceof SocketException && "NanoHttpd Shutdown".equals(e.getMessage())) && !(e instanceof SocketTimeoutException)) {
+                NanoHTTPD.LOG.log(Level.SEVERE, "Communication with the client broken, or an bug in the handler code", e);
+            }
+        } finally {
+            s_httpServerConnections.decr();
+
+            NanoHTTPD.safeClose(outputStream);
+            NanoHTTPD.safeClose(this.inputStream);
+            NanoHTTPD.safeClose(this.acceptSocket);
+            httpd.asyncRunner.closed(this);
+        }
+    }
+}