Merge branch 'develop'

Author: helje5

.github/workflows/swift.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         image:
           - swift:5.9-jammy
-          - swift:6.1-noble
+          - swift:6.2-jammy
     container: ${{ matrix.image }}
     steps:
       - name: Checkout Repository
@@ -29,7 +29,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Select latest available Xcode
-        uses: maxim-lobanov/setup-xcode@v1.5.1
+        uses: maxim-lobanov/setup-xcode@v1.6.0
         with:
           xcode-version: latest
       - name: Checkout Repository

Sources/http/BasicAuth.swift

@@ -38,7 +38,7 @@ public extension BasicAuthModule {
   #if canImport(Foundation) // `String.Encoding.utf8`, provide alternative!
   /**
    * Extract HTTP Basic authentication credentials (name/pass) from the given
-   * ```IncomingMessage```.
+   * ``IncomingMessage``.
    *
    * - Parameters:
    *   - request:  The ``IncomingMessage`` containing the `Authorization`
@@ -81,7 +81,7 @@ public extension BasicAuthModule {
       throw BasicAuthError.differentAuthorization
     }
 
-    let payload = String(authString[authString.index(after: idx)])
+    let payload = String(authString[authString.index(after: idx)...])
           .trimmingCharacters(in: .whitespacesAndNewlines)
 
     guard let data = Data(base64Encoded: payload) else {
@@ -98,7 +98,7 @@ public extension BasicAuthModule {
 
     return Credentials(
       name: String(string[string.startIndex..<colIdx]),
-      pass: String(string[colIdx..<string.endIndex])
+      pass: String(string[string.index(after: colIdx)..<string.endIndex])
     )
   }
   #endif // canImport(Foundation)

Sources/http/IncomingMessage.swift

@@ -274,8 +274,10 @@ open class IncomingMessage: ReadableByteStream, CustomStringConvertible {
     }
   }
 
-  /// The URI associated with the request as a plain string.
-  /// Returns an empty string for responses.
+  /**
+   * The URI associated with the request as a plain string.
+   * Returns an empty string for responses.
+   */
   @inlinable
   public var url : String {
     switch head {

Sources/http/Support/HTTPHeadersHolder.swift

@@ -15,6 +15,42 @@ public protocol HTTPMutableHeadersHolder: HTTPHeadersHolder {
   var headers : HTTPHeaders { get set }
 }
 
+// MARK: - Express API
+
+public extension HTTPHeadersHolder {
+  
+  /**
+   * Returns the value of a header, or nil if the header is empty.
+   * 
+   * If there are multiple headers w/ the same name, their value is joined
+   * by ", ", e.g.:
+   * ```http
+   * Accept: text/html
+   * Accept: application/json
+   * ```
+   * will result in this:
+   * ```swift
+   * > req.get("accept")
+   * "text/html, application/json
+   * ```
+   */
+  @inlinable
+  func header(_ headerName: String) -> String? {
+    let values = headers[headerName]
+    guard !values.isEmpty else { return nil }
+    return headers[headerName].joined(separator: ", ")
+  }
+  
+  /**
+   * Aliased for ``header(_:)``.
+   */
+  @inlinable
+  func get(_ headerName: String) -> String? {
+    return header(headerName)
+  }
+}
+
+
 // MARK: - Node API
 
 public extension HTTPHeadersHolder {