feat: tsc 添加服务依赖接口

src/BuildingBlocks/Tsc/Masa.BuildingBlocks.StackSdk.Tsc/Model/ServiceTopologiesDto.cs

@@ -0,0 +1,8 @@
+namespace Masa.BuildingBlocks.StackSdks.Tsc.Model;
+
+public class ServiceTopologiesDto
+{
+    public string Service { get; set; } = default!;
+
+    public IEnumerable<string> Servers { get; set; } = default!;
+}

src/BuildingBlocks/Tsc/Masa.BuildingBlocks.StackSdk.Tsc/Service/ITopologyService.cs

@@ -0,0 +1,6 @@
+namespace Masa.BuildingBlocks.StackSdks.Tsc.Service;
+
+public interface ITopologyService
+{
+    public Task<IEnumerable<ServiceTopologiesDto>> GetServicesAsync(string? service = default);
+}

src/Contrib.Wasm/Masa.Contrib.StackSdks.Auth.Wasm/Service/DynamicRoleService.cs

@@ -47,6 +47,6 @@ public async Task DeleteAsync(Guid id)
     public Task<List<DynamicRoleModel>> HasAsync(params Guid[] roleIds)
     {
         var requestUri = $"{_party}/has";
-        return _caller.PostAsync<List<DynamicRoleModel>>(requestUri, new { roleIds });
+        return _caller.PostAsync<List<DynamicRoleModel>>(requestUri, new { roleIds })!;
     }
 }

src/Contrib.Wasm/Masa.Contrib.StackSdks.Config.Wasm/ServiceCollectionExtensions.cs

@@ -40,14 +40,14 @@ private static Dictionary<string, string> GetConfigMap(IConfiguration configurat
     {
         var configs = new Dictionary<string, string>()
         {
-            { MasaStackConfigConstant.VERSION, configuration.GetValue<string>(MasaStackConfigConstant.VERSION) },
+            { MasaStackConfigConstant.VERSION, configuration.GetValue<string>(MasaStackConfigConstant.VERSION)! },
             { MasaStackConfigConstant.IS_DEMO, configuration.GetValue<bool>(MasaStackConfigConstant.IS_DEMO).ToString() },
-            { MasaStackConfigConstant.DOMAIN_NAME, configuration.GetValue<string>(MasaStackConfigConstant.DOMAIN_NAME) },
-            { MasaStackConfigConstant.NAMESPACE, configuration.GetValue<string>(MasaStackConfigConstant.NAMESPACE) },
-            { MasaStackConfigConstant.CLUSTER, configuration.GetValue<string>(MasaStackConfigConstant.CLUSTER) },
-            { MasaStackConfigConstant.OTLP_URL, configuration.GetValue<string>(MasaStackConfigConstant.OTLP_URL) },
-            { MasaStackConfigConstant.MASA_STACK, configuration.GetValue<string>(MasaStackConfigConstant.MASA_STACK) },
-            { MasaStackConfigConstant.ENVIRONMENT, configuration.GetValue<string>(MasaStackConfigConstant.ENVIRONMENT) }
+            { MasaStackConfigConstant.DOMAIN_NAME, configuration.GetValue<string>(MasaStackConfigConstant.DOMAIN_NAME)! },
+            { MasaStackConfigConstant.NAMESPACE, configuration.GetValue<string>(MasaStackConfigConstant.NAMESPACE)! },
+            { MasaStackConfigConstant.CLUSTER, configuration.GetValue<string>(MasaStackConfigConstant.CLUSTER)! },
+            { MasaStackConfigConstant.OTLP_URL, configuration.GetValue<string>(MasaStackConfigConstant.OTLP_URL)! },
+            { MasaStackConfigConstant.MASA_STACK, configuration.GetValue<string>(MasaStackConfigConstant.MASA_STACK)! },
+            { MasaStackConfigConstant.ENVIRONMENT, configuration.GetValue<string>(MasaStackConfigConstant.ENVIRONMENT)! }
         };
         return configs;
     }

src/Contrib.Wasm/Masa.Contrib.StackSdks.Tsc.Wasm/Service/TopologyService.cs

@@ -0,0 +1,16 @@
+namespace Masa.Contrib.StackSdks.Tsc.Service;
+
+internal class TopologyService : ITopologyService
+{
+    readonly ICaller _caller;
+
+    public TopologyService(ICaller caller)
+    {
+        _caller = caller;
+    }
+
+    public Task<IEnumerable<ServiceTopologiesDto>> GetServicesAsync(string? service = null)
+    {
+        return _caller.GetAsync<IEnumerable<ServiceTopologiesDto>>("api/topology/services", new { service })!;
+    }
+}

src/Contrib.Wasm/Masa.Contrib.StackSdks.Tsc.Wasm/TscClient.cs

@@ -6,12 +6,13 @@ namespace Masa.Contrib.StackSdks.Tsc;
 
 internal class TscClient : ITscClient
 {
-    public TscClient(ICaller caller)
+    internal TscClient(ICaller caller)
     {
         LogService = new LogService(caller);
         MetricService = new MetricService(caller);
         TraceService = new TraceService(caller);
         ApmService = new ApmService(caller);
+        TopologyService = new TopologyService(caller);
     }
 
     public ILogService LogService { get; }
@@ -21,4 +22,6 @@ public TscClient(ICaller caller)
     public ITraceService TraceService { get; }
 
     public IApmService ApmService { get; }
+
+    public ITopologyService TopologyService { get; }
 }

src/Contrib/Masa.Contrib.StackSdks.Auth/Service/DynamicRoleService.cs

@@ -47,6 +47,6 @@ public async Task DeleteAsync(Guid id)
     public Task<List<DynamicRoleModel>> HasAsync(params Guid[] roleIds)
     {
         var requestUri = $"{_party}/has";
-        return _caller.PostAsync<List<DynamicRoleModel>>(requestUri, new { roleIds });
+        return _caller.PostAsync<List<DynamicRoleModel>>(requestUri, new { roleIds })!;
     }
 }

