[Swift Testing] Make it easy to use HTTPServer from Swift by rr-codes · Pull Request #63391 · WebKit/WebKit

rr-codes · 2026-04-23T02:44:10Z

`bb3490f`

[Swift Testing] Make it easy to use HTTPServer from Swift
https://bugs.webkit.org/show_bug.cgi?id=313093
rdar://175390188

Reviewed by Aditya Keerthi and Abrar Rahman Protyasha.

Design and implement a Swift overlay of HTTPServer to make it so much nicer and easier to use from Swift.

* Tools/TestWebKitAPI/Helpers/cocoa/HTTPServer.h:
(TestWebKitAPI::HTTPServer::HTTPServer):
* Tools/TestWebKitAPI/Helpers/cocoa/HTTPServer.mm:
(TestWebKitAPI::HTTPServer::RequestData::RequestData):
(TestWebKitAPI::HTTPServer::startListening):
(TestWebKitAPI::HTTPServer::cancel):
(TestWebKitAPI::HTTPServer::HTTPServer):
(TestWebKitAPI::m_protocol):
(hashMapSet):
(TestWebKitAPI::startListening): Deleted.

- Swift is unable to create an `std::initializer_list`, so add a `HashMap` overload
for the constructor.

- The `cancel` and `startListening` functions were masquarading as sync functions while
in actuality they are async; change them to reflect their true async nature.

- Change the Swift name of the Cxx HTTPServer so that Swift clients find the Swift
version instead of the Cxx version.

- Work around a limitation of Swift-Cxx interop with templated types by adding a helper
setter function for a hashmap.

* Tools/TestWebKitAPI/Helpers/cocoa/HTTPServer.swift: Added.
(RouteBuilder.buildBlock(_:)):
(HTTPServer.storage):

Implement the Swift HTTPServer.

* Tools/TestWebKitAPI/Helpers/cocoa/StdLibExtras.swift: Added.
(WTF.description):

Temporarily duplicate some code to make it easy to convert between WTF String and Swift String.

* Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:

Add the new file.

* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/AppPrivacyReport.mm:
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/Download.mm:
(TestWebKitAPI::ResumeCantReconnect)):
* Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ServiceWorkerBasic.mm:
((ServiceWorkers, ChangeOfServerCertificate)):

Adjust some tests to accurately use the async cancel and startListening functions.

* Tools/TestWebKitAPI/Tests/WebKit/WebPage/AppKitGesturesTests.swift:
* Tools/TestWebKitAPI/Tests/WebKit/WebPage/URLSchemeHandlerTests.swift:
* Tools/TestWebKitAPI/Tests/WebKit/WebPage/WebPageNavigationTests.swift:

Disambiguate the `Task` type.

Canonical link: https://commits.webkit.org/311958@main

87df6dd

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win	⏳ 🛠 ios-apple
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	✅ 🧪 ios-wk2-wpt	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
		✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 playstation
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2026-04-23T02:44:16Z

EWS run on previous version of this PR (hash 2a35830)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	❌ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
✅ 🧪 bindings	❌ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	~~🧪 api-mac~~	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	❌ 🧪 ios-wk2-wpt	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
	❌ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
		✅ 🧪 mac-wk2	~~🧪 gtk-wk2~~
	❌ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	✅ 🧪 api-gtk
	❌ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	~~🛠 playstation~~
	❌ 🧪 vision-wk2	~~🧪 mac-intel-wk2~~
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	~~🛠 watch-sim~~

webkit-early-warning-system · 2026-04-23T03:49:39Z

EWS run on previous version of this PR (hash 50fc6f9)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	❌ 🛠 ios	~~🛠 mac~~	✅ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
✅ 🧪 bindings	❌ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	~~🧪 api-mac~~	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	❌ 🧪 ios-wk2-wpt	~~🧪 api-mac-debug~~	~~🛠 gtk3-libwebrtc~~
	❌ 🧪 api-ios	~~🧪 mac-wk1~~	✅ 🛠 gtk
		~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	~~🛠 vision~~	~~🧪 mac-AS-debug-wk2~~	~~🧪 api-gtk~~
	❌ 🛠 vision-sim	~~🧪 mac-wk2-stress~~	~~🛠 playstation~~
	❌ 🧪 vision-wk2	~~🧪 mac-intel-wk2~~
	~~🛠 tv~~
	~~🛠 tv-sim~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2026-04-23T03:56:53Z

EWS run on previous version of this PR (hash 2675ab2)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	❌ 🛠 ios	~~🛠 mac~~	~~🛠 wpe~~	~~🛠 win~~	⏳ 🛠 ios-apple
✅ 🧪 bindings	~~🛠 ios-sim~~	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~		⏳ 🛠 vision-apple
	~~🧪 ios-wk2-wpt~~	~~🧪 api-mac-debug~~	~~🛠 gtk3-libwebrtc~~
	~~🧪 api-ios~~	~~🧪 mac-wk1~~	✅ 🛠 gtk
		~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	❌ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	✅ 🧪 api-gtk
	❌ 🛠 vision-sim	~~🧪 mac-wk2-stress~~	~~🛠 playstation~~
	❌ 🧪 vision-wk2	~~🧪 mac-intel-wk2~~
	~~🛠 tv~~
	~~🛠 tv-sim~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2026-04-23T04:00:10Z

EWS run on previous version of this PR (hash 23b4dff)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	❌ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
✅ 🧪 bindings	❌ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	~~🧪 api-mac~~	~~🧪 api-wpe~~		⏳ 🛠 vision-apple
	❌ 🧪 ios-wk2-wpt	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
	❌ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
		✅ 🧪 mac-wk2	~~🧪 gtk-wk2~~
	❌ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	~~🧪 api-gtk~~
	~~🛠 vision-sim~~	✅ 🧪 mac-wk2-stress	~~🛠 playstation~~
	~~🧪 vision-wk2~~	~~🧪 mac-intel-wk2~~
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	~~🛠 watch-sim~~

webkit-early-warning-system · 2026-04-23T04:19:14Z

EWS run on previous version of this PR (hash 4e76a18)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	❌ 🛠 ios	~~🛠 mac~~	~~🛠 wpe~~	~~🛠 win~~	⏳ 🛠 ios-apple
✅ 🧪 bindings	❌ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	~~🧪 api-mac~~	~~🧪 api-wpe~~		⏳ 🛠 vision-apple
✅ 🧪 webkitpy	❌ 🧪 ios-wk2-wpt	~~🧪 api-mac-debug~~	~~🛠 gtk3-libwebrtc~~
	❌ 🧪 api-ios	~~🧪 mac-wk1~~	✅ 🛠 gtk
		~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	~~🛠 vision~~	~~🧪 mac-AS-debug-wk2~~	~~🧪 api-gtk~~
	❌ 🛠 vision-sim	~~🧪 mac-wk2-stress~~	~~🛠 playstation~~
	❌ 🧪 vision-wk2	~~🧪 mac-intel-wk2~~
	✅ 🛠 tv
	~~🛠 tv-sim~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2026-04-23T04:24:17Z

EWS run on previous version of this PR (hash 30dc12f)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	~~🛠 ios~~	~~🛠 mac~~	✅ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
✅ 🧪 bindings	~~🛠 ios-sim~~	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~		⏳ 🛠 vision-apple
✅ 🧪 webkitpy	~~🧪 ios-wk2-wpt~~	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
	~~🧪 api-ios~~	~~🧪 mac-wk1~~	✅ 🛠 gtk
		~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	❌ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	~~🧪 api-gtk~~
	~~🛠 vision-sim~~	~~🧪 mac-wk2-stress~~	~~🛠 playstation~~
	~~🧪 vision-wk2~~	~~🧪 mac-intel-wk2~~
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	~~🛠 watch-sim~~

webkit-early-warning-system · 2026-04-23T04:28:16Z

EWS run on previous version of this PR (hash cbc7059)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	❌ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
✅ 🧪 bindings	❌ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	~~🧪 api-mac~~	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
✅ 🧪 webkitpy	❌ 🧪 ios-wk2-wpt	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
	❌ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
		✅ 🧪 mac-wk2	~~🧪 gtk-wk2~~
	❌ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	✅ 🧪 api-gtk
	❌ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	~~🛠 playstation~~
	❌ 🧪 vision-wk2	~~🧪 mac-intel-wk2~~
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	~~🛠 watch-sim~~

webkit-early-warning-system · 2026-04-23T05:09:56Z

EWS run on previous version of this PR (hash 72abd4d)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	❌ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
✅ 🧪 bindings	❌ 🛠 ios-sim	✅ 🛠 mac-AS-debug	~~🧪 wpe-wk2~~	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	❌ 🧪 ios-wk2	~~🧪 api-mac~~	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
✅ 🧪 webkitpy	❌ 🧪 ios-wk2-wpt	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
	❌ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
		✅ 🧪 mac-wk2	~~🧪 gtk-wk2~~
	❌ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	✅ 🧪 api-gtk
	❌ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	~~🛠 playstation~~
	❌ 🧪 vision-wk2	~~🧪 mac-intel-wk2~~
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	~~🛠 watch-sim~~

webkit-early-warning-system · 2026-04-23T05:47:36Z

EWS run on previous version of this PR (hash cfe89d7)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win	⏳ 🛠 ios-apple
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	❌ 🧪 api-mac	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	✅ 🧪 ios-wk2-wpt	❌ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	~~🧪 api-ios~~	✅ 🧪 mac-wk1	✅ 🛠 gtk
	🛠 ios-safer-cpp	✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 playstation
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

webkit-early-warning-system · 2026-04-23T20:56:26Z

EWS run on previous version of this PR (hash 778781c)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	~~🛠 ios~~	~~🛠 mac~~	~~🛠 wpe~~	~~🛠 win~~	⏳ 🛠 ios-apple
✅ 🧪 bindings	~~🛠 ios-sim~~	~~🛠 mac-AS-debug~~	~~🧪 wpe-wk2~~	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	~~🧪 ios-wk2~~	~~🧪 api-mac~~	~~🧪 api-wpe~~		⏳ 🛠 vision-apple
	~~🧪 ios-wk2-wpt~~	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
	~~🧪 api-ios~~	~~🧪 mac-wk1~~	~~🛠 gtk~~
		~~🧪 mac-wk2~~	~~🧪 gtk-wk2~~
	~~🛠 vision~~	~~🧪 mac-AS-debug-wk2~~	~~🧪 api-gtk~~
	~~🛠 vision-sim~~	~~🧪 mac-wk2-stress~~	~~🛠 playstation~~
	~~🧪 vision-wk2~~	~~🧪 mac-intel-wk2~~
	~~🛠 tv~~
	~~🛠 tv-sim~~
	~~🛠 watch~~
	~~🛠 watch-sim~~

webkit-early-warning-system · 2026-04-23T20:59:58Z

EWS run on previous version of this PR (hash 1470c37)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	~~🛠 win~~	⏳ 🛠 ios-apple
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	~~🧪 win-tests~~	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	~~🧪 ios-wk2-wpt~~	~~🧪 api-mac-debug~~	✅ 🛠 gtk3-libwebrtc
	~~🧪 api-ios~~	✅ 🧪 mac-wk1	✅ 🛠 gtk
		❌ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	~~🧪 mac-AS-debug-wk2~~	✅ 🧪 api-gtk
	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 playstation
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

aprotyas · 2026-04-23T21:58:23Z

+    HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>>, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, bool startListeningImmediately = true);
+    HTTPServer(ResponseMap&& responses, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, bool startListeningImmediately = true);


if we have a sync cancel() helper, we don't need this forked constructor logic.

we can also now make startListening() private

and you can drop this section from Swift run? Since the server is already listening from init?

await withCheckedContinuation { continuation in unsafe self.storage.startListening( consuming: .init( { continuation.resume() }, WTF.ThreadLikeAssertion(WTF.CurrentThreadLike()) ) ) }

aprotyas · 2026-04-23T22:04:12Z

@@ -205,4 +213,6 @@ RetainPtr<SecIdentityRef> testIdentity();
 RetainPtr<SecIdentityRef> testIdentity2();
 void verifyCertificateAndPublicKey(SecTrustRef);

+void hashMapSet(HashMap<WTF::String, TestWebKitAPI::HTTPResponse>&, WTF::String&&, TestWebKitAPI::HTTPResponse&&);


two things: (1) does this need to be in a global namespace? (2) this feels like a general utility that could be housed in something like CxxInteropHelpers.h?

I chose this deliberately because it is not general enough to go in a different file since it uses the specific types defined here, but it is general enough that it is unrelated to the core of TestWebKitAPI itself. Plus it’s temporary anyways so 🤷

oh, temporary how? I think I missed that

it’s just a swift compiler interop bug atm that it doesn’t work well with HashMap/generic types, so in the future this won’t be needed

aprotyas · 2026-04-23T22:29:22Z

+    HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>>, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, bool startListeningImmediately = true);
+    HTTPServer(ResponseMap&& responses, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, bool startListeningImmediately = true);


Consider making this an enum param? Makes it clearer from call sites

Suggested change

HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>>, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, bool startListeningImmediately = true);

HTTPServer(ResponseMap&& responses, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, bool startListeningImmediately = true);

enum class DeferListening : bool { No, Yes };

HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>>, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, DeferListening = DeferListening::No);

HTTPServer(ResponseMap&& responses, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, DeferListening = DeferListening::No);

webkit-early-warning-system · 2026-04-24T01:03:41Z

EWS run on current version of this PR (hash 87df6dd)

Details

Misc	iOS, visionOS, tvOS & watchOS	macOS	Linux	Windows	Apple Internal
❌ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 win	⏳ 🛠 ios-apple
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2	✅ 🧪 win-tests	⏳ 🛠 mac-apple
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe		⏳ 🛠 vision-apple
	✅ 🧪 ios-wk2-wpt	✅ 🧪 api-mac-debug	✅ 🛠 gtk3-libwebrtc
	✅ 🧪 api-ios	✅ 🧪 mac-wk1	✅ 🛠 gtk
		✅ 🧪 mac-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 vision	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 vision-sim	✅ 🧪 mac-wk2-stress	✅ 🛠 playstation
	✅ 🧪 vision-wk2	✅ 🧪 mac-intel-wk2
	✅ 🛠 tv
	✅ 🛠 tv-sim
	✅ 🛠 watch
	✅ 🛠 watch-sim

https://bugs.webkit.org/show_bug.cgi?id=313093 rdar://175390188 Reviewed by Aditya Keerthi and Abrar Rahman Protyasha. Design and implement a Swift overlay of HTTPServer to make it so much nicer and easier to use from Swift. * Tools/TestWebKitAPI/Helpers/cocoa/HTTPServer.h: (TestWebKitAPI::HTTPServer::HTTPServer): * Tools/TestWebKitAPI/Helpers/cocoa/HTTPServer.mm: (TestWebKitAPI::HTTPServer::RequestData::RequestData): (TestWebKitAPI::HTTPServer::startListening): (TestWebKitAPI::HTTPServer::cancel): (TestWebKitAPI::HTTPServer::HTTPServer): (TestWebKitAPI::m_protocol): (hashMapSet): (TestWebKitAPI::startListening): Deleted. - Swift is unable to create an `std::initializer_list`, so add a `HashMap` overload for the constructor. - The `cancel` and `startListening` functions were masquarading as sync functions while in actuality they are async; change them to reflect their true async nature. - Change the Swift name of the Cxx HTTPServer so that Swift clients find the Swift version instead of the Cxx version. - Work around a limitation of Swift-Cxx interop with templated types by adding a helper setter function for a hashmap. * Tools/TestWebKitAPI/Helpers/cocoa/HTTPServer.swift: Added. (RouteBuilder.buildBlock(_:)): (HTTPServer.storage): Implement the Swift HTTPServer. * Tools/TestWebKitAPI/Helpers/cocoa/StdLibExtras.swift: Added. (WTF.description): Temporarily duplicate some code to make it easy to convert between WTF String and Swift String. * Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Add the new file. * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/AppPrivacyReport.mm: * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/Download.mm: (TestWebKitAPI::ResumeCantReconnect)): * Tools/TestWebKitAPI/Tests/WebKit/WKWebView/ServiceWorkerBasic.mm: ((ServiceWorkers, ChangeOfServerCertificate)): Adjust some tests to accurately use the async cancel and startListening functions. * Tools/TestWebKitAPI/Tests/WebKit/WebPage/AppKitGesturesTests.swift: * Tools/TestWebKitAPI/Tests/WebKit/WebPage/URLSchemeHandlerTests.swift: * Tools/TestWebKitAPI/Tests/WebKit/WebPage/WebPageNavigationTests.swift: Disambiguate the `Task` type. Canonical link: https://commits.webkit.org/311958@main

webkit-commit-queue · 2026-04-24T16:45:06Z

Committed 311958@main (bb3490f): https://commits.webkit.org/311958@main

Reviewed commits have been landed. Closing PR #63391 and removing active labels.

rr-codes self-assigned this Apr 23, 2026

rr-codes added the WebKit Misc. For miscellaneous bugs in the WebKit framework (and not JavaScriptCore or WebCore). label Apr 23, 2026

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes force-pushed the eng/Swift-Testing-Make-it-easy-to-use-HTTPServer-from-Swift branch from 2a35830 to 50fc6f9 Compare April 23, 2026 03:49

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes force-pushed the eng/Swift-Testing-Make-it-easy-to-use-HTTPServer-from-Swift branch from 50fc6f9 to 2675ab2 Compare April 23, 2026 03:56

