petit refactor et paramètres

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

README.md

@@ -1,3 +1,18 @@
 # CyberCuisineWebServer
+Server HTTP + WebSocket + Serveur TCP pour transmettre la température du thermometre dans ma cuisine
 
-Server HTTP + WebSocket + Serveur TCP pour transmettre la température du thermometre dans ma cuisine
+## Running
+**Java 14**
+~~~~
+java -jar [jar] -h hostname 
+~~~~
+
+Parametres :
+~~~
+-h hostname
+-wp port : pour la page web (8080)
+-sp port : pour le websocket (10269)
+-wsp    : afficher le port dans l'uri du websocket dans le code côté client
+-sr prefix : pour le websocket [prefix (ws/wss)]://hostname (wss)
+-tp port : pour le socket tcp (6868)
+~~~

build.gradle

@@ -26,7 +26,7 @@ task fatJar(type: Jar) {
                     'Implementation-Version': version,
                     'Main-Class': 'Application'
     }
-    baseName = project.name + '-all'
+    baseName = project.name
     from {
         configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
 

docker/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     ports:
       - "10200:8080"
       - "10220:6868"
-      - "10269:42069"
+      - "10269:10269"
     volumes:
-      - "./CyberCuisine.jar:/app.jar"
-    command: ['java', '-jar', '/app.jar']
+      - "./CyberCuisine-1.0.jar:/app.jar"
+    command: ["java", "-jar", "/app.jar","-h","demisel.space","-sr","wss","-sp","10269","-wp","8080","-tp","6868"]

src/main/java/Application.java

@@ -5,8 +5,32 @@ public class Application {
         String vHostName = "demisel.space";
         int vWebPagePort = 8080;
         int vWebSocketPort = 10269;
+        boolean vWebSocketUriClDispPort = false;
         int vTcpSocketPort = 6868;
+        String vWebSocketProtocolPrefix = "wss";
         CuisineHTTPServer vServer = new CuisineHTTPServer();
-        vServer.startServer(vHostName,vWebPagePort,vWebSocketPort,vTcpSocketPort);
+
+        int i = 0;
+        for(i = 0 ; i<args.length ; i++)
+        {
+            switch(args[i])
+            {
+                case "-h" -> vHostName = args[++i];
+                case "-sr" -> vWebSocketProtocolPrefix = args[++i];
+                case "-wp" -> vWebPagePort = Integer.parseInt(args[++i]);
+                case "-sp" -> vWebSocketPort = Integer.parseInt(args[++i]);
+                case "-tp" -> vTcpSocketPort = Integer.parseInt(args[++i]);
+                case "-wsp" -> vWebSocketUriClDispPort = true;
+            }
+        }
+        vServer.startServer
+            (
+            vHostName,
+            vWebPagePort,
+            vWebSocketPort,
+            vWebSocketUriClDispPort,
+            vWebSocketProtocolPrefix,
+            vTcpSocketPort
+            );
     }
 }

src/main/java/CuisineHTTPServer.java

@@ -2,18 +2,11 @@ import io.undertow.Undertow;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.Headers;
-import io.undertow.websockets.WebSocketConnectionCallback;
-import io.undertow.websockets.core.AbstractReceiveListener;
-import io.undertow.websockets.core.BufferedTextMessage;
-import io.undertow.websockets.core.WebSocketChannel;
-import io.undertow.websockets.core.WebSockets;
-import io.undertow.websockets.spi.WebSocketHttpExchange;
-
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Paths;
+import tcp.CuisineTCPServer;
+
+import websockets.CuisineWebSocketServer;
+
 import java.util.Scanner;
-import java.util.stream.Stream;
 
 import static io.undertow.Handlers.*;
 
@@ -23,55 +16,57 @@ public class CuisineHTTPServer extends Thread
 
     static int webSocketPort = 42069;
     static String webSocketHost = "192.168.0.24";
+    static String webSocketProcolPrefix = "wss";
+    static boolean writePortInClientSideURI = false;
 
     static int tcpSocketPort = 6868;
     static String HOST = "0.0.0.0" ;
 
