Purge json_god
This commit is contained in:
parent
f27b4ab85a
commit
af00141470
4 changed files with 7 additions and 19 deletions
|
@ -77,7 +77,7 @@ class WebSocketAction {
|
|||
data: data['data'],
|
||||
params: data['params'] as Map<String, dynamic>);
|
||||
|
||||
Map toJson() {
|
||||
Map<String, dynamic> toJson() {
|
||||
return {'id': id, 'eventName': eventName, 'data': data, 'params': params};
|
||||
}
|
||||
}
|
||||
|
|
16
lib/io.dart
16
lib/io.dart
|
@ -5,10 +5,8 @@ import 'dart:async';
|
|||
import 'dart:io';
|
||||
import 'package:angel_client/angel_client.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:json_god/json_god.dart' as god;
|
||||
import 'package:web_socket_channel/web_socket_channel.dart';
|
||||
import 'package:web_socket_channel/io.dart';
|
||||
import 'angel_websocket.dart';
|
||||
import 'base_websocket_client.dart';
|
||||
export 'package:angel_client/angel_client.dart';
|
||||
export 'angel_websocket.dart';
|
||||
|
@ -51,9 +49,6 @@ class WebSockets extends BaseWebSocketClient {
|
|||
String uri = path.replaceAll(_straySlashes, '');
|
||||
return new IoWebSocketsService<Id, Data>(socket, this, uri, type);
|
||||
}
|
||||
|
||||
@override
|
||||
serialize(x) => god.serialize(x);
|
||||
}
|
||||
|
||||
class IoWebSocketsService<Id, Data> extends WebSocketsService<Id, Data> {
|
||||
|
@ -62,15 +57,4 @@ class IoWebSocketsService<Id, Data> extends WebSocketsService<Id, Data> {
|
|||
IoWebSocketsService(
|
||||
WebSocketChannel socket, WebSockets app, String uri, this.type)
|
||||
: super(socket, app, uri);
|
||||
|
||||
@override
|
||||
serialize(WebSocketAction action) => god.serialize(action);
|
||||
|
||||
@override
|
||||
deserialize(x) {
|
||||
if (type != null && type != dynamic) {
|
||||
return god.deserializeDatum(x, outputType: type) as Data;
|
||||
} else
|
||||
return super.deserialize(x);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,8 +44,8 @@ class WebSocketContext {
|
|||
|
||||
/// Sends an arbitrary [WebSocketEvent];
|
||||
void send(String eventName, data) {
|
||||
channel.sink
|
||||
.add(json.encode(new WebSocketEvent(eventName: eventName, data: data)));
|
||||
channel.sink.add(json
|
||||
.encode(new WebSocketEvent(eventName: eventName, data: data).toJson()));
|
||||
}
|
||||
|
||||
/// Sends an error event.
|
||||
|
|
|
@ -10,6 +10,10 @@ class Game {
|
|||
playerOne: data['playerOne'].toString(),
|
||||
playerTwo: data['playerTwo'].toString());
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
return {'playerOne': playerOne, 'playerTwo': playerTwo};
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(other) =>
|
||||
other is Game &&
|
||||
|
|
Loading…
Reference in a new issue