@oneuptime/common 10.0.52 → 10.0.54
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Models/AnalyticsModels/Metric.ts +78 -0
- package/Server/API/AIAgentDataAPI.ts +6 -1
- package/Server/API/BillingAPI.ts +28 -6
- package/Server/API/CommonAPI.ts +11 -0
- package/Server/API/DashboardAPI.ts +6 -2
- package/Server/API/DashboardDomainAPI.ts +10 -3
- package/Server/API/GitHubAPI.ts +58 -14
- package/Server/API/MicrosoftTeamsAPI.ts +97 -33
- package/Server/API/OpenSourceDeploymentAPI.ts +2 -2
- package/Server/API/SlackAPI.ts +107 -36
- package/Server/API/StatusAPI.ts +37 -16
- package/Server/API/StatusPageAPI.ts +97 -23
- package/Server/API/StatusPageDomainAPI.ts +6 -3
- package/Server/API/TelemetryAPI.ts +81 -0
- package/Server/API/UserAPI.ts +3 -3
- package/Server/API/UserCallAPI.ts +5 -2
- package/Server/API/UserEmailAPI.ts +5 -2
- package/Server/API/UserPushAPI.ts +9 -3
- package/Server/API/UserSmsAPI.ts +5 -2
- package/Server/API/UserWhatsAppAPI.ts +5 -2
- package/Server/Infrastructure/Postgres/SchemaMigrations/1774559064921-MigrationName.ts +47 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1775735059360-MigrationName.ts +35 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +4 -0
- package/Server/Middleware/NotificationMiddleware.ts +2 -2
- package/Server/Middleware/ProjectAuthorization.ts +6 -0
- package/Server/Middleware/SCIMAuthorization.ts +2 -1
- package/Server/Middleware/SlackAuthorization.ts +28 -10
- package/Server/Middleware/TelemetryIngest.ts +16 -3
- package/Server/Middleware/UserAuthorization.ts +22 -5
- package/Server/Middleware/WhatsAppAuthorization.ts +15 -4
- package/Server/Services/AIAgentService.ts +13 -6
- package/Server/Services/AIService.ts +9 -3
- package/Server/Services/AlertEpisodeFeedService.ts +17 -5
- package/Server/Services/AlertEpisodeService.ts +34 -3
- package/Server/Services/AlertEpisodeStateTimelineService.ts +80 -22
- package/Server/Services/AlertFeedService.ts +17 -5
- package/Server/Services/AlertGroupingEngineService.ts +36 -7
- package/Server/Services/AlertService.ts +60 -8
- package/Server/Services/AlertStateTimelineService.ts +29 -7
- package/Server/Services/AnalyticsDatabaseService.ts +59 -25
- package/Server/Services/BillingInvoiceService.ts +7 -3
- package/Server/Services/BillingService.ts +9 -2
- package/Server/Services/DashboardDomainService.ts +56 -22
- package/Server/Services/DashboardService.ts +11 -4
- package/Server/Services/DatabaseService.ts +31 -11
- package/Server/Services/IncidentEpisodeFeedService.ts +17 -5
- package/Server/Services/IncidentEpisodeService.ts +34 -3
- package/Server/Services/IncidentEpisodeStateTimelineService.ts +80 -22
- package/Server/Services/IncidentFeedService.ts +33 -9
- package/Server/Services/IncidentGroupingEngineService.ts +35 -6
- package/Server/Services/IncidentService.ts +103 -9
- package/Server/Services/IncidentSlaRuleService.ts +16 -4
- package/Server/Services/IncidentSlaService.ts +20 -4
- package/Server/Services/IncidentStateTimelineService.ts +120 -31
- package/Server/Services/KubernetesClusterService.ts +62 -14
- package/Server/Services/LabelService.ts +14 -1
- package/Server/Services/MonitorFeedService.ts +33 -9
- package/Server/Services/MonitorProbeService.ts +31 -2
- package/Server/Services/MonitorService.ts +35 -4
- package/Server/Services/MonitorStatusTimelineService.ts +68 -20
- package/Server/Services/NotificationService.ts +4 -2
- package/Server/Services/OnCallDutyPolicyEscalationRuleService.ts +53 -9
- package/Server/Services/OnCallDutyPolicyEscalationRuleUserService.ts +9 -2
- package/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.ts +29 -8
- package/Server/Services/OnCallDutyPolicyFeedService.ts +33 -8
- package/Server/Services/OnCallDutyPolicyScheduleService.ts +97 -24
- package/Server/Services/OnCallDutyPolicyService.ts +2 -1
- package/Server/Services/OpenTelemetryIngestService.ts +51 -20
- package/Server/Services/ProbeService.ts +16 -7
- package/Server/Services/ProjectService.ts +29 -11
- package/Server/Services/ScheduledMaintenanceFeedService.ts +17 -4
- package/Server/Services/ScheduledMaintenanceService.ts +52 -6
- package/Server/Services/ScheduledMaintenanceStateTimelineService.ts +72 -20
- package/Server/Services/StatusPageDomainService.ts +59 -23
- package/Server/Services/StatusPageService.ts +26 -8
- package/Server/Services/StatusPageSubscriberService.ts +382 -111
- package/Server/Services/TeamMemberService.ts +9 -3
- package/Server/Services/TelemetryAttributeService.ts +117 -4
- package/Server/Services/UserNotificationRuleService.ts +9 -3
- package/Server/Services/UserService.ts +6 -4
- package/Server/Services/UserWhatsAppService.ts +9 -3
- package/Server/Services/WorkflowService.ts +7 -3
- package/Server/Services/WorkspaceNotificationRuleService.ts +398 -156
- package/Server/Types/Domain.ts +15 -5
- package/Server/Types/Workflow/Components/API/Post.ts +22 -8
- package/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.ts +12 -4
- package/Server/Utils/AnalyticsDatabase/StatementGenerator.ts +10 -0
- package/Server/Utils/CodeRepository/CodeRepository.ts +62 -13
- package/Server/Utils/Express.ts +1 -0
- package/Server/Utils/Greenlock/Greenlock.ts +75 -20
- package/Server/Utils/LLM/LLMService.ts +22 -7
- package/Server/Utils/Logger.ts +93 -13
- package/Server/Utils/Monitor/MonitorAlert.ts +15 -3
- package/Server/Utils/Monitor/MonitorCriteriaEvaluator.ts +15 -5
- package/Server/Utils/Monitor/MonitorIncident.ts +17 -3
- package/Server/Utils/Monitor/MonitorStatusTimeline.ts +6 -1
- package/Server/Utils/Profiling.ts +11 -5
- package/Server/Utils/Realtime.ts +90 -31
- package/Server/Utils/Response.ts +2 -2
- package/Server/Utils/StartServer.ts +43 -9
- package/Server/Utils/Telemetry/SpanUtil.ts +90 -0
- package/Server/Utils/Workspace/MicrosoftTeams/Actions/Alert.ts +58 -15
- package/Server/Utils/Workspace/MicrosoftTeams/Actions/AlertEpisode.ts +58 -15
- package/Server/Utils/Workspace/MicrosoftTeams/Actions/Auth.ts +19 -3
- package/Server/Utils/Workspace/MicrosoftTeams/Actions/Incident.ts +87 -22
- package/Server/Utils/Workspace/MicrosoftTeams/Actions/Monitor.ts +12 -3
- package/Server/Utils/Workspace/MicrosoftTeams/Actions/OnCallDutyPolicy.ts +25 -7
- package/Server/Utils/Workspace/MicrosoftTeams/Actions/ScheduledMaintenance.ts +55 -8
- package/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.ts +100 -22
- package/Server/Utils/Workspace/Slack/Actions/Alert.ts +35 -9
- package/Server/Utils/Workspace/Slack/Actions/AlertEpisode.ts +32 -8
- package/Server/Utils/Workspace/Slack/Actions/Auth.ts +3 -1
- package/Server/Utils/Workspace/Slack/Actions/Incident.ts +52 -11
- package/Server/Utils/Workspace/Slack/Actions/IncidentEpisode.ts +4 -1
- package/Server/Utils/Workspace/Slack/Actions/ScheduledMaintenance.ts +89 -20
- package/Server/Utils/Workspace/Slack/Slack.ts +498 -247
- package/Server/Utils/Workspace/Workspace.ts +33 -11
- package/Server/Utils/Workspace/WorkspaceBase.ts +3 -1
- package/Server/Utils/Workspace/WorkspaceMessages/Alert.ts +8 -2
- package/Tests/Server/Middleware/UserAuthorization.test.ts +1 -1
- package/Tests/Server/Services/AnalyticsDatabaseService.test.ts +12 -3
- package/UI/Components/BulkUpdate/BulkUpdateForm.tsx +60 -38
- package/UI/Components/Charts/Area/AreaChart.tsx +35 -1
- package/UI/Components/Charts/ChartGroup/ChartGroup.tsx +7 -0
- package/UI/Components/Charts/ChartLibrary/AreaChart/AreaChart.tsx +33 -0
- package/UI/Components/Charts/ChartLibrary/LineChart/LineChart.tsx +33 -0
- package/UI/Components/Charts/ChartLibrary/Types/FormattedExemplarPoint.ts +14 -0
- package/UI/Components/Charts/Line/LineChart.tsx +35 -1
- package/UI/Components/Charts/Types/ExemplarPoint.ts +6 -0
- package/UI/Components/Dictionary/Dictionary.tsx +13 -1
- package/UI/Components/Filters/FiltersForm.tsx +2 -0
- package/UI/Components/Filters/JSONFilter.tsx +5 -1
- package/UI/Components/Filters/Types/Filter.ts +2 -0
- package/UI/Components/Markdown.tsx/MarkdownViewer.tsx +3 -3
- package/UI/Components/ModelTable/BaseModelTable.tsx +10 -6
- package/UI/Components/Navbar/NavBar.tsx +10 -0
- package/build/dist/Models/AnalyticsModels/Metric.js +70 -0
- package/build/dist/Models/AnalyticsModels/Metric.js.map +1 -1
- package/build/dist/Server/API/AIAgentDataAPI.js +6 -6
- package/build/dist/Server/API/AIAgentDataAPI.js.map +1 -1
- package/build/dist/Server/API/BillingAPI.js +13 -13
- package/build/dist/Server/API/BillingAPI.js.map +1 -1
- package/build/dist/Server/API/CommonAPI.js +5 -0
- package/build/dist/Server/API/CommonAPI.js.map +1 -1
- package/build/dist/Server/API/DashboardAPI.js +2 -2
- package/build/dist/Server/API/DashboardAPI.js.map +1 -1
- package/build/dist/Server/API/DashboardDomainAPI.js +3 -3
- package/build/dist/Server/API/DashboardDomainAPI.js.map +1 -1
- package/build/dist/Server/API/GitHubAPI.js +19 -19
- package/build/dist/Server/API/GitHubAPI.js.map +1 -1
- package/build/dist/Server/API/MicrosoftTeamsAPI.js +34 -34
- package/build/dist/Server/API/MicrosoftTeamsAPI.js.map +1 -1
- package/build/dist/Server/API/OpenSourceDeploymentAPI.js +2 -2
- package/build/dist/Server/API/OpenSourceDeploymentAPI.js.map +1 -1
- package/build/dist/Server/API/SlackAPI.js +38 -38
- package/build/dist/Server/API/SlackAPI.js.map +1 -1
- package/build/dist/Server/API/StatusAPI.js +16 -16
- package/build/dist/Server/API/StatusAPI.js.map +1 -1
- package/build/dist/Server/API/StatusPageAPI.js +52 -52
- package/build/dist/Server/API/StatusPageAPI.js.map +1 -1
- package/build/dist/Server/API/StatusPageDomainAPI.js +3 -3
- package/build/dist/Server/API/StatusPageDomainAPI.js.map +1 -1
- package/build/dist/Server/API/TelemetryAPI.js +39 -0
- package/build/dist/Server/API/TelemetryAPI.js.map +1 -1
- package/build/dist/Server/API/UserAPI.js +3 -3
- package/build/dist/Server/API/UserAPI.js.map +1 -1
- package/build/dist/Server/API/UserCallAPI.js +2 -2
- package/build/dist/Server/API/UserCallAPI.js.map +1 -1
- package/build/dist/Server/API/UserEmailAPI.js +2 -2
- package/build/dist/Server/API/UserEmailAPI.js.map +1 -1
- package/build/dist/Server/API/UserPushAPI.js +3 -3
- package/build/dist/Server/API/UserPushAPI.js.map +1 -1
- package/build/dist/Server/API/UserSmsAPI.js +2 -2
- package/build/dist/Server/API/UserSmsAPI.js.map +1 -1
- package/build/dist/Server/API/UserWhatsAppAPI.js +2 -2
- package/build/dist/Server/API/UserWhatsAppAPI.js.map +1 -1
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1774559064921-MigrationName.js +40 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1774559064921-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1775735059360-MigrationName.js +18 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1775735059360-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +4 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
- package/build/dist/Server/Middleware/NotificationMiddleware.js +2 -2
- package/build/dist/Server/Middleware/NotificationMiddleware.js.map +1 -1
- package/build/dist/Server/Middleware/ProjectAuthorization.js +5 -0
- package/build/dist/Server/Middleware/ProjectAuthorization.js.map +1 -1
- package/build/dist/Server/Middleware/SCIMAuthorization.js +2 -2
- package/build/dist/Server/Middleware/SCIMAuthorization.js.map +1 -1
- package/build/dist/Server/Middleware/SlackAuthorization.js +10 -10
- package/build/dist/Server/Middleware/SlackAuthorization.js.map +1 -1
- package/build/dist/Server/Middleware/TelemetryIngest.js +9 -4
- package/build/dist/Server/Middleware/TelemetryIngest.js.map +1 -1
- package/build/dist/Server/Middleware/UserAuthorization.js +10 -5
- package/build/dist/Server/Middleware/UserAuthorization.js.map +1 -1
- package/build/dist/Server/Middleware/WhatsAppAuthorization.js +6 -6
- package/build/dist/Server/Middleware/WhatsAppAuthorization.js.map +1 -1
- package/build/dist/Server/Services/AIAgentService.js +13 -7
- package/build/dist/Server/Services/AIAgentService.js.map +1 -1
- package/build/dist/Server/Services/AIService.js +9 -2
- package/build/dist/Server/Services/AIService.js.map +1 -1
- package/build/dist/Server/Services/AlertEpisodeFeedService.js +17 -5
- package/build/dist/Server/Services/AlertEpisodeFeedService.js.map +1 -1
- package/build/dist/Server/Services/AlertEpisodeService.js +40 -10
- package/build/dist/Server/Services/AlertEpisodeService.js.map +1 -1
- package/build/dist/Server/Services/AlertEpisodeStateTimelineService.js +81 -24
- package/build/dist/Server/Services/AlertEpisodeStateTimelineService.js.map +1 -1
- package/build/dist/Server/Services/AlertFeedService.js +17 -5
- package/build/dist/Server/Services/AlertFeedService.js.map +1 -1
- package/build/dist/Server/Services/AlertGroupingEngineService.js +44 -28
- package/build/dist/Server/Services/AlertGroupingEngineService.js.map +1 -1
- package/build/dist/Server/Services/AlertService.js +72 -20
- package/build/dist/Server/Services/AlertService.js.map +1 -1
- package/build/dist/Server/Services/AlertStateTimelineService.js +36 -13
- package/build/dist/Server/Services/AlertStateTimelineService.js.map +1 -1
- package/build/dist/Server/Services/AnalyticsDatabaseService.js +52 -28
- package/build/dist/Server/Services/AnalyticsDatabaseService.js.map +1 -1
- package/build/dist/Server/Services/BillingInvoiceService.js +7 -2
- package/build/dist/Server/Services/BillingInvoiceService.js.map +1 -1
- package/build/dist/Server/Services/BillingService.js +8 -8
- package/build/dist/Server/Services/BillingService.js.map +1 -1
- package/build/dist/Server/Services/DashboardDomainService.js +49 -27
- package/build/dist/Server/Services/DashboardDomainService.js.map +1 -1
- package/build/dist/Server/Services/DashboardService.js +11 -4
- package/build/dist/Server/Services/DashboardService.js.map +1 -1
- package/build/dist/Server/Services/DatabaseService.js +32 -12
- package/build/dist/Server/Services/DatabaseService.js.map +1 -1
- package/build/dist/Server/Services/IncidentEpisodeFeedService.js +17 -5
- package/build/dist/Server/Services/IncidentEpisodeFeedService.js.map +1 -1
- package/build/dist/Server/Services/IncidentEpisodeService.js +40 -10
- package/build/dist/Server/Services/IncidentEpisodeService.js.map +1 -1
- package/build/dist/Server/Services/IncidentEpisodeStateTimelineService.js +81 -24
- package/build/dist/Server/Services/IncidentEpisodeStateTimelineService.js.map +1 -1
- package/build/dist/Server/Services/IncidentFeedService.js +34 -10
- package/build/dist/Server/Services/IncidentFeedService.js.map +1 -1
- package/build/dist/Server/Services/IncidentGroupingEngineService.js +43 -29
- package/build/dist/Server/Services/IncidentGroupingEngineService.js.map +1 -1
- package/build/dist/Server/Services/IncidentService.js +116 -28
- package/build/dist/Server/Services/IncidentService.js.map +1 -1
- package/build/dist/Server/Services/IncidentSlaRuleService.js +19 -11
- package/build/dist/Server/Services/IncidentSlaRuleService.js.map +1 -1
- package/build/dist/Server/Services/IncidentSlaService.js +21 -14
- package/build/dist/Server/Services/IncidentSlaService.js.map +1 -1
- package/build/dist/Server/Services/IncidentStateTimelineService.js +130 -37
- package/build/dist/Server/Services/IncidentStateTimelineService.js.map +1 -1
- package/build/dist/Server/Services/KubernetesClusterService.js +51 -14
- package/build/dist/Server/Services/KubernetesClusterService.js.map +1 -1
- package/build/dist/Server/Services/LabelService.js +10 -1
- package/build/dist/Server/Services/LabelService.js.map +1 -1
- package/build/dist/Server/Services/MonitorFeedService.js +34 -10
- package/build/dist/Server/Services/MonitorFeedService.js.map +1 -1
- package/build/dist/Server/Services/MonitorProbeService.js +23 -3
- package/build/dist/Server/Services/MonitorProbeService.js.map +1 -1
- package/build/dist/Server/Services/MonitorService.js +42 -11
- package/build/dist/Server/Services/MonitorService.js.map +1 -1
- package/build/dist/Server/Services/MonitorStatusTimelineService.js +69 -21
- package/build/dist/Server/Services/MonitorStatusTimelineService.js.map +1 -1
- package/build/dist/Server/Services/NotificationService.js +4 -3
- package/build/dist/Server/Services/NotificationService.js.map +1 -1
- package/build/dist/Server/Services/OnCallDutyPolicyEscalationRuleService.js +49 -12
- package/build/dist/Server/Services/OnCallDutyPolicyEscalationRuleService.js.map +1 -1
- package/build/dist/Server/Services/OnCallDutyPolicyEscalationRuleUserService.js +9 -3
- package/build/dist/Server/Services/OnCallDutyPolicyEscalationRuleUserService.js.map +1 -1
- package/build/dist/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.js +26 -11
- package/build/dist/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.js.map +1 -1
- package/build/dist/Server/Services/OnCallDutyPolicyFeedService.js +34 -10
- package/build/dist/Server/Services/OnCallDutyPolicyFeedService.js.map +1 -1
- package/build/dist/Server/Services/OnCallDutyPolicyScheduleService.js +94 -37
- package/build/dist/Server/Services/OnCallDutyPolicyScheduleService.js.map +1 -1
- package/build/dist/Server/Services/OnCallDutyPolicyService.js +1 -1
- package/build/dist/Server/Services/OnCallDutyPolicyService.js.map +1 -1
- package/build/dist/Server/Services/OpenTelemetryIngestService.js +45 -17
- package/build/dist/Server/Services/OpenTelemetryIngestService.js.map +1 -1
- package/build/dist/Server/Services/ProbeService.js +13 -7
- package/build/dist/Server/Services/ProbeService.js.map +1 -1
- package/build/dist/Server/Services/ProjectService.js +41 -21
- package/build/dist/Server/Services/ProjectService.js.map +1 -1
- package/build/dist/Server/Services/ScheduledMaintenanceFeedService.js +17 -5
- package/build/dist/Server/Services/ScheduledMaintenanceFeedService.js.map +1 -1
- package/build/dist/Server/Services/ScheduledMaintenanceService.js +71 -24
- package/build/dist/Server/Services/ScheduledMaintenanceService.js.map +1 -1
- package/build/dist/Server/Services/ScheduledMaintenanceStateTimelineService.js +72 -24
- package/build/dist/Server/Services/ScheduledMaintenanceStateTimelineService.js.map +1 -1
- package/build/dist/Server/Services/StatusPageDomainService.js +55 -29
- package/build/dist/Server/Services/StatusPageDomainService.js.map +1 -1
- package/build/dist/Server/Services/StatusPageService.js +29 -9
- package/build/dist/Server/Services/StatusPageService.js.map +1 -1
- package/build/dist/Server/Services/StatusPageSubscriberService.js +393 -130
- package/build/dist/Server/Services/StatusPageSubscriberService.js.map +1 -1
- package/build/dist/Server/Services/TeamMemberService.js +10 -2
- package/build/dist/Server/Services/TeamMemberService.js.map +1 -1
- package/build/dist/Server/Services/TelemetryAttributeService.js +83 -6
- package/build/dist/Server/Services/TelemetryAttributeService.js.map +1 -1
- package/build/dist/Server/Services/UserNotificationRuleService.js +10 -2
- package/build/dist/Server/Services/UserNotificationRuleService.js.map +1 -1
- package/build/dist/Server/Services/UserService.js +8 -3
- package/build/dist/Server/Services/UserService.js.map +1 -1
- package/build/dist/Server/Services/UserWhatsAppService.js +10 -2
- package/build/dist/Server/Services/UserWhatsAppService.js.map +1 -1
- package/build/dist/Server/Services/WorkflowService.js +7 -2
- package/build/dist/Server/Services/WorkflowService.js.map +1 -1
- package/build/dist/Server/Services/WorkspaceNotificationRuleService.js +367 -180
- package/build/dist/Server/Services/WorkspaceNotificationRuleService.js.map +1 -1
- package/build/dist/Server/Types/Domain.js +12 -6
- package/build/dist/Server/Types/Domain.js.map +1 -1
- package/build/dist/Server/Types/Workflow/Components/API/Post.js +11 -7
- package/build/dist/Server/Types/Workflow/Components/API/Post.js.map +1 -1
- package/build/dist/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.js +11 -4
- package/build/dist/Server/Types/Workflow/Components/BaseModel/OnTriggerBaseModel.js.map +1 -1
- package/build/dist/Server/Utils/AnalyticsDatabase/StatementGenerator.js +7 -0
- package/build/dist/Server/Utils/AnalyticsDatabase/StatementGenerator.js.map +1 -1
- package/build/dist/Server/Utils/CodeRepository/CodeRepository.js +45 -17
- package/build/dist/Server/Utils/CodeRepository/CodeRepository.js.map +1 -1
- package/build/dist/Server/Utils/Express.js.map +1 -1
- package/build/dist/Server/Utils/Greenlock/Greenlock.js +36 -29
- package/build/dist/Server/Utils/Greenlock/Greenlock.js.map +1 -1
- package/build/dist/Server/Utils/LLM/LLMService.js +18 -6
- package/build/dist/Server/Utils/LLM/LLMService.js.map +1 -1
- package/build/dist/Server/Utils/Logger.js +61 -13
- package/build/dist/Server/Utils/Logger.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorAlert.js +23 -20
- package/build/dist/Server/Utils/Monitor/MonitorAlert.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorCriteriaEvaluator.js +13 -4
- package/build/dist/Server/Utils/Monitor/MonitorCriteriaEvaluator.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorIncident.js +25 -22
- package/build/dist/Server/Utils/Monitor/MonitorIncident.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorStatusTimeline.js +6 -3
- package/build/dist/Server/Utils/Monitor/MonitorStatusTimeline.js.map +1 -1
- package/build/dist/Server/Utils/Profiling.js +9 -6
- package/build/dist/Server/Utils/Profiling.js.map +1 -1
- package/build/dist/Server/Utils/Realtime.js +50 -34
- package/build/dist/Server/Utils/Realtime.js.map +1 -1
- package/build/dist/Server/Utils/Response.js +2 -2
- package/build/dist/Server/Utils/Response.js.map +1 -1
- package/build/dist/Server/Utils/StartServer.js +23 -11
- package/build/dist/Server/Utils/StartServer.js.map +1 -1
- package/build/dist/Server/Utils/Telemetry/SpanUtil.js +52 -0
- package/build/dist/Server/Utils/Telemetry/SpanUtil.js.map +1 -0
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/Alert.js +58 -15
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/Alert.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/AlertEpisode.js +58 -15
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/AlertEpisode.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/Auth.js +19 -5
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/Auth.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/Incident.js +90 -26
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/Incident.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/Monitor.js +12 -3
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/Monitor.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/OnCallDutyPolicy.js +25 -7
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/OnCallDutyPolicy.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/ScheduledMaintenance.js +58 -19
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/Actions/ScheduledMaintenance.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.js +102 -29
- package/build/dist/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/Slack/Actions/Alert.js +38 -9
- package/build/dist/Server/Utils/Workspace/Slack/Actions/Alert.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/Slack/Actions/AlertEpisode.js +34 -8
- package/build/dist/Server/Utils/Workspace/Slack/Actions/AlertEpisode.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/Slack/Actions/Auth.js +3 -1
- package/build/dist/Server/Utils/Workspace/Slack/Actions/Auth.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/Slack/Actions/Incident.js +55 -13
- package/build/dist/Server/Utils/Workspace/Slack/Actions/Incident.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/Slack/Actions/IncidentEpisode.js +5 -1
- package/build/dist/Server/Utils/Workspace/Slack/Actions/IncidentEpisode.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/Slack/Actions/ScheduledMaintenance.js +91 -26
- package/build/dist/Server/Utils/Workspace/Slack/Actions/ScheduledMaintenance.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/Slack/Slack.js +355 -270
- package/build/dist/Server/Utils/Workspace/Slack/Slack.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/Workspace.js +21 -12
- package/build/dist/Server/Utils/Workspace/Workspace.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/WorkspaceBase.js +3 -1
- package/build/dist/Server/Utils/Workspace/WorkspaceBase.js.map +1 -1
- package/build/dist/Server/Utils/Workspace/WorkspaceMessages/Alert.js +9 -2
- package/build/dist/Server/Utils/Workspace/WorkspaceMessages/Alert.js.map +1 -1
- package/build/dist/Tests/Server/Middleware/UserAuthorization.test.js +1 -1
- package/build/dist/Tests/Server/Middleware/UserAuthorization.test.js.map +1 -1
- package/build/dist/Tests/Server/Services/AnalyticsDatabaseService.test.js +12 -6
- package/build/dist/Tests/Server/Services/AnalyticsDatabaseService.test.js.map +1 -1
- package/build/dist/UI/Components/BulkUpdate/BulkUpdateForm.js +31 -30
- package/build/dist/UI/Components/BulkUpdate/BulkUpdateForm.js.map +1 -1
- package/build/dist/UI/Components/Charts/Area/AreaChart.js +20 -2
- package/build/dist/UI/Components/Charts/Area/AreaChart.js.map +1 -1
- package/build/dist/UI/Components/Charts/ChartGroup/ChartGroup.js +2 -2
- package/build/dist/UI/Components/Charts/ChartGroup/ChartGroup.js.map +1 -1
- package/build/dist/UI/Components/Charts/ChartLibrary/AreaChart/AreaChart.js +9 -2
- package/build/dist/UI/Components/Charts/ChartLibrary/AreaChart/AreaChart.js.map +1 -1
- package/build/dist/UI/Components/Charts/ChartLibrary/LineChart/LineChart.js +9 -2
- package/build/dist/UI/Components/Charts/ChartLibrary/LineChart/LineChart.js.map +1 -1
- package/build/dist/UI/Components/Charts/ChartLibrary/Types/FormattedExemplarPoint.js +2 -0
- package/build/dist/UI/Components/Charts/ChartLibrary/Types/FormattedExemplarPoint.js.map +1 -0
- package/build/dist/UI/Components/Charts/Line/LineChart.js +20 -2
- package/build/dist/UI/Components/Charts/Line/LineChart.js.map +1 -1
- package/build/dist/UI/Components/Charts/Types/ExemplarPoint.js +2 -0
- package/build/dist/UI/Components/Charts/Types/ExemplarPoint.js.map +1 -0
- package/build/dist/UI/Components/Dictionary/Dictionary.js +9 -1
- package/build/dist/UI/Components/Dictionary/Dictionary.js.map +1 -1
- package/build/dist/UI/Components/Filters/FiltersForm.js +1 -1
- package/build/dist/UI/Components/Filters/FiltersForm.js.map +1 -1
- package/build/dist/UI/Components/Filters/JSONFilter.js +1 -1
- package/build/dist/UI/Components/Filters/JSONFilter.js.map +1 -1
- package/build/dist/UI/Components/Markdown.tsx/MarkdownViewer.js +3 -3
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js +9 -5
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js.map +1 -1
- package/build/dist/UI/Components/Navbar/NavBar.js +9 -1
- package/build/dist/UI/Components/Navbar/NavBar.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StatementGenerator.js","sourceRoot":"","sources":["../../../../../Server/Utils/AnalyticsDatabase/StatementGenerator.ts"],"names":[],"mappings":";;;;;;;;;AAMA,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,OAA6B,EAC3B,aAAa,GACd,MAAM,8CAA8C,CAAC;AACtD,OAAO,eAAe,MAAM,kDAAkD,CAAC;AAC/E,OAAO,WAAW,MAAM,yCAAyC,CAAC;AAClE,OAAO,kBAAkB,MAAM,gDAAgD,CAAC;AAChF,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,QAAQ,MAAM,sCAAsC,CAAC;AAC5D,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,QAAQ,MAAM,sCAAsC,CAAC;AAC5D,OAAO,eAAe,MAAM,6CAA6C,CAAC;AAC1E,OAAO,iBAAiB,MAAM,+CAA+C,CAAC;AAC9E,OAAO,cAAc,MAAM,4CAA4C,CAAC;AACxE,OAAO,QAAQ,MAAM,sCAAsC,CAAC;AAC5D,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAChD,OAAO,gBAAgB,MAAM,2CAA2C,CAAC;AAEzE,OAAO,aAAa,MAAM,8BAA8B,CAAC;AACzD,OAAoB,EAClB,aAAa,GACd,MAAM,2CAA2C,CAAC;AACnD,OAAO,WAAW,MAAM,0BAA0B,CAAC;AAEnD,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAKrC,YAAmB,IAGlB;QACC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;IAChC,CAAC;IAEM,iBAAiB,CAAC,QAA8B;QACrD,MAAM,YAAY,GAAc,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,cAAc,GAAc,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAExE,sCAAsC;QACtC,MAAM,SAAS,GAAc,GAAG,CAAA;0BACV,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,QAAS,IAC1D,IAAI,CAAC,KAAK,CAAC,SACb;oBACQ;aACb,MAAM,CAAC,YAAY,CAAC;aACpB,MAAM,CACL,GAAG,CAAA;wBACa,CACjB;aACA,MAAM,CAAC,cAAc,CAAC,CAAC;QAC1B,qCAAqC;QAErC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,mBAAmB,CAAC,CAAC;QACzD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,cAAc,CACnB,YAAyC;QAEzC,MAAM,WAAW,GAAkB,EAAE,CAAC;QACtC,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;YAClC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAEM,wBAAwB,CAAC,MAAuB;QACrD,IAAI,cAAc,GAAW,EAAE,CAAC;QAEhC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACvB,cAAc,IAAI,MAAM,CAAC;oBACzB,SAAS;gBACX,CAAC;gBAED,cAAc,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,cAAc,IAAI,GAAG,KAAK,IAAI,CAAC;YACjC,CAAC;QACH,CAAC;QAED,cAAc,GAAG,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,qBAAqB;QAE9F,OAAO,cAAc,CAAC;IACxB,CAAC;IAEM,kBAAkB,CAAC,OAA+B;QACvD,IAAI,SAAS,GAAW,EAAE,CAAC;QAC3B,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,SAAS,IAAI,IAAI,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,KAAK,CAAC;QAC9D,CAAC;QAED,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,qBAAqB;QAE/E,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,iBAAiB,CAAC,IAAiC;QACxD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,WAAW,GAAkB,IAAI,CAAC,cAAc,CACpD,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAC7B,CAAC;QAEF,MAAM,OAAO,GAA2B,EAAE,CAAC;QAE3C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACrD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QAED;;;WAGG;QAEH,MAAM,SAAS,GAAW,eACxB,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,QACvC,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS;;cAEd,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;;;UAG1B,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;SACjC,CAAC;QAEN,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,mBAAmB,CAAC,CAAC;QACzD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,SAAS,CAAC,IAAiB;QACjC,MAAM,MAAM,GAAoB,EAAE,CAAC;QAEnC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;YAC5C,MAAM,KAAK,GAA4B,IAAI,CAAC,aAAa,CACvD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,EAC/B,MAAM,CACP,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,mBAAmB,CAAC,GAAW;QACrC,4FAA4F;QAC5F,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC;IAC7C,CAAC;IAEO,aAAa,CACnB,KAA8B,EAC9B,MAA4B,EAC5B,OAEC;QAED,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YAC7C,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,EAAE,CAAC;gBAC3B,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,EAAE,CAAC;oBACzC,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,MAAM,EAAE,CAAC;oBAC3C,OAAO,CAAC,CAAC;gBACX,CAAC;YACH,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IACE,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,QAAQ;YACxC,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,EACpC,CAAC;YACD,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAClE,KAAK,GAAG,kCAAkC,aAAa,CAAC,QAAQ,CAC9D,KAAa,CACd,IAAI,CAAC;QACR,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,UAAU,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YACxE,KAAK,GAAG,kCAAkC,aAAa,CAAC,sBAAsB,CAC5E,KAAa,CACd,IAAI,CAAC;QACR,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,MAAM,EAAE,CAAC;YAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;YAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,WAAW,EAAE,CAAC;YAChD,KAAK,GAAG,IAAK,KAAuB;iBACjC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE;gBACjB,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;oBAC/B,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oBAClB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/B,CAAC;gBACD,OAAO,CAAC,CAAC;YACX,CAAC,CAAC;iBACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACnB,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,SAAS,EAAE,CAAC;YAC9C,KAAK,GAAG,IAAK,KAAuB;iBACjC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE;gBACjB,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC,CAAC;iBACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACnB,CAAC;QAED,IACE,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI;YACpC,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,SAAS,EACzC,CAAC;YACD,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,UAAU,EAAE,CAAC;YAC/C,KAAK,GAAG,QAAQ,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC;QAC1E,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,SAAS,EAAE,CAAC;YAC9C,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,cAAc,EAAE,CAAC;YACnD,KAAK,GAAG,IAAK,KAAuB;iBACjC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE;gBACjB,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;oBAC/B,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;oBAClB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/B,CAAC;gBACD,OAAO,CAAC,CAAC;YACX,CAAC,CAAC;iBACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACnB,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,eAAe,EAAE,CAAC;YACpD,MAAM,MAAM,GAA2B,KAA+B,CAAC;YACvE,MAAM,OAAO,GAAkB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CACvD,CAAC,CAAC,CAAC,EAAE,CAAC,CAAmB,EAAE,EAAE;gBAC3B,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,CAAC,CACF,CAAC;YACF,KAAK,GAAG,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACvC,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,cAAc,CAAC,IAAgB;QACpC,MAAM,YAAY,GAAc,IAAI,SAAS,EAAE,CAAC;QAEhD,IAAI,KAAK,GAAY,IAAI,CAAC;QAC1B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;YAC5C,MAAM,KAAK,GAA4B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACvE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,IAAI,KAAK,EAAE,CAAC;oBACV,KAAK,GAAG,KAAK,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,YAAY,CAAC,MAAM,CAAC,GAAG,CAAA,IAAI,CAAC,CAAC;gBAC/B,CAAC;gBAED;;;;mBAIG;gBACH,MAAM,YAAY,GAAW,MAAM,CAAC,GAAG,CAAC;gBAExC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CACtC,GAAG,CAAA,MAAM;oBACP,KAAK;oBACL,IAAI,EAAE,MAAM,CAAC,IAAI;iBAClB,EAAE,CACJ,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED;;OAEG;IACI,gBAAgB,CAAC,KAAwB;QAC9C,MAAM,cAAc,GAAc,IAAI,SAAS,EAAE,CAAC;QAElD,IAAI,KAAK,GAAY,IAAI,CAAC;QAC1B,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,KAAK,GAAQ,KAAK,CAAC,GAAG,CAAC,CAAC;YAC9B,MAAM,WAAW,GACf,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YAEjC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,IAAI,gBAAgB,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;YACvD,CAAC;YAED,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,GAAG,KAAK,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,MAAM,CAAC,GAAG,CAAA,GAAG,CAAC,CAAC;YAChC,CAAC;YAED,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;gBAC5B,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,UAAU;oBACrB,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,EAAE,CACJ,CAAC;YACJ,CAAC;iBAAM,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;gBACrC,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,OAAO;oBAClB,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,EAAE,CACJ,CAAC;YACJ,CAAC;iBAAM,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;gBACxC,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,MAAM;oBACjB,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,EAAE,CACJ,CAAC;YACJ,CAAC;iBAAM,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;gBACrC,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,MAAM;oBACjB,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,EAAE,CACJ,CAAC;YACJ,CAAC;iBAAM,IAAI,KAAK,YAAY,eAAe,EAAE,CAAC;gBAC5C,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,OAAO;oBAClB,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,EAAE,CACJ,CAAC;YACJ,CAAC;iBAAM,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;gBAC3C,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,QAAQ,GAAG,OAAO;oBACnB,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,OAAO,GAAG,WAAW,CACvB,CAAC;YACJ,CAAC;iBAAM,IAAI,KAAK,YAAY,iBAAiB,EAAE,CAAC;gBAC9C,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,QAAQ,GAAG,OAAO;oBACnB,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,OAAO,GAAG,WAAW,CACvB,CAAC;YACJ,CAAC;iBAAM,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;gBAC/C,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,OAAO;oBAClB,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,EAAE,CACJ,CAAC;YACJ,CAAC;iBAAM,IAAI,KAAK,YAAY,SAAS,EAAE,CAAC;gBACtC,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,OAAO;oBAClB,KAAK,EAAE,KAAK,CAAC,UAAU;oBACvB,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,QAAQ,GAAG,OAAO;oBACjB,KAAK,EAAE,KAAK,CAAC,QAAQ;oBACrB,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,EAAE,CACJ,CAAC;YACJ,CAAC;iBAAM,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;gBACrC,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,OAAO;oBAClB,KAAK,EAAE,KAAK;oBACZ,IAAI,EAAE,WAAW,CAAC,IAAI;iBACvB,EAAE,CACJ,CAAC;YACJ,CAAC;iBAAM,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;gBACnC,IAAI,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,EAAE,CAAC;oBAC9C,cAAc,CAAC,MAAM,CAAC,GAAG,CAAA,QAAQ,GAAG,eAAe,GAAG,QAAQ,CAAC,CAAC;gBAClE,CAAC;qBAAM,CAAC;oBACN,cAAc,CAAC,MAAM,CAAC,GAAG,CAAA,OAAO,GAAG,UAAU,CAAC,CAAC;gBACjD,CAAC;YACH,CAAC;iBAAM,IACL,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,eAAe;gBACpD,OAAO,KAAK,KAAK,QAAQ,EACzB,CAAC;gBACD,MAAM,QAAQ,GACZ,KAAgD,CAAC;gBACnD,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;oBAC9B,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;wBACnC,SAAS;oBACX,CAAC;oBACD,IAAI,QAAQ,CAAC,MAAM,CAAC,YAAY,MAAM,EAAE,CAAC;wBACvC,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,IAAI;4BACf,KAAK,EAAE,MAAM;4BACb,IAAI,EAAE,eAAe,CAAC,IAAI;yBAC3B,WAAW;4BACV,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAmB;4BACzC,IAAI,EAAE,eAAe,CAAC,IAAI;yBAC3B,EAAE,CACJ,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,IAAI;4BACf,KAAK,EAAE,MAAM;4BACb,IAAI,EAAE,eAAe,CAAC,IAAI;yBAC3B,OAAO;4BACN,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAW;4BACjC,IAAI,EAAE,eAAe,CAAC,IAAI;yBAC3B,EAAE,CACJ,CAAC;oBACJ,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,IACL,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI;gBACxC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,SAAS,CAAC;gBACjD,OAAO,KAAK,KAAK,QAAQ,EACzB,CAAC;gBACD,MAAM,SAAS,GAAe,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAEjE,KAAK,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC;oBAC/B,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;wBACpC,SAAS;oBACX,CAAC;oBAED,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,OAAO,SAAS,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;wBAC/D,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,yBAAyB,GAAG,KAAK;4BAClC,KAAK,EAAE,MAAM;4BACb,IAAI,EAAE,eAAe,CAAC,IAAI;yBAC3B,OAAO;4BACN,KAAK,EAAE,SAAS,CAAC,MAAM,CAAW;4BAClC,IAAI,EAAE,eAAe,CAAC,IAAI;yBAC3B,EAAE,CACJ,CAAC;wBACF,SAAS;oBACX,CAAC;oBAED,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,OAAO,SAAS,CAAC,MAAM,CAAC,KAAK,QAAQ,EAAE,CAAC;wBAC/D,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,sBAAsB,GAAG,KAAK;4BAC/B,KAAK,EAAE,MAAM;4BACb,IAAI,EAAE,eAAe,CAAC,IAAI;yBAC3B,OAAO;4BACN,KAAK,EAAE,SAAS,CAAC,MAAM,CAAW;4BAClC,IAAI,EAAE,eAAe,CAAC,MAAM;yBAC7B,EAAE,CACJ,CAAC;wBACF,SAAS;oBACX,CAAC;oBAED,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,OAAO,SAAS,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;wBAChE,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,uBAAuB,GAAG,KAAK;4BAChC,KAAK,EAAE,MAAM;4BACb,IAAI,EAAE,eAAe,CAAC,IAAI;yBAC3B,OAAO;4BACN,KAAK,EAAE,SAAS,CAAC,MAAM,CAAQ;4BAC/B,IAAI,EAAE,eAAe,CAAC,OAAO;yBAC9B,EAAE,CACJ,CAAC;wBACF,SAAS;oBACX,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,MAAM,CACnB,GAAG,CAAA,OAAO,GAAG,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,EAAE,CACvD,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;IAEM,kBAAkB,CAAC,OAA4B;QACpD,MAAM,gBAAgB,GAAc,IAAI,SAAS,EAAE,CAAC;QAEpD,IAAI,KAAK,GAAY,IAAI,CAAC;QAC1B,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpC,MAAM,IAAI,gBAAgB,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;YACvD,CAAC;YAED,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,GAAG,KAAK,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAA,IAAI,CAAC,CAAC;YACnC,CAAC;YACD,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAA,GAAG,GAAG,EAAE,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAEM,eAAe,CAAC,IAAsB;QAC3C,MAAM,aAAa,GAAc,IAAI,SAAS,EAAE,CAAC;QAEjD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpC,MAAM,IAAI,gBAAgB,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;YACvD,CAAC;YAED,MAAM,KAAK,GAAc,IAAI,CAAC,GAAG,CAAE,CAAC;YACpC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAA,GAAG,GAAG,GAAG,CAAC,CAAC,MAAM,CACvC;gBACE,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,GAAG,CAAA,KAAK;gBAC/B,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,GAAG,CAAA,MAAM;aAClC,CAAC,KAAK,CAAC,CACT,CAAC;QACJ,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,iBAAiB,CAAC,MAA0B;QAIjD,MAAM,eAAe,GAAc,IAAI,SAAS,EAAE,CAAC;QACnD,MAAM,OAAO,GAAkB,EAAE,CAAC;QAElC,IAAI,KAAK,GAAY,IAAI,CAAC;QAC1B,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,KAAK,GAAQ,MAAM,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;oBACpC,MAAM,IAAI,gBAAgB,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;gBACvD,CAAC;gBAED,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAClB,IAAI,KAAK,EAAE,CAAC;oBACV,KAAK,GAAG,KAAK,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,eAAe,CAAC,MAAM,CAAC,GAAG,CAAA,IAAI,CAAC,CAAC;gBAClC,CAAC;gBACD,eAAe,CAAC,MAAM,CAAC,GAAG,CAAA,GAAG,GAAG,EAAE,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QAED,OAAO;YACL,OAAO,EAAE,OAAO;YAChB,SAAS,EAAE,eAAe;SAC3B,CAAC;IACJ,CAAC;IAEM,0BAA0B,CAAC,WAAoC;QAIpE;;;WAGG;QAEH,MAAM,eAAe,GAAc,IAAI,SAAS,EAAE,CAAC;QAEnD,MAAM,iBAAiB,GACrB,WAAW,CAAC,eAAe,CAAC,iBAAiB,EAAE,CAAC;QAClD,MAAM,mBAAmB,GAAW,aAAa,CAAC,sBAAsB,CAAC;YACvE,SAAS,EAAE,WAAW,CAAC,cAAe;YACtC,OAAO,EAAE,WAAW,CAAC,YAAa;SACnC,CAAC,CAAC;QAEH,eAAe,CAAC,MAAM,CACpB,GAAG,iBAAiB,IAAI,WAAW,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,WAAW,CAAC,mBAAmB,CAAC,QAAQ,EAAE,iBAAiB,mBAAmB,CAAC,WAAW,EAAE,wBAAwB,WAAW,CAAC,8BAA8B,CAAC,QAAQ,EAAE,gBAAgB,mBAAmB,CAAC,WAAW,EAAE,SAAS,WAAW,CAAC,8BAA8B,CAAC,QAAQ,EAAE,EAAE,CACrW,CAAC;QAEF,MAAM,OAAO,GAAkB;YAC7B,WAAW,CAAC,mBAAmB,CAAC,QAAQ,EAAE;YAC1C,WAAW,CAAC,8BAA8B,CAAC,QAAQ,EAAE;SACtD,CAAC;QAEF,IAAI,WAAW,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvE,MAAM,gBAAgB,GAAc,IAAI,CAAC,kBAAkB,CACzD,WAAW,CAAC,OAAO,CACpB,CAAC;YACF,eAAe,CAAC,MAAM,CAAC,GAAG,CAAA,IAAI,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAEzD,kBAAkB;YAClB,KAAK,MAAM,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBACtC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QAED,OAAO;YACL,OAAO,EAAE,OAAO;YAChB,SAAS,EAAE,eAAe;SAC3B,CAAC;IACJ,CAAC;IAEM,uBAAuB,CAAC,UAAkB;QAC/C,OAAO,kDACL,IAAI,CAAC,KAAK,CAAC,SACb,qBACE,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,QACvC,iBAAiB,UAAU,GAAG,CAAC;IACjC,CAAC;IAGY,AAAN,KAAK,CAAC,uBAAuB,CAClC,aAAqB,EACrB,aAAqB;QAErB,MAAM,SAAS,GAAW,eACxB,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,QACvC,IACE,IAAI,CAAC,KAAK,CAAC,SACb,4BAA4B,aAAa,OAAO,aAAa,EAAE,CAAC;QAEhE,OAAO,GAAG,CAAA,GAAG,SAAS,EAAE,CAAC;IAC3B,CAAC;IAEM,wBAAwB,CAC7B,YAAyC;QAEzC,MAAM,OAAO,GAAc,IAAI,SAAS,EAAE,CAAC;QAE3C,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrD,MAAM,MAAM,GAAyB,YAAY,CAAC,CAAC,CAAE,CAAC;YAEtD,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACZ,OAAO,CAAC,MAAM,CAAC,GAAG,CAAA,IAAI,CAAC,CAAC;YAC1B,CAAC;YAED;;;eAGG;YACH,MAAM,YAAY,GAAW,MAAM,CAAC,GAAG,CAAC;YAExC,OAAO;iBACJ,MAAM,CAAC,YAAY,CAAC;iBACpB,MAAM,CAAC,GAAG,CAAA,GAAG,CAAC;iBACd,MAAM,CACL,MAAM,CAAC,QAAQ;gBACb,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC;gBAChC,CAAC,CAAC,GAAG,CAAA,WAAW;qBACX,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;qBACtC,MAAM,CAAC,GAAG,CAAA,GAAG,CAAC,CACtB,CAAC;YAEJ,4BAA4B;YAC5B,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjB,MAAM,QAAQ,GACZ,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS;oBAC9B,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG;oBAChD,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;gBACzB,OAAO,CAAC,MAAM,CAAC,UAAU,QAAQ,GAAG,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAED,+CAA+C;QAC/C,MAAM,gBAAgB,GAAgC,YAAY,CAAC,MAAM,CACvE,CAAC,GAAyB,EAAE,EAAE;YAC5B,OAAO,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC;QACrC,CAAC,CACF,CAAC;QAEF,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;YACnC,MAAM,GAAG,GAAsC,GAAG,CAAC,SAAU,CAAC;YAC9D,MAAM,SAAS,GACb,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E;;;eAGG;YACH,MAAM,kBAAkB,GACtB,CAAC,GAAG,CAAC,QAAQ;gBACb,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO;oBACjC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO,CAAC,CAAC;YACxC,MAAM,UAAU,GAAW,kBAAkB;gBAC3C,CAAC,CAAC,iBAAiB,GAAG,CAAC,GAAG,GAAG;gBAC7B,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;YACZ,OAAO,CAAC,MAAM,CACZ,WAAW,GAAG,CAAC,IAAI,IAAI,UAAU,SAAS,GAAG,CAAC,IAAI,GAAG,SAAS,gBAAgB,GAAG,CAAC,WAAW,EAAE,CAChG,CAAC;QACJ,CAAC;QAED,mCAAmC;QACnC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChE,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;gBAChD,OAAO,CAAC,MAAM,CAAC,gBAAgB,UAAU,CAAC,IAAI,KAAK,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC;YAC1E,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,iBAAiB,CACtB,cAAsB;QAEtB,OAAO;YACL,MAAM,EAAE,eAAe,CAAC,IAAI;YAC5B,KAAK,EAAE,eAAe,CAAC,MAAM;YAC7B,KAAK,EAAE,eAAe,CAAC,SAAS;YAChC,MAAM,EAAE,eAAe,CAAC,UAAU;YAClC,OAAO,EAAE,eAAe,CAAC,OAAO;YAChC,OAAO,EAAE,eAAe,CAAC,OAAO;YAChC,QAAQ,EAAE,eAAe,CAAC,IAAI;YAC9B,eAAe,EAAE,eAAe,CAAC,UAAU;YAC3C,eAAe,EAAE,eAAe,CAAC,SAAS;YAC1C,cAAc,EAAE,eAAe,CAAC,WAAW;YAC3C,cAAc,EAAE,eAAe,CAAC,cAAc;YAC9C,qBAAqB,EAAE,eAAe,CAAC,eAAe;YACtD,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,wBAAwB;YACpD,IAAI,EAAE,eAAe,CAAC,OAAO;SAC9B,CAAC,cAAc,CAAC,CAAC;IACpB,CAAC;IAEM,YAAY,CAAC,IAAqB;QACvC,MAAM,SAAS,GAA0B;YACvC,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAA,QAAQ;YACnC,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAA,QAAQ;YACvC,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,CAAA,MAAM;YACpC,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,GAAG,CAAA,OAAO;YACpC,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,CAAA,QAAQ;YACtC,CAAC,eAAe,CAAC,EAAE,CAAC,EAAE,GAAG,CAAA,QAAQ;YACjC,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAA,QAAQ;YACnC,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAA,UAAU;YACrC,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,GAAG,CAAA,eAAe;YAChD,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAA,QAAQ,EAAE,2FAA2F;YAChI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,GAAG,CAAA,QAAQ,EAAE,2FAA2F;YACrI,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,GAAG,CAAA,cAAc;YAChD,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,GAAG,CAAA,cAAc;YACnD,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,GAAG,CAAA,eAAe;YAC/C,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,GAAG,CAAA,QAAQ;YACzC,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,GAAG,CAAA,OAAO;YACvC,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,GAAG,CAAA,qBAAqB;SAC5D,CAAC,IAAI,CAAC,CAAC;QAER,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,gBAAgB,CACxB,wBAAwB,IAAI,4CAA4C,CACzE,CAAC;QACJ,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,0BAA0B,CAAC,UAAkB;QAClD,MAAM,SAAS,GAAW,kDACxB,IAAI,CAAC,KAAK,CAAC,SACb,qBAAqB,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE;aACtD,QAAS,iBAAiB,UAAU,GAAG,CAAC;QAE3C,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,8BAA8B,CAAC,CAAC;QACpE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,oBAAoB,CAAC,MAA4B;QACtD,8FAA8F;QAC9F,MAAM,SAAS,GAAc,IAAI,SAAS,EAAE,CAAC;QAE7C,SAAS;aACN,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;aAClB,MAAM,CAAC,GAAG,CAAA,GAAG,CAAC;aACd,MAAM,CACL,MAAM,CAAC,QAAQ;YACb,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC;YAChC,CAAC,CAAC,GAAG,CAAA,WAAW;iBACX,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;iBACtC,MAAM,CAAC,GAAG,CAAA,GAAG,CAAC,CACtB,CAAC;QAEJ,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,QAAQ,GACZ,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS;gBAC9B,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG;gBAChD,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC;YACzB,SAAS,CAAC,MAAM,CAAC,UAAU,QAAQ,GAAG,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,SAAS,GAAc,GAAG,CAAA;0BACV,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,QAAS,IAC1D,IAAI,CAAC,KAAK,CAAC,SACb,4BAA4B,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAEvD,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,uBAAuB,CAAC,CAAC;QAC7D,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,uBAAuB,CAC5B,MAA4B;QAE5B,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,GAAG,GAAsC,MAAM,CAAC,SAAS,CAAC;QAChE,MAAM,SAAS,GACb,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAE1E,MAAM,kBAAkB,GACtB,CAAC,MAAM,CAAC,QAAQ;YAChB,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO;gBACjC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,UAAU,GAAW,kBAAkB;YAC3C,CAAC,CAAC,iBAAiB,MAAM,CAAC,GAAG,GAAG;YAChC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QAEf,MAAM,YAAY,GAAW,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,QAAS,CAAC;QAC5E,MAAM,SAAS,GAAc,IAAI,SAAS,EAAE,CAAC;QAC7C,SAAS,CAAC,MAAM,CACd,eAAe,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,4BAA4B,GAAG,CAAC,IAAI,IAAI,UAAU,SAAS,GAAG,CAAC,IAAI,GAAG,SAAS,gBAAgB,GAAG,CAAC,WAAW,EAAE,CACpK,CAAC;QAEF,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,2BAA2B,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,qBAAqB,CAAC,UAAkB;QAC7C,MAAM,SAAS,GAAW,eAAe,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE;aAC1E,QAAS,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,0BAA0B,UAAU,EAAE,CAAC;QAE3E,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,wBAAwB,CAAC,CAAC;QAC9D,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,sBAAsB;QAC3B,MAAM,YAAY,GAAW,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC,QAAS,CAAC;QAC5E,MAAM,gBAAgB,GAAc,IAAI,CAAC,wBAAwB,CAC/D,IAAI,CAAC,KAAK,CAAC,YAAY,CACxB,CAAC;QAEF;;;WAGG;QACH,MAAM,oBAAoB,GAAW,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;QAE5D,MAAM,YAAY,GAAW,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;QAErD,MAAM,SAAS,GAAc,GAAG,CAAA;yCACK,YAAY,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS;gBAC7D;aACT,MAAM,CAAC,gBAAgB,CAAC;aACxB,MAAM,CACL,GAAG,CAAA;;sBAEW,CACf;aACA,MAAM,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC;wBACnB,YAAY;SAC3B,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;0BACK,CAAC,CAAC;QAExB,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/D,MAAM,GAAG,GAAW,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAE,CAAC;YAC/C,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACZ,SAAS,CAAC,MAAM,CAAC,GAAG,CAAA,IAAI,CAAC,CAAC;YAC5B,CAAC;YACD,SAAS,CAAC,MAAM,CAAC,GAAG,CAAA,GAAG,GAAG,EAAE,CAAC,CAAC;QAChC,CAAC;QAED,SAAS,CAAC,MAAM,CAAC,GAAG,CAAA;uBACD,CAAC,CAAC;QAErB,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5D,MAAM,GAAG,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC;YAC5C,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACZ,SAAS,CAAC,MAAM,CAAC,GAAG,CAAA,IAAI,CAAC,CAAC;YAC5B,CAAC;YACD,SAAS,CAAC,MAAM,CAAC,GAAG,CAAA,GAAG,GAAG,EAAE,CAAC,CAAC;QAChC,CAAC;QAED,SAAS,CAAC,MAAM,CAAC,GAAG,CAAA,GAAG,CAAC,CAAC;QAEzB,0BAA0B;QAC1B,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;YAC7B,SAAS,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC;QACxD,CAAC;QAED,qCAAqC;QAErC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,yBAAyB,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAhSc;IADZ,WAAW,EAAE;;;;iEAYb"}
|
|
1
|
+
{"version":3,"file":"StatementGenerator.js","sourceRoot":"","sources":["../../../../../Server/Utils/AnalyticsDatabase/StatementGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,8 +61,12 @@ export default class CodeRepositoryUtil {
|
|
|
61
61
|
await this.runGitCommand(data.repoPath, ["checkout", data.branchName]);
|
|
62
62
|
}
|
|
63
63
|
catch (error) {
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
const branchLogAttributes = {
|
|
65
|
+
repoPath: data.repoPath,
|
|
66
|
+
branchName: data.branchName,
|
|
67
|
+
};
|
|
68
|
+
logger.debug(`Branch ${data.branchName} not found. Creating a new branch instead.`, branchLogAttributes);
|
|
69
|
+
logger.debug(error, branchLogAttributes);
|
|
66
70
|
await this.runGitCommand(data.repoPath, [
|
|
67
71
|
"checkout",
|
|
68
72
|
"-b",
|
|
@@ -92,25 +96,36 @@ export default class CodeRepositoryUtil {
|
|
|
92
96
|
}
|
|
93
97
|
static async deleteDirectory(data) {
|
|
94
98
|
const totalPath = LocalFile.sanitizeFilePath(`${data.repoPath}/${data.directoryPath}`);
|
|
95
|
-
logger.debug("Deleting directory: " + totalPath
|
|
99
|
+
logger.debug("Deleting directory: " + totalPath, {
|
|
100
|
+
repoPath: data.repoPath,
|
|
101
|
+
directoryPath: data.directoryPath,
|
|
102
|
+
});
|
|
96
103
|
await LocalFile.deleteDirectory(totalPath);
|
|
97
104
|
}
|
|
98
105
|
static async createBranch(data) {
|
|
99
|
-
|
|
106
|
+
const createBranchLogAttributes = {
|
|
107
|
+
repoPath: data.repoPath,
|
|
108
|
+
branchName: data.branchName,
|
|
109
|
+
};
|
|
110
|
+
logger.debug(`Creating git branch '${data.branchName}' in ${path.resolve(data.repoPath)}`, createBranchLogAttributes);
|
|
100
111
|
const stdout = await this.runGitCommand(data.repoPath, [
|
|
101
112
|
"checkout",
|
|
102
113
|
"-b",
|
|
103
114
|
data.branchName,
|
|
104
115
|
]);
|
|
105
|
-
logger.debug(stdout);
|
|
116
|
+
logger.debug(stdout, createBranchLogAttributes);
|
|
106
117
|
}
|
|
107
118
|
static async checkoutBranch(data) {
|
|
108
|
-
|
|
119
|
+
const checkoutLogAttributes = {
|
|
120
|
+
repoPath: data.repoPath,
|
|
121
|
+
branchName: data.branchName,
|
|
122
|
+
};
|
|
123
|
+
logger.debug(`Checking out git branch '${data.branchName}' in ${path.resolve(data.repoPath)}`, checkoutLogAttributes);
|
|
109
124
|
const stdout = await this.runGitCommand(data.repoPath, [
|
|
110
125
|
"checkout",
|
|
111
126
|
data.branchName,
|
|
112
127
|
]);
|
|
113
|
-
logger.debug(stdout);
|
|
128
|
+
logger.debug(stdout, checkoutLogAttributes);
|
|
114
129
|
}
|
|
115
130
|
static async addFilesToGit(data) {
|
|
116
131
|
const repoRoot = path.resolve(data.repoPath);
|
|
@@ -129,34 +144,43 @@ export default class CodeRepositoryUtil {
|
|
|
129
144
|
}
|
|
130
145
|
sanitizedRelativeFilePaths.push(LocalFile.sanitizeFilePath(relativeFilePath));
|
|
131
146
|
}
|
|
147
|
+
const addFilesLogAttributes = {
|
|
148
|
+
repoPath: data.repoPath,
|
|
149
|
+
};
|
|
132
150
|
if (sanitizedRelativeFilePaths.length === 0) {
|
|
133
|
-
logger.debug("git add skipped because no file paths were provided");
|
|
151
|
+
logger.debug("git add skipped because no file paths were provided", addFilesLogAttributes);
|
|
134
152
|
return;
|
|
135
153
|
}
|
|
136
|
-
logger.debug(`Adding ${sanitizedRelativeFilePaths.length} file(s) to git in ${path.resolve(data.repoPath)}
|
|
154
|
+
logger.debug(`Adding ${sanitizedRelativeFilePaths.length} file(s) to git in ${path.resolve(data.repoPath)}`, addFilesLogAttributes);
|
|
137
155
|
const stdout = await this.runGitCommand(data.repoPath, [
|
|
138
156
|
"add",
|
|
139
157
|
...sanitizedRelativeFilePaths,
|
|
140
158
|
]);
|
|
141
|
-
logger.debug(stdout);
|
|
159
|
+
logger.debug(stdout, addFilesLogAttributes);
|
|
142
160
|
}
|
|
143
161
|
static async setUsername(data) {
|
|
144
|
-
|
|
162
|
+
const setUsernameLogAttributes = {
|
|
163
|
+
repoPath: data.repoPath,
|
|
164
|
+
};
|
|
165
|
+
logger.debug(`Setting git user.name in ${path.resolve(data.repoPath)}`, setUsernameLogAttributes);
|
|
145
166
|
const stdout = await this.runGitCommand(data.repoPath, [
|
|
146
167
|
"config",
|
|
147
168
|
"user.name",
|
|
148
169
|
data.username,
|
|
149
170
|
]);
|
|
150
|
-
logger.debug(stdout);
|
|
171
|
+
logger.debug(stdout, setUsernameLogAttributes);
|
|
151
172
|
}
|
|
152
173
|
static async commitChanges(data) {
|
|
153
|
-
|
|
174
|
+
const commitLogAttributes = {
|
|
175
|
+
repoPath: data.repoPath,
|
|
176
|
+
};
|
|
177
|
+
logger.debug("Executing git commit", commitLogAttributes);
|
|
154
178
|
const stdout = await Execute.executeCommandFile({
|
|
155
179
|
command: "git",
|
|
156
180
|
args: ["commit", "-m", data.message],
|
|
157
181
|
cwd: data.repoPath,
|
|
158
182
|
});
|
|
159
|
-
logger.debug(stdout);
|
|
183
|
+
logger.debug(stdout, commitLogAttributes);
|
|
160
184
|
}
|
|
161
185
|
static async getGitCommitHashForFile(data) {
|
|
162
186
|
if (!data.filePath.startsWith("/")) {
|
|
@@ -170,14 +194,18 @@ export default class CodeRepositoryUtil {
|
|
|
170
194
|
const absoluteTarget = this.resolvePathWithinRepo(repoPath, filePath);
|
|
171
195
|
const relativeTarget = path.relative(repoRoot, absoluteTarget);
|
|
172
196
|
const gitArgument = LocalFile.sanitizeFilePath(`./${relativeTarget}`);
|
|
173
|
-
|
|
197
|
+
const commitHashLogAttributes = {
|
|
198
|
+
repoPath: data.repoPath,
|
|
199
|
+
filePath: data.filePath,
|
|
200
|
+
};
|
|
201
|
+
logger.debug(`Getting last commit hash for ${gitArgument} in ${repoRoot}`, commitHashLogAttributes);
|
|
174
202
|
const hash = await this.runGitCommand(repoRoot, [
|
|
175
203
|
"log",
|
|
176
204
|
"-1",
|
|
177
205
|
"--pretty=format:%H",
|
|
178
206
|
gitArgument,
|
|
179
207
|
]);
|
|
180
|
-
logger.debug(hash);
|
|
208
|
+
logger.debug(hash, commitHashLogAttributes);
|
|
181
209
|
return hash.trim();
|
|
182
210
|
}
|
|
183
211
|
static async listFilesInDirectory(data) {
|
|
@@ -269,7 +297,7 @@ export default class CodeRepositoryUtil {
|
|
|
269
297
|
.map((arg) => {
|
|
270
298
|
return arg.includes(" ") ? `"${arg}"` : arg;
|
|
271
299
|
})
|
|
272
|
-
.join(" ")}
|
|
300
|
+
.join(" ")}`, { repoPath });
|
|
273
301
|
return Execute.executeCommandFile({
|
|
274
302
|
command: "git",
|
|
275
303
|
args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CodeRepository.js","sourceRoot":"","sources":["../../../../../Server/Utils/CodeRepository/CodeRepository.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CodeRepository.js","sourceRoot":"","sources":["../../../../../Server/Utils/CodeRepository/CodeRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Express.js","sourceRoot":"","sources":["../../../../Server/Utils/Express.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,UAAU,CAAC;AAY9B,OAAO,KAAK,CAAC;AACb,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAU,YAAY,EAAE,MAAM,MAAM,CAAC;AAK5C,MAAM,CAAC,MAAM,aAAa,GAAoB,OAAO,CAAC,MAAM,CAAC;AAC7D,MAAM,CAAC,MAAM,WAAW,GAAoB,OAAO,CAAC,IAAI,CAAC;AACzD,MAAM,CAAC,MAAM,iBAAiB,GAAoB,OAAO,CAAC,UAAU,CAAC;AACrE,MAAM,CAAC,MAAM,UAAU,GAAoB,OAAO,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"Express.js","sourceRoot":"","sources":["../../../../Server/Utils/Express.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,35 +44,38 @@ export default class GreenlockUtil {
|
|
|
44
44
|
isRoot: true,
|
|
45
45
|
},
|
|
46
46
|
});
|
|
47
|
-
logger.debug(`Found ${certificates.length} certificates which are expiring soon
|
|
47
|
+
logger.debug(`Found ${certificates.length} certificates which are expiring soon`, { certificateCount: certificates.length });
|
|
48
48
|
// order certificate for each domain
|
|
49
49
|
for (const certificate of certificates) {
|
|
50
50
|
if (!certificate.domain) {
|
|
51
51
|
continue;
|
|
52
52
|
}
|
|
53
|
-
|
|
53
|
+
const certLogAttributes = {
|
|
54
|
+
domain: certificate.domain,
|
|
55
|
+
};
|
|
56
|
+
logger.debug(`Renewing certificate for domain: ${certificate.domain}`, certLogAttributes);
|
|
54
57
|
try {
|
|
55
58
|
//validate cname
|
|
56
59
|
const isValidCname = await data.validateCname(certificate.domain);
|
|
57
60
|
if (!isValidCname) {
|
|
58
|
-
logger.debug(`CNAME is not valid for domain: ${certificate.domain}
|
|
61
|
+
logger.debug(`CNAME is not valid for domain: ${certificate.domain}`, certLogAttributes);
|
|
59
62
|
// if cname is not valid then remove the domain
|
|
60
63
|
await GreenlockUtil.removeDomain(certificate.domain);
|
|
61
64
|
await data.notifyDomainRemoved(certificate.domain);
|
|
62
|
-
logger.error(`Cname is not valid for domain: ${certificate.domain}
|
|
65
|
+
logger.error(`Cname is not valid for domain: ${certificate.domain}`, certLogAttributes);
|
|
63
66
|
}
|
|
64
67
|
else {
|
|
65
|
-
logger.debug(`CNAME is valid for domain: ${certificate.domain}
|
|
68
|
+
logger.debug(`CNAME is valid for domain: ${certificate.domain}`, certLogAttributes);
|
|
66
69
|
await GreenlockUtil.orderCert({
|
|
67
70
|
domain: certificate.domain,
|
|
68
71
|
validateCname: data.validateCname,
|
|
69
72
|
});
|
|
70
|
-
logger.debug(`Certificate renewed for domain: ${certificate.domain}
|
|
73
|
+
logger.debug(`Certificate renewed for domain: ${certificate.domain}`, certLogAttributes);
|
|
71
74
|
}
|
|
72
75
|
}
|
|
73
76
|
catch (e) {
|
|
74
|
-
logger.error(`Error renewing certificate for domain: ${certificate.domain}
|
|
75
|
-
logger.error(e);
|
|
77
|
+
logger.error(`Error renewing certificate for domain: ${certificate.domain}`, certLogAttributes);
|
|
78
|
+
logger.error(e, certLogAttributes);
|
|
76
79
|
}
|
|
77
80
|
}
|
|
78
81
|
}
|
|
@@ -97,15 +100,19 @@ export default class GreenlockUtil {
|
|
|
97
100
|
});
|
|
98
101
|
}
|
|
99
102
|
catch (err) {
|
|
100
|
-
logger.error(`Error removing domain: ${domain}
|
|
103
|
+
logger.error(`Error removing domain: ${domain}`, { domain });
|
|
101
104
|
throw err;
|
|
102
105
|
}
|
|
103
106
|
}
|
|
104
107
|
static async orderCert(data) {
|
|
108
|
+
const orderLogAttributes = {
|
|
109
|
+
domain: data.domain,
|
|
110
|
+
};
|
|
105
111
|
try {
|
|
106
|
-
logger.debug(`GreenlockUtil - Ordering certificate for domain: ${data.domain}
|
|
112
|
+
logger.debug(`GreenlockUtil - Ordering certificate for domain: ${data.domain}`, orderLogAttributes);
|
|
107
113
|
let { domain } = data;
|
|
108
114
|
domain = domain.trim().toLowerCase();
|
|
115
|
+
orderLogAttributes["domain"] = domain;
|
|
109
116
|
const acmeAccountKeyInBase64 = LetsEncryptAccountKey;
|
|
110
117
|
if (!acmeAccountKeyInBase64) {
|
|
111
118
|
throw new ServerException("No lets encrypt account key found in environment variables. Please add one.");
|
|
@@ -113,16 +120,16 @@ export default class GreenlockUtil {
|
|
|
113
120
|
let acmeAccountKey = Buffer.from(acmeAccountKeyInBase64, "base64").toString();
|
|
114
121
|
acmeAccountKey = Text.replaceAll(acmeAccountKey, "\\n", "\n");
|
|
115
122
|
//validate cname
|
|
116
|
-
logger.debug(`Validating cname for domain: ${domain}
|
|
123
|
+
logger.debug(`Validating cname for domain: ${domain}`, orderLogAttributes);
|
|
117
124
|
const isValidCname = await data.validateCname(domain);
|
|
118
125
|
if (!isValidCname) {
|
|
119
|
-
logger.debug(`CNAME is not valid for domain: ${domain}
|
|
120
|
-
logger.debug(`Removing domain: ${domain}
|
|
126
|
+
logger.debug(`CNAME is not valid for domain: ${domain}`, orderLogAttributes);
|
|
127
|
+
logger.debug(`Removing domain: ${domain}`, orderLogAttributes);
|
|
121
128
|
await GreenlockUtil.removeDomain(domain);
|
|
122
|
-
logger.error(`Cname is not valid for domain: ${domain}
|
|
129
|
+
logger.error(`Cname is not valid for domain: ${domain}`, orderLogAttributes);
|
|
123
130
|
throw new BadDataException("Cname is not valid for domain " + domain);
|
|
124
131
|
}
|
|
125
|
-
logger.debug(`Cname is valid for domain: ${domain}
|
|
132
|
+
logger.debug(`Cname is valid for domain: ${domain}`, orderLogAttributes);
|
|
126
133
|
const client = new acme.Client({
|
|
127
134
|
directoryUrl: acme.directory.letsencrypt.production,
|
|
128
135
|
accountKey: acmeAccountKey,
|
|
@@ -130,7 +137,7 @@ export default class GreenlockUtil {
|
|
|
130
137
|
const [certificateKey, certificateRequest] = await acme.crypto.createCsr({
|
|
131
138
|
commonName: domain,
|
|
132
139
|
});
|
|
133
|
-
logger.debug(`Ordering certificate for domain: ${domain}
|
|
140
|
+
logger.debug(`Ordering certificate for domain: ${domain}`, orderLogAttributes);
|
|
134
141
|
const certificate = await client.auto({
|
|
135
142
|
csr: certificateRequest,
|
|
136
143
|
email: LetsEncryptNotificationEmail.toString(),
|
|
@@ -140,7 +147,7 @@ export default class GreenlockUtil {
|
|
|
140
147
|
// Satisfy challenge here
|
|
141
148
|
/* http-01 */
|
|
142
149
|
if (challenge.type === "http-01") {
|
|
143
|
-
logger.debug(`Creating challenge for domain: ${authz.identifier.value}
|
|
150
|
+
logger.debug(`Creating challenge for domain: ${authz.identifier.value}`, orderLogAttributes);
|
|
144
151
|
const acmeChallenge = new AcmeChallenge();
|
|
145
152
|
acmeChallenge.challenge = keyAuthorization;
|
|
146
153
|
acmeChallenge.token = challenge.token;
|
|
@@ -151,12 +158,12 @@ export default class GreenlockUtil {
|
|
|
151
158
|
isRoot: true,
|
|
152
159
|
},
|
|
153
160
|
});
|
|
154
|
-
logger.debug(`Challenge created for domain: ${authz.identifier.value}
|
|
161
|
+
logger.debug(`Challenge created for domain: ${authz.identifier.value}`, orderLogAttributes);
|
|
155
162
|
}
|
|
156
163
|
},
|
|
157
164
|
challengeRemoveFn: async (authz, challenge) => {
|
|
158
165
|
// Clean up challenge here
|
|
159
|
-
logger.debug(`Removing challenge for domain: ${authz.identifier.value}
|
|
166
|
+
logger.debug(`Removing challenge for domain: ${authz.identifier.value}`, orderLogAttributes);
|
|
160
167
|
if (challenge.type === "http-01") {
|
|
161
168
|
await AcmeChallengeService.deleteBy({
|
|
162
169
|
query: {
|
|
@@ -169,16 +176,16 @@ export default class GreenlockUtil {
|
|
|
169
176
|
},
|
|
170
177
|
});
|
|
171
178
|
}
|
|
172
|
-
logger.debug(`Challenge removed for domain: ${authz.identifier.value}
|
|
179
|
+
logger.debug(`Challenge removed for domain: ${authz.identifier.value}`, orderLogAttributes);
|
|
173
180
|
},
|
|
174
181
|
});
|
|
175
|
-
logger.debug(`Certificate ordered for domain: ${domain}
|
|
182
|
+
logger.debug(`Certificate ordered for domain: ${domain}`, orderLogAttributes);
|
|
176
183
|
// get expires at date from certificate
|
|
177
184
|
const cert = acme.crypto.readCertificateInfo(certificate);
|
|
178
185
|
const issuedAt = cert.notBefore;
|
|
179
186
|
const expiresAt = cert.notAfter;
|
|
180
|
-
logger.debug(`Certificate expires at: ${expiresAt}
|
|
181
|
-
logger.debug(`Certificate issued at: ${issuedAt}
|
|
187
|
+
logger.debug(`Certificate expires at: ${expiresAt}`, orderLogAttributes);
|
|
188
|
+
logger.debug(`Certificate issued at: ${issuedAt}`, orderLogAttributes);
|
|
182
189
|
// check if the certificate is already in the database.
|
|
183
190
|
const existingCertificate = await AcmeCertificateService.findOneBy({
|
|
184
191
|
query: {
|
|
@@ -192,7 +199,7 @@ export default class GreenlockUtil {
|
|
|
192
199
|
},
|
|
193
200
|
});
|
|
194
201
|
if (existingCertificate) {
|
|
195
|
-
logger.debug(`Updating certificate for domain: ${domain}
|
|
202
|
+
logger.debug(`Updating certificate for domain: ${domain}`, orderLogAttributes);
|
|
196
203
|
// update the certificate
|
|
197
204
|
await AcmeCertificateService.updateBy({
|
|
198
205
|
query: {
|
|
@@ -210,10 +217,10 @@ export default class GreenlockUtil {
|
|
|
210
217
|
isRoot: true,
|
|
211
218
|
},
|
|
212
219
|
});
|
|
213
|
-
logger.debug(`Certificate updated for domain: ${domain}
|
|
220
|
+
logger.debug(`Certificate updated for domain: ${domain}`, orderLogAttributes);
|
|
214
221
|
}
|
|
215
222
|
else {
|
|
216
|
-
logger.debug(`Creating certificate for domain: ${domain}
|
|
223
|
+
logger.debug(`Creating certificate for domain: ${domain}`, orderLogAttributes);
|
|
217
224
|
// create the certificate
|
|
218
225
|
const acmeCertificate = new AcmeCertificate();
|
|
219
226
|
acmeCertificate.domain = domain;
|
|
@@ -227,12 +234,12 @@ export default class GreenlockUtil {
|
|
|
227
234
|
isRoot: true,
|
|
228
235
|
},
|
|
229
236
|
});
|
|
230
|
-
logger.debug(`Certificate created for domain: ${domain}
|
|
237
|
+
logger.debug(`Certificate created for domain: ${domain}`, orderLogAttributes);
|
|
231
238
|
}
|
|
232
239
|
}
|
|
233
240
|
catch (e) {
|
|
234
|
-
logger.error(`Error ordering certificate for domain: ${data.domain}
|
|
235
|
-
logger.error(e);
|
|
241
|
+
logger.error(`Error ordering certificate for domain: ${data.domain}`, orderLogAttributes);
|
|
242
|
+
logger.error(e, orderLogAttributes);
|
|
236
243
|
if (e instanceof Exception) {
|
|
237
244
|
throw e;
|
|
238
245
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Greenlock.js","sourceRoot":"","sources":["../../../../../Server/Utils/Greenlock/Greenlock.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,oBAAoB,MAAM,qCAAqC,CAAC;AACvE,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"Greenlock.js","sourceRoot":"","sources":["../../../../../Server/Utils/Greenlock/Greenlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,9 +57,13 @@ export default class LLMService {
|
|
|
57
57
|
timeout: 120000, // 2 minutes timeout for LLM calls
|
|
58
58
|
},
|
|
59
59
|
});
|
|
60
|
+
const openAILogAttributes = {
|
|
61
|
+
llmType: config.llmType,
|
|
62
|
+
modelName: modelName,
|
|
63
|
+
};
|
|
60
64
|
if (response instanceof HTTPErrorResponse) {
|
|
61
|
-
logger.error("Error from OpenAI API:");
|
|
62
|
-
logger.error(response);
|
|
65
|
+
logger.error("Error from OpenAI API:", openAILogAttributes);
|
|
66
|
+
logger.error(response, openAILogAttributes);
|
|
63
67
|
throw new BadDataException(`OpenAI API error: ${JSON.stringify(response.jsonData)}`);
|
|
64
68
|
}
|
|
65
69
|
const jsonData = response.jsonData;
|
|
@@ -123,9 +127,13 @@ export default class LLMService {
|
|
|
123
127
|
timeout: 120000,
|
|
124
128
|
},
|
|
125
129
|
});
|
|
130
|
+
const anthropicLogAttributes = {
|
|
131
|
+
llmType: config.llmType,
|
|
132
|
+
modelName: modelName,
|
|
133
|
+
};
|
|
126
134
|
if (response instanceof HTTPErrorResponse) {
|
|
127
|
-
logger.error("Error from Anthropic API:");
|
|
128
|
-
logger.error(response);
|
|
135
|
+
logger.error("Error from Anthropic API:", anthropicLogAttributes);
|
|
136
|
+
logger.error(response, anthropicLogAttributes);
|
|
129
137
|
throw new BadDataException(`Anthropic API error: ${JSON.stringify(response.jsonData)}`);
|
|
130
138
|
}
|
|
131
139
|
const jsonData = response.jsonData;
|
|
@@ -182,9 +190,13 @@ export default class LLMService {
|
|
|
182
190
|
timeout: 300000, // 5 minutes for Ollama as it may be slower
|
|
183
191
|
},
|
|
184
192
|
});
|
|
193
|
+
const ollamaLogAttributes = {
|
|
194
|
+
llmType: config.llmType,
|
|
195
|
+
modelName: modelName,
|
|
196
|
+
};
|
|
185
197
|
if (response instanceof HTTPErrorResponse) {
|
|
186
|
-
logger.error("Error from Ollama API:");
|
|
187
|
-
logger.error(response);
|
|
198
|
+
logger.error("Error from Ollama API:", ollamaLogAttributes);
|
|
199
|
+
logger.error(response, ollamaLogAttributes);
|
|
188
200
|
throw new BadDataException(`Ollama API error: ${JSON.stringify(response.jsonData)}`);
|
|
189
201
|
}
|
|
190
202
|
const jsonData = response.jsonData;
|