chore(messaging): Added Publish-, Subscribe- and UnsubscribeResponse …

…types on both .NET and Typescript side, fixed DesktopAgent ModuleNotFound exception when removing module from the dictionary -running the chart and grid example.

src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Fdc3DesktopAgent.cs

@@ -695,10 +695,17 @@ private Dictionary<string, AppIntent> GetAppIntentsFromIntentMetadaCollection(
 
     private Task RemoveModuleAsync(IModuleInstance instance)
     {
-        var fdc3InstanceId = GetFdc3InstanceId(instance);
-        if (!_runningModules.TryRemove(new(fdc3InstanceId), out _))
+        try
+        {
+            var fdc3InstanceId = GetFdc3InstanceId(instance);
+            if (!_runningModules.TryRemove(new(fdc3InstanceId), out _))
+            {
+                _logger.LogError($"Could not remove the closed window with instanceId: {fdc3InstanceId}.");
+            }
+        }
+        catch (Fdc3DesktopAgentException exception)
         {
-            _logger.LogError($"Could not remove the closed window with instanceId: {fdc3InstanceId}.");
+            _logger.LogError(exception, $"Exception thrown while removing module: {instance.Manifest.Id}, {instance.Manifest.Name} from running instances in FDC3DesktopAgent.");
         }
 
         return Task.CompletedTask;

src/messaging/dotnet/examples/TestServer/Program.cs

@@ -3,7 +3,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using MorganStanley.ComposeUI.Messaging.Server.WebSocket;
 
 namespace TestServer;
 

src/messaging/dotnet/src/Client/Client/MessageRouterClient.cs

@@ -67,17 +67,18 @@ public ValueTask<IAsyncDisposable> SubscribeAsync(
         return SubscribeAsyncCore(GetTopic(topic), subscriber, cancellationToken);
     }
 
-    public ValueTask PublishAsync(
+    public async ValueTask PublishAsync(
         string topic,
         MessageBuffer? payload = null,
         PublishOptions options = default,
         CancellationToken cancellationToken = default)
     {
         Protocol.Topic.Validate(topic);
 
-        return SendMessageAsync(
+        await SendRequestAsync(
             new PublishMessage
             {
+                RequestId = GenerateRequestId(),
                 Topic = topic,
                 Payload = payload,
                 CorrelationId = options.CorrelationId
@@ -616,9 +617,10 @@ private async ValueTask<IAsyncDisposable> SubscribeAsyncCore(
 
         try
         {
-            await SendMessageAsync(
+            await SendRequestAsync(
                 new SubscribeMessage
                 {
+                    RequestId = GenerateRequestId(),
                     Topic = topic.Name
                 },
                 cancellationToken);
@@ -797,11 +799,21 @@ async Task CloseTopics()
         }
     }
 
-    private ValueTask TryUnsubscribe(Topic topic)
+    private async ValueTask TryUnsubscribe(Topic topic)
     {
-        return topic.CanUnsubscribe
-            ? SendMessageAsync(new UnsubscribeMessage {Topic = topic.Name}, CancellationToken.None)
-            : default;
+        var requestId = GenerateRequestId();
+
+        try
+        {
+            if (topic.CanUnsubscribe)
+            {
+                await SendRequestAsync(new UnsubscribeMessage { RequestId = requestId, Topic = topic.Name }, CancellationToken.None);
+            }
+        }
+        catch (MessageRouterException exception)
+        {
+            _logger.LogWarning(exception, $"Exception thrown while unsubscribing, topic: {topic.Name}, request id: {requestId}.");
+        }
     }
 
     private void OnConnectStart()

src/messaging/dotnet/src/Core/Protocol/Messages/Message.cs

@@ -28,8 +28,11 @@ public static Type ResolveMessageType(MessageType messageType)
             MessageType.Connect => typeof(ConnectRequest),
             MessageType.ConnectResponse => typeof(ConnectResponse),
             MessageType.Subscribe => typeof(SubscribeMessage),
+            MessageType.SubscribeResponse => typeof(SubscribeResponse),
             MessageType.Unsubscribe => typeof(UnsubscribeMessage),
+            MessageType.UnsubscribeResponse => typeof(UnsubscribeResponse),
             MessageType.Publish => typeof(PublishMessage),
+            MessageType.PublishResponse => typeof(PublishResponse),
             MessageType.Topic => typeof(TopicMessage),
             MessageType.Invoke => typeof(InvokeRequest),
             MessageType.RegisterService => typeof(RegisterServiceRequest),

src/messaging/dotnet/src/Core/Protocol/Messages/MessageType.cs

@@ -29,21 +29,30 @@ public enum MessageType : int
     /// </summary>
     Subscribe,
 
-    // TODO: SubscribeResponse
+    /// <summary>
+    ///     Server confirms that the client subscribed.
+    /// </summary>
+    SubscribeResponse,
 
     /// <summary>
     ///     Client unsubscribes from a topic.
     /// </summary>
     Unsubscribe,
 
-    // TODO: UnsubscribeResponse
+    /// <summary>
+    ///     Server confirms that the client unsubscribed.
+    /// </summary>
+    UnsubscribeResponse,
 
     /// <summary>
     ///     Client publishes a message to a topic.
     /// </summary>
     Publish,
 
-    // TODO: PublishResponse
+    /// <summary>
+    ///     Server confirms that the message was published to a topic by the client.
+    /// </summary>
+    PublishResponse,
 
     /// <summary>
     ///     Server notifies client of a message from a subscribed topic.

src/messaging/dotnet/src/Core/Protocol/Messages/PublishMessage.cs

@@ -12,7 +12,7 @@
 
 namespace MorganStanley.ComposeUI.Messaging.Protocol.Messages;
 
-public sealed class PublishMessage : Message
+public sealed class PublishMessage : AbstractRequest<PublishResponse>
 {
     public override MessageType Type => MessageType.Publish;
     public string Topic { get; init; } = null!;

src/messaging/dotnet/src/Core/Protocol/Messages/PublishResponse.cs

@@ -0,0 +1,18 @@
+// Morgan Stanley makes this available to you under the Apache License,
+// Version 2.0 (the "License"). You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0.
+// 
+// See the NOTICE file distributed with this work for additional information
+// regarding copyright ownership. Unless required by applicable law or agreed
+// to in writing, software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+// or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+
+namespace MorganStanley.ComposeUI.Messaging.Protocol.Messages;
+
+public class PublishResponse : AbstractResponse
+{
+    public override MessageType Type => MessageType.PublishResponse;
+}

src/messaging/dotnet/src/Core/Protocol/Messages/SubscribeMessage.cs

@@ -12,7 +12,7 @@
 
 namespace MorganStanley.ComposeUI.Messaging.Protocol.Messages;
 
-public sealed class SubscribeMessage : Message
+public sealed class SubscribeMessage : AbstractRequest<SubscribeResponse> 
 {
     public override MessageType Type => MessageType.Subscribe;
     public string Topic { get; init; } = null!;

src/messaging/dotnet/src/Core/Protocol/Messages/SubscribeResponse.cs

@@ -0,0 +1,18 @@
+// Morgan Stanley makes this available to you under the Apache License,
+// Version 2.0 (the "License"). You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0.
+// 
+// See the NOTICE file distributed with this work for additional information
+// regarding copyright ownership. Unless required by applicable law or agreed
+// to in writing, software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+// or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+
+namespace MorganStanley.ComposeUI.Messaging.Protocol.Messages;
+
+public class SubscribeResponse : AbstractResponse
+{
+    public override MessageType Type => MessageType.SubscribeResponse;
+}

src/messaging/dotnet/src/Core/Protocol/Messages/UnsubscribeMessage.cs

@@ -12,7 +12,7 @@
 
 namespace MorganStanley.ComposeUI.Messaging.Protocol.Messages;
 
-public sealed class UnsubscribeMessage : Message
+public sealed class UnsubscribeMessage : AbstractRequest<UnsubscribeResponse>
 {
     public override MessageType Type => MessageType.Unsubscribe;
     public string Topic { get; init; } = null!;

src/messaging/dotnet/src/Core/Protocol/Messages/UnsubscribeResponse.cs

@@ -0,0 +1,18 @@
+// Morgan Stanley makes this available to you under the Apache License,
+// Version 2.0 (the "License"). You may obtain a copy of the License at
+// 
+//      http://www.apache.org/licenses/LICENSE-2.0.
+// 
+// See the NOTICE file distributed with this work for additional information
+// regarding copyright ownership. Unless required by applicable law or agreed
+// to in writing, software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+// or implied. See the License for the specific language governing permissions
+// and limitations under the License.
+
+namespace MorganStanley.ComposeUI.Messaging.Protocol.Messages;
+
+public class UnsubscribeResponse : AbstractResponse
+{
+    public override MessageType Type => MessageType.UnsubscribeResponse;
+}

src/messaging/dotnet/src/Server/MorganStanley.ComposeUI.Messaging.Server.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net6.0</TargetFramework>
@@ -22,7 +22,6 @@
 
 	<ItemGroup>
 	  <ProjectReference Include="../Core/MorganStanley.ComposeUI.Messaging.Core.csproj" />
-	  <ProjectReference Include="..\..\..\..\module-loader\dotnet\src\MorganStanley.ComposeUI.ModuleLoader.Abstractions\MorganStanley.ComposeUI.ModuleLoader.Abstractions.csproj" />
 	</ItemGroup>
 
 </Project>