Merge pull request #2 from DevKevYT/2.1.1

Add files via upload

Author: Philipp Gersch

server-hook/src/Application.java

@@ -15,7 +15,7 @@ public class Application extends Hook {
 	Server server;
 
 	public Application() {
-		super(Version.of("2.1.0")); 
+		super(Version.of("2.1.1")); 
 	}
 
 	@Override

server-hook/src/Codes.java

@@ -7,7 +7,10 @@ public interface Codes {
 
 	//Codes 0-99 keine Errors
 	public static final int CODE_SUCCESS = 0;
+	//Einkommende Datei
 	public static final int CODE_READY = 1;
+	//Ausgehende Datei
+	public static final int CODE_SEND_READY = 2;
 
 	//Codes 100-... Error codes
 	public static final int CODE_UNKNOWN_ERROR = 100;

server-hook/src/Commands.java

@@ -69,7 +69,7 @@ public static final String generateErrorJSON(int code, String errorMessage) {
 	public Command[] createLib() {
 		return new Command[] {
 
-			new Command("download-file", "string", "download-file <klasseid> Stellt die Date als Stream bereit") {
+			new Command("download-file", "string", "download-file <klasseid> Stellt die Date als Stream bereit. Wenn eine Nachricht mit code 2 vom Server kommt muss der Befehl 'ready-to-recieve' zurückgesendet werden. Dann kann die Datei empfangen werden") {
 				@Override
 				public Object execute(Object[] arg0, Process arg1, Block arg2) throws Exception {
 					Connection c = (Connection) arg1.getVariable("connection", arg1.getMain());
@@ -81,18 +81,33 @@ public Object execute(Object[] arg0, Process arg1, Block arg2) throws Exception
 							if(filepath != Variable.UNKNOWN) {
 								File sheet = new File(filepath.getAsString());
 								if(sheet.exists()) {
-									try (FileInputStream fileReadStream = new FileInputStream(sheet)) {
-							            int read;
-							            byte[] bytes = new byte[8192];
-							            while ((read = fileReadStream.read(bytes)) != -1) {
-							            	c.client.getOutputStream().write(bytes, 0, read);
-							            }
-							            
-							            c.status = Codes.CODE_SUCCESS;
-							            c.terminateConnection();
-							        } catch (FileNotFoundException e1) {
-										e1.printStackTrace();
-									} catch (IOException e1) {
+									
+									try {
+										c.sendMessage(generateJSON(Codes.CODE_SEND_READY, "\"ready-to-send\""));
+									} catch (IOException e) {
+										return;
+									}
+									//Warte auf Client Bestätigung
+									try {
+										String approve = c.read();
+										
+										if(approve.equals("ready-to-recieve")) {
+											try (FileInputStream fileReadStream = new FileInputStream(sheet)) {
+									            int read;
+									            byte[] bytes = new byte[8192];
+									            while ((read = fileReadStream.read(bytes)) != -1) {
+									            	c.client.getOutputStream().write(bytes, 0, read);
+									            }
+									            
+									            c.status = Codes.CODE_SUCCESS;
+									            c.terminateConnection();
+									        } catch (FileNotFoundException e1) {
+												e1.printStackTrace();
+											} catch (IOException e1) {
+											}
+										}
+									} catch (IOException e) {
+										return;
 									}
 								} else {
 									c.status = Codes.CODE_ENTRY_MISSING;

server-hook/src/Connection.java

@@ -1,7 +1,9 @@
 
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.net.Socket;
 
@@ -15,6 +17,7 @@ public class Connection  {
 
 	public final Socket client;
 	public final BufferedWriter writer;
+	public final BufferedReader reader;
 
 	public Thread thread;
 
@@ -27,12 +30,25 @@ public Connection(Socket client) throws IOException {
 		this.sessionId = SESSION_COUNTER;
 		this.client = client;
 		this.writer = new BufferedWriter(new OutputStreamWriter(client.getOutputStream()));
+		this.reader = new BufferedReader(new InputStreamReader(client.getInputStream()));
 		SESSION_COUNTER++;
 	}
 
+	public String read() throws IOException {
+		int max = 500; //Maximal 500 Zeichen
+		StringBuilder command = new StringBuilder();
+		while(command.length() < max) {
+			int character = reader.read();
+			if(character == '\n') break;
+			command.append((char) character);
+		}
+		return command.toString();
+	}
+	
 	public void terminateConnection() throws IOException {
 		client.close();
 		writer.close();
+		reader.close();
 	}
 
 	public void addThread(Thread thread) {

server-hook/src/Server.java

@@ -1,8 +1,6 @@
 
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
@@ -37,6 +35,7 @@ public Server(int port, int maxConnections, int maxConnectionTime) {
 	}
 
 	private void addClientConnection(Socket client) throws IOException {
+		
 		final Connection c = new Connection(client);
 
 		//System.out.println("Starting session: " + c.sessionId);
@@ -47,15 +46,9 @@ public void run() {
 				//Maximal einen Command pro connection!
 				try {
 					Process commandHandler = new Process(true);
-					BufferedReader reader = new BufferedReader(new InputStreamReader(c.client.getInputStream()));
 
-					int max = 6000; //Maximal 6000 Zeichen
-					StringBuilder command = new StringBuilder();
-					while(command.length() < max) {
-						int character = reader.read();
-						if(character == '\n') break;
-						command.append((char) character);
-					}
+					String command = c.read();
+					
 					//Einfach eine Zeile!
 					if(command != null) {
 						commandHandler.clearLibraries();
@@ -71,16 +64,15 @@ public void log(String arg0, boolean arg1) {
 
 							@Override
 							public void error(String arg0) {
-								Main.logger.logError("Error while executing command: " + command + ": " + arg0 + " (Exit Code: " + c.status + ")");
+								Main.logger.logError("Error while executing command: " + (arg0.length() > 100 ? arg0.substring(0, 100) : arg0) + " (Exit Code: " + c.status + ")");
 								//Send error message
 								try {
 									c.writer.write("{\"error\": \"" + arg0 + "\",\"code\": " + c.status + "}");
 									c.writer.flush();
 								} catch (IOException e) {}
 							}
 						});
-						
-						commandHandler.execute(command.toString(), false);
+						commandHandler.execute(command, false);
 					}
 				} catch (IOException e) {
 					c.status = Codes.CODE_UNKNOWN_ERROR;