Improve request building performance

Author: SwiftyJoeyy

Sources/NetworkingCore/Configurations/Configurations.swift

@@ -35,14 +35,14 @@ public struct ConfigurationValues: Sendable, CustomStringConvertible {
     /// - Parameter key: The type of the configuration key.
     public subscript<K: ConfigurationKey>(_ key: K.Type) -> K.Value {
         get {
-            guard let value = box.values[String(describing: key)] else {
+            guard let value = box.value(for: ObjectIdentifier(key)) else {
                 return K.defaultValue
             }
             return unsafeBitCast(value, to: K.Value.self)
         }
         set {
             ensureUniqueBox()
-            box.values[String(describing: key)] = newValue
+            box.setValue(newValue, for: ObjectIdentifier(key))
         }
     }
 
@@ -54,15 +54,16 @@ public struct ConfigurationValues: Sendable, CustomStringConvertible {
     /// - SeeAlso: `isKnownUniquelyReferenced(_:)`
     @inline(__always) private mutating func ensureUniqueBox() {
         guard !isKnownUniquelyReferenced(&box) else {return}
-        box = ProperiesBox(values: box.values)
+        box = ProperiesBox(values: box.allValues())
     }
 
     /// A string that represents the contents of the environment values instance.
     public var description: String {
-        guard !box.values.isEmpty else {
+        let values = box.allValues()
+        guard !values.isEmpty else {
             return "\(String(describing: Self.self)) = []"
         }
-        let valuesString = box.values
+        let valuesString = values
             .map({"  \($0) : \($1)"})
             .joined(separator: ",\n")
         return """
@@ -75,17 +76,37 @@ public struct ConfigurationValues: Sendable, CustomStringConvertible {
 
 extension ConfigurationValues {
     /// A type that stores configuration key-value pairs.
-    internal final class ProperiesBox: @unchecked Sendable {
+    fileprivate final class ProperiesBox: @unchecked Sendable {
+        private var lock = os_unfair_lock_s()
+        
         /// The stored configuration values.
-        internal var values: [String: any Sendable]
+        private var values: [ObjectIdentifier: any Sendable]
 
         /// Creates a new box with the specified initial values.
         ///
         /// - Parameter values: A dictionary of configuration values.
         ///   Defaults to an empty dictionary.
-        internal init(values: [String: any Sendable] = [:]) {
+        fileprivate init(values: [ObjectIdentifier: any Sendable] = [:]) {
             self.values = values
         }
+        
+        fileprivate func setValue(_ value: any Sendable, for key: ObjectIdentifier) {
+            os_unfair_lock_lock(&lock)
+            defer { os_unfair_lock_unlock(&lock) }
+            values[key] = value
+        }
+        
+        fileprivate func value(for key: ObjectIdentifier) -> (any Sendable)? {
+            os_unfair_lock_lock(&lock)
+            defer { os_unfair_lock_unlock(&lock) }
+            return values[key]
+        }
+        
+        fileprivate func allValues() -> [ObjectIdentifier: any Sendable] {
+            os_unfair_lock_lock(&lock)
+            defer { os_unfair_lock_unlock(&lock) }
+            return values
+        }
     }
 }
 

Sources/NetworkingCore/Configurations/DynamicConfigurable.swift

@@ -64,21 +64,28 @@ public protocol _DynamicConfigurable {
     public func _accept(_ values: ConfigurationValues) {
         content.values = values
     }
+    
+    package func setValue<V>(
+        _ value: V,
+        for keyPath: WritableKeyPath<ConfigurationValues, V>
+    ) {
+        content.values[keyPath: keyPath] = value
+    }
 }
 
 extension Configurations {
     /// A type that stores the configuration values.
     ///
     /// This internal type enables reference semantics, allowing configurations to be
     /// efficiently shared and updated across instances.
-    internal final class Content {
+    fileprivate final class Content {
         /// The current configuration values.
-        internal var values: ConfigurationValues
+        fileprivate var values: ConfigurationValues
 
         /// Creates a new instance with the specified initial values.
         ///
         /// - Parameter values: The initial configuration values. Defaults to a new instance.
-        init(values: ConfigurationValues = ConfigurationValues()) {
+        fileprivate init(values: ConfigurationValues = ConfigurationValues()) {
             self.values = values
         }
     }

Sources/NetworkingCore/Request/AnyRequest.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 /// A type-erased request.
-@frozen public struct AnyRequest: Request {
+@frozen public struct AnyRequest: Request, Sendable {
     /// The contents of the request.
     public typealias Contents = Never
 
@@ -17,12 +17,13 @@ import Foundation
     private let storage: AnyRequestStorageBase
 
     /// The request's identifier.
-    public let id: String
+    public var id: String {
+        return storage.id
+    }
 
 // MARK: - Initializer
     /// Create an instance that type-erases `request`.
     public init(_ request: some Request) {
-        self.id = request.id
         self.storage = AnyRequestStorage(request: request)
     }
 
@@ -52,27 +53,37 @@ import Foundation
 
 extension AnyRequest {
     /// An abstract base class for type-erased request storage.
-    @usableFromInline internal class AnyRequestStorageBase {
+    @usableFromInline internal class AnyRequestStorageBase: @unchecked Sendable {
+        /// The request's identifier.
+        internal var id: String {
+            fatalError("Subclasses must override this member.")
+        }
+        
         /// Creates a ``URLRequest`` from the underlying request.
         ///
         /// - Returns: A configured ``URLRequest``.
         internal func makeURLRequest() throws -> URLRequest {
-            fatalError("Subclasses must override this method.")
+            fatalError("Subclasses must override this member.")
         }
 
         /// Applies the specified configuration values to the underlying request.
         ///
         /// - Parameter values: The configuration values to apply.
         internal func accept(_ values: ConfigurationValues) {
-            fatalError("Subclasses must override this method.")
+            fatalError("Subclasses must override this member.")
         }
     }
 
     /// A concrete storage type for a specific ``Request`` instance.
-    fileprivate final class AnyRequestStorage<R: Request>: AnyRequestStorageBase {
+    fileprivate final class AnyRequestStorage<R: Request>: AnyRequestStorageBase, @unchecked Sendable {
         /// The wrapped request.
         private let request: R
 
+        /// The request's identifier.
+        fileprivate override var id: String {
+            return request.id
+        }
+        
         /// Creates a new instance that wraps the given request.
         ///
         /// - Parameter request: The request to wrap.

Sources/NetworkingCore/Request/HTTPRequest.swift

@@ -125,7 +125,7 @@ extension HTTPRequest: Request {
                 .modifying(consume urlRequest)
         }
 
-        return try modifier.modifying(urlRequest)
+        return try modifier.modifying(consume urlRequest)
     }
 
     /// Applies the given configuration values to the request.

Sources/NetworkingCore/Request/ModifiableRequest.swift

@@ -35,7 +35,7 @@ import Foundation
 /// which is applied to the resulting ``URLRequest`` before sending.
 ///
 /// - Note: Prefer using ``ModifiedRequest`` over creating custom ``ModifiableRequest``s.
-protocol ModifiableRequest: Request {
+public protocol ModifiableRequest: Request {
     /// The type of modifier applied to the request.
     associatedtype Modifier: RequestModifier
 
@@ -54,9 +54,9 @@ extension ModifiableRequest {
     ///
     /// - Returns: A modified ``URLRequest`` ready to be sent.
     /// - Note: This type is prefixed with `_` to indicate that it is not intended for public use.
-    @inlinable public func _makeURLRequest() throws -> URLRequest {
+    public func _makeURLRequest() throws -> URLRequest {
         let urlRequest = try request._makeURLRequest()
-        return try modifier.modifying(urlRequest)
+        return try modifier.modifying(consume urlRequest)
     }
 
     /// Applies the given configuration values to the request and its modifier.
@@ -67,7 +67,7 @@ extension ModifiableRequest {
     ///
     /// - Parameter values: The configuration values to apply.
     /// - Note: This type is prefixed with `_` to indicate that it is not intended for public use.
-    @inlinable public func _accept(_ values: ConfigurationValues) {
+    public func _accept(_ values: ConfigurationValues) {
         request._accept(values)
         modifier._accept(values)
     }

Sources/NetworkingCore/RequestModifiers/Headers/RequestHeader.swift

@@ -26,13 +26,8 @@ extension RequestHeader {
     public func modifying(
         _ request: consuming URLRequest
     ) throws -> URLRequest {
-        if var headersFields = request.allHTTPHeaderFields {
-            for header in headers {
-                headersFields[header.key] = header.value
-            }
-            request.allHTTPHeaderFields = headersFields
-        }else {
-            request.allHTTPHeaderFields = headers
+        for header in headers {
+            request.setValue(header.value, forHTTPHeaderField: header.key)
         }
         return request
     }

Sources/NetworkingCore/ResultBuilders/Shared Modifiers/_ConditionalModifier.swift

@@ -14,28 +14,28 @@ import Foundation
     }
     public let storage: Self.Storage
 
-    @inlinable public init(storage: Self.Storage) {
+    public init(storage: Self.Storage) {
         self.storage = storage
     }
 }
 
 // MARK: - RequestModifier
 extension _ConditionalModifier: RequestModifier where TrueContent: RequestModifier, FalseContent: RequestModifier {
-    @inlinable public func modifying(
+    public func modifying(
         _ request: consuming URLRequest
     ) throws -> URLRequest {
         switch storage {
             case .trueContent(let mod):
-                return try mod.modifying(request)
+                return try mod.modifying(consume request)
             case .falseContent(let mod):
-                return try mod.modifying(request)
+                return try mod.modifying(consume request)
         }
     }
 }
 
 // MARK: - _DynamicConfigurable
 extension _ConditionalModifier: _DynamicConfigurable where TrueContent: _DynamicConfigurable, FalseContent: _DynamicConfigurable {
-    @inlinable public func _accept(_ values: ConfigurationValues) {
+    public func _accept(_ values: ConfigurationValues) {
         switch storage {
             case .trueContent(let mod):
                 mod._accept(values)
@@ -59,7 +59,7 @@ extension _ConditionalModifier: CustomStringConvertible where TrueContent: Custo
 
 // MARK: - RequestHeader
 extension _ConditionalModifier: RequestHeader where TrueContent: RequestHeader, FalseContent: RequestHeader {
-    @inlinable public var headers: [String : String] {
+    public var headers: [String : String] {
         switch storage {
             case .trueContent(let header):
                 return header.headers
@@ -71,7 +71,7 @@ extension _ConditionalModifier: RequestHeader where TrueContent: RequestHeader,
 
 // MARK: - RequestParameter
 extension _ConditionalModifier: RequestParameter where TrueContent: RequestParameter, FalseContent: RequestParameter {
-    @inlinable public var parameters: [URLQueryItem] {
+    public var parameters: [URLQueryItem] {
         switch storage {
             case .trueContent(let parameter):
                 return parameter.parameters

Sources/NetworkingCore/ResultBuilders/Shared Modifiers/_OptionalModifier.swift

@@ -10,26 +10,26 @@ import Foundation
 @frozen public struct _OptionalModifier<Modifier> {
     public let storage: Modifier?
 
-    @inlinable public init(storage: Modifier?) {
+    public init(storage: Modifier?) {
         self.storage = storage
     }
 }
 
 // MARK: - RequestModifier
 extension _OptionalModifier: RequestModifier where Modifier: RequestModifier {
-    @inlinable public func modifying(
+    public func modifying(
         _ request: consuming URLRequest
     ) throws -> URLRequest {
         guard let storage else {
             return request
         }
-        return try storage.modifying(request)
+        return try storage.modifying(consume request)
     }
 }
 
 // MARK: - _DynamicConfigurable
 extension _OptionalModifier: _DynamicConfigurable where Modifier: _DynamicConfigurable {
-    @inlinable public func _accept(_ values: ConfigurationValues) {
+    public func _accept(_ values: ConfigurationValues) {
         storage?._accept(values)
     }
 }
@@ -43,14 +43,14 @@ extension _OptionalModifier: CustomStringConvertible where Modifier: CustomStrin
 
 // MARK: - RequestHeader
 extension _OptionalModifier: RequestHeader where Modifier: RequestHeader {
-    @inlinable public var headers: [String : String] {
+    public var headers: [String : String] {
         return storage?.headers ?? [:]
     }
 }
 
 // MARK: - RequestParameter
 extension _OptionalModifier: RequestParameter where Modifier: RequestParameter {
-    @inlinable public var parameters: [URLQueryItem] {
+    public var parameters: [URLQueryItem] {
         return storage?.parameters ?? []
     }
 }

Sources/NetworkingCore/ResultBuilders/Shared Modifiers/_TupleModifier.swift

@@ -14,7 +14,7 @@ import Foundation
 // MARK: - RequestModifier
 extension _TupleModifier: RequestModifier where M0: RequestModifier, M1: RequestModifier, M2: RequestModifier, M3: RequestModifier, M4: RequestModifier, M5: RequestModifier, M6: RequestModifier, M7: RequestModifier, M8: RequestModifier, M9: RequestModifier {
 
-    @inlinable public init(
+    public init(
         _ m0: M0,
         _ m1: M1,
         _ m2: M2 = EmptyModifier(),
@@ -29,28 +29,27 @@ extension _TupleModifier: RequestModifier where M0: RequestModifier, M1: Request
         self.value = (m0, m1, m2, m3, m4, m5, m6, m7, m8, m9)
     }
 
-    @inlinable public func modifying(
+    public func modifying(
         _ request: consuming URLRequest
     ) throws -> URLRequest {
-        var urlRequest = request
-        try urlRequest = value.0.modifying(consume urlRequest)
-        try urlRequest = value.1.modifying(consume urlRequest)
-        try urlRequest = value.2.modifying(consume urlRequest)
-        try urlRequest = value.3.modifying(consume urlRequest)
-        try urlRequest = value.4.modifying(consume urlRequest)
-        try urlRequest = value.5.modifying(consume urlRequest)
-        try urlRequest = value.6.modifying(consume urlRequest)
-        try urlRequest = value.7.modifying(consume urlRequest)
-        try urlRequest = value.8.modifying(consume urlRequest)
-        try urlRequest = value.9.modifying(consume urlRequest)
+        var urlRequest = try value.0.modifying(consume request)
+        urlRequest = try value.1.modifying(consume urlRequest)
+        urlRequest = try value.2.modifying(consume urlRequest)
+        urlRequest = try value.3.modifying(consume urlRequest)
+        urlRequest = try value.4.modifying(consume urlRequest)
+        urlRequest = try value.5.modifying(consume urlRequest)
+        urlRequest = try value.6.modifying(consume urlRequest)
+        urlRequest = try value.7.modifying(consume urlRequest)
+        urlRequest = try value.8.modifying(consume urlRequest)
+        urlRequest = try value.9.modifying(consume urlRequest)
         return urlRequest
     }
 }
 
 // MARK: - _DynamicConfigurable
 extension _TupleModifier: _DynamicConfigurable where M0: _DynamicConfigurable, M1: _DynamicConfigurable, M2: _DynamicConfigurable, M3: _DynamicConfigurable, M4: _DynamicConfigurable, M5: _DynamicConfigurable, M6: _DynamicConfigurable, M7: _DynamicConfigurable, M8: _DynamicConfigurable, M9: _DynamicConfigurable {
 
-    @inlinable public func _accept(_ values: ConfigurationValues) {
+    public func _accept(_ values: ConfigurationValues) {
         value.0._accept(values)
         value.1._accept(values)
         value.2._accept(values)
@@ -83,15 +82,15 @@ extension _TupleModifier: CustomStringConvertible where M0: CustomStringConverti
 
 // MARK: - RequestParameter
 extension _TupleModifier: RequestParameter where M0: RequestParameter, M1: RequestParameter, M2: RequestParameter, M3: RequestParameter, M4: RequestParameter, M5: RequestParameter, M6: RequestParameter, M7: RequestParameter, M8: RequestParameter, M9: RequestParameter {
-    @inlinable public var parameters: [URLQueryItem] {
+    public var parameters: [URLQueryItem] {
         return value.0.parameters + value.1.parameters + value.2.parameters + value.3.parameters + value.4.parameters + value.5.parameters + value.6.parameters + value.7.parameters + value.8.parameters + value.9.parameters
     }
 }
 
 // MARK: - RequestHeader
 extension _TupleModifier: RequestHeader where M0: RequestHeader, M1: RequestHeader, M2: RequestHeader, M3: RequestHeader, M4: RequestHeader, M5: RequestHeader, M6: RequestHeader, M7: RequestHeader, M8: RequestHeader, M9: RequestHeader {
 
-    @inlinable public var headers: [String : String] {
+    public var headers: [String : String] {
         value.0.headers
             .merging(value.1.headers, uniquingKeysWith: { $1 })
             .merging(value.2.headers, uniquingKeysWith: { $1 })