adopted crypto2 0.4.*

src/jvmMain/kotlin/net/sergeych/kiloparsec/adapter/WebsocketServer.kt

@@ -21,7 +21,7 @@ import java.time.Duration
 fun <S> Application.setupWebsocketServer(
     localInterface: KiloInterface<S>,
     path: String = "/kp",
-    serverKey: SigningKey.Secret? = null,
+    serverKey: SigningKey? = null,
     createSession: () -> S,
 ) {
 

src/jvmMain/kotlin/net/sergeych/kiloparsec/adapter/asyncSocketToDevice.kt

@@ -4,12 +4,12 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
 import kotlinx.coroutines.flow.MutableStateFlow
+import net.sergeych.crypto2.Contrail
 import net.sergeych.crypto2.encodeVarUnsigned
 import net.sergeych.crypto2.readVarUnsigned
 import net.sergeych.kiloparsec.RemoteInterface
 import net.sergeych.kiloparsec.Transport
 import net.sergeych.mp_logger.LogTag
-import net.sergeych.mp_logger.info
 import net.sergeych.mp_logger.warning
 import net.sergeych.mp_tools.globalLaunch
 import net.sergeych.tools.waitFor
@@ -25,7 +25,10 @@ private val log = LogTag("ASTD")
 /**
  * Prepend block with its size, varint-encoded
  */
-private fun encode(block: UByteArray): ByteArray = (encodeVarUnsigned(block.size.toUInt()) + block).toByteArray()
+private fun encode(block: UByteArray): ByteArray {
+    val c = Contrail.create(block)
+    return (encodeVarUnsigned(c.size.toUInt()) + c).toByteArray()
+}
 
 /**
  * Convert asynchronous socket to a [Transport.Device] using non-blocking nio,
@@ -122,7 +125,8 @@ suspend fun asyncSocketToDevice(socket: AsynchronousSocketChannel): InetTranspor
                             for (i in 0..<size.toInt()) {
                                 block[i] = input.receive()
                             }
-                            inputBlocks.send(block)
+                            Contrail.unpack(block)?.let { inputBlocks.send(it) }
+                                ?: log.warning { "skipping bad block ${block.size} bytes" }
                         }
                     }
                 } catch (_: CancellationException) {
@@ -135,17 +139,13 @@ suspend fun asyncSocketToDevice(socket: AsynchronousSocketChannel): InetTranspor
             val addr = socket.remoteAddress as InetSocketAddress
             deferredDevice.complete(
                 InetTransportDevice(inputBlocks, outputBlocks, JvmNetworkAddress(addr.address, addr.port), {
-                    val log = LogTag("S:${addr.address}:${addr.port}")
-                    log.info { "ASTD is waitig to close" }
                     yield()
                     // wait until all received data are parsed, but not too long
                     withTimeoutOrNull(500) {
                         receiving.waitFor { !it }
                     }
                     // then stop it
-                    log.info { "ASTd is calling STOP" }
                     stop()
-                    log.info { "STopped" }
                 })
             )
         }