Inline function Key.Private.withKeyOrNull (#562)

Author: 05nelsonm

library/runtime-core/api/runtime-core.api

@@ -4084,7 +4084,6 @@ public abstract class io/matthewnelson/kmp/tor/runtime/core/key/Key$Private : io
 	public final fun hashCode ()I
 	public final fun isDestroyed ()Z
 	public final fun toString ()Ljava/lang/String;
-	protected final fun withKeyOrNull (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
 }
 
 public abstract class io/matthewnelson/kmp/tor/runtime/core/key/Key$Public : io/matthewnelson/kmp/tor/runtime/core/key/Key, java/security/PublicKey {

library/runtime-core/api/runtime-core.klib.api

@@ -3608,7 +3608,6 @@ sealed class io.matthewnelson.kmp.tor.runtime.core.key/Key { // io.matthewnelson
     sealed class Private : io.matthewnelson.kmp.tor.runtime.core.key/Key, io.matthewnelson.kmp.tor.runtime.core/Destroyable { // io.matthewnelson.kmp.tor.runtime.core.key/Key.Private|null[0]
         constructor <init>(kotlin/ByteArray) // io.matthewnelson.kmp.tor.runtime.core.key/Key.Private.<init>|<init>(kotlin.ByteArray){}[0]
 
-        final fun <#A2: kotlin/Any> withKeyOrNull(kotlin/Function1<kotlin/ByteArray, #A2>): #A2? // io.matthewnelson.kmp.tor.runtime.core.key/Key.Private.withKeyOrNull|withKeyOrNull(kotlin.Function1<kotlin.ByteArray,0:0>){0§<kotlin.Any>}[0]
         final fun base16(): kotlin/String // io.matthewnelson.kmp.tor.runtime.core.key/Key.Private.base16|base16(){}[0]
         final fun base16OrNull(): kotlin/String? // io.matthewnelson.kmp.tor.runtime.core.key/Key.Private.base16OrNull|base16OrNull(){}[0]
         final fun base32(): kotlin/String // io.matthewnelson.kmp.tor.runtime.core.key/Key.Private.base32|base32(){}[0]

library/runtime-core/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/EnqueuedJob.kt

@@ -443,9 +443,9 @@ public abstract class EnqueuedJob protected constructor(
                 }
 
                 internal companion object {
+
                     @JvmSynthetic
-                    internal fun get(): BuilderScope =
-                        BuilderScope()
+                    internal fun get(): BuilderScope = BuilderScope()
                 }
             }
 

library/runtime-core/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/key/ED25519_V3.kt

@@ -17,8 +17,6 @@
 
 package io.matthewnelson.kmp.tor.runtime.core.key
 
-import io.matthewnelson.encoding.base16.Base16
-import io.matthewnelson.encoding.base64.Base64
 import io.matthewnelson.kmp.tor.runtime.core.net.OnionAddress
 import io.matthewnelson.kmp.tor.runtime.core.net.OnionAddress.V3.Companion.toOnionAddressV3OrNull
 import io.matthewnelson.kmp.tor.runtime.core.internal.tryDecodeOrNull

library/runtime-core/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/key/Key.kt

@@ -71,8 +71,6 @@ public expect sealed class Key private constructor() {
         public final override fun base32OrNull(): String?
         public final override fun base64OrNull(): String?
 
-        protected fun <T: Any> withKeyOrNull(block: (key: ByteArray) -> T): T?
-
         /** @suppress */
         public final override fun equals(other: Any?): Boolean
         /** @suppress */

library/runtime-core/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/net/LocalHost.kt

@@ -66,8 +66,9 @@ public sealed class LocalHost private constructor(): Address("localhost") {
         internal override fun fromCache(): IPAddress.V6? = Cache.getOrNull()?.firstOrNull()
     }
 
-    private class Cache private constructor(private val addresses: Set<IPAddress>) {
+    private class Cache private constructor(addresses: Set<IPAddress>) {
 
+        private val addresses: Set<IPAddress> = addresses.toImmutableSet()
         private val timeMark = TimeSource.Monotonic.markNow()
 
         private fun isNotExpired(): Boolean {
@@ -114,8 +115,9 @@ public sealed class LocalHost private constructor(): Address("localhost") {
                 addresses.add(IPAddress.V4.loopback())
                 addresses.add(IPAddress.V6.loopback())
 
-                _cache = Cache(addresses.toImmutableSet())
-                return addresses
+                val c = Cache(addresses)
+                _cache = c
+                return c.addresses
             }
 
             @JvmStatic
@@ -135,9 +137,7 @@ public sealed class LocalHost private constructor(): Address("localhost") {
 
     public companion object {
 
-        /**
-         * @suppress
-         * */
+        /** @suppress */
         @InternalKmpTorApi
         @Throws(IOException::class)
         public fun refreshCache() { Cache.resolve(checkCache = false) }

library/runtime-core/src/jvmMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/key/Key.kt

@@ -28,6 +28,9 @@ import io.matthewnelson.kmp.tor.common.core.synchronized
 import io.matthewnelson.kmp.tor.runtime.core.Destroyable
 import io.matthewnelson.kmp.tor.runtime.core.Destroyable.Companion.destroyedException
 import kotlin.concurrent.Volatile
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
 
 /**
  * Base abstraction for Public/Private keys used in tor.
@@ -104,10 +107,14 @@ public actual sealed class Key private actual constructor(): java.security.Key {
         public actual final override fun base32OrNull(): String? = withKeyOrNull { it.encodeToString(BASE_32) }
         public actual final override fun base64OrNull(): String? = withKeyOrNull { it.encodeToString(BASE_64) }
 
-        @OptIn(InternalKmpTorApi::class)
-        protected actual fun <T : Any> withKeyOrNull(
+        @OptIn(ExperimentalContracts::class, InternalKmpTorApi::class)
+        private inline fun <T : Any> withKeyOrNull(
             block: (key: ByteArray) -> T
         ): T? {
+            contract {
+                callsInPlace(block, InvocationKind.AT_MOST_ONCE)
+            }
+
             if (_destroyed) return null
 
             return synchronized(lock) {

library/runtime-core/src/nonJvmMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/key/Key.kt

@@ -28,6 +28,9 @@ import io.matthewnelson.kmp.tor.common.core.synchronized
 import io.matthewnelson.kmp.tor.runtime.core.Destroyable
 import io.matthewnelson.kmp.tor.runtime.core.Destroyable.Companion.destroyedException
 import kotlin.concurrent.Volatile
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.InvocationKind
+import kotlin.contracts.contract
 
 /**
  * Base abstraction for Public/Private keys used in tor.
@@ -97,10 +100,14 @@ public actual sealed class Key private actual constructor() {
         public actual final override fun base32OrNull(): String? = withKeyOrNull { it.encodeToString(BASE_32) }
         public actual final override fun base64OrNull(): String? = withKeyOrNull { it.encodeToString(BASE_64) }
 
-        @OptIn(InternalKmpTorApi::class)
-        protected actual fun <T : Any> withKeyOrNull(
+        @OptIn(ExperimentalContracts::class, InternalKmpTorApi::class)
+        private inline fun <T : Any> withKeyOrNull(
             block: (key: ByteArray) -> T
         ): T? {
+            contract {
+                callsInPlace(block, InvocationKind.AT_MOST_ONCE)
+            }
+
             if (_destroyed) return null
 
             return synchronized(lock) {