Automatically finish the response if not already finished

Also invoke the notFoundBlock if no data has been sent
thecatalinstan · Oct 24, 2016 · 4f3d0ec · 4f3d0ec
1 parent 0e7f27d
commit 4f3d0ec
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/Criollo/Source/CRResponse.m b/Criollo/Source/CRResponse.m
@@ -180,6 +180,7 @@ - (void)writeData:(NSData *)data finish:(BOOL)flag {
     if ( flag ) {
         _finished = YES;
     }
+    _hasWrittenBodyData = YES;
     [self.connection sendDataToSocket:data forRequest:self.request];
 }
 

diff --git a/Criollo/Source/CRResponse_Internal.h b/Criollo/Source/CRResponse_Internal.h
@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL alreadySentHeaders;
 @property (nonatomic, assign) BOOL alreadyBuiltHeaders;
 @property (nonatomic, readonly) BOOL finished;
+@property (nonatomic, readonly) BOOL hasWrittenBodyData;
 
 - (instancetype)initWithConnection:(CRConnection *)connection HTTPStatusCode:(NSUInteger)HTTPStatusCode;
 - (instancetype)initWithConnection:(CRConnection *)connection HTTPStatusCode:(NSUInteger)HTTPStatusCode description:(NSString * _Nullable)description;
@@ -28,4 +29,4 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)buildHeaders;
 
 @end
-NS_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END
diff --git a/Criollo/Source/Routing/CRRoute.m b/Criollo/Source/Routing/CRRoute.m
@@ -135,4 +135,4 @@ - (instancetype)initWithStaticFileAtPath:(NSString *)filePath options:(CRStaticF
     return result;
 }
 
-@end
+@end
diff --git a/Criollo/Source/Routing/CRRouter.m b/Criollo/Source/Routing/CRRouter.m
@@ -249,6 +249,17 @@ - (void)executeRoutes:(NSArray<CRRouteMatchingResult *> *)routes forRequest:(CRR
         routeBlock (request, response, ^{
             shouldStopExecutingBlocks = NO;
             currentRouteIndex++;
+            if ( currentRouteIndex == routes.count && !response.finished ) {
+                if ( !response.hasWrittenBodyData ) {
+                    notFoundBlock(request, response, ^{
+                        if ( !response.finished) {
+                            [response finish];
+                        }
+                    });
+                } else {
+                    [response finish];
+                }
+            }
         });
     }
 }