修复捕获不到get方法的问题

Roc.Tian · Roc.Tian · commit 85904e600eb1 · 2018-06-26T14:21:08.000+08:00
diff --git a/TPFDebugTool.podspec b/TPFDebugTool.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'TPFDebugTool'
-  s.version          = '0.1.7'
+  s.version          = '0.1.8'
   s.summary          = 'TPFDebugTool is a debugging tool to monitor the network, view the log, collect crash log'
 
 # This description is used to generate tags and improve search results.
diff --git a/TPFDebugTool/Classes/JxbCrashVC.m b/TPFDebugTool/Classes/JxbCrashVC.m
@@ -23,14 +23,6 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     [self.navigationItem setTitle:@"Crash"];
     
-    UIButton *btnclose = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
-    btnclose.titleLabel.font = [UIFont systemFontOfSize:13];
-    [btnclose setTitle:@"关闭" forState:UIControlStateNormal];
-    [btnclose addTarget:self action:@selector(dismissViewController) forControlEvents:UIControlEventTouchUpInside];
-    [btnclose setTitleColor:[JxbDebugTool shareInstance].mainColor forState:UIControlStateNormal];
-    
-    UIBarButtonItem *btnleft = [[UIBarButtonItem alloc] initWithCustomView:btnclose];
-    self.navigationItem.leftBarButtonItem = btnleft;
     
     self.listData = [[JxbCrashHelper sharedInstance] crashLogs];
     
@@ -43,7 +35,23 @@ - (void)viewDidLoad {
     [self.view addSubview:self.tableView];
     
 }
-
+-(void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self setLeftBarButtonItem];
+    });
+}
+-(void)setLeftBarButtonItem{
+    
+    UIButton *btnclose = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
+    btnclose.titleLabel.font = [UIFont systemFontOfSize:13];
+    [btnclose setTitle:@"关闭" forState:UIControlStateNormal];
+    [btnclose addTarget:self action:@selector(dismissViewController) forControlEvents:UIControlEventTouchUpInside];
+    [btnclose setTitleColor:[JxbDebugTool shareInstance].mainColor forState:UIControlStateNormal];
+    
+    UIBarButtonItem *btnleft = [[UIBarButtonItem alloc] initWithCustomView:btnclose];
+    self.navigationItem.leftBarButtonItem = btnleft;
+}
 - (void)dismissViewController {
 //    [self dismissViewControllerAnimated:YES completion:nil];
       [[JxbDebugTool shareInstance] showDebug];
diff --git a/TPFDebugTool/Classes/JxbHttpVC.m b/TPFDebugTool/Classes/JxbHttpVC.m
@@ -25,15 +25,6 @@ - (void)dealloc {
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self.navigationItem setTitle:@"Http"];
-   
-    UIButton *btnclose = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
-    btnclose.titleLabel.font = [UIFont systemFontOfSize:13];
-    [btnclose setTitle:@"关闭" forState:UIControlStateNormal];
-    [btnclose addTarget:self action:@selector(dismissViewController) forControlEvents:UIControlEventTouchUpInside];
-    [btnclose setTitleColor:[JxbDebugTool shareInstance].mainColor forState:UIControlStateNormal];
-    
-    UIBarButtonItem *btnleft = [[UIBarButtonItem alloc] initWithCustomView:btnclose];
-    self.navigationItem.leftBarButtonItem = btnleft;
     
     UIButton *btnclear = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
     btnclear.titleLabel.font = [UIFont systemFontOfSize:13];
@@ -57,7 +48,23 @@ - (void)viewDidLoad {
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reloadHttp) name:kNotifyKeyReloadHttp object:nil];
 }
