🐛 Fix aspire local dev issue

2025-09-21 17:25:43 +08:00
parent 4d83c2de31
commit a88843a4c2
9 changed files with 38 additions and 30 deletions
--- a/DysonNetwork.Control/AppHost.cs
+++ b/DysonNetwork.Control/AppHost.cs
@@ -1,7 +1,12 @@
+using System.Net;
+using System.Net.Sockets;
 using Aspire.Hosting.Yarp.Transforms;
+using Microsoft.Extensions.Hosting;

 var builder = DistributedApplication.CreateBuilder(args);

+var isDev = builder.Environment.IsDevelopment();
+
 // Database was configured separately in each service.
 // var database = builder.AddPostgres("database");

@@ -9,42 +14,55 @@ var cache = builder.AddRedis("cache");
 var queue = builder.AddNats("queue").WithJetStream();

 var ringService = builder.AddProject<Projects.DysonNetwork_Ring>("ring")
-    .WithReference(queue)
-    .WithHttpHealthCheck()
-    .WithEndpoint(5001, 5001, "https", name: "grpc");
+    .WithReference(queue);
 var passService = builder.AddProject<Projects.DysonNetwork_Pass>("pass")
    .WithReference(cache)
    .WithReference(queue)
-    .WithReference(ringService)
-    .WithHttpHealthCheck()
-    .WithEndpoint(5001, 5001, "https", name: "grpc");
+    .WithReference(ringService);
 var driveService = builder.AddProject<Projects.DysonNetwork_Drive>("drive")
    .WithReference(cache)
    .WithReference(queue)
    .WithReference(passService)
-    .WithReference(ringService)
-    .WithHttpHealthCheck()
-    .WithEndpoint(5001, 5001, "https", name: "grpc");
+    .WithReference(ringService);
 var sphereService = builder.AddProject<Projects.DysonNetwork_Sphere>("sphere")
    .WithReference(cache)
    .WithReference(queue)
    .WithReference(passService)
    .WithReference(ringService)
-    .WithReference(driveService)
-    .WithHttpHealthCheck()
-    .WithEndpoint(5001, 5001, "https", name: "grpc");
+    .WithReference(driveService);
 var developService = builder.AddProject<Projects.DysonNetwork_Develop>("develop")
    .WithReference(cache)
    .WithReference(passService)
-    .WithReference(ringService)
-    .WithHttpHealthCheck()
-    .WithEndpoint(5001, 5001, "https", name: "grpc");
+    .WithReference(ringService);
+
+List<IResourceBuilder<ProjectResource>> services =
+    [ringService, passService, driveService, sphereService, developService];
+
+for (var idx = 0; idx < services.Count; idx++)
+{
+    var service = services[idx];
+    var grpcPort = 7002 + idx;
+
+    if (isDev)
+    {
+        service.WithEnvironment("GRPC_PORT", grpcPort.ToString());
+
+        var httpPort = 8001 + idx;
+        service.WithEnvironment("HTTP_PORTS", httpPort.ToString());
+        service.WithHttpEndpoint(httpPort, targetPort: null, isProxied: false, name: "http");
+    }
+    else
+    {
+        service.WithHttpEndpoint(8080, targetPort: null, isProxied: false, name: "http");
+    }
+
+    service.WithEndpoint(isDev ? grpcPort : 7001, isDev ? null : 7001, "https", name: "grpc", isProxied: false);
+}

 // Extra double-ended references
 ringService.WithReference(passService);

 builder.AddYarp("gateway")
