Skip to content

Handle URL changes in latest Apple Platforms #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Handle URL changes in latest Apple Platforms #148

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a74d684
Update SSLTestHelpers, remove deprecation warnings in tests
Feb 2, 2024
e54997e
Merge branch 'main' into main
0xTim Mar 20, 2024
24ea66e
Update guard for WebSocket scheme
cham-s Apr 15, 2024
1af749d
Add availability conditional for URL init
cham-s Apr 22, 2024
4b73088
Remove visionOS availability check
cham-s Apr 23, 2024
1c3de79
Add conditional compilation directive
cham-s Apr 23, 2024
3c8b213
Add platform specific conditional
cham-s Apr 23, 2024
a1f7242
Lower minimum macOS version to 14.3
cham-s Apr 23, 2024
d145fc2
Update Sources/WebSocketKit/WebSocket+Connect.swift
0xTim Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Tests/WebSocketKitTests/SSLTestHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func generateRSAPrivateKey() -> OpaquePointer {
precondition(generateRC == 1)

let pkey = CNIOBoringSSL_EVP_PKEY_new()!
let assignRC = CNIOBoringSSL_EVP_PKEY_assign(pkey, EVP_PKEY_RSA, rsa)
let assignRC = CNIOBoringSSL_EVP_PKEY_assign_RSA(pkey, rsa)

precondition(assignRC == 1)
return pkey
Expand Down Expand Up @@ -125,7 +125,7 @@ func generateSelfSignedCert(keygenFunction: () -> OpaquePointer = generateRSAPri
NID_commonName,
MBSTRING_UTF8,
UnsafeMutablePointer(mutating: pointer),
CInt(commonName.lengthOfBytes(using: .utf8)),
ossl_ssize_t(commonName.lengthOfBytes(using: .utf8)),
-1,
0)
}
Expand Down
8 changes: 4 additions & 4 deletions Tests/WebSocketKitTests/WebSocketKitTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,8 @@ final class WebSocketKitTests: XCTestCase {
return XCTFail("couldn't get port from \(String(reflecting: server.localAddress))")
}
WebSocket.connect(to: "ws://localhost:\(port)", on: self.elg) { ws in
ws.onPong {
$0.close(promise: closePromise)
ws.onPong { webSocket, _ in
webSocket.close(promise: closePromise)
promise.succeed()
}
ws.sendPing()
Expand All @@ -536,8 +536,8 @@ final class WebSocketKitTests: XCTestCase {
}
WebSocket.connect(to: "ws://localhost:\(port)", on: self.elg) { ws in
ws.pingInterval = .milliseconds(100)
ws.onPong {
$0.close(promise: closePromise)
ws.onPong { webSocket, _ in
webSocket.close(promise: closePromise)
promise.succeed()
}
}.cascadeFailure(to: closePromise)
Expand Down