Iteration 3

README.md

@@ -1,5 +1,30 @@
 # WebProgramming lab work №1
 
+
+## Quick Start
+```bash
+docker compose up
+```
+
+## Structure
+```
+├── httpd/                  # Директория с конфигурациями веб-серверов и статическими файлами
+      ├── nginx-conf/       # Конфиг веб-сервера для nginx  
+      ├── apache-conf/      # Конфиг веб-сервера для apache (! НА ДАННЫЙ МОМЕНТ ОТКЛЮЧЁН !)
+      ├── static/           # Директория с статическими файлами
+            ├── index.html  # Основной файл сайта
+            ├── js/         # Js сайта
+            └── assets/     # Ресурсы сайта
+      ├── Dockerfile-nginx  # Dockerfile для Nginx
+      └── Dockerfile-apache # Dockerfile для Apache  (! НА ДАННЫЙ МОМЕНТ ОТКЛЮЧЁН !)
+├── server/                 # Директория с кодом java-сервера (FastCGI)
+      ├── lib/              # Директория с библиотекой для fastcgi
+      ├── src/              # Исходники
+      └── Dockerfile        # Dockerfile для fastcgi-сервера
+└── docs                    # Дополнительная документация
+```
+
+
 ## TODOs
 
 ### Httpd

docs/openapi.yaml

@@ -0,0 +1,86 @@
+openapi: 3.0.0
+info: 
+  title: "WebProg Lab1"
+  version: 0.0.2
+  description: |
+    Сервак из говна и палок 
+
+    Last update: 00:00 15.09.25 by NF-coder
+servers:
+  - url: http://localhost:8080/fcgi/
+    description: FastCGI API
+
+paths:
+  /:
+    get:
+      summary: Тест попадания в область
+      tags:
+        - General
+      parameters:
+        - in: query
+          name: x
+          required: true
+          schema:
+            $ref: "#/components/schemas/x"
+        - in: query
+          name: y
+          required: true
+          schema:
+            $ref: "#/components/schemas/y"
+        - in: query
+          name: r
+          required: true
+          schema:
+            $ref: "#/components/schemas/r"
+
+      responses:
+        200:
+          description: Responce with data
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  result:
+                    type: boolean
+                    description: "true if hitted area and false if missed"
+                    example: true
+                  elapsedTimeNs:
+                    type: integer
+                    description: "Time in ns that server spent while handling responce"
+                    example: 12345
+        default:
+          description: Error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+components:
+  schemas:
+    x:
+      type: integer
+      description: Кордината X
+      example: 0
+    y:
+      type: number
+      description: Кордината Y
+      example: 0
+    r:
+      type: number
+      description: Параметр R
+      example: 2
+
+    Error:
+      type: object
+      required:
+        - error
+      properties:
+        error:
+          type: string
+          description: "Description of error"
+          example: Some text
+
+
+
+
+

httpd/static/index.html

