Merge pull request #9 from gmbrax/fix/fix-unsecure-postgres-version

Fix the pom.xml

pom.xml

@@ -13,7 +13,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <hibernate.version>7.1.7.Final</hibernate.version>
-        <postgresql.version>42.7.5</postgresql.version>
+        <postgresql.version>42.7.7</postgresql.version>
         <hikaricp.version>5.1.0</hikaricp.version>
         <log4j.version>2.23.1</log4j.version>
         <junit.version>5.10.2</junit.version>
@@ -84,12 +84,10 @@
             <version>4.32.0</version>
         </dependency>
         <dependency>
-            <groupId>io.zonky.test</groupId>
+            <groupId>org.xerial</groupId>
-            <artifactId>embedded-postgres</artifactId>
+            <artifactId>sqlite-jdbc</artifactId>
-            <version>2.2.0</version>
+            <version>3.44.1.0</version>
         </dependency>
-
-
     </dependencies>
 
     <build>

src/main/java/com/mediamanager/MediaManagerApplication.java

@@ -1,5 +1,6 @@
 package com.mediamanager;
 
+import com.mediamanager.service.database.DatabaseManager;
 import com.mediamanager.service.delegate.DelegateActionManager;
 import com.mediamanager.service.ipc.IPCManager;
 import org.apache.logging.log4j.LogManager;
