Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2318)

Unified Diff: pkg/shelf/lib/src/middleware.dart

Issue 260933004: Support Request hijacking in Shelf, using a similar API to Rack. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: code review Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/shelf/lib/src/hijack_exception.dart ('k') | pkg/shelf/lib/src/request.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/shelf/lib/src/middleware.dart
diff --git a/pkg/shelf/lib/src/middleware.dart b/pkg/shelf/lib/src/middleware.dart
index e1a9f1892f4a043e9e9e8c563002950fcc9394d3..228761dea6862084c17f9872997140779a4692c6 100644
--- a/pkg/shelf/lib/src/middleware.dart
+++ b/pkg/shelf/lib/src/middleware.dart
@@ -7,6 +7,7 @@ library shelf.middleware;
import 'request.dart';
import 'response.dart';
import 'handler.dart';
+import 'hijack_exception.dart';
import 'util.dart';
/// A function which creates a new [Handler] by wrapping a [Handler].
@@ -21,6 +22,9 @@ import 'util.dart';
///
/// Common uses for middleware include caching, logging, and authentication.
///
+/// Middleware that captures exceptions should be sure to pass
+/// [HijackException]s on without modification.
+///
/// A simple [Middleware] can be created using [createMiddleware].
typedef Handler Middleware(Handler innerHandler);
@@ -40,8 +44,9 @@ typedef Handler Middleware(Handler innerHandler);
/// create a new response object.
///
/// If provided, [errorHandler] receives errors thrown by the inner handler. It
-/// does not receive errors thrown by [requestHandler] or [responseHandler]. It
-/// can either return a new response or throw an error.
+/// does not receive errors thrown by [requestHandler] or [responseHandler], nor
+/// does it receive [HijackException]s. It can either return a new response or
+/// throw an error.
Middleware createMiddleware({requestHandler(Request request),
responseHandler(Response response),
errorHandler(error, StackTrace stackTrace)}) {
@@ -56,7 +61,10 @@ Middleware createMiddleware({requestHandler(Request request),
return syncFuture(() => innerHandler(request))
.then((response) => responseHandler(response),
- onError: errorHandler);
+ onError: (error, stackTrace) {
+ if (error is HijackException) throw error;
+ return errorHandler(error, stackTrace);
+ });
});
};
};
« no previous file with comments | « pkg/shelf/lib/src/hijack_exception.dart ('k') | pkg/shelf/lib/src/request.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698