Merge pull request #2 from alexarchambault/develop

Add helpers to convert channels to java.net.*Socket

Author: alexarchambault

.scalafmt.conf

@@ -35,3 +35,11 @@ project.excludeFilters = [
   ".metals"
   "out"
 ]
+fileOverride {
+  "glob:**/manual/client/src/**" {
+     runner.dialect = scala3
+  }
+  "glob:**/manual/server/src/**" {
+     runner.dialect = scala3
+  }
+}

library/src/libdaemonjvm/Util.scala

@@ -0,0 +1,50 @@
+package libdaemonjvm
+
+import java.net.{ServerSocket, Socket}
+import java.nio.ByteBuffer
+import java.nio.channels.{Channels, ReadableByteChannel, ServerSocketChannel, SocketChannel}
+
+object Util {
+
+  def socketFromChannel(channel: SocketChannel): Socket =
+    new Socket {
+      override def getInputStream() =
+        Channels.newInputStream(
+          // Passing a custom ReadableByteChannel rather than channel,
+          // so that ChannelInputStream doesn't try to acquire the "blocking lock",
+          // that's also acquired by output stream stuff below (which causes reads and
+          // writes to block each other).
+          new ReadableByteChannel {
+            override def read(dst: ByteBuffer) =
+              channel.read(dst)
+            override def close() =
+              channel.close()
+            override def isOpen() =
+              channel.isOpen()
+          }
+        )
+      override def getOutputStream() =
+        Channels.newOutputStream(channel)
+      // override def getLocalAddress() =
+      //   channel.getLocalAddress()
+      override def isConnected() =
+        channel.isConnected()
+      override def getRemoteSocketAddress() =
+        channel.getRemoteAddress()
+      override def close() =
+        channel.close()
+      override def shutdownInput() =
+        channel.shutdownInput()
+      override def shutdownOutput() =
+        channel.shutdownOutput()
+    }
+
+  def serverSocketFromChannel(serverChannel: ServerSocketChannel): ServerSocket =
+    new ServerSocket {
+      override def accept() =
+        socketFromChannel(serverChannel.accept())
+      override def close() =
+        serverChannel.close()
+      override def getLocalPort() = -1
+    }
+}

library/src/libdaemonjvm/errors/ConnectExceptionLike.scala

@@ -0,0 +1,3 @@
+package libdaemonjvm.errors
+
+class ConnectExceptionLike(cause: Throwable) extends SocketExceptionLike(cause)

library/src/libdaemonjvm/internal/SocketExceptionLike.scala renamed to library/src/libdaemonjvm/errors/SocketExceptionLike.scala

@@ -1,4 +1,4 @@
-package libdaemonjvm.internal
+package libdaemonjvm.errors
 
 import java.io.IOException
 

library/src/libdaemonjvm/internal/SocketFile.scala

@@ -5,6 +5,7 @@ import java.nio.channels.SocketChannel
 import java.nio.file.Path
 import java.net.Socket
 
+import libdaemonjvm.errors._
 import libdaemonjvm.SocketPaths
 
 object SocketFile {

library/src/libdaemonjvm/internal/SocketHandler.scala

@@ -12,6 +12,7 @@ import scala.util.Properties
 import org.scalasbt.ipcsocket.Win32NamedPipeSocket
 import org.scalasbt.ipcsocket.Win32NamedPipeServerSocket
 
+import libdaemonjvm.errors._
 import libdaemonjvm.SocketPaths
 
 object SocketHandler {
@@ -21,7 +22,7 @@ object SocketHandler {
         if Option(ex.getCause)
           .collect { case e: NativeErrorException => e }
           .exists(e => connectionRelatedCodes(e.returnCode)) =>
-      throw new SocketExceptionLike(ex)
+      throw new ConnectExceptionLike(ex)
     case ex: IOException if ex.getMessage.contains("error code 2") =>
       throw new SocketExceptionLike(ex)
     case ex: IOException if ex.getMessage.contains("Couldn't open pipe for") =>