From fa9dd5bd9438d16dab75cb45fbdfbac2eb001458 Mon Sep 17 00:00:00 2001 From: SuhorukovAnton Date: Thu, 27 Oct 2022 15:37:26 +0300 Subject: [PATCH] rename singnalR to socket --- common/ASC.Core.Common/GlobalUsings.cs | 2 +- ...Logger.cs => SocketServiceClientLogger.cs} | 6 +- .../Notify/Signalr/MailNotificationState.cs | 2 +- ...erviceClient.cs => SocketServiceClient.cs} | 730 +++++++++--------- .../ASC.Feed.Aggregator/GlobalUsings.cs | 2 +- .../Service/FeedAggregatorService.cs | 8 +- products/ASC.Files/Core/GlobalUsings.cs | 2 +- .../ASC.Files/Core/Utils/SocketManager.cs | 16 +- 8 files changed, 384 insertions(+), 384 deletions(-) rename common/ASC.Core.Common/Log/{SignalrServiceClientLogger.cs => SocketServiceClientLogger.cs} (85%) rename common/ASC.Core.Common/Notify/Signalr/{SignalrServiceClient.cs => SocketServiceClient.cs} (91%) diff --git a/common/ASC.Core.Common/GlobalUsings.cs b/common/ASC.Core.Common/GlobalUsings.cs index 2a4a9de3d5..aeb31933dc 100644 --- a/common/ASC.Core.Common/GlobalUsings.cs +++ b/common/ASC.Core.Common/GlobalUsings.cs @@ -99,7 +99,7 @@ global using ASC.Core.Data; global using ASC.Core.Notify; global using ASC.Core.Notify.Jabber; global using ASC.Core.Notify.Senders; -global using ASC.Core.Notify.Signalr; +global using ASC.Core.Notify.Socket; global using ASC.Core.Security.Authentication; global using ASC.Core.Security.Authorizing; global using ASC.Core.Tenants; diff --git a/common/ASC.Core.Common/Log/SignalrServiceClientLogger.cs b/common/ASC.Core.Common/Log/SocketServiceClientLogger.cs similarity index 85% rename from common/ASC.Core.Common/Log/SignalrServiceClientLogger.cs rename to common/ASC.Core.Common/Log/SocketServiceClientLogger.cs index a5a5f62328..d009e5d846 100644 --- a/common/ASC.Core.Common/Log/SignalrServiceClientLogger.cs +++ b/common/ASC.Core.Common/Log/SocketServiceClientLogger.cs @@ -25,11 +25,11 @@ // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode namespace ASC.Core.Common.Log; -internal static partial class SignalrServiceClientLogger +internal static partial class SocketServiceClientLogger { [LoggerMessage(Level = LogLevel.Debug, Message = "Method:{method}, Data:{data}")] - public static partial void DebugMakeRequest(this ILogger logger, string method, string data); + public static partial void DebugMakeRequest(this ILogger logger, string method, string data); [LoggerMessage(Level = LogLevel.Error, Message = "Service Error")] - public static partial void ErrorService(this ILogger logger, Exception exception); + public static partial void ErrorService(this ILogger logger, Exception exception); } diff --git a/common/ASC.Core.Common/Notify/Signalr/MailNotificationState.cs b/common/ASC.Core.Common/Notify/Signalr/MailNotificationState.cs index 9dd1e01378..e5cfbce2f2 100644 --- a/common/ASC.Core.Common/Notify/Signalr/MailNotificationState.cs +++ b/common/ASC.Core.Common/Notify/Signalr/MailNotificationState.cs @@ -24,7 +24,7 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -namespace ASC.Core.Notify.Signalr; +namespace ASC.Core.Notify.Socket; public enum MailNotificationState { diff --git a/common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs b/common/ASC.Core.Common/Notify/Signalr/SocketServiceClient.cs similarity index 91% rename from common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs rename to common/ASC.Core.Common/Notify/Signalr/SocketServiceClient.cs index 922772dd96..b7cb65efcb 100644 --- a/common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs +++ b/common/ASC.Core.Common/Notify/Signalr/SocketServiceClient.cs @@ -1,289 +1,289 @@ -// (c) Copyright Ascensio System SIA 2010-2022 -// -// This program is a free software product. -// You can redistribute it and/or modify it under the terms -// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software -// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended -// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of -// any third-party rights. -// -// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty -// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see -// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html -// -// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021. -// -// The interactive user interfaces in modified source and object code versions of the Program must -// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3. -// -// Pursuant to Section 7(b) of the License you must retain the original Product logo when -// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under -// trademark law for use of our trademarks. -// -// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing -// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 -// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - -namespace ASC.Core.Notify.Signalr; - -[Scope] -public class ConfigureSignalrServiceClient : IConfigureNamedOptions -{ - internal readonly TenantManager _tenantManager; - internal readonly CoreSettings _coreSettings; - internal readonly MachinePseudoKeys _machinePseudoKeys; - internal readonly IConfiguration _configuration; - internal readonly ILogger logger; - internal readonly IHttpClientFactory _clientFactory; +// (c) Copyright Ascensio System SIA 2010-2022 +// +// This program is a free software product. +// You can redistribute it and/or modify it under the terms +// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software +// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended +// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of +// any third-party rights. +// +// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty +// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see +// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html +// +// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021. +// +// The interactive user interfaces in modified source and object code versions of the Program must +// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3. +// +// Pursuant to Section 7(b) of the License you must retain the original Product logo when +// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under +// trademark law for use of our trademarks. +// +// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing +// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 +// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - public ConfigureSignalrServiceClient( - TenantManager tenantManager, - CoreSettings coreSettings, - MachinePseudoKeys machinePseudoKeys, - IConfiguration configuration, - ILogger logger, - IHttpClientFactory clientFactory) - { - _tenantManager = tenantManager; - _coreSettings = coreSettings; - _machinePseudoKeys = machinePseudoKeys; - _configuration = configuration; - this.logger = logger; - _clientFactory = clientFactory; - } +namespace ASC.Core.Notify.Socket; - public void Configure(string name, SignalrServiceClient options) - { - options._logger = logger; - options._hub = name.Trim('/'); - options._tenantManager = _tenantManager; - options._coreSettings = _coreSettings; - options._clientFactory = _clientFactory; - options._sKey = _machinePseudoKeys.GetMachineConstant(); - options._url = _configuration["web:hub:internal"]; - options.EnableSignalr = !string.IsNullOrEmpty(options._url); +[Scope] +public class ConfigureSocketServiceClient : IConfigureNamedOptions +{ + internal readonly TenantManager _tenantManager; + internal readonly CoreSettings _coreSettings; + internal readonly MachinePseudoKeys _machinePseudoKeys; + internal readonly IConfiguration _configuration; + internal readonly ILogger logger; + internal readonly IHttpClientFactory _clientFactory; - try - { - var replaceSetting = _configuration["jabber:replace-domain"]; - if (!string.IsNullOrEmpty(replaceSetting)) - { - options._jabberReplaceDomain = true; - var q = - replaceSetting.Split(new[] { "->" }, StringSplitOptions.RemoveEmptyEntries) - .Select(s => s.Trim().ToLowerInvariant()) - .ToList(); - options._jabberReplaceFromDomain = q.ElementAt(0); - options._jabberReplaceToDomain = q.ElementAt(1); - } - } - catch (Exception) { } - } + public ConfigureSocketServiceClient( + TenantManager tenantManager, + CoreSettings coreSettings, + MachinePseudoKeys machinePseudoKeys, + IConfiguration configuration, + ILogger logger, + IHttpClientFactory clientFactory) + { + _tenantManager = tenantManager; + _coreSettings = coreSettings; + _machinePseudoKeys = machinePseudoKeys; + _configuration = configuration; + this.logger = logger; + _clientFactory = clientFactory; + } - public void Configure(SignalrServiceClient options) - { - Configure("default", options); - } -} - -[Scope(typeof(ConfigureSignalrServiceClient))] -public class SignalrServiceClient -{ - private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(1); - internal ILogger _logger; - private static DateTime _lastErrorTime; - public bool EnableSignalr { get; set; } - internal byte[] _sKey; - internal string _url; - internal bool _jabberReplaceDomain; - internal string _jabberReplaceFromDomain; - internal string _jabberReplaceToDomain; + public void Configure(string name, SocketServiceClient options) + { + options._logger = logger; + options._hub = name.Trim('/'); + options._tenantManager = _tenantManager; + options._coreSettings = _coreSettings; + options._clientFactory = _clientFactory; + options._sKey = _machinePseudoKeys.GetMachineConstant(); + options._url = _configuration["web:hub:internal"]; + options.EnableSocket = !string.IsNullOrEmpty(options._url); - internal string _hub; + try + { + var replaceSetting = _configuration["jabber:replace-domain"]; + if (!string.IsNullOrEmpty(replaceSetting)) + { + options._jabberReplaceDomain = true; + var q = + replaceSetting.Split(new[] { "->" }, StringSplitOptions.RemoveEmptyEntries) + .Select(s => s.Trim().ToLowerInvariant()) + .ToList(); + options._jabberReplaceFromDomain = q.ElementAt(0); + options._jabberReplaceToDomain = q.ElementAt(1); + } + } + catch (Exception) { } + } - internal TenantManager _tenantManager; - internal CoreSettings _coreSettings; - internal IHttpClientFactory _clientFactory; + public void Configure(SocketServiceClient options) + { + Configure("default", options); + } +} - public SignalrServiceClient() { } +[Scope(typeof(ConfigureSocketServiceClient))] +public class SocketServiceClient +{ + private static readonly TimeSpan _timeout = TimeSpan.FromSeconds(1); + internal ILogger _logger; + private static DateTime _lastErrorTime; + public bool EnableSocket { get; set; } + internal byte[] _sKey; + internal string _url; + internal bool _jabberReplaceDomain; + internal string _jabberReplaceFromDomain; + internal string _jabberReplaceToDomain; - public void SendMessage(string callerUserName, string calleeUserName, string messageText, int tenantId, - string domain) - { - try - { - domain = ReplaceDomain(domain); - var tenant = tenantId == -1 - ? _tenantManager.GetTenant(domain) - : _tenantManager.GetTenant(tenantId); - var isTenantUser = callerUserName.Length == 0; - var message = new MessageClass - { - UserName = isTenantUser ? tenant.GetTenantDomain(_coreSettings) : callerUserName, - Text = messageText - }; + internal string _hub; - MakeRequest("send", new { tenantId = tenant.Id, callerUserName, calleeUserName, message, isTenantUser }); - } - catch (Exception error) - { - ProcessError(error); - } - } + internal TenantManager _tenantManager; + internal CoreSettings _coreSettings; + internal IHttpClientFactory _clientFactory; - public void SendInvite(string chatRoomName, string calleeUserName, string domain) - { - try - { - domain = ReplaceDomain(domain); + public SocketServiceClient() { } - var tenant = _tenantManager.GetTenant(domain); + public void SendMessage(string callerUserName, string calleeUserName, string messageText, int tenantId, + string domain) + { + try + { + domain = ReplaceDomain(domain); + var tenant = tenantId == -1 + ? _tenantManager.GetTenant(domain) + : _tenantManager.GetTenant(tenantId); + var isTenantUser = callerUserName.Length == 0; + var message = new MessageClass + { + UserName = isTenantUser ? tenant.GetTenantDomain(_coreSettings) : callerUserName, + Text = messageText + }; - var message = new MessageClass - { - UserName = tenant.GetTenantDomain(_coreSettings), - Text = chatRoomName - }; + MakeRequest("send", new { tenantId = tenant.Id, callerUserName, calleeUserName, message, isTenantUser }); + } + catch (Exception error) + { + ProcessError(error); + } + } - MakeRequest("sendInvite", new { tenantId = tenant.Id, calleeUserName, message }); - } - catch (Exception error) - { - ProcessError(error); - } - } + public void SendInvite(string chatRoomName, string calleeUserName, string domain) + { + try + { + domain = ReplaceDomain(domain); - public void SendState(string from, byte state, int tenantId, string domain) - { - try - { - domain = ReplaceDomain(domain); + var tenant = _tenantManager.GetTenant(domain); - if (tenantId == -1) - { - tenantId = _tenantManager.GetTenant(domain).Id; - } + var message = new MessageClass + { + UserName = tenant.GetTenantDomain(_coreSettings), + Text = chatRoomName + }; - MakeRequest("setState", new { tenantId, from, state }); - } - catch (Exception error) - { - ProcessError(error); - } - } + MakeRequest("sendInvite", new { tenantId = tenant.Id, calleeUserName, message }); + } + catch (Exception error) + { + ProcessError(error); + } + } - public void SendOfflineMessages(string callerUserName, List users, int tenantId) - { - try - { - MakeRequest("sendOfflineMessages", new { tenantId, callerUserName, users }); - } - catch (Exception error) - { - ProcessError(error); - } - } + public void SendState(string from, byte state, int tenantId, string domain) + { + try + { + domain = ReplaceDomain(domain); - public void SendUnreadCounts(Dictionary unreadCounts, string domain) - { - try - { - domain = ReplaceDomain(domain); + if (tenantId == -1) + { + tenantId = _tenantManager.GetTenant(domain).Id; + } - var tenant = _tenantManager.GetTenant(domain); + MakeRequest("setState", new { tenantId, from, state }); + } + catch (Exception error) + { + ProcessError(error); + } + } - MakeRequest("sendUnreadCounts", new { tenantId = tenant.Id, unreadCounts }); - } - catch (Exception error) - { - ProcessError(error); - } - } + public void SendOfflineMessages(string callerUserName, List users, int tenantId) + { + try + { + MakeRequest("sendOfflineMessages", new { tenantId, callerUserName, users }); + } + catch (Exception error) + { + ProcessError(error); + } + } - public void SendUnreadUsers(Dictionary> unreadUsers) - { - try - { - MakeRequest("sendUnreadUsers", unreadUsers); - } - catch (Exception error) - { - ProcessError(error); - } - } + public void SendUnreadCounts(Dictionary unreadCounts, string domain) + { + try + { + domain = ReplaceDomain(domain); - public void SendUnreadUser(int tenant, string userId, int count) - { - try - { - MakeRequest("updateFolders", new { tenant, userId, count }); - } - catch (Exception error) - { - ProcessError(error); - } - } + var tenant = _tenantManager.GetTenant(domain); - public void SendMailNotification(int tenant, string userId, MailNotificationState state) - { - try - { - MakeRequest("sendMailNotification", new { tenant, userId, state }); - } - catch (Exception error) - { - ProcessError(error); - } - } + MakeRequest("sendUnreadCounts", new { tenantId = tenant.Id, unreadCounts }); + } + catch (Exception error) + { + ProcessError(error); + } + } - public void EnqueueCall(string numberId, string callId, string agent) - { - try - { - MakeRequest("enqueue", new { numberId, callId, agent }); - } - catch (Exception error) - { - ProcessError(error); - } - } + public void SendUnreadUsers(Dictionary> unreadUsers) + { + try + { + MakeRequest("sendUnreadUsers", unreadUsers); + } + catch (Exception error) + { + ProcessError(error); + } + } - public void IncomingCall(string callId, string agent) - { - try - { - MakeRequest("incoming", new { callId, agent }); - } - catch (Exception error) - { - ProcessError(error); - } - } + public void SendUnreadUser(int tenant, string userId, int count) + { + try + { + MakeRequest("updateFolders", new { tenant, userId, count }); + } + catch (Exception error) + { + ProcessError(error); + } + } - public void MissCall(string numberId, string callId, string agent) - { - try - { - MakeRequest("miss", new { numberId, callId, agent }); - } - catch (Exception error) - { - ProcessError(error); - } - } + public void SendMailNotification(int tenant, string userId, MailNotificationState state) + { + try + { + MakeRequest("sendMailNotification", new { tenant, userId, state }); + } + catch (Exception error) + { + ProcessError(error); + } + } - public void Reload(string numberId, string agentId = null) - { - try - { - var numberRoom = _tenantManager.GetCurrentTenant().Id + numberId; - MakeRequest("reload", new { numberRoom, agentId }); - } - catch (Exception error) - { - ProcessError(error); - } - } + public void EnqueueCall(string numberId, string callId, string agent) + { + try + { + MakeRequest("enqueue", new { numberId, callId, agent }); + } + catch (Exception error) + { + ProcessError(error); + } + } + + public void IncomingCall(string callId, string agent) + { + try + { + MakeRequest("incoming", new { callId, agent }); + } + catch (Exception error) + { + ProcessError(error); + } + } + + public void MissCall(string numberId, string callId, string agent) + { + try + { + MakeRequest("miss", new { numberId, callId, agent }); + } + catch (Exception error) + { + ProcessError(error); + } + } + + public void Reload(string numberId, string agentId = null) + { + try + { + var numberRoom = _tenantManager.GetCurrentTenant().Id + numberId; + MakeRequest("reload", new { numberRoom, agentId }); + } + catch (Exception error) + { + ProcessError(error); + } + } public void StartEdit(T fileId, string room) { @@ -294,21 +294,21 @@ public class SignalrServiceClient catch (Exception error) { ProcessError(error); - } - } - + } + } + public void StopEdit(T fileId, string room) { try - { + { MakeRequest("stop-edit", new { room, fileId }); } catch (Exception error) { ProcessError(error); } - } - + } + public void CreateFile(T fileId, string room, string data) { try @@ -319,20 +319,20 @@ public class SignalrServiceClient { ProcessError(error); } - } - - public void UpdateFile(T fileId, string room, string data) - { - try - { - MakeRequest("update-file", new { room, fileId, data }); - } - catch (Exception error) - { - ProcessError(error); - } - } - + } + + public void UpdateFile(T fileId, string room, string data) + { + try + { + MakeRequest("update-file", new { room, fileId, data }); + } + catch (Exception error) + { + ProcessError(error); + } + } + public void DeleteFile(T fileId, string room) { try @@ -343,96 +343,96 @@ public class SignalrServiceClient { ProcessError(error); } - } - - public T GetAgent(string numberId, List contactsResponsibles) - { - try - { - return MakeRequest("GetAgent", new { numberId, contactsResponsibles }); - } - catch (Exception error) - { - ProcessError(error); - } - - return default; - } - - private string ReplaceDomain(string domain) - { - if (_jabberReplaceDomain && domain.EndsWith(_jabberReplaceFromDomain)) - { - var place = domain.LastIndexOf(_jabberReplaceFromDomain); - if (place >= 0) - { - return domain.Remove(place, _jabberReplaceFromDomain.Length).Insert(place, _jabberReplaceToDomain); - } - } - - return domain; - } - - private void ProcessError(Exception e) - { - _logger.ErrorService(e); - - if (e is HttpRequestException) - { - _lastErrorTime = DateTime.Now; - } } - private string MakeRequest(string method, object data) - { - if (!IsAvailable()) - { - return string.Empty; - } - - var request = new HttpRequestMessage(); - request.Headers.Add("Authorization", CreateAuthToken()); - request.Method = HttpMethod.Post; - request.RequestUri = new Uri(GetMethod(method)); - - var jsonData = JsonConvert.SerializeObject(data); - _logger.DebugMakeRequest(method, jsonData); - - request.Content = new StringContent(jsonData, Encoding.UTF8, "application/json"); - - var httpClient = _clientFactory.CreateClient(); - - using (var response = httpClient.Send(request)) - using (var stream = response.Content.ReadAsStream()) - using (var streamReader = new StreamReader(stream)) - { - return streamReader.ReadToEnd(); - } - } + public T GetAgent(string numberId, List contactsResponsibles) + { + try + { + return MakeRequest("GetAgent", new { numberId, contactsResponsibles }); + } + catch (Exception error) + { + ProcessError(error); + } - private T MakeRequest(string method, object data) - { - var resultMakeRequest = MakeRequest(method, data); - - return JsonConvert.DeserializeObject(resultMakeRequest); - } + return default; + } - private bool IsAvailable() - { - return EnableSignalr && _lastErrorTime + _timeout < DateTime.Now; - } + private string ReplaceDomain(string domain) + { + if (_jabberReplaceDomain && domain.EndsWith(_jabberReplaceFromDomain)) + { + var place = domain.LastIndexOf(_jabberReplaceFromDomain); + if (place >= 0) + { + return domain.Remove(place, _jabberReplaceFromDomain.Length).Insert(place, _jabberReplaceToDomain); + } + } - private string GetMethod(string method) - { - return $"{_url.TrimEnd('/')}/controller/{_hub}/{method}"; - } + return domain; + } - public string CreateAuthToken(string pkey = "socketio") - { - using var hasher = new HMACSHA1(_sKey); - var now = DateTime.UtcNow.ToString("yyyyMMddHHmmss"); - var hash = Convert.ToBase64String(hasher.ComputeHash(Encoding.UTF8.GetBytes(string.Join("\n", now, pkey)))); - - return $"ASC {pkey}:{now}:{hash}"; - } + private void ProcessError(Exception e) + { + _logger.ErrorService(e); + + if (e is HttpRequestException) + { + _lastErrorTime = DateTime.Now; + } + } + + private string MakeRequest(string method, object data) + { + if (!IsAvailable()) + { + return string.Empty; + } + + var request = new HttpRequestMessage(); + request.Headers.Add("Authorization", CreateAuthToken()); + request.Method = HttpMethod.Post; + request.RequestUri = new Uri(GetMethod(method)); + + var jsonData = JsonConvert.SerializeObject(data); + _logger.DebugMakeRequest(method, jsonData); + + request.Content = new StringContent(jsonData, Encoding.UTF8, "application/json"); + + var httpClient = _clientFactory.CreateClient(); + + using (var response = httpClient.Send(request)) + using (var stream = response.Content.ReadAsStream()) + using (var streamReader = new StreamReader(stream)) + { + return streamReader.ReadToEnd(); + } + } + + private T MakeRequest(string method, object data) + { + var resultMakeRequest = MakeRequest(method, data); + + return JsonConvert.DeserializeObject(resultMakeRequest); + } + + private bool IsAvailable() + { + return EnableSocket && _lastErrorTime + _timeout < DateTime.Now; + } + + private string GetMethod(string method) + { + return $"{_url.TrimEnd('/')}/controller/{_hub}/{method}"; + } + + public string CreateAuthToken(string pkey = "socketio") + { + using var hasher = new HMACSHA1(_sKey); + var now = DateTime.UtcNow.ToString("yyyyMMddHHmmss"); + var hash = Convert.ToBase64String(hasher.ComputeHash(Encoding.UTF8.GetBytes(string.Join("\n", now, pkey)))); + + return $"ASC {pkey}:{now}:{hash}"; + } } diff --git a/common/services/ASC.Feed.Aggregator/GlobalUsings.cs b/common/services/ASC.Feed.Aggregator/GlobalUsings.cs index 55538d5ce3..f205c6debe 100644 --- a/common/services/ASC.Feed.Aggregator/GlobalUsings.cs +++ b/common/services/ASC.Feed.Aggregator/GlobalUsings.cs @@ -31,7 +31,7 @@ global using ASC.Common.Caching; global using ASC.Common.Utils; global using ASC.Core; global using ASC.Core.Common; -global using ASC.Core.Notify.Signalr; +global using ASC.Core.Notify.Socket; global using ASC.Feed.Aggregator.Log; global using ASC.Feed.Aggregator.Modules; diff --git a/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs b/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs index 3ea22a4128..6e47b3f7f5 100644 --- a/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs +++ b/common/services/ASC.Feed.Aggregator/Service/FeedAggregatorService.cs @@ -31,16 +31,16 @@ public class FeedAggregatorService : FeedBaseService { protected override string LoggerName { get; set; } = "ASC.Feed.Aggregator"; - private readonly SignalrServiceClient _signalrServiceClient; + private readonly SocketServiceClient _socketServiceClient; public FeedAggregatorService( FeedSettings feedSettings, IServiceScopeFactory serviceScopeFactory, ILoggerProvider optionsMonitor, - SignalrServiceClient signalrServiceClient) + SocketServiceClient socketServiceClient) : base(feedSettings, serviceScopeFactory, optionsMonitor) { - _signalrServiceClient = signalrServiceClient; + _socketServiceClient = socketServiceClient; } protected override async Task ExecuteAsync(CancellationToken stoppingToken) @@ -200,7 +200,7 @@ public class FeedAggregatorService : FeedBaseService } } - _signalrServiceClient.SendUnreadUsers(unreadUsers); + _socketServiceClient.SendUnreadUsers(unreadUsers); _logger.DebugTimeCollectingNews(DateTime.UtcNow - start); } diff --git a/products/ASC.Files/Core/GlobalUsings.cs b/products/ASC.Files/Core/GlobalUsings.cs index 1689a3ab93..357f104c15 100644 --- a/products/ASC.Files/Core/GlobalUsings.cs +++ b/products/ASC.Files/Core/GlobalUsings.cs @@ -76,7 +76,7 @@ global using ASC.Core.Common.EF.Model; global using ASC.Core.Common.Quota; global using ASC.Core.Common.Quota.Features; global using ASC.Core.Common.Settings; -global using ASC.Core.Notify.Signalr; +global using ASC.Core.Notify.Socket; global using ASC.Core.Tenants; global using ASC.Core.Users; global using ASC.Data.Storage; diff --git a/products/ASC.Files/Core/Utils/SocketManager.cs b/products/ASC.Files/Core/Utils/SocketManager.cs index 40331520d2..0d229ee4b1 100644 --- a/products/ASC.Files/Core/Utils/SocketManager.cs +++ b/products/ASC.Files/Core/Utils/SocketManager.cs @@ -29,17 +29,17 @@ namespace ASC.Web.Files.Utils; [Scope] public class SocketManager { - private readonly SignalrServiceClient _signalrServiceClient; + private readonly SocketServiceClient _socketServiceClient; private readonly FileDtoHelper _filesWrapperHelper; private readonly TenantManager _tenantManager; public SocketManager( - IOptionsSnapshot optionsSnapshot, + IOptionsSnapshot optionsSnapshot, FileDtoHelper filesWrapperHelper, TenantManager tenantManager ) { - _signalrServiceClient = optionsSnapshot.Get("files"); + _socketServiceClient = optionsSnapshot.Get("files"); _filesWrapperHelper = filesWrapperHelper; _tenantManager = tenantManager; } @@ -47,13 +47,13 @@ public class SocketManager public void StartEdit(T fileId) { var room = GetFileRoom(fileId); - _signalrServiceClient.StartEdit(fileId, room); + _socketServiceClient.StartEdit(fileId, room); } public void StopEdit(T fileId) { var room = GetFileRoom(fileId); - _signalrServiceClient.StopEdit(fileId, room); + _socketServiceClient.StopEdit(fileId, room); } public async Task CreateFileAsync(File file) @@ -69,7 +69,7 @@ public class SocketManager serializerSettings.Converters.Add(new FileEntryWrapperConverter()); var data = JsonSerializer.Serialize(await _filesWrapperHelper.GetAsync(file), serializerSettings); - _signalrServiceClient.CreateFile(file.Id, room, data); + _socketServiceClient.CreateFile(file.Id, room, data); } public async Task UpdateFileAsync(File file) @@ -85,13 +85,13 @@ public class SocketManager serializerSettings.Converters.Add(new FileEntryWrapperConverter()); var data = JsonSerializer.Serialize(await _filesWrapperHelper.GetAsync(file), serializerSettings); - _signalrServiceClient.UpdateFile(file.Id, room, data); + _socketServiceClient.UpdateFile(file.Id, room, data); } public void DeleteFile(File file) { var room = GetFolderRoom(file.ParentId); - _signalrServiceClient.DeleteFile(file.Id, room); + _socketServiceClient.DeleteFile(file.Id, room); } private string GetFileRoom(T fileId)