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

Purge json_god

Browse source
This commit is contained in:
Tobe O 2018-11-03 22:17:33 -04:00
parent f27b4ab85a
commit af00141470
4 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/angel_websocket.dart
View file

@ -77,7 +77,7 @@ class WebSocketAction {
data: data['data'], data: data['data'],
params: data['params'] as Map<String, dynamic>); params: data['params'] as Map<String, dynamic>);
Map toJson() { Map<String, dynamic> toJson() {
return {'id': id, 'eventName': eventName, 'data': data, 'params': params}; return {'id': id, 'eventName': eventName, 'data': data, 'params': params};
} }
} }

16
lib/io.dart
View file

@ -5,10 +5,8 @@ import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:angel_client/angel_client.dart'; import 'package:angel_client/angel_client.dart';
import 'package:http/http.dart' as http; 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/web_socket_channel.dart';
import 'package:web_socket_channel/io.dart'; import 'package:web_socket_channel/io.dart';
import 'angel_websocket.dart';
import 'base_websocket_client.dart'; import 'base_websocket_client.dart';
export 'package:angel_client/angel_client.dart'; export 'package:angel_client/angel_client.dart';
export 'angel_websocket.dart'; export 'angel_websocket.dart';
@ -51,9 +49,6 @@ class WebSockets extends BaseWebSocketClient {
String uri = path.replaceAll(_straySlashes, ''); String uri = path.replaceAll(_straySlashes, '');
return new IoWebSocketsService<Id, Data>(socket, this, uri, type); return new IoWebSocketsService<Id, Data>(socket, this, uri, type);
} }
@override
serialize(x) => god.serialize(x);
} }
class IoWebSocketsService<Id, Data> extends WebSocketsService<Id, Data> { class IoWebSocketsService<Id, Data> extends WebSocketsService<Id, Data> {
@ -62,15 +57,4 @@ class IoWebSocketsService<Id, Data> extends WebSocketsService<Id, Data> {
IoWebSocketsService( IoWebSocketsService(
WebSocketChannel socket, WebSockets app, String uri, this.type) WebSocketChannel socket, WebSockets app, String uri, this.type)
: super(socket, app, uri); : 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);
}
} }

4
lib/websocket_context.dart
View file

@ -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 channel.sink.add(json
.add(json.encode(new WebSocketEvent(eventName: eventName, data: data))); .encode(new WebSocketEvent(eventName: eventName, data: data).toJson()));
} }
/// Sends an error event. /// Sends an error event.

4
test/controller/common.dart
View file

@ -10,6 +10,10 @@ class Game {
playerOne: data['playerOne'].toString(), playerOne: data['playerOne'].toString(),
playerTwo: data['playerTwo'].toString()); playerTwo: data['playerTwo'].toString());
Map<String, dynamic> toJson() {
return {'playerOne': playerOne, 'playerTwo': playerTwo};
}
@override @override
bool operator ==(other) => bool operator ==(other) =>
other is Game && other is Game &&