From 6f75401e7c1eca03fb25efbf3bcfe762ec8e1d91 Mon Sep 17 00:00:00 2001
From: NF-coder <resetnikovs72@gmail.com>
Date: Sun, 21 Sep 2025 04:51:13 +0300
Subject: [PATCH 1/3] java-fcgi: the server now analyzes request types and
 endpoints paths

Also there have been multiple improvements to the purchase structure.
And now request handling and it's receiving are separated!
---
 .../{Main.xml => Application.xml}             |  4 +-
 server/dependency-reduced-pom.xml             |  2 +-
 server/pom.xml                                |  2 +-
 .../src/main/java/org/web1/Application.java   | 25 +++++++
 server/src/main/java/org/web1/Main.java       | 71 -------------------
 .../QueryStringParser.java}                   |  4 +-
 .../java/org/web1/http/RequestContext.java    | 10 +++
 .../handler/tester}/RequestDTO.java           |  2 +-
 .../org/web1/http/handler/tester/Tester.java  | 53 ++++++++++++++
 .../handler/tester}/checkers/Checker.java     |  6 +-
 .../tester}/checkers/CheckerFunction.java     |  2 +-
 .../tester}/checkers/utils/PlotQuarters.java  |  2 +-
 .../tester}/checkers/utils/PlotUtils.java     |  2 +-
 .../response/HttpResponseWriter.java}         | 11 ++-
 .../response}/ResponseStatus.java             |  2 +-
 .../org/web1/http/routing/EndpointKey.java    |  6 ++
 .../org/web1/http/routing/RestController.java | 48 +++++++++++++
 .../utils/{mappers => json}/JsonBuilder.java  |  2 +-
 .../utils/{ => logging}/SimpleLogger.java     |  8 ++-
 .../utils/logging/SimpleLoggerFormatter.java  | 22 ++++++
 .../{timer/Timer.java => time/Stopwatch.java} |  4 +-
 21 files changed, 190 insertions(+), 98 deletions(-)
 rename server/.idea/runConfigurations/{Main.xml => Application.xml} (72%)
 create mode 100644 server/src/main/java/org/web1/Application.java
 delete mode 100644 server/src/main/java/org/web1/Main.java
 rename server/src/main/java/org/web1/{utils/mappers/QueryStringToHashmap.java => http/QueryStringParser.java} (82%)
 create mode 100644 server/src/main/java/org/web1/http/RequestContext.java
 rename server/src/main/java/org/web1/{DTOs => http/handler/tester}/RequestDTO.java (85%)
 create mode 100644 server/src/main/java/org/web1/http/handler/tester/Tester.java
 rename server/src/main/java/org/web1/{ => http/handler/tester}/checkers/Checker.java (85%)
 rename server/src/main/java/org/web1/{ => http/handler/tester}/checkers/CheckerFunction.java (73%)
 rename server/src/main/java/org/web1/{ => http/handler/tester}/checkers/utils/PlotQuarters.java (67%)
 rename server/src/main/java/org/web1/{ => http/handler/tester}/checkers/utils/PlotUtils.java (91%)
 rename server/src/main/java/org/web1/{utils/responce/ResponseController.java => http/response/HttpResponseWriter.java} (82%)
 rename server/src/main/java/org/web1/{utils/responce => http/response}/ResponseStatus.java (62%)
 create mode 100644 server/src/main/java/org/web1/http/routing/EndpointKey.java
 create mode 100644 server/src/main/java/org/web1/http/routing/RestController.java
 rename server/src/main/java/org/web1/utils/{mappers => json}/JsonBuilder.java (94%)
 rename server/src/main/java/org/web1/utils/{ => logging}/SimpleLogger.java (62%)
 create mode 100644 server/src/main/java/org/web1/utils/logging/SimpleLoggerFormatter.java
 rename server/src/main/java/org/web1/utils/{timer/Timer.java => time/Stopwatch.java} (77%)

diff --git a/server/.idea/runConfigurations/Main.xml b/server/.idea/runConfigurations/Application.xml
similarity index 72%
rename from server/.idea/runConfigurations/Main.xml
rename to server/.idea/runConfigurations/Application.xml
index 2e1a7a7..b9e984c 100644
--- a/server/.idea/runConfigurations/Main.xml
+++ b/server/.idea/runConfigurations/Application.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Main" type="Application" factoryName="Application" nameIsGenerated="true">
+  <configuration default="false" name="Application" type="Application" factoryName="Application" nameIsGenerated="true">
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="MAIN_CLASS_NAME" value="org.web1.Main" />
+    <option name="MAIN_CLASS_NAME" value="org.web1.Application" />
     <module name="server" />
     <extension name="coverage">
       <pattern>
diff --git a/server/dependency-reduced-pom.xml b/server/dependency-reduced-pom.xml
index 9443a5f..f6bfa29 100644
--- a/server/dependency-reduced-pom.xml
+++ b/server/dependency-reduced-pom.xml
@@ -12,7 +12,7 @@
         <configuration>
           <archive>
             <manifest>
-              <mainClass>org.web1.Main</mainClass>
+              <mainClass>org.web1.Application</mainClass>
             </manifest>
             <manifestEntries>
               <Multi-Release>true</Multi-Release>
diff --git a/server/pom.xml b/server/pom.xml
index 1962106..878b144 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -32,7 +32,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>org.web1.Main</mainClass>
+                            <mainClass>org.web1.Application</mainClass>
                         </manifest>
                         <manifestEntries>
                             <Multi-Release>true</Multi-Release>
