1.1.1

CHANGELOG.md

@@ -1,2 +1,6 @@
+# 1.1.1
+* Deprecated `unwrap`.
+* Service streams now pump out `e.data`, rather than the actual event.
+
 # 1.1.0+1
 * Added `unwrap`.

README.md

@@ -107,7 +107,7 @@ main() async {
 
   var Cars = app.service("api/cars");
 
-  Cars.onCreated.listen((e) => print("New car: ${e.data}"));
+  Cars.onCreated.listen((car) => print("New car: $car"));
 
   // Happens asynchronously
   Cars.create({"brand": "Toyota"});
@@ -148,10 +148,9 @@ main() async {
 
   var Cars = app.service("api/cars", type: Car);
 
-  Cars.onCreated.listen((e) {
+  Cars.onCreated.listen((Car car) {
       // Automatically deserialized into a car :)
-      Car car = e.data;
-
+      //
       // I just bought a new 2016 Toyota Camry!
       print("I just bought a new $car!");
   });
@@ -162,14 +161,3 @@ main() async {
   // Authenticate a WebSocket, if you were not already authenticated...
   app.authenticateViaJwt('<some-jwt>');
 }
-```
-**Unwrapping Events**
-In several cases, it may be cumbersome or inconsistent to handle events
-as `WebSocketEvent`s. Call `unwrap` to receive a `Service` that returns the underlying `data`
-objects.
-
-```dart
-foo() async {
-  var unwrapped = app.service('api/todos').unwrap();
-}
-```

lib/base_websocket_client.dart

@@ -240,39 +240,39 @@ class WebSocketsService extends Service {
 
   final StreamController<WebSocketEvent> _onAllEvents =
       new StreamController<WebSocketEvent>();
-  final StreamController<WebSocketEvent> _onIndexed =
-      new StreamController<WebSocketEvent>();
-  final StreamController<WebSocketEvent> _onRead =
-      new StreamController<WebSocketEvent>();
-  final StreamController<WebSocketEvent> _onCreated =
-      new StreamController<WebSocketEvent>();
-  final StreamController<WebSocketEvent> _onModified =
-      new StreamController<WebSocketEvent>();
-  final StreamController<WebSocketEvent> _onUpdated =
-      new StreamController<WebSocketEvent>();
-  final StreamController<WebSocketEvent> _onRemoved =
-      new StreamController<WebSocketEvent>();
+  final StreamController _onIndexed =
+      new StreamController();
+  final StreamController _onRead =
+      new StreamController();
+  final StreamController _onCreated =
+      new StreamController();
+  final StreamController _onModified =
+      new StreamController();
+  final StreamController _onUpdated =
+      new StreamController();
+  final StreamController _onRemoved =
+      new StreamController();
 
   /// Fired on all events.
   Stream<WebSocketEvent> get onAllEvents => _onAllEvents.stream;
 
   /// Fired on `index` events.
-  Stream<WebSocketEvent> get onIndexed => _onIndexed.stream;
+  Stream get onIndexed => _onIndexed.stream;
 
   /// Fired on `read` events.
-  Stream<WebSocketEvent> get onRead => _onRead.stream;
+  Stream get onRead => _onRead.stream;
 
   /// Fired on `created` events.
-  Stream<WebSocketEvent> get onCreated => _onCreated.stream;
+  Stream get onCreated => _onCreated.stream;
 
   /// Fired on `modified` events.
-  Stream<WebSocketEvent> get onModified => _onModified.stream;
+  Stream get onModified => _onModified.stream;
 
   /// Fired on `updated` events.
-  Stream<WebSocketEvent> get onUpdated => _onUpdated.stream;
+  Stream get onUpdated => _onUpdated.stream;
 
   /// Fired on `removed` events.
-  Stream<WebSocketEvent> get onRemoved => _onRemoved.stream;
+  Stream get onRemoved => _onRemoved.stream;
 
   WebSocketsService(this.socket, this.app, this.path, {this.deserializer}) {
     listen();
@@ -306,7 +306,7 @@ class WebSocketsService extends Service {
     app.onServiceEvent.listen((map) {
       if (map.containsKey(path)) {
         var event = map[path];
-        var transformed = transformEvent(event);
+        var transformed = transformEvent(event).data;
 
         _onAllEvents.add(event);
 
@@ -389,8 +389,9 @@ class WebSocketsService extends Service {
     return null;
   }
 
-  /// Returns a wrapper that queries this service, but fires the `data` of `WebSocketEvent`s, rather than the events themselves.
-  Service unwrap() => new _WebSocketsDataService(this);
+  /// No longer necessary.
+  @deprecated
+  Service unwrap() => this;
 }
 
 /// Contains a dynamic Map of [WebSocketEvent] streams.
@@ -411,81 +412,3 @@ class WebSocketExtraneousEventHandler {
     return _events[index].stream;
   }
 }
-
-class _WebSocketsDataService extends Service {
-  final WebSocketsService service;
-
-  Stream _onIndexed, _onRead, _onCreated, _onModified, _onUpdated, _onRemoved;
-
-  _WebSocketsDataService(this.service);
-
-  getData(WebSocketEvent e) => e.data;
-
-  @override
-  Future remove(id, [Map params]) {
-    return service.remove(id, params);
-  }
-
-  @override
-  Future update(id, data, [Map params]) {
-    return service.update(id, data, params);
-  }
-
-  @override
-  Future modify(id, data, [Map params]) {
-    return service.modify(id, data, params);
-  }
-
-  @override
-  Future create(data, [Map params]) {
-    return service.create(data, params);
-  }
-
-  @override
-  Future read(id, [Map params]) {
-    return service.read(id, params);
-  }
-
-  @override
-  Future index([Map params]) {
-    return service.index(params);
-  }
-
-  @override
-  Future close() async {}
-
-  @override
-  Angel get app {
-    return service.app;
-  }
-
-  @override
-  Stream get onRemoved {
-    return _onRemoved ??= service.onRemoved.map(getData);
-  }
-
-  @override
-  Stream get onUpdated {
-    return _onUpdated ??= service.onUpdated.map(getData);
-  }
-
-  @override
-  Stream get onModified {
-    return _onModified ??= service.onModified.map(getData);
-  }
-
-  @override
-  Stream get onCreated {
-    return _onCreated ??= service.onCreated.map(getData);
-  }
-
-  @override
-  Stream get onRead {
-    return _onRead ??= service.onRead.map(getData);
-  }
-
-  @override
-  Stream get onIndexed {
-    return _onIndexed ??= service.onIndexed.map(getData);
-  }
-}

pubspec.yaml

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

test/service/common.dart

@@ -21,7 +21,7 @@ class TodoService extends TypedService<Todo> {
 }
 
 testIndex(BaseWebSocketClient client) async {
-  var Todos = client.service('api/todos').unwrap();
+  var Todos = client.service('api/todos');
   Todos.index();
 
   var indexed = await Todos.onIndexed.first;