Merge pull request #35 from vshcryabets/fix/dev-string-serialization

vshcryabets · web-flow · commit c5b67735a76d · 2025-07-16T16:55:17.000Z
Add StringSerializer
diff --git a/java/v2styx-console-client/src/main/java/com/v2soft/styxlib/StyxConsoleClient.java b/java/v2styx-console-client/src/main/java/com/v2soft/styxlib/StyxConsoleClient.java
@@ -8,7 +8,7 @@
 import com.v2soft.styxlib.l5.serialization.IDataDeserializer;
 import com.v2soft.styxlib.l5.serialization.IDataSerializer;
 import com.v2soft.styxlib.l5.serialization.impl.StyxDeserializerImpl;
-import com.v2soft.styxlib.l5.serialization.impl.StyxSerializerImpl;
+import com.v2soft.styxlib.l5.v9p2000.StyxSerializerImpl;
 import com.v2soft.styxlib.l5.structs.StyxStat;
 import com.v2soft.styxlib.library.types.impl.CredentialsImpl;
 import com.v2soft.styxlib.server.StyxServerManager;
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/Logger.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/Logger.java
@@ -4,4 +4,22 @@
 
 public class Logger {
     public static final PrintStream DEBUG = System.out;
+
+    private static void message(String tag, String id, String message) {
+        String currentTime = java.time.LocalTime.now().toString();
+        long tid = Thread.currentThread().getId();
+        DEBUG.println(currentTime + "\t" + tid + "\t" + id + "\t" + tag + ":\t" + message);
+    }
+
+    public static void d(String tag, String message) {
+        message(tag, "D", message);
+    }
+
+    public static void info(String tag, String message) {
+        message(tag, "I", message);
+    }
+
+    public static void e(String tag, String message) {
+        message(tag, "E", message);
+    }
 }
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/exceptions/StyxUnknownClientIdException.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/exceptions/StyxUnknownClientIdException.java
@@ -1,4 +1,7 @@
 package com.v2soft.styxlib.exceptions;
 
 public class StyxUnknownClientIdException extends StyxException {
+    public StyxUnknownClientIdException(String message) {
+        super(message);
+    }
 }
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/handlers/QueueMessagesProcessor.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/handlers/QueueMessagesProcessor.java
@@ -11,16 +11,16 @@
  * @author V.Shcryabets <a>vshcryabets@gmail.com</a>
  */
 public abstract class QueueMessagesProcessor implements IMessageProcessor {
-    protected LinkedBlockingQueue<Pair> mQueue;
-    protected Thread mThread;
-
-    private static class Pair {
+    public static class Pair {
         public StyxMessage mMessage;
         public int mClientId;
     }
 
+    protected LinkedBlockingQueue<Pair> mQueue;
+    protected Thread mThread;
+
     public QueueMessagesProcessor() {
-        mQueue = new LinkedBlockingQueue<Pair>();
+        mQueue = new LinkedBlockingQueue<>();
         mThread = new Thread(mRunnable, toString());
         mThread.start();
     }
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/dev/Operations.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/dev/Operations.java
@@ -1,5 +1,6 @@
 package com.v2soft.styxlib.l5.dev;
 
+import com.v2soft.styxlib.Logger;
 import com.v2soft.styxlib.l5.enums.MessageType;
 import com.v2soft.styxlib.l5.messages.StyxTWStatMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
@@ -44,4 +45,12 @@ public static String toString(StyxMessage message) {
         }
         return result.toString();
     }
+
+    public static void printStacktrace(String tag) {
+        var stackTrace = Thread.currentThread().getStackTrace();
+        Logger.d(tag, "Stack trace:");
+        for (StackTraceElement element : stackTrace) {
+            Logger.d(tag, element.toString());
+        }
+    }
 }
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/dev/StringSerializer.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/dev/StringSerializer.java
@@ -0,0 +1,13 @@
+package com.v2soft.styxlib.l5.dev;
+
+import com.v2soft.styxlib.exceptions.StyxException;
+import com.v2soft.styxlib.l5.messages.base.StyxMessage;
+import com.v2soft.styxlib.l5.structs.StyxQID;
+import com.v2soft.styxlib.l5.structs.StyxStat;
+
+// String serialization for debug purposes
+public interface StringSerializer {
+    String serializeQid(StyxQID qid) throws StyxException;
+    String serializeStat(StyxStat stat) throws StyxException;
+    String serializeMessage(StyxMessage message);
+}
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/base/StyxRSingleQIDMessage.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/base/StyxRSingleQIDMessage.java
@@ -1,11 +1,7 @@
 package com.v2soft.styxlib.l5.messages.base;
 