-
+-(void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self setLeftBarButtonItem];
+    });
+}
+-(void)setLeftBarButtonItem{
+    
+    UIButton *btnclose = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
+    btnclose.titleLabel.font = [UIFont systemFontOfSize:13];
+    [btnclose setTitle:@"关闭" forState:UIControlStateNormal];
+    [btnclose addTarget:self action:@selector(dismissViewController) forControlEvents:UIControlEventTouchUpInside];
+    [btnclose setTitleColor:[JxbDebugTool shareInstance].mainColor forState:UIControlStateNormal];
+    
+    UIBarButtonItem *btnleft = [[UIBarButtonItem alloc] initWithCustomView:btnclose];
+    self.navigationItem.leftBarButtonItem = btnleft;
+}
 - (void)dismissViewController {
 //    [self dismissViewControllerAnimated:YES completion:nil];
     [[JxbDebugTool shareInstance] showDebug];
diff --git a/TPFDebugTool/Classes/JxbLogVC.m b/TPFDebugTool/Classes/JxbLogVC.m
@@ -91,15 +91,6 @@ - (void)viewDidLoad {
     [self.view addSubview:txt];
     
     
-    UIButton *btnclose = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
-    btnclose.titleLabel.font = [UIFont systemFontOfSize:13];
-    [btnclose setTitle:@"关闭" forState:UIControlStateNormal];
-    [btnclose addTarget:self action:@selector(dismissViewController) forControlEvents:UIControlEventTouchUpInside];
-    [btnclose setTitleColor:[JxbDebugTool shareInstance].mainColor forState:UIControlStateNormal];
-    
-    UIBarButtonItem *barclose = [[UIBarButtonItem alloc] initWithCustomView:btnclose];
-    self.navigationItem.leftBarButtonItem = barclose;
-    
     UIButton *btnrefresh = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
     btnrefresh.titleLabel.font = [UIFont systemFontOfSize:13];
     [btnrefresh setTitle:@"刷新" forState:UIControlStateNormal];
@@ -112,7 +103,23 @@ - (void)viewDidLoad {
     
     [self loadLogs];
 }
-
+-(void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self setLeftBarButtonItem];
+    });
+}
+-(void)setLeftBarButtonItem{
+    
+    UIButton *btnclose = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 44, 44)];
+    btnclose.titleLabel.font = [UIFont systemFontOfSize:13];
+    [btnclose setTitle:@"关闭" forState:UIControlStateNormal];
+    [btnclose addTarget:self action:@selector(dismissViewController) forControlEvents:UIControlEventTouchUpInside];
+    [btnclose setTitleColor:[JxbDebugTool shareInstance].mainColor forState:UIControlStateNormal];
+    
+    UIBarButtonItem *btnleft = [[UIBarButtonItem alloc] initWithCustomView:btnclose];
+    self.navigationItem.leftBarButtonItem = btnleft;
+}
 - (void)dismissViewController {
 //    [self dismissViewControllerAnimated:YES completion:nil];
       [[JxbDebugTool shareInstance] showDebug];
diff --git a/TPFDebugTool/Classes/NSURLSessionTask+Swizzling.m b/TPFDebugTool/Classes/NSURLSessionTask+Swizzling.m
@@ -20,7 +20,7 @@
 @implementation NSURLSession (Swizzling)
 
 + (void)load {
-   
+    
     Method oriMethod = class_getInstanceMethod([NSURLSession class], @selector(dataTaskWithRequest:));
     Method newMethod = class_getInstanceMethod([NSURLSession class], @selector(dataTaskWithRequest_swizzling:));
     method_exchangeImplementations(oriMethod, newMethod);
@@ -81,29 +81,38 @@ + (void)swizzling_TaskWillPerformHTTPRedirectionIntoDelegateClass:(Class)cls {
 
 + (void)swizzling_TaskDidSendBodyDataIntoDelegateClass:(Class)cls {
     SEL selector = @selector(URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:);
-//    SEL swizzledSelector = @selector(URLSession_swizzling:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:);
-//    Protocol *protocol = @protocol(NSURLSessionTaskDelegate);
-//    
-//    struct objc_method_description methodDescription = protocol_getMethodDescription(protocol, selector, NO, YES);
-//    [self replaceImplementationOfSelector:selector withSelector:swizzledSelector forClass:cls withMethodDescription:methodDescription];
-
+    //    SEL swizzledSelector = @selector(URLSession_swizzling:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:);
+    //    Protocol *protocol = @protocol(NSURLSessionTaskDelegate);
+    //
+    //    struct objc_method_description methodDescription = protocol_getMethodDescription(protocol, selector, NO, YES);
+    //    [self replaceImplementationOfSelector:selector withSelector:swizzledSelector forClass:cls withMethodDescription:methodDescription];
+    
     NSError *error;
     
     [cls aspect_hookSelector:selector
-                              withOptions:AspectPositionBefore
-                               usingBlock:^(id <AspectInfo> aspectInfo,NSURLSession *session,NSURLSessionTask *task){                                   
-                                   
-                                   [self addRequestModel:session task:task];
-                                  
-                               }
-                                    error:&error];
+                 withOptions:AspectPositionBefore
+                  usingBlock:^(id <AspectInfo> aspectInfo,NSURLSession *session,NSURLSessionTask *task){
+                      
+                      [self addRequestModel:session task:task];
+                      
+                  }
+                       error:&error];
+    
 }
 +(void)addRequestModel:(NSURLSession *)session task:(NSURLSessionTask *)task {
     
     NSURLRequest* req = task.originalRequest;
-    req.requestId = [[NSUUID UUID] UUIDString];
-    req.startTime = @([[NSDate date] timeIntervalSince1970]);
     
+    if ([[JxbHttpDatasource shareInstance] arrRequestContainObject:req.requestId])
+        return;
+    
+    if (![self canHandle:req])
+        return;
+    
+    [self createModel:req statusCode:@"100"];
+    
+}
++(BOOL)canHandle:(NSURLRequest *)req{
     BOOL canHandle = YES;
     if ([[JxbDebugTool shareInstance] arrOnlyHosts].count > 0) {
         canHandle = NO;
@@ -115,16 +124,20 @@ +(void)addRequestModel:(NSURLSession *)session task:(NSURLSessionTask *)task {
             }
         }
     }
-    if (!canHandle)
-        return;
+    return canHandle;
+}
++(void)createModel:(NSURLRequest *)req statusCode:(NSString *)statusCode{
+    
+    req.requestId = [[NSUUID UUID] UUIDString];
+    req.startTime = @([[NSDate date] timeIntervalSince1970]);
     
     JxbHttpModel* model = [[JxbHttpModel alloc] init];
     model.requestId = req.requestId;
     model.url = req.URL;
     model.method = req.HTTPMethod;
     model.requestAllHTTPHeaderFields = req.allHTTPHeaderFields;
     model.startTime = [NSString stringWithFormat:@"%fs",req.startTime.doubleValue];
-    model.statusCode = @"100";
+    model.statusCode = statusCode;
     if (req.HTTPBody) {
         NSData* data = req.HTTPBody;
         if ([[JxbDebugTool shareInstance] isHttpRequestEncrypt]) {
@@ -137,7 +150,6 @@ +(void)addRequestModel:(NSURLSession *)session task:(NSURLSessionTask *)task {
     
     [[JxbHttpDatasource shareInstance] addHttpRequset:model];
     [[NSNotificationCenter defaultCenter] postNotificationName:kNotifyKeyReloadHttp object:nil];
-    
 }
 + (void)swizzling_TaskDidReceiveChallengeIntoDelegateClass:(Class)cls {
     SEL selector = @selector(URLSession:task:didReceiveChallenge:completionHandler:);
@@ -159,11 +171,11 @@ + (void)swizzling_TaskNeedNewBodyStreamIntoDelegateClass:(Class)cls {
 
 + (void)swizzling_TaskDidCompleteWithErrorIntoDelegateClass:(Class)cls {
     SEL selector = @selector(URLSession:task:didCompleteWithError:);
-//    SEL swizzledSelector = @selector(URLSession_swizzling:task:didCompleteWithError:);
-//    Protocol *protocol = @protocol(NSURLSessionTaskDelegate);
-//
-//    struct objc_method_description methodDescription = protocol_getMethodDescription(protocol, selector, NO, YES);
-//    [self replaceImplementationOfSelector:selector withSelector:swizzledSelector forClass:cls withMethodDescription:methodDescription];
+    //    SEL swizzledSelector = @selector(URLSession_swizzling:task:didCompleteWithError:);
+    //    Protocol *protocol = @protocol(NSURLSessionTaskDelegate);
+    //
+    //    struct objc_method_description methodDescription = protocol_getMethodDescription(protocol, selector, NO, YES);
+    //    [self replaceImplementationOfSelector:selector withSelector:swizzledSelector forClass:cls withMethodDescription:methodDescription];
     
     NSError *error;
     
@@ -183,9 +195,9 @@ - (void)URLSession_swizzling:(NSURLSession *)session task:(NSURLSessionTask *)ta
 }
 
 - (void)URLSession_swizzling:(NSURLSession *)session task:(NSURLSessionTask *)task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesSent totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend {
-   
     
-//    [self URLSession_swizzling:session task:task didSendBodyData:bytesSent totalBytesSent:totalBytesSent totalBytesExpectedToSend:totalBytesExpectedToSend];
+    
+    //    [self URLSession_swizzling:session task:task didSendBodyData:bytesSent totalBytesSent:totalBytesSent totalBytesExpectedToSend:totalBytesExpectedToSend];
 }
 
 - (void)URLSession_swizzling:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * __nullable credential))completionHandler {
@@ -197,34 +209,63 @@ - (void)URLSession_swizzling:(NSURLSession *)session task:(NSURLSessionTask *)ta
 }
 
 +(void)URLSession_swizzling:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(nullable NSError *)error {
-//    [self URLSession_swizzling:session task:task didCompleteWithError:error];
-   
-    NSURLRequest* req = task.originalRequest;
-    if (![[JxbHttpDatasource shareInstance] arrRequestContainObject:req.requestId])
-        return;
+    //    [self URLSession_swizzling:session task:task didCompleteWithError:error];
     
+    NSURLRequest* req = task.originalRequest;
     NSURLResponse* resp = task.response;
-
-    __block JxbHttpModel* model;
-    NSMutableArray *httpArray = [[[JxbHttpDatasource shareInstance] httpArray] mutableCopy];
-    [httpArray enumerateObjectsUsingBlock:^(JxbHttpModel *obj, NSUInteger idx, BOOL * _Nonnull stop) {
+    NSHTTPURLResponse* httpResponse = (NSHTTPURLResponse*)resp;
+    NSString *statusCode = [NSString stringWithFormat:@"%d",(int)httpResponse.statusCode];
+    
+    if ([[JxbHttpDatasource shareInstance] arrRequestContainObject:req.requestId]){
         
-        if([obj.requestId isEqualToString:req.requestId]){
-            model = obj;
-            *stop = YES;
+        __block JxbHttpModel* model;
+        NSMutableArray *httpArray = [[[JxbHttpDatasource shareInstance] httpArray] mutableCopy];
+        [httpArray enumerateObjectsUsingBlock:^(JxbHttpModel *obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            
+            if([obj.requestId isEqualToString:req.requestId]){
+                model = obj;
+                *stop = YES;
+            }
+        }];
+        
+        model.statusCode = statusCode;
+        model.responseData = task.responseDatas;
+        model.responseAllHTTPHeaderFields = httpResponse.allHeaderFields;
+        model.mineType = httpResponse.MIMEType;
+        model.isImage = [resp.MIMEType rangeOfString:@"image"].location != NSNotFound;
+        model.totalDuration = [NSString stringWithFormat:@"%fs",[[NSDate date] timeIntervalSince1970] - model.startTime.doubleValue];
+        
+        [[NSNotificationCenter defaultCenter] postNotificationName:kNotifyKeyReloadHttp object:model];
+    }
+    else if ([self canHandle:req]){
+        
+        JxbHttpModel* model = [[JxbHttpModel alloc] init];
+        model.requestId = req.requestId;
+        model.url = req.URL;
+        model.method = req.HTTPMethod;
+        model.requestAllHTTPHeaderFields = req.allHTTPHeaderFields;
+        model.startTime = [NSString stringWithFormat:@"%fs",[[NSDate date] timeIntervalSince1970]];
+        model.statusCode = statusCode;
+        if (req.HTTPBody) {
+            NSData* data = req.HTTPBody;
+            if ([[JxbDebugTool shareInstance] isHttpRequestEncrypt]) {
+                if ([[JxbDebugTool shareInstance] delegate] && [[JxbDebugTool shareInstance].delegate respondsToSelector:@selector(decryptJson:)]) {
+                    data = [[JxbDebugTool shareInstance].delegate decryptJson:req.HTTPBody];
+                }
+            }
+            model.requestBody = [JxbHttpDatasource prettyJSONStringFromData:data error:nil];
         }
-    }];
-    
-    NSHTTPURLResponse* httpResponse = (NSHTTPURLResponse*)resp;
-    model.statusCode = [NSString stringWithFormat:@"%d",(int)httpResponse.statusCode];
-    model.responseData = task.responseDatas;
-    model.responseAllHTTPHeaderFields = httpResponse.allHeaderFields;
-    model.mineType = httpResponse.MIMEType;
-    model.isImage = [resp.MIMEType rangeOfString:@"image"].location != NSNotFound;
-    NSString *mimeType = resp.MIMEType;
-    model.totalDuration = [NSString stringWithFormat:@"%fs",[[NSDate date] timeIntervalSince1970] - model.startTime.doubleValue];
-
-    [[NSNotificationCenter defaultCenter] postNotificationName:kNotifyKeyReloadHttp object:model];
+        
+        model.responseData = task.responseDatas;
+        model.responseAllHTTPHeaderFields = httpResponse.allHeaderFields;
+        model.mineType = httpResponse.MIMEType;
+        model.isImage = [resp.MIMEType rangeOfString:@"image"].location != NSNotFound;
+        model.totalDuration = [NSString stringWithFormat:@"%fs",[[NSDate date] timeIntervalSince1970] - model.startTime.doubleValue];
+        
+        
+        [[JxbHttpDatasource shareInstance] addHttpRequset:model];
+        [[NSNotificationCenter defaultCenter] postNotificationName:kNotifyKeyReloadHttp object:nil];
+    }
     
 }
 
@@ -235,7 +276,7 @@ + (void)swizzling_selectors_data:(Class)cls {
     [self swizzling_TaskDidReceiveDataIntoDelegateClass:cls];
     [self swizzling_TaskDidBecomeDownloadTaskIntoDelegateClass:cls];
     [self swizzling_TaskDidBecomeStreamTaskIntoDelegateClass:cls];
-//    [self swizzling_TaskWillCacheResponseIntoDelegateClass:cls];
+    //    [self swizzling_TaskWillCacheResponseIntoDelegateClass:cls];
 }
 
 + (void)swizzling_TaskDidReceiveResponseIntoDelegateClass:(Class)cls {
@@ -251,7 +292,7 @@ + (void)swizzling_TaskDidReceiveDataIntoDelegateClass:(Class)cls {
     SEL selector = @selector(URLSession:dataTask:didReceiveData:);
     SEL swizzledSelector = @selector(URLSession_swizzling:dataTask:didReceiveData:);
     Protocol *protocol = @protocol(NSURLSessionDataDelegate);
-
+    
     struct objc_method_description methodDescription = protocol_getMethodDescription(protocol, selector, NO, YES);
     [self replaceImplementationOfSelector:selector withSelector:swizzledSelector forClass:cls withMethodDescription:methodDescription];
 }
@@ -291,7 +332,7 @@ + (void)replaceImplementationOfSelector:(SEL)selector withSelector:(SEL)swizzled
         Method newMethod = class_getInstanceMethod(cls, swizzledSelector);
         method_exchangeImplementations(oldMethod, newMethod);
     } else {    // 没有实例方法的话，就不要添加
-//        class_addMethod(cls, selector, implementation, methodDescription.types);
+        //        class_addMethod(cls, selector, implementation, methodDescription.types);
     }
 }
 
@@ -312,6 +353,7 @@ - (void)URLSession_swizzling:(NSURLSession *)session dataTask:(NSURLSessionDataT
     }
     if ([dataTask.taskDataIdentify isEqualToString:NSStringFromClass([self class])])
         [dataTask.responseDatas appendData:data];
+    
     [self URLSession_swizzling:session dataTask:dataTask didReceiveData:data];
 }
 
