Add shadowJar instead of application, bump the project's version to 1.0.5

Merge with local changes

.gitignore

@@ -1,3 +1,5 @@
+data.db
+
 .gradle
 build/
 !gradle/wrapper/gradle-wrapper.jar
@@ -39,4 +41,4 @@ bin/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store

build.gradle

@@ -1,19 +1,31 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
     id 'java'
-    id 'application'
+    id 'com.gradleup.shadow' version '9.0.0-beta4'
 }
 
 group = 'net.pixtaded'
-version = '1.0-SNAPSHOT'
+version = projectVersion
 
 repositories {
     mavenCentral()
 }
 
-application {
-    mainClass = 'net.pixtaded.crab.Main'
-}
-
 dependencies {
     implementation('org.xerial:sqlite-jdbc:3.47.1.0')
+}
+
+tasks.build.dependsOn tasks.shadowJar
+
+tasks.named('jar', Jar) {
+    manifest {
+        attributes 'Main-Class': 'net.pixtaded.crab.Main'
+    }
+}
+
+tasks.named('shadowJar', ShadowJar) {
+    archiveBaseName = 'crab'
+    archiveClassifier = ''
+    archiveVersion = projectVersion
 }

gradle.properties

@@ -0,0 +1 @@
+projectVersion=1.0.5

src/main/java/net/pixtaded/crab/Main.java

@@ -7,9 +7,43 @@ import java.util.Scanner;
 
 public class Main {
     public static void main(String[] args) {
-        Scanner scanner = new Scanner(System.in);
-        chooseMode(scanner);
-        scanner.close();
+        if (args.length == 0) {
+            Scanner scanner = new Scanner(System.in);
+            chooseMode(scanner);
+            scanner.close();
+            return;
+        }
+        switch (args[0]) {
+            case "help" -> {
+                System.out.println("crab help - print this message.");
+                System.out.println("crab client <ip> <port> [nick] - connect to a server.");
+                System.out.println("crab server <port> - start a server.");
+            }
+            case "client" -> {
+                CrabClient client;
+                try {
+                    client = new CrabClient(args[1], Integer.parseInt(args[2]), args.length == 4 ? args[3] : null);
+                } catch (NumberFormatException e) {
+                    System.err.println("Port is not a number.");
+                    return;
+                }
+                client.run();
+            }
+            case "server" -> {
+                CrabServer server;
+                try {
+                    server = new CrabServer(Integer.parseInt(args[1]));
+                } catch (NumberFormatException e) {
+                    System.err.println("Port is not a number.");
+                    return;
+                }
+                server.run();
+            }
+            default -> {
+                System.err.println("Unknown argument");
+                return;
+            }
+        }
     }
 
     private static void chooseMode(Scanner scanner) {
@@ -28,4 +62,4 @@ public class Main {
         }
     }
 
-}
+}

src/main/java/net/pixtaded/crab/client/CrabClient.java

@@ -1,6 +1,7 @@
 package net.pixtaded.crab.client;
 
 import net.pixtaded.crab.common.Crab;
+import net.pixtaded.crab.common.Logs;
 import net.pixtaded.crab.common.Sanitizer;
 
 import java.io.*;