src/Contrib/Masa.Contrib.StackSdks.Tsc/Service/TopologyService.cs

@@ -0,0 +1,16 @@
+namespace Masa.Contrib.StackSdks.Tsc.Service;
+
+internal class TopologyService : ITopologyService
+{
+    readonly ICaller _caller;
+
+    public TopologyService(ICaller caller)
+    {
+        _caller = caller;
+    }
+
+    public Task<IEnumerable<ServiceTopologiesDto>> GetServicesAsync(string? service = null)
+    {
+        return _caller.GetAsync<IEnumerable<ServiceTopologiesDto>>("api/topology/services", new { service })!;
+    }
+}

src/Contrib/Masa.Contrib.StackSdks.Tsc/TscClient.cs

@@ -6,12 +6,13 @@ namespace Masa.Contrib.StackSdks.Tsc;
 
 internal class TscClient : ITscClient
 {
-    public TscClient(ICaller caller)
+    internal TscClient(ICaller caller)
     {
         LogService = new LogService(caller);
         MetricService = new MetricService(caller);
         TraceService = new TraceService(caller);
         ApmService = new ApmService(caller);
+        TopologyService = new TopologyService(caller);
     }
 
     public ILogService LogService { get; }
@@ -21,4 +22,6 @@ public TscClient(ICaller caller)
     public ITraceService TraceService { get; }
 
     public IApmService ApmService { get; }
-}
+
+    public ITopologyService TopologyService { get; }
+}

src/Contrib/Tests/Masa.Contrib.StackSdks.Config.Tests/MasaStackConfigTest.cs

@@ -19,21 +19,21 @@ public void Initialize()
         var configuration = builder.Configuration.AddJsonFile("appsettings.json", true, true).Build();
         _config = new Dictionary<string, string>()
         {
-            { MasaStackConfigConstant.VERSION, configuration.GetValue<string>(MasaStackConfigConstant.VERSION) },
+            { MasaStackConfigConstant.VERSION, configuration.GetValue<string>(MasaStackConfigConstant.VERSION)! },
             { MasaStackConfigConstant.IS_DEMO, configuration.GetValue<bool>(MasaStackConfigConstant.IS_DEMO).ToString() },
-            { MasaStackConfigConstant.DOMAIN_NAME, configuration.GetValue<string>(MasaStackConfigConstant.DOMAIN_NAME) },
-            { MasaStackConfigConstant.NAMESPACE, configuration.GetValue<string>(MasaStackConfigConstant.NAMESPACE) },
-            { MasaStackConfigConstant.CLUSTER, configuration.GetValue<string>(MasaStackConfigConstant.CLUSTER) },
-            { MasaStackConfigConstant.OTLP_URL, configuration.GetValue<string>(MasaStackConfigConstant.OTLP_URL) },
-            { MasaStackConfigConstant.REDIS, configuration.GetValue<string>(MasaStackConfigConstant.REDIS) },
-            { MasaStackConfigConstant.CONNECTIONSTRING, configuration.GetValue<string>(MasaStackConfigConstant.CONNECTIONSTRING) },
-            { MasaStackConfigConstant.MASA_STACK, configuration.GetValue<string>(MasaStackConfigConstant.MASA_STACK) },
-            { MasaStackConfigConstant.ELASTIC, configuration.GetValue<string>(MasaStackConfigConstant.ELASTIC) },
-            { MasaStackConfigConstant.ENVIRONMENT, configuration.GetValue<string>(MasaStackConfigConstant.ENVIRONMENT) },
-            { MasaStackConfigConstant.ADMIN_PWD, configuration.GetValue<string>(MasaStackConfigConstant.ADMIN_PWD) },
-            { MasaStackConfigConstant.DCC_SECRET, configuration.GetValue<string>(MasaStackConfigConstant.DCC_SECRET) },
-            { MasaStackConfigConstant.DCC_STORE_NAME, configuration.GetValue<string>(MasaStackConfigConstant.DCC_STORE_NAME) },
-            { MasaStackConfigConstant.SUFFIX_IDENTITY, configuration.GetValue<string>(MasaStackConfigConstant.SUFFIX_IDENTITY) }
+            { MasaStackConfigConstant.DOMAIN_NAME, configuration.GetValue<string>(MasaStackConfigConstant.DOMAIN_NAME)! },
+            { MasaStackConfigConstant.NAMESPACE, configuration.GetValue<string>(MasaStackConfigConstant.NAMESPACE)! },
+            { MasaStackConfigConstant.CLUSTER, configuration.GetValue<string>(MasaStackConfigConstant.CLUSTER)! },
+            { MasaStackConfigConstant.OTLP_URL, configuration.GetValue<string>(MasaStackConfigConstant.OTLP_URL)! },
+            { MasaStackConfigConstant.REDIS, configuration.GetValue<string>(MasaStackConfigConstant.REDIS)! },
+            { MasaStackConfigConstant.CONNECTIONSTRING, configuration.GetValue<string>(MasaStackConfigConstant.CONNECTIONSTRING)! },
+            { MasaStackConfigConstant.MASA_STACK, configuration.GetValue<string>(MasaStackConfigConstant.MASA_STACK)! },
+            { MasaStackConfigConstant.ELASTIC, configuration.GetValue<string>(MasaStackConfigConstant.ELASTIC)! },
+            { MasaStackConfigConstant.ENVIRONMENT, configuration.GetValue<string>(MasaStackConfigConstant.ENVIRONMENT)! },
+            { MasaStackConfigConstant.ADMIN_PWD, configuration.GetValue<string>(MasaStackConfigConstant.ADMIN_PWD)! },
+            { MasaStackConfigConstant.DCC_SECRET, configuration.GetValue<string>(MasaStackConfigConstant.DCC_SECRET)! },
+            { MasaStackConfigConstant.DCC_STORE_NAME, configuration.GetValue<string>(MasaStackConfigConstant.DCC_STORE_NAME)! },
+            { MasaStackConfigConstant.SUFFIX_IDENTITY, configuration.GetValue<string>(MasaStackConfigConstant.SUFFIX_IDENTITY)! }
         };
 
         Mock<IConfigurationApiClient> dccClient = new();
@@ -235,6 +235,6 @@ public void TestHasAlert()
     {
         var result = _stackConfig.HasAlert();
 
-        Assert.AreEqual(true, result);
+        Assert.IsTrue(result);
     }
 }

src/Contrib/Tests/Masa.Contrib.StackSdks.Tsc.OpenTelemetry.Tests/Extensions/ServiceExtensionsTests.cs

@@ -29,8 +29,7 @@ public void FuncTest()
             {
                 ServiceName = "test-app"
             }, () => ObservableHelper.OTLPURL, true);
-        });
-        Assert.IsTrue(true);
+        });        
     }
 
     [TestMethod]
@@ -42,7 +41,6 @@ public void OptionsTest()
             {
                 ServiceName = "test-app"
             }, ObservableHelper.OTLPURL, true);
-        });
-        Assert.IsTrue(true);
+        });        
     }
 }