moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2025-07-02 15:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reference cycle in HttpManager due to delegate retention

Browse Source 
Fixes #654
This commit is contained in:
Cameron Gutman 2024-12-20 15:33:02 -06:00
parent 997525c71e
commit 1e0714ce70
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Limelight/Network/HttpManager.m
View File

@ -23,20 +23,14 @@
#define EXTRA_LONG_TIMEOUT_SEC 180 #define EXTRA_LONG_TIMEOUT_SEC 180
@implementation HttpManager { @implementation HttpManager {
NSURLSession* _urlSession;
NSString* _urlSafeHostName; NSString* _urlSafeHostName;
NSString* _baseHTTPURL; NSString* _baseHTTPURL;
NSString* _uniqueId; NSString* _uniqueId;
NSString* _deviceName; NSString* _deviceName;
NSData* _serverCert; NSData* _serverCert;
NSMutableData* _respData;
NSData* _requestResp;
dispatch_semaphore_t _requestLock;
TemporaryHost *_host; // May be nil TemporaryHost *_host; // May be nil
NSString* _baseHTTPSURL; NSString* _baseHTTPSURL;
NSError* _error;
} }
+ (NSData*) fixXmlVersion:(NSData*) xmlData { + (NSData*) fixXmlVersion:(NSData*) xmlData {
@ -63,10 +57,6 @@
_uniqueId = @"0123456789ABCDEF"; _uniqueId = @"0123456789ABCDEF";
_deviceName = deviceName; _deviceName = deviceName;
_serverCert = serverCert; _serverCert = serverCert;
_requestLock = dispatch_semaphore_create(0);
_respData = [[NSMutableData alloc] init];
NSURLSessionConfiguration* config = [NSURLSessionConfiguration ephemeralSessionConfiguration];
_urlSession = [NSURLSession sessionWithConfiguration:config delegate:self delegateQueue:nil];
NSString* address = [Utils addressPortStringToAddress:hostAddressPortString]; NSString* address = [Utils addressPortStringToAddress:hostAddressPortString];
unsigned short port = [Utils addressPortStringToPort:hostAddressPortString]; unsigned short port = [Utils addressPortStringToPort:hostAddressPortString];
@ -126,36 +116,39 @@
return; return;
} }
[_respData setLength:0]; __block NSData* requestResp;
_error = nil; __block NSError* respError;
__block dispatch_semaphore_t requestLock = dispatch_semaphore_create(0);
Log(LOG_D, @"Making Request: %@", request); Log(LOG_D, @"Making Request: %@", request);
[[_urlSession dataTaskWithRequest:request.request completionHandler:^(NSData * __nullable data, NSURLResponse * __nullable response, NSError * __nullable error) { NSURLSession* urlSession = [NSURLSession sessionWithConfiguration:[NSURLSessionConfiguration ephemeralSessionConfiguration] delegate:self delegateQueue:nil];
[[urlSession dataTaskWithRequest:request.request completionHandler:^(NSData * __nullable data, NSURLResponse * __nullable response, NSError * __nullable error) {
if (error != NULL) { if (error != NULL) {
Log(LOG_D, @"Connection error: %@", error); Log(LOG_D, @"Connection error: %@", error);
self->_error = error; respError = error;
} }
else { else {
Log(LOG_D, @"Received response: %@", response); Log(LOG_D, @"Received response: %@", response);
if (data != NULL) { if (data != NULL) {
Log(LOG_D, @"\n\nReceived data: %@\n\n", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]); Log(LOG_D, @"\n\nReceived data: %@\n\n", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
[self->_respData appendData:data]; if ([[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] != nil) {
if ([[NSString alloc] initWithData:self->_respData encoding:NSUTF8StringEncoding] != nil) { requestResp = [HttpManager fixXmlVersion:data];
self->_requestResp = [HttpManager fixXmlVersion:self->_respData];
} else { } else {
self->_requestResp = self->_respData; requestResp = data;
} }
} }
} }
dispatch_semaphore_signal(self->_requestLock); dispatch_semaphore_signal(requestLock);
}] resume]; }] resume];
dispatch_semaphore_wait(_requestLock, DISPATCH_TIME_FOREVER);
if (!_error && request.response) { dispatch_semaphore_wait(requestLock, DISPATCH_TIME_FOREVER);
[request.response populateWithData:_requestResp]; [urlSession invalidateAndCancel];
if (!respError && request.response) {
[request.response populateWithData:requestResp];
// If the fallback error code was detected, issue the fallback request // If the fallback error code was detected, issue the fallback request
if (request.response.statusCode == request.fallbackError && request.fallbackRequest != NULL) { if (request.response.statusCode == request.fallbackError && request.fallbackRequest != NULL) {
@ -166,7 +159,7 @@
[self executeRequestSynchronously:request]; [self executeRequestSynchronously:request];
} }
} }
else if (_error && [_error code] == NSURLErrorServerCertificateUntrusted) { else if (respError && [respError code] == NSURLErrorServerCertificateUntrusted) {
// We must have a pinned cert for HTTPS. If we fail, it must be due to // We must have a pinned cert for HTTPS. If we fail, it must be due to
// a non-matching cert, not because we had no cert at all. // a non-matching cert, not because we had no cert at all.
assert(_serverCert != nil); assert(_serverCert != nil);
@ -181,9 +174,9 @@
[self executeRequestSynchronously:request]; [self executeRequestSynchronously:request];
} }
} }
else if (_error && request.response) { else if (respError && request.response) {
request.response.statusCode = [_error code]; request.response.statusCode = [respError code];
request.response.statusMessage = [_error localizedDescription]; request.response.statusMessage = [respError localizedDescription];
} }
} }