@@ -151,18 +151,17 @@ public DdpConnection(string url) {
151
151
ws . OnMessage += OnWebSocketMessage ;
152
152
}
153
153
154
- private async void OnWebSocketOpen ( )
154
+ public void OnWebSocketOpen ( )
155
155
{
156
156
OnDebugMessage ? . Invoke ( "Websocket open" ) ;
157
- await SendAsync ( GetConnectMessage ( ) ) ;
158
-
157
+ Send ( GetConnectMessage ( ) ) ;
159
158
foreach ( Subscription subscription in subscriptions . Values )
160
159
{
161
- await SendAsync ( GetSubscriptionMessage ( subscription ) ) ;
160
+ Send ( GetSubscriptionMessage ( subscription ) ) ;
162
161
}
163
162
foreach ( MethodCall methodCall in methodCalls . Values )
164
163
{
165
- await SendAsync ( GetMethodCallMessage ( methodCall ) ) ;
164
+ Send ( GetMethodCallMessage ( methodCall ) ) ;
166
165
}
167
166
}
168
167
@@ -188,13 +187,13 @@ private void OnWebSocketClose(bool wasClean) {
188
187
}
189
188
190
189
// TODO: return Task instead of void
191
- private async void OnWebSocketMessage ( string data ) {
190
+ private void OnWebSocketMessage ( string data ) {
192
191
if ( logMessages ) OnDebugMessage ? . Invoke ( "OnMessage: " + data ) ;
193
192
JSONObject message = new JSONObject ( data ) ;
194
- await HandleMessage ( message ) ;
193
+ HandleMessage ( message ) ;
195
194
}
196
195
197
- private async Task HandleMessage ( JSONObject message ) {
196
+ private void HandleMessage ( JSONObject message ) {
198
197
if ( ! message . HasField ( Field . MSG ) ) {
199
198
// Silently ignore those messages.
200
199
return ;
@@ -215,16 +214,16 @@ private async Task HandleMessage(JSONObject message) {
215
214
reason = "The server is using an unsupported DDP protocol version: " +
216
215
message [ Field . VERSION ]
217
216
} ) ;
218
- await CloseAsync ( ) ;
217
+ Close ( ) ;
219
218
break ;
220
219
}
221
220
222
221
case MessageType . PING : {
223
222
if ( message . HasField ( Field . ID ) ) {
224
- await SendAsync ( GetPongMessage ( message [ Field . ID ] . str ) ) ;
223
+ Send ( GetPongMessage ( message [ Field . ID ] . str ) ) ;
225
224
}
226
225
else {
227
- await SendAsync ( GetPongMessage ( ) ) ;
226
+ Send ( GetPongMessage ( ) ) ;
228
227
}
229
228
break ;
230
229
}
@@ -462,9 +461,10 @@ void Dispose() {
462
461
}
463
462
464
463
// send message without waiting for its result
465
- async void Send ( string message )
464
+ void Send ( string message )
466
465
{
467
- await SendAsync ( message ) ;
466
+ Task t = SendAsync ( message ) ;
467
+ t . Wait ( ) ;
468
468
}
469
469
470
470
public Subscription Subscribe ( string name , params JSONObject [ ] items )
0 commit comments