Fix connection timeout when throwing/returning an ErrorResponse within a Future; Fix crash when reading text files in multipart requests

Author: luizmineo

CHANGELOG.md

@@ -1,9 +1,14 @@
+##v0.5.21
+
+* Fix connection timeout when throwing/returning an ErrorResponse within a Future ([#83](https://github.com/luizmineo/redstone.dart/issues/83))
+* Fix crash when reading text files in multipart requests ([#77](https://github.com/luizmineo/redstone.dart/issues/77))
+
 ##v0.5.20
 
 * Update `route_hierarchical` version constraint.
 
 ##v0.5.19
-* Fix: Error when setting `Intereptor.parseRequestBody = true` (Thanks to [platelk](https://github.com/platelk). See PR [#46](https://github.com/luizmineo/redstone.dart/pull/46)).
+* Fix: Error when setting `Interceptor.parseRequestBody = true` (Thanks to [platelk](https://github.com/platelk). See PR [#46](https://github.com/luizmineo/redstone.dart/pull/46)).
 
 ## v0.5.18
 * Updated to Grinder v0.6.1 (see [documentation](https://github.com/luizmineo/redstone.dart/wiki/Deploy))

lib/src/http_body_parser.dart

@@ -7,7 +7,7 @@ part of redstone_server;
 class HttpBodyFileUpload {
   final ContentType contentType;
   final String filename;
-  final List<int> content;
+  final dynamic content;
 
   HttpBodyFileUpload(this.contentType, this.filename, this.content);
 

lib/src/server_impl.dart

@@ -462,17 +462,21 @@ Future _writeResponse(respValue, String responseType, {int statusCode: 200,
   } else if (respValue is Future) {
 
     respValue.then((fValue) {
+      if (fValue is ErrorResponse) {
+        throw fValue;
+      }
       return _writeResponse(fValue, responseType,
           statusCode: statusCode,
           processors: processors,
           abortIfChainInterrupted: abortIfChainInterrupted);
     }).then((_) {
       completer.complete();
-    }).catchError((e) {
-      return _writeResponse(e, responseType,
+    }).catchError((e, s) {
+      var f = _writeResponse(e, responseType,
                 statusCode: statusCode,
                 processors: processors,
                 abortIfChainInterrupted: abortIfChainInterrupted);
+      f.then((_) => completer.completeError(e, s));
     }, test: (e) => e is ErrorResponse)
     .catchError((e, s) {
       completer.completeError(e, s);
@@ -629,7 +633,7 @@ void _writeErrorPage(int statusCode, String resource, [Object error, StackTrace
       <pre>${error}${formattedStack != null ? "\n\n" + formattedStack : ""}</pre>
     </div>
   </div>
-  <div class="footer">Redstone Server - 2014 - Luiz Mineo</div>
+  <div class="footer">Redstone Server - 2015 - Luiz Mineo</div>
 </body>
 </html>''';
 

lib/src/setup_impl.dart

@@ -374,7 +374,6 @@ void _scanHandlers([List<Symbol> libraries]) {
   currentLevel = 0;
   levelHist = [];
   groups.forEach((g) {
-    List<int> chainIdxByLevel;
     if (g.lib.level > currentLevel) {
       currentLevel = g.lib.level;
       levelHist.add(g.lib.conf.chainIdx);
@@ -813,8 +812,14 @@ void _configureTarget(_ServerMetadataImpl serverMetadata,
                    logLevel: Level.FINER,
                    printErrorPage: false);
              }
-          });
-
+          }).catchError((e, s) {
+             chain.error = e.error;
+             return _handleError("ErrorResponse returned by $handlerName",
+                 e.error, req: request,
+                 statusCode: e.statusCode,
+                 logLevel: Level.FINER,
+                 printErrorPage: false);
+          }, test: (e) => e is ErrorResponse);
     });
 
   };

pubspec.yaml

@@ -1,5 +1,5 @@
 name: redstone
-version: 0.5.20
+version: 0.5.21
 author: Luiz Mineo <[email protected]>
 description: A metadata driven microframework for Dart 
 homepage: http://redstonedart.org

test/server_tests.dart

@@ -388,7 +388,31 @@ main() {
     });
 
     test("Error response", () {
-      var req = new MockRequest("/error_response");
+      var req = new MockRequest("/error_response/sync");
+      return app.dispatch(req).then((resp) {
+        expect(resp.statusCode, equals(400));
+        expect(resp.mockContent, equals("handling: error_response"));
+      });
+    });
+    
+    test("async error response", () {
+      var req = new MockRequest("/error_response/async");
+      return app.dispatch(req).then((resp) {
+        expect(resp.statusCode, equals(400));
+        expect(resp.mockContent, equals("handling: error_response"));
+      });
+    });
+    
+    test("throw error response", () {
+      var req = new MockRequest("/error_response/throw/sync");
+      return app.dispatch(req).then((resp) {
+        expect(resp.statusCode, equals(400));
+        expect(resp.mockContent, equals("handling: error_response"));
+      });
+    });
+    
+    test("async throw error response", () {
+      var req = new MockRequest("/error_response/throw/async");
       return app.dispatch(req).then((resp) {
         expect(resp.statusCode, equals(400));
         expect(resp.mockContent, equals("handling: error_response"));

test/services/errors.dart

@@ -61,10 +61,21 @@ subHandler() => throw "server_error";
 subErrorHandler() => new shelf.Response.internalServerError(
     body: "${app.chain.error} sub_error_handler");
 
-@app.Route("/error_response")
-errorResponse() => throw new app.ErrorResponse(400, "error_response");
+@app.Route("/error_response/sync")
+errorResponse() => new app.ErrorResponse(400, "error_response");
 
-@app.ErrorHandler(400, urlPattern: "/error_response")
+@app.Route("/error_response/async")
+asyncErrorResponse() => new Future(() => 
+    new app.ErrorResponse(400, "error_response"));
+
+@app.Route("/error_response/throw/sync")
+throwErrorResponse() => throw new app.ErrorResponse(400, "error_response");
+
+@app.Route("/error_response/throw/async")
+asyncThrowErrorResponse() => new Future(() => 
+    throw new app.ErrorResponse(400, "error_response"));
+
+@app.ErrorHandler(400, urlPattern: "/error_response/.*")
 handleErrorResponse() {
   return app.response.readAsString().then((resp) {
     return new shelf.Response(app.response.statusCode,