Skip to content

Commit 098a0f1

Browse files
authored
Rename helper extensions to not collide with pkg:web unreleased (dart-archive/web_socket_channel#303)
1 parent 63d83c9 commit 098a0f1

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

pkgs/web_socket_channel/lib/html.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ class HtmlWebSocketChannel extends StreamChannelMixin
9696
}
9797
// The socket API guarantees that only a single open event will be
9898
// emitted.
99-
innerWebSocket.onOpen.first.then((_) {
99+
innerWebSocket.onOpenX.first.then((_) {
100100
_readyCompleter.complete();
101101
_listen();
102102
});
103103
}
104104

105105
// The socket API guarantees that only a single error event will be emitted,
106106
// and that once it is no open or message events will be emitted.
107-
innerWebSocket.onError.first.then((_) {
107+
innerWebSocket.onErrorX.first.then((_) {
108108
// Unfortunately, the underlying WebSocket API doesn't expose any
109109
// specific information about the error itself.
110110
final error = WebSocketChannelException('WebSocket connection failed.');
@@ -115,11 +115,11 @@ class HtmlWebSocketChannel extends StreamChannelMixin
115115
_controller.local.sink.close();
116116
});
117117

118-
innerWebSocket.onMessage.listen(_innerListen);
118+
innerWebSocket.onMessageX.listen(_innerListen);
119119

120120
// The socket API guarantees that only a single error event will be emitted,
121121
// and that once it is no other events will be emitted.
122-
innerWebSocket.onClose.first.then((event) {
122+
innerWebSocket.onCloseX.first.then((event) {
123123
_closeCode = event.code;
124124
_closeReason = event.reason;
125125
_controller.local.sink.close();

pkgs/web_socket_channel/lib/src/web_helpers.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import 'package:web/helpers.dart';
77
// TODO(kevmoo): remove when https://github.com/dart-lang/web/commit/4cb5811ed06
88
// is in a published release and the min constraint on pkg:web is updated
99
extension WebSocketEvents on WebSocket {
10-
Stream<Event> get onOpen => EventStreamProviders.openEvent.forTarget(this);
11-
Stream<MessageEvent> get onMessage =>
10+
Stream<Event> get onOpenX => EventStreamProviders.openEvent.forTarget(this);
11+
Stream<MessageEvent> get onMessageX =>
1212
EventStreamProviders.messageEvent.forTarget(this);
13-
Stream<CloseEvent> get onClose =>
13+
Stream<CloseEvent> get onCloseX =>
1414
EventStreamProviders.closeEvent.forTarget(this);
15-
Stream<Event> get onError =>
15+
Stream<Event> get onErrorX =>
1616
EventStreamProviders.errorEventSourceEvent.forTarget(this);
1717
}

pkgs/web_socket_channel/test/html_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void main() {
7070

7171
test('communicates using an existing open WebSocket', () async {
7272
final webSocket = WebSocket('ws://localhost:$port');
73-
await webSocket.onOpen.first;
73+
await webSocket.onOpenX.first;
7474

7575
final channel = HtmlWebSocketChannel(webSocket);
7676

0 commit comments

Comments
 (0)