Skip to content

Commit

Permalink
#177 Add server handling of missing files
Browse files Browse the repository at this point in the history
  • Loading branch information
@rheimus
rheimus committed Apr 7, 2020
1 parent 7c02763 commit 56dcd21
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 41 deletions.
96 changes: 56 additions & 40 deletions src/main/java/com/superzanti/serversync/server/ServerWorker.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package com.superzanti.serversync.server;

import com.superzanti.serversync.ServerSync;
import com.superzanti.serversync.util.Logger;
import com.superzanti.serversync.util.LoggerNG;
import com.superzanti.serversync.util.enums.EBinaryAnswer;
import com.superzanti.serversync.util.enums.EServerMessage;
import com.superzanti.serversync.util.errors.UnknownMessageError;

import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.*;
import java.net.Socket;
import java.net.SocketException;
import java.nio.file.Files;
Expand Down Expand Up @@ -40,7 +38,7 @@ public class ServerWorker implements Runnable {
private Timer timeout;
private TimerTask timeoutTask;

private LoggerNG logger;
private LoggerNG clientLogger;

ServerWorker(
Socket socket,
Expand All @@ -49,7 +47,7 @@ public class ServerWorker implements Runnable {
List<String> managedDirectories,
Map<String, String> serverFiles
) {
logger = new LoggerNG(String.format("server-connection-from-%s", socket.getInetAddress().toString().replaceAll("[/\\.:@?|\\*\"]","-")));
clientLogger = new LoggerNG(String.format("server-connection-from-%s", socket.getInetAddress().toString().replaceAll("[/\\.:@?|\\*\"]", "-")));
clientSocket = socket;
messages = comsMessages;
directories = managedDirectories;
Expand All @@ -58,7 +56,7 @@ public class ServerWorker implements Runnable {
Date clientConnectionStarted = new Date();
DateFormat dateFormatter = DateFormat.getDateTimeInstance();

logger.log("Connection established with " + clientSocket + dateFormatter.format(clientConnectionStarted));
clientLogger.log("Connection established with " + clientSocket + dateFormatter.format(clientConnectionStarted));
}

@Override
Expand All @@ -67,7 +65,7 @@ public void run() {
ois = new ObjectInputStream(clientSocket.getInputStream());
oos = new ObjectOutputStream(clientSocket.getOutputStream());
} catch (IOException e) {
logger.log("Failed to create client streams");
clientLogger.log("Failed to create client streams");
e.printStackTrace();
}

Expand All @@ -76,25 +74,25 @@ public void run() {
try {
setTimeout(ServerWorker.DEFAULT_CLIENT_TIMEOUT_MS);
message = (String) ois.readObject();
logger.log(
clientLogger.log(
String.format("Received message: %s, from client: %s", message, clientSocket.getInetAddress()));
} catch (SocketException e) {
// Client timed out
break;
} catch (ClassNotFoundException | IOException e) {
logger.debug(e);
clientLogger.debug(e);
}

if (message == null) {
logger.debug("Received null message, this should not happen.");
clientLogger.debug("Received null message, this should not happen.");
continue;
}

try {
// <---->
// always called first
if (message.equals(ServerSync.HANDSHAKE)) {
logger.log("Sending coms messages");
clientLogger.log("Sending coms messages");
oos.writeObject(messages);
oos.flush();
continue;
Expand All @@ -104,12 +102,12 @@ public void run() {
// fallback if I don't know what this message is
if (!messages.containsValue(message)) {
try {
logger.log("Unknown message received from: " + clientSocket.getInetAddress());
clientLogger.log("Unknown message received from: " + clientSocket.getInetAddress());
oos.writeObject(new UnknownMessageError(message));
oos.flush();
} catch (IOException e) {
logger.log("Failed to write error to client " + clientSocket);
logger.debug(e);
clientLogger.log("Failed to write error to client " + clientSocket);
clientLogger.debug(e);
}

// There should not be unknown messages being sent to ServerSync, disconnect from the client.
Expand All @@ -128,7 +126,7 @@ public void run() {
if (files.size() > 0) {
for (Map.Entry<String, String> entry : files.entrySet()) {
try {
logger.debug(String.format("Asking client if the have file: %s", entry.getKey()));
clientLogger.debug(String.format("Asking client if the have file: %s", entry.getKey()));
oos.writeBoolean(true); // There are files left
oos.writeUTF(entry.getKey()); // The path
oos.writeUTF(entry.getValue()); // The hash
Expand All @@ -137,24 +135,25 @@ public void run() {

// Client: Nope, don't have it joe!
if (EBinaryAnswer.NO.getValue() == ois.readInt()) {
logger.debug("Client said they don't have the file");
clientLogger.debug("Client said they don't have the file");
setTimeout(ServerWorker.FILE_SYNC_CLIENT_TIMEOUT_MS);
transferFile(entry.getKey());
} else {
logger.debug("Client said they have the file already");
clientLogger.debug("Client said they have the file already");
setTimeout(ServerWorker.DEFAULT_CLIENT_TIMEOUT_MS);
}
} catch (IOException ex) {
logger.debug(ex);
logger.log(String.format("Encountered error during sync with %s, killing sync process", clientSocket.getInetAddress()));
clientLogger.debug(ex);
clientLogger
.log(String.format("Encountered error during sync with %s, killing sync process", clientSocket.getInetAddress()));
break;
}
}

logger.debug("Finished sync");
clientLogger.debug("Finished sync");
oos.writeBoolean(false); // No files left
} else {
logger.debug("No files on the server?");
clientLogger.debug("No files on the server?");
oos.writeBoolean(false); // No files at all?
}
oos.flush();
Expand All @@ -178,25 +177,25 @@ public void run() {
continue;
}
} catch (SocketException e) {
logger.log("Client " + clientSocket + " closed by timeout");
clientLogger.log("Client " + clientSocket + " closed by timeout");
break;
} catch (IOException e) {
logger.log("Failed to write to " + clientSocket + " client stream");
clientLogger.log("Failed to write to " + clientSocket + " client stream");
e.printStackTrace();
break;
}

// <---->
if (matchMessage(message, EServerMessage.EXIT)) {
logger.log(String.format(
clientLogger.log(String.format(
"Client requested exit, sync process complete for: %s",
clientSocket.getInetAddress()
));
break;
}
}

logger.log("Closing connection with: " + clientSocket);
clientLogger.log("Closing connection with: " + clientSocket);
teardown();
}

Expand All @@ -206,26 +205,43 @@ private void transferFile(String path) throws IOException {
// Not checking if the file exists as this is coming from a list of
// files that we already know exist.

logger.log("Writing " + file.toString() + " to client " + clientSocket.getInetAddress() + "...");
InputStream fis = Files.newInputStream(file);
clientLogger.log("Writing " + file.toString() + " to client " + clientSocket.getInetAddress() + "...");

// -- Size, for client GUI progress tracking
long size = Files.size(file);
logger.debug(String.format("File size is: %d", size));
long size = 0L;
try {
size = Files.size(file);
} catch (IOException e) {
clientLogger.debug(e);
String error = String.format(ServerSync.strings.getString("server_message_file_missing"), file);
clientLogger.error(error);
Logger.error(error);
} catch (SecurityException se) {
clientLogger.debug(se);
clientLogger.error(String.format(ServerSync.strings.getString("server_message_file_permission_denied"), file));
}
clientLogger.debug(String.format("File size is: %d", size));
oos.writeLong(size);
oos.flush();
// --

int bytesRead;
byte[] buffer = new byte[clientSocket.getSendBufferSize()];
while ((bytesRead = fis.read(buffer)) > 0) {
oos.write(buffer, 0, bytesRead);
}
if(size > 0) {
int bytesRead;
byte[] buffer = new byte[clientSocket.getSendBufferSize()];

fis.close();
oos.flush();
try (BufferedInputStream fis = new BufferedInputStream(Files.newInputStream(file))) {
while ((bytesRead = fis.read(buffer)) > 0) {
oos.write(buffer, 0, bytesRead);
}
} catch(IOException e) {
clientLogger.debug(String.format("Failed to write file: %s", file));
clientLogger.debug(e);
} finally {
oos.flush();
}
}

logger.log(String.format(
clientLogger.log(String.format(
"Finished writing: %s, to client: %s",
file.toString(),
clientSocket.getInetAddress()
Expand All @@ -247,7 +263,7 @@ private void setTimeout(int durationMs) {
clearTimeout();
timeoutTask = new ServerTimeout(this);
timeout.schedule(timeoutTask, durationMs);
logger.debug(String.format(
clientLogger.debug(String.format(
"Reset timeout for client: %s, with a timeout of: %s",
clientSocket.getInetAddress(),
durationMs
Expand All @@ -269,7 +285,7 @@ private void teardown() {

public void timeoutShutdown() {
try {
logger.log("Client connection timed out, closing " + clientSocket);
clientLogger.log("Client connection timed out, closing " + clientSocket);

if (!clientSocket.isClosed()) {
clientSocket.close();
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/serversync/lang/MessagesBundle_en_US.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ debug_IO_streams_failed=Failed to obtain input/output streams from client
debug_server_exit=Telling server to exit...
debug_server_close=Closing connections...
debug_server_close_success=All of ServerSync's sockets to the server have been closed
server_message_file_missing=File: %s has gone missing!
server_message_file_missing=File: %s has gone missing!
server_message_file_permission_denied=File: %s says permission denied
1 change: 1 addition & 0 deletions src/main/resources/assets/serversync/lang/MessagesBundle_ru_RU.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ debug_server_exit=Telling server to exit...
debug_server_close=Закрытие соединений...
debug_server_close_success=All of ServerSync's sockets to the server have been closed
server_message_file_missing=File: %s has gone missing!
server_message_file_permission_denied=File: %s says permission denied

0 comments on commit 56dcd21

Please sign in to comment.