1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
|
//
// MullvadAPIProxy.swift
// MullvadVPN
//
// Created by Jon Petersson on 2025-03-19.
// Copyright © 2025 Mullvad VPN AB. All rights reserved.
//
import MullvadRustRuntime
import MullvadTypes
import Operations
import WireGuardKitTypes
public protocol APIQuerying: Sendable {
func getAddressList(
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping @Sendable ProxyCompletionHandler<[AnyIPEndpoint]>
) -> Cancellable
func getRelays(
etag: String?,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping @Sendable ProxyCompletionHandler<REST.ServerRelaysCacheResponse>
) -> Cancellable
func legacyStorekitPayment(
accountNumber: String,
request: LegacyStorekitRequest,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping @Sendable ProxyCompletionHandler<REST.CreateApplePaymentResponse>
) -> Cancellable
func sendProblemReport(
_ body: ProblemReportRequest,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping @Sendable ProxyCompletionHandler<Void>
) -> Cancellable
func submitVoucher(
voucherCode: String,
accountNumber: String,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping @Sendable ProxyCompletionHandler<REST.SubmitVoucherResponse>
) -> Cancellable
func initStorekitPayment(
accountNumber: String,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping @Sendable ProxyCompletionHandler<String>
) -> Cancellable
func checkStorekitPayment(
accountNumber: String,
transaction: StorekitTransaction,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping @Sendable ProxyCompletionHandler<Void>
) -> Cancellable
func checkApiAvailability(
retryStrategy: REST.RetryStrategy,
accessMethod: PersistentAccessMethod,
completion: @escaping @Sendable ProxyCompletionHandler<Bool>
) -> Cancellable
}
extension REST {
public final class MullvadAPIProxy: APIQuerying, @unchecked Sendable {
let transportProvider: APITransportProviderProtocol
let dispatchQueue: DispatchQueue
let operationQueue = AsyncOperationQueue()
let responseDecoder: JSONDecoder
public init(
transportProvider: APITransportProviderProtocol,
dispatchQueue: DispatchQueue,
responseDecoder: JSONDecoder
) {
self.transportProvider = transportProvider
self.dispatchQueue = dispatchQueue
self.responseDecoder = responseDecoder
}
public func getAddressList(
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping ProxyCompletionHandler<[AnyIPEndpoint]>
) -> Cancellable {
let responseHandler = rustResponseHandler(
decoding: [AnyIPEndpoint].self,
with: responseDecoder
)
return createNetworkOperation(
request: .getAddressList(retryStrategy),
responseHandler: responseHandler,
completionHandler: completionHandler
)
}
public func getRelays(
etag: String?,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping ProxyCompletionHandler<REST.ServerRelaysCacheResponse>
) -> Cancellable {
if var etag {
// Enforce weak validator to account for some backend caching quirks.
if etag.starts(with: "\"") {
etag.insert(contentsOf: "W/", at: etag.startIndex)
}
}
let responseHandler = rustCustomResponseHandler { [weak self] data, responseEtag in
if let responseEtag, responseEtag == etag {
return REST.ServerRelaysCacheResponse.notModified
} else {
// Discarding result since we're only interested in knowing that it's parseable.
let canDecodeResponse =
(try? self?.responseDecoder.decode(
REST.ServerRelaysResponse.self,
from: data
)) != nil
return canDecodeResponse ? REST.ServerRelaysCacheResponse.newContent(responseEtag, data) : nil
}
}
return createNetworkOperation(
request: .getRelayList(retryStrategy, etag: etag),
responseHandler: responseHandler,
completionHandler: completionHandler
)
}
public func sendProblemReport(
_ body: ProblemReportRequest,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping ProxyCompletionHandler<Void>
) -> Cancellable {
createNetworkOperation(
request: .sendProblemReport(retryStrategy, problemReportRequest: body),
responseHandler: rustEmptyResponseHandler(),
completionHandler: completionHandler
)
}
public func submitVoucher(
voucherCode: String,
accountNumber: String,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping ProxyCompletionHandler<REST.SubmitVoucherResponse>
) -> Cancellable {
AnyCancellable()
}
public func checkApiAvailability(
retryStrategy: REST.RetryStrategy,
accessMethod: PersistentAccessMethod,
completion: @escaping @Sendable ProxyCompletionHandler<Bool>
) -> Cancellable {
let responseHandler = rustEmptyResponseHandler()
return createNetworkOperation(
request: .checkApiAvailability(retryStrategy, accessMethod: accessMethod),
responseHandler: responseHandler
) { result in
if case let .failure(err) = result {
completion(.failure(err))
} else {
completion(.success(true))
}
}
}
public func legacyStorekitPayment(
accountNumber: String,
request: LegacyStorekitRequest,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping ProxyCompletionHandler<REST.CreateApplePaymentResponse>
) -> Cancellable {
let responseHandler: REST.RustResponseHandler<REST.CreateApplePaymentResponse> =
rustCustomResponseHandler { [weak self] data, _ in
guard
let serverResponse = try? self?.responseDecoder.decode(
CreateApplePaymentRawResponse.self,
from: data
)
else {
return nil
}
return if serverResponse.timeAdded > 0 {
.timeAdded(
serverResponse.timeAdded,
serverResponse.newExpiry
)
} else {
.noTimeAdded(serverResponse.newExpiry)
}
}
return createNetworkOperation(
request:
.legacyStorekitPayment(
retryStrategy: retryStrategy,
accountNumber: accountNumber,
request: request
),
responseHandler: responseHandler,
completionHandler: completionHandler
)
}
public func initStorekitPayment(
accountNumber: String,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping ProxyCompletionHandler<String>
) -> Cancellable {
struct InitStorekitPaymentResponse: Codable {
let paymentToken: String
}
let responseHandler = rustResponseHandler(
decoding: InitStorekitPaymentResponse.self,
with: responseDecoder
)
return createNetworkOperation(
request:
.initStorekitPayment(retryStrategy: retryStrategy, accountNumber: accountNumber),
responseHandler: responseHandler,
completionHandler: { completionHandler($0.map { $0.paymentToken }) }
)
}
public func checkStorekitPayment(
accountNumber: String,
transaction: StorekitTransaction,
retryStrategy: REST.RetryStrategy,
completionHandler: @escaping ProxyCompletionHandler<Void>
) -> Cancellable {
let responseHandler = rustEmptyResponseHandler()
return createNetworkOperation(
request:
.checkStorekitPayment(
retryStrategy: retryStrategy,
accountNumber: accountNumber,
transaction: transaction
),
responseHandler: responseHandler,
completionHandler: completionHandler
)
}
private func createNetworkOperation<Success>(
request: APIRequest,
responseHandler: RustResponseHandler<Success>,
completionHandler: @escaping @Sendable ProxyCompletionHandler<Success>
) -> MullvadApiNetworkOperation<Success> {
let networkOperation = MullvadApiNetworkOperation(
name: request.name,
dispatchQueue: dispatchQueue,
request: request,
transportProvider: transportProvider,
responseDecoder: responseDecoder,
responseHandler: responseHandler,
completionHandler: completionHandler
)
operationQueue.addOperation(networkOperation)
return networkOperation
}
}
// MARK: - Response types
public enum ServerRelaysCacheResponse: Sendable, Decodable {
case notModified
case newContent(_ etag: String?, _ rawData: Data)
}
public enum CreateApplePaymentResponse: Sendable, Decodable {
case noTimeAdded(_ expiry: Date)
case timeAdded(_ timeAdded: Int, _ newExpiry: Date)
public var newExpiry: Date {
switch self {
case let .noTimeAdded(expiry), let .timeAdded(_, expiry):
return expiry
}
}
public var timeAdded: TimeInterval {
switch self {
case .noTimeAdded:
return 0
case let .timeAdded(timeAdded, _):
return TimeInterval(timeAdded)
}
}
/// Returns a formatted string for the `timeAdded` interval, i.e "30 days"
public var formattedTimeAdded: String? {
let formatter = DateComponentsFormatter()
formatter.allowedUnits = [.day, .hour]
formatter.unitsStyle = .full
return formatter.string(from: self.timeAdded)
}
}
private struct CreateApplePaymentRawResponse: Decodable, Sendable {
let timeAdded: Int
let newExpiry: Date
}
}
|
