@@ -15,18 +15,32 @@ import FoundationNetworking
1515extension URLSession {
1616 static let parse : URLSession = {
1717 if !ParseSwift. configuration. isTestingSDK {
18- return URLSession ( configuration: . default,
18+ let configuration = URLSessionConfiguration . default
19+ configuration. urlCache = URLCache . parse
20+ configuration. requestCachePolicy = ParseSwift . configuration. requestCachePolicy
21+ configuration. httpAdditionalHeaders = ParseSwift . configuration. httpAdditionalHeaders
22+ return URLSession ( configuration: configuration,
1923 delegate: ParseSwift . sessionDelegate,
2024 delegateQueue: nil )
2125 } else {
26+ let session = URLSession . shared
27+ session. configuration. urlCache = URLCache . parse
2228 return URLSession . shared
2329 }
2430 } ( )
2531
26- internal func makeResult< U> ( responseData: Data ? ,
32+ internal func makeResult< U> ( request: URLRequest ,
33+ responseData: Data ? ,
2734 urlResponse: URLResponse ? ,
2835 responseError: Error ? ,
2936 mapper: @escaping ( Data ) throws -> U ) -> Result < U , ParseError > {
37+ guard let response = urlResponse else {
38+ guard let parseError = responseError as? ParseError else {
39+ return . failure( ParseError ( code: . unknownError,
40+ message: " No response from server " ) )
41+ }
42+ return . failure( parseError)
43+ }
3044 if let responseError = responseError {
3145 guard let parseError = responseError as? ParseError else {
3246 return . failure( ParseError ( code: . unknownError,
@@ -37,6 +51,11 @@ extension URLSession {
3751
3852 if let responseData = responseData {
3953 do {
54+ if URLSession . parse. configuration. urlCache? . cachedResponse ( for: request) == nil {
55+ URLSession . parse. configuration. urlCache? . storeCachedResponse ( . init( response: response,
56+ data: responseData) ,
57+ for: request)
58+ }
4059 return try . success( mapper ( responseData) )
4160 } catch {
4261 if let error = try ? ParseCoding . jsonDecoder ( ) . decode ( ParseError . self, from: responseData) {
@@ -49,11 +68,11 @@ extension URLSession {
4968 options: . prettyPrinted) else {
5069 return . failure( ParseError ( code: . unknownError,
5170 // swiftlint:disable:next line_length
52- message: " Error decoding parse-server response: \( String ( describing : urlResponse ) ) with error: \( error. localizedDescription) Format: \( String ( describing: String ( data: responseData, encoding: . utf8) ) ) " ) )
71+ message: " Error decoding parse-server response: \( response ) with error: \( error. localizedDescription) Format: \( String ( describing: String ( data: responseData, encoding: . utf8) ) ) " ) )
5372 }
5473 return . failure( ParseError ( code: . unknownError,
5574 // swiftlint:disable:next line_length
56- message: " Error decoding parse-server response: \( String ( describing : urlResponse ) ) with error: \( error. localizedDescription) Format: \( String ( describing: String ( data: json, encoding: . utf8) ) ) " ) )
75+ message: " Error decoding parse-server response: \( response ) with error: \( error. localizedDescription) Format: \( String ( describing: String ( data: json, encoding: . utf8) ) ) " ) )
5776 }
5877 return . failure( parseError)
5978 }
@@ -63,10 +82,18 @@ extension URLSession {
6382 message: " Unable to sync with parse-server: \( String ( describing: urlResponse) ) . " ) )
6483 }
6584
66- internal func makeResult< U> ( location: URL ? ,
85+ internal func makeResult< U> ( request: URLRequest ,
86+ location: URL ? ,
6787 urlResponse: URLResponse ? ,
6888 responseError: Error ? ,
6989 mapper: @escaping ( Data ) throws -> U ) -> Result < U , ParseError > {
90+ guard let response = urlResponse else {
91+ guard let parseError = responseError as? ParseError else {
92+ return . failure( ParseError ( code: . unknownError,
93+ message: " No response from server " ) )
94+ }
95+ return . failure( parseError)
96+ }
7097 if let responseError = responseError {
7198 guard let parseError = responseError as? ParseError else {
7299 return . failure( ParseError ( code: . unknownError,
@@ -78,19 +105,24 @@ extension URLSession {
78105 if let location = location {
79106 do {
80107 let data = try ParseCoding . jsonEncoder ( ) . encode ( location)
108+ if URLSession . parse. configuration. urlCache? . cachedResponse ( for: request) == nil {
109+ URLSession . parse. configuration. urlCache? . storeCachedResponse ( . init( response: response,
110+ data: data) ,
111+ for: request)
112+ }
81113 return try . success( mapper ( data) )
82114 } catch {
83115 guard let parseError = error as? ParseError else {
84116 return . failure( ParseError ( code: . unknownError,
85117 // swiftlint:disable:next line_length
86- message: " Error decoding parse-server response: \( String ( describing : urlResponse ) ) with error: \( error. localizedDescription) " ) )
118+ message: " Error decoding parse-server response: \( response ) with error: \( error. localizedDescription) " ) )
87119 }
88120 return . failure( parseError)
89121 }
90122 }
91123
92124 return . failure( ParseError ( code: . unknownError,
93- message: " Unable to sync with parse-server: \( String ( describing : urlResponse ) ) . " ) )
125+ message: " Unable to sync with parse-server: \( response ) . " ) )
94126 }
95127
96128 internal func dataTask< U> (
@@ -100,9 +132,10 @@ extension URLSession {
100132 ) {
101133
102134 dataTask ( with: request) { ( responseData, urlResponse, responseError) in
103- completion ( self . makeResult ( responseData: responseData,
104- urlResponse: urlResponse,
105- responseError: responseError, mapper: mapper) )
135+ completion ( self . makeResult ( request: request,
136+ responseData: responseData,
137+ urlResponse: urlResponse,
138+ responseError: responseError, mapper: mapper) )
106139 } . resume ( )
107140 }
108141}
@@ -120,15 +153,17 @@ extension URLSession {
120153 var task : URLSessionTask ?
121154 if let data = data {
122155 task = uploadTask ( with: request, from: data) { ( responseData, urlResponse, responseError) in
123- completion ( self . makeResult ( responseData: responseData,
124- urlResponse: urlResponse,
125- responseError: responseError, mapper: mapper) )
156+ completion ( self . makeResult ( request: request,
157+ responseData: responseData,
158+ urlResponse: urlResponse,
159+ responseError: responseError, mapper: mapper) )
126160 }
127161 } else if let file = file {
128162 task = uploadTask ( with: request, fromFile: file) { ( responseData, urlResponse, responseError) in
129- completion ( self . makeResult ( responseData: responseData,
130- urlResponse: urlResponse,
131- responseError: responseError, mapper: mapper) )
163+ completion ( self . makeResult ( request: request,
164+ responseData: responseData,
165+ urlResponse: urlResponse,
166+ responseError: responseError, mapper: mapper) )
132167 }
133168 } else {
134169 completion ( . failure( ParseError ( code: . unknownError, message: " data and file both can't be nil " ) ) )
@@ -148,23 +183,23 @@ extension URLSession {
148183 completion: @escaping ( Result < U , ParseError > ) -> Void
149184 ) {
150185 let task = downloadTask ( with: request) { ( location, urlResponse, responseError) in
151- completion ( self . makeResult ( location: location,
152- urlResponse: urlResponse,
153- responseError: responseError, mapper: mapper) )
186+ completion ( self . makeResult ( request: request,
187+ location: location,
188+ urlResponse: urlResponse,
189+ responseError: responseError, mapper: mapper) )
154190 }
155191 ParseSwift . sessionDelegate. downloadDelegates [ task] = progress
156192 ParseSwift . sessionDelegate. taskCallbackQueues [ task] = callbackQueue
157193 task. resume ( )
158194 }
159195
160196 internal func downloadTask< U> (
161- with url : URL ,
197+ with request : URLRequest ,
162198 mapper: @escaping ( Data ) throws -> U ,
163199 completion: @escaping ( Result < U , ParseError > ) -> Void
164200 ) {
165-
166- downloadTask ( with: url) { ( location, urlResponse, responseError) in
167- completion ( self . makeResult ( location: location,
201+ downloadTask ( with: request) { ( location, urlResponse, responseError) in
202+ completion ( self . makeResult ( request: request, location: location,
168203 urlResponse: urlResponse,
169204 responseError: responseError,
170205 mapper: mapper) )
0 commit comments