-
     private static CuisineTCPServer fCuisineTCPServer;
 
-    public void startServer(String iHostName, int iWebPagePort, int iWebSocketPort, int iTcpSocketPort)
+    public void startServer(String iHostName, int iWebPagePort, int iWebSocketPort, boolean iWebSocketUriClPortDisplay, String iWebSocketProtocolPrefix, int iTcpSocketPort)
     {
         webSocketHost = iHostName;
         webPagePort = iWebPagePort;
         webSocketPort = iWebSocketPort;
         tcpSocketPort = iTcpSocketPort;
+        webSocketProcolPrefix = iWebSocketProtocolPrefix;
+        writePortInClientSideURI = iWebSocketUriClPortDisplay;
         initResources();
 
-        //Create CuisineTCPServers
+        //Create CuisineTCPServer
         fCuisineTCPServer = new CuisineTCPServer(tcpSocketPort);
-        CuisineWebSocketMessageHandler vWebSocketMessageHandler         = new CuisineWebSocketMessageHandler( fCuisineTCPServer );
-        CuisineWebSocketConnectionHandler vWebSocketConnectionHandler   = new CuisineWebSocketConnectionHandler( vWebSocketMessageHandler );
 
         //Start HTTP Server : serve webpage with JS that calls the websocket
         Undertow WebPageServer = Undertow.builder()
                 .addHttpListener(webPagePort, HOST)
                 .setHandler(
-                        new CuisineResponseHandler("ws://"+webSocketHost+":"+webSocketPort+"/data")
+                        new CuisineResponseHandler(iWebSocketProtocolPrefix+"://"+webSocketHost+":"+( writePortInClientSideURI ? webSocketPort : "/data" ))
                             ).build();
         WebPageServer.start();
 
         System.out.println("WebPageServer started");
+
+        CuisineWebSocketServer vWebSocketServer = new CuisineWebSocketServer(webSocketHost,webSocketPort);
+        vWebSocketServer.initTCPServer(fCuisineTCPServer);
         //Start websocket
-        Undertow WebSocketServer = Undertow.builder()
-            .addHttpListener(webSocketPort, HOST)
-            .setHandler(
-                path()
-                    .addPrefixPath("/data",websocket(vWebSocketConnectionHandler))
-            )
-            .build();
-        WebSocketServer.start();
+        vWebSocketServer.start();
         System.out.println("WebSocketServer started");
 
+
+
     }
 
     static String sHtml_ASCII_title;
     static String sHtml_CSS;
+    static String sJS_ClientSide;
     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();
+
         }
         catch(Exception vex)
         {
@@ -100,38 +95,6 @@ public class CuisineHTTPServer extends Thread
         }
     }
 
-    private class CuisineWebSocketConnectionHandler implements WebSocketConnectionCallback
-    {
-        private CuisineWebSocketMessageHandler fWebSocketMessageHandler;
-
-        protected CuisineWebSocketConnectionHandler(CuisineWebSocketMessageHandler iWebSocketMessageHandler)
-        {
-        fWebSocketMessageHandler = iWebSocketMessageHandler;
-        }
-
-        @Override
-        public void onConnect(WebSocketHttpExchange exchange, WebSocketChannel channel) {
-            channel.getReceiveSetter().set(fWebSocketMessageHandler);
-            channel.resumeReceives();
-        }
-    }
-
-    private class CuisineWebSocketMessageHandler extends AbstractReceiveListener {
-
-        private CuisineTCPServer fTCPServer;
-
-        protected CuisineWebSocketMessageHandler( CuisineTCPServer iTCPServer)
-        {
-
-            fTCPServer = iTCPServer;
-        }
-
-        protected void onFullTextMessage(WebSocketChannel iChannel, BufferedTextMessage iTextMessage)
-        {
-            //Handle message on webSocket
-            WebSockets.sendText(String.valueOf(fTCPServer.getCurrentTemperature()), iChannel, null);
-        }
-    }
 
 
     static String getHTMLFrontPage(String iWsUri)
