Compare commits
No commits in common. "77259308c62122de02c31a936e7a799b8399ed5d" and "3998b18671529d3011d8845073966dc90e15c696" have entirely different histories.
77259308c6
...
3998b18671
55
pom.xml
55
pom.xml
|
|
@ -78,22 +78,9 @@
|
||||||
<version>${junit.version}</version>
|
<version>${junit.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.protobuf</groupId>
|
|
||||||
<artifactId>protobuf-java</artifactId>
|
|
||||||
<version>4.32.0</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<extensions>
|
|
||||||
<extension>
|
|
||||||
<groupId>kr.motd.maven</groupId>
|
|
||||||
<artifactId>os-maven-plugin</artifactId>
|
|
||||||
<version>1.7.1</version>
|
|
||||||
</extension>
|
|
||||||
</extensions>
|
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
@ -104,54 +91,12 @@
|
||||||
<target>17</target>
|
<target>17</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>3.2.5</version>
|
<version>3.2.5</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<!-- Protocol Buffers Plugin -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.xolstice.maven.plugins</groupId>
|
|
||||||
<artifactId>protobuf-maven-plugin</artifactId>
|
|
||||||
<version>0.6.1</version>
|
|
||||||
<configuration>
|
|
||||||
<protocExecutable>/usr/bin/protoc</protocExecutable>
|
|
||||||
<protoSourceRoot>${project.basedir}/src/main/proto</protoSourceRoot>
|
|
||||||
<outputDirectory>${project.build.directory}/generated-sources/protobuf/java</outputDirectory>
|
|
||||||
<clearOutputDirectory>false</clearOutputDirectory>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>compile</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
<!-- Build Helper Plugin - Adiciona generated sources ao classpath -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
|
||||||
<artifactId>build-helper-maven-plugin</artifactId>
|
|
||||||
<version>3.5.0</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>add-source</id>
|
|
||||||
<phase>generate-sources</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>add-source</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<sources>
|
|
||||||
<source>${project.build.directory}/generated-sources/protobuf/java</source>
|
|
||||||
</sources>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
|
|
||||||
<!-- Maven Shade Plugin - Creates executable JAR with all dependencies -->
|
<!-- Maven Shade Plugin - Creates executable JAR with all dependencies -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
package com.mediamanager;
|
package com.mediamanager;
|
||||||
|
|
||||||
import com.mediamanager.service.delegate.DelegateActionManager;
|
|
||||||
import com.mediamanager.service.ipc.IPCManager;
|
import com.mediamanager.service.ipc.IPCManager;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
@ -15,7 +14,6 @@ public class MediaManagerApplication {
|
||||||
private static final Logger logger = LogManager.getLogger(MediaManagerApplication.class);
|
private static final Logger logger = LogManager.getLogger(MediaManagerApplication.class);
|
||||||
private static Properties config;
|
private static Properties config;
|
||||||
private static DatabaseManager databaseManager;
|
private static DatabaseManager databaseManager;
|
||||||
private static DelegateActionManager actionManager;
|
|
||||||
private static IPCManager ipcManager;
|
private static IPCManager ipcManager;
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
|
@ -26,9 +24,8 @@ public class MediaManagerApplication {
|
||||||
loadConfiguration();
|
loadConfiguration();
|
||||||
databaseManager = new DatabaseManager(config);
|
databaseManager = new DatabaseManager(config);
|
||||||
databaseManager.init();
|
databaseManager.init();
|
||||||
actionManager = new DelegateActionManager();
|
|
||||||
actionManager.start();
|
ipcManager = new IPCManager(config);
|
||||||
ipcManager = new IPCManager(config,actionManager);
|
|
||||||
ipcManager.init();
|
ipcManager.init();
|
||||||
|
|
||||||
// TODO: Start application services
|
// TODO: Start application services
|
||||||
|
|
@ -54,9 +51,6 @@ public class MediaManagerApplication {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (actionManager != null) {
|
|
||||||
actionManager.stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info("MediaManager Core shutdown successfully");
|
logger.info("MediaManager Core shutdown successfully");
|
||||||
logger.info("Goodbye!");
|
logger.info("Goodbye!");
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
package com.mediamanager.service.delegate;
|
|
||||||
|
|
||||||
import com.google.protobuf.ByteString;
|
|
||||||
import com.google.protobuf.InvalidProtocolBufferException;
|
|
||||||
import com.mediamanager.protocol.TransportProtocol;
|
|
||||||
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface ActionHandler {
|
|
||||||
TransportProtocol.Response.Builder handle(ByteString requestPayload) throws InvalidProtocolBufferException;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,60 +0,0 @@
|
||||||
package com.mediamanager.service.delegate;
|
|
||||||
|
|
||||||
import com.google.protobuf.ByteString;
|
|
||||||
import com.mediamanager.protocol.TransportProtocol;
|
|
||||||
import com.mediamanager.service.delegate.handler.EchoHandler;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class DelegateActionManager {
|
|
||||||
private static final Logger logger = LogManager.getLogger(DelegateActionManager.class);
|
|
||||||
|
|
||||||
private final Map<String, ActionHandler> handlerRegistry;
|
|
||||||
|
|
||||||
public DelegateActionManager() {
|
|
||||||
|
|
||||||
logger.debug("DelegateActionManager created");
|
|
||||||
this.handlerRegistry = new HashMap<>();
|
|
||||||
registerHandlers();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void registerHandlers() {
|
|
||||||
handlerRegistry.put("echo",new EchoHandler());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void start(){
|
|
||||||
logger.info("DelegateActionManager started");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void stop(){
|
|
||||||
logger.info("DelegateActionManager stopped");
|
|
||||||
}
|
|
||||||
|
|
||||||
public TransportProtocol.Response ProcessedRequest(TransportProtocol.Request request){
|
|
||||||
String requestId = request.getRequestId();
|
|
||||||
logger.info("Processing request: {}", requestId);
|
|
||||||
String action = request.getHeadersMap().getOrDefault("action", "unknown");
|
|
||||||
ActionHandler handler = handlerRegistry.get(action);
|
|
||||||
TransportProtocol.Response.Builder responseBuilder;
|
|
||||||
if (handler == null) {
|
|
||||||
logger.warn("No handler found for action: {}", action);
|
|
||||||
responseBuilder = TransportProtocol.Response.newBuilder()
|
|
||||||
.setStatusCode(404) // 404 Not Found
|
|
||||||
.setPayload(ByteString.copyFromUtf8("Error: Action '" + action + "' not found."));
|
|
||||||
} else{
|
|
||||||
try {
|
|
||||||
logger.debug("Delegating action '{}' to handler...", action);
|
|
||||||
responseBuilder = handler.handle(request.getPayload());
|
|
||||||
}catch (Exception e) {
|
|
||||||
logger.error("Handler for action '{}' threw an exception:", action, e);
|
|
||||||
responseBuilder = TransportProtocol.Response.newBuilder()
|
|
||||||
.setStatusCode(500) // 500 Internal Server Error
|
|
||||||
.setPayload(ByteString.copyFromUtf8("Error: " + e.getMessage()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return responseBuilder.setRequestId(requestId).build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
package com.mediamanager.service.delegate.handler;
|
|
||||||
|
|
||||||
import com.google.protobuf.ByteString;
|
|
||||||
import com.mediamanager.protocol.TransportProtocol;
|
|
||||||
import com.mediamanager.service.delegate.ActionHandler;
|
|
||||||
|
|
||||||
public class EchoHandler implements ActionHandler {
|
|
||||||
@Override
|
|
||||||
public TransportProtocol.Response.Builder handle(ByteString requestPayload) {
|
|
||||||
String payloadText = requestPayload.toStringUtf8();
|
|
||||||
String responseText = "Server received: " + payloadText;
|
|
||||||
|
|
||||||
return TransportProtocol.Response.newBuilder()
|
|
||||||
.setPayload(ByteString.copyFromUtf8(responseText))
|
|
||||||
.setStatusCode(200);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
package com.mediamanager.service.ipc;
|
package com.mediamanager.service.ipc;
|
||||||
|
|
||||||
import com.mediamanager.protocol.TransportProtocol;
|
|
||||||
import com.mediamanager.service.delegate.DelegateActionManager;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.StandardProtocolFamily;
|
import java.net.StandardProtocolFamily;
|
||||||
import java.net.UnixDomainSocketAddress;
|
import java.net.UnixDomainSocketAddress;
|
||||||
|
|
@ -27,8 +26,6 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||||
public class IPCManager {
|
public class IPCManager {
|
||||||
private final Properties configuration;
|
private final Properties configuration;
|
||||||
private static final Logger logger = LogManager.getLogger(IPCManager.class);
|
private static final Logger logger = LogManager.getLogger(IPCManager.class);
|
||||||
private final DelegateActionManager actionManager;
|
|
||||||
|
|
||||||
private Path socketPath;
|
private Path socketPath;
|
||||||
private UnixDomainSocketAddress socketAddress;
|
private UnixDomainSocketAddress socketAddress;
|
||||||
private ServerSocketChannel serverChannel;
|
private ServerSocketChannel serverChannel;
|
||||||
|
|
@ -38,9 +35,8 @@ public class IPCManager {
|
||||||
private final AtomicInteger clientIdCounter = new AtomicInteger(0);
|
private final AtomicInteger clientIdCounter = new AtomicInteger(0);
|
||||||
|
|
||||||
|
|
||||||
public IPCManager(Properties config, DelegateActionManager actionManager){
|
public IPCManager(Properties config){
|
||||||
configuration = config;
|
configuration = config;
|
||||||
this.actionManager = actionManager;
|
|
||||||
logger.debug("IPCManager created with configuration:");
|
logger.debug("IPCManager created with configuration:");
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -223,25 +219,24 @@ public class IPCManager {
|
||||||
logger.debug("Client {} handler thread started", clientId);
|
logger.debug("Client {} handler thread started", clientId);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
TransportProtocol.Request request = readRequest(channel);
|
// TODO: No próximo passo, vamos implementar:
|
||||||
|
// 1. Ler mensagens JSON do SocketChannel
|
||||||
|
// 2. Parsear o JSON para objetos Java
|
||||||
|
// 3. Processar a requisição
|
||||||
|
// 4. Criar uma resposta JSON
|
||||||
|
// 5. Escrever a resposta de volta no SocketChannel
|
||||||
|
|
||||||
if (request != null) {
|
// Por enquanto, apenas mantém a conexão aberta brevemente
|
||||||
logger.info("Client {} sent request {}", clientId, request.getRequestId());
|
// para testar que o sistema de aceitação e threads está funcionando
|
||||||
|
Thread.sleep(100);
|
||||||
|
|
||||||
// Processa usando o DelegateActionManager
|
logger.debug("Client {} processing complete", clientId);
|
||||||
TransportProtocol.Response response = actionManager.ProcessedRequest(request);
|
|
||||||
|
|
||||||
// Envia resposta de volta
|
|
||||||
writeResponse(channel, response);
|
|
||||||
|
|
||||||
logger.info("Client {} response sent", clientId);
|
|
||||||
} else {
|
|
||||||
logger.warn("Client {} sent null message", clientId);
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error("Error handling client {}", clientId, e);
|
logger.error("Error handling client {}", clientId, e);
|
||||||
} finally {
|
} finally {
|
||||||
|
// SEMPRE fecha o canal quando terminar
|
||||||
|
// O finally garante que isso acontece mesmo se houver exceção
|
||||||
try {
|
try {
|
||||||
channel.close();
|
channel.close();
|
||||||
logger.debug("Client {} channel closed", clientId);
|
logger.debug("Client {} channel closed", clientId);
|
||||||
|
|
@ -250,67 +245,6 @@ public class IPCManager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private TransportProtocol.Request readRequest(SocketChannel channel) throws IOException {
|
|
||||||
// Primeiro, lê o tamanho da mensagem (4 bytes = int32)
|
|
||||||
java.nio.ByteBuffer sizeBuffer = java.nio.ByteBuffer.allocate(4);
|
|
||||||
int bytesRead = 0;
|
|
||||||
|
|
||||||
while (bytesRead < 4) {
|
|
||||||
int read = channel.read(sizeBuffer);
|
|
||||||
if (read == -1) {
|
|
||||||
logger.debug("Client disconnected before sending size");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
bytesRead += read;
|
|
||||||
}
|
|
||||||
|
|
||||||
sizeBuffer.flip();
|
|
||||||
int messageSize = sizeBuffer.getInt();
|
|
||||||
logger.debug("Expecting message of {} bytes", messageSize);
|
|
||||||
|
|
||||||
// Validação básica de segurança
|
|
||||||
if (messageSize <= 0 || messageSize > 1024 * 1024) { // Max 1MB
|
|
||||||
throw new IOException("Invalid message size: " + messageSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Agora lê a mensagem completa
|
|
||||||
java.nio.ByteBuffer messageBuffer = java.nio.ByteBuffer.allocate(messageSize);
|
|
||||||
bytesRead = 0;
|
|
||||||
|
|
||||||
while (bytesRead < messageSize) {
|
|
||||||
int read = channel.read(messageBuffer);
|
|
||||||
if (read == -1) {
|
|
||||||
throw new IOException("Client disconnected while reading message");
|
|
||||||
}
|
|
||||||
bytesRead += read;
|
|
||||||
}
|
|
||||||
|
|
||||||
messageBuffer.flip();
|
|
||||||
|
|
||||||
// Deserializa o Protocol Buffers
|
|
||||||
byte[] messageBytes = new byte[messageSize];
|
|
||||||
messageBuffer.get(messageBytes);
|
|
||||||
|
|
||||||
return TransportProtocol.Request.parseFrom(messageBytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void writeResponse(SocketChannel channel, TransportProtocol.Response response) throws IOException {
|
|
||||||
byte[] messageBytes = response.toByteArray();
|
|
||||||
int messageSize = messageBytes.length;
|
|
||||||
|
|
||||||
logger.debug("Writing response of {} bytes", messageSize);
|
|
||||||
|
|
||||||
java.nio.ByteBuffer buffer = java.nio.ByteBuffer.allocate(4 + messageSize);
|
|
||||||
buffer.putInt(messageSize);
|
|
||||||
buffer.put(messageBytes);
|
|
||||||
buffer.flip();
|
|
||||||
|
|
||||||
while (buffer.hasRemaining()) {
|
|
||||||
channel.write(buffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug("Response written successfully");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
syntax = "proto3";
|
|
||||||
|
|
||||||
option java_package = "com.mediamanager.protocol";
|
|
||||||
option java_outer_classname = "TransportProtocol";
|
|
||||||
|
|
||||||
package mediamanager;
|
|
||||||
|
|
||||||
message Request {
|
|
||||||
string request_id = 1;
|
|
||||||
bytes payload = 2;
|
|
||||||
map<string, string> headers = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
message Response {
|
|
||||||
string request_id = 1;
|
|
||||||
int32 status_code = 2;
|
|
||||||
bytes payload = 3;
|
|
||||||
map<string, string> headers = 4;
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue