Skip to content

Avoid FoundationNetworking and libcurl on non-Darwin platforms #681

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

Closed
wants to merge 13 commits into from
Closed

Avoid FoundationNetworking and libcurl on non-Darwin platforms #681

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
66353a1
Replace uses of `Data(contentsOf:)` with `FileHandle`
MaxDesiatov Aug 2, 2023
0db65fa
Remove remaining `import FoundationNetworking` lines
MaxDesiatov Aug 2, 2023
c1b5529
Clean up uses of `URLRequest` and `URLResponse`
MaxDesiatov Aug 2, 2023
992d221
Fix needlessly prepending request path
MaxDesiatov Aug 2, 2023
58a5d0e
Fix default content type test failure
MaxDesiatov Aug 2, 2023
f042a68
Use throwing `readToEnd` for debugging and error handling
MaxDesiatov Aug 2, 2023
71fe790
Bump swift-http-types to 0.2.1
MaxDesiatov Aug 2, 2023
8c4e6d0
Apply suggestions from code review
MaxDesiatov Aug 2, 2023
fb38bef
Update copyright year, refine error handling
MaxDesiatov Aug 2, 2023
f2b5908
Check for uses of `FoundationNetworking` in `./bin/test`
MaxDesiatov Aug 2, 2023
ea5bccb
Replace `FileSystemError` with `CocoaError`
MaxDesiatov Aug 2, 2023
98561ac
Remove broken import from `FilesAndFolders.swift`
MaxDesiatov Aug 2, 2023
30500a0
Merge branch 'main' into maxd/avoid-foundationnetworking
MaxDesiatov Aug 8, 2023
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
2 changes: 1 addition & 1 deletion Sources/SwiftDocC/Servers/FileServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public class FileServer {
xlog("Tried to load an invalid path: \(path).\nFalling back to serve index.html.")
}
mimeType = "text/html"
data = self.data(for: path.appendingPathComponent("/index.html"))
data = self.data(for: "/index.html")
Copy link
Contributor

@d-ronnqvist d-ronnqvist Aug 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain why this isn't a change in behavior? What's needless about this?

Copy link
Contributor Author

@MaxDesiatov MaxDesiatov Aug 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only path component of url that data(for:) took as argument was used. The rest of the components are ignored by DocC server implementations.

Additionally, HTTPRequest unlike URLRequest doesn't store full URLs, only paths. The authority and scheme components can be assembled from scheme and authority properties on HTTPRequest , but those aren't used anywhere in the DocC codebase, other than a test in this diff below where we have to construct a new URLRequest to pass it to WKWebView on Darwin platforms.

Copy link
Contributor

@d-ronnqvist d-ronnqvist Aug 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But if request.path is "/something" then this used to pass "/something/index.html" as an argument but now it only passes "index.html". Isn't that returning data for the wrong path?

Copy link
Contributor Author

@MaxDesiatov MaxDesiatov Aug 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If request.path is "/something" then that is handled by the if branch above, no this else branch. The latter branch didn't use request.path previously, that logic is unchanged, as verified by the test suite.

}

if let data = data {
Expand Down