-    .WithHostPort(5000)
    .WithConfiguration(yarp =>
    {
        var ringCluster = yarp.AddCluster(ringService.GetEndpoint("http"));
@@ -75,4 +93,4 @@ builder.AddYarp("gateway")

 builder.AddDockerComposeEnvironment("docker-compose");

-builder.Build().Run();
+builder.Build().Run();
--- a/DysonNetwork.Develop/Properties/launchSettings.json
+++ b/DysonNetwork.Develop/Properties/launchSettings.json
@@ -5,7 +5,6 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": false,
-      "applicationUrl": "http://localhost:5156",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
@@ -14,7 +13,6 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": false,
-      "applicationUrl": "https://localhost:7192;http://localhost:5156",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/DysonNetwork.Drive/Properties/launchSettings.json
+++ b/DysonNetwork.Drive/Properties/launchSettings.json
@@ -5,7 +5,6 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": false,
-      "applicationUrl": "http://localhost:5090",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
@@ -14,7 +13,6 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": false,
-      "applicationUrl": "https://localhost:7092;http://localhost:5090",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/DysonNetwork.Pass/Properties/launchSettings.json
+++ b/DysonNetwork.Pass/Properties/launchSettings.json
@@ -5,7 +5,6 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": false,
-      "applicationUrl": "http://localhost:5216",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
@@ -14,7 +13,6 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": false,
-      "applicationUrl": "https://localhost:7058;http://localhost:5216",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/DysonNetwork.Ring/DysonNetwork.Ring.csproj
+++ b/DysonNetwork.Ring/DysonNetwork.Ring.csproj
@@ -5,7 +5,7 @@
        <Nullable>enable</Nullable>
        <ImplicitUsings>enable</ImplicitUsings>
        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <RootNamespace>DysonNetwork.Pusher</RootNamespace>
+        <RootNamespace>DysonNetwork.Ring</RootNamespace>
    </PropertyGroup>

    <ItemGroup>
--- a/DysonNetwork.Ring/Properties/launchSettings.json
+++ b/DysonNetwork.Ring/Properties/launchSettings.json
@@ -5,7 +5,6 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": false,
-      "applicationUrl": "http://localhost:5212",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
@@ -14,7 +13,6 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": false,
-      "applicationUrl": "https://localhost:7259;http://localhost:5212",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/DysonNetwork.Shared/Http/KestrelConfiguration.cs
+++ b/DysonNetwork.Shared/Http/KestrelConfiguration.cs
@@ -16,7 +16,6 @@ public static class KestrelConfiguration
        long maxRequestBodySize = 50 * 1024 * 1024
    )
    {
-        builder.Host.UseContentRoot(Directory.GetCurrentDirectory());
        builder.WebHost.ConfigureKestrel(options =>
        {
            options.Limits.MaxRequestBodySize = maxRequestBodySize;
@@ -31,7 +30,7 @@ public static class KestrelConfiguration
                listenOptions.UseHttps(selfSignedCert);
            });

-            var httpPorts = configuration.GetValue<string>("HTTP_PORTS", "5000")
+            var httpPorts = configuration.GetValue<string>("HTTP_PORTS", "6000")
                .Split(',', StringSplitOptions.RemoveEmptyEntries)
                .Select(p => int.Parse(p.Trim()))
                .ToArray();
--- a/DysonNetwork.Sphere/Properties/launchSettings.json
+++ b/DysonNetwork.Sphere/Properties/launchSettings.json
@@ -5,7 +5,6 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": false,
-      "applicationUrl": "http://localhost:5071",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
@@ -14,7 +13,6 @@
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": false,
-      "applicationUrl": "https://localhost:7099;http://localhost:5071",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/DysonNetwork.sln.DotSettings.user
+++ b/DysonNetwork.sln.DotSettings.user
@@ -32,6 +32,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADateTime_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe6898c1ddf974e16b95b114722270029e55000_003Fd6_003Fd0d63431_003FDateTime_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADbContext_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fa0b45f29f34f594814a7b1fbc25fe5ef3c18257956ed4f4fbfa68717db58_003FDbContext_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADbFunctionsExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fc1c46ed28c61e1caa79185e4375a8ae7cd11cd5ba8853dcb37577f93f2ca8d5_003FDbFunctionsExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADefaultInterpolatedStringHandler_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3e6f03b324974d80b20d1999c4a43881f83400_003F87_003F5967abaf_003FDefaultInterpolatedStringHandler_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADiagnosticServiceCollectionExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F47e01f36dea14a23aaea6e0391c1347ace00_003F3c_003F140e6d8b_003FDiagnosticServiceCollectionExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADirectory_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb6f0571a6bc744b0b551fd4578292582e54c00_003Fde_003F94973e27_003FDirectory_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADockerComposeServiceExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4768773ea5864bf8b6fc7a1a3c6f6f311fc38_003F2d_003F5f83b17e_003FDockerComposeServiceExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>