@@ -17,16 +18,27 @@ public class CrabClient implements Crab {
     private PrintWriter out;
     private BufferedReader in;
     private int lastBufferLength = 0;
+    private String nickname;
+    private Logs cache = new Logs(0, "");
 
     public CrabClient() {
+        this.nickname = "";
+    }
 
+    public CrabClient(String serverAddress, int port, String nickname) {
+        this.serverAddress = serverAddress;
+        this.port = port;
+        if (nickname != null)
+            this.nickname = "<" + nickname + "> ";
+        else
+            this.nickname = "";
     }
 
     @Override
     public void run() {
         try {
-            setup();
-            connect();
+            if (this.serverAddress == null)
+                setup();
             communicate();
         } catch (IOException e) {
             System.err.println("Error connecting to the server: " + e.getMessage());
@@ -54,6 +66,11 @@ public class CrabClient implements Crab {
                 System.out.println("Enter a correct port number: ");
             }
         }
+
+        System.out.print("Enter your nickname (leave empty for no nickname): ");
+        nickname = scanner.nextLine();
+        if (!nickname.isEmpty())
+            nickname = "<" + nickname + "> ";
     }
 
     private void connect() throws IOException {
@@ -66,9 +83,7 @@ public class CrabClient implements Crab {
     private void communicate() throws IOException {
         Scanner scanner = new Scanner(System.in);
         String message;
-
         while (true) {
-            System.out.print("\033[H\033[2J");
             getLogs();
             System.out.print("Enter a message (or type '/exit' to exit): ");
             message = scanner.nextLine();
@@ -77,17 +92,19 @@ public class CrabClient implements Crab {
                 break;
             }
 
-            if (!message.isEmpty()) sendPacket(MESSAGE, message);
+            if (!message.isEmpty()) sendPacket(MESSAGE, this.nickname + message);
         }
     }
 
     private void sendPacket(byte PID, String argument) throws IOException {
+        connect();
         String formattedMessage = String.valueOf((char) PID) + argument + "\n";
 
         out.print(formattedMessage);
         out.flush();
 
         receiveResponse(PID);
+        closeConnection();
     }
 
     private void receiveResponse(byte PID) throws IOException {
@@ -97,13 +114,15 @@ public class CrabClient implements Crab {
                 int response = in.read(buffer);
                 lastBufferLength = Integer.parseInt(new String(buffer).trim());
             } case LOGS -> {
-                byte[] bytes = socket.getInputStream().readNBytes(lastBufferLength);
-                System.out.print(Sanitizer.sanitizeString(new String(bytes, StandardCharsets.UTF_8), false));
+                if (cache.sizeInBytes() != lastBufferLength) {
+                    byte[] bytes = socket.getInputStream().readNBytes(lastBufferLength);
+                    cache = new Logs(lastBufferLength, new String(bytes, StandardCharsets.UTF_8));
+                }
+                clearScreen();
+                System.out.print(Sanitizer.sanitizeString(cache.content(), false));
             } default -> {
             }
         }
-        closeConnection();
-        connect();
     }
 
     private void closeConnection() {
@@ -120,4 +139,9 @@ public class CrabClient implements Crab {
         sendPacket(LOGS_SIZE, "");
         sendPacket(LOGS, "");
     }
-}
+
+    private void clearScreen() {
+        System.out.print("\033[999999S\033[H\033[2J");
+    }
+
+}

src/main/java/net/pixtaded/crab/common/Logs.java

@@ -0,0 +1,4 @@
+package net.pixtaded.crab.common;
+
+public record Logs(int sizeInBytes, String content) {
+}

src/main/java/net/pixtaded/crab/common/Sanitizer.java

@@ -2,11 +2,15 @@ package net.pixtaded.crab.common;
 
 public class Sanitizer {
     public static String sanitizeString(String s, boolean sanitizeNewlines) {
-        String sanitized = s.replaceAll("\033", "");
+        String sanitized = s.replaceAll("[\010\015\033]", "");
         if (sanitizeNewlines) {
             sanitized = sanitized.replaceAll("\n", "\\\\n");
             if (!s.endsWith("\n")) sanitized += '\n';
         }
         return sanitized;
     }
+
+    public static String formatMessage(long timeMillis, String address, String content) {
+        return String.format("[%td.%1$tm.%1$tY %1$tR] {%s} %s", timeMillis, address, content);
+    }
 }

src/main/java/net/pixtaded/crab/server/CrabServer.java

@@ -1,5 +1,6 @@
 package net.pixtaded.crab.server;
 import net.pixtaded.crab.common.Crab;
+import net.pixtaded.crab.common.Logs;
 
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -12,16 +13,24 @@ public class CrabServer implements Crab {
     private Socket socket;
     private boolean isStopped = false;
     private int port;
-    private Database db;
+    private final Database db;
+    public Logs cache = new Logs(0, "");
 
     public CrabServer() {
         this.db = new Database("data.db");
     }
 
+    public CrabServer(int port) {
+        this.db = new Database("data.db");
+        this.port = port;
+    }
+
     @Override
     public void run() {
         try {
-            setup();
+            if (this.port == 0)
+                setup();
+            this.cache = getDb().getLogs();
             listen();
         } catch (IOException e) {
             if (!isStopped) System.err.println("Error starting server: " + e.getMessage());
@@ -60,9 +69,9 @@ public class CrabServer implements Crab {
         }
     }
 
-    public void stop() {
+    public synchronized void stop() {
+        isStopped = true;
         try {
-            isStopped = true;
             if (socket != null) socket.close();
             if (serverSocket != null) serverSocket.close();
         } catch (IOException e) {

src/main/java/net/pixtaded/crab/server/Database.java

@@ -1,15 +1,14 @@
 package net.pixtaded.crab.server;
 
+import net.pixtaded.crab.common.Logs;
 import net.pixtaded.crab.common.Sanitizer;
 
 import java.sql.*;
 import java.util.Date;
-import java.util.Locale;
 
-public class Database {
+public class Database implements AutoCloseable {
 
     private Connection connection;
-    private String logs = "";
 
     public Database(String dbName) {
         try {
@@ -50,22 +49,23 @@ public class Database {
         }
     }
 
-    public String getLogs() {
+    public Logs getLogs() {
         StringBuilder s = new StringBuilder();
         try (ResultSet rs = query("SELECT time, address, msg FROM messages")) {
             while (rs.next()) {
-                s.append(String.format("[%td.%1$tm.%1$tY %1$tR] {%s} %s", rs.getLong(1), rs.getString(2), rs.getString(3)));
+                s.append(Sanitizer.formatMessage(rs.getLong(1), rs.getString(2), rs.getString(3)));
             }
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }
-        logs = s.toString();
-        return logs;
+        String logsString = s.toString();
+        return new Logs(logsString.isEmpty() ? 0 : logsString.getBytes().length, logsString);
     }
 
-    public int getLogSize() {
-        if (logs.isEmpty()) return 0;
-        else return logs.getBytes().length;
+    @Override
+    public void close() throws SQLException {
+        if (connection != null && !connection.isClosed()) {
+            connection.close();
+        }
     }
-
 }

src/main/java/net/pixtaded/crab/server/ServerThread.java

@@ -1,5 +1,8 @@
 package net.pixtaded.crab.server;
 
+import net.pixtaded.crab.common.Logs;
+import net.pixtaded.crab.common.Sanitizer;
+
 import java.io.*;
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
@@ -30,18 +33,30 @@ public class ServerThread implements Runnable {
     public void run() {
         try {
             byte[] PID = input.readNBytes(1);
+            if (PID.length == 0) {
+                socket.close();
+                return;
+            }
             switch (PID[0]) {
                 case MESSAGE -> {
-                    server.getDb().logMessage(new Date(), socket.getInetAddress().getHostAddress(), new String(input.readNBytes(4096), StandardCharsets.UTF_8).trim());
-                    socket.close();
+                    Date date = new Date();
+                    String msg = new String(input.readNBytes(4096), StandardCharsets.UTF_8).trim();
+                    String address = socket.getInetAddress().getHostAddress();
+
+                    String s = Sanitizer.sanitizeString(msg, true);
+                    String newContent = server.cache.content() + Sanitizer.formatMessage(date.getTime(), address, s);
+                    server.cache = new Logs(newContent.getBytes().length, newContent);
+
+                    new Thread(new LogDBThread(date, address, msg)).start();
                 } case LOGS -> {
-                    respond(server.getDb().getLogs());
+                    respond(server.cache.content());
                 } case LOGS_SIZE -> {
-                    respond(String.valueOf(server.getDb().getLogSize()));
+                    respond(String.valueOf(server.cache.sizeInBytes()));
                 } default -> {
                     System.out.println("PID not implemented: " + PID[0]);
                 }
             }
+            socket.close();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -50,10 +65,27 @@ public class ServerThread implements Runnable {
     private void respond(byte[] data) throws IOException {
         socket.getOutputStream().write(data);
         socket.getOutputStream().flush();
-        socket.close();
     }
 
     private void respond(String utf8) throws IOException {
         respond(utf8.getBytes(StandardCharsets.UTF_8));
     }
+
+    private class LogDBThread implements Runnable {
+
+        Date date;
+        String msg;
+        String address;
+
+        public LogDBThread(Date date, String address, String msg) {
+            this.date = date;
+            this.msg = msg;
+            this.address = address;
+        }
+
+        @Override
+        public void run() {
+            server.getDb().logMessage(date, address, msg);
+        }
+    }
 }