@@ -5,6 +5,7 @@
 	<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"/>
 	<style>
 		:root {
 			/* Цветовая палитра в OKLCH */
@@ -733,9 +734,7 @@ <h3 class="history-title">История введенных данных</h3>
 
 			if (X && R && Y) {
 
-				// Stub
 				sendAJAXGETRequest("/fcgi/", {"x": X, "y": Y, "r": R}, (data) => {FFCGIResponceHandler(data, X,Y,R)});
-				console.log(`Данные отправлены!\nX: ${X}\nY: ${Y}\nR: ${R}`);	
 
 				// Очищаем форму
 				this.reset();

server/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-slim AS build
+FROM eclipse-temurin:17-jdk-alpine AS build
 
 # copy maven confis
 COPY pom.xml mvnw ./
@@ -14,7 +14,7 @@ RUN ./mvnw dependency:resolve
 COPY src src
 RUN ./mvnw clean package
 
-FROM openjdk:17-jdk-slim
+FROM eclipse-temurin:17-jre-alpine
 WORKDIR server
 COPY --from=build target/*.jar server-1.0.jar
 ENTRYPOINT ["java", "-DFCGI_PORT=55555", "-jar", "server-1.0.jar"]

server/src/main/java/org/web1/Main.java

@@ -1,6 +1,7 @@
 package org.web1;
 
 import com.fastcgi.*;
+
 import java.util.HashMap;
 import java.util.function.Function;
 
@@ -9,10 +10,11 @@
 import org.web1.DTOs.RequestDTO;
 import org.web1.checkers.Checker;
 import org.web1.checkers.CheckerFunction;
-import org.web1.netUtils.JsonBuilder;
-import org.web1.netUtils.QueryStringToHashmap;
-import org.web1.netUtils.ResponseFactory;
-import org.web1.timer.Timer;
+import org.web1.utils.mappers.JsonBuilder;
+import org.web1.utils.mappers.QueryStringToHashmap;
+import org.web1.utils.responce.ResponseFactory;
+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();
@@ -46,13 +48,16 @@ public static void main(String[] args) {
                 String result = ResponseFactory.create(
                         new JsonBuilder()
                                 .add("result", checkResult)
-                                .add("elapsedTimeNs", timer.stop())
+                                .add("elapsedTimeNs", timer.stop()),
+                        ResponseStatus.OK
                 );
 
                 System.out.println(result);
             } catch (ValidationException e) {
                 String result = ResponseFactory.create(
-                        new JsonBuilder().add("error", '"'+e.getMessage()+'"')
+                        new JsonBuilder()
+                                .add("error", '"'+e.getMessage()+'"'),
+                        ResponseStatus.BAD_REQUEST
                 );
                 System.out.println(result);
             }

server/src/main/java/org/web1/netUtils/JsonBuilder.java → server/src/main/java/org/web1/utils/mappers/JsonBuilder.java

@@ -1,4 +1,4 @@
-package org.web1.netUtils;
+package org.web1.utils.mappers;
 
 import java.util.HashMap;
 

server/src/main/java/org/web1/netUtils/QueryStringToHashmap.java → server/src/main/java/org/web1/utils/mappers/QueryStringToHashmap.java

@@ -1,4 +1,4 @@
-package org.web1.netUtils;
+package org.web1.utils.mappers;
 
 import java.util.HashMap;
 import java.util.function.Function;

server/src/main/java/org/web1/utils/responce/ResponseFactory.java

@@ -0,0 +1,37 @@
+package org.web1.utils.responce;
+
+import org.web1.utils.mappers.JsonBuilder;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+
+public class ResponseFactory {
+    private static final String BASE_RESPONSE = """
+            HTTP/2 %s\r
+            Status: %s\r
+            Access-Control-Allow-Origin: *\r
+            Connection: keep-alive\r
+            Content-Type: application/json; charset=utf-8\r
+            Content-Length: %d\r
+            \r
+            %s""";
+
+    private static final HashMap<ResponseStatus, String> responseStatus = new HashMap<>();
+
+    static {
+        responseStatus.put(ResponseStatus.BAD_REQUEST, "400");
+        responseStatus.put(ResponseStatus.OK, "200");
+    }
+
+    public static String create(JsonBuilder jsonBuilder, ResponseStatus status) {
+        String response = jsonBuilder.build();
+
+        return String.format(
+                BASE_RESPONSE,
+                responseStatus.get(status),
+                responseStatus.get(status),
+                response.getBytes(StandardCharsets.UTF_8).length + 1,
+                response
+        );
+    }
+}

server/src/main/java/org/web1/utils/responce/ResponseStatus.java

@@ -0,0 +1,6 @@
+package org.web1.utils.responce;
+
+public enum ResponseStatus {
+    BAD_REQUEST,
+    OK
+}

server/src/main/java/org/web1/timer/Timer.java → server/src/main/java/org/web1/utils/timer/Timer.java

@@ -1,4 +1,4 @@
-package org.web1.timer;
+package org.web1.utils.timer;
 
 public class Timer {
     long startTime;