rr-codes force-pushed the eng/Swift-Testing-Make-it-easy-to-use-HTTPServer-from-Swift branch from 2675ab2 to 23b4dff Compare April 23, 2026 04:00

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes changed the title ~~[Swift Testing] Make it easy to use HTTPServer from Swift~~ Revert "Speed up check-webkit-style (and git webkit pr)" Apr 23, 2026

rr-codes requested review from JonWBedard and gsnedders as code owners April 23, 2026 04:19

rr-codes changed the title ~~Revert "Speed up check-webkit-style (and git webkit pr)"~~ Revert "a Style checker should not suggest using swift format to fix 'unsafe' warnings" Apr 23, 2026

rr-codes changed the title ~~Revert "a Style checker should not suggest using swift format to fix 'unsafe' warnings"~~ [Swift Testing] Make it easy to use HTTPServer from Swift Apr 23, 2026

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes force-pushed the eng/Swift-Testing-Make-it-easy-to-use-HTTPServer-from-Swift branch from cbc7059 to 72abd4d Compare April 23, 2026 05:09

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes force-pushed the eng/Swift-Testing-Make-it-easy-to-use-HTTPServer-from-Swift branch from 72abd4d to 23b4dff Compare April 23, 2026 05:31

rr-codes requested review from aprotyas, hortont424, lilyspiniolas, megangardner, pascoej, pxlcoder, whsieh and zakariaridouh April 23, 2026 05:47

rr-codes force-pushed the eng/Swift-Testing-Make-it-easy-to-use-HTTPServer-from-Swift branch from cfe89d7 to 778781c Compare April 23, 2026 20:56

rr-codes force-pushed the eng/Swift-Testing-Make-it-easy-to-use-HTTPServer-from-Swift branch from 778781c to 1470c37 Compare April 23, 2026 20:59

pxlcoder reviewed Apr 23, 2026

View reviewed changes

Comment thread Tools/TestWebKitAPI/Helpers/cocoa/HTTPServer.mm

aprotyas reviewed Apr 23, 2026

View reviewed changes

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Apr 23, 2026

rr-codes removed the merging-blocked Applied to prevent a change from being merged label Apr 24, 2026

rr-codes force-pushed the eng/Swift-Testing-Make-it-easy-to-use-HTTPServer-from-Swift branch from 1470c37 to 87df6dd Compare April 24, 2026 01:03

rr-codes requested review from aprotyas and pxlcoder April 24, 2026 01:05

pxlcoder approved these changes Apr 24, 2026

View reviewed changes

aprotyas approved these changes Apr 24, 2026

View reviewed changes

rr-codes added the merge-queue Applied to send a pull request to merge-queue label Apr 24, 2026

webkit-commit-queue force-pushed the eng/Swift-Testing-Make-it-easy-to-use-HTTPServer-from-Swift branch from 87df6dd to bb3490f Compare April 24, 2026 16:44

webkit-commit-queue merged commit bb3490f into WebKit:main Apr 24, 2026

webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Apr 24, 2026

		HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>>, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, bool startListeningImmediately = true);
		HTTPServer(ResponseMap&& responses, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, bool startListeningImmediately = true);

-    HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>>, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, bool startListeningImmediately = true);
-    HTTPServer(ResponseMap&& responses, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, bool startListeningImmediately = true);
+    enum class DeferListening : bool { No, Yes };
+    HTTPServer(std::initializer_list<std::pair<String, HTTPResponse>>, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, DeferListening = DeferListening::No);
+    HTTPServer(ResponseMap&& responses, Protocol = Protocol::Http, CertificateVerifier&& = nullptr, SecIdentityRef = nullptr, std::optional<uint16_t> port = { }, DeferListening = DeferListening::No);

Conversation

rr-codes commented Apr 23, 2026 • edited by webkit-early-warning-system Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-early-warning-system commented Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aprotyas Apr 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

webkit-early-warning-system commented Apr 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

webkit-commit-queue commented Apr 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

rr-codes commented Apr 23, 2026 •

edited by webkit-early-warning-system

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 23, 2026 •

edited

Loading

aprotyas Apr 23, 2026 •

edited

Loading

webkit-early-warning-system commented Apr 24, 2026 •

edited

Loading