diff --git a/src/ai-service/Deal.Ai.Tests/Ai/AiTestHost.cs b/src/ai-service/Deal.Ai.Tests/Ai/AiTestHost.cs index d342cbd..4d0796e 100644 --- a/src/ai-service/Deal.Ai.Tests/Ai/AiTestHost.cs +++ b/src/ai-service/Deal.Ai.Tests/Ai/AiTestHost.cs @@ -1,7 +1,10 @@ using System.Net; using System.Net.Sockets; using Deal.Ai.Llm; -using Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; using Grpc.Core; using Grpc.Net.Client; using Microsoft.AspNetCore.Builder; diff --git a/src/ai-service/Deal.Ai/AiServiceHost.cs b/src/ai-service/Deal.Ai/AiServiceHost.cs index 45d25af..134f929 100644 --- a/src/ai-service/Deal.Ai/AiServiceHost.cs +++ b/src/ai-service/Deal.Ai/AiServiceHost.cs @@ -1,4 +1,7 @@ -using Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; namespace Deal.Ai; diff --git a/src/ai-service/Deal.Ai/Program.cs b/src/ai-service/Deal.Ai/Program.cs index 85f45fb..b35dc1f 100644 --- a/src/ai-service/Deal.Ai/Program.cs +++ b/src/ai-service/Deal.Ai/Program.cs @@ -12,7 +12,10 @@ // задачи 7–8): фасад живёт в Deal.Ai/Llm. using Deal.Ai; -using Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; // Порт по умолчанию — 5102 (Ruling 12, compose.dev.yml); переопределяется env GRPC_PORT (контейнер) // или PORT (общий конвенциональный env хостинг-платформ) — см. GrpcHostEnvironment.ResolveGrpcPort. diff --git a/src/core/Deal.Api/Observability/DealMetricsHosting.cs b/src/core/Deal.Api/Observability/DealMetricsHosting.cs index 0c440ac..324c46a 100644 --- a/src/core/Deal.Api/Observability/DealMetricsHosting.cs +++ b/src/core/Deal.Api/Observability/DealMetricsHosting.cs @@ -10,7 +10,7 @@ namespace Deal.Api.Observability; /// /// /// -/// Зеркалит общий хелпер сервисов (Deal.Grpc.Hosting.DealMetricsHosting) — ядро не ссылается на +/// Зеркалит общий хелпер сервисов (Deal.Grpc.Hosting.Services.DealMetricsHosting) — ядро не ссылается на /// обвязку gRPC-сервисов, поэтому держит свою копию по конвенции проекта (см. комментарий в /// Deal.Grpc.Hosting.csproj). Отдельный HTTP/1.1-эндпоинт нужен, т.к. основной HTTP :5080 уже /// обслуживает приложение, а gRPC-ингресс :5082 слушает только HTTP/2. diff --git a/src/core/Deal.Modules.Tenants/Application/Services/InviteCodeGenerator.cs b/src/core/Deal.Modules.Tenants/Application/Services/InviteCodeGenerator.cs index 2a653fb..de45231 100644 --- a/src/core/Deal.Modules.Tenants/Application/Services/InviteCodeGenerator.cs +++ b/src/core/Deal.Modules.Tenants/Application/Services/InviteCodeGenerator.cs @@ -1,4 +1,5 @@ using Deal.SharedKernel; +using Deal.SharedKernel.Utilities; namespace Deal.Modules.Tenants.Application.Services; diff --git a/src/core/Deal.Modules.Tenants/Application/Services/SessionTokens.cs b/src/core/Deal.Modules.Tenants/Application/Services/SessionTokens.cs index 30b9584..d230926 100644 --- a/src/core/Deal.Modules.Tenants/Application/Services/SessionTokens.cs +++ b/src/core/Deal.Modules.Tenants/Application/Services/SessionTokens.cs @@ -1,6 +1,7 @@ using System.Security.Cryptography; using System.Text; using Deal.SharedKernel; +using Deal.SharedKernel.Utilities; namespace Deal.Modules.Tenants.Application.Services; diff --git a/src/core/Deal.Modules.Tenants/Application/Services/TenantAdminService.cs b/src/core/Deal.Modules.Tenants/Application/Services/TenantAdminService.cs index 1240a87..eae1f82 100644 --- a/src/core/Deal.Modules.Tenants/Application/Services/TenantAdminService.cs +++ b/src/core/Deal.Modules.Tenants/Application/Services/TenantAdminService.cs @@ -1,6 +1,7 @@ using Deal.Modules.Tenants.Application.Abstractions; using Deal.Modules.Tenants.Application.Models; using Deal.SharedKernel; +using Deal.SharedKernel.Utilities; namespace Deal.Modules.Tenants.Application.Services; diff --git a/src/core/Deal.SharedKernel/SharedKernelMarker.cs b/src/core/Deal.SharedKernel/SharedKernelMarker.cs index 6cc95c1..399175c 100644 --- a/src/core/Deal.SharedKernel/SharedKernelMarker.cs +++ b/src/core/Deal.SharedKernel/SharedKernelMarker.cs @@ -1,3 +1,5 @@ +using Deal.SharedKernel.Utilities; + namespace Deal.SharedKernel; /// diff --git a/src/core/Deal.SharedKernel/Tenants/Models/TenantId.cs b/src/core/Deal.SharedKernel/Tenants/Models/TenantId.cs index 6ac8f26..948b1c3 100644 --- a/src/core/Deal.SharedKernel/Tenants/Models/TenantId.cs +++ b/src/core/Deal.SharedKernel/Tenants/Models/TenantId.cs @@ -1,3 +1,5 @@ +using Deal.SharedKernel.Utilities; + namespace Deal.SharedKernel.Tenants.Models; /// diff --git a/src/core/Deal.SharedKernel/UrlSafeToken.cs b/src/core/Deal.SharedKernel/Utilities/UrlSafeToken.cs similarity index 92% rename from src/core/Deal.SharedKernel/UrlSafeToken.cs rename to src/core/Deal.SharedKernel/Utilities/UrlSafeToken.cs index 49859e4..018e1f2 100644 --- a/src/core/Deal.SharedKernel/UrlSafeToken.cs +++ b/src/core/Deal.SharedKernel/Utilities/UrlSafeToken.cs @@ -1,6 +1,8 @@ using System.Security.Cryptography; +using Deal.SharedKernel; +using Deal.SharedKernel.Utilities; -namespace Deal.SharedKernel; +namespace Deal.SharedKernel.Utilities; /// /// Криптостойкие url-safe токены (Base64Url без padding) для одноразовых секретов: raw-токены сессий, diff --git a/src/grpc-hosting/Deal.Grpc.Hosting/RpcCallLoggingInterceptor.cs b/src/grpc-hosting/Deal.Grpc.Hosting/Interceptors/RpcCallLoggingInterceptor.cs similarity index 96% rename from src/grpc-hosting/Deal.Grpc.Hosting/RpcCallLoggingInterceptor.cs rename to src/grpc-hosting/Deal.Grpc.Hosting/Interceptors/RpcCallLoggingInterceptor.cs index 7ba641b..6d14672 100644 --- a/src/grpc-hosting/Deal.Grpc.Hosting/RpcCallLoggingInterceptor.cs +++ b/src/grpc-hosting/Deal.Grpc.Hosting/Interceptors/RpcCallLoggingInterceptor.cs @@ -2,8 +2,11 @@ using System.Diagnostics; using Grpc.Core; using Grpc.Core.Interceptors; using Microsoft.Extensions.Logging; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; -namespace Deal.Grpc.Hosting; +namespace Deal.Grpc.Hosting.Interceptors; /// /// Access-лог RPC Deal-сервисов (Ruling 7, план Task 14; общий шаблон трёх сервисов — C31): каждый diff --git a/src/grpc-hosting/Deal.Grpc.Hosting/ServiceTokenInterceptor.cs b/src/grpc-hosting/Deal.Grpc.Hosting/Interceptors/ServiceTokenInterceptor.cs similarity index 96% rename from src/grpc-hosting/Deal.Grpc.Hosting/ServiceTokenInterceptor.cs rename to src/grpc-hosting/Deal.Grpc.Hosting/Interceptors/ServiceTokenInterceptor.cs index 354a381..a19cefe 100644 --- a/src/grpc-hosting/Deal.Grpc.Hosting/ServiceTokenInterceptor.cs +++ b/src/grpc-hosting/Deal.Grpc.Hosting/Interceptors/ServiceTokenInterceptor.cs @@ -3,8 +3,11 @@ using System.Text; using Grpc.Core; using Grpc.Core.Interceptors; using Microsoft.Extensions.Configuration; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; -namespace Deal.Grpc.Hosting; +namespace Deal.Grpc.Hosting.Interceptors; /// /// Серверный интерцептор service-token (Ruling 1; общий шаблон трёх Deal-сервисов — C31). diff --git a/src/grpc-hosting/Deal.Grpc.Hosting/MtlsCertificates.cs b/src/grpc-hosting/Deal.Grpc.Hosting/Models/MtlsCertificates.cs similarity index 96% rename from src/grpc-hosting/Deal.Grpc.Hosting/MtlsCertificates.cs rename to src/grpc-hosting/Deal.Grpc.Hosting/Models/MtlsCertificates.cs index 9664130..331069f 100644 --- a/src/grpc-hosting/Deal.Grpc.Hosting/MtlsCertificates.cs +++ b/src/grpc-hosting/Deal.Grpc.Hosting/Models/MtlsCertificates.cs @@ -1,8 +1,11 @@ using System.Net.Security; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; -namespace Deal.Grpc.Hosting; +namespace Deal.Grpc.Hosting.Models; /// /// Загруженный набор сертификатов mTLS внутреннего gRPC (Ruling 6, план Task 13; общий шаблон — C31). diff --git a/src/grpc-hosting/Deal.Grpc.Hosting/MtlsOptions.cs b/src/grpc-hosting/Deal.Grpc.Hosting/Options/MtlsOptions.cs similarity index 95% rename from src/grpc-hosting/Deal.Grpc.Hosting/MtlsOptions.cs rename to src/grpc-hosting/Deal.Grpc.Hosting/Options/MtlsOptions.cs index 9206c42..25cea26 100644 --- a/src/grpc-hosting/Deal.Grpc.Hosting/MtlsOptions.cs +++ b/src/grpc-hosting/Deal.Grpc.Hosting/Options/MtlsOptions.cs @@ -1,6 +1,9 @@ using Microsoft.Extensions.Configuration; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Services; -namespace Deal.Grpc.Hosting; +namespace Deal.Grpc.Hosting.Options; /// /// Конфигурация mTLS-транспорта внутреннего gRPC (Ruling 6, план Task 13; общий шаблон — C31). diff --git a/src/grpc-hosting/Deal.Grpc.Hosting/DealLogging.cs b/src/grpc-hosting/Deal.Grpc.Hosting/Services/DealLogging.cs similarity index 96% rename from src/grpc-hosting/Deal.Grpc.Hosting/DealLogging.cs rename to src/grpc-hosting/Deal.Grpc.Hosting/Services/DealLogging.cs index 63942f6..bf4aa4f 100644 --- a/src/grpc-hosting/Deal.Grpc.Hosting/DealLogging.cs +++ b/src/grpc-hosting/Deal.Grpc.Hosting/Services/DealLogging.cs @@ -4,8 +4,11 @@ using Microsoft.Extensions.Hosting; using Serilog; using Serilog.Events; using Serilog.Formatting.Compact; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; -namespace Deal.Grpc.Hosting; +namespace Deal.Grpc.Hosting.Services; /// /// Serilog-конфигурация процесса Deal-сервиса (Ruling 7/9, план Task 14; общий шаблон — C31). diff --git a/src/grpc-hosting/Deal.Grpc.Hosting/DealMetricsHosting.cs b/src/grpc-hosting/Deal.Grpc.Hosting/Services/DealMetricsHosting.cs similarity index 95% rename from src/grpc-hosting/Deal.Grpc.Hosting/DealMetricsHosting.cs rename to src/grpc-hosting/Deal.Grpc.Hosting/Services/DealMetricsHosting.cs index 9ff85e5..053e04b 100644 --- a/src/grpc-hosting/Deal.Grpc.Hosting/DealMetricsHosting.cs +++ b/src/grpc-hosting/Deal.Grpc.Hosting/Services/DealMetricsHosting.cs @@ -3,8 +3,11 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.Extensions.DependencyInjection; using OpenTelemetry.Metrics; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; -namespace Deal.Grpc.Hosting; +namespace Deal.Grpc.Hosting.Services; /// /// Общая настройка метрик Deal-сервисов (этап 12, пакет A): OpenTelemetry → экспортёр Prometheus, diff --git a/src/grpc-hosting/Deal.Grpc.Hosting/GrpcHostEnvironment.cs b/src/grpc-hosting/Deal.Grpc.Hosting/Services/GrpcHostEnvironment.cs similarity index 94% rename from src/grpc-hosting/Deal.Grpc.Hosting/GrpcHostEnvironment.cs rename to src/grpc-hosting/Deal.Grpc.Hosting/Services/GrpcHostEnvironment.cs index 17d81da..bc6346d 100644 --- a/src/grpc-hosting/Deal.Grpc.Hosting/GrpcHostEnvironment.cs +++ b/src/grpc-hosting/Deal.Grpc.Hosting/Services/GrpcHostEnvironment.cs @@ -1,4 +1,8 @@ -namespace Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; + +namespace Deal.Grpc.Hosting.Services; /// /// Общие стартовые проверки/разбор env для Program.cs Deal-сервисов (C31): порт Kestrel diff --git a/src/grpc-hosting/Deal.Grpc.Hosting/GrpcServer.cs b/src/grpc-hosting/Deal.Grpc.Hosting/Services/GrpcServer.cs similarity index 95% rename from src/grpc-hosting/Deal.Grpc.Hosting/GrpcServer.cs rename to src/grpc-hosting/Deal.Grpc.Hosting/Services/GrpcServer.cs index e3f6667..68d4d2a 100644 --- a/src/grpc-hosting/Deal.Grpc.Hosting/GrpcServer.cs +++ b/src/grpc-hosting/Deal.Grpc.Hosting/Services/GrpcServer.cs @@ -5,8 +5,11 @@ using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Https; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; -namespace Deal.Grpc.Hosting; +namespace Deal.Grpc.Hosting.Services; /// /// Общие серверные блоки gRPC-хостов Deal-сервисов (C31): mTLS-набор, Kestrel HTTP/2-эндпоинт, diff --git a/src/ml-service/Deal.Ml.Tests/Grpc/MlTestHost.cs b/src/ml-service/Deal.Ml.Tests/Grpc/MlTestHost.cs index dcc1287..88a78cd 100644 --- a/src/ml-service/Deal.Ml.Tests/Grpc/MlTestHost.cs +++ b/src/ml-service/Deal.Ml.Tests/Grpc/MlTestHost.cs @@ -1,6 +1,9 @@ using System.Net; using System.Net.Sockets; -using Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; using Deal.Ml.Model; using Grpc.Core; using Grpc.Net.Client; diff --git a/src/ml-service/Deal.Ml/MlServiceHost.cs b/src/ml-service/Deal.Ml/MlServiceHost.cs index 6f71732..01dfa71 100644 --- a/src/ml-service/Deal.Ml/MlServiceHost.cs +++ b/src/ml-service/Deal.Ml/MlServiceHost.cs @@ -1,4 +1,7 @@ -using Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; using Deal.Ml.Model; namespace Deal.Ml; diff --git a/src/ml-service/Deal.Ml/Program.cs b/src/ml-service/Deal.Ml/Program.cs index d268f93..c3e5036 100644 --- a/src/ml-service/Deal.Ml/Program.cs +++ b/src/ml-service/Deal.Ml/Program.cs @@ -11,7 +11,10 @@ // наивный Байес по терминам per-tenant (файлы data/ml/.sqlite, Ruling 4) — движок/пул // в Model/, хранилище в Storage/, gRPC Predict/Status/Reset/TrainBatch — MlServiceImpl. -using Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; using Deal.Ml; // Порт по умолчанию — 5103 (Ruling 12, compose.dev.yml); переопределяется env GRPC_PORT (контейнер) diff --git a/src/telegram-service/Deal.Telegram.Tests/Grpc/TelegramTestHost.cs b/src/telegram-service/Deal.Telegram.Tests/Grpc/TelegramTestHost.cs index aa68661..d76c984 100644 --- a/src/telegram-service/Deal.Telegram.Tests/Grpc/TelegramTestHost.cs +++ b/src/telegram-service/Deal.Telegram.Tests/Grpc/TelegramTestHost.cs @@ -1,6 +1,9 @@ using System.Net; using System.Net.Sockets; -using Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; using Deal.Telegram.Core; using Deal.Telegram.Sessions; using Grpc.Core; diff --git a/src/telegram-service/Deal.Telegram/Core/CoreIngressClient.cs b/src/telegram-service/Deal.Telegram/Core/CoreIngressClient.cs index 3f150fa..c5b5f76 100644 --- a/src/telegram-service/Deal.Telegram/Core/CoreIngressClient.cs +++ b/src/telegram-service/Deal.Telegram/Core/CoreIngressClient.cs @@ -1,4 +1,7 @@ -using Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; using Deal.Grpc.Telegram; using Deal.Telegram.Sessions; using Grpc.Core; diff --git a/src/telegram-service/Deal.Telegram/Program.cs b/src/telegram-service/Deal.Telegram/Program.cs index 62309a6..351646d 100644 --- a/src/telegram-service/Deal.Telegram/Program.cs +++ b/src/telegram-service/Deal.Telegram/Program.cs @@ -11,7 +11,10 @@ // каталога/мониторинга (Task 10) и discovery-операции Search/GetInfo/ReadForEval/Join/Leave // (Task 11, см. TelegramServiceImpl/DiscoveryOps). -using Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; using Deal.Telegram; // Порт по умолчанию — 5101 (Ruling 12, compose.dev.yml); переопределяется env GRPC_PORT (контейнер) diff --git a/src/telegram-service/Deal.Telegram/TelegramServiceHost.cs b/src/telegram-service/Deal.Telegram/TelegramServiceHost.cs index 6eb0647..e94f219 100644 --- a/src/telegram-service/Deal.Telegram/TelegramServiceHost.cs +++ b/src/telegram-service/Deal.Telegram/TelegramServiceHost.cs @@ -1,4 +1,7 @@ -using Deal.Grpc.Hosting; +using Deal.Grpc.Hosting.Interceptors; +using Deal.Grpc.Hosting.Models; +using Deal.Grpc.Hosting.Options; +using Deal.Grpc.Hosting.Services; using Deal.Telegram.Core; using Deal.Telegram.Dialogs; using Deal.Telegram.Discovery;