fixup! KTOR-6004 Support TCP and Unix socket for wasm-js and js via N…

…odeJS (#4411)
ktorio · Jan 8, 2025 · 7a3736b · 7a3736b
1 parent 4188d2a
commit 7a3736b
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 47 deletions.
diff --git a/ktor-network/common/test/io/ktor/network/sockets/tests/TestUtils.kt b/ktor-network/common/test/io/ktor/network/sockets/tests/TestUtils.kt
@@ -1,18 +1,20 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.sockets.tests
 
 import io.ktor.network.selector.*
 import io.ktor.test.dispatcher.*
-import io.ktor.utils.io.core.*
-import kotlinx.coroutines.*
-import kotlinx.coroutines.test.*
-import kotlinx.io.files.*
-import kotlin.time.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.test.TestResult
+import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
+import kotlinx.io.files.SystemTemporaryDirectory
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
-import kotlin.uuid.*
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 internal fun testSockets(
     timeout: Duration = 1.minutes,

diff --git a/ktor-network/jsAndWasmShared/src/io/ktor/network/selector/Selectable.jsAndWasmShared.kt b/ktor-network/jsAndWasmShared/src/io/ktor/network/selector/Selectable.jsAndWasmShared.kt
@@ -1,11 +1,7 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.selector
 
-import io.ktor.network.util.*
-
 public actual interface Selectable
-
-internal actual fun Any.supportsUnixDomainSockets(): Boolean = isAFUnixSupported
diff --git a/ktor-network/jsAndWasmShared/test/io/ktor/network/sockets/tests/TestUtils.jsAndWasmShared.kt b/ktor-network/jsAndWasmShared/test/io/ktor/network/sockets/tests/TestUtils.jsAndWasmShared.kt
@@ -0,0 +1,7 @@
+/*
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.network.sockets.tests
+
+internal actual fun Any.supportsUnixDomainSockets(): Boolean = false
diff --git a/ktor-network/jsAndWasmShared/test/io/ktor/network/sockets/tests/TestUtils.kt b/ktor-network/jsAndWasmShared/test/io/ktor/network/sockets/tests/TestUtils.kt
diff --git a/...tor/network/sockets/tests/TestUtilsIos.kt → ...or/network/sockets/tests/TestUtils.nix.kt b/...tor/network/sockets/tests/TestUtilsIos.kt → ...or/network/sockets/tests/TestUtils.nix.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.sockets.tests

diff --git a/ktor-network/posix/test/io/ktor/network/sockets/tests/TestUtils.posix.kt b/ktor-network/posix/test/io/ktor/network/sockets/tests/TestUtils.posix.kt
diff --git a/ktor-network/tvos/test/io/ktor/network/sockets/tests/TestUtilsTvos.kt b/ktor-network/tvos/test/io/ktor/network/sockets/tests/TestUtilsTvos.kt
diff --git a/ktor-network/watchos/test/io/ktor/network/sockets/tests/TestUtilsWatchos.kt b/ktor-network/watchos/test/io/ktor/network/sockets/tests/TestUtilsWatchos.kt
diff --git a/ktor-network/windows/test/io/ktor/network/sockets/tests/TestUtils.windows.kt b/ktor-network/windows/test/io/ktor/network/sockets/tests/TestUtils.windows.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.network.sockets.tests
+
+import io.ktor.network.util.*
+
+internal actual fun Any.supportsUnixDomainSockets(): Boolean = isAFUnixSupported