Merge pull request #39 from vshcryabets/fix/simplify-response-logic

Update response handling logic

Author: vshcryabets

java/v2styx-console-client/src/main/java/com/v2soft/styxlib/StyxConsoleClient.java

@@ -11,7 +11,7 @@
 import com.v2soft.styxlib.server.tcp.TCPClientChannelDriver;
 import com.v2soft.styxlib.server.tcp.TCPServerChannelDriver;
 import com.v2soft.styxlib.utils.StyxSessionDI;
-import com.v2soft.styxlib.utils.StyxSessionDIImpl;
+import com.v2soft.styxlib.utils.impl.StyxSessionDIImpl;
 import org.jline.reader.LineReader;
 import org.jline.reader.LineReaderBuilder;
 import org.jline.terminal.Terminal;

java/v2styx-lib/src/main/java/com/v2soft/styxlib/handlers/IMessageTransmitter.java

@@ -14,7 +14,6 @@ public interface IMessageTransmitter {
     int getErrorsCount();
     void clearStatistics();
     void close();
-    <R extends StyxMessage> Future<R> sendMessage(StyxMessage answer,
-                                                  int clientId,
-                                                  long timeout) throws StyxException;
+    <R extends StyxMessage> Future<R> sendMessage(StyxMessage message,
+                                                  int clientId) throws StyxException;
 }

java/v2styx-lib/src/main/java/com/v2soft/styxlib/handlers/RMessagesProcessor.java

@@ -1,14 +1,12 @@
 package com.v2soft.styxlib.handlers;
 
+import com.v2soft.styxlib.Logger;
 import com.v2soft.styxlib.exceptions.StyxException;
 import com.v2soft.styxlib.l5.enums.MessageType;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
-import com.v2soft.styxlib.l5.messages.base.StyxTMessage;
 import com.v2soft.styxlib.l5.messages.base.StyxTMessageFID;
 import com.v2soft.styxlib.server.ClientsRepo;
 
-import java.util.Map;
-
 /**
  * @author V.Shcryabets <a>vshcryabets@gmail.com</a>
  */