diff --git a/server/src/main/java/org/web1/Application.java b/server/src/main/java/org/web1/Application.java
new file mode 100644
index 0000000..a721f58
--- /dev/null
+++ b/server/src/main/java/org/web1/Application.java
@@ -0,0 +1,25 @@
+package org.web1;
+
+import java.util.HashMap;
+import java.util.function.Consumer;
+
+import org.web1.http.RequestContext;
+import org.web1.http.routing.EndpointKey;
+import org.web1.http.routing.RestController;
+import org.web1.http.handler.tester.Tester;
+
+
+public class Application {
+    public static void main(String[] args) {
+        final HashMap<EndpointKey, Consumer<RequestContext>> endpoints = new HashMap<>();
+
+        endpoints.put(
+                new EndpointKey("GET", "/fcgi/"),
+                new Tester()
+        );
+
+        new RestController(
+                endpoints
+        ).start();
+    }
+}
\ No newline at end of file
diff --git a/server/src/main/java/org/web1/Main.java b/server/src/main/java/org/web1/Main.java
deleted file mode 100644
index 2397c72..0000000
--- a/server/src/main/java/org/web1/Main.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.web1;
-
-import com.fastcgi.FCGIInterface;
-
-import java.util.HashMap;
-import java.util.function.Function;
-import java.util.logging.Logger;
-
-import org.validator.ValidatedRecordFactory;
-import org.validator.validation.exceptions.ValidationException;
-import org.web1.DTOs.RequestDTO;
-import org.web1.checkers.Checker;
-import org.web1.checkers.CheckerFunction;
-import org.web1.utils.SimpleLogger;
-import org.web1.utils.mappers.JsonBuilder;
-import org.web1.utils.mappers.QueryStringToHashmap;
-import org.web1.utils.responce.ResponseController;
-import org.web1.utils.responce.ResponseStatus;
-import org.web1.utils.timer.Timer;
-
-public class Main {
-    private static final Function<String, HashMap<String,String>> parseQuery = new QueryStringToHashmap();
-    private static final CheckerFunction checker = new Checker();
-
-    public static void main(String[] args) {
-        FCGIInterface fastCGI = new FCGIInterface();
-        Timer timer = new Timer();
-        Logger logger = SimpleLogger.create();
-        ResponseController responseController = new ResponseController(logger);
-
-        while (fastCGI.FCGIaccept() >= 0) {
-            timer.start();
-
-            final HashMap<String, String> queryParams = parseQuery.apply(
-                    FCGIInterface.request.params.getProperty("QUERY_STRING")
-            );
-            logger.info("Received request with query: " + queryParams);
-
-            try {
-                RequestDTO requestData = ValidatedRecordFactory.create(
-                        RequestDTO.class,
-                        queryParams.get("x"),
-                        queryParams.get("r"),
-                        queryParams.get("y")
-                );
-
-                boolean checkResult = checker.test(
-                        Integer.parseInt(requestData.X()),
-                        Float.parseFloat(requestData.Y()),
-                        Float.parseFloat(requestData.R())
-                );
-
-
-                responseController.send(
-                        new JsonBuilder()
-                                .add("result", checkResult)
-                                .add("elapsedTimeNs", timer.stop()),
-                        ResponseStatus.OK
-                );
-            } catch (ValidationException e) {
-                responseController.send(
-                        new JsonBuilder()
-                                .add("error", '"'+e.getMessage()+'"'),
-                        ResponseStatus.BAD_REQUEST
-                );
-            } catch (Exception e) {
-                logger.severe("Failed to process request: " + e.getMessage());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/server/src/main/java/org/web1/utils/mappers/QueryStringToHashmap.java b/server/src/main/java/org/web1/http/QueryStringParser.java
similarity index 82%
rename from server/src/main/java/org/web1/utils/mappers/QueryStringToHashmap.java
rename to server/src/main/java/org/web1/http/QueryStringParser.java
index 5bc2ada..45f31a9 100644
--- a/server/src/main/java/org/web1/utils/mappers/QueryStringToHashmap.java
+++ b/server/src/main/java/org/web1/http/QueryStringParser.java
@@ -1,9 +1,9 @@
-package org.web1.utils.mappers;
+package org.web1.http;
 
 import java.util.HashMap;
 import java.util.function.Function;
 
-public class QueryStringToHashmap implements Function<String, HashMap<String,String>> {
+public class QueryStringParser implements Function<String, HashMap<String,String>> {
     public HashMap<String, String> apply(final String jsonStr) {
         HashMap<String, String> params = new HashMap<>();
 
diff --git a/server/src/main/java/org/web1/http/RequestContext.java b/server/src/main/java/org/web1/http/RequestContext.java
new file mode 100644
index 0000000..948d029
--- /dev/null
+++ b/server/src/main/java/org/web1/http/RequestContext.java
@@ -0,0 +1,10 @@
+package org.web1.http;
+
+import org.web1.http.response.HttpResponseWriter;
+
+import java.util.HashMap;
+
+public record RequestContext(
+       HashMap<String, String> queryParams,
+       HttpResponseWriter responseController
+) {}
diff --git a/server/src/main/java/org/web1/DTOs/RequestDTO.java b/server/src/main/java/org/web1/http/handler/tester/RequestDTO.java
similarity index 85%
rename from server/src/main/java/org/web1/DTOs/RequestDTO.java
rename to server/src/main/java/org/web1/http/handler/tester/RequestDTO.java
index d811ccd..30100c5 100644
--- a/server/src/main/java/org/web1/DTOs/RequestDTO.java
+++ b/server/src/main/java/org/web1/http/handler/tester/RequestDTO.java
@@ -1,4 +1,4 @@
-package org.web1.DTOs;
+package org.web1.http.handler.tester;
 
 import org.validator.annotations.Number;
 
diff --git a/server/src/main/java/org/web1/http/handler/tester/Tester.java b/server/src/main/java/org/web1/http/handler/tester/Tester.java
new file mode 100644
index 0000000..75aa148
--- /dev/null
+++ b/server/src/main/java/org/web1/http/handler/tester/Tester.java
@@ -0,0 +1,53 @@
+package org.web1.http.handler.tester;
+
+import org.validator.ValidatedRecordFactory;
+import org.validator.validation.exceptions.ValidationException;
+import org.web1.http.RequestContext;
+import org.web1.http.handler.tester.checkers.Checker;
+import org.web1.http.handler.tester.checkers.CheckerFunction;
+import org.web1.utils.json.JsonBuilder;
+import org.web1.http.response.ResponseStatus;
+import org.web1.utils.time.Stopwatch;
+
+import java.util.function.Consumer;
+
+public class Tester implements Consumer<RequestContext> {
+    private static final Stopwatch timer = new Stopwatch();
+    private static final CheckerFunction checker = new Checker();
+
+    @Override
+    public void accept(
+            final RequestContext endpointData
+    ) {
+        timer.start();
+
+        try {
+            RequestDTO requestData = ValidatedRecordFactory.create(
+                    RequestDTO.class,
+                    endpointData.queryParams().get("x"),
+                    endpointData.queryParams().get("r"),
+                    endpointData.queryParams().get("y")
+            );
+
+            boolean checkResult = checker.test(
+                    Integer.parseInt(requestData.X()),
+                    Float.parseFloat(requestData.Y()),
+                    Float.parseFloat(requestData.R())
+            );
+
+            endpointData.responseController().send(
+                    new JsonBuilder()
+                            .add("result", checkResult)
+                            .add("elapsedTimeNs", timer.stop()),
+                    ResponseStatus.OK
+            );
+        } catch (ValidationException e) {
+            endpointData.responseController().send(
+                    new JsonBuilder()
+                            .add("error", '"' + e.getMessage() + '"'),
+                    ResponseStatus.BAD_REQUEST
+            );
+        }
+
+    }
+}
diff --git a/server/src/main/java/org/web1/checkers/Checker.java b/server/src/main/java/org/web1/http/handler/tester/checkers/Checker.java
similarity index 85%
rename from server/src/main/java/org/web1/checkers/Checker.java
rename to server/src/main/java/org/web1/http/handler/tester/checkers/Checker.java
index e6a1745..02c116c 100644
--- a/server/src/main/java/org/web1/checkers/Checker.java
+++ b/server/src/main/java/org/web1/http/handler/tester/checkers/Checker.java
@@ -1,6 +1,6 @@
-package org.web1.checkers;
-import org.web1.checkers.utils.PlotQuarters;
-import org.web1.checkers.utils.PlotUtils;
+package org.web1.http.handler.tester.checkers;
+import org.web1.http.handler.tester.checkers.utils.PlotQuarters;
+import org.web1.http.handler.tester.checkers.utils.PlotUtils;
 
 public class Checker implements CheckerFunction{
     public boolean test(final int x, final float y, final float r) {
diff --git a/server/src/main/java/org/web1/checkers/CheckerFunction.java b/server/src/main/java/org/web1/http/handler/tester/checkers/CheckerFunction.java
similarity index 73%
rename from server/src/main/java/org/web1/checkers/CheckerFunction.java
rename to server/src/main/java/org/web1/http/handler/tester/checkers/CheckerFunction.java
index 6948e52..ede7b89 100644
--- a/server/src/main/java/org/web1/checkers/CheckerFunction.java
+++ b/server/src/main/java/org/web1/http/handler/tester/checkers/CheckerFunction.java
@@ -1,4 +1,4 @@
-package org.web1.checkers;
+package org.web1.http.handler.tester.checkers;
 
 import java.util.HashMap;
 
diff --git a/server/src/main/java/org/web1/checkers/utils/PlotQuarters.java b/server/src/main/java/org/web1/http/handler/tester/checkers/utils/PlotQuarters.java
similarity index 67%
rename from server/src/main/java/org/web1/checkers/utils/PlotQuarters.java
rename to server/src/main/java/org/web1/http/handler/tester/checkers/utils/PlotQuarters.java
index ec90417..a04c2a7 100644
--- a/server/src/main/java/org/web1/checkers/utils/PlotQuarters.java
+++ b/server/src/main/java/org/web1/http/handler/tester/checkers/utils/PlotQuarters.java
@@ -1,4 +1,4 @@
-package org.web1.checkers.utils;
+package org.web1.http.handler.tester.checkers.utils;
 
 public enum PlotQuarters {
     FIRST_QUADRANT,
diff --git a/server/src/main/java/org/web1/checkers/utils/PlotUtils.java b/server/src/main/java/org/web1/http/handler/tester/checkers/utils/PlotUtils.java
similarity index 91%
rename from server/src/main/java/org/web1/checkers/utils/PlotUtils.java
rename to server/src/main/java/org/web1/http/handler/tester/checkers/utils/PlotUtils.java
index c0134be..2972510 100644
--- a/server/src/main/java/org/web1/checkers/utils/PlotUtils.java
+++ b/server/src/main/java/org/web1/http/handler/tester/checkers/utils/PlotUtils.java
@@ -1,4 +1,4 @@
-package org.web1.checkers.utils;
+package org.web1.http.handler.tester.checkers.utils;
 
 public class PlotUtils {
     public static PlotQuarters getQuarter(final int x, final float y) {
diff --git a/server/src/main/java/org/web1/utils/responce/ResponseController.java b/server/src/main/java/org/web1/http/response/HttpResponseWriter.java
similarity index 82%
rename from server/src/main/java/org/web1/utils/responce/ResponseController.java
rename to server/src/main/java/org/web1/http/response/HttpResponseWriter.java
index 005e7cb..81414cd 100644
--- a/server/src/main/java/org/web1/utils/responce/ResponseController.java
+++ b/server/src/main/java/org/web1/http/response/HttpResponseWriter.java
@@ -1,15 +1,12 @@
-package org.web1.utils.responce;
+package org.web1.http.response;
 
-import org.web1.utils.mappers.JsonBuilder;
+import org.web1.utils.json.JsonBuilder;
 
-import java.io.FileWriter;
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class ResponseController {
+public class HttpResponseWriter {
     private static final String BASE_RESPONSE = """
             Status: %s\r
             Access-Control-Allow-Origin: *\r
@@ -27,7 +24,7 @@ public class ResponseController {
         responseStatus.put(ResponseStatus.OK, "200");
     }
 
-    public ResponseController(Logger logger) {
+    public HttpResponseWriter(Logger logger) {
         this.logger = logger;
     }
 
diff --git a/server/src/main/java/org/web1/utils/responce/ResponseStatus.java b/server/src/main/java/org/web1/http/response/ResponseStatus.java
similarity index 62%
rename from server/src/main/java/org/web1/utils/responce/ResponseStatus.java
rename to server/src/main/java/org/web1/http/response/ResponseStatus.java
index 99752bf..3e2cfdc 100644
--- a/server/src/main/java/org/web1/utils/responce/ResponseStatus.java
+++ b/server/src/main/java/org/web1/http/response/ResponseStatus.java
@@ -1,4 +1,4 @@
-package org.web1.utils.responce;
+package org.web1.http.response;
 
 public enum ResponseStatus {
     BAD_REQUEST,
diff --git a/server/src/main/java/org/web1/http/routing/EndpointKey.java b/server/src/main/java/org/web1/http/routing/EndpointKey.java
new file mode 100644
index 0000000..0954049
--- /dev/null
+++ b/server/src/main/java/org/web1/http/routing/EndpointKey.java
@@ -0,0 +1,6 @@
+package org.web1.http.routing;
+
+public record EndpointKey(
+        String method,
+        String path
+) { }
diff --git a/server/src/main/java/org/web1/http/routing/RestController.java b/server/src/main/java/org/web1/http/routing/RestController.java
new file mode 100644
index 0000000..66631a9
--- /dev/null
+++ b/server/src/main/java/org/web1/http/routing/RestController.java
@@ -0,0 +1,48 @@
+package org.web1.http.routing;
+
+import com.fastcgi.FCGIInterface;
+import org.web1.http.RequestContext;
+import org.web1.utils.logging.SimpleLogger;
+import org.web1.http.QueryStringParser;
+import org.web1.http.response.HttpResponseWriter;
+
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.logging.Logger;
+
+public class RestController {
+    private static final Function<String, HashMap<String,String>> parseQuery = new QueryStringParser();
+    private static final FCGIInterface fastCGI = new FCGIInterface();
+    private static final Logger logger = SimpleLogger.create();
+    private final HashMap<EndpointKey, Consumer<RequestContext>> endpoints;
+
+    public RestController(HashMap<EndpointKey, Consumer<RequestContext>> endpoints) {
+        this.endpoints = endpoints;
+    }
+
+    public void start() {
+        HttpResponseWriter responseController = new HttpResponseWriter(logger);
+
+        while (fastCGI.FCGIaccept() >= 0) {
+            final Properties requestParams = FCGIInterface.request.params;
+
+            final EndpointKey requestInfo = new EndpointKey(
+                    requestParams.getProperty("REQUEST_METHOD"),
+                    requestParams.getProperty("DOCUMENT_URI")
+            );
+            final HashMap<String, String> requestData = parseQuery.apply(
+                            requestParams.getProperty("QUERY_STRING")
+            );
+
+            logger.info(requestInfo.method() + " " + requestInfo.path() + " " + requestData);
+
+            Consumer<RequestContext> requestHandler = endpoints.get(requestInfo);
+
+            if (requestHandler != null) requestHandler.accept(
+                    new RequestContext(requestData, responseController)
+            );
+        }
+    }
+}
diff --git a/server/src/main/java/org/web1/utils/mappers/JsonBuilder.java b/server/src/main/java/org/web1/utils/json/JsonBuilder.java
similarity index 94%
rename from server/src/main/java/org/web1/utils/mappers/JsonBuilder.java
rename to server/src/main/java/org/web1/utils/json/JsonBuilder.java
index 44c8141..94c0976 100644
--- a/server/src/main/java/org/web1/utils/mappers/JsonBuilder.java
+++ b/server/src/main/java/org/web1/utils/json/JsonBuilder.java
@@ -1,4 +1,4 @@
-package org.web1.utils.mappers;
+package org.web1.utils.json;
 
 import java.util.HashMap;
 
diff --git a/server/src/main/java/org/web1/utils/SimpleLogger.java b/server/src/main/java/org/web1/utils/logging/SimpleLogger.java
similarity index 62%
rename from server/src/main/java/org/web1/utils/SimpleLogger.java
rename to server/src/main/java/org/web1/utils/logging/SimpleLogger.java
index a7dcd05..7d27fe0 100644
--- a/server/src/main/java/org/web1/utils/SimpleLogger.java
+++ b/server/src/main/java/org/web1/utils/logging/SimpleLogger.java
@@ -1,15 +1,17 @@
-package org.web1.utils;
+package org.web1.utils.logging;
 
 import java.io.IOException;
 import java.util.logging.*;
 
 public class SimpleLogger {
-    static Logger logger = Logger.getLogger(Logger.class.getName());
+    private static final Logger logger = Logger.getLogger(SimpleLogger.class.getName());
+    private static final Formatter SimpleLoggerFormatter = new SimpleLoggerFormatter();
 
     public static Logger create(){
         try {
             Handler fileHandler = new FileHandler("log.log");
-            fileHandler.setFormatter(fileHandler.getFormatter());
+
+            fileHandler.setFormatter(SimpleLoggerFormatter);
             logger.addHandler(fileHandler);
             logger.setLevel(Level.INFO);
 
diff --git a/server/src/main/java/org/web1/utils/logging/SimpleLoggerFormatter.java b/server/src/main/java/org/web1/utils/logging/SimpleLoggerFormatter.java
new file mode 100644
index 0000000..0c1b378
--- /dev/null
+++ b/server/src/main/java/org/web1/utils/logging/SimpleLoggerFormatter.java
@@ -0,0 +1,22 @@
+package org.web1.utils.logging;
+
+import java.util.Date;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
+
+public class SimpleLoggerFormatter extends Formatter {
+    private final String logstringFormat = "%s - %s %s \t %s \n";
+
+    @Override
+    public String format(LogRecord record) {
+        return String.format(
+                logstringFormat,
+
+                new Date(record.getMillis()),
+                record.getSourceClassName(),
+                record.getSourceMethodName(),
+                record.getMessage()
+        );
+    }
+
+}
\ No newline at end of file
diff --git a/server/src/main/java/org/web1/utils/timer/Timer.java b/server/src/main/java/org/web1/utils/time/Stopwatch.java
similarity index 77%
rename from server/src/main/java/org/web1/utils/timer/Timer.java
rename to server/src/main/java/org/web1/utils/time/Stopwatch.java
index 5e27275..7fcecee 100644
--- a/server/src/main/java/org/web1/utils/timer/Timer.java
+++ b/server/src/main/java/org/web1/utils/time/Stopwatch.java
@@ -1,6 +1,6 @@
-package org.web1.utils.timer;
+package org.web1.utils.time;
 
-public class Timer {
+public class Stopwatch {
     private long startTime;
     public void start() {
         this.startTime = System.nanoTime();

From 40cca13e7f5d4ba5968c5d067c8127ba3404e1c4 Mon Sep 17 00:00:00 2001
From: NF-coder <resetnikovs72@gmail.com>
Date: Mon, 22 Sep 2025 01:02:29 +0300
Subject: [PATCH 2/3] static: structure of project was improved

History table and plot handling are separated from main file.
AJAX handling improved: now u can send all request types? that have no body.
Alsp AJAX handling now working through promises.

and of course it become more extendable.
---
 httpd/static/index.html         | 229 +++++++++-----------------------
 httpd/static/js/ajax.js         |  22 ---
 httpd/static/js/error.js        |  31 +++++
 httpd/static/js/historyTable.js |  47 +++++++
 httpd/static/js/net/ajax.js     |  34 +++++
 httpd/static/js/plot.js         |  37 ++++++
 6 files changed, 215 insertions(+), 185 deletions(-)
 delete mode 100644 httpd/static/js/ajax.js
 create mode 100644 httpd/static/js/error.js
 create mode 100644 httpd/static/js/historyTable.js
 create mode 100644 httpd/static/js/net/ajax.js
 create mode 100644 httpd/static/js/plot.js

diff --git a/httpd/static/index.html b/httpd/static/index.html
index 6f4ebe2..4858f3a 100644
--- a/httpd/static/index.html
+++ b/httpd/static/index.html
@@ -3,9 +3,14 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Web lab1</title>
-    <script src="./js/ajax.js"></script>
     <link rel="icon" href="assets/img/logo.ico" type="image/x-icon"/>
+    <title>Web lab1</title>
+
+    <script src="./js/net/ajax.js"></script>
+    <script src="./js/plot.js"></script>
+    <script src="./js/historyTable.js"></script>
+    <script src="./js/error.js"></script>
+    
     <style>
         :root {
             /* Цветовая палитра в OKLCH */
@@ -520,26 +525,26 @@ <h2>Вариант: 467233</h2>
                  </g>
                  
                  <style>
-                     .svg-cord-line {
-                         stroke: var(--svg-axis-primary);
-                     }
-                     .svg-cord-arrow {
-                         fill: var(--svg-axis-primary);
-                     }     
-
-                     .svg-caption {
-                         fill: var(--text-secondary);
-                         font-size: 12px;
-                     }     
-
-                     .svg-fill-area {
-                         fill: var(--svg-fill-area);
-                         fill-opacity: 0.7;
-                     }
-
-                     .point-on-graph {
-                         fill: var(--accent-primary);
-                     }
+                    .svg-cord-line {
+                        stroke: var(--svg-axis-primary);
+                    }
+                    .svg-cord-arrow {
+                        fill: var(--svg-axis-primary);
+                    }     
+
+                    .svg-caption {
+                        fill: var(--text-secondary);
+                        font-size: 12px;
+                    }     
+
+                    .svg-fill-area {
+                        fill: var(--svg-fill-area);
+                        fill-opacity: 0.7;
+                    }
+
+                    .point-on-graph {
+                       fill: var(--accent-primary);
+                    }
                  </style>
              </svg>
         </div>
@@ -671,167 +676,65 @@ <h3 class="history-title">История введенных данных</h3>
     </div>
 
     <script>
-        // Хранение истории данных
-        let formHistory = JSON.parse(sessionStorage.getItem('formHistory')) || [];
-
-        const showError = (message) => {
-            // Убираем существующие сообщения
-            const existingErrors = document.querySelectorAll('.error-message');
-            existingErrors.forEach(error => error.remove());
-            
-            // Слздаём элемент
-            const errorDiv = document.createElement('div');
-            errorDiv.className = 'error-message';
-            errorDiv.textContent = message;
-            
-            // Вставка
-            document.body.appendChild(errorDiv);
-            
-            // Убираем по прошествии 5-ти секунд
-            setTimeout(() => {
-                if (errorDiv.parentNode) {
-                    errorDiv.parentNode.removeChild(errorDiv);
-                }
-            }, 5000);
-        };
-
-        const FFCGIResponceHandler = (responce, X, Y, R) => {
-            const JSONResponce = JSON.parse(responce); 
-
-            if (JSONResponce.error) {
-                showError(`Ошибка: ${JSONResponce.error}`);
-                return;
-            }
-
-            // Сохраняем данные в историю
-            const formData = {
-                timestamp: new Date().toISOString(),
-                X: X,
-                Y: Y,
-                R: R,
-                elapsedTimeNs: JSONResponce.elapsedTimeNs,
-                isHitted: JSONResponce.result
-            };
-                
-            formHistory.push(formData);
-            sessionStorage.setItem('formHistory', JSON.stringify(formHistory));
-
-            // Обновляем таблицу
-            refreshHistoryTable();
-
-            // Обновляем график
-            refreshGraph();
-        }
+        const plot = new Plot("graph-svg");
+        const history = new HistoryTable("historyTableBody");
+        const error = new ErrorFactory("error-message")
 
         // Обработчик отправки формы
         document.getElementById('graph-test-form').addEventListener('submit', function (e) {
             e.preventDefault(); // Отключаем дефолтное поведение
             
             // Получаем все значения
-            const X = document.querySelector('input[name="X"]:checked').value;
-            const R = document.querySelector('input[name="R"]:checked').value;
-            const Y = document.getElementById('Y').value;
-
-
- 		    if (!new RegExp("^(-?[1-9]\d*(\.\d+)?)|(^-?0(\.\d*[1-9]))$").test(Y) && Y !== '') {
-        		showError(`Ошибка: число Y не соответствует здравому смыслу`);
-        		return;
-      		}
-
-      		if (X && R && Y) {
-                sendAJAXGETRequest("/fcgi/", {"x": X, "y": Y, "r": R}, (data) => {FFCGIResponceHandler(data, X,Y,R)});
-
-                // Очищаем форму
-                this.reset();
-                
-         	} else {
-               	alert('Пожалуйста, заполните все поля формы')
-            }
+            const X = Number(document.querySelector('input[name="X"]:checked').value);
+            const R = Number(document.querySelector('input[name="R"]:checked').value);
+            const Y = Number(document.getElementById('Y').value);
+
+            sendAJAXRequest("GET", "/fcgi/", {"x": X, "y": Y, "r": R})
+                .then(
+                    result => {testHandler(result, X, Y, R)},
+                    result => {errorHandler(result)}
+                );
+            
+            this.reset();
         });
 
-
-        // Функция для обновления таблицы истории
-        // TODO: переделать говнокод!
-        const refreshHistoryTable = () => {
-            const tableBody = document.getElementById('historyTableBody');
-            const emptyHistory = document.getElementById('emptyHistory');
-            
-            tableBody.innerHTML = '';
-            
-            if (formHistory.length === 0) {
-                emptyHistory.style.display = 'block';
-                return;
-            }
-            
-            emptyHistory.style.display = 'none';
-            
-            // Сортируем историю по дате (новые сверху)
-            const sortedHistory = [...formHistory].reverse();
-            
-            sortedHistory.forEach((elem, index) => {
-                const row = document.createElement('tr');
-
-                row.innerHTML = `
-                    <td>${new Date(elem.timestamp).toLocaleString('ru-RU')}</td>
-                    <td>${elem.elapsedTimeNs} ns</td>
-                    <td>${elem.X}</td>
-                    <td>${elem.Y}</td>
-                    <td>${elem.R}</td>
-                    <td>${elem.isHitted ? 'HIT' : 'MISS'}</td>
-                `;
-                
-                tableBody.appendChild(row);
-            });
+        const errorHandler = (result) => {
+            const JSONResponce = JSON.parse(result.response);
+            error.showError(`Ошибка: ${JSONResponce.error} (${result.status})`)
         }
 
-        // TODO: переделать говнокод!
-        const refreshGraph = () => {
-            const svgns = "http://www.w3.org/2000/svg";
-            const container = document.getElementById('graph-svg');
-
-            formHistory.forEach((elem, index) => {
-                const X = parseFloat(elem.X);
-                const Y = parseFloat(elem.Y);
-                const R = parseFloat(elem.R);
-
-                const cx = 20 + (1 + X/R)*80;
-                const cy = 20 + (1 - Y/R)*80;
-
-                if (!container.querySelector(`circle[cx="${cx}"][cy="${cy}"]`) && 0 <= cx <= 200 && 0 <= cy <= 200) {
-                    const point = document.createElementNS(svgns, 'circle');
-
-                    point.setAttributeNS(null, 'cx', cx);
-                    point.setAttributeNS(null, 'cy', cy);
-                    point.setAttributeNS(null, 'r', 3);
-                    point.setAttributeNS(null, 'class', 'point-on-graph' );
-
-                    container.appendChild(point);
-                }
-            });
-        }
+        const testHandler = (result, X, Y, R) => {
+            const JSONResponce = JSON.parse(result.response);
+                        
+            // Обновляем таблицу
+            history.addHistoryItem(
+                new Date().toISOString(),
+                JSONResponce.elapsedTimeNs,
+                X,
+                Y,
+                R,
+                JSONResponce.result
+            )
 
-        const clearGraph = () => {
-            const container = document.getElementById('graph-svg');
-            container.querySelectorAll('circle').forEach((elem) => {
-                elem.remove();
-            })
+            // Обновляем график
+            plot.addPoint(
+                ...convertInputCordsToSvgCords(X, Y, R),
+                3,
+                "point-on-graph"
+            );  
         }
 
         // Функция для очистки истории
         const clearHistory = () => {
             if (confirm('Вы уверены, что хотите очистить всю историю?')) {
-                formHistory = [];
-                localStorage.setItem('formHistory', JSON.stringify(formHistory));
-
-                refreshHistoryTable();
-
-                clearGraph();
+                history.clear();
+                plot.clear();
             }
         }
+
         // Инициализация при загрузке страницы
         document.addEventListener('DOMContentLoaded', () => {
-            refreshHistoryTable();
-            refreshGraph();
+            // placeholder
         });
     </script>
 </body>
diff --git a/httpd/static/js/ajax.js b/httpd/static/js/ajax.js
deleted file mode 100644
index 9975aa8..0000000
--- a/httpd/static/js/ajax.js
+++ /dev/null
@@ -1,22 +0,0 @@
-const sendAJAXGETRequest = (url, data, callback)  => {
-    // encode url
-    const query = [];
-    for (const key in data) {
-        query.push(String(key) + '=' + String(data[key]));
-    }
-
-    // creating AJAX req object
-    const xhr = new XMLHttpRequest();
-    // enable CORS support
-    xhr.withCredentials = true;
-
-    xhr.open("GET", url+(query.length ? '?' + query.join('&') : ''));
-
-    xhr.onreadystatechange = () => {
-        if (xhr.readyState == 4) { // status of finished request
-            callback(xhr.responseText)
-        }
-    };
-
-    xhr.send(data)
-};
\ No newline at end of file
diff --git a/httpd/static/js/error.js b/httpd/static/js/error.js
new file mode 100644
index 0000000..d7384b2
--- /dev/null
+++ b/httpd/static/js/error.js
@@ -0,0 +1,31 @@
+class ErrorFactory {
+    #errorBlockClassName
+
+    constructor(errorBlockClassName){
+        this.#errorBlockClassName = errorBlockClassName;
+    }
+
+    #clearErrors(){
+        let existingErrors = document.querySelectorAll(this.#errorBlockClassName);
+        existingErrors.forEach(error => error.remove());
+    }
+
+    showError(message, showTimeMs = 5000){
+        this.#clearErrors();
+
+        // Слздаём элемент
+        const errorDiv = document.createElement('div');
+        errorDiv.className = this.#errorBlockClassName;
+        errorDiv.textContent = message;
+
+        // Вставка
+        document.body.appendChild(errorDiv);
+
+        // Убираем по прошествии времени
+        setTimeout(() => {
+            if (errorDiv.parentNode) {
+                errorDiv.parentNode.removeChild(errorDiv);
+            }
+        }, showTimeMs);
+    }
+}
\ No newline at end of file
diff --git a/httpd/static/js/historyTable.js b/httpd/static/js/historyTable.js
new file mode 100644
index 0000000..a43dd29
--- /dev/null
+++ b/httpd/static/js/historyTable.js
@@ -0,0 +1,47 @@
+class HistoryTable {
+	#tableElem;
+	#emptyHistoryElem;
+
+	constructor(tableId, emptyHistoryBlockId) {
+		this.#tableElem = document.getElementById(tableId);
+
+		this.#emptyHistoryElem = new EmptyBlock(emptyHistoryBlockId);
+		this.#emptyHistoryElem.setVisibility(true);
+	}
+
+	addHistoryItem(timestamp, elapsedTime, x, y, r, isHitted) {
+		this.#emptyHistoryElem.setVisibility(false);
+
+		const row = document.createElement('tr');
+
+        row.innerHTML = `
+            <td>${new Date(timestamp).toLocaleString('ru-RU')}</td>
+            <td>${elapsedTime} ns</td>
+            <td>${x}</td>
+            <td>${y}</td>
+            <td>${r}</td>
+            <td>${isHitted ? 'HIT' : 'MISS'}</td>
+        `;
+        
+        this.#tableElem.prepend(row);
+	}
+
+	clear() {
+		this.#tableElem.querySelectorAll('tr').forEach((elem) => {
+            elem.remove();
+        });
+        this.#emptyHistoryElem.setVisibility(true);
+	}
+}
+
+class EmptyBlock {
+	#emptyHistoryElem;
+	
+	constructor(emptyHistoryBlockId) {
+		this.#emptyHistoryElem = document.getElementById(emptyHistoryBlockId);
+	}
+
+	setVisibility(isVisible) {
+		emptyHistory.style.display = isVisible ? 'block' : 'none';
+	}
+}
\ No newline at end of file
diff --git a/httpd/static/js/net/ajax.js b/httpd/static/js/net/ajax.js
new file mode 100644
index 0000000..c326b6b
--- /dev/null
+++ b/httpd/static/js/net/ajax.js
@@ -0,0 +1,34 @@
+const sendAJAXRequest = (method, url, data) => {
+    return new Promise((resolve, reject) => {
+        // encode url
+        const query = [];
+        for (const key in data) {
+            query.push(String(key) + '=' + String(data[key]));
+        }
+
+        // creating AJAX req object
+        const xhr = new XMLHttpRequest();
+        // enable CORS support
+        xhr.withCredentials = true;
+
+        xhr.open(method, url + (query.length ? '?' + query.join('&') : ''));
+
+        xhr.onreadystatechange = () => {
+            if (xhr.readyState === 4) {
+                if (xhr.status >= 200 && xhr.status < 300) {
+                    resolve({
+                        status: xhr.status,
+                        response: xhr.responseText
+                    });
+                } else {
+                    reject({
+                        status: xhr.status,
+                        response: xhr.responseText
+                    });
+                }
+            }
+        };
+
+        xhr.send();
+    });
+};
\ No newline at end of file
diff --git a/httpd/static/js/plot.js b/httpd/static/js/plot.js
new file mode 100644
index 0000000..2206469
--- /dev/null
+++ b/httpd/static/js/plot.js
@@ -0,0 +1,37 @@
+const convertInputCordsToSvgCords = (
+    X, Y, R,
+    paddingX = 20,
+    paddingY = 20,
+    XAxisSize = 160,
+    YAxisSize = 160
+) => {
+    return [paddingX + (1 + X/R)*XAxisSize/2, paddingY + (1 - Y/R)*YAxisSize/2];
+}
+
+
+class Plot {
+    #svgNamespace = "http://www.w3.org/2000/svg";
+    #container;
+
+    constructor(svgId) {
+        this.#container = document.getElementById(svgId);
+    }
+
+    addPoint(cx, cy, radius, styleClass) {
+        const point = document.createElementNS(this.#svgNamespace, 'circle');    
+
+        point.setAttributeNS(null, 'cx', cx);
+        point.setAttributeNS(null, 'cy', cy);
+        point.setAttributeNS(null, 'r', radius);
+        point.setAttributeNS(null, 'class', styleClass); 
+
+        this.#container.appendChild(point);
+    } 
+
+    clear() {
+        this.#container.querySelectorAll('circle').forEach((elem) => {
+            elem.remove();
+        });
+    }
+
+}
\ No newline at end of file

From 40d238c286d52521f0ca417a1d0b0f2ae5fb83e3 Mon Sep 17 00:00:00 2001
From: NF-coder <resetnikovs72@gmail.com>
Date: Mon, 22 Sep 2025 02:13:24 +0300
Subject: [PATCH 3/3] static: support of new endpoints

Support of server-side history storage
---
 httpd/static/index.html | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/httpd/static/index.html b/httpd/static/index.html
index 4858f3a..85333bf 100644
--- a/httpd/static/index.html
+++ b/httpd/static/index.html
@@ -689,7 +689,7 @@ <h3 class="history-title">История введенных данных</h3>
             const R = Number(document.querySelector('input[name="R"]:checked').value);
             const Y = Number(document.getElementById('Y').value);
 
-            sendAJAXRequest("GET", "/fcgi/", {"x": X, "y": Y, "r": R})
+            sendAJAXRequest("GET", "/fcgi/test", {"x": X, "y": Y, "r": R})
                 .then(
                     result => {testHandler(result, X, Y, R)},
                     result => {errorHandler(result)}
@@ -721,7 +721,7 @@ <h3 class="history-title">История введенных данных</h3>
                 ...convertInputCordsToSvgCords(X, Y, R),
                 3,
                 "point-on-graph"
-            );  
+            );
         }
 
         // Функция для очистки истории
@@ -729,12 +729,39 @@ <h3 class="history-title">История введенных данных</h3>
             if (confirm('Вы уверены, что хотите очистить всю историю?')) {
                 history.clear();
                 plot.clear();
+                sendAJAXRequest("DELETE", "/fcgi/journal")
+                    .then(
+                        result => {},
+                        result => {errorHandler(result)}
+                    );
             }
         }
 
         // Инициализация при загрузке страницы
         document.addEventListener('DOMContentLoaded', () => {
-            // placeholder
+            // Получаем историю с сервера
+            sendAJAXRequest("GET", "/fcgi/journal")
+                .then(
+                    result => {
+                        const JSONResponce = JSON.parse(result.response);
+                        JSONResponce.result.forEach((elem) => {
+                            plot.addPoint(
+                                ...convertInputCordsToSvgCords(elem.x, elem.y, elem.r),
+                                3,
+                                "point-on-graph"
+                            );
+                        });
+                        history.addHistoryItem(
+                            new Date(elem.timestamp).toISOString(),
+                            elem.elapsedTimeNs,
+                            elem.x,
+                            elem.y,
+                            elem.r,
+                            elem.isInsideArea
+                        )
+                    },
+                    result => {errorHandler(result)}
+                );
         });
     </script>
 </body>