Skip to content

Commit 6b9ced4

Browse files
SiemianSiemian
committed
Migrate to use WebSocketKit, in order to support Vapor 4.
1 parent 37285cc commit 6b9ced4

30 files changed

+9440
-1911
lines changed

‎Package.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ SKRTMAPI.dependencies = [
2323
"SKCore",
2424
"SKWebAPI",
2525
"Starscream",
26-
"WebSocket"
26+
"WebSocketKit"
2727
]
2828
#elseif os(Linux)
2929
SKRTMAPI.dependencies = [
3030
"SKCore",
3131
"SKWebAPI",
32-
"WebSocket"
32+
"WebSocketKit"
3333
]
3434
#elseif os(iOS) || os(tvOS)
3535
SKRTMAPI.dependencies = [
@@ -70,13 +70,13 @@ let package = Package(
7070
#if os(macOS)
7171
package.dependencies = [
7272
.package(url: "https://github.com/httpswift/swifter.git", .upToNextMinor(from: "1.4.6")),
73-
.package(url: "https://github.com/vapor/websocket", .upToNextMinor(from: "1.1.2")),
73+
.package(url: "https://github.com/vapor/websocket", .upToNextMinor(from: "2.1.1")),
7474
.package(url: "https://github.com/daltoniam/Starscream", .upToNextMinor(from: "3.1.0"))
7575
]
7676
#elseif os(Linux)
7777
package.dependencies = [
7878
.package(url: "https://github.com/httpswift/swifter.git", .upToNextMinor(from: "1.4.6")),
79-
.package(url: "https://github.com/vapor/websocket", .upToNextMinor(from: "1.1.2"))
79+
.package(url: "https://github.com/vapor/websocket", .upToNextMinor(from: "2.1.1"))
8080
]
8181
#elseif os(iOS) || os(tvOS)
8282
package.dependencies = [

‎SKRTMAPI/Sources/Conformers/VaporEngineRTM.swift‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
#if os(Linux) || os(macOS) && !COCOAPODS
2525
import Foundation
26-
import HTTP
27-
import WebSocket
26+
import NIO
27+
import WebSocketKit
2828

2929
// Builds with *Swift Package Manager ONLY*
3030
public class VaporEngineRTM: RTMWebSocket {
@@ -34,23 +34,13 @@ public class VaporEngineRTM: RTMWebSocket {
3434
public weak var delegate: RTMDelegate?
3535
// Websocket
3636
private var websocket: WebSocket?
37-
private var futureWebsocket: Future<WebSocket>?
3837

3938
public required init() {}
4039

4140
public func connect(url: URL) {
42-
guard let host = url.host else {
43-
fatalError("ERROR - Cannot extract host from '\(url.absoluteString)'")
41+
_ = WebSocket.connect(to: url, on: eventLoopGroup) { socket in
42+
self.didConnect(websocket: socket)
4443
}
45-
46-
let scheme: HTTPScheme = url.scheme == "wss" ? .wss : .ws
47-
futureWebsocket = HTTPClient.webSocket(
48-
scheme: scheme,
49-
hostname: host,
50-
path: url.path,
51-
on: eventLoopGroup
52-
)
53-
.do(didConnect)
5444
}
5545

5646
func didConnect(websocket: WebSocket) {
@@ -61,20 +51,14 @@ public class VaporEngineRTM: RTMWebSocket {
6151
websocket.onText { ws, text in
6252
self.delegate?.receivedMessage(text)
6353
}
64-
65-
websocket.onError { ws, error in
66-
67-
}
68-
69-
websocket.onCloseCode { closeCode in
54+
_ = websocket.onClose.always { _ in
7055
self.delegate?.disconnected()
7156
}
7257
}
7358

7459
public func disconnect() {
75-
websocket?.close()
60+
_ = websocket?.close()
7661
websocket = nil
77-
futureWebsocket = nil
7862
}
7963

8064
public func sendMessage(_ message: String) throws {

‎SlackKit.xcodeproj/CNIOAtomics_Info.plist‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>CFBundleDevelopmentRegion</key>
5+
<string>en</string>
6+
<key>CFBundleExecutable</key>
7+
<string>$(EXECUTABLE_NAME)</string>
8+
<key>CFBundleIdentifier</key>
9+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<key>CFBundleInfoDictionaryVersion</key>
11+
<string>6.0</string>
12+
<key>CFBundleName</key>
13+
<string>$(PRODUCT_NAME)</string>
14+
<key>CFBundlePackageType</key>
15+
<string>FMWK</string>
16+
<key>CFBundleShortVersionString</key>
17+
<string>1.0</string>
18+
<key>CFBundleSignature</key>
19+
<string>????</string>
20+
<key>CFBundleVersion</key>
21+
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<key>NSPrincipalClass</key>
23+
<string></string>
24+
</dict>
25+
</plist>

‎SlackKit.xcodeproj/CNIOBoringSSLShims_Info.plist‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>CFBundleDevelopmentRegion</key>
5+
<string>en</string>
6+
<key>CFBundleExecutable</key>
7+
<string>$(EXECUTABLE_NAME)</string>
8+
<key>CFBundleIdentifier</key>
9+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<key>CFBundleInfoDictionaryVersion</key>
11+
<string>6.0</string>
12+
<key>CFBundleName</key>
13+
<string>$(PRODUCT_NAME)</string>
14+
<key>CFBundlePackageType</key>
15+
<string>FMWK</string>
16+
<key>CFBundleShortVersionString</key>
17+
<string>1.0</string>
18+
<key>CFBundleSignature</key>
19+
<string>????</string>
20+
<key>CFBundleVersion</key>
21+
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<key>NSPrincipalClass</key>
23+
<string></string>
24+
</dict>
25+
</plist>

‎SlackKit.xcodeproj/CNIOBoringSSL_Info.plist‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>CFBundleDevelopmentRegion</key>
5+
<string>en</string>
6+
<key>CFBundleExecutable</key>
7+
<string>$(EXECUTABLE_NAME)</string>
8+
<key>CFBundleIdentifier</key>
9+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<key>CFBundleInfoDictionaryVersion</key>
11+
<string>6.0</string>
12+
<key>CFBundleName</key>
13+
<string>$(PRODUCT_NAME)</string>
14+
<key>CFBundlePackageType</key>
15+
<string>FMWK</string>
16+
<key>CFBundleShortVersionString</key>
17+
<string>1.0</string>
18+
<key>CFBundleSignature</key>
19+
<string>????</string>
20+
<key>CFBundleVersion</key>
21+
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<key>NSPrincipalClass</key>
23+
<string></string>
24+
</dict>
25+
</plist>

‎SlackKit.xcodeproj/CNIODarwin_Info.plist‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>CFBundleDevelopmentRegion</key>
5+
<string>en</string>
6+
<key>CFBundleExecutable</key>
7+
<string>$(EXECUTABLE_NAME)</string>
8+
<key>CFBundleIdentifier</key>
9+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<key>CFBundleInfoDictionaryVersion</key>
11+
<string>6.0</string>
12+
<key>CFBundleName</key>
13+
<string>$(PRODUCT_NAME)</string>
14+
<key>CFBundlePackageType</key>
15+
<string>FMWK</string>
16+
<key>CFBundleShortVersionString</key>
17+
<string>1.0</string>
18+
<key>CFBundleSignature</key>
19+
<string>????</string>
20+
<key>CFBundleVersion</key>
21+
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<key>NSPrincipalClass</key>
23+
<string></string>
24+
</dict>
25+
</plist>

‎SlackKit.xcodeproj/CNIOHTTPParser_Info.plist‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>CFBundleDevelopmentRegion</key>
5+
<string>en</string>
6+
<key>CFBundleExecutable</key>
7+
<string>$(EXECUTABLE_NAME)</string>
8+
<key>CFBundleIdentifier</key>
9+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<key>CFBundleInfoDictionaryVersion</key>
11+
<string>6.0</string>
12+
<key>CFBundleName</key>
13+
<string>$(PRODUCT_NAME)</string>
14+
<key>CFBundlePackageType</key>
15+
<string>FMWK</string>
16+
<key>CFBundleShortVersionString</key>
17+
<string>1.0</string>
18+
<key>CFBundleSignature</key>
19+
<string>????</string>
20+
<key>CFBundleVersion</key>
21+
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<key>NSPrincipalClass</key>
23+
<string></string>
24+
</dict>
25+
</plist>

‎SlackKit.xcodeproj/CNIOLinux_Info.plist‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>CFBundleDevelopmentRegion</key>
5+
<string>en</string>
6+
<key>CFBundleExecutable</key>
7+
<string>$(EXECUTABLE_NAME)</string>
8+
<key>CFBundleIdentifier</key>
9+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<key>CFBundleInfoDictionaryVersion</key>
11+
<string>6.0</string>
12+
<key>CFBundleName</key>
13+
<string>$(PRODUCT_NAME)</string>
14+
<key>CFBundlePackageType</key>
15+
<string>FMWK</string>
16+
<key>CFBundleShortVersionString</key>
17+
<string>1.0</string>
18+
<key>CFBundleSignature</key>
19+
<string>????</string>
20+
<key>CFBundleVersion</key>
21+
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<key>NSPrincipalClass</key>
23+
<string></string>
24+
</dict>
25+
</plist>

‎SlackKit.xcodeproj/CNIOSHA1_Info.plist‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>CFBundleDevelopmentRegion</key>
5+
<string>en</string>
6+
<key>CFBundleExecutable</key>
7+
<string>$(EXECUTABLE_NAME)</string>
8+
<key>CFBundleIdentifier</key>
9+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<key>CFBundleInfoDictionaryVersion</key>
11+
<string>6.0</string>
12+
<key>CFBundleName</key>
13+
<string>$(PRODUCT_NAME)</string>
14+
<key>CFBundlePackageType</key>
15+
<string>FMWK</string>
16+
<key>CFBundleShortVersionString</key>
17+
<string>1.0</string>
18+
<key>CFBundleSignature</key>
19+
<string>????</string>
20+
<key>CFBundleVersion</key>
21+
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<key>NSPrincipalClass</key>
23+
<string></string>
24+
</dict>
25+
</plist>

‎SlackKit.xcodeproj/NIOConcurrencyHelpers_Info.plist‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<plist version="1.0">
3+
<dict>
4+
<key>CFBundleDevelopmentRegion</key>
5+
<string>en</string>
6+
<key>CFBundleExecutable</key>
7+
<string>$(EXECUTABLE_NAME)</string>
8+
<key>CFBundleIdentifier</key>
9+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
10+
<key>CFBundleInfoDictionaryVersion</key>
11+
<string>6.0</string>
12+
<key>CFBundleName</key>
13+
<string>$(PRODUCT_NAME)</string>
14+
<key>CFBundlePackageType</key>
15+
<string>FMWK</string>
16+
<key>CFBundleShortVersionString</key>
17+
<string>1.0</string>
18+
<key>CFBundleSignature</key>
19+
<string>????</string>
20+
<key>CFBundleVersion</key>
21+
<string>$(CURRENT_PROJECT_VERSION)</string>
22+
<key>NSPrincipalClass</key>
23+
<string></string>
24+
</dict>
25+
</plist>

0 commit comments

Comments
 (0)