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

Bump to 2.0.0-alpha.4

Browse source
This commit is contained in:
Tobe O 2018-11-03 22:11:52 -04:00
parent ee93f87677
commit f27b4ab85a
4 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -1,4 +1,6 @@
# 2.0.0-alpha.4 # 2.0.0-alpha.4
* Remove `package:json_god`.
* Make `WebSocketContext` take any `StreamChannel`.
* Strong typing updates. * Strong typing updates.
# 2.0.0-alpha.3 # 2.0.0-alpha.3

8
lib/server.dart
View file

@ -8,10 +8,9 @@ import 'dart:mirrors';
import 'package:angel_auth/angel_auth.dart'; import 'package:angel_auth/angel_auth.dart';
import 'package:angel_framework/angel_framework.dart'; import 'package:angel_framework/angel_framework.dart';
import "package:angel_framework/http.dart"; import "package:angel_framework/http.dart";
import 'package:json_god/json_god.dart' as god;
import 'package:merge_map/merge_map.dart'; import 'package:merge_map/merge_map.dart';
import 'package:stream_channel/stream_channel.dart';
import 'package:web_socket_channel/io.dart'; import 'package:web_socket_channel/io.dart';
import 'package:web_socket_channel/web_socket_channel.dart';
import 'angel_websocket.dart'; import 'angel_websocket.dart';
export 'angel_websocket.dart'; export 'angel_websocket.dart';
@ -81,7 +80,7 @@ class AngelWebSocket {
this.synchronizer, this.synchronizer,
this.serializer, this.serializer,
this.deserializer}) { this.deserializer}) {
if (serializer == null) serializer = god.serialize; if (serializer == null) serializer = json.encode;
if (deserializer == null) deserializer = (params) => params; if (deserializer == null) deserializer = (params) => params;
} }
@ -113,7 +112,7 @@ class AngelWebSocket {
dynamic result = true; dynamic result = true;
if (filter != null) result = await filter(client); if (filter != null) result = await filter(client);
if (result == true) { if (result == true) {
client.channel.sink.add((serializer ?? god.serialize)(event.toJson())); client.channel.sink.add((serializer ?? json.encode)(event.toJson()));
} }
}); });
@ -365,7 +364,6 @@ class AngelWebSocket {
if (req is HttpRequestContext && res is HttpResponseContext) { if (req is HttpRequestContext && res is HttpResponseContext) {
if (!WebSocketTransformer.isUpgradeRequest(req.rawRequest)) if (!WebSocketTransformer.isUpgradeRequest(req.rawRequest))
throw new AngelHttpException.badRequest(); throw new AngelHttpException.badRequest();
await res.detach(); await res.detach();
var ws = await WebSocketTransformer.upgrade(req.rawRequest); var ws = await WebSocketTransformer.upgrade(req.rawRequest);
var channel = new IOWebSocketChannel(ws); var channel = new IOWebSocketChannel(ws);

14
lib/websocket_context.dart
View file

@ -6,8 +6,8 @@ class WebSocketContext {
/// Use this to listen for events. /// Use this to listen for events.
_WebSocketEventTable on = new _WebSocketEventTable(); _WebSocketEventTable on = new _WebSocketEventTable();
/// The underlying [WebSocketChannel]. /// The underlying [StreamChannel].
final WebSocketChannel channel; final StreamChannel channel;
/// The original [RequestContext]. /// The original [RequestContext].
final RequestContext request; final RequestContext request;
@ -33,9 +33,9 @@ class WebSocketContext {
WebSocketContext(this.channel, this.request, this.response); WebSocketContext(this.channel, this.request, this.response);
/// Closes the underlying [WebSocket]. /// Closes the underlying [StreamChannel].
Future close([int code, String reason]) async { Future close() async {
await channel.sink.close(code, reason); await channel.sink.close();
_onAction.close(); _onAction.close();
_onData.close(); _onData.close();
_onClose.add(null); _onClose.add(null);
@ -44,8 +44,8 @@ class WebSocketContext {
/// Sends an arbitrary [WebSocketEvent]; /// Sends an arbitrary [WebSocketEvent];
void send(String eventName, data) { void send(String eventName, data) {
channel.sink.add( channel.sink
god.serialize(new WebSocketEvent(eventName: eventName, data: data))); .add(json.encode(new WebSocketEvent(eventName: eventName, data: data)));
} }
/// Sends an error event. /// Sends an error event.

1
pubspec.yaml
View file

@ -11,7 +11,6 @@ dependencies:
angel_framework: ^2.0.0-alpha angel_framework: ^2.0.0-alpha
angel_http_exception: ^1.0.0 angel_http_exception: ^1.0.0
http: ^0.11.0 http: ^0.11.0
json_god: ^2.0.0-beta
merge_map: ^1.0.0 merge_map: ^1.0.0
meta: ^1.0.0 meta: ^1.0.0
web_socket_channel: ^1.0.0 web_socket_channel: ^1.0.0