diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index b8dfae30..088c8509 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -12,7 +12,7 @@
-
+
@@ -454,7 +454,7 @@
-
+
diff --git a/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml b/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml
new file mode 100644
index 00000000..41e6ad8d
--- /dev/null
+++ b/.idea/runConfigurations/Middleware_via_metadata_in_routing_test_dart.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/encoding_in_streaming_test_dart.xml b/.idea/runConfigurations/encoding_in_streaming_test_dart.xml
new file mode 100644
index 00000000..f3885511
--- /dev/null
+++ b/.idea/runConfigurations/encoding_in_streaming_test_dart.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/metadata_in_hooked_test_dart.xml b/.idea/runConfigurations/metadata_in_hooked_test_dart.xml
new file mode 100644
index 00000000..618cdc73
--- /dev/null
+++ b/.idea/runConfigurations/metadata_in_hooked_test_dart.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml b/.idea/runConfigurations/tests_in_framework__PRODUCTION_.xml
similarity index 66%
rename from .idea/runConfigurations/All_Tests__PRODUCTION_2.xml
rename to .idea/runConfigurations/tests_in_framework__PRODUCTION_.xml
index 27a10c9c..263eac1e 100644
--- a/.idea/runConfigurations/All_Tests__PRODUCTION_2.xml
+++ b/.idea/runConfigurations/tests_in_framework__PRODUCTION_.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7de0fedd..ecb94876 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,27 @@
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -32,83 +45,11 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -116,25 +57,43 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
@@ -152,28 +111,6 @@
- parse
- io
- io.
- lazyP
- storeO
- origina
- originalBuffer
- lazyQue
- singleton(
- preI
- );
- RequestContext req
- req.inject
- injections
- injecti
- debug
- handle(
- lock
- add(
- close(
- end()
- stop
sto
sopw
stopw
@@ -181,7 +118,29 @@
handleRe
get container
Parameter
+ log
mirrors
+ dart:mirror
+ dart:io
+ _Par
+ waterfall
+ wtf
+ errorHan
+ nested
+ _parent =
+ headers['content
+ skip
+ Provi
+ contentTy
+ abc
+ /chained
+ flatten
+ sendRe
+ enableB
+ Hooks
+ Middleware
+ /meta
+ complet
FutureOr
@@ -237,13 +196,11 @@
@@ -307,7 +266,7 @@
-
+
@@ -321,8 +280,6 @@
-
-
@@ -330,11 +287,6 @@
-
-
@@ -718,21 +658,9 @@
-
-
-
- 1534692805087
-
-
-
- 1534692805087
-
-
- 1534693249779
-
-
-
- 1534693249779
+
+
+
1534693360366
@@ -1063,43 +991,57 @@
1534819472503
-
+
+ 1534861361523
+
+
+
+ 1534861361524
+
+
+ 1534861733989
+
+
+
+ 1534861733990
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -1111,8 +1053,7 @@
-
-
+
@@ -1130,14 +1071,13 @@
-
-
+
-
+
@@ -1150,6 +1090,7 @@
+
@@ -1162,8 +1103,6 @@
-
-
@@ -1187,7 +1126,9 @@
-
+
+
+
@@ -1195,111 +1136,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1318,9 +1154,6 @@
-
-
-
@@ -1346,16 +1179,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1363,13 +1186,6 @@
-
-
-
-
-
-
-
@@ -1384,60 +1200,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1480,23 +1242,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1504,40 +1249,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1548,50 +1263,283 @@
-
+
-
-
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26d2c047..362f4082 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,6 @@
* Changed view engine to use `Map`.
* Remove dependency on `package:json_god` by default.
* Remove dependency on `package:dart2_constant`.
-* Remove `contentType` argument in `ResponseContext.serialize`.
* Moved `lib/hooks.dart` into `package:angel_hooks`.
* Moved `TypedService` into `package:angel_typed_service`.
* Completely removed the `AngelBase` class.
@@ -47,8 +46,6 @@ type-safe manner.
* Removed `RequestContext.properties`.
* Removed the defunct `debug` property where it still existed.
* `Routable.use` now only accepts a `Service`.
-* The above change removes the concept of "nested apps," which are messy to maintain, and
-not very elegant.
* Removed `Angel.createZoneForRequest`.
* Removed `Angel.defaultZoneCreator`.
* Added all flags to the `Angel` constructor, ex. `Angel.eagerParseBodies`.
@@ -64,4 +61,9 @@ as in many cases it is unnecessary and slows down response time.
* Removed the now-obsolete `ResponseContext.releaseCorrespondingRequest`.
* `preInject` now takes a `Reflector` as its second argument.
* `Angel.reflector` defaults to `const EmptyReflector()`, disabling
-reflection out-of-the-box.
\ No newline at end of file
+reflection out-of-the-box.
+* Removed `Angel.injectEncoders`.
+* Added `Providers.toJson`.
+* Moved `Providers.graphql` to `Providers.graphQL`.
+* `Angel.optimizeForProduction` no longer calls `preInject`,
+as it does not need to.
\ No newline at end of file
diff --git a/README.md b/README.md
index a287997c..9c4cec80 100644
--- a/README.md
+++ b/README.md
@@ -9,38 +9,53 @@ This is the core of the [Angel](https://github.com/angel-dart/angel) framework.
To build real-world applications, please see the [homepage](https://angel-dart.github.io).
```dart
+import 'package:angel_container/mirrors.dart';
import 'package:angel_framework/angel_framework.dart';
main() async {
- var app = new Angel(reflector: MirrorsReflector());
+ var app = new Angel(reflector: MirrorsReflector());
- // Index route. Returns JSON.
- app.get('/', () => 'Welcome to Angel!');
-
- // Accepts a URL like /greet/foo or /greet/bob.
- app.get('/greet/:name', (String name) => 'Hello, $name!');
-
- // Pattern matching - only call this handler if the query value of `name` equals 'emoji'.
- app.get('/greet', (@Query('name', match: 'emoji') String name) => '😇🔥🔥🔥');
-
- // Handle any other query value of `name`.
- app.get('/greet', (@Query('name') String name) => 'Hello, $name!');
-
- // Simple fallback to throw a 404 on unknown paths.
- app.use((RequestContext req) async {
- throw new AngelHttpException.notFound(
- message: 'Unknown path: "${req.uri.path}"',
+ // Index route. Returns JSON.
+ app.get('/', (req, res) => res.write('Welcome to Angel!'));
+
+ // Accepts a URL like /greet/foo or /greet/bob.
+ app.get(
+ '/greet/:name',
+ (req, res) {
+ var name = req.params['name'];
+ res
+ ..write('Hello, $name!')
+ ..close();
+ },
);
- });
+
+ // Pattern matching - only call this handler if the query value of `name` equals 'emoji'.
+ app.get(
+ '/greet',
+ ioc((@Query('name', match: 'emoji') String name) => '😇🔥🔥🔥'),
+ );
+
+ // Handle any other query value of `name`.
+ app.get(
+ '/greet',
+ ioc((@Query('name') String name) => 'Hello, $name!'),
+ );
+
+ // Simple fallback to throw a 404 on unknown paths.
+ app.fallback((req, res) {
+ throw new AngelHttpException.notFound(
+ message: 'Unknown path: "${req.uri.path}"',
+ );
+ });
- var http = new AngelHttp(app);
- var server = await http.startServer('127.0.0.1', 3000);
- var url = 'http://${server.address.address}:${server.port}';
- print('Listening at $url');
- print('Visit these pages to see Angel in action:');
- print('* $url/greet/bob');
- print('* $url/greet/?name=emoji');
- print('* $url/greet/?name=jack');
- print('* $url/nonexistent_page');
+ var http = new AngelHttp(app);
+ var server = await http.startServer('127.0.0.1', 3000);
+ var url = 'http://${server.address.address}:${server.port}';
+ print('Listening at $url');
+ print('Visit these pages to see Angel in action:');
+ print('* $url/greet/bob');
+ print('* $url/greet/?name=emoji');
+ print('* $url/greet/?name=jack');
+ print('* $url/nonexistent_page');
}
```
diff --git a/example/handle_error.dart b/example/handle_error.dart
index 1fa5d1bb..2e7fab11 100644
--- a/example/handle_error.dart
+++ b/example/handle_error.dart
@@ -9,7 +9,8 @@ main() async {
..logger = (new Logger('angel')..onRecord.listen(print))
..encoders.addAll({'gzip': gzip.encoder});
- app.fallback((req, res) => new Future.error('Throwing just because I feel like!'));
+ app.fallback(
+ (req, res) => new Future.error('Throwing just because I feel like!'));
var http = new AngelHttp(app);
var server = await http.startServer('127.0.0.1', 3000);
diff --git a/lib/src/core/hooked_service.dart b/lib/src/core/hooked_service.dart
index 7ef14e78..d9c6a147 100644
--- a/lib/src/core/hooked_service.dart
+++ b/lib/src/core/hooked_service.dart
@@ -121,13 +121,14 @@ class HookedService extends Service {
applyListeners(inner.remove, afterRemoved, true);
}
- List get bootstrappers => new List.from(super.bootstrappers)
- ..add((RequestContext req, ResponseContext res) {
- req.serviceParams
- ..['__requestctx'] = req
- ..['__responsectx'] = res;
- return true;
- });
+ List get bootstrappers =>
+ new List.from(super.bootstrappers)
+ ..add((RequestContext req, ResponseContext res) {
+ req.serviceParams
+ ..['__requestctx'] = req
+ ..['__responsectx'] = res;
+ return true;
+ });
void addRoutes([Service s]) {
super.addRoutes(s ?? inner);
diff --git a/lib/src/core/response_context.dart b/lib/src/core/response_context.dart
index 214637b7..aa821151 100644
--- a/lib/src/core/response_context.dart
+++ b/lib/src/core/response_context.dart
@@ -103,7 +103,7 @@ abstract class ResponseContext
headers["Content-Disposition"] =
'attachment; filename="${filename ?? file.path}"';
- headers['content-type'] = lookupMimeType(file.path);
+ contentType = MediaType.parse(lookupMimeType(file.path));
headers['content-length'] = file.lengthSync().toString();
if (!isBuffered) {
@@ -150,7 +150,7 @@ abstract class ResponseContext
new Map.from(renderParams)
..addAll(data ?? {}))).then((content) {
write(content);
- headers['content-type'] = 'text/html';
+ contentType = new MediaType('text', 'html');
close();
});
}
@@ -241,8 +241,11 @@ abstract class ResponseContext
throw new Exception(
"Controller '${split[0]}' does not contain any action named '${split[1]}'");
- final head =
- controller.findExpose(app.container.reflector).path.toString().replaceAll(_straySlashes, '');
+ final head = controller
+ .findExpose(app.container.reflector)
+ .path
+ .toString()
+ .replaceAll(_straySlashes, '');
final tail = matched
.makeUri(params.keys.fold>({}, (out, k) {
return out..[k.toString()] = params[k];
@@ -256,14 +259,15 @@ abstract class ResponseContext
void sendFile(File file) {
if (!isOpen) throw closed();
- headers['content-type'] = lookupMimeType(file.path);
+ contentType = MediaType.parse(lookupMimeType(file.path));
buffer.add(file.readAsBytesSync());
close();
}
/// Serializes data to the response.
- bool serialize(value) {
+ bool serialize(value, {MediaType contentType}) {
if (!isOpen) throw closed();
+ this.contentType = contentType ?? new MediaType('application', 'json');
var text = serializer(value);
if (text.isEmpty) return true;
write(text);
@@ -274,12 +278,12 @@ abstract class ResponseContext
/// Streams a file to this response.
Future streamFile(File file) {
if (!isOpen) throw closed();
- headers['content-type'] = lookupMimeType(file.path);
+ contentType = MediaType.parse(lookupMimeType(file.path));
return file.openRead().pipe(this);
}
/// Configure the response to write to an intermediate response buffer, rather than to the stream directly.
- void enableBuffer();
+ void useBuffer();
/// Adds a stream directly the underlying response.
///
@@ -304,10 +308,7 @@ abstract class ResponseContext
else if (!isBuffered) {
add(encoding.encode(value.toString()));
} else {
- if (value is List)
- buffer.add(value);
- else
- buffer.add(encoding.encode(value.toString()));
+ buffer.add(encoding.encode(value.toString()));
}
}
diff --git a/lib/src/core/server.dart b/lib/src/core/server.dart
index 912179d4..700a3285 100644
--- a/lib/src/core/server.dart
+++ b/lib/src/core/server.dart
@@ -9,6 +9,7 @@ import 'package:angel_container/angel_container.dart';
import 'package:angel_http_exception/angel_http_exception.dart';
import 'package:angel_route/angel_route.dart';
import 'package:combinator/combinator.dart';
+import 'package:http_parser/http_parser.dart';
import 'package:logging/logging.dart';
import 'package:tuple/tuple.dart';
@@ -135,7 +136,7 @@ class Angel extends Routable {
return;
}
- res.headers['content-type'] = 'text/html';
+ res.contentType = new MediaType('text', 'html', {'charset': 'utf8'});
res.statusCode = e.statusCode;
res.write("${e.message}");
res.write("${e.message}
");
@@ -170,6 +171,12 @@ class Angel extends Routable {
logger?.warning(
'This route will be ignored, and no requests will ever reach it.');
}
+
+ if (router is Angel) {
+ router._parent = this;
+ _children.add(router);
+ }
+
return super.mount(path.toString(), router);
}
@@ -238,11 +245,6 @@ class Angel extends Routable {
}
}
- /// Shortcuts for adding converters to transform the response buffer/stream of any request.
- void injectEncoders(Map, List>> encoders) {
- this.encoders.addAll(encoders);
- }
-
Future getHandlerResult(handler, RequestContext req, ResponseContext res) {
if (handler is RequestHandler) {
var result = handler(req, res);
@@ -296,24 +298,7 @@ class Angel extends Routable {
void optimizeForProduction({bool force: false}) {
if (isProduction == true || force == true) {
_isProduction = true;
- _add(v) {
- if (v is Function && !_preContained.containsKey(v)) {
- _preContained[v] = preInject(v, container.reflector);
- }
- }
-
- void _walk(Router router) {
- router.middleware.forEach(_add);
- router.routes.forEach((r) {
- r.handlers.forEach(_add);
- if (r is SymlinkRoute) _walk(r.router);
- });
- }
-
_flattened ??= flatten(this);
-
- _walk(_flattened);
-
logger?.config('Angel is running in production mode.');
}
}
diff --git a/lib/src/core/service.dart b/lib/src/core/service.dart
index e157da8f..d243b18c 100644
--- a/lib/src/core/service.dart
+++ b/lib/src/core/service.dart
@@ -33,11 +33,15 @@ class Providers {
static const Providers websocket = Providers(viaWebsocket);
/// Represents a request parsed from GraphQL.
- static const Providers graphql = Providers(viaGraphQL);
+ static const Providers graphQL = Providers(viaGraphQL);
@override
bool operator ==(other) => other is Providers && other.via == via;
+ Map toJson() {
+ return {'via': via};
+ }
+
@override
String toString() {
return 'via:$via';
@@ -154,11 +158,13 @@ class Service extends Routable {
var handlers = new List.from(handlerss);
// Add global middleware if declared on the instance itself
- Middleware before = getAnnotation(service, Middleware, app.container.reflector);
+ Middleware before =
+ getAnnotation(service, Middleware, app.container.reflector);
if (before != null) handlers.addAll(before.handlers);
- Middleware indexMiddleware = getAnnotation(service.index, Middleware, app.container.reflector);
+ Middleware indexMiddleware =
+ getAnnotation(service.index, Middleware, app.container.reflector);
get('/', (req, res) {
return req.parseQuery().then((query) {
return this.index(mergeMap([
@@ -172,7 +178,8 @@ class Service extends Routable {
..addAll(handlers)
..addAll((indexMiddleware == null) ? [] : indexMiddleware.handlers));
- Middleware createMiddleware = getAnnotation(service.create, Middleware, app.container.reflector);
+ Middleware createMiddleware =
+ getAnnotation(service.create, Middleware, app.container.reflector);
post('/', (req, ResponseContext res) {
return req.parseQuery().then((query) {
return req.parseBody().then((body) {
@@ -196,7 +203,8 @@ class Service extends Routable {
..addAll(
(createMiddleware == null) ? [] : createMiddleware.handlers));
- Middleware readMiddleware = getAnnotation(service.read, Middleware, app.container.reflector);
+ Middleware readMiddleware =
+ getAnnotation(service.read, Middleware, app.container.reflector);
get('/:id', (req, res) {
return req.parseQuery().then((query) {
@@ -213,7 +221,8 @@ class Service extends Routable {
..addAll(handlers)
..addAll((readMiddleware == null) ? [] : readMiddleware.handlers));
- Middleware modifyMiddleware = getAnnotation(service.modify, Middleware, app.container.reflector);
+ Middleware modifyMiddleware =
+ getAnnotation(service.modify, Middleware, app.container.reflector);
patch(
'/:id',
(req, res) => req.parseBody().then((body) {
@@ -233,7 +242,8 @@ class Service extends Routable {
..addAll(
(modifyMiddleware == null) ? [] : modifyMiddleware.handlers));
- Middleware updateMiddleware = getAnnotation(service.update, Middleware, app.container.reflector);
+ Middleware updateMiddleware =
+ getAnnotation(service.update, Middleware, app.container.reflector);
post(
'/:id',
(req, res) => req.parseBody().then((body) {
@@ -271,7 +281,8 @@ class Service extends Routable {
..addAll(
(updateMiddleware == null) ? [] : updateMiddleware.handlers));
- Middleware removeMiddleware = getAnnotation(service.remove, Middleware, app.container.reflector);
+ Middleware removeMiddleware =
+ getAnnotation(service.remove, Middleware, app.container.reflector);
delete('/', (req, res) {
return req.parseQuery().then((query) {
return this.remove(
diff --git a/lib/src/core/typed_service.dart b/lib/src/core/typed_service.dart
index e69de29b..8b137891 100644
--- a/lib/src/core/typed_service.dart
+++ b/lib/src/core/typed_service.dart
@@ -0,0 +1 @@
+
diff --git a/lib/src/http/angel_http.dart b/lib/src/http/angel_http.dart
index 0dfedcbc..5623d6fe 100644
--- a/lib/src/http/angel_http.dart
+++ b/lib/src/http/angel_http.dart
@@ -147,11 +147,13 @@ class AngelHttp {
if (handler == null) break;
if (runPipeline == null)
- runPipeline = () => Future.sync(() => handler(req, res));
+ runPipeline = () =>
+ Future.sync(() => app.executeHandler(handler, req, res));
else {
var current = runPipeline;
- runPipeline = () => current().then((result) =>
- !res.isOpen ? new Future.value(result) : handler(req, res));
+ runPipeline = () => current().then((result) => !res.isOpen
+ ? new Future.value(result)
+ : app.executeHandler(handler, req, res));
}
}
diff --git a/lib/src/http/controller.dart b/lib/src/http/controller.dart
index 6920e939..4d6f71a4 100644
--- a/lib/src/http/controller.dart
+++ b/lib/src/http/controller.dart
@@ -45,9 +45,8 @@ class Controller {
var routable = new Routable();
app.mount(exposeDecl.path, routable);
var typeMirror = app.container.reflector.reflectType(this.runtimeType);
- String name = exposeDecl.as?.isNotEmpty == true
- ? exposeDecl.as
- : typeMirror.name;
+ String name =
+ exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : typeMirror.name;
app.controllers[name] = this;
@@ -85,9 +84,8 @@ class Controller {
var middleware = []
..addAll(handlers)
..addAll(exposeDecl.middleware);
- String name = exposeDecl.as?.isNotEmpty == true
- ? exposeDecl.as
- : methodName;
+ String name =
+ exposeDecl.as?.isNotEmpty == true ? exposeDecl.as : methodName;
// Check if normal
var method = decl.function;
@@ -120,7 +118,8 @@ class Controller {
void configureRoutes(Routable routable) {}
/// Finds the [Expose] declaration for this class.
- Expose findExpose(Reflector reflector) => reflector.reflectClass(runtimeType)
+ Expose findExpose(Reflector reflector) => reflector
+ .reflectClass(runtimeType)
.annotations
.map((m) => m.reflectee)
.firstWhere((r) => r is Expose, orElse: () => null) as Expose;
diff --git a/lib/src/http/http_response_context.dart b/lib/src/http/http_response_context.dart
index c2e263c5..44e5ec9f 100644
--- a/lib/src/http/http_response_context.dart
+++ b/lib/src/http/http_response_context.dart
@@ -42,10 +42,26 @@ class HttpResponseContext extends ResponseContext {
}
@override
- void enableBuffer() {
+ void useBuffer() {
_buffer = new LockableBytesBuilder();
}
+ Iterable __allowedEncodings;
+
+ Iterable get _allowedEncodings {
+ return __allowedEncodings ??= correspondingRequest.headers
+ .value('accept-encoding')
+ ?.split(',')
+ ?.map((s) => s.trim())
+ ?.where((s) => s.isNotEmpty)
+ ?.map((str) {
+ // Ignore quality specifications in accept-encoding
+ // ex. gzip;q=0.8
+ if (!str.contains(';')) return str;
+ return str.split(';')[0];
+ });
+ }
+
bool _openStream() {
if (!_streamInitialized) {
// If this is the first stream added to this response,
@@ -54,6 +70,31 @@ class HttpResponseContext extends ResponseContext {
..statusCode = statusCode
..cookies.addAll(cookies);
headers.forEach(rawResponse.headers.set);
+ rawResponse.headers.contentType = new ContentType(
+ contentType.type, contentType.subtype,
+ charset: contentType.parameters['charset'],
+ parameters: contentType.parameters);
+
+ if (encoders.isNotEmpty && correspondingRequest != null) {
+ if (_allowedEncodings != null) {
+ for (var encodingName in _allowedEncodings) {
+ Converter, List> encoder;
+ String key = encodingName;
+
+ if (encoders.containsKey(encodingName))
+ encoder = encoders[encodingName];
+ else if (encodingName == '*') {
+ encoder = encoders[key = encoders.keys.first];
+ }
+
+ if (encoder != null) {
+ rawResponse.headers.set('content-encoding', key);
+ break;
+ }
+ }
+ }
+ }
+
//_isClosed = true;
return _streamInitialized = true;
}
@@ -64,25 +105,13 @@ class HttpResponseContext extends ResponseContext {
@override
Future addStream(Stream> stream) {
if (_isClosed && isBuffered) throw ResponseContext.closed();
- var firstStream = _openStream();
+ _openStream();
Stream> output = stream;
if (encoders.isNotEmpty && correspondingRequest != null) {
- var allowedEncodings = correspondingRequest.headers
- .value('accept-encoding')
- ?.split(',')
- ?.map((s) => s.trim())
- ?.where((s) => s.isNotEmpty)
- ?.map((str) {
- // Ignore quality specifications in accept-encoding
- // ex. gzip;q=0.8
- if (!str.contains(';')) return str;
- return str.split(';')[0];
- });
-
- if (allowedEncodings != null) {
- for (var encodingName in allowedEncodings) {
+ if (_allowedEncodings != null) {
+ for (var encodingName in _allowedEncodings) {
Converter, List> encoder;
String key = encodingName;
@@ -93,10 +122,6 @@ class HttpResponseContext extends ResponseContext {
}
if (encoder != null) {
- if (firstStream) {
- rawResponse.headers.set('content-encoding', key);
- }
-
output = encoders[key].bind(output);
break;
}
@@ -113,6 +138,27 @@ class HttpResponseContext extends ResponseContext {
throw ResponseContext.closed();
else if (!isBuffered) {
_openStream();
+
+ if (encoders.isNotEmpty && correspondingRequest != null) {
+ if (_allowedEncodings != null) {
+ for (var encodingName in _allowedEncodings) {
+ Converter, List> encoder;
+ String key = encodingName;
+
+ if (encoders.containsKey(encodingName))
+ encoder = encoders[encodingName];
+ else if (encodingName == '*') {
+ encoder = encoders[key = encoders.keys.first];
+ }
+
+ if (encoder != null) {
+ data = encoders[key].convert(data);
+ break;
+ }
+ }
+ }
+ }
+
rawResponse.add(data);
} else
buffer.add(data);
diff --git a/lib/src/util.dart b/lib/src/util.dart
index 077551c2..e3537a22 100644
--- a/lib/src/util.dart
+++ b/lib/src/util.dart
@@ -4,10 +4,11 @@ final RegExp straySlashes = new RegExp(r'(^/+)|(/+$)');
matchingAnnotation(List metadata, Type T) {
for (ReflectedInstance metaDatum in metadata) {
- if (metaDatum.type == T) {
+ if (metaDatum.type.reflectedType == T) {
return metaDatum.reflectee;
}
}
+
return null;
}
diff --git a/test/common.dart b/test/common.dart
index 1c0b4a3b..0e028dcb 100644
--- a/test/common.dart
+++ b/test/common.dart
@@ -8,6 +8,13 @@ class Todo extends Model {
String over;
Todo({String this.text, String this.over});
+
+ Map toJson() {
+ return {
+ 'text': text,
+ 'over': over,
+ };
+ }
}
class BookService extends Service {
diff --git a/test/encoders_buffer_test.dart b/test/encoders_buffer_test.dart
index 05d7070e..66732c7a 100644
--- a/test/encoders_buffer_test.dart
+++ b/test/encoders_buffer_test.dart
@@ -1,9 +1,10 @@
import 'dart:async';
+import 'dart:convert';
import 'dart:io' show BytesBuilder;
+import 'dart:io';
+
import 'package:angel_container/mirrors.dart';
import 'package:angel_framework/angel_framework.dart';
-import 'dart:convert';
-import 'dart:io';
import 'package:mock_request/mock_request.dart';
import 'package:test/test.dart';
@@ -19,7 +20,7 @@ main() {
setUp(() {
app = new Angel(reflector: MirrorsReflector());
- app.injectEncoders(
+ app.encoders.addAll(
{
'deflate': zlib.encoder,
'gzip': gzip.encoder,
@@ -27,7 +28,9 @@ main() {
);
app.get('/hello', (req, res) {
- res.write('Hello, world!');
+ res
+ ..useBuffer()
+ ..write('Hello, world!');
});
});
@@ -63,6 +66,7 @@ void encodingTests(Angel getApp()) {
await http.handleRequest(rq);
var body = await getBody(rs);
+ print(rs.headers);
expect(rs.headers.value('content-encoding'), 'deflate');
expect(body, zlib.encode(utf8.encode('Hello, world!')));
});
diff --git a/test/parameter_meta_test.dart b/test/parameter_meta_test.dart
index 2a767f56..e4a6ea4f 100644
--- a/test/parameter_meta_test.dart
+++ b/test/parameter_meta_test.dart
@@ -18,10 +18,7 @@ Future printResponse(MockHttpResponse rs) {
}
void main() {
- group('parameter_meta', parameterMetaTests,
- skip: !Platform.version.contains('2.0.0')
- ? null
- : 'Blocked on https://github.com/dart-lang/sdk/issues/33774');
+ group('parameter_meta', parameterMetaTests);
}
parameterMetaTests() {
diff --git a/test/precontained_test.dart b/test/precontained_test.dart
index 3488ab8d..22d38e79 100644
--- a/test/precontained_test.dart
+++ b/test/precontained_test.dart
@@ -12,7 +12,7 @@ main() {
..get('/foo', ioc(echoAppFoo));
app.optimizeForProduction(force: true);
print(app.preContained);
- expect(app.preContained, contains(echoAppFoo));
+ expect(app.preContained.keys, contains(echoAppFoo));
var rq = new MockHttpRequest('GET', new Uri(path: '/foo'));
rq.close();
@@ -20,7 +20,7 @@ main() {
var rs = rq.response;
var body = await rs.transform(utf8.decoder).join();
expect(body, json.encode('bar'));
- });
+ }, skip: 'Angel no longer has to preinject functions');
}
echoAppFoo(String foo) => foo;
diff --git a/test/routing_test.dart b/test/routing_test.dart
index 3edb1f46..b841fd10 100644
--- a/test/routing_test.dart
+++ b/test/routing_test.dart
@@ -99,7 +99,7 @@ main() {
}
app.chain([write('a')]).chain([write('b'), write('c')]).get(
- '/chained', (req, res) => false);
+ '/chained', (req, res) => res.close());
app.fallback((req, res) => 'MJ');
diff --git a/test/serialize_test.dart b/test/serialize_test.dart
index c8776e4d..a800dc05 100644
--- a/test/serialize_test.dart
+++ b/test/serialize_test.dart
@@ -16,8 +16,8 @@ main() {
app = new Angel(reflector: MirrorsReflector())
..get('/foo', ioc(() => {'hello': 'world'}))
..get('/bar', (req, res) async {
- res.contentType = new MediaType('text', 'html');
- await res.serialize({'hello': 'world'});
+ await res.serialize({'hello': 'world'},
+ contentType: new MediaType('text', 'html'));
});
client = new http.Client();
diff --git a/test/server_test.dart b/test/server_test.dart
index b27c0d42..a084f2aa 100644
--- a/test/server_test.dart
+++ b/test/server_test.dart
@@ -145,7 +145,7 @@ main() {
});
test('end response', () async {
- var handler = (req, res) => res.end();
+ var handler = (req, ResponseContext res) => res.close();
expect(await app.executeHandler(handler, req, res), isFalse);
});
});
diff --git a/test/streaming_test.dart b/test/streaming_test.dart
index c45bf663..471c2283 100644
--- a/test/streaming_test.dart
+++ b/test/streaming_test.dart
@@ -17,7 +17,7 @@ main() {
setUp(() {
app = new Angel(reflector: MirrorsReflector());
- http = new AngelHttp(app);
+ http = new AngelHttp(app, useZone: true);
app.logger = new Logger('streaming_test')
..onRecord.listen((rec) {
@@ -25,15 +25,16 @@ main() {
if (rec.stackTrace != null) print(rec.stackTrace);
});
- app.injectEncoders(
+ app.encoders.addAll(
{
'deflate': zlib.encoder,
'gzip': gzip.encoder,
},
);
- app.get('/hello', (req, res) {
- new Stream>.fromIterable(['Hello, world!'.codeUnits]).pipe(res);
+ app.get('/hello', (req, res) {
+ return new Stream>.fromIterable(['Hello, world!'.codeUnits])
+ .pipe(res);
});
app.get('/write', (req, res) async {
@@ -56,13 +57,12 @@ main() {
await new Stream>.fromIterable(['Hello, world!'.codeUnits])
.pipe(res);
- try {
- await new Stream>.fromIterable(['Hello, world!'.codeUnits])
- .pipe(res);
- throw new Exception('Should throw on rewrite...');
- } on StateError {
- // Yay!!!
- }
+ var f = new Stream>.fromIterable(['Hello, world!'.codeUnits])
+ .pipe(res)
+ .then((_) => false)
+ .catchError((_) => true);
+
+ expect(f, completion(true));
});
app.get('/error', (req, res) => res.addError(new StateError('wtf')));
@@ -86,12 +86,16 @@ main() {
test('multiple addStream', () => _expectHelloBye('/multiple'));
test('cannot write after close', () async {
- var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
- await http.handleRequest(rq);
- var body = await rq.response.transform(utf8.decoder).join();
+ try {
+ var rq = new MockHttpRequest('GET', Uri.parse('/overwrite'))..close();
+ await http.handleRequest(rq);
+ var body = await rq.response.transform(utf8.decoder).join();
- if (rq.response.statusCode != 32)
- throw 'overwrite should throw error; response: $body';
+ if (rq.response.statusCode != 32)
+ throw 'overwrite should throw error; response: $body';
+ } on StateError {
+ // Success
+ }
});
test('res => addError', () async {
diff --git a/test/view_generator_test.dart b/test/view_generator_test.dart
index 0b304061..177fb63f 100644
--- a/test/view_generator_test.dart
+++ b/test/view_generator_test.dart
@@ -1,10 +1,9 @@
-import 'package:angel_container/mirrors.dart';
import 'package:angel_framework/angel_framework.dart';
import 'package:test/test.dart';
main() {
test('default view generator', () async {
- var app = new Angel(reflector: MirrorsReflector());
+ var app = new Angel();
var view = await app.viewGenerator('foo', {'bar': 'baz'});
expect(view, contains('No view engine'));
});