diff options
Diffstat (limited to 'websocket/src/main/java/fi/iki/elonen/samples/echo')
3 files changed, 45 insertions, 105 deletions
diff --git a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocket.java b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocket.java deleted file mode 100644 index 7d9fcfe..0000000 --- a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocket.java +++ /dev/null @@ -1,100 +0,0 @@ -package fi.iki.elonen.samples.echo; - -/* - * #%L - * NanoHttpd-Websocket - * %% - * Copyright (C) 2012 - 2015 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.IOException; - -import fi.iki.elonen.NanoHTTPD; -import fi.iki.elonen.WebSocket; -import fi.iki.elonen.WebSocketFrame; - -/** -* @author Paul S. Hawke (paul.hawke@gmail.com) -* On: 4/23/14 at 10:34 PM -*/ -class DebugWebSocket extends WebSocket { - private final boolean debug; - - public DebugWebSocket(NanoHTTPD.IHTTPSession handshake, boolean debug) { - super(handshake); - this.debug = debug; - } - - @Override - protected void onPong(WebSocketFrame pongFrame) { - if (debug) { - System.out.println("P " + pongFrame); - } - } - - @Override - protected void onMessage(WebSocketFrame messageFrame) { - try { - messageFrame.setUnmasked(); - sendFrame(messageFrame); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - @Override - protected void onClose(WebSocketFrame.CloseCode code, String reason, boolean initiatedByRemote) { - if (debug) { - System.out.println("C [" + (initiatedByRemote ? "Remote" : "Self") + "] " + - (code != null ? code : "UnknownCloseCode[" + code + "]") + - (reason != null && !reason.isEmpty() ? ": " + reason : "")); - } - } - - @Override - protected void onException(IOException e) { - e.printStackTrace(); - } - - @Override - protected void handleWebsocketFrame(WebSocketFrame frame) throws IOException { - if (debug) { - System.out.println("R " + frame); - } - super.handleWebsocketFrame(frame); - } - - @Override - public synchronized void sendFrame(WebSocketFrame frame) throws IOException { - if (debug) { - System.out.println("S " + frame); - } - super.sendFrame(frame); - } -} diff --git a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java index e6b225e..8d5b752 100644 --- a/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java +++ b/websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java @@ -33,14 +33,14 @@ package fi.iki.elonen.samples.echo; * #L% */ +import java.io.IOException; import fi.iki.elonen.NanoWebSocketServer; -import fi.iki.elonen.WebSocket; /** * @author Paul S. Hawke (paul.hawke@gmail.com) * On: 4/23/14 at 10:31 PM */ -class DebugWebSocketServer extends NanoWebSocketServer { +public class DebugWebSocketServer extends NanoWebSocketServer { private final boolean debug; public DebugWebSocketServer(int port, boolean debug) { @@ -49,7 +49,47 @@ class DebugWebSocketServer extends NanoWebSocketServer { } @Override - public WebSocket openWebSocket(IHTTPSession handshake) { - return new DebugWebSocket(handshake, debug); + protected void onPong(WebSocket socket, WebSocketFrame pongFrame) { + if (debug) { + System.out.println("P " + pongFrame); + } + } + + @Override + protected void onMessage(WebSocket socket, WebSocketFrame messageFrame) { + try { + messageFrame.setUnmasked(); + socket.sendFrame(messageFrame); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Override + protected void onClose(WebSocket socket, WebSocketFrame.CloseCode code, String reason, boolean initiatedByRemote) { + if (debug) { + System.out.println("C [" + (initiatedByRemote ? "Remote" : "Self") + "] " + + (code != null ? code : "UnknownCloseCode[" + code + "]") + + (reason != null && !reason.isEmpty() ? ": " + reason : "")); + } + } + + @Override + protected void onException(WebSocket socket, IOException e) { + e.printStackTrace(); + } + + @Override + protected void onFrameReceived(WebSocketFrame frame) { + if (debug) { + System.out.println("R " + frame); + } + } + + @Override + public void onSendFrame(WebSocketFrame frame) { + if (debug) { + System.out.println("S " + frame); + } } } diff --git a/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java b/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java index 8fed4c7..9a90815 100644 --- a/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java +++ b/websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java @@ -40,7 +40,7 @@ import fi.iki.elonen.NanoWebSocketServer; public class EchoSocketSample { public static void main(String[] args) throws IOException { final boolean debugMode = args.length >= 2 && args[1].toLowerCase().equals("-d"); - NanoWebSocketServer ws = new DebugWebSocketServer(Integer.parseInt(args[0]), debugMode); + NanoWebSocketServer ws = new DebugWebSocketServer(args.length > 0 ? Integer.parseInt(args[0]) : 9090, debugMode); ws.start(); System.out.println("Server started, hit Enter to stop.\n"); try { |