mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved DI 2

Browse source
This commit is contained in:
thosakwe 2016-09-17 22:59:06 -04:00
parent bdcd9e2513
commit aea4ec1cf2
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/src/http/server.dart
View file

@ -39,7 +39,6 @@ class Angel extends AngelBase {
/// Fired before a request is processed. Always runs. /// Fired before a request is processed. Always runs.
Stream<HttpRequest> get beforeProcessed => _beforeProcessed.stream; Stream<HttpRequest> get beforeProcessed => _beforeProcessed.stream;
/// Fired whenever a controller is added to this instance. /// Fired whenever a controller is added to this instance.
/// ///
/// **NOTE**: This is a broadcast stream. /// **NOTE**: This is a broadcast stream.
@ -72,8 +71,8 @@ class Angel extends AngelBase {
/// ///
/// Returns false on failure; otherwise, returns the HttpServer. /// Returns false on failure; otherwise, returns the HttpServer.
Future<HttpServer> startServer([InternetAddress address, int port]) async { Future<HttpServer> startServer([InternetAddress address, int port]) async {
var server = var server = await _serverGenerator(
await _serverGenerator(address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0); address ?? InternetAddress.LOOPBACK_IP_V4, port ?? 0);
this.httpServer = server; this.httpServer = server;
server.listen(handleRequest); server.listen(handleRequest);
@ -86,8 +85,7 @@ class Angel extends AngelBase {
container.singleton(this, as: AngelBase); container.singleton(this, as: AngelBase);
container.singleton(this); container.singleton(this);
if (runtimeType != Angel) if (runtimeType != Angel) container.singleton(this, as: Angel);
container.singleton(this, as: Angel);
} }
Future handleRequest(HttpRequest request) async { Future handleRequest(HttpRequest request) async {
@ -242,7 +240,9 @@ class Angel extends AngelBase {
} }
// Run a function after injecting from service container // Run a function after injecting from service container
Future runContained(Function handler, RequestContext req, ResponseContext res, {Map<String, dynamic> namedParameters, Map<Type, dynamic> injecting}) async { Future runContained(Function handler, RequestContext req, ResponseContext res,
{Map<String, dynamic> namedParameters,
Map<Type, dynamic> injecting}) async {
ClosureMirror closureMirror = reflect(handler); ClosureMirror closureMirror = reflect(handler);
List args = []; List args = [];
@ -254,18 +254,20 @@ class Angel extends AngelBase {
else { else {
// First, search to see if we can map this to a type // First, search to see if we can map this to a type
if (parameter.type.reflectedType != dynamic) { if (parameter.type.reflectedType != dynamic) {
args.add(container.make(parameter.type.reflectedType, namedParameters: namedParameters, injecting: injecting)); args.add(container.make(parameter.type.reflectedType,
namedParameters: namedParameters, injecting: injecting));
} else { } else {
String name = MirrorSystem.getName(parameter.simpleName); String name = MirrorSystem.getName(parameter.simpleName);
if (name == "req") if (req.params.containsKey(name))
args.add(req.params[name]);
else if (name == "req")
args.add(req); args.add(req);
else if (name == "res") else if (name == "res")
args.add(res); args.add(res);
else if (req.params.containsKey(name))
args.add(req.params[name]);
else { else {
throw new Exception("Cannot resolve parameter '$name' within handler."); throw new Exception(
"Cannot resolve parameter '$name' within handler.");
} }
} }
} }