-import com.v2soft.styxlib.l5.enums.MessageType;
-import com.v2soft.styxlib.l5.serialization.IBufferReader;
 import com.v2soft.styxlib.l5.structs.StyxQID;
 
-import java.io.IOException;
-
 public class StyxRSingleQIDMessage extends StyxMessage {
     protected final StyxQID mQID;
 
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/v9p2000/StringSerializerImpl.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/v9p2000/StringSerializerImpl.java
@@ -0,0 +1,37 @@
+package com.v2soft.styxlib.l5.v9p2000;
+
+import com.v2soft.styxlib.exceptions.StyxException;
+import com.v2soft.styxlib.l5.dev.StringSerializer;
+import com.v2soft.styxlib.l5.messages.base.StyxMessage;
+import com.v2soft.styxlib.l5.structs.StyxQID;
+import com.v2soft.styxlib.l5.structs.StyxStat;
+
+public class StringSerializerImpl implements StringSerializer {
+    @Override
+    public String serializeQid(StyxQID qid) throws StyxException {
+        return String.format("QID {type: %d, version: %d, path: %d}",
+                qid.type(), qid.version(), qid.path());
+    }
+
+    @Override
+    public String serializeStat(StyxStat stat) throws StyxException {
+        StringBuilder result = new StringBuilder();
+        result.append("Stat ")
+                .append(String.format("0x%x,0x%x,", stat.type(), stat.dev()))
+                .append("Qid=").append(serializeQid(stat.QID()))
+                .append(",mode=0x").append(Long.toHexString(stat.mode()))
+                .append(",atime=").append(stat.accessTime().toInstant())
+                .append(",mtime=").append(stat.modificationTime().toInstant())
+                .append(",length=").append(stat.length())
+                .append(",name=").append(stat.name())
+                .append(",user=").append(stat.userName())
+                .append(",group=").append(stat.groupName())
+                .append(",modUser=").append(stat.modificationUser());
+        return result.toString();
+    }
+
+    @Override
+    public String serializeMessage(StyxMessage message) {
+        return "";
+    }
+}
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/v9p2000/StyxSerializerImpl.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/v9p2000/StyxSerializerImpl.java
@@ -1,4 +1,4 @@
-package com.v2soft.styxlib.l5.serialization.impl;
+package com.v2soft.styxlib.l5.v9p2000;
 
 import com.v2soft.styxlib.exceptions.StyxException;
 import com.v2soft.styxlib.l5.enums.Checks;
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/StyxFile.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/l6/StyxFile.java
@@ -12,7 +12,7 @@
 import com.v2soft.styxlib.l5.messages.*;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
-import com.v2soft.styxlib.l5.serialization.impl.StyxSerializerImpl;
+import com.v2soft.styxlib.l5.v9p2000.StyxSerializerImpl;
 import com.v2soft.styxlib.l5.structs.StyxStat;
 import com.v2soft.styxlib.l6.io.StyxFileBufferedInputStream;
 import com.v2soft.styxlib.l6.io.StyxUnbufferedInputStream;
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/server/ClientsRepoImpl.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/server/ClientsRepoImpl.java
@@ -7,19 +7,20 @@
 import com.v2soft.styxlib.utils.FIDPoll;
 import com.v2soft.styxlib.utils.Polls;
 
-import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class ClientsRepoImpl implements ClientsRepo {
+    private static final String TAG = "ClientsRepoImpl";
     public record Configuration(
             boolean noAuthenticationRequired
     ){}
-    private final HashMap<Integer, ClientDetails> mClients;
+    private final ConcurrentHashMap<Integer, ClientDetails> mClients;
     private final AtomicInteger mIdCounter = new AtomicInteger(1);
     private final Configuration mConfiguration;
 
     public ClientsRepoImpl(Configuration configuration) {
-        mClients = new HashMap<>();
+        mClients = new ConcurrentHashMap<>();
         mConfiguration = configuration;
     }
 
@@ -42,7 +43,7 @@ public void removeClient(int id) {
     @Override
     public ClientDetails getClient(int id) throws StyxUnknownClientIdException {
         if (!mClients.containsKey(id)) {
-            throw new StyxUnknownClientIdException();
+            throw new StyxUnknownClientIdException("No client with id " + id + " found " + mClients);
         }
         return mClients.get(id);
     }
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/server/IChannelDriver.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/server/IChannelDriver.java
@@ -13,7 +13,7 @@
  *
  * @author V.Shcryabets (vshcryabets@gmail.com)
  */
-public interface IChannelDriver<IC extends IChannelDriver.InitConfiguration> extends Closeable, IMessageTransmitter {
+public interface IChannelDriver<IC extends IChannelDriver.InitConfiguration> extends IMessageTransmitter {
     class InitConfiguration {
         public final int iounit;
         public final StyxSessionDI di;
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/server/tcp/TCPChannelDriver.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/server/tcp/TCPChannelDriver.java
@@ -1,5 +1,6 @@
 package com.v2soft.styxlib.server.tcp;
 
+import com.v2soft.styxlib.Logger;
 import com.v2soft.styxlib.exceptions.StyxException;
 import com.v2soft.styxlib.l5.enums.Checks;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
@@ -128,7 +129,7 @@ public void close() {
      * Read data from assigned SocketChannel
      */
     protected boolean readSocket(int clientId) throws StyxException {
-        int read = 0;
+        int read;
         final var client = (TCPClientDetails) mDI.getClientsRepo().getClient(clientId);
         try {
             read = client.getBufferLoader().readFromChannelToBuffer(client.getChannel());
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/server/tcp/TCPClientChannelDriver.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/server/tcp/TCPClientChannelDriver.java
@@ -1,6 +1,8 @@
 package com.v2soft.styxlib.server.tcp;
 
+import com.v2soft.styxlib.Logger;
 import com.v2soft.styxlib.exceptions.StyxException;
+import com.v2soft.styxlib.l5.dev.Operations;
 import com.v2soft.styxlib.l5.enums.Checks;
 import com.v2soft.styxlib.l5.io.impl.BufferImpl;
 import com.v2soft.styxlib.l5.serialization.IBufferReader;
@@ -114,6 +116,7 @@ public void run() {
     @Override
     public void close() {
         super.close();
+        mDI.getClientsRepo().removeClient(mServerClientDetails.getId());
         mAcceptorThread.interrupt();
     }
 
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/server/tcp/TCPServerChannelDriver.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/server/tcp/TCPServerChannelDriver.java
@@ -1,6 +1,7 @@
 package com.v2soft.styxlib.server.tcp;
 
 import com.v2soft.styxlib.exceptions.StyxException;
+import com.v2soft.styxlib.exceptions.StyxUnknownClientIdException;
 import com.v2soft.styxlib.utils.StyxSessionDI;
 
 import java.io.IOException;
@@ -91,6 +92,9 @@ public void run() {
                     processEventsQueue(newConnections, readable);
                     newConnections.clear();
                     readable.clear();
+                } catch (StyxUnknownClientIdException e) {
+                    e.printStackTrace();
+                    break;
                 } catch (IOException e) {
                     // this is ok
                     e.printStackTrace();
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/utils/StyxSessionDI.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/utils/StyxSessionDI.java
@@ -1,5 +1,6 @@
 package com.v2soft.styxlib.utils;
 
+import com.v2soft.styxlib.l5.dev.StringSerializer;
 import com.v2soft.styxlib.l5.serialization.IDataDeserializer;
 import com.v2soft.styxlib.l5.serialization.IDataSerializer;
 import com.v2soft.styxlib.l6.IsClientAuthorizedUseCase;
@@ -10,6 +11,7 @@ public interface StyxSessionDI {
 
     IDataDeserializer getDataDeserializer();
     IDataSerializer getDataSerializer();
+    StringSerializer getStringSerializer();
 
     ClientsRepo getClientsRepo();
 }
diff --git a/java/v2styx-lib/src/main/java/com/v2soft/styxlib/utils/StyxSessionDIImpl.java b/java/v2styx-lib/src/main/java/com/v2soft/styxlib/utils/StyxSessionDIImpl.java
@@ -1,23 +1,27 @@
 package com.v2soft.styxlib.utils;
 
+import com.v2soft.styxlib.l5.dev.StringSerializer;
 import com.v2soft.styxlib.l5.serialization.IDataDeserializer;
 import com.v2soft.styxlib.l5.serialization.IDataSerializer;
 import com.v2soft.styxlib.l5.serialization.impl.StyxDeserializerImpl;
-import com.v2soft.styxlib.l5.serialization.impl.StyxSerializerImpl;
+import com.v2soft.styxlib.l5.v9p2000.StyxSerializerImpl;
+import com.v2soft.styxlib.l5.v9p2000.StringSerializerImpl;
 import com.v2soft.styxlib.l6.IsClientAuthorizedUseCase;
 import com.v2soft.styxlib.l6.IsClientAuthorizedUseCaseImpl;
 import com.v2soft.styxlib.server.ClientsRepo;
 import com.v2soft.styxlib.server.ClientsRepoImpl;
 
 public class StyxSessionDIImpl implements StyxSessionDI {
-    private ClientsRepo mClientsRepo;
-    private IDataSerializer serializer = new StyxSerializerImpl();
-    private IDataDeserializer deserializer = new StyxDeserializerImpl();
-    private IsClientAuthorizedUseCaseImpl isClientAuthorizedUseCase;
+    private final ClientsRepo mClientsRepo;
+    private final IDataSerializer serializer = new StyxSerializerImpl();
+    private final IDataDeserializer deserializer = new StyxDeserializerImpl();
+    private final IsClientAuthorizedUseCaseImpl isClientAuthorizedUseCase;
+    private final StringSerializer stringSerializer;
 
     public StyxSessionDIImpl(boolean authRequired) {
         mClientsRepo = new ClientsRepoImpl(new ClientsRepoImpl.Configuration(!authRequired));
         isClientAuthorizedUseCase = new IsClientAuthorizedUseCaseImpl(mClientsRepo);
+        stringSerializer = new StringSerializerImpl();
     }
 
     @Override
@@ -39,4 +43,9 @@ public IDataSerializer getDataSerializer() {
     public ClientsRepo getClientsRepo() {
         return mClientsRepo;
     }
+
+    @Override
+    public StringSerializer getStringSerializer() {
+        return stringSerializer;
+    }
 }
diff --git a/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/ConnectionTest.java b/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/ConnectionTest.java
@@ -1,8 +1,10 @@
 package com.v2soft.styxlib.l5;
 
+import com.v2soft.styxlib.Logger;
 import com.v2soft.styxlib.exceptions.StyxErrorMessageException;
 import com.v2soft.styxlib.exceptions.StyxException;
 import com.v2soft.styxlib.l5.dev.MetricsAndStats;
+import com.v2soft.styxlib.l5.dev.Operations;
 import com.v2soft.styxlib.l5.enums.FileMode;
 import com.v2soft.styxlib.l6.StyxFile;
 import com.v2soft.styxlib.l6.io.StyxFileBufferedInputStream;
@@ -26,7 +28,6 @@
 import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.TimeoutException;
-import java.util.logging.Logger;
 import java.util.zip.CRC32;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -37,7 +38,7 @@
  * @author V.Shcriyabets (vshcryabets@gmail.com)
  */
 public class ConnectionTest {
-    private static Logger log = Logger.getLogger(ConnectionTest.class.getSimpleName());
+    private static final String TAG = ConnectionTest.class.getSimpleName();
     private static final int PORT = 10234;
     private Connection mConnection;
     private StyxServerManager mServer;
@@ -80,14 +81,15 @@ public void setUp() throws Exception {
 
     @AfterEach
     public void shutDown() throws InterruptedException, IOException {
+        com.v2soft.styxlib.Logger.d(TAG, "shutDown 01");
         mConnection.close();
         mServer.closeAndWait();
     }
 
     // TVersion & TAttach
     @Test
     @Tag("dev")
-    public void testConnection() throws IOException, InterruptedException, TimeoutException {
+    public void testConnection() throws IOException {
         int count = 1000;
         clientConfiguration.transmitter.clearStatistics();
         long startTime = System.currentTimeMillis();
@@ -97,7 +99,7 @@ public void testConnection() throws IOException, InterruptedException, TimeoutEx
         assertEquals(count * 3, clientConfiguration.transmitter.getTransmittedCount()); // TVersion, Tattach, TClunk
         assertEquals(0, clientConfiguration.transmitter.getErrorsCount());
         long diff = System.currentTimeMillis() - startTime;
-        log.info(String.format("\tTransmited %d messages\n\t" +
+        Logger.info(TAG, String.format("\tTransmited %d messages\n\t" +
                         //"Received %d messages\n\t" +
                         "Error %d messages\n\t" +
                         "Average time for connection %f ms",
@@ -193,7 +195,7 @@ public void testFSTree() throws IOException {
 
     @Test
     public void testBigFileTransmition()
-            throws IOException {
+            throws IOException, InterruptedException {
         byte[] buffer = new byte[156];
         System.out.println("Generating pattern...");
         Random random = new Random();
@@ -220,6 +222,7 @@ public void testBigFileTransmition()
             out.write(buffer);
         }
         out.write(buffer, 0, (int) last);
+        Logger.d("ConnectionTest", String.format("Write %d bytes", filessize));
         // close it
         out.close();
         file.close();
@@ -242,7 +245,6 @@ public void testBigFileTransmition()
             crcounter.update(buffer, 0, readed);
             assertEquals(crc32, crcounter.getValue());
         }
-
         // close it
         in.close();
 
diff --git a/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/serialization/MessageSerializerImplTest.java b/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/serialization/MessageSerializerImplTest.java
@@ -8,7 +8,7 @@
 import com.v2soft.styxlib.l5.messages.StyxRReadMessage;
 import com.v2soft.styxlib.l5.messages.StyxTVersionMessage;
 import com.v2soft.styxlib.l5.serialization.impl.BufferWriterImpl;
-import com.v2soft.styxlib.l5.serialization.impl.StyxSerializerImpl;
+import com.v2soft.styxlib.l5.v9p2000.StyxSerializerImpl;
 import com.v2soft.styxlib.l5.structs.StyxQID;
 import com.v2soft.styxlib.l5.structs.StyxStat;
 
diff --git a/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/v9p2000/StringSerializerImplTests.java b/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/v9p2000/StringSerializerImplTests.java
diff --git a/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/v9p2000/StyxSerializerImplTest.java b/java/v2styx-lib/src/test/java/com/v2soft/styxlib/l5/v9p2000/StyxSerializerImplTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`	`1`	`package com.v2soft.styxlib.exceptions;`
`2`	`2`
`3`	`3`	`public class StyxUnknownClientIdException extends StyxException {`
	`4`	`+ public StyxUnknownClientIdException(String message) {`
	`5`	`+ super(message);`
	`6`	`+ }`
`4`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.v2soft.styxlib.l5.dev;`
`2`	`2`
	`3`	`+import com.v2soft.styxlib.Logger;`
`3`	`4`	`import com.v2soft.styxlib.l5.enums.MessageType;`
`4`	`5`	`import com.v2soft.styxlib.l5.messages.StyxTWStatMessage;`
`5`	`6`	`import com.v2soft.styxlib.l5.messages.base.StyxMessage;`
`@@ -44,4 +45,12 @@ public static String toString(StyxMessage message) {`
`44`	`45`	`}`
`45`	`46`	`return result.toString();`
`46`	`47`	`}`
	`48`	`+`
	`49`	`+ public static void printStacktrace(String tag) {`
	`50`	`+ var stackTrace = Thread.currentThread().getStackTrace();`
	`51`	`+ Logger.d(tag, "Stack trace:");`
	`52`	`+ for (StackTraceElement element : stackTrace) {`
	`53`	`+ Logger.d(tag, element.toString());`
	`54`	`+ }`
	`55`	`+ }`
`47`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.v2soft.styxlib.l5.serialization.impl;`
	`1`	`+package com.v2soft.styxlib.l5.v9p2000;`
`2`	`2`
`3`	`3`	`import com.v2soft.styxlib.exceptions.StyxException;`
`4`	`4`	`import com.v2soft.styxlib.l5.enums.Checks;`