tor: Implement HsDescEventParser

network/tor/tor/src/main/java/bisq/tor/controller/HsDescEventParser.java

@@ -0,0 +1,48 @@
+package bisq.tor.controller;
+
+import bisq.tor.controller.events.events.HsDescCreatedEvent;
+import bisq.tor.controller.events.events.HsDescEvent;
+import bisq.tor.controller.events.events.HsDescUploadEvent;
+import bisq.tor.controller.events.events.HsDescUploadedEventV2;
+
+import java.util.Optional;
+
+public class HsDescEventParser {
+    public static Optional<HsDescEvent> tryParse(String[] parts) {
+        if (HsDescEvent.Action.CREATED.isAction(parts)) {
+            // 650 HS_DESC CREATED <onion_address> UNKNOWN UNKNOWN <descriptor_id>
+            HsDescCreatedEvent hsDescEvent = HsDescCreatedEvent.builder()
+                    .action(HsDescEvent.Action.CREATED)
+                    .hsAddress(parts[3])
+                    .authType(parts[4])
+                    .hsDir(parts[5])
+                    .descriptorId(parts[6])
+                    .build();
+            return Optional.of(hsDescEvent);
+
+        } else if (HsDescEvent.Action.UPLOAD.isAction(parts)) {
+            // 650 HS_DESC UPLOAD <onion_address> UNKNOWN <hs_dir> <descriptor_id> HSDIR_INDEX=<index>
+            HsDescUploadEvent hsDescEvent = HsDescUploadEvent.builder()
+                    .action(HsDescEvent.Action.UPLOAD)
+                    .hsAddress(parts[3])
+                    .authType(parts[4])
+                    .hsDir(parts[5])
+                    .descriptorId(parts[6])
+                    .hsDirIndex(parts[7])
+                    .build();
+            return Optional.of(hsDescEvent);
+
+        } else if (HsDescEvent.Action.UPLOADED.isAction(parts)) {
+            // 650 HS_DESC UPLOADED <onion_address> UNKNOWN <hs_dir>
+            HsDescUploadedEventV2 hsDescEvent = HsDescUploadedEventV2.builder()
+                    .action(HsDescEvent.Action.UPLOADED)
+                    .hsAddress(parts[3])
+                    .authType(parts[4])
+                    .hsDir(parts[5])
+                    .build();
+            return Optional.of(hsDescEvent);
+        } else {
+            return Optional.empty();
+        }
+    }
+}

network/tor/tor/src/main/java/bisq/tor/controller/TorControlProtocol.java

@@ -20,9 +20,8 @@ public class TorControlProtocol implements AutoCloseable {
     private final OutputStream outputStream;
 
     // MidReplyLine = StatusCode "-" ReplyLine
-    private final Pattern midReplyLinePattern = Pattern.compile("^\\d+-.+");
     // DataReplyLine = StatusCode "+" ReplyLine CmdData
-    private final Pattern dataReplyLinePattern = Pattern.compile("^\\d+\\+.+");
+    private final Pattern multiLineReplyPattern = Pattern.compile("^\\d+[-+].+");
 
     public TorControlProtocol(int port) throws IOException {
         controlSocket = new Socket("127.0.0.1", port);
@@ -148,7 +147,7 @@ private String tryReadNextReply() {
     }
 
     private boolean isMultilineReply(String reply) {
-        return midReplyLinePattern.matcher(reply).matches() || dataReplyLinePattern.matcher(reply).matches();
+        return multiLineReplyPattern.matcher(reply).matches();
     }
 
     private String assertTwoLineOkReply(Stream<String> replyStream, String commandName) {

network/tor/tor/src/main/java/bisq/tor/controller/events/events/HsDescCreatedEvent.java

@@ -0,0 +1,13 @@
+package bisq.tor.controller.events.events;
+
+import lombok.Getter;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+
+@SuperBuilder
+@Getter
+@ToString(callSuper = true)
+public class HsDescCreatedEvent extends HsDescEvent {
+    private final String descriptorId;
+}

network/tor/tor/src/main/java/bisq/tor/controller/events/events/HsDescEvent.java

@@ -0,0 +1,34 @@
+package bisq.tor.controller.events.events;
+
+import lombok.Getter;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+@SuperBuilder
+@Getter
+@ToString
+public abstract class HsDescEvent {
+
+    @Getter
+    public enum Action {
+        CREATED(7),
+        UPLOAD(8),
+        UPLOADED(6);
+
+        private final int numberOfArgs;
+
+        Action(int numberOfArgs) {
+            this.numberOfArgs = numberOfArgs;
+        }
+
+        public boolean isAction(String[] parts) {
+            // Example: 650 HS_DESC CREATED <onion_address> UNKNOWN UNKNOWN <descriptor_id>
+            return parts[2].equals(this.toString()) && parts.length == numberOfArgs;
+        }
+    }
+
+    protected final Action action;
+    protected final String hsAddress;
+    protected final String authType;
+    protected final String hsDir;
+}

network/tor/tor/src/main/java/bisq/tor/controller/events/events/HsDescUploadEvent.java

@@ -0,0 +1,12 @@
+package bisq.tor.controller.events.events;
+
+import lombok.Getter;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+@SuperBuilder
+@Getter
+@ToString(callSuper = true)
+public class HsDescUploadEvent extends HsDescCreatedEvent {
+    private final String hsDirIndex;
+}

network/tor/tor/src/main/java/bisq/tor/controller/events/events/HsDescUploadedEventV2.java

@@ -0,0 +1,11 @@
+package bisq.tor.controller.events.events;
+
+import lombok.Getter;
+import lombok.ToString;
+import lombok.experimental.SuperBuilder;
+
+@SuperBuilder
+@Getter
+@ToString(callSuper = true)
+public class HsDescUploadedEventV2 extends HsDescEvent {
+}