mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
replace URLConnection with URLSession (#10596)
This commit is contained in:
@@ -33,7 +33,8 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <Security/Security.h>
|
||||
/// @cond
|
||||
@interface HttpAsynConnection : NSObject <NSURLConnectionDelegate, NSURLConnectionDataDelegate> {
|
||||
@interface HttpAsynConnection : NSObject<NSURLSessionDelegate> {
|
||||
NSURLSession *session;
|
||||
}
|
||||
|
||||
// The original URL to download. Due to redirects the actual content may come from another URL
|
||||
@@ -53,7 +54,7 @@
|
||||
@property (strong) NSError *responseError;
|
||||
@property (strong) NSError *connError;
|
||||
|
||||
@property (strong) NSURLConnection *conn;
|
||||
@property (strong) NSURLSessionDataTask *task;
|
||||
|
||||
@property bool finish;
|
||||
|
||||
|
||||
@@ -24,12 +24,14 @@
|
||||
|
||||
#if (CC_PLATFORM == CC_PLATFORM_MAC_OSX) || (CC_PLATFORM == CC_PLATFORM_MAC_IOS)
|
||||
|
||||
#import "network/HttpAsynConnection-apple.h"
|
||||
#import "network/HttpAsynConnection-apple.h"
|
||||
|
||||
@interface HttpAsynConnection ()
|
||||
|
||||
@property (readwrite) NSString *statusString;
|
||||
|
||||
- (BOOL)shouldTrustProtectionSpace:(NSURLProtectionSpace *)protectionSpace;
|
||||
|
||||
@end
|
||||
|
||||
@implementation HttpAsynConnection
|
||||
@@ -43,7 +45,7 @@
|
||||
@synthesize statusString = statusString;
|
||||
@synthesize responseError = responseError;
|
||||
@synthesize connError = connError;
|
||||
@synthesize conn = conn;
|
||||
@synthesize task = task;
|
||||
@synthesize finish = finish;
|
||||
@synthesize runLoop = runLoop;
|
||||
|
||||
@@ -53,106 +55,73 @@
|
||||
[responseHeader release];
|
||||
[responseData release];
|
||||
[responseError release];
|
||||
[conn release];
|
||||
[runLoop release];
|
||||
[connError release];
|
||||
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (void)startRequest:(NSURLRequest *)request {
|
||||
#ifdef CC_DEBUG
|
||||
// NSLog(@"Starting to load %@", srcURL);
|
||||
#endif
|
||||
|
||||
#ifdef CC_DEBUG
|
||||
// NSLog(@"Starting to load %@", srcURL);
|
||||
#endif
|
||||
|
||||
finish = false;
|
||||
|
||||
|
||||
self.responseData = [NSMutableData data];
|
||||
getDataTime = 0;
|
||||
|
||||
|
||||
self.responseError = nil;
|
||||
self.connError = nil;
|
||||
|
||||
// create the connection with the target request and this class as the delegate
|
||||
self.conn = [[[NSURLConnection alloc] initWithRequest:request
|
||||
delegate:self
|
||||
startImmediately:NO] autorelease];
|
||||
|
||||
[self.conn scheduleInRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
|
||||
|
||||
// start the connection
|
||||
[self.conn start];
|
||||
}
|
||||
|
||||
#pragma mark NSURLConnectionDelegate methods
|
||||
/**
|
||||
* This delegate method is called when the NSURLConnection connects to the server. It contains the
|
||||
* NSURLResponse object with the headers returned by the server. This method may be called multiple times.
|
||||
* Therefore, it is important to reset the data on each call. Do not assume that it is the first call
|
||||
* of this method.
|
||||
**/
|
||||
- (void)connection:(NSURLConnection *)connection
|
||||
didReceiveResponse:(NSURLResponse *)response {
|
||||
#ifdef CC_DEBUG
|
||||
// NSLog(@"Received response from request to url %@", srcURL);
|
||||
#endif
|
||||
|
||||
NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
|
||||
//NSLog(@"All headers = %@", [httpResponse allHeaderFields]);
|
||||
self.responseHeader = [httpResponse allHeaderFields];
|
||||
|
||||
responseCode = httpResponse.statusCode;
|
||||
self.statusString = [NSHTTPURLResponse localizedStringForStatusCode:responseCode];
|
||||
if (responseCode == 200)
|
||||
self.statusString = @"OK";
|
||||
|
||||
/*The individual values of the numeric status codes defined for HTTP/1.1
|
||||
| "200" ; OK
|
||||
| "201" ; Created
|
||||
| "202" ; Accepted
|
||||
| "203" ; Non-Authoritative Information
|
||||
| "204" ; No Content
|
||||
| "205" ; Reset Content
|
||||
| "206" ; Partial Content
|
||||
*/
|
||||
if (responseCode < 200 || responseCode >= 300) { // something went wrong, abort the whole thing
|
||||
self.responseError = [NSError errorWithDomain:@"CCBackendDomain"
|
||||
code:responseCode
|
||||
userInfo:@{NSLocalizedDescriptionKey : @"Bad HTTP Response Code"}];
|
||||
}
|
||||
|
||||
[responseData setLength:0];
|
||||
}
|
||||
|
||||
/**
|
||||
* This delegate method is called for each chunk of data received from the server. The chunk size
|
||||
* is dependent on the network type and the server configuration.
|
||||
*/
|
||||
- (void)connection:(NSURLConnection *)connection
|
||||
didReceiveData:(NSData *)data {
|
||||
//NSLog(@"get some data");
|
||||
[responseData appendData:data];
|
||||
getDataTime++;
|
||||
}
|
||||
|
||||
/**
|
||||
* This delegate method is called if the connection cannot be established to the server.
|
||||
* The error object will have a description of the error
|
||||
**/
|
||||
- (void)connection:(NSURLConnection *)connection
|
||||
didFailWithError:(NSError *)error {
|
||||
//NSLog(@"Load failed with error %@", [error localizedDescription]);
|
||||
self.connError = error;
|
||||
|
||||
finish = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* This delegate method is called when the data load is complete. The delegate will be released
|
||||
* following this call
|
||||
**/
|
||||
- (void)connectionDidFinishLoading:(NSURLConnection *)connection {
|
||||
finish = true;
|
||||
|
||||
session = [NSURLSession sharedSession];
|
||||
|
||||
task = [session dataTaskWithRequest:request completionHandler:^(NSData * data, NSURLResponse * response, NSError * _Nullable error) {
|
||||
|
||||
if(error != nil) {
|
||||
self.connError = error;
|
||||
finish = true;
|
||||
return;
|
||||
}
|
||||
if(response != nil) {
|
||||
#ifdef CC_DEBUG
|
||||
// NSLog(@"Received response from request to url %@", srcURL);
|
||||
#endif
|
||||
|
||||
NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
|
||||
//NSLog(@"All headers = %@", [httpResponse allHeaderFields]);
|
||||
self.responseHeader = [httpResponse allHeaderFields];
|
||||
|
||||
responseCode = httpResponse.statusCode;
|
||||
self.statusString = [NSHTTPURLResponse localizedStringForStatusCode:responseCode];
|
||||
if (responseCode == 200)
|
||||
self.statusString = @"OK";
|
||||
|
||||
/*The individual values of the numeric status codes defined for HTTP/1.1
|
||||
| "200" ; OK
|
||||
| "201" ; Created
|
||||
| "202" ; Accepted
|
||||
| "203" ; Non-Authoritative Information
|
||||
| "204" ; No Content
|
||||
| "205" ; Reset Content
|
||||
| "206" ; Partial Content
|
||||
*/
|
||||
if (responseCode < 200 || responseCode >= 300) { // something went wrong, abort the whole thing
|
||||
self.responseError = [NSError errorWithDomain:@"CCBackendDomain"
|
||||
code:responseCode
|
||||
userInfo:@{NSLocalizedDescriptionKey : @"Bad HTTP Response Code"}];
|
||||
}
|
||||
|
||||
[responseData setLength:0];
|
||||
}
|
||||
|
||||
if (data != nil) {
|
||||
[responseData appendData:data];
|
||||
getDataTime++;
|
||||
}
|
||||
|
||||
finish = true;
|
||||
}];
|
||||
[task resume];
|
||||
}
|
||||
|
||||
//Server evaluates client's certificate
|
||||
@@ -164,16 +133,16 @@
|
||||
NSData *certData = [[NSData alloc] initWithContentsOfFile:certPath];
|
||||
CFDataRef certDataRef = (CFDataRef)certData;
|
||||
SecCertificateRef cert = SecCertificateCreateWithData(NULL, certDataRef);
|
||||
|
||||
|
||||
//Establish a chain of trust anchored on our bundled certificate
|
||||
CFArrayRef certArrayRef = CFArrayCreate(NULL, (void *)&cert, 1, NULL);
|
||||
SecTrustRef serverTrust = protectionSpace.serverTrust;
|
||||
SecTrustSetAnchorCertificates(serverTrust, certArrayRef);
|
||||
|
||||
|
||||
//Verify that trust
|
||||
SecTrustResultType trustResult;
|
||||
SecTrustEvaluate(serverTrust, &trustResult);
|
||||
|
||||
|
||||
if (trustResult == kSecTrustResultRecoverableTrustFailure) {
|
||||
CFDataRef errDataRef = SecTrustCopyExceptions(serverTrust);
|
||||
SecTrustSetExceptions(serverTrust, errDataRef);
|
||||
@@ -191,10 +160,11 @@
|
||||
return trustResult == kSecTrustResultUnspecified || trustResult == kSecTrustResultProceed;
|
||||
}
|
||||
|
||||
- (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge {
|
||||
- (void)URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
|
||||
completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * _Nullable credential))completionHandler {
|
||||
id<NSURLAuthenticationChallengeSender> sender = challenge.sender;
|
||||
NSURLProtectionSpace *protectionSpace = challenge.protectionSpace;
|
||||
|
||||
|
||||
//Should server trust client?
|
||||
if ([self shouldTrustProtectionSpace:protectionSpace]) {
|
||||
SecTrustRef trust = [protectionSpace serverTrust];
|
||||
@@ -204,9 +174,9 @@
|
||||
// NSData *serverCertificateData = (NSData*)SecCertificateCopyData(certificate);
|
||||
// NSString *serverCertificateDataHash = [[serverCertificateData base64EncodedString] ]
|
||||
NSURLCredential *credential = [NSURLCredential credentialForTrust:trust];
|
||||
[sender useCredential:credential forAuthenticationChallenge:challenge];
|
||||
completionHandler(NSURLSessionAuthChallengeUseCredential, credential);
|
||||
} else {
|
||||
[sender cancelAuthenticationChallenge:challenge];
|
||||
completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user