Skip to content
This repository was archived by the owner on Feb 20, 2022. It is now read-only.

Commit 6f4e40c

Browse files
committed
do not use await if not needed
1 parent 938b1e9 commit 6f4e40c

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

unity-project/Assets/Moulin/DDP/ddp/DdpConnection.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,17 @@ public DdpConnection(string url) {
151151
ws.OnMessage += OnWebSocketMessage;
152152
}
153153

154-
private async void OnWebSocketOpen()
154+
public void OnWebSocketOpen()
155155
{
156156
OnDebugMessage?.Invoke("Websocket open");
157-
await SendAsync(GetConnectMessage());
158-
157+
Send(GetConnectMessage());
159158
foreach (Subscription subscription in subscriptions.Values)
160159
{
161-
await SendAsync(GetSubscriptionMessage(subscription));
160+
Send(GetSubscriptionMessage(subscription));
162161
}
163162
foreach (MethodCall methodCall in methodCalls.Values)
164163
{
165-
await SendAsync(GetMethodCallMessage(methodCall));
164+
Send(GetMethodCallMessage(methodCall));
166165
}
167166
}
168167

@@ -188,13 +187,13 @@ private void OnWebSocketClose(bool wasClean) {
188187
}
189188

190189
// TODO: return Task instead of void
191-
private async void OnWebSocketMessage(string data) {
190+
private void OnWebSocketMessage(string data) {
192191
if (logMessages) OnDebugMessage?.Invoke("OnMessage: " + data);
193192
JSONObject message = new JSONObject(data);
194-
await HandleMessage(message);
193+
HandleMessage(message);
195194
}
196195

197-
private async Task HandleMessage(JSONObject message) {
196+
private void HandleMessage(JSONObject message) {
198197
if (!message.HasField(Field.MSG)) {
199198
// Silently ignore those messages.
200199
return;
@@ -215,16 +214,16 @@ private async Task HandleMessage(JSONObject message) {
215214
reason = "The server is using an unsupported DDP protocol version: " +
216215
message[Field.VERSION]
217216
});
218-
await CloseAsync();
217+
Close();
219218
break;
220219
}
221220

222221
case MessageType.PING: {
223222
if (message.HasField(Field.ID)) {
224-
await SendAsync(GetPongMessage(message[Field.ID].str));
223+
Send(GetPongMessage(message[Field.ID].str));
225224
}
226225
else {
227-
await SendAsync(GetPongMessage());
226+
Send(GetPongMessage());
228227
}
229228
break;
230229
}
@@ -462,9 +461,10 @@ void Dispose() {
462461
}
463462

464463
// send message without waiting for its result
465-
async void Send(string message)
464+
void Send(string message)
466465
{
467-
await SendAsync(message);
466+
Task t = SendAsync(message);
467+
t.Wait();
468468
}
469469

470470
public Subscription Subscribe(string name, params JSONObject[] items)

0 commit comments

Comments
 (0)