drop expect/actual for currentMillis

rsocket · Nov 13, 2023 · 67573af · 67573af
1 parent 2f4e1d0
commit 67573af
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 64 deletions.
diff --git a/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/KeepAliveHandler.kt b/rsocket-core/src/commonMain/kotlin/io/rsocket/kotlin/internal/KeepAliveHandler.kt
@@ -22,11 +22,15 @@ import io.rsocket.kotlin.frame.*
 import io.rsocket.kotlin.keepalive.*
 import kotlinx.atomicfu.*
 import kotlinx.coroutines.*
+import kotlin.time.*
 
 internal class KeepAliveHandler(
     private val keepAlive: KeepAlive,
-    private val sender: FrameSender
+    private val sender: FrameSender,
 ) {
+    private val initial = TimeSource.Monotonic.markNow()
+    private fun currentMillis() = initial.elapsedNow().inWholeMilliseconds
+
     private val lastMark = atomic(currentMillis()) // mark initial timestamp for keepalive
 
     suspend fun mark(frame: KeepAliveFrame) {
@@ -42,5 +46,3 @@ internal class KeepAliveHandler(
         sender.sendKeepAlive(true, 0, ByteReadPacket.Empty)
     }
 }
-
-internal expect fun currentMillis(): Long
diff --git a/rsocket-core/src/jsMain/kotlin/io/rsocket/kotlin/internal/currentMillis.kt b/rsocket-core/src/jsMain/kotlin/io/rsocket/kotlin/internal/currentMillis.kt
diff --git a/rsocket-core/src/jvmMain/kotlin/io/rsocket/kotlin/internal/currentMillis.kt b/rsocket-core/src/jvmMain/kotlin/io/rsocket/kotlin/internal/currentMillis.kt
diff --git a/rsocket-core/src/nativeMain/kotlin/io/rsocket/kotlin/internal/currentMillis.kt b/rsocket-core/src/nativeMain/kotlin/io/rsocket/kotlin/internal/currentMillis.kt