Merge branch 'feature/wan-impl' into main

Author: Sandro642

src/main/java/fr/sandro642/github/ConnectLib.java

@@ -1,16 +1,24 @@
 package fr.sandro642.github;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 import fr.sandro642.github.enums.LangType;
 import fr.sandro642.github.enums.lang.CategoriesType;
 import fr.sandro642.github.hook.HookManager;
 import fr.sandro642.github.hook.LangSupport;
 import fr.sandro642.github.hook.MCSupport;
+import fr.sandro642.github.log.Logger;
+import fr.sandro642.github.log.Logs;
 import fr.sandro642.github.misc.*;
 import fr.sandro642.github.jobs.JobGetInfos;
 import fr.sandro642.github.enums.ResourceType;
 import fr.sandro642.github.spring.Application;
 import fr.sandro642.github.update.RetrieveLastVersion;
 
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.util.*;
 
 /**
@@ -147,6 +155,51 @@ public void webServices(int port, String nameDashboard) {
         SpringApp().startApplication().subscribe();
     }
 
+    /**
+     * Implement WAN connection to retrieve the port from the server.
+     * @param urlServ the server URL
+     */
+    public void wanImplement(String urlServ) {
+        try {
+            String codeWan = "";
+
+            HttpClient client1 = HttpClient.newHttpClient();
+            HttpRequest request1 = HttpRequest.newBuilder()
+                    .uri(URI.create(urlServ)) // remplacer par l'URL qui
+                    .build();
+
+            HttpResponse<String> response1 = client1.send(request1, HttpResponse.BodyHandlers.ofString());
+
+            Gson gson1 = new Gson();
+            JsonObject root1 = gson1.fromJson(response1.body(), JsonObject.class);
+
+            if (root1 != null) {
+                codeWan = root1.get("code").getAsString();
+            }
+
+            HttpClient client = HttpClient.newHttpClient();
+            HttpRequest request = HttpRequest.newBuilder()
+                    .uri(URI.create(urlServ + "/connect/" + codeWan)) // remplacer par l'URL qui renvoie le JSON
+                    .build();
+
+            HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+
+            Gson gson = new Gson();
+            JsonObject root = gson.fromJson(response.body(), JsonObject.class);
+
+            if (root != null && root.has("user")) {
+                JsonObject user = root.getAsJsonObject("user");
+                if (user != null && user.has("port") && !user.get("port").isJsonNull()) {
+                    StoreAndRetrieve().put(StoreAndRetrieve().DYNAMIC_PORT, user.get("port").getAsString());
+                }
+            }
+
+            SpringApp().startApplication().subscribe();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     /**
      * Check if the ConnectLib is initialized.
      * @return true if initialized, false otherwise

src/main/java/fr/sandro642/github/hook/HookManager.java

@@ -3,7 +3,6 @@
 import fr.sandro642.github.ConnectLib;
 import fr.sandro642.github.enums.ResourceType;
 import fr.sandro642.github.enums.lang.CategoriesType;
-import fr.sandro642.github.misc.Logger;
 
 /**
  * HookManager is a class that manages hooks for different resource types.

…ava/fr/sandro642/github/misc/Logger.java …java/fr/sandro642/github/log/Logger.javasrc/main/java/fr/sandro642/github/misc/Logger.java renamed to src/main/java/fr/sandro642/github/log/Logger.java src/main/java/fr/sandro642/github/misc/Logger.java renamed to src/main/java/fr/sandro642/github/log/Logger.java

@@ -1,4 +1,4 @@
-package fr.sandro642.github.misc;
+package fr.sandro642.github.log;
 
 /**
  * Logger is a utility class for logging messages in the ConnectLib library.

…/java/fr/sandro642/github/misc/Logs.java …n/java/fr/sandro642/github/log/Logs.javasrc/main/java/fr/sandro642/github/misc/Logs.java renamed to src/main/java/fr/sandro642/github/log/Logs.java src/main/java/fr/sandro642/github/misc/Logs.java renamed to src/main/java/fr/sandro642/github/log/Logs.java

@@ -1,4 +1,4 @@
-package fr.sandro642.github.misc;
+package fr.sandro642.github.log;
 
 import java.io.File;
 import java.io.FileWriter;

src/main/java/fr/sandro642/github/misc/EnumLoader.java

@@ -10,7 +10,6 @@
  * This class provides a method to convert an enum class into a map where the keys are the enum constants and the values are their corresponding routes.
  * @author Sandro642
  * @version 1.0
- * @since 1.0
  */
 
 public class EnumLoader {

src/main/java/fr/sandro642/github/misc/StoreAndRetrieve.java

@@ -23,6 +23,7 @@ public class StoreAndRetrieve {
 
     public final String NAME_DASHBOARD = "nameDashboard";
     public final String PORT = String.valueOf(3000);
+    public final String DYNAMIC_PORT = "dynamicPort";
     public final HashMap<String, Object> store = new HashMap<>();
 
     /**

src/main/java/fr/sandro642/github/spring/Application.java

@@ -4,6 +4,7 @@
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.web.reactive.config.WebFluxConfigurer;
 import reactor.core.publisher.ConnectableFlux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
@@ -16,13 +17,40 @@
  */
 
 @SpringBootApplication
-public class Application {
+public class Application implements WebFluxConfigurer {
 
     // Singleton instance
     private static Application instance;
 
+    /**
+     * ConnectLib instance for managing connections.
+     */
     private static final ConnectLib connectLib = new ConnectLib();
 
+    /**
+     * Determines the port to use for the server, checking for a dynamic port first.
+     * @return the port number as a string
+     */
+    private String Dyn_Port() {
+        if (connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT) != null) {
+            return connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT).toString();
+        } else {
+            return connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().PORT).toString();
+        }
+    }
+
+    /**
+     * Checks if the application is using a static port.
+     * @return true if using a static port, false if using a dynamic port
+     */
+    private boolean isStatic() {
+        if (connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT) != null) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
     /**
      * Starts the Spring Boot application in a non-blocking manner.
      * @return a Mono that completes when the application has started
@@ -33,10 +61,12 @@ public Mono<Void> startApplication() {
             app.setBannerMode(Banner.Mode.OFF);               // supprime le banner Spring
             app.setLogStartupInfo(false);                     // désactive l'info de démarrage
             Map<String, Object> props = new HashMap<>();
-            props.put("server.port", connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().PORT)); // définit le port du serveur
-            props.put("logging.level.root", "OFF");           // coupe l'affichage des logs
+            props.put("server.port", Dyn_Port()); // définit le port du serveur
+            props.put("logging.level.root", "OFF");
             app.setDefaultProperties(props);
             app.run();
+
+            System.out.println(Dyn_Port());
         }).subscribeOn(Schedulers.boundedElastic()).then();
     }
 

src/main/java/fr/sandro642/github/spring/controller/DataController.java

@@ -2,7 +2,6 @@
 
 import fr.sandro642.github.ConnectLib;
 import fr.sandro642.github.spring.dto.Request;
-import fr.sandro642.github.spring.dto.RouteInfo;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
@@ -58,34 +57,47 @@ public static DataController getInstance() {
     @GetMapping("/status")
     public Map<String, Object> getStatus() {
         Map<String, Object> status = new HashMap<>();
+        status.put("portInfo", connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT));
         status.put("isInitialized", connectLib.isInitialized());
         status.put("resourceType", connectLib.HookManager().getResourceType());
         return status;
     }
 
-    /**
-     * Endpoint to get the available routes from ConnectLib.
-     * @return a list of RouteInfo objects representing the routes
-     */
     @GetMapping("/routes")
-    public List<RouteInfo> getRoutes() {
+    public Map<String, Object> getRoutes() {
         Map<String, String> map = connectLib.getRoutesMap();
-        List<RouteInfo> result = new ArrayList<>();
+        Map<String, Object> result = new HashMap<>();
+
+        // portInfo
+        result.put("portInfo", connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT).toString());
+
+        List<Map<String, String>> routes = new ArrayList<>();
         if (map != null) {
             for (Map.Entry<String, String> e : map.entrySet()) {
-                result.add(new RouteInfo(e.getKey(), e.getValue()));
+                Map<String, String> route = new HashMap<>();
+                route.put("name", e.getKey());
+                route.put("url", e.getValue());
+                routes.add(route);
             }
         }
+        result.put("routes", routes);
         return result;
     }
 
+
     /**
      * Endpoint to get all requests.
      * @return a list of Request objects
      */
     @GetMapping("/requests")
-    public List<Request> getRequests() {
-        List<Request> result = new ArrayList<>(requestsMap.values());
+    public Map<String, Object> getRequests() {
+        Map<String, Object> result = new HashMap<>();
+
+        result.put("portInfo", connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT).toString());
+
+        List<Request> requests = new ArrayList<>(requestsMap.values());
+        result.put("requests", requests);
+
         return result;
     }
 
@@ -108,7 +120,7 @@ public Request createRequest(String route, String branch) {
         }
         long id = requestIdCounter.incrementAndGet();
 
-        Request req = new Request(id, route, branch, "pending");
+        Request req = new Request(connectLib.StoreAndRetrieve().get(connectLib.StoreAndRetrieve().DYNAMIC_PORT).toString(), id, route, branch, "pending");
         requestsMap.put(id, req);
         return req;
     }

src/main/java/fr/sandro642/github/spring/dto/Request.java

@@ -9,6 +9,11 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Request {
 
+    /**
+     * Port information of the request.
+     */
+    private String infoPort;
+
     /**
      * Unique identifier for the request
      */
@@ -36,12 +41,14 @@ public Request() {}
 
     /**
      * Parameterized constructor
+     * @param infoPort Port information of the request
      * @param id Unique identifier for the request
      * @param route Route associated with the request
      * @param branch Branch associated with the request
      * @param status Status of the request
      */
-    public Request(Long id, String route, String branch, String status) {
+    public Request(String infoPort, Long id, String route, String branch, String status) {
+        this.infoPort = infoPort;
         this.id = id;
         this.route = route;
         this.branch = branch;