@@ -34,21 +32,18 @@ public void processPacket(StyxMessage message, int clientId) {
         int tag = message.getTag();
         try {
             final var polls = mClientsRepo.getPolls(clientId);
-            final Map<Integer, StyxTMessage> clientMessagesMap = polls.getMessagesMap();
-            if (!clientMessagesMap.containsKey(tag)) {
-                // we didn't send T message with such tag, so ignore this R message
-                System.err.printf("%d\tGot (%s) unknown R message from client %d\n", System.currentTimeMillis(),
-                        mTag,
-                        clientId);
-                return;
-            }
-            final StyxTMessage tMessage = clientMessagesMap.get(tag);
-            // TODO i'm not sure that this is proper place for that logic
-            if (tMessage.type == MessageType.Tclunk ||
-                    tMessage.type == MessageType.Tremove) {
-                polls.releaseFID((StyxTMessageFID) tMessage);
+            polls.assignAnswer(tag, message);
+            if (message.getType() == MessageType.Rclunk ||
+                    message.getType() == MessageType.Rremove) {
+                if (message instanceof StyxTMessageFID) {
+                    polls.releaseFID(((StyxTMessageFID) message).mFID);
+                } else {
+                    // Log or handle the unexpected message type
+                    Logger.e(RMessagesProcessor.class.getSimpleName(),
+                            "Warning: Message type " + message.getType() +
+                            " does not support FID release.");
+                }
             }
-            tMessage.setAnswer(message);
             polls.releaseTag(tag);
         } catch (StyxException e) {
             e.printStackTrace();

java/v2styx-lib/src/main/java/com/v2soft/styxlib/handlers/TMessageTransmitter.java

@@ -5,7 +5,6 @@
 import com.v2soft.styxlib.l5.enums.Constants;
 import com.v2soft.styxlib.l5.enums.MessageType;
 import com.v2soft.styxlib.l5.messages.base.StyxMessage;
-import com.v2soft.styxlib.l5.messages.base.StyxTMessage;
 import com.v2soft.styxlib.server.ClientsRepo;
 import com.v2soft.styxlib.utils.Future;
 
@@ -30,9 +29,7 @@ public TMessageTransmitter(Listener listener, ClientsRepo clientsRepo) {
     @Override
     public <R extends StyxMessage> Future<R> sendMessage(
             StyxMessage message,
-            int clientId,
-            long timeout
-            )
+            int clientId)
             throws StyxException {
         if ( !Checks.isTMessage(message.getType())) {
             throw new StyxException("Can't sent RMessage");
@@ -47,12 +44,11 @@ public <R extends StyxMessage> Future<R> sendMessage(
         // set message tag
         int tag = Constants.NOTAG;
         if (message.getType() != MessageType.Tversion) {
-            tag = mClientsRepo.getPolls(clientId).getTagPoll().getFreeItem();
+            tag = polls.getTagPoll().getFreeItem();
         }
         message.setTag((short) tag);
-        polls.getMessagesMap().put(tag, (StyxTMessage) message);
         mTransmittedCount++;
-        return driver.sendMessage(message, clientId, timeout);
+        return driver.sendMessage(message, clientId);
     }
 
     @Override

java/v2styx-lib/src/main/java/com/v2soft/styxlib/handlers/TMessagesProcessor.java

@@ -129,7 +129,7 @@ public void processPacket(StyxMessage message, int clientId) throws StyxExceptio
         }
         if (answer != null) {
             mAnswerPackets++;
-            mDi.getClientsRepo().getDriver(clientId).sendMessage(answer, clientId, 0);
+            mDi.getClientsRepo().getDriver(clientId).sendMessage(answer, clientId);
         }
     }
 

java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/Connection.java

@@ -181,14 +181,13 @@ public void sendVersionMessage()
             throws StyxException {
         // release attached FID
         if (mRootFid != Constants.NOFID) {
-            final StyxTMessageFID tClunk = new StyxTMessageFID(MessageType.Tclunk, MessageType.Rclunk, mRootFid);
-            mConfiguration.transmitter.sendMessage(tClunk, mClientId, mTimeout).getResult();
+            final StyxTMessageFID tClunk = new StyxTMessageFID(MessageType.Tclunk, mRootFid);
+            mConfiguration.transmitter.sendMessage(tClunk, mClientId).getResult(mTimeout);
             mRootFid = Constants.NOFID;
         }
         StyxMessage rMessage = mConfiguration.transmitter.sendMessage(
                 mConfiguration.di.getMessageFactory().constructTVersion(mDetails.ioUnit(), getProtocol()),
-                mClientId,
-                mTimeout).getResult();
+                mClientId).getResult(mTimeout);
         StyxRVersionMessage rVersion = (StyxRVersionMessage) rMessage;
         if (rVersion.maxPacketSize < mDetails.ioUnit()) {
             mDetails = new ConnectionDetails(getProtocol(), (int) rVersion.maxPacketSize);
@@ -205,7 +204,7 @@ private void sendAuthMessage()
 
             StyxMessage tAuth = mConfiguration.di.getMessageFactory().constructTAuth(mAuthFID,
                     mConfiguration.credentials.getUserName(), getMountPoint());
-            StyxMessage rMessage = mConfiguration.transmitter.sendMessage(tAuth, mClientId, mTimeout).getResult();
+            StyxMessage rMessage = mConfiguration.transmitter.sendMessage(tAuth, mClientId).getResult(mTimeout);
             StyxRAuthMessage rAuth = (StyxRAuthMessage) rMessage;
             mAuthQID = rAuth.getQID();
 
@@ -220,8 +219,9 @@ private void sendAuthMessage()
         StyxMessage tAttach = mConfiguration.di.getMessageFactory().constructTAttach(mRootFid, getAuthFID(),
                 mConfiguration.credentials.getUserName(),
                 getMountPoint());
-        var rAttach = (StyxRAttachMessage)mConfiguration.transmitter.sendMessage(tAttach, mClientId, mTimeout)
-                .getResult();
+        var rAttach = (StyxRAttachMessage)mConfiguration.transmitter
+                .sendMessage(tAttach, mClientId)
+                .getResult(mTimeout);
         mQID = rAttach.getQID();
         setAttached(true);
     }

java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/StyxTCreateMessage.java

@@ -9,7 +9,7 @@ public class StyxTCreateMessage extends StyxTMessageFID {
     public final int mode;
 
     public StyxTCreateMessage(long fid, String name, long permissions, int mode) {
-        super(MessageType.Tcreate, MessageType.Rcreate, fid);
+        super(MessageType.Tcreate, fid);
         this.name = name;
         this.permissions = permissions;
         this.mode = mode;

java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/StyxTFlushMessage.java

@@ -7,7 +7,7 @@ public class StyxTFlushMessage extends StyxTMessage {
 	public final int oldTag;
 
 	public StyxTFlushMessage(int tag){
-		super(MessageType.Tflush, MessageType.Rflush);
+		super(MessageType.Tflush);
 		oldTag = tag;
 	}
 

java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/StyxTOpenMessage.java

@@ -7,7 +7,7 @@ public class StyxTOpenMessage extends StyxTMessageFID {
     public final int mode;
 
     public StyxTOpenMessage(long fid, int mode) {
-        super(MessageType.Topen, MessageType.Ropen, fid);
+        super(MessageType.Topen, fid);
         this.mode = mode;
     }
 

java/v2styx-lib/src/main/java/com/v2soft/styxlib/l5/messages/StyxTReadMessage.java

@@ -8,7 +8,7 @@ public class StyxTReadMessage extends StyxTMessageFID {
 	public final int count;
 
 	public StyxTReadMessage(long fid, long offset, int count)	{
-		super(MessageType.Tread, MessageType.Rread, fid);
+		super(MessageType.Tread, fid);
 		this.offset = offset;
 		this.count = count;
 	}