@@ -9,12 +10,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-import com.mediamanager.service.database.LocalDatabaseManager;
+import com.mediamanager.service.database.SqliteDatabaseManager;
 
 public class MediaManagerApplication {
     private static final Logger logger = LogManager.getLogger(MediaManagerApplication.class);
     private static Properties config;
-    private static LocalDatabaseManager databaseManager;
+    private static DatabaseManager databaseManager;
     private static DelegateActionManager actionManager;
     private static IPCManager ipcManager;
 
@@ -52,7 +53,7 @@ public class MediaManagerApplication {
             switch (mode) {
                 case LOCAL:
                     logger.info("Starting local database...");
-                    databaseManager = new LocalDatabaseManager(config);
+                    databaseManager = new SqliteDatabaseManager(config);
                     break;
                 case SERVER:
                     throw new Exception("Server mode not yet implemented");

src/main/java/com/mediamanager/service/database/LocalDatabaseManager.java

@@ -1,87 +0,0 @@
-package com.mediamanager.service.database;
-
-import io.zonky.test.db.postgres.embedded.EmbeddedPostgres;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.sql.Connection;
-import java.util.Properties;
-
-public class LocalDatabaseManager extends DatabaseManager {
-    private static final Logger logger = LogManager.getLogger(LocalDatabaseManager.class);
-    private EmbeddedPostgres embeddedPostgres;
-
-    public LocalDatabaseManager(Properties config) {
-        super(config);
-    }
-
-    @Override
-    public void init() throws Exception {
-        logger.info("Initializing embedded PostgreSQL database...");
-
-        // Configurações específicas do modo local
-        String dataDir = configuration.getProperty("local.database.dir",
-                System.getProperty("user.home") + "/.mediamanager/db");
-        int port = Integer.parseInt(
-                configuration.getProperty("local.database.port", "54321")
-        );
-
-        // Cria diretório se não existir
-        Path dataPath = Paths.get(dataDir);
-        Files.createDirectories(dataPath);
-        logger.debug("Using data directory: {}", dataDir);
-
-        // Inicia o PostgreSQL embedded
-        logger.info("Starting embedded PostgreSQL on port {}", port);
-        embeddedPostgres = EmbeddedPostgres.builder()
-                .setDataDirectory(dataPath)
-                .setCleanDataDirectory(false)  // Mantém dados
-                .setPort(port)
-                .start();
-
-        // Cria a conexão
-        this.connection = createConnection();
-        logger.info("Embedded database connection established successfully");
-
-        // Usa o método da classe pai para sanity checks
-        performSanityChecks();
-        logger.info("Database sanity checks passed successfully");
-    }
-
-    @Override
-    protected Connection createConnection() throws Exception {
-        if (embeddedPostgres == null) {
-            throw new IllegalStateException("Embedded PostgreSQL not started");
-        }
-
-        try {
-            // Pega conexão do embedded
-            Connection conn = embeddedPostgres.getPostgresDatabase().getConnection();
-            logger.debug("Got connection from embedded PostgreSQL");
-            return conn;
-        } catch (Exception e) {
-            logger.error("Failed to get embedded connection", e);
-            throw new Exception("Embedded connection failed: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public void close() {
-        // Primeiro fecha a conexão (método da classe pai)
-        super.close();
-
-        // Depois para o embedded
-        if (embeddedPostgres != null) {
-            try {
-                logger.info("Stopping embedded PostgreSQL...");
-                embeddedPostgres.close();
-                logger.info("Embedded PostgreSQL stopped successfully");
-            } catch (Exception e) {
-                logger.error("Error stopping embedded PostgreSQL", e);
-            }
-        }
-    }
-}

src/main/java/com/mediamanager/service/database/SqliteDatabaseManager.java

@@ -0,0 +1,97 @@
+package com.mediamanager.service.database;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+public class SqliteDatabaseManager extends DatabaseManager {
+    private static final Logger logger = LogManager.getLogger(SqliteDatabaseManager.class);
+
+
+    private String connectionUrl;
+
+    public SqliteDatabaseManager(Properties config) {
+        super(config);
+    }
+
+        @Override
+        public void init() throws Exception {
+
+            logger.info("Initializing SQLite database...");
+            String dataDir = configuration.getProperty("database.dir",
+                    System.getProperty("user.home") + "/.mediamanager/db");
+            String dbFilename = configuration.getProperty("database.filename", "mediamanager.db");
+            String driverClassName = configuration.getProperty("database.driver", "org.sqlite.JDBC");
+            try {
+                Class.forName(driverClassName);
+            }catch(ClassNotFoundException e) {
+                logger.error("Failed to load SQLite driver", e);
+                throw e;
+            }
+            Path dataPath = Paths.get(dataDir);
+            if (!Files.exists(dataPath)) {
+                Files.createDirectories(dataPath);
+                logger.debug("Created database directory: {}", dataDir);
+            }
+            Path dbFile = dataPath.resolve(dbFilename);
+            this.connectionUrl = "jdbc:sqlite:" + dbFile.toAbsolutePath().toString();
+            logger.info("Database file path: {}", dbFile);
+            logger.info("Connection URL: {}", this.connectionUrl);
+            this.connection = createConnection();
+            configurePerformancePragmas();
+            performSanityChecks();
+            ensureSchemaExists();
+            logger.info("SQLite database initialized successfully");
+
+    }
+
+    @Override
+    protected Connection createConnection() throws Exception {
+        try {
+            // O driver org.xerial.sqlite-jdbc é carregado automaticamente aqui
+            Connection conn = DriverManager.getConnection(this.connectionUrl);
+            logger.debug("Got connection to SQLite file");
+            return conn;
+        } catch (SQLException e) {
+            logger.error("Failed to create SQLite connection", e);
+            throw new Exception("SQLite connection failed: " + e.getMessage(), e);
+        }
+    }
+
+
+    private void configurePerformancePragmas() throws SQLException {
+        try (Statement stmt = connection.createStatement()) {
+
+            stmt.execute("PRAGMA journal_mode=WAL;");
+
+
+            stmt.execute("PRAGMA foreign_keys=ON;");
+
+
+            stmt.execute("PRAGMA synchronous=NORMAL;");
+
+            stmt.execute("PRAGMA busy_timeout=5000;");
+
+            logger.debug("SQLite performance PRAGMAs applied (WAL, Synchronous, ForeignKeys).");
+        }
+    }
+
+    private void ensureSchemaExists() throws SQLException {
+
+    }
+
+    @Override
+    public void close() {
+
+        super.close();
+        logger.info("SQLite resources released.");
+    }
+}

src/main/java/com/mediamanager/service/delegate/DelegateActionManager.java

@@ -2,7 +2,9 @@ package com.mediamanager.service.delegate;
 
 import com.google.protobuf.ByteString;
 import com.mediamanager.protocol.TransportProtocol;
+import com.mediamanager.service.delegate.handler.CloseHandler;
 import com.mediamanager.service.delegate.handler.EchoHandler;
+import com.mediamanager.service.delegate.handler.HeartbeatHandler;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -23,6 +25,8 @@ public class DelegateActionManager {
 
     private void registerHandlers() {
         handlerRegistry.put("echo",new EchoHandler());
+        handlerRegistry.put("heartbeat",new HeartbeatHandler());
+        handlerRegistry.put("close", new CloseHandler());
     }
 
     public void start(){

src/main/java/com/mediamanager/service/delegate/handler/CloseHandler.java

@@ -0,0 +1,32 @@
+package com.mediamanager.service.delegate.handler;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.mediamanager.protocol.TestProtocol.CloseCommand;
+import com.mediamanager.protocol.TestProtocol.CloseResponse;
+import com.mediamanager.protocol.TransportProtocol;
+import com.mediamanager.service.delegate.ActionHandler;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class CloseHandler implements ActionHandler {
+    private static final Logger logger = LogManager.getLogger(CloseHandler.class);
+
+    @Override
+    public TransportProtocol.Response.Builder handle(ByteString requestPayload)
+            throws InvalidProtocolBufferException {
+
+        CloseCommand.parseFrom(requestPayload); // Valida
+
+        logger.info("Close command received - connection will close");
+
+        CloseResponse response = CloseResponse.newBuilder()
+                .setMessage("Connection closing. Goodbye!")
+                .build();
+
+        return TransportProtocol.Response.newBuilder()
+                .setPayload(ByteString.copyFrom(response.toByteArray()))
+                .setStatusCode(200)
+                .putHeaders("Connection", "close"); // ← Marca para fechar
+    }
+}

src/main/java/com/mediamanager/service/delegate/handler/EchoHandler.java

@@ -1,17 +1,39 @@
 package com.mediamanager.service.delegate.handler;
 
 import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.mediamanager.protocol.TestProtocol.EchoCommand;      // ← Import
+import com.mediamanager.protocol.TestProtocol.EchoResponse;    // ← Import
 import com.mediamanager.protocol.TransportProtocol;
 import com.mediamanager.service.delegate.ActionHandler;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class EchoHandler implements ActionHandler {
-    @Override
+    private static final Logger logger = LogManager.getLogger(EchoHandler.class);
-    public TransportProtocol.Response.Builder handle(ByteString requestPayload) {
-        String payloadText = requestPayload.toStringUtf8();
-        String responseText = "Server received: " + payloadText;
 
+    @Override
+    public TransportProtocol.Response.Builder handle(ByteString requestPayload)
+            throws InvalidProtocolBufferException {  // ← Pode lançar exceção
+
+        // 1. Parse Protobuf bytes → EchoCommand
+        EchoCommand command = EchoCommand.parseFrom(requestPayload);
+
+        logger.debug("Echo received: {}", command.getMessage());
+
+        // 2. Cria EchoResponse (Protobuf)
+        EchoResponse echoResponse = EchoResponse.newBuilder()
+                .setMessage(command.getMessage())
+                .setServerTimestamp(System.currentTimeMillis())
+                .build();
+
+        // 3. Serializa EchoResponse → bytes
+        ByteString responsePayload = ByteString.copyFrom(echoResponse.toByteArray());
+
+        // 4. Retorna Response
         return TransportProtocol.Response.newBuilder()
-                .setPayload(ByteString.copyFromUtf8(responseText))
+                .setPayload(responsePayload)
                 .setStatusCode(200);
+
     }
 }

src/main/java/com/mediamanager/service/delegate/handler/HeartbeatHandler.java

@@ -0,0 +1,36 @@
+package com.mediamanager.service.delegate.handler;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.mediamanager.protocol.TestProtocol.HeartbeatCommand;
+import com.mediamanager.protocol.TestProtocol.HeartbeatResponse;
+import com.mediamanager.protocol.TransportProtocol;
+import com.mediamanager.service.delegate.ActionHandler;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class HeartbeatHandler implements ActionHandler {
+    private static final Logger logger = LogManager.getLogger(HeartbeatHandler.class);
+
+    @Override
+    public TransportProtocol.Response.Builder handle(ByteString requestPayload)
+            throws InvalidProtocolBufferException {
+
+        HeartbeatCommand command = HeartbeatCommand.parseFrom(requestPayload);
+
+        long serverTime = System.currentTimeMillis();
+
+        logger.debug("Heartbeat received. Client T1={}, Server T2={}",
+                command.getClientTimestamp(), serverTime);
+
+        HeartbeatResponse response = HeartbeatResponse.newBuilder()
+                .setClientTimestamp(command.getClientTimestamp())  // Echo T1
+                .setServerTimestamp(serverTime)                     // T2
+                .build();
+
+        return TransportProtocol.Response.newBuilder()
+                .setPayload(ByteString.copyFrom(response.toByteArray()))
+                .setStatusCode(200);
+
+    }
+}

src/main/java/com/mediamanager/service/ipc/IPCManager.java

@@ -185,7 +185,7 @@ public class IPCManager {
                     // Nenhum cliente conectado no momento
                     // Dorme por um curto período antes de verificar novamente
                     // Isso evita consumir CPU desnecessariamente em um loop vazio
-                    Thread.sleep(100); // 100 milissegundos
+                    Thread.sleep(1); // 1 milissegundos
                 }
 
             } catch (InterruptedException e) {
@@ -223,9 +223,16 @@ public class IPCManager {
             logger.debug("Client {} handler thread started", clientId);
 
             try {
-                TransportProtocol.Request request = readRequest(channel);
+                // LOOP: processa múltiplas requests na mesma conexão
+                while (channel.isOpen()) {
+                    TransportProtocol.Request request = readRequest(channel);
+
+                    if (request == null) {
+                        // Cliente desconectou gracefully
+                        logger.info("Client {} disconnected (end of stream)", clientId);
+                        break;
+                    }
 
-                if (request != null) {
                     logger.info("Client {} sent request {}", clientId, request.getRequestId());
 
                     // Processa usando o DelegateActionManager
@@ -233,17 +240,29 @@ public class IPCManager {
 
                     // Envia resposta de volta
                     writeResponse(channel, response);
-
                     logger.info("Client {} response sent", clientId);
-                } else {
+
-                    logger.warn("Client {} sent null message", clientId);
+                    // Verifica se é comando CLOSE
+                    String connectionHeader = response.getHeadersOrDefault("Connection", "");
+                    if ("close".equals(connectionHeader)) {
+                        logger.info("Client {} requested connection close", clientId);
+                        break; // Sai do loop e fecha
+                    }
                 }
 
+            } catch (IOException e) {
+                if (channel.isOpen()) {
+                    logger.error("IO error handling client {}", clientId, e);
+                } else {
+                    logger.debug("Client {} connection closed by peer", clientId);
+                }
             } catch (Exception e) {
-                logger.error("Error handling client {}", clientId, e);
+                logger.error("Unexpected error handling client {}", clientId, e);
             } finally {
                 try {
-                    channel.close();
+                    if (channel.isOpen()) {
+                        channel.close();
+                    }
                     logger.debug("Client {} channel closed", clientId);
                 } catch (IOException e) {
                     logger.error("Error closing client {} channel", clientId, e);

src/main/proto/test.proto

@@ -0,0 +1,30 @@
+syntax = "proto3";
+
+option java_package = "com.mediamanager.protocol";
+option java_outer_classname = "TestProtocol";
+
+package mediamanager.test;
+
+message EchoCommand {
+  string message = 1;
+}
+
+message EchoResponse {
+  string message = 1;
+  int64 server_timestamp = 2;
+}
+
+message HeartbeatCommand {
+  int64 client_timestamp = 1;
+}
+
+message HeartbeatResponse {
+  int64 client_timestamp = 1;
+  int64 server_timestamp = 2;
+}
+message CloseCommand {
+  // Vazio - apenas sinaliza fechamento
+}
+message CloseResponse {
+  string message = 1;
+}

src/main/resources/config.properties.example

@@ -21,7 +21,8 @@ hibernate.format_sql=true
 ipc.pipe.name=mediamanager-pipe
 ipc.pipe.path=/tmp/mediamanager
 ipc.buffer.size=8192
-
-ipc.socket.path=/tmp/mediamanager
 runtype=local
+ipc.socket.path=/tmp/mediamanager
+
+
 

src/main/resources/log4j2.xml

@@ -18,40 +18,17 @@
     </Appenders>
     
     <Loggers>
-        <Logger name="com.mediamanager" level="debug" additivity="false">
+        <Logger name="com.mediamanager" level="INFO" additivity="false">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="FileAppender"/>
         </Logger>
         
-        <Logger name="org.hibernate" level="info" additivity="false">
+        <Logger name="org.hibernate" level="INFO" additivity="false">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="FileAppender"/>
         </Logger>
         
-        <Logger name="io.zonky.test" level="INFO" additivity="false">
+        <Root level="INFO">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="FileAppender"/>
-        </Logger>
-
-        <!-- PostgreSQL JDBC Driver -->
-        <Logger name="org.postgresql" level="WARN" additivity="false">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="FileAppender"/>
-        </Logger>
-
-        <!-- Processo do PostgreSQL embedded -->
-        <Logger name="org.postgresql.embedded" level="INFO" additivity="false">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="FileAppender"/>
-        </Logger>
-
-        <!-- HikariCP Connection Pool -->
-        <Logger name="com.zaxxer.hikari" level="INFO" additivity="false">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="FileAppender"/>
-        </Logger>
-        
-        <Root level="info">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="FileAppender"/>
         </Root>