* Fix RPC examples

Author: lukebakken

dotnet/RPCClient/RPCClient.cs

@@ -58,14 +58,18 @@ public async Task<string> CallAsync(string message,
             throw new InvalidOperationException();
         }
 
-        var props = new BasicProperties();
-        var correlationId = Guid.NewGuid().ToString();
-        props.CorrelationId = correlationId;
-        props.ReplyTo = _replyQueueName;
-        var messageBytes = Encoding.UTF8.GetBytes(message);
-        var tcs = new TaskCompletionSource<string>();
+        string correlationId = Guid.NewGuid().ToString();
+        var props = new BasicProperties
+        {
+            CorrelationId = correlationId,
+            ReplyTo = _replyQueueName
+        };
+
+        var tcs = new TaskCompletionSource<string>(
+                TaskCreationOptions.RunContinuationsAsynchronously);
         _callbackMapper.TryAdd(correlationId, tcs);
 
+        var messageBytes = Encoding.UTF8.GetBytes(message);
         await _channel.BasicPublishAsync(exchange: string.Empty, routingKey: QUEUE_NAME,
             mandatory: true, basicProperties: props, body: messageBytes);
 

dotnet/RPCServer/RPCServer.cs

@@ -2,22 +2,22 @@
 using RabbitMQ.Client.Events;
 using System.Text;
 
+const string QUEUE_NAME = "rpc_queue";
+
 var factory = new ConnectionFactory { HostName = "localhost" };
 using var connection = await factory.CreateConnectionAsync();
 using var channel = await connection.CreateChannelAsync();
 
-await channel.QueueDeclareAsync(queue: "rpc_queue", durable: false, exclusive: false,
+await channel.QueueDeclareAsync(queue: QUEUE_NAME, durable: false, exclusive: false,
     autoDelete: false, arguments: null);
 
 await channel.BasicQosAsync(prefetchSize: 0, prefetchCount: 1, global: false);
 
 var consumer = new AsyncEventingBasicConsumer(channel);
-await channel.BasicConsumeAsync("rpc_queue", false, consumer);
-Console.WriteLine(" [x] Awaiting RPC requests");
-
 consumer.Received += async (object sender, BasicDeliverEventArgs ea) =>
 {
-    IChannel ch = (IChannel)sender;
+    AsyncEventingBasicConsumer cons = (AsyncEventingBasicConsumer)sender;
+    IChannel ch = cons.Channel;
     string response = string.Empty;
 
     byte[] body = ea.Body.ToArray();
@@ -48,6 +48,8 @@ await ch.BasicPublishAsync(exchange: string.Empty, routingKey: props.ReplyTo!,
     }
 };
 
+await channel.BasicConsumeAsync(QUEUE_NAME, false, consumer);
+Console.WriteLine(" [x] Awaiting RPC requests");
 Console.WriteLine(" Press [enter] to exit.");
 Console.ReadLine();