@@ -150,19 +113,7 @@ public class CuisineHTTPServer extends Thread
             .append("   </div>")
             .append("   <h1 id=\"tempValue\">None</h1>")
             .append("   <script>")
-            .append("       var socket=new WebSocket(\""+iWsUri+"\");\n")
-            .append("       let connected=false;")
-            .append("       let view=document.getElementById(\"tempValue\");")
-            .append("       socket.onerror=function(error){connected=false;view.innerHTML=\"oups :(\";};")
-            .append("       socket.onmessage=function(event){view.innerHTML=event.data+\"&deg;C\"};")
-            .append("       socket.onopen=function(e){")
-            .append("           connected=true;")
-            .append("           callServer();")
-            .append("       };")
-            .append("       var callServer=function(){")
-            .append("           socket.send(\"coucou\");")
-            .append("       };")
-            .append("       let timer=setInterval(callServer,100);")
+            .append(sJS_ClientSide.replace("%WSURI%",iWsUri))
             .append("   </script>")
             .append("</body>")
             .append("")

src/main/java/CuisineTCPServer.java → src/main/java/tcp/CuisineTCPServer.java

@@ -1,3 +1,5 @@
+package tcp;
+
 import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;

src/main/java/websockets/CuisineWebSocketServer.java

@@ -0,0 +1,77 @@
+package websockets;
+
+import io.undertow.Undertow;
+import io.undertow.websockets.WebSocketConnectionCallback;
+import io.undertow.websockets.core.AbstractReceiveListener;
+import io.undertow.websockets.core.BufferedTextMessage;
+import io.undertow.websockets.core.WebSocketChannel;
+import io.undertow.websockets.core.WebSockets;
+import io.undertow.websockets.spi.WebSocketHttpExchange;
+import tcp.CuisineTCPServer;
+
+import static io.undertow.Handlers.path;
+import static io.undertow.Handlers.websocket;
+import static io.undertow.Handlers.*;
+
+public class CuisineWebSocketServer {
+
+    CuisineWebSocketConnectionHandler fConnectionHandler;
+    CuisineWebSocketMessageHandler fMessageHandler;
+    Undertow fWebSocketServer;
+    String fWebSocketHost;
+    int fWebSocketPort;
+
+    public CuisineWebSocketServer(String iHost, int iPort
+    ) {
+        fWebSocketPort = iPort;
+        fWebSocketHost = iHost;
+    }
+
+    public void initTCPServer(CuisineTCPServer iTcpServer) {
+        fMessageHandler = new CuisineWebSocketMessageHandler(iTcpServer);
+    }
+
+    public void start() {
+        fConnectionHandler = new CuisineWebSocketConnectionHandler(fMessageHandler);
+        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))
+                )
+                .build();
+        fWebSocketServer.start();
+    }
+
+
+    private class CuisineWebSocketConnectionHandler implements WebSocketConnectionCallback {
+        private CuisineWebSocketMessageHandler fWebSocketMessageHandler;
+
+        protected CuisineWebSocketConnectionHandler(CuisineWebSocketMessageHandler iWebSocketMessageHandler) {
+            fWebSocketMessageHandler = iWebSocketMessageHandler;
+        }
+
+        @Override
+        public void onConnect(WebSocketHttpExchange exchange, WebSocketChannel channel) {
+            channel.getReceiveSetter().set(fWebSocketMessageHandler);
+            channel.resumeReceives();
+        }
+    }
+
+    private class CuisineWebSocketMessageHandler extends AbstractReceiveListener {
+
+        private CuisineTCPServer fTCPServer;
+
+        protected CuisineWebSocketMessageHandler(CuisineTCPServer iTCPServer) {
+            super();
+            fTCPServer = iTCPServer;
+        }
+
+        protected void onFullTextMessage(WebSocketChannel iChannel, BufferedTextMessage iTextMessage) {
+            //Handle message on webSocket
+            WebSockets.sendText(String.valueOf(fTCPServer.getCurrentTemperature()), iChannel, null);
+        }
+    }
+
+}

src/main/resources/clientsidecoms.js

@@ -0,0 +1,13 @@
+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);