réparé des trucs jcrois

src/main/java/CuisineHTTPServer.java

@@ -41,7 +41,7 @@ public class CuisineHTTPServer extends Thread
         Undertow WebPageServer = Undertow.builder()
                 .addHttpListener(webPagePort, HOST)
                 .setHandler(
-                        new CuisineResponseHandler(iWebSocketProtocolPrefix+"://"+webSocketHost+":"+( writePortInClientSideURI ? webSocketPort : "/data" ))
+                        new CuisineResponseHandler(iWebSocketProtocolPrefix+"://"+webSocketHost+":"+( writePortInClientSideURI ? webSocketPort : "" ))
                             ).build();
         WebPageServer.start();
 
@@ -60,12 +60,16 @@ public class CuisineHTTPServer extends Thread
     static String sHtml_ASCII_title;
     static String sHtml_CSS;
     static String sJS_ClientSide;
+    static String sHtml_Chatbox;
+    static String sJS_Chatbox;
     static void initResources()
     {
         try {
             sHtml_ASCII_title = new Scanner(CuisineHTTPServer.class.getResourceAsStream("html_ascii_title"), "UTF-8").useDelimiter("\\A").next();
             sHtml_CSS = new Scanner(CuisineHTTPServer.class.getResourceAsStream("style.css"), "UTF-8").useDelimiter("\\A").next();
             sJS_ClientSide = new Scanner(CuisineHTTPServer.class.getResourceAsStream("clientsidecoms.js"), "UTF-8").useDelimiter("\\A").next();
+            sHtml_Chatbox = new Scanner(CuisineHTTPServer.class.getResourceAsStream("components/chat.html"), "UTF-8").useDelimiter("\\A").next();
+            sJS_Chatbox = new Scanner(CuisineHTTPServer.class.getResourceAsStream("components/chatscript.js"), "UTF-8").useDelimiter("\\A").next();
 
         }
         catch(Exception vex)
@@ -112,8 +116,10 @@ public class CuisineHTTPServer extends Thread
             .append(sHtml_ASCII_title)
             .append("   </div>")
             .append("   <h1 id=\"tempValue\">None</h1>")
+            .append(sHtml_Chatbox.replace("%WSURI%",iWsUri))
             .append("   <script>")
             .append(sJS_ClientSide.replace("%WSURI%",iWsUri))
+            .append(sJS_Chatbox.replace("%WSURI%",iWsUri))
             .append("   </script>")
             .append("</body>")
             .append("")

src/main/java/websockets/CuisineWebSocketChichatHandler.java

@@ -9,18 +9,28 @@ import java.util.ArrayList;
 
 public class CuisineWebSocketChichatHandler extends AbstractReceiveListener {
 
-    final int MAX_MESSAGES = 5;
+    final int MAX_MESSAGES = 10;
     ArrayList<String> vMessageHistory;
 
     protected CuisineWebSocketChichatHandler() {
-
+        vMessageHistory = new ArrayList<>();
     }
 
     protected void onFullTextMessage(WebSocketChannel iChannel, BufferedTextMessage iTextMessage) {
         String vMessageContent = iTextMessage.getData();
-        System.out.println("Received " + iTextMessage.toString());
+        if(!vMessageContent.equals("R0VU") && vMessageContent.length()>0 && vMessageContent.length()<250)
+            vMessageHistory.add(vMessageContent);
+        if(vMessageHistory.size() > MAX_MESSAGES)
+        {
+            vMessageHistory.remove(0);
+        }
+        StringBuilder vBuilder = new StringBuilder();
+        for(String vMessage : vMessageHistory)
+        {
+            vBuilder.append(vMessage+"\n");
+        }
         //Handle message on webSocket
-        WebSockets.sendText(vMessageContent, iChannel, null);
+        WebSockets.sendText(vBuilder.toString(), iChannel, null);
     }
 
 }

src/main/java/websockets/CuisineWebSocketServer.java

@@ -9,6 +9,8 @@ import io.undertow.websockets.core.WebSockets;
 import io.undertow.websockets.spi.WebSocketHttpExchange;
 import tcp.CuisineTCPServer;
 
+import java.util.ArrayList;
+
 import static io.undertow.Handlers.path;
 import static io.undertow.Handlers.websocket;
 import static io.undertow.Handlers.*;
@@ -16,7 +18,9 @@ import static io.undertow.Handlers.*;
 public class CuisineWebSocketServer {
 
     CuisineWebSocketConnectionHandler fConnectionHandler;
+    CuisineWebSocketConnectionHandler fChatConnectionHandler;
     CuisineWebSocketMessageHandler fMessageHandler;
+    CuisineWebSocketChichatHandler fChitchatMessageHandler;
     Undertow fWebSocketServer;
     String fWebSocketHost;
     int fWebSocketPort;
@@ -32,13 +36,17 @@ public class CuisineWebSocketServer {
     }
 
     public void start() {
+        fChitchatMessageHandler = new CuisineWebSocketChichatHandler();
+
         fConnectionHandler = new CuisineWebSocketConnectionHandler(fMessageHandler);
+        fChatConnectionHandler = new CuisineWebSocketConnectionHandler(fChitchatMessageHandler);
         System.out.println("Opening web socket server at "+fWebSocketHost+":"+fWebSocketPort);
         fWebSocketServer = Undertow.builder()
                 .addHttpListener(fWebSocketPort, "0.0.0.0")
                 .setHandler(
                         path()
                                 .addPrefixPath("/data", websocket(fConnectionHandler))
+                                .addPrefixPath("/chat", websocket(fChatConnectionHandler))
                 )
                 .build();
         fWebSocketServer.start();
@@ -46,9 +54,9 @@ public class CuisineWebSocketServer {
 
 
     private class CuisineWebSocketConnectionHandler implements WebSocketConnectionCallback {
-        private CuisineWebSocketMessageHandler fWebSocketMessageHandler;
+        private AbstractReceiveListener fWebSocketMessageHandler;
 
-        protected CuisineWebSocketConnectionHandler(CuisineWebSocketMessageHandler iWebSocketMessageHandler) {
+        protected CuisineWebSocketConnectionHandler(AbstractReceiveListener iWebSocketMessageHandler) {
             fWebSocketMessageHandler = iWebSocketMessageHandler;
         }
 

src/main/resources/clientsidecoms.js

@@ -1,13 +1,17 @@
-var socket=new WebSocket("%WSURI%/data");
-let connected=false;
-let view=document.getElementById("tempValue");
+document.addEventListener("DOMContentLoaded", (event) => {
 
-socket.onerror=function(error){connected=false;view.innerHTML="oups :(";};
-socket.onmessage=function(event){view.innerHTML=event.data+"°C"};
-socket.onopen=function(e){connected=true;callServer();};
-var callServer=function(){
-    socket.send("coucou");
-};
+    var socket=new WebSocket("%WSURI%/data");
+    let connected=false;
+    let view=document.getElementById("tempValue");
 
+    socket.onerror=function(error){connected=false;view.innerHTML="oups :(";};
+    socket.onmessage=function(event){view.innerHTML=event.data+"°C"};
+    socket.onopen=function(e){connected=true;callServer();};
+    var callServer=function(){
+        socket.send("coucou");
+    };
 
-let timer=setInterval(callServer,100);
+
+    let timer=setInterval(callServer,100);
+
+});

src/main/resources/components/chat.html

@@ -1,10 +1,9 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>$Title$</title>
-</head>
-<body>
-$END$
-</body>
-</html>
+<div id="chatbox" >
+    <div id="chatboxcontent">
+
+    </div>
+    <div id="chatboxinput">
+        <input type="text" id="chatboxinputtext">
+        <input type="button" id="chatboxinputbutton" value="ok"/>
+    </div>
+</div>

src/main/resources/components/chatscript.js

@@ -0,0 +1,27 @@
+var chatSocket=new WebSocket("%WSURI%/chat");
+    document.addEventListener("DOMContentLoaded", (event) => {
+
+
+    let connected=false;
+    let view=document.getElementById("chatboxcontent");
+
+    let chatInput = document.getElementById("chatboxinputtext");
+
+    let chatInputButton = document.getElementById("chatboxinputbutton");
+    chatInputButton.onclick = function()
+    {
+        input = chatInput.value;
+        console.log(input);
+        chatSocket.send(input);
+    };
+
+    chatSocket.onerror=function(error){connected=false;view.innerHTML="oups :(";};
+    chatSocket.onmessage=function(event){view.innerHTML="<pre>"+event.data+"</pre>";};
+    chatSocket.onopen=function(e){connected=true;callServer();};
+    var callServer=function(){
+        chatSocket.send("R0VU");
+    };
+
+    let timer=setInterval(callServer,1000);
+
+});