Revert "Sendable Take 2 (#136)"

This reverts commit a8f3ec8.
vapor · May 25, 2023 · 0ba2f8a · 0ba2f8a
1 parent a8f3ec8
commit 0ba2f8a
Show file tree

Hide file tree

Showing 13 changed files with 175 additions and 233 deletions.
diff --git a/.api-breakage/allowlist-branch-sendable-take-2.txt b/.api-breakage/allowlist-branch-sendable-take-2.txt
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,9 @@ concurrency:
 on:
   pull_request: { types: [opened, reopened, synchronize, ready_for_review] }
   push: { branches: [ main ] }
+
 jobs:
+
   vapor-integration:
     if: ${{ !(github.event.pull_request.draft || false) }}
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,3 @@
 DerivedData
 .swiftpm
 Package.resolved
-.devcontainer/
diff --git a/Package.swift b/Package.swift
@@ -16,8 +16,8 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.53.0"),
         .package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.16.0"),
         .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.24.0"),
-        .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.16.0"),
-        .package(url: "https://github.com/apple/swift-atomics.git", from: "1.1.0"),
+        .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.11.4"),
+        .package(url: "https://github.com/apple/swift-atomics.git", from: "1.0.2"),
     ],
     targets: [
         .target(name: "WebSocketKit", dependencies: [

diff --git a/Sources/WebSocketKit/Concurrency/WebSocket+Concurrency.swift b/Sources/WebSocketKit/Concurrency/WebSocket+Concurrency.swift
@@ -40,52 +40,44 @@ extension WebSocket {
         try await close(code: code).get()
     }
 
-    @preconcurrency public func onText(_ callback: @Sendable @escaping (WebSocket, String) async -> ()) {
-        self.eventLoop.execute {
-            self.onText { socket, text in
-                Task {
-                    await callback(socket, text)
-                }
+    public func onText(_ callback: @escaping (WebSocket, String) async -> ()) {
+        onText { socket, text in
+            Task {
+                await callback(socket, text)
             }
         }
     }
 
-    @preconcurrency public func onBinary(_ callback: @Sendable @escaping (WebSocket, ByteBuffer) async -> ()) {
-        self.eventLoop.execute {
-            self.onBinary { socket, binary in
-                Task {
-                    await callback(socket, binary)
-                }
+    public func onBinary(_ callback: @escaping (WebSocket, ByteBuffer) async -> ()) {
+        onBinary { socket, binary in
+            Task {
+                await callback(socket, binary)
             }
         }
     }
 
-    @preconcurrency public func onPong(_ callback: @Sendable @escaping (WebSocket) async -> ()) {
-        self.eventLoop.execute {
-            self.onPong { socket in
-                Task {
-                    await callback(socket)
-                }
+    public func onPong(_ callback: @escaping (WebSocket) async -> ()) {
+        onPong { socket in
+            Task {
+                await callback(socket)
             }
         }
     }
 
-    @preconcurrency public func onPing(_ callback: @Sendable @escaping (WebSocket) async -> ()) {
-        self.eventLoop.execute {
-            self.onPing { socket in
-                Task {
-                    await callback(socket)
-                }
+    public func onPing(_ callback: @escaping (WebSocket) async -> ()) {
+        onPing { socket in
+            Task {
+                await callback(socket)
             }
         }
     }
 
-    @preconcurrency public static func connect(
+    public static func connect(
         to url: String,
         headers: HTTPHeaders = [:],
         configuration: WebSocketClient.Configuration = .init(),
         on eventLoopGroup: EventLoopGroup,
-        onUpgrade: @Sendable @escaping (WebSocket) async -> ()
+        onUpgrade: @escaping (WebSocket) async -> ()
     ) async throws {
         return try await self.connect(
             to: url,
@@ -100,12 +92,12 @@ extension WebSocket {
         ).get()
     }
 
-    @preconcurrency public static func connect(
+    public static func connect(
         to url: URL,
         headers: HTTPHeaders = [:],
         configuration: WebSocketClient.Configuration = .init(),
         on eventLoopGroup: EventLoopGroup,
-        onUpgrade: @Sendable @escaping (WebSocket) async -> ()
+        onUpgrade: @escaping (WebSocket) async -> ()
     ) async throws {
         return try await self.connect(
             to: url,
@@ -120,7 +112,7 @@ extension WebSocket {
         ).get()
     }
 
-    @preconcurrency public static func connect(
+    public static func connect(
         scheme: String = "ws",
         host: String,
         port: Int = 80,
@@ -129,7 +121,7 @@ extension WebSocket {
         headers: HTTPHeaders = [:],
         configuration: WebSocketClient.Configuration = .init(),
         on eventLoopGroup: EventLoopGroup,
-        onUpgrade: @Sendable @escaping (WebSocket) async -> ()
+        onUpgrade: @escaping (WebSocket) async -> ()
     ) async throws {
         return try await self.connect(
             scheme: scheme,

diff --git a/Sources/WebSocketKit/Exports.swift b/Sources/WebSocketKit/Exports.swift
@@ -6,7 +6,9 @@
 @_documentation(visibility: internal) @_exported import protocol NIOCore.EventLoopGroup
 @_documentation(visibility: internal) @_exported import struct NIOCore.EventLoopPromise
 @_documentation(visibility: internal) @_exported import class NIOCore.EventLoopFuture
+
 @_documentation(visibility: internal) @_exported import struct NIOHTTP1.HTTPHeaders
+
 @_documentation(visibility: internal) @_exported import struct Foundation.URL
 
 #else
@@ -17,7 +19,9 @@
 @_exported import protocol NIOCore.EventLoopGroup
 @_exported import struct NIOCore.EventLoopPromise
 @_exported import class NIOCore.EventLoopFuture
+
 @_exported import struct NIOHTTP1.HTTPHeaders
+
 @_exported import struct Foundation.URL
 
 #endif
diff --git a/Sources/WebSocketKit/WebSocket+Connect.swift b/Sources/WebSocketKit/WebSocket+Connect.swift
@@ -12,13 +12,12 @@ extension WebSocket {
     ///   - eventLoopGroup: Event loop group to be used by the WebSocket client.
     ///   - onUpgrade: An escaping closure to be executed after the upgrade is completed by `NIOWebSocketClientUpgrader`.
     /// - Returns: An future which completes when the connection to the WebSocket server is established.
-    @preconcurrency
     public static func connect(
         to url: String,
         headers: HTTPHeaders = [:],
         configuration: WebSocketClient.Configuration = .init(),
         on eventLoopGroup: EventLoopGroup,
-        onUpgrade: @Sendable @escaping (WebSocket) -> ()
+        onUpgrade: @escaping (WebSocket) -> ()
     ) -> EventLoopFuture<Void> {
         guard let url = URL(string: url) else {
             return eventLoopGroup.any().makeFailedFuture(WebSocketClient.Error.invalidURL)
@@ -41,13 +40,12 @@ extension WebSocket {
     ///   - eventLoopGroup: Event loop group to be used by the WebSocket client.
     ///   - onUpgrade: An escaping closure to be executed after the upgrade is completed by `NIOWebSocketClientUpgrader`.
     /// - Returns: An future which completes when the connection to the WebSocket server is established.
-    @preconcurrency
     public static func connect(
         to url: URL,
         headers: HTTPHeaders = [:],
         configuration: WebSocketClient.Configuration = .init(),
         on eventLoopGroup: EventLoopGroup,
-        onUpgrade: @Sendable @escaping (WebSocket) -> ()
+        onUpgrade: @escaping (WebSocket) -> ()
     ) -> EventLoopFuture<Void> {
         let scheme = url.scheme ?? "ws"
         return self.connect(
@@ -76,7 +74,6 @@ extension WebSocket {
     ///   - eventLoopGroup: Event loop group to be used by the WebSocket client.
     ///   - onUpgrade: An escaping closure to be executed after the upgrade is completed by `NIOWebSocketClientUpgrader`.
     /// - Returns: An future which completes when the connection to the WebSocket server is established.
-    @preconcurrency
     public static func connect(
         scheme: String = "ws",
         host: String,
@@ -86,7 +83,7 @@ extension WebSocket {
         headers: HTTPHeaders = [:],
         configuration: WebSocketClient.Configuration = .init(),
         on eventLoopGroup: EventLoopGroup,
-        onUpgrade: @Sendable @escaping (WebSocket) -> ()
+        onUpgrade: @escaping (WebSocket) -> ()
     ) -> EventLoopFuture<Void> {
         return WebSocketClient(
             eventLoopGroupProvider: .shared(eventLoopGroup),
@@ -119,7 +116,6 @@ extension WebSocket {
     ///   - eventLoopGroup: Event loop group to be used by the WebSocket client.
     ///   - onUpgrade: An escaping closure to be executed after the upgrade is completed by `NIOWebSocketClientUpgrader`.
     /// - Returns: An future which completes when the connection to the origin server is established.
-    @preconcurrency
     public static func connect(
         scheme: String = "ws",
         host: String,
@@ -133,7 +129,7 @@ extension WebSocket {
         proxyConnectDeadline: NIODeadline = NIODeadline.distantFuture,
         configuration: WebSocketClient.Configuration = .init(),
         on eventLoopGroup: EventLoopGroup,
-        onUpgrade: @Sendable @escaping (WebSocket) -> ()
+        onUpgrade: @escaping (WebSocket) -> ()
     ) -> EventLoopFuture<Void> {
         return WebSocketClient(
             eventLoopGroupProvider: .shared(eventLoopGroup),
@@ -166,7 +162,6 @@ extension WebSocket {
     ///   - eventLoopGroup: Event loop group to be used by the WebSocket client.
     ///   - onUpgrade: An escaping closure to be executed after the upgrade is completed by `NIOWebSocketClientUpgrader`.
     /// - Returns: An future which completes when the connection to the origin server is established.
-    @preconcurrency
     public static func connect(
         to url: String,
         headers: HTTPHeaders = [:],
@@ -176,7 +171,7 @@ extension WebSocket {
         proxyConnectDeadline: NIODeadline = NIODeadline.distantFuture,
         configuration: WebSocketClient.Configuration = .init(),
         on eventLoopGroup: EventLoopGroup,
-        onUpgrade: @Sendable @escaping (WebSocket) -> ()
+        onUpgrade: @escaping (WebSocket) -> ()
     ) -> EventLoopFuture<Void> {
         guard let url = URL(string: url) else {
             return eventLoopGroup.any().makeFailedFuture(WebSocketClient.Error.invalidURL)