* Initial MySensors proof of concept module #2

Signed-off-by: Piotr Sobiech <[email protected]>
psobiech · Feb 9, 2024 · dade3c5 · dade3c5
1 parent 5906e8f
commit dade3c5
Show file tree

Hide file tree

Showing 11 changed files with 582 additions and 251 deletions.
diff --git a/modules/common/src/main/java/pl/psobiech/opengr8on/util/SocketUtil.java b/modules/common/src/main/java/pl/psobiech/opengr8on/util/SocketUtil.java
@@ -38,6 +38,8 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.locks.ReentrantLock;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import pl.psobiech.opengr8on.exceptions.UncheckedInterruptedException;
 import pl.psobiech.opengr8on.exceptions.UnexpectedException;
 
@@ -84,6 +86,8 @@ public static UDPSocket udpRandomPort(InetAddress address) {
      * TCP socket wrapper
      */
     public static class TCPClientSocket implements Closeable {
+        private static final Logger LOGGER = LoggerFactory.getLogger(TCPClientSocket.class);
+
         /**
          * Local network address
          */
@@ -113,23 +117,35 @@ public TCPClientSocket(InetAddress address, int port) {
             this.port    = port;
         }
 
-        public void send(byte[] buffer) throws IOException {
+        public void send(byte[]... buffers) throws IOException {
             ensureConnected();
 
             try {
                 final OutputStream outputStream = socket.getOutputStream();
-                outputStream.write(buffer);
+                for (byte[] buffer : buffers) {
+                    outputStream.write(buffer);
+                }
+
                 outputStream.flush();
             } catch (SocketException e) {
+                if (UncheckedInterruptedException.wasSocketInterrupted(e)) {
+                    throw new UncheckedInterruptedException(e);
+                }
+
                 // TODO: proper retry / broken pipe handling
                 disconnect();
                 ensureConnected();
 
                 try {
                     final OutputStream outputStream = socket.getOutputStream();
-                    outputStream.write(buffer);
+                    for (byte[] buffer : buffers) {
+                        outputStream.write(buffer);
+                    }
+
                     outputStream.flush();
                 } catch (Exception e2) {
+                    LOGGER.error(e2.getMessage(), e2);
+
                     throw e;
                 }
             }
@@ -207,7 +223,7 @@ private void ensureConnected() throws IOException {
         public void connect() throws IOException {
             socketLock.lock();
             try {
-                this.socket.connect(new InetSocketAddress(address, port), DEFAULT_TIMEOUT_MILLISECONDS);
+                socket.connect(new InetSocketAddress(address, port), DEFAULT_TIMEOUT_MILLISECONDS);
             } finally {
                 socketLock.unlock();
             }
@@ -217,7 +233,7 @@ public void connect() throws IOException {
         public void close() {
             socketLock.lock();
             try {
-                IOUtil.closeQuietly(this.socket);
+                IOUtil.closeQuietly(socket);
             } finally {
                 socketLock.unlock();
             }

diff --git a/modules/common/src/main/java/pl/psobiech/opengr8on/util/Util.java b/modules/common/src/main/java/pl/psobiech/opengr8on/util/Util.java
@@ -28,10 +28,15 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import pl.psobiech.opengr8on.exceptions.UncheckedInterruptedException;
+
 public final class Util {
+    private static final long NANOS_IN_MILLISECOND = TimeUnit.MILLISECONDS.toNanos(1);
+
     private Util() {
         // NOP
     }
@@ -176,4 +181,15 @@ public static <V1, V2> String stringifyMap(
 
         return sb.toString();
     }
+
+    public static void sleepNanos(long nanoSeconds) {
+        final long millis = nanoSeconds / NANOS_IN_MILLISECOND;
+        final int nanos = (int) (nanoSeconds % NANOS_IN_MILLISECOND);
+
+        try {
+            Thread.sleep(millis, nanos);
+        } catch (InterruptedException e) {
+            throw new UncheckedInterruptedException(e);
+        }
+    }
 }