Develop

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.5.0
+
+Websocket format is changed.
+
 ## 0.4.0
 
 Fix Websockets

example/app.dart

@@ -38,13 +38,10 @@ void main() {
       });
     });
 
-    app.ws('/socket').listen((socket) {
-      socket.on('connected').listen((data) {
-        socket.send('ping', 'data-from-ping');
-      });
+    app.ws('/').listen((socket) {
 
-      socket.on('pong').listen((data) {
-        print('pong: $data');
+      socket.onMessage().listen((data) {
+        print('msg: $data');
         socket.close(1000, 'requested');
       });
 

lib/socket.dart

@@ -14,19 +14,17 @@ class Socket implements SocketBase {
         this._ws = new WebSocket(url) {
     _messages = _messageController.stream.asBroadcastStream();
     _ws.onMessage.listen((e) {
-      var msg = new Message.fromPacket(e.data);
+      var msg = e.data;
       _messageController.add(msg);
     });
   }
 
-  void send(String messageName, [ data ]) {
-    var message = new Message(messageName, data);
-    _ws.send(message.toPacket());
+  void send(String message) {
+    _ws.send(message);
   }
 
-  Stream on(String messageName) {
-    return _messages.where((msg) => msg.name == messageName).map((msg) =>
-    msg.data);
+  Stream onMessage() {
+    return _messages;
   }
 
   Stream get onOpen => _ws.onOpen;
@@ -36,4 +34,4 @@ class Socket implements SocketBase {
   void close([int status, String reason]) {
     _ws.close(status, reason);
   }
-}
+}

lib/src/socket.dart

@@ -13,22 +13,19 @@ class Socket implements SocketBase {
 
     _openController.add(_ws);
     _ws.listen((data) {
-          var msg = new Message.fromPacket(data);
-          _messageController.add(msg);
+          _messageController.add(data);
         },
         onDone: () {
           _closeController.add(_ws);
         });
   }
 
-  void send(String messageName, [ data ]) {
-    var message = new Message(messageName, data);
-    _ws.add(message.toPacket());
+  void send(String message) {
+    _ws.add(message);
   }
 
-  Stream on(String messageName) {
-    return _messages.where((msg) => msg.name == messageName).map((msg) =>
-    msg.data);
+  Stream onMessage() {
+    return _messages;
   }
 
   Stream get onOpen => _openController.stream;

lib/src/socket_base.dart

@@ -2,12 +2,10 @@ library start_socket;
 
 import 'dart:async';
 
-export 'message.dart' show Message;
-
 abstract class SocketBase {
-  void send(String msg_name, [ data ]);
+  void send(String msg);
 
-  Stream on(String message_name);
+  Stream onMessage();
 
   void close([int status, String reason]);
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: start
-author: Yehor Lvivski <[email protected]>
-version: 0.4.0
+author: Yehor Lvivski <[email protected]>, Benjamin Jung <[email protected]>
+version: 0.5.0
 homepage: http://github.com/lvivski/start
 description: Sinatra inspired Web framework
 environment: