2.0.0-alpha.2

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.0.0-alpha.2
+* Updated for the next version of `angel_client`.
+
 # 2.0.0-alpha.1
 * Refactorings for updated Angel 2 versions.
 * Remove `package:dart2_constant`.

lib/angel_websocket.dart

@@ -39,16 +39,24 @@ const List<String> EVENTS = const [
 ];
 
 /// A notification from the server that something has occurred.
-class WebSocketEvent {
+class WebSocketEvent<Data> {
   String eventName;
-  var data;
+  Data data;
 
   WebSocketEvent({String this.eventName, this.data});
 
   factory WebSocketEvent.fromJson(Map data) => new WebSocketEvent(
-      eventName: data['eventName'].toString(), data: data['data']);
+      eventName: data['eventName'].toString(), data: data['data'] as Data);
 
-  Map toJson() {
+  WebSocketEvent<T> cast<T>() {
+    if (T == Data) {
+      return this as WebSocketEvent<T>;
+    } else {
+      return new WebSocketEvent<T>(eventName: eventName, data: data as T);
+    }
+  }
+
+  Map<String, dynamic> toJson() {
     return {'eventName': eventName, 'data': data};
   }
 }

lib/base_websocket_client.dart

@@ -133,10 +133,11 @@ abstract class BaseWebSocketClient extends BaseAngelClient {
   Future<WebSocketChannel> getConnectedWebSocket();
 
   @override
-  WebSocketsService service(String path,
+  WebSocketsService<Id, Data> service<Id, Data>(String path,
-      {Type type, AngelDeserializer deserializer}) {
+      {Type type, AngelDeserializer<Data> deserializer}) {
     String uri = path.toString().replaceAll(_straySlashes, '');
-    return new WebSocketsService(socket, this, uri, deserializer: deserializer);
+    return new WebSocketsService<Id, Data>(socket, this, uri,
+        deserializer: deserializer);
   }
 
   /// Starts listening for data.
@@ -225,13 +226,13 @@ abstract class BaseWebSocketClient extends BaseAngelClient {
 }
 
 /// A [Service] that asynchronously interacts with the server.
-class WebSocketsService extends Service {
+class WebSocketsService<Id, Data> extends Service<Id, Data> {
   /// The [BaseWebSocketClient] that spawned this service.
   @override
   final BaseWebSocketClient app;
 
   /// Used to deserialize JSON into typed data.
-  final AngelDeserializer deserializer;
+  final AngelDeserializer<Data> deserializer;
 
   /// The [WebSocketChannel] to listen to, and send data across.
   final WebSocketChannel socket;
@@ -242,11 +243,11 @@ class WebSocketsService extends Service {
   final StreamController<WebSocketEvent> _onAllEvents =
       new StreamController<WebSocketEvent>();
   final StreamController _onIndexed = new StreamController();
-  final StreamController _onRead = new StreamController();
+  final StreamController<Data> _onRead = new StreamController<Data>();
-  final StreamController _onCreated = new StreamController();
+  final StreamController<Data> _onCreated = new StreamController<Data>();
-  final StreamController _onModified = new StreamController();
+  final StreamController<Data> _onModified = new StreamController<Data>();
-  final StreamController _onUpdated = new StreamController();
+  final StreamController<Data> _onUpdated = new StreamController<Data>();
-  final StreamController _onRemoved = new StreamController();
+  final StreamController<Data> _onRemoved = new StreamController<Data>();
 
   /// Fired on all events.
   Stream<WebSocketEvent> get onAllEvents => _onAllEvents.stream;
@@ -255,19 +256,19 @@ class WebSocketsService extends Service {
   Stream get onIndexed => _onIndexed.stream;
 
   /// Fired on `read` events.
-  Stream get onRead => _onRead.stream;
+  Stream<Data> get onRead => _onRead.stream;
 
   /// Fired on `created` events.
-  Stream get onCreated => _onCreated.stream;
+  Stream<Data> get onCreated => _onCreated.stream;
 
   /// Fired on `modified` events.
-  Stream get onModified => _onModified.stream;
+  Stream<Data> get onModified => _onModified.stream;
 
   /// Fired on `updated` events.
-  Stream get onUpdated => _onUpdated.stream;
+  Stream<Data> get onUpdated => _onUpdated.stream;
 
   /// Fired on `removed` events.
-  Stream get onRemoved => _onRemoved.stream;
+  Stream<Data> get onRemoved => _onRemoved.stream;
 
   WebSocketsService(this.socket, this.app, this.path, {this.deserializer}) {
     listen();
@@ -287,12 +288,12 @@ class WebSocketsService extends Service {
   serialize(WebSocketAction action) => json.encode(action);
 
   /// Deserializes data from a [WebSocketEvent].
-  deserialize(x) {
+  Data deserialize(x) {
-    return deserializer != null ? deserializer(x) : x;
+    return deserializer != null ? deserializer(x) : x as Data;
   }
 
   /// Deserializes the contents of an [event].
-  WebSocketEvent transformEvent(WebSocketEvent event) {
+  WebSocketEvent<Data> transformEvent(WebSocketEvent<Data> event) {
     return event..data = deserialize(event.data);
   }
 
@@ -300,7 +301,7 @@ class WebSocketsService extends Service {
   void listen() {
     app.onServiceEvent.listen((map) {
       if (map.containsKey(path)) {
-        var event = map[path];
+        var event = map[path].cast<Data>();
         var transformed = transformEvent(event).data;
 
         _onAllEvents.add(event);

lib/browser.dart

@@ -83,18 +83,18 @@ class WebSockets extends BaseWebSocketClient {
   }
 
   @override
-  BrowserWebSocketsService service(String path,
+  BrowserWebSocketsService<Id, Data> service<Id, Data>(String path,
-      {Type type, AngelDeserializer deserializer}) {
+      {Type type, AngelDeserializer<Data> deserializer}) {
     String uri = path.replaceAll(_straySlashes, '');
-    return new BrowserWebSocketsService(socket, this, uri,
+    return new BrowserWebSocketsService<Id, Data>(socket, this, uri,
         deserializer: deserializer);
   }
 }
 
-class BrowserWebSocketsService extends WebSocketsService {
+class BrowserWebSocketsService<Id, Data> extends WebSocketsService<Id, Data> {
   final Type type;
 
   BrowserWebSocketsService(WebSocketChannel socket, WebSockets app, String uri,
-      {this.type, AngelDeserializer deserializer})
+      {this.type, AngelDeserializer<Data> deserializer})
       : super(socket, app, uri, deserializer: deserializer);
 }

lib/io.dart

@@ -46,17 +46,17 @@ class WebSockets extends BaseWebSocketClient {
   }
 
   @override
-  IoWebSocketsService service(String path,
+  IoWebSocketsService<Id, Data> service<Id, Data>(String path,
-      {Type type, AngelDeserializer deserializer}) {
+      {Type type, AngelDeserializer<Data> deserializer}) {
     String uri = path.replaceAll(_straySlashes, '');
-    return new IoWebSocketsService(socket, this, uri, type);
+    return new IoWebSocketsService<Id, Data>(socket, this, uri, type);
   }
 
   @override
   serialize(x) => god.serialize(x);
 }
 
-class IoWebSocketsService extends WebSocketsService {
+class IoWebSocketsService<Id, Data> extends WebSocketsService<Id, Data> {
   final Type type;
 
   IoWebSocketsService(
@@ -69,7 +69,7 @@ class IoWebSocketsService extends WebSocketsService {
   @override
   deserialize(x) {
     if (type != null && type != dynamic) {
-      return god.deserializeDatum(x, outputType: type);
+      return god.deserializeDatum(x, outputType: type) as Data;
     } else
       return super.deserialize(x);
   }

lib/websocket_controller.dart

@@ -68,7 +68,8 @@ class WebSocketController extends Controller {
       socket.onData.listen((data) => onData(data, socket));
 
       socket.onAction.listen((WebSocketAction action) async {
-        socket.request.container.registerSingleton<WebSocketAction>(action);
+        var container = socket.request.container.createChild();
+        container.registerSingleton<WebSocketAction>(action);
 
         try {
           await onAction(action, socket);
@@ -77,7 +78,7 @@ class WebSocketController extends Controller {
             var methodMirror = _handlers[action.eventName];
             var fn = instanceMirror.getField(methodMirror.simpleName).reflectee;
             return app.runContained(
-                fn as Function, socket.request, socket.response);
+                fn as Function, socket.request, socket.response, container);
           }
         } catch (e, st) {
           ws.catchError(e, st, socket);

pubspec.yaml

@@ -2,7 +2,7 @@ name: angel_websocket
 description: WebSocket plugin for Angel.
 environment:
   sdk: ">=2.0.0-dev <3.0.0"
-version: 2.0.0-alpha.1
+version: 2.0.0-alpha.2
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/angel_websocket
 dependencies: