diff --git a/build/build.backend.docker.sh b/build/build.backend.docker.sh index f96d814298..40e743700a 100755 --- a/build/build.backend.docker.sh +++ b/build/build.backend.docker.sh @@ -38,9 +38,14 @@ echo "SERVICE_DOCEDITOR: $doceditor" echo "SERVICE_LOGIN: $login" echo "SERVICE_CLIENT: $client" -echo "Stop all backend services" +# Stop all backend services" $dir/build/start/stop.backend.docker.sh +echo "Remove all backend containers" +docker rm -f $(docker ps -a | egrep "onlyoffice" | egrep -v "mysql|rabbitmq|redis|elasticsearch|documentserver" | awk 'NR>0 {print $1}') +echo "Remove all backend images" +docker rmi -f $(docker images -a | egrep "onlyoffice" | egrep -v "mysql|rabbitmq|redis|elasticsearch|documentserver" | awk 'NR>0 {print $3}') + echo "Remove all docker images except 'mysql, rabbitmq, redis, elasticsearch, documentserver'" docker image rm -f $(docker images -a | egrep "onlyoffice" | egrep -v "mysql|rabbitmq|redis|elasticsearch|documentserver" | awk 'NR>0 {print $3}') @@ -68,7 +73,9 @@ if [ "$1" = "--no_ds" ]; then echo "SKIP Document server" else echo "Run Document server" - docker compose -f ds.yml up -d + DOCUMENT_SERVER_IMAGE_NAME=onlyoffice/documentserver-de:latest \ + ROOT_DIR=$dir \ + docker compose -f ds.dev.yml up -d fi echo "Build all backend services" @@ -86,5 +93,5 @@ echo "Run DB migration" DOCKERFILE=$docker_file \ docker compose -f migration-runner.yml up -d -echo "Start all backend services" +# Start all backend services" $dir/build/start/start.backend.docker.sh \ No newline at end of file diff --git a/build/clear.backend.docker.sh b/build/clear.backend.docker.sh new file mode 100755 index 0000000000..215543370a --- /dev/null +++ b/build/clear.backend.docker.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +echo "Stop all onlyoffice containers." +docker stop $(docker ps -a | egrep "onlyoffice" | awk 'NR>0 {print $1}') +echo "Remove all onlyoffice containers." +docker rm -f $(docker ps -a | egrep "onlyoffice" | awk 'NR>0 {print $1}') +echo "Remove all onlyoffice images." +docker rmi -f $(docker images -a | egrep "onlyoffice" | awk 'NR>0 {print $3}') +echo "Remove unused volumes." +docker volume prune -f +echo "Remove unused networks." +docker network prune -f \ No newline at end of file diff --git a/build/install/docker/Dockerfile.app b/build/install/docker/Dockerfile.app index e7fcd59b79..7d16136a8a 100644 --- a/build/install/docker/Dockerfile.app +++ b/build/install/docker/Dockerfile.app @@ -34,6 +34,7 @@ RUN apt-get -y update && \ apt-get install -y nodejs && \ rm -rf /var/lib/apt/lists/* +ADD https://api.github.com/repos/ONLYOFFICE/DocSpace/git/refs/heads/${GIT_BRANCH} version.json RUN echo ${GIT_BRANCH} && \ git clone --recurse-submodules -b ${GIT_BRANCH} https://github.com/ONLYOFFICE/DocSpace.git ${SRC_PATH} @@ -196,7 +197,7 @@ WORKDIR ${BUILD_PATH}/services/ASC.ApiSystem/ COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.ApiSystem/service/ . -CMD [" ASC.ApiSystem.dll", " ASC.ApiSystem"] +CMD ["ASC.ApiSystem.dll", "ASC.ApiSystem"] ## ASC.ClearEvents ## FROM dotnetrun AS clear-events diff --git a/build/install/docker/ds.dev.yml b/build/install/docker/ds.dev.yml new file mode 100644 index 0000000000..2bb2f1a4c5 --- /dev/null +++ b/build/install/docker/ds.dev.yml @@ -0,0 +1,23 @@ +version: "3.6" +services: + onlyoffice-document-server: + image: "${DOCUMENT_SERVER_IMAGE_NAME}" + container_name: ${DOCUMENT_SERVER_HOST} + # Strings below enable the JSON Web Token validation. + environment: + - JWT_ENABLED=true + - JWT_SECRET=${DOCUMENT_SERVER_JWT_SECRET} + - JWT_HEADER=${DOCUMENT_SERVER_JWT_HEADER} + - JWT_IN_BODY=true + expose: + - "80" + volumes: + - ${ROOT_DIR}/Data:/var/www/onlyoffice/Data + stdin_open: true + restart: always + stop_grace_period: 60s + +networks: + default: + external: + name: ${NETWORK_NAME} diff --git a/build/run/WebHealthChecksUI.bat b/build/run/WebHealthChecksUI.bat index f2cddd1061..0aa219a0ba 100644 --- a/build/run/WebHealthChecksUI.bat +++ b/build/run/WebHealthChecksUI.bat @@ -1,4 +1,4 @@ @echo off PUSHD %~dp0..\.. -set servicepath=%cd%\web\ASC.Web.HealthChecks.UI\bin\Debug\ASC.Web.HealthChecks.UI.exe urls=http://0.0.0.0:5027 \ No newline at end of file +set servicepath=%cd%\web\ASC.Web.HealthChecks.UI\bin\Debug\ASC.Web.HealthChecks.UI.exe urls=http://0.0.0.0:5033 \ No newline at end of file diff --git a/build/start/start.backend.docker.sh b/build/start/start.backend.docker.sh index 27c1fb275b..4286f52d3f 100755 --- a/build/start/start.backend.docker.sh +++ b/build/start/start.backend.docker.sh @@ -39,7 +39,7 @@ docker_file=Dockerfile.dev env_extension="dev" core_base_domain="localhost" -echo "Start all backend services" +echo "Start all backend services (containers)" DOCKERFILE=$docker_file \ ROOT_DIR=$dir \ RELEASE_DATE=$build_date \ diff --git a/build/start/stop.backend.docker.sh b/build/start/stop.backend.docker.sh index ebc2e665ba..6a6154bf38 100755 --- a/build/start/stop.backend.docker.sh +++ b/build/start/stop.backend.docker.sh @@ -1,23 +1,4 @@ #!/bin/bash -#rd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -#echo "Run script directory:" $dir - -#dir=$(builtin cd $rd/../../; pwd) - -#echo "Root directory:" $dir - -#cd $dir/build/install/docker/ - -#docker_dir="$( pwd )" - -#echo "Docker directory:" $docker_dir - -echo "Stop all backend containers" -# DOCKERFILE=Dockerfile.dev \ -# docker compose -f docspace.dev.yml down -docker stop $(docker ps -a | egrep "onlyoffice" | egrep -v "mysql|rabbitmq|redis|elasticsearch|documentserver" | awk 'NR>0 {print $1}') -echo "Remove all backend containers" -docker rm -f $(docker ps -a | egrep "onlyoffice" | egrep -v "mysql|rabbitmq|redis|elasticsearch|documentserver" | awk 'NR>0 {print $1}') -echo "Remove all backend images" -docker rmi -f $(docker images -a | egrep "onlyoffice" | egrep -v "mysql|rabbitmq|redis|elasticsearch|documentserver" | awk 'NR>0 {print $3}') \ No newline at end of file +echo "Stop all backend services (containers)" +docker stop $(docker ps -a | egrep "onlyoffice" | egrep -v "mysql|rabbitmq|redis|elasticsearch|documentserver" | awk 'NR>0 {print $1}') \ No newline at end of file diff --git a/common/ASC.Api.Core/ASC.Api.Core.csproj b/common/ASC.Api.Core/ASC.Api.Core.csproj index a20d31ef2e..8c7af2f9a8 100644 --- a/common/ASC.Api.Core/ASC.Api.Core.csproj +++ b/common/ASC.Api.Core/ASC.Api.Core.csproj @@ -16,6 +16,8 @@ + + diff --git a/common/ASC.Api.Core/Core/CustomHealthCheck.cs b/common/ASC.Api.Core/Core/CustomHealthCheck.cs index e3c40ec592..2c5953afd7 100644 --- a/common/ASC.Api.Core/Core/CustomHealthCheck.cs +++ b/common/ASC.Api.Core/Core/CustomHealthCheck.cs @@ -24,6 +24,8 @@ // 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 +using CsvHelper; + namespace ASC.Api.Core.Core; public static class CustomHealthCheck @@ -64,6 +66,7 @@ public static class CustomHealthCheck } var elasticSettings = configuration.GetSection("elastic"); + if (elasticSettings != null && elasticSettings.GetChildren().Any()) { var host = elasticSettings.GetSection("Host").Value ?? "localhost"; @@ -77,7 +80,25 @@ public static class CustomHealthCheck name: "elasticsearch", tags: new string[] { "elasticsearch" }); } - } + } + + var redisConfiguration = configuration.GetSection("Redis").Get(); + + if (redisConfiguration != null) + { + hcBuilder.AddRedis(redisConfiguration.ConfigurationOptions.ToString(), + name: "redis", + tags: new string[] { "redis" }); + } + + var rabbitMQConfiguration = configuration.GetSection("RabbitMQ").Get(); + + if (rabbitMQConfiguration != null) + { + hcBuilder.AddRabbitMQ(x => rabbitMQConfiguration.GetConnectionFactory(), + name: "rabbitMQ", + tags: new string[] { "rabbitMQ" }); + } return services; } diff --git a/common/ASC.Api.Core/Extensions/ServiceCollectionExtension.cs b/common/ASC.Api.Core/Extensions/ServiceCollectionExtension.cs index 2793136231..fdb7ec621d 100644 --- a/common/ASC.Api.Core/Extensions/ServiceCollectionExtension.cs +++ b/common/ASC.Api.Core/Extensions/ServiceCollectionExtension.cs @@ -84,39 +84,8 @@ public static class ServiceCollectionExtension var cfg = sp.GetRequiredService(); var logger = sp.GetRequiredService>(); - - var factory = new ConnectionFactory() - { - DispatchConsumersAsync = true - }; - if (!string.IsNullOrEmpty(rabbitMQConfiguration.Uri)) - { - factory.Uri = new Uri(rabbitMQConfiguration.Uri); - } - else - { - factory.HostName = rabbitMQConfiguration.HostName; - factory.UserName = rabbitMQConfiguration.UserName; - factory.Password = rabbitMQConfiguration.Password; - factory.Port = rabbitMQConfiguration.Port; - factory.VirtualHost = rabbitMQConfiguration.VirtualHost; - } - - if (rabbitMQConfiguration.EnableSsl) - { - factory.Ssl = new SslOption - { - Enabled = rabbitMQConfiguration.EnableSsl, - Version = SslProtocols.Tls12 - }; - - if (!string.IsNullOrEmpty(rabbitMQConfiguration.SslCertPath)) - { - factory.Ssl.CertPath = rabbitMQConfiguration.SslCertPath; - factory.Ssl.ServerName = rabbitMQConfiguration.SslServerName; - } - } + var connectionFactory = rabbitMQConfiguration.GetConnectionFactory(); var retryCount = 5; @@ -125,7 +94,7 @@ public static class ServiceCollectionExtension retryCount = int.Parse(cfg["core:eventBus:connectRetryCount"]); } - return new DefaultRabbitMQPersistentConnection(factory, logger, retryCount); + return new DefaultRabbitMQPersistentConnection(connectionFactory, logger, retryCount); }); services.AddSingleton(sp => diff --git a/common/ASC.Api.Core/Model/TaskProgressDto.cs b/common/ASC.Api.Core/Model/TaskProgressDto.cs new file mode 100644 index 0000000000..6985c942f6 --- /dev/null +++ b/common/ASC.Api.Core/Model/TaskProgressDto.cs @@ -0,0 +1,43 @@ +// (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.Api.Core.Model; +public class TaskProgressDto +{ + public bool IsCompleted { get; set; } + public int Progress { get; set; } + + public static TaskProgressDto GetSample() + { + return new TaskProgressDto + { + IsCompleted = true, + Progress = 0 + }; + } +} + + diff --git a/common/ASC.Common/Caching/RabbitMQCache.cs b/common/ASC.Common/Caching/RabbitMQCache.cs index 56531ac1bd..a8d6233991 100644 --- a/common/ASC.Common/Caching/RabbitMQCache.cs +++ b/common/ASC.Common/Caching/RabbitMQCache.cs @@ -54,36 +54,8 @@ public class RabbitMQCache : IDisposable, ICacheNotify where T : IMessage< _actions = new ConcurrentDictionary>>(); var rabbitMQConfiguration = configuration.GetSection("rabbitmq").Get(); - - _factory = new ConnectionFactory(); - if (!string.IsNullOrEmpty(rabbitMQConfiguration.Uri)) - { - _factory.Uri = new Uri(rabbitMQConfiguration.Uri); - } - else - { - _factory.HostName = rabbitMQConfiguration.HostName; - _factory.UserName = rabbitMQConfiguration.UserName; - _factory.Password = rabbitMQConfiguration.Password; - _factory.Port = rabbitMQConfiguration.Port; - _factory.VirtualHost = rabbitMQConfiguration.VirtualHost; - } - - if (rabbitMQConfiguration.EnableSsl) - { - _factory.Ssl = new SslOption - { - Enabled = rabbitMQConfiguration.EnableSsl, - Version = SslProtocols.Tls12 - }; - - if (!string.IsNullOrEmpty(rabbitMQConfiguration.SslCertPath)) - { - _factory.Ssl.CertPath = rabbitMQConfiguration.SslCertPath; - _factory.Ssl.ServerName = rabbitMQConfiguration.SslServerName; - } - } + _factory = rabbitMQConfiguration.GetConnectionFactory(); _connection = _factory.CreateConnection(); _consumerChannel = CreateConsumerChannel(); @@ -139,8 +111,7 @@ public class RabbitMQCache : IDisposable, ICacheNotify where T : IMessage< _logger.ErrorStartBasicConsumeCanNotCall(); } } - - + private void TryConnect() { lock (_lock) diff --git a/common/ASC.Common/Caching/Settings/RabbitMQSettings.cs b/common/ASC.Common/Caching/Settings/RabbitMQSettings.cs index 9dc1b85b5d..a6d49dbb90 100644 --- a/common/ASC.Common/Caching/Settings/RabbitMQSettings.cs +++ b/common/ASC.Common/Caching/Settings/RabbitMQSettings.cs @@ -24,6 +24,8 @@ // 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 +using System.Security.Authentication; + namespace ASC.Common.Caching; public class RabbitMQSettings { @@ -36,4 +38,42 @@ public class RabbitMQSettings public bool EnableSsl { get; set; } public string SslServerName { get; set; } public string SslCertPath { get; set; } + + public ConnectionFactory GetConnectionFactory() + { + var factory = new ConnectionFactory() + { + DispatchConsumersAsync = true + }; + + if (!string.IsNullOrEmpty(Uri)) + { + factory.Uri = new Uri(Uri); + } + else + { + factory.HostName = HostName; + factory.UserName = UserName; + factory.Password = Password; + factory.Port = Port; + factory.VirtualHost = VirtualHost; + } + + if (EnableSsl) + { + factory.Ssl = new SslOption + { + Enabled = EnableSsl, + Version = SslProtocols.Tls12 + }; + + if (!string.IsNullOrEmpty(SslCertPath)) + { + factory.Ssl.CertPath = SslCertPath; + factory.Ssl.ServerName = SslServerName; + } + } + + return factory; + } } diff --git a/common/ASC.Core.Common/Context/Impl/UserManager.cs b/common/ASC.Core.Common/Context/Impl/UserManager.cs index 900feed336..7747ff6401 100644 --- a/common/ASC.Core.Common/Context/Impl/UserManager.cs +++ b/common/ASC.Core.Common/Context/Impl/UserManager.cs @@ -600,7 +600,7 @@ public class UserManager return GetUsers(employeeStatus).Where(u => IsUserInGroupInternal(u.Id, groupId, refs)).ToArray(); } - public void AddUserIntoGroup(Guid userId, Guid groupId) + public void AddUserIntoGroup(Guid userId, Guid groupId, bool dontClearAddressBook = false) { if (Constants.LostUser.Id == userId || Constants.LostGroupInfo.ID == groupId) { @@ -618,7 +618,11 @@ public class UserManager var myUri = (_accessor?.HttpContext != null) ? _accessor.HttpContext.Request.GetUrlRewriter().ToString() : (_cache.Get("REWRITE_URL" + tenant.Id) != null) ? new Uri(_cache.Get("REWRITE_URL" + tenant.Id)).ToString() : tenant.GetTenantDomain(_coreSettings); - _cardDavAddressbook.Delete(myUri, user.Id, user.Email, tenant.Id).Wait(); //todo + + if (!dontClearAddressBook) + { + _cardDavAddressbook.Delete(myUri, user.Id, user.Email, tenant.Id).Wait(); //todo + } } } diff --git a/common/ASC.Core.Common/Data/DbQuotaService.cs b/common/ASC.Core.Common/Data/DbQuotaService.cs index 13f410fed1..f52d347c75 100644 --- a/common/ASC.Core.Common/Data/DbQuotaService.cs +++ b/common/ASC.Core.Common/Data/DbQuotaService.cs @@ -101,12 +101,8 @@ class DbQuotaService : IQuotaService using var coreDbContext = _dbContextFactory.CreateDbContext(); using var tx = coreDbContext.Database.BeginTransaction(); - AddQuota(coreDbContext, Guid.Empty); - if (row.UserId != Guid.Empty) - { - AddQuota(coreDbContext, row.UserId); - } + AddQuota(coreDbContext, row.UserId); tx.Commit(); }); diff --git a/common/ASC.Data.Storage/TenantQuotaController.cs b/common/ASC.Data.Storage/TenantQuotaController.cs index ac47292bbc..7d7531170f 100644 --- a/common/ASC.Data.Storage/TenantQuotaController.cs +++ b/common/ASC.Data.Storage/TenantQuotaController.cs @@ -76,6 +76,7 @@ public class TenantQuotaController : IQuotaController CurrentSize += size; } + SetTenantQuotaRow(module, domain, size, dataTag, true, Guid.Empty); SetTenantQuotaRow(module, domain, size, dataTag, true, _authContext.CurrentAccount.ID); } @@ -87,6 +88,7 @@ public class TenantQuotaController : IQuotaController CurrentSize += size; } + SetTenantQuotaRow(module, domain, size, dataTag, true, Guid.Empty); SetTenantQuotaRow(module, domain, size, dataTag, true, _authContext.CurrentAccount.ID); } diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.Designer.cs b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.Designer.cs index c6fec0fb6e..4b3c7bca1b 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.Designer.cs +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.Designer.cs @@ -113,14 +113,14 @@ namespace ASC.Notify.Textile.Resources { } /// - /// Looks up a localized string similar to This email is generated automatically and you do not need to answer it. - ///<br />You receive this email because you are a registered user of <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> - ///<br />Click here to unsubscribe from informational emails: <a href="{1}" style="color: #7b7b7b;" target="_blank">Unsubscribe</a> + /// Looks up a localized string similar to For any purchase questions, email us at <a href="mailto:sales@onlyoffice.com" style="color: #7b7b7b;" target="_blank">sales@onlyoffice.com</a>. + ///<br />In case of technical problems contact our <a href="https://www.onlyoffice.com/support-contact-form.aspx" style="color: #7b7b7b;" target="_blank">support team</a>. + ///<br /> <a href="{0}" style="color: #7b7b7b;" target="_blank">Click here to unsubscribe</a> ///<br />. /// - public static string TextForFooterWithUnsubscribeLink { + public static string TextForFooterUnsubsribeDocSpace { get { - return ResourceManager.GetString("TextForFooterWithUnsubscribeLink", resourceCulture); + return ResourceManager.GetString("TextForFooterUnsubsribeDocSpace", resourceCulture); } } } diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.az.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.az.resx index 344ff2e1d3..cb6173ba0b 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.az.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.az.resx @@ -192,10 +192,4 @@ </td> </tr> - - Bu e-poçt avtomatik olaraq yaradılır və ona cavab vermək lazım deyil. -<br />Siz <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a>-nin qeydiyyatdan keçmiş istifadəçisi olduğunuz üçün bu e-poçtu alırsınız. -<br />Bu e-poçtların artıq sizə göndərilməsini istəmirsinizsə, aşağıdakı linkə klikləyin: <a href="{1}" style="color: #7b7b7b;" target="_blank">Abunəlikdən çıxın</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.bg.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.bg.resx index b34088c0f2..13b89fbd8c 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.bg.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.bg.resx @@ -158,10 +158,4 @@ </div> </body> - - Този имейл се генерира автоматично и не е необходимо да отговаряте. -<br/>Получавате този имейл, защото сте регистриран потребител на <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br/>Ако вече не искате да получавате тези имейли, кликнете върху следната връзка: <a href="{1}" style="color: #7b7b7b;" target="_blank">Отписване</a> -<br/> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.cs.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.cs.resx index 264baee07b..c185caca93 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.cs.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.cs.resx @@ -128,10 +128,4 @@ </div> </body> - - Tento e-mail je generován automaticky a nemusíte na něj odpovídat. -<br />Tento e-mail obdržíte, protože jste registrovaným uživatelem <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Pokud již nechcete přijímat tyto e-maily, klikněte na následující odkaz: <a href="{1}" style="color: #7b7b7b;" target="_blank">Unsubscribe</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.de.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.de.resx index 2dd679dbad..830245abf5 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.de.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.de.resx @@ -192,10 +192,4 @@ </td> </tr> - - Diese E-Mail ist automatisch generiert und erfordert keine Antwort. -<br />Sie erhalten diese E-Mail, weil Sie ein registrierter Benutzer bzw. eine registrierte Benutzerin von <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> sind. -<br />Um keine E-Mails mehr zu erhalten, klicken Sie bitte hier: <a href="{1}" style="color: #7b7b7b;" target="_blank">Abmelden</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.es.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.es.resx index c7ac554bce..0815171b0d 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.es.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.es.resx @@ -192,10 +192,4 @@ </td> </tr> - - Este correo electrónico se genera automáticamente y no es necesario responderlo. -<br />Ha recibido este correo electrónico porque es un usuario registrado de <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Haga clic aquí para cancelar la suscripción a los correos electrónicos informativos: <a href="{1}" style="color: #7b7b7b;" target="_blank">Cancelar la suscripción</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.fr.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.fr.resx index d3f7551a33..4738a78d84 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.fr.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.fr.resx @@ -192,10 +192,4 @@ </td> </tr> - - Cet e-mail est généré automatiquement et vous n'avez pas besoin de répondre. -<br />Vous recevez ce courriel parce que vous êtes un utilisateur enregistré de <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Cliquez ici pour vous désabonner des e-mails d'information: <a href="{1}" style="color: #7b7b7b;" target="_blank">Se Désabonner</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.it.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.it.resx index c9a2dbbd45..9418265bf3 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.it.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.it.resx @@ -192,10 +192,4 @@ </td> </tr> - - Questo messaggio è stato generato automaticamente e non necessità di risposta. -<br />Hai ricevuto questo messaggio in quanto sei un untente registrato su <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Сlicca qui per annullare l'iscrizione alle email informative:<a href="{1}" style="color: #7b7b7b;" target="_blank">Rimuovi sottoscrizione</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.lv.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.lv.resx index 2747cb7280..89a8dda716 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.lv.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.lv.resx @@ -158,10 +158,4 @@ </div> </body> - - Šis e-pasts ir izveidots automātiski, un jums nav uz to jāatbild. -<br />Jūs saņēmāt šo e-pastu, jo esat reģistrēts lietotājs portālā <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Ja nevēlaties saņemt šos e-pastus, spiediet uz šīs saites: <a href="{1}" style="color: #7b7b7b;" target="_blank">Atsaukt abonēšanu</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.nl.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.nl.resx index 4b45e135e6..39e46052ed 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.nl.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.nl.resx @@ -128,10 +128,4 @@ </div> </body> - - Deze e-mail is automatisch gegenereerd en u hoeft deze niet te beantwoorden. -<br />U ontvangt deze e-mail omdat u een geregistreerde gebruiker bent van <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Als u deze e-mails niet langer wilt ontvangen, klik dan op de volgende link: <a href="{1}" style="color: #7b7b7b;" target="_blank">Afmelden</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.pl.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.pl.resx index 8b37e7d444..39ac70e2ce 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.pl.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.pl.resx @@ -128,10 +128,4 @@ </div> </body> - - Wiadomość utworzona automatycznie i odpowiadać na nią nie trzeba. -<br />otrzymujesz tę wiadomość, ponieważ jesteś zarejestrowanym użytkownikiem <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Jeśli nie chcesz otrzymywać tych wiadomości, kliknij na poniższy link: <a href="{1}" style="color: #7b7b7b;" target="_blank">Rezygnacja</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.pt-BR.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.pt-BR.resx index 8bfdf18513..ac673e947f 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.pt-BR.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.pt-BR.resx @@ -192,10 +192,4 @@ </td> </tr> - - Este e-mail é gerado automaticamente e você não precisa respondê-lo. -<br />Você está recebendo este e-mail por que é um usuário registrado do <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Se você não quiser mais receber estes e-mails, clique no seguinte link: <a href="{1}" style="color: #7b7b7b;" target="_blank">Cancelar subscrição</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.resx index 92779bffdc..8165bcb000 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.resx @@ -192,10 +192,10 @@ </td> </tr> - - This email is generated automatically and you do not need to answer it. -<br />You receive this email because you are a registered user of <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Click here to unsubscribe from informational emails: <a href="{1}" style="color: #7b7b7b;" target="_blank">Unsubscribe</a> + + For any purchase questions, email us at <a href="mailto:sales@onlyoffice.com" style="color: #7b7b7b;" target="_blank">sales@onlyoffice.com</a>. +<br />In case of technical problems contact our <a href="https://www.onlyoffice.com/support-contact-form.aspx" style="color: #7b7b7b;" target="_blank">support team</a>. +<br /> <a href="{0}" style="color: #7b7b7b;" target="_blank">Click here to unsubscribe</a> <br /> \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.ru.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.ru.resx index 6ee6068a9c..8b28f6d4c2 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.ru.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.ru.resx @@ -192,10 +192,4 @@ </td> </tr> - - Это сообщение создано автоматически, и отвечать на него не нужно. -<br />Вы получили это сообщение, так как являетесь зарегистрированным пользователем <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Если вы хотите отписаться от информационных электронных писем, нажмите на следующую ссылку: <a href="{1}" style="color: #7b7b7b;" target="_blank">Отписаться</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.sk.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.sk.resx index 068dbddc51..39e2b97578 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.sk.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.sk.resx @@ -128,10 +128,4 @@ </div> </body> - - Tento e-mail je generovaný automaticky a nemusíte na to odpovedať. -<br />Tento e-mail dostanete pretože ste registrovaným používateľom <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Ak si viac neprajete dostávať tieto e-maily, kliknite na nasledujúci link: <a href="{1}" style="color: #7b7b7b;" target="_blank">Unsubscribe</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.tr.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.tr.resx index e9c1dc16fd..4fd4229290 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.tr.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.tr.resx @@ -128,10 +128,4 @@ </div> </body> - - Bu e-posta otomatik olarak oluşturulmuştur, lütfen yanıtlamayın. -<br />Bu e-postayı almanızın sebebi <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> kayıtlı kullanıcısı olmanızdır. -<br />Bu e-postaları almak istemiyorsanız lütfen linke tıklayın: <a href="{1}" style="color: #7b7b7b;" target="_blank">Abonelikten Ayrıl</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.uk.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.uk.resx index 378e67716b..39e2b97578 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.uk.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.uk.resx @@ -128,10 +128,4 @@ </div> </body> - - Цей електронний лист сформовано автоматично, і вам не потрібно відповідати на нього. -<br />Ви отримуєте цей електронний лист, оскільки ви є зареєстрованим користувачем <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Якщо ви більше не бажаєте отримувати ці електронні листи, натисніть на це посилання: <a href="{1}" style="color: #7b7b7b;" target="_blank">Скасувати підписку</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.vi.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.vi.resx index 0a74c936ef..d5123f368e 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.vi.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.vi.resx @@ -128,10 +128,4 @@ </div> </body> - - Email này được tạo tự động và bạn không cần trả lời nó. -<br />Bạn nhận được email này vì bạn là người dùng đã đăng ký <a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a> -<br />Nếu bạn không còn muốn nhận những email này, hãy nhấp vào liên kết sau: <a href="{1}" style="color: #7b7b7b;" target="_blank">Hủy đăng ký</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.zh-CN.resx b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.zh-CN.resx index 8056b888b6..39e2b97578 100644 --- a/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.zh-CN.resx +++ b/common/ASC.Notify.Textile/Resources/NotifyTemplateResource.zh-CN.resx @@ -128,10 +128,4 @@ </div> </body> - - 此电子邮件是自动生成的,您无需回复。 -<br/>您收到此邮件,因为您是<a href="{0}" style="color: #7b7b7b;" target="_blank">{0}</a>的用户 -<br/>点击这里,取消邮件订阅。<a href="{1}" style="color: #7b7b7b;" target="_blank">取消订阅</a> -<br /> - \ No newline at end of file diff --git a/common/ASC.Notify.Textile/TextileStyler.cs b/common/ASC.Notify.Textile/TextileStyler.cs index 5b4541443c..97762a20e4 100644 --- a/common/ASC.Notify.Textile/TextileStyler.cs +++ b/common/ASC.Notify.Textile/TextileStyler.cs @@ -263,14 +263,6 @@ public class TextileStyler : IPatternStyler return string.Empty; } - var rootPathArgument = message.GetArgument("__VirtualRootPath"); - var rootPath = rootPathArgument == null ? string.Empty : (string)rootPathArgument.Value; - - if (string.IsNullOrEmpty(rootPath)) - { - return string.Empty; - } - var unsubscribeLink = _coreBaseSettings.CustomMode && _coreBaseSettings.Personal ? GetSiteUnsubscribeLink(message, settings) : GetPortalUnsubscribeLink(message, settings); @@ -280,7 +272,7 @@ public class TextileStyler : IPatternStyler return string.Empty; } - return string.Format(NotifyTemplateResource.TextForFooterWithUnsubscribeLink, rootPath, unsubscribeLink); + return string.Format(NotifyTemplateResource.TextForFooterUnsubsribeDocSpace, unsubscribeLink); } private string GetPortalUnsubscribeLink(NoticeMessage message, MailWhiteLabelSettings settings) diff --git a/common/ASC.Socket.IO/app/log.js b/common/ASC.Socket.IO/app/log.js index 5c41a6611b..3cc1bd3903 100644 --- a/common/ASC.Socket.IO/app/log.js +++ b/common/ASC.Socket.IO/app/log.js @@ -1,9 +1,14 @@ -const winston = require("winston"); +const winston = require("winston"), + WinstonCloudWatch = require('winston-cloudwatch'); + require("winston-daily-rotate-file"); const path = require("path"); const config = require("../config"); const fs = require("fs"); +const os = require("os"); +const { randomUUID } = require('crypto'); +const date = require('date-and-time'); let logpath = config.get("logPath"); if(logpath != null) @@ -17,6 +22,14 @@ if(logpath != null) const fileName = logpath ? path.join(logpath, "socket-io.%DATE%.log") : path.join(__dirname, "..", "..", "..", "Logs", "socket-io.%DATE%.log"); const dirName = path.dirname(fileName); +const aws = config.get("aws"); + +const accessKeyId = aws.accessKeyId; +const secretAccessKey = aws.secretAccessKey; +const awsRegion = aws.region; +const logGroupName = aws.logGroupName; +const logStreamName = aws.logStreamName; + if (!fs.existsSync(dirName)) { fs.mkdirSync(dirName); } @@ -38,25 +51,67 @@ var options = { json: false, colorize: true, }, + cloudWatch: { + name: 'aws', + level: "debug", + logGroupName: () => { + const hostname = os.hostname(); + + return logGroupName.replace("${instance-id}", hostname); + }, + logStreamName: () => { + const now = new Date(); + const guid = randomUUID(); + const dateAsString = date.format(now, 'YYYY/MM/DDTHH.mm.ss'); + + return logStreamName.replace("${guid}", guid) + .replace("${date}", dateAsString); + }, + awsRegion: awsRegion, + jsonMessage: true, + awsOptions: { + credentials: { + accessKeyId: accessKeyId, + secretAccessKey: secretAccessKey + } + } + } }; //const fileTransport = new winston.transports.DailyRotateFile(options.file); -const transports = [ +var transports = [ new winston.transports.Console(options.console), - new winston.transports.DailyRotateFile(options.file), + new winston.transports.DailyRotateFile(options.file) ]; +if (aws != null && aws.accessKeyId !== '') +{ + transports.push(new WinstonCloudWatch(options.cloudWatch)); +} + //winston.exceptions.handle(fileTransport); +const customFormat = winston.format(info => { + const now = new Date(); + + info.date = date.format(now, 'YYYY-MM-DD HH:mm:ss'); + info.applicationContext = "SocketIO"; + info.level = info.level.toUpperCase(); + + const hostname = os.hostname(); + + info["instance-id"] = hostname; + + return info; +})(); + module.exports = new winston.createLogger({ //defaultMeta: { component: "socket.io-server" }, format: winston.format.combine( - winston.format.timestamp({ - format: "YYYY-MM-DD HH:mm:ss", - }), - winston.format.json() + customFormat, + winston.format.json() ), transports: transports, exitOnError: false, -}); +}); \ No newline at end of file diff --git a/common/ASC.Socket.IO/config/config.json b/common/ASC.Socket.IO/config/config.json index 8922ebd921..100703a6ce 100644 --- a/common/ASC.Socket.IO/config/config.json +++ b/common/ASC.Socket.IO/config/config.json @@ -3,5 +3,12 @@ "port": 9899, "appsettings": "../../../config", "environment": "Development" + }, + "aws":{ + "accessKeyId": "", + "secretAccessKey": "", + "region": "", + "logGroupName": "/docspace/ASC.SocketIO/instance/${instance-id}/general", + "logStreamName": "${guid} - ${date}" } } diff --git a/common/ASC.Socket.IO/package.json b/common/ASC.Socket.IO/package.json index 1dc4ea2c41..2d26c0ede0 100644 --- a/common/ASC.Socket.IO/package.json +++ b/common/ASC.Socket.IO/package.json @@ -7,9 +7,11 @@ "start:dev": "nodemon server.js" }, "dependencies": { + "@aws-sdk/client-cloudwatch-logs": "^3.199.0", "axios": "0.24.0", "connect-redis": "~6.0.0", "cookie-parser": "~1.4.6", + "date-and-time": "^2.4.1", "express": "~4.17.2", "express-session": "~1.17.2", "express-socket.io-session": "~1.3.5", @@ -20,7 +22,8 @@ "nodemon": "^2.0.15", "redis": "^3.1.2", "socket.io": "^4.4.0", - "winston": "^3.3.3", + "winston": "^3.8.2", + "winston-cloudwatch": "^6.1.1", "winston-daily-rotate-file": "^4.5.5" } } diff --git a/common/ASC.Socket.IO/yarn.lock b/common/ASC.Socket.IO/yarn.lock index c93f0018c9..7b6600624a 100644 --- a/common/ASC.Socket.IO/yarn.lock +++ b/common/ASC.Socket.IO/yarn.lock @@ -5,14 +5,798 @@ __metadata: version: 6 cacheKey: 8 -"@dabh/diagnostics@npm:^2.0.2": +"@aws-crypto/ie11-detection@npm:^2.0.0": version: 2.0.2 - resolution: "@dabh/diagnostics@npm:2.0.2" + resolution: "@aws-crypto/ie11-detection@npm:2.0.2" + dependencies: + tslib: ^1.11.1 + checksum: 713293deea8eefd3ab43dc05e62228571d27754e7293f8ec2fd8a0c693fbbfc55213e6599387776e3cdbc951965dc62e24e92b9c4a853e4a50d00ae6a9f6b2bd + languageName: node + linkType: hard + +"@aws-crypto/sha256-browser@npm:2.0.0": + version: 2.0.0 + resolution: "@aws-crypto/sha256-browser@npm:2.0.0" + dependencies: + "@aws-crypto/ie11-detection": ^2.0.0 + "@aws-crypto/sha256-js": ^2.0.0 + "@aws-crypto/supports-web-crypto": ^2.0.0 + "@aws-crypto/util": ^2.0.0 + "@aws-sdk/types": ^3.1.0 + "@aws-sdk/util-locate-window": ^3.0.0 + "@aws-sdk/util-utf8-browser": ^3.0.0 + tslib: ^1.11.1 + checksum: 7bc1ff042d0c53a46c0fc3824bd97fb3ed1df7dc030b8a995889471052860b8c8ade469c97866fafd8249a3144d0f48b0f1054f357e2b403606009381c4b8f0e + languageName: node + linkType: hard + +"@aws-crypto/sha256-js@npm:2.0.0, @aws-crypto/sha256-js@npm:^2.0.0": + version: 2.0.0 + resolution: "@aws-crypto/sha256-js@npm:2.0.0" + dependencies: + "@aws-crypto/util": ^2.0.0 + "@aws-sdk/types": ^3.1.0 + tslib: ^1.11.1 + checksum: e4abf9baec6bed19d380f92a999a41ac5bdd8890dfd45971d29054c298854c5b7087e7de633413f2e64618ef8238ccf4c0b75797c73063c74bbba3cb5d8b2581 + languageName: node + linkType: hard + +"@aws-crypto/supports-web-crypto@npm:^2.0.0": + version: 2.0.2 + resolution: "@aws-crypto/supports-web-crypto@npm:2.0.2" + dependencies: + tslib: ^1.11.1 + checksum: 03d04d29292dc1b76db9bc6becd05f52fa79adee0ec084f971b0767f7e73250dd0422bea57636015f8c27f38aefcd1d9c58800a4749cf35339296c8d670f3ccb + languageName: node + linkType: hard + +"@aws-crypto/util@npm:^2.0.0": + version: 2.0.2 + resolution: "@aws-crypto/util@npm:2.0.2" + dependencies: + "@aws-sdk/types": ^3.110.0 + "@aws-sdk/util-utf8-browser": ^3.0.0 + tslib: ^1.11.1 + checksum: 13cb33a39005b09c062398d361043c2224bc8ba42b1432bad52e15bc4bf9ffad4facdddc394b3cc71b3fb8d86a7ec325fd1afa107b5fde0dab84a7e32d311d7f + languageName: node + linkType: hard + +"@aws-sdk/abort-controller@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/abort-controller@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: d4ce4904aa0182e4f6aac288b378bdeff3ce965fd157d20e3774ae1d6e504f934fc95efbb534a07219a4dbbfb0d60b5573c6f821dd4765347243402da36b1d8a + languageName: node + linkType: hard + +"@aws-sdk/client-cloudwatch-logs@npm:^3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/client-cloudwatch-logs@npm:3.199.0" + dependencies: + "@aws-crypto/sha256-browser": 2.0.0 + "@aws-crypto/sha256-js": 2.0.0 + "@aws-sdk/client-sts": 3.199.0 + "@aws-sdk/config-resolver": 3.198.0 + "@aws-sdk/credential-provider-node": 3.199.0 + "@aws-sdk/fetch-http-handler": 3.199.0 + "@aws-sdk/hash-node": 3.198.0 + "@aws-sdk/invalid-dependency": 3.198.0 + "@aws-sdk/middleware-content-length": 3.199.0 + "@aws-sdk/middleware-endpoint": 3.198.0 + "@aws-sdk/middleware-host-header": 3.198.0 + "@aws-sdk/middleware-logger": 3.198.0 + "@aws-sdk/middleware-recursion-detection": 3.198.0 + "@aws-sdk/middleware-retry": 3.198.0 + "@aws-sdk/middleware-serde": 3.198.0 + "@aws-sdk/middleware-signing": 3.198.0 + "@aws-sdk/middleware-stack": 3.198.0 + "@aws-sdk/middleware-user-agent": 3.198.0 + "@aws-sdk/node-config-provider": 3.198.0 + "@aws-sdk/node-http-handler": 3.199.0 + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/smithy-client": 3.198.0 + "@aws-sdk/types": 3.198.0 + "@aws-sdk/url-parser": 3.198.0 + "@aws-sdk/util-base64-browser": 3.188.0 + "@aws-sdk/util-base64-node": 3.188.0 + "@aws-sdk/util-body-length-browser": 3.188.0 + "@aws-sdk/util-body-length-node": 3.188.0 + "@aws-sdk/util-defaults-mode-browser": 3.198.0 + "@aws-sdk/util-defaults-mode-node": 3.198.0 + "@aws-sdk/util-endpoints": 3.198.0 + "@aws-sdk/util-user-agent-browser": 3.198.0 + "@aws-sdk/util-user-agent-node": 3.198.0 + "@aws-sdk/util-utf8-browser": 3.188.0 + "@aws-sdk/util-utf8-node": 3.199.0 + tslib: ^2.3.1 + checksum: 1f49bd39c7da6f1d0171ec411ad32e26197aec8012163a1c354e154f8b548321c5e2e298419c17d45efe80124863bdfb7b6cf4835ff4322948011adbbc62cecd + languageName: node + linkType: hard + +"@aws-sdk/client-sso@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/client-sso@npm:3.199.0" + dependencies: + "@aws-crypto/sha256-browser": 2.0.0 + "@aws-crypto/sha256-js": 2.0.0 + "@aws-sdk/config-resolver": 3.198.0 + "@aws-sdk/fetch-http-handler": 3.199.0 + "@aws-sdk/hash-node": 3.198.0 + "@aws-sdk/invalid-dependency": 3.198.0 + "@aws-sdk/middleware-content-length": 3.199.0 + "@aws-sdk/middleware-endpoint": 3.198.0 + "@aws-sdk/middleware-host-header": 3.198.0 + "@aws-sdk/middleware-logger": 3.198.0 + "@aws-sdk/middleware-recursion-detection": 3.198.0 + "@aws-sdk/middleware-retry": 3.198.0 + "@aws-sdk/middleware-serde": 3.198.0 + "@aws-sdk/middleware-stack": 3.198.0 + "@aws-sdk/middleware-user-agent": 3.198.0 + "@aws-sdk/node-config-provider": 3.198.0 + "@aws-sdk/node-http-handler": 3.199.0 + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/smithy-client": 3.198.0 + "@aws-sdk/types": 3.198.0 + "@aws-sdk/url-parser": 3.198.0 + "@aws-sdk/util-base64-browser": 3.188.0 + "@aws-sdk/util-base64-node": 3.188.0 + "@aws-sdk/util-body-length-browser": 3.188.0 + "@aws-sdk/util-body-length-node": 3.188.0 + "@aws-sdk/util-defaults-mode-browser": 3.198.0 + "@aws-sdk/util-defaults-mode-node": 3.198.0 + "@aws-sdk/util-endpoints": 3.198.0 + "@aws-sdk/util-user-agent-browser": 3.198.0 + "@aws-sdk/util-user-agent-node": 3.198.0 + "@aws-sdk/util-utf8-browser": 3.188.0 + "@aws-sdk/util-utf8-node": 3.199.0 + tslib: ^2.3.1 + checksum: fe77c7989ffbf37e031beaa94330af478d730eff5404eb0ff277e69a3ee0151311ee65d78bfac83bf06bbb6ae15674c15cea49d4f11ce51257c2bf33c1a4ba25 + languageName: node + linkType: hard + +"@aws-sdk/client-sts@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/client-sts@npm:3.199.0" + dependencies: + "@aws-crypto/sha256-browser": 2.0.0 + "@aws-crypto/sha256-js": 2.0.0 + "@aws-sdk/config-resolver": 3.198.0 + "@aws-sdk/credential-provider-node": 3.199.0 + "@aws-sdk/fetch-http-handler": 3.199.0 + "@aws-sdk/hash-node": 3.198.0 + "@aws-sdk/invalid-dependency": 3.198.0 + "@aws-sdk/middleware-content-length": 3.199.0 + "@aws-sdk/middleware-endpoint": 3.198.0 + "@aws-sdk/middleware-host-header": 3.198.0 + "@aws-sdk/middleware-logger": 3.198.0 + "@aws-sdk/middleware-recursion-detection": 3.198.0 + "@aws-sdk/middleware-retry": 3.198.0 + "@aws-sdk/middleware-sdk-sts": 3.199.0 + "@aws-sdk/middleware-serde": 3.198.0 + "@aws-sdk/middleware-signing": 3.198.0 + "@aws-sdk/middleware-stack": 3.198.0 + "@aws-sdk/middleware-user-agent": 3.198.0 + "@aws-sdk/node-config-provider": 3.198.0 + "@aws-sdk/node-http-handler": 3.199.0 + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/smithy-client": 3.198.0 + "@aws-sdk/types": 3.198.0 + "@aws-sdk/url-parser": 3.198.0 + "@aws-sdk/util-base64-browser": 3.188.0 + "@aws-sdk/util-base64-node": 3.188.0 + "@aws-sdk/util-body-length-browser": 3.188.0 + "@aws-sdk/util-body-length-node": 3.188.0 + "@aws-sdk/util-defaults-mode-browser": 3.198.0 + "@aws-sdk/util-defaults-mode-node": 3.198.0 + "@aws-sdk/util-endpoints": 3.198.0 + "@aws-sdk/util-user-agent-browser": 3.198.0 + "@aws-sdk/util-user-agent-node": 3.198.0 + "@aws-sdk/util-utf8-browser": 3.188.0 + "@aws-sdk/util-utf8-node": 3.199.0 + fast-xml-parser: 4.0.11 + tslib: ^2.3.1 + checksum: 5d64ca1212f4dc53d8868fe3d3428136a40aae384f4597de56a32bc7fb33e814d3344ce60257ad8e41267d79f67a5d9876c63741f58eabde7f9c0611673b1617 + languageName: node + linkType: hard + +"@aws-sdk/config-resolver@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/config-resolver@npm:3.198.0" + dependencies: + "@aws-sdk/signature-v4": 3.198.0 + "@aws-sdk/types": 3.198.0 + "@aws-sdk/util-config-provider": 3.188.0 + "@aws-sdk/util-middleware": 3.198.0 + tslib: ^2.3.1 + checksum: 098359479b11a5f73e047ca087f6541d9a1bbe0f7ac22f56436554e0b9038f28af6020156e11710cae7f4862d2ca7e0ccab5e690d76004ffaae2019d20fa758e + languageName: node + linkType: hard + +"@aws-sdk/credential-provider-env@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/credential-provider-env@npm:3.198.0" + dependencies: + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 5da85858e62f1e215619783ed3c6255704f7bcfc4fea12b9c10f17acccebddffc051f8580bf39483995452a91185a6ed7e40e1443fdcafdd323b7056b9838e6f + languageName: node + linkType: hard + +"@aws-sdk/credential-provider-imds@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/credential-provider-imds@npm:3.198.0" + dependencies: + "@aws-sdk/node-config-provider": 3.198.0 + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/types": 3.198.0 + "@aws-sdk/url-parser": 3.198.0 + tslib: ^2.3.1 + checksum: e97b11a79e54e2159869c5810a0aa9f10bf1242c81a6de34377864981e055180c58f53e9668c7a449aa3236d35d4b71637b2b6c1c115677d16b16136eccacecf + languageName: node + linkType: hard + +"@aws-sdk/credential-provider-ini@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/credential-provider-ini@npm:3.199.0" + dependencies: + "@aws-sdk/credential-provider-env": 3.198.0 + "@aws-sdk/credential-provider-imds": 3.198.0 + "@aws-sdk/credential-provider-sso": 3.199.0 + "@aws-sdk/credential-provider-web-identity": 3.198.0 + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/shared-ini-file-loader": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 937160c50703c65ac640da1f268ca7844f1bd180e87b1fa112142811b3c8fa3ee3147b7c3a3a4f352c5abf4ade82d472b78d799b47ebbad6eaa003d55fb0bced + languageName: node + linkType: hard + +"@aws-sdk/credential-provider-node@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/credential-provider-node@npm:3.199.0" + dependencies: + "@aws-sdk/credential-provider-env": 3.198.0 + "@aws-sdk/credential-provider-imds": 3.198.0 + "@aws-sdk/credential-provider-ini": 3.199.0 + "@aws-sdk/credential-provider-process": 3.198.0 + "@aws-sdk/credential-provider-sso": 3.199.0 + "@aws-sdk/credential-provider-web-identity": 3.198.0 + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/shared-ini-file-loader": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 4ae6d1229aa5a34a30f29d988d22d53dbd9a99f34a88df4c00eaedc5d98b13c109dc98a9b81d5f1802598f186c7e2b94f33adb4c940f6f1f2dff3e712f352e7a + languageName: node + linkType: hard + +"@aws-sdk/credential-provider-process@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/credential-provider-process@npm:3.198.0" + dependencies: + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/shared-ini-file-loader": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 0a0783c2e90fb8955f20d3ab88c2a72adb62214ced6eaca80edd686577946596a09104036e4e6ccd2eaa1bb9f394a32f083c0e33e2d00c2a2601c023695ab4dd + languageName: node + linkType: hard + +"@aws-sdk/credential-provider-sso@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/credential-provider-sso@npm:3.199.0" + dependencies: + "@aws-sdk/client-sso": 3.199.0 + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/shared-ini-file-loader": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 297a0008d1e8b277027fdef9a0f8abd0e81c81326bcc94b6c63e54d827f9d2882fadb1e03a126d2322f59f3708455ad9a0fbaecca4908b278e7650a5b629e826 + languageName: node + linkType: hard + +"@aws-sdk/credential-provider-web-identity@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/credential-provider-web-identity@npm:3.198.0" + dependencies: + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: c39f5df0c31edeaa9a8a62698627008ceda4fa8ef0661d2a065262b1a1daed18beb5344b4f115f3d30357f3d9df7e2263f636f3484cd078b9eba744e2d322d8c + languageName: node + linkType: hard + +"@aws-sdk/fetch-http-handler@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/fetch-http-handler@npm:3.199.0" + dependencies: + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/querystring-builder": 3.199.0 + "@aws-sdk/types": 3.198.0 + "@aws-sdk/util-base64-browser": 3.188.0 + tslib: ^2.3.1 + checksum: 847cc9798a443a67f79c0fe2a3cf47c45807d75099f402be3b107e6810ed762d3d06f43b0290174def8b8f7e90d64e4edac099099867dd5535a696b16456c860 + languageName: node + linkType: hard + +"@aws-sdk/hash-node@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/hash-node@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + "@aws-sdk/util-buffer-from": 3.188.0 + tslib: ^2.3.1 + checksum: 4a915fb2b1f2479d8da35d4fa4dd61f0d715d90e8fed6871ef4876ae401a476da141f53fc7e9ca28ab64e520c166e243a5d69c96b8372b34d242aa3b16eb759b + languageName: node + linkType: hard + +"@aws-sdk/invalid-dependency@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/invalid-dependency@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 9613423db5ddaf8b208dd4f1a8801c67bc6ff7c84436cab2fbd2eeb21ecbfc709dfcbc21d328ce3e8f66ff244dfe5607a6781abbce907a48da7f5dd5665af9d4 + languageName: node + linkType: hard + +"@aws-sdk/is-array-buffer@npm:3.188.0": + version: 3.188.0 + resolution: "@aws-sdk/is-array-buffer@npm:3.188.0" + dependencies: + tslib: ^2.3.1 + checksum: be98f3936241cae66d2ab399d4e3b1b91a530b5abc7c6e35faa110b26aad923343004492e8b305030fa81d7d64bcba7066a5c0e2e5ec3a814719bfc2b2fa00b1 + languageName: node + linkType: hard + +"@aws-sdk/middleware-content-length@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/middleware-content-length@npm:3.199.0" + dependencies: + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 512a6972fbcaf4acc9fcc2aa9ca0b5aafd050360e28c6f95ec86efa190cf894a814b2c95158b81a5df0814cf2161aacffe5cf40bb01f5e3e4bd3c3335130bbf5 + languageName: node + linkType: hard + +"@aws-sdk/middleware-endpoint@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/middleware-endpoint@npm:3.198.0" + dependencies: + "@aws-sdk/middleware-serde": 3.198.0 + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/signature-v4": 3.198.0 + "@aws-sdk/types": 3.198.0 + "@aws-sdk/url-parser": 3.198.0 + "@aws-sdk/util-config-provider": 3.188.0 + "@aws-sdk/util-middleware": 3.198.0 + tslib: ^2.3.1 + checksum: 42d8c0c5e79aa7f54f43b995495d1f19e63104a879e5b93e0335b8ab420b0f52556599f384b5b8f288abdf5206353701c72ac7853ef561dea82217e358e171d9 + languageName: node + linkType: hard + +"@aws-sdk/middleware-host-header@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/middleware-host-header@npm:3.198.0" + dependencies: + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 3ffa7a89ca0ed238f84d97f5bd1bd2a740d9111e8b0dfa90688c0d12de95daad85d7dea6cd500f89abf302c4c37f4de5c1e235965172b2fa874e9e44bd7320be + languageName: node + linkType: hard + +"@aws-sdk/middleware-logger@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/middleware-logger@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: ad63cbe20f105b03e019d4f68c82f8fced5b148eab8df6ecd877d22f97d5aee47d790ec69b13cc4e5cdcc3406210d52e12ea22b29296db0a25730de71bc5b5ad + languageName: node + linkType: hard + +"@aws-sdk/middleware-recursion-detection@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/middleware-recursion-detection@npm:3.198.0" + dependencies: + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 4e45af43d048a33066e9eeb615b3b916aaa520801bc36866ba99643e9db98f107baf0714c9c1581317f660a2735d4f2309b139595fcf4352f6ae94981b071f92 + languageName: node + linkType: hard + +"@aws-sdk/middleware-retry@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/middleware-retry@npm:3.198.0" + dependencies: + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/service-error-classification": 3.198.0 + "@aws-sdk/types": 3.198.0 + "@aws-sdk/util-middleware": 3.198.0 + tslib: ^2.3.1 + uuid: ^8.3.2 + checksum: c70fc4f8121aff1cf0fc0b66bebce76413f10670a345674805176f57894e8c86574e34b21f5334bc84e8fb1ab192f7439af353669dc066554b0bfddab01176e5 + languageName: node + linkType: hard + +"@aws-sdk/middleware-sdk-sts@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/middleware-sdk-sts@npm:3.199.0" + dependencies: + "@aws-sdk/middleware-signing": 3.198.0 + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/signature-v4": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 9293b2136bb1d78cb29d88f2ca1fbc999136343b258293d1b42b8d1368ec6b8a9da6c52c578ce030f1908b11893eb8bd1dad862997b32a051227c83a2efda120 + languageName: node + linkType: hard + +"@aws-sdk/middleware-serde@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/middleware-serde@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: f31612bb2e0b21c632a768eee1514748f538f7452e9bf27f5306f80ea1bfb2a30cca7c67197e441fbb073cae65dae0b6bedff679c55fb36c9b68287595923301 + languageName: node + linkType: hard + +"@aws-sdk/middleware-signing@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/middleware-signing@npm:3.198.0" + dependencies: + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/signature-v4": 3.198.0 + "@aws-sdk/types": 3.198.0 + "@aws-sdk/util-middleware": 3.198.0 + tslib: ^2.3.1 + checksum: 70f42d049d12db39dbe4c4aeda919490eeb9679d2878d85055e8a109d0404aa5e1bccbb0f69cdb80f0ad0f6e83dc53ad09f8514c9e758ca2cae718489a3fcb8e + languageName: node + linkType: hard + +"@aws-sdk/middleware-stack@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/middleware-stack@npm:3.198.0" + dependencies: + tslib: ^2.3.1 + checksum: 61924144744df66df76f2eabbd8830feb2eae860d73059b704b5129ccb7fe4436f2fa345caee00f9075f8dd0237fa50e0c7a818ef4858037712b7a629f2419bb + languageName: node + linkType: hard + +"@aws-sdk/middleware-user-agent@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/middleware-user-agent@npm:3.198.0" + dependencies: + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 93434bec94803c2a314f64a5372d130766d063a7e17f18bb7eba352f21a3939dab2e80f78efca6aa43bc069495881257d9e8e598a24fd2f68bbc6c0f45be5471 + languageName: node + linkType: hard + +"@aws-sdk/node-config-provider@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/node-config-provider@npm:3.198.0" + dependencies: + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/shared-ini-file-loader": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 7b48b0bdc4d8aa71fc2497d5ea23cf4cfde152fe1cbdf6b40145ec0702a6846ca06d67c422b3b2abb3400e754995cbf3b07f0e902b09237b2a7929e9868140a2 + languageName: node + linkType: hard + +"@aws-sdk/node-http-handler@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/node-http-handler@npm:3.199.0" + dependencies: + "@aws-sdk/abort-controller": 3.198.0 + "@aws-sdk/protocol-http": 3.198.0 + "@aws-sdk/querystring-builder": 3.199.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: a875c37f583757bca5e5f728ec1fb1d15584406dd8e507c1ed76b9e40ce37200607cb31ec7b494b58bbfc81efe720ca36061801cd16090ae6caaf8fd4529d36b + languageName: node + linkType: hard + +"@aws-sdk/property-provider@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/property-provider@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: a4404736af7b577dc2425b3202e02c14a687404ca9eeb53d8bc26eb2afb451802bbe62ff3e4d2ac958a7ee573fcd3960643a9c0ddaf49684a51708e74e7fb7e8 + languageName: node + linkType: hard + +"@aws-sdk/protocol-http@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/protocol-http@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: db72ffb4afa3f61fc0172135a5db26ddd4e5f4700331e78ac5b16a7a09dd1c9341f46eb234067e4ca06b77e1290bbb1bea82ae741f9649c8e4e4066d25ffaa0c + languageName: node + linkType: hard + +"@aws-sdk/querystring-builder@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/querystring-builder@npm:3.199.0" + dependencies: + "@aws-sdk/types": 3.198.0 + "@aws-sdk/util-uri-escape": 3.188.0 + tslib: ^2.3.1 + checksum: 60ea7e6996955df8dcc5b15bf85104ad99d946fbb435653f3d325b32697baa8e7ef950d9bccab9b9b868dcbe3b94e28093a7a185bb9abb3b4cc8941a9c6358de + languageName: node + linkType: hard + +"@aws-sdk/querystring-parser@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/querystring-parser@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: eb396a3d460444cc0cefa802a67239b4b371c9185a625bea002e88d83f23cbbfb02c07c452de60f438b2003b2773b6d0ec1528cc10f8412a7be388f126ed71dd + languageName: node + linkType: hard + +"@aws-sdk/service-error-classification@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/service-error-classification@npm:3.198.0" + checksum: 6093f5aab6f6253017b1b4c164072903ce545d7ea0363caf647f785208676825ea2f03d7aa9dd8a6311608e56335cb07fd144d97c7b97201c76d3a20e9798c36 + languageName: node + linkType: hard + +"@aws-sdk/shared-ini-file-loader@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/shared-ini-file-loader@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: ce35e875578631de099ee5023c81345aa6852d5e662b68afd970121e04808e47645352c7318bb15825ccda2179d8fcba3e594aa30c6e928aa94cd4e7e6cacfc0 + languageName: node + linkType: hard + +"@aws-sdk/signature-v4@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/signature-v4@npm:3.198.0" + dependencies: + "@aws-sdk/is-array-buffer": 3.188.0 + "@aws-sdk/types": 3.198.0 + "@aws-sdk/util-hex-encoding": 3.188.0 + "@aws-sdk/util-middleware": 3.198.0 + "@aws-sdk/util-uri-escape": 3.188.0 + tslib: ^2.3.1 + checksum: 4dfc0229349aea5224df8e30044154ab1aa37995a26ced39384c3799702796e82238fb97aeb9d3f298803bb2107474f4cc63c01c4b048af8af3ff06983a23ad1 + languageName: node + linkType: hard + +"@aws-sdk/smithy-client@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/smithy-client@npm:3.198.0" + dependencies: + "@aws-sdk/middleware-stack": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 767c27a20dbf9a10df313e8b4517b5b3d7a3af7f9db94f317e632039c612b1b95d944f997b039d44a835361ba88ad2e3490a321d9a0059b7236d51217c3417a7 + languageName: node + linkType: hard + +"@aws-sdk/types@npm:3.198.0, @aws-sdk/types@npm:^3.1.0, @aws-sdk/types@npm:^3.110.0": + version: 3.198.0 + resolution: "@aws-sdk/types@npm:3.198.0" + checksum: 0cc9de42c722ee352d94d41f2524e254b2c535c39f9f531226cd1fc02eb2462acc39d51f00ca0ada07b72871ed413c148bada65de1a5a72710d800e0f3cfd6bc + languageName: node + linkType: hard + +"@aws-sdk/url-parser@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/url-parser@npm:3.198.0" + dependencies: + "@aws-sdk/querystring-parser": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 59e6e342ecef6d98d770683250c6e736ed262fcfadf735f4e0411ef6e57f36851a660a8739e97076130c17ed4a13a2834849e298c793d77775d2b80d34b2f01f + languageName: node + linkType: hard + +"@aws-sdk/util-base64-browser@npm:3.188.0": + version: 3.188.0 + resolution: "@aws-sdk/util-base64-browser@npm:3.188.0" + dependencies: + tslib: ^2.3.1 + checksum: 127b16db2ff70a82d56e003a7c3f531f32e7e8f9e9c5f4daaa2ba55ff5494b42d1531ef1f207a1632e33ac5dc1258cb2ebc8b28eeeaa97f96ad7125b17892e7d + languageName: node + linkType: hard + +"@aws-sdk/util-base64-node@npm:3.188.0": + version: 3.188.0 + resolution: "@aws-sdk/util-base64-node@npm:3.188.0" + dependencies: + "@aws-sdk/util-buffer-from": 3.188.0 + tslib: ^2.3.1 + checksum: 0aed4d00fe893fdeddd9f6d1e2fe45a39956485f560041162f6ec4d936a64cc1e31f713980db731337316fadbbbd2241b3842bf3e15eab51c8bbc3b661720120 + languageName: node + linkType: hard + +"@aws-sdk/util-body-length-browser@npm:3.188.0": + version: 3.188.0 + resolution: "@aws-sdk/util-body-length-browser@npm:3.188.0" + dependencies: + tslib: ^2.3.1 + checksum: 1b08bd1e63ec843ee336f51d894c49bf3c4c2f96e50d1711a12f7d0c5b6f7a15b490e366fec55b63e77036002994bac12927b29de2eb9ac91e4f152b1af78e58 + languageName: node + linkType: hard + +"@aws-sdk/util-body-length-node@npm:3.188.0": + version: 3.188.0 + resolution: "@aws-sdk/util-body-length-node@npm:3.188.0" + dependencies: + tslib: ^2.3.1 + checksum: 4bb0dcc63aa616ef8efd131754882bad228d6f449faea16db38ba36d34185e45d3e7063cea4c7296609990ad77c9cd9810b66f8d9e4a08a0066d191793ceb186 + languageName: node + linkType: hard + +"@aws-sdk/util-buffer-from@npm:3.188.0": + version: 3.188.0 + resolution: "@aws-sdk/util-buffer-from@npm:3.188.0" + dependencies: + "@aws-sdk/is-array-buffer": 3.188.0 + tslib: ^2.3.1 + checksum: ccb9fea77e1207cfbbdd06adbba7b8128ec7f26966ff8f95743d62a760e7748c5c4ff90ad154724f8bbce12958133375e0526984a5af7ef49a98b7c6f3d7495a + languageName: node + linkType: hard + +"@aws-sdk/util-config-provider@npm:3.188.0": + version: 3.188.0 + resolution: "@aws-sdk/util-config-provider@npm:3.188.0" + dependencies: + tslib: ^2.3.1 + checksum: 0fa44590ad6859ed0f9945b1fef62906d97ce7b5a27219e454e961d0e2d028bb9981b16ca884fc13c3c33a720228699fadd947451144a984eb7fae1ae26a2456 + languageName: node + linkType: hard + +"@aws-sdk/util-defaults-mode-browser@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/util-defaults-mode-browser@npm:3.198.0" + dependencies: + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/types": 3.198.0 + bowser: ^2.11.0 + tslib: ^2.3.1 + checksum: c4cfd37d100442a453d16c03b58f7cbf70c1530cbe65c530e81261f73d1e9782795d133a34a3d187b5f4529780f5fac8d0595ba1cebfe390dcfc8f722ec00cab + languageName: node + linkType: hard + +"@aws-sdk/util-defaults-mode-node@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/util-defaults-mode-node@npm:3.198.0" + dependencies: + "@aws-sdk/config-resolver": 3.198.0 + "@aws-sdk/credential-provider-imds": 3.198.0 + "@aws-sdk/node-config-provider": 3.198.0 + "@aws-sdk/property-provider": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 88abfdc01c753e8631251d9819eee740fff7f8119f919c05eac9af39b13348fa03ca9a23a229553b130df15d56be8d4b1030a6bb07efa10479640f22eb5d0525 + languageName: node + linkType: hard + +"@aws-sdk/util-endpoints@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/util-endpoints@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + checksum: 0bb4c57e4b6ba559c019483c56cd853d014a91f5f88602a9e7b492199aad503dc422e71b93c77b4986db6978faa31cdba9284e35af8270b55416769acadb1339 + languageName: node + linkType: hard + +"@aws-sdk/util-hex-encoding@npm:3.188.0": + version: 3.188.0 + resolution: "@aws-sdk/util-hex-encoding@npm:3.188.0" + dependencies: + tslib: ^2.3.1 + checksum: 87e79f5f124891bcdcb5347a5a566f066488da79beccbdfc39979e83d85d77fce67b22f901ab74623b172c51ad18e1d4909a610e5fff36b8c5bd16366aa4454f + languageName: node + linkType: hard + +"@aws-sdk/util-locate-window@npm:^3.0.0": + version: 3.188.0 + resolution: "@aws-sdk/util-locate-window@npm:3.188.0" + dependencies: + tslib: ^2.3.1 + checksum: 0c50326a20611d6a7e088390bee212973d6c2988e324ee53dea2ea71e8a84a1c00b7678295cbc963deb19fd34cf48beae70977a3f84c1b0836acf8994242208f + languageName: node + linkType: hard + +"@aws-sdk/util-middleware@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/util-middleware@npm:3.198.0" + dependencies: + tslib: ^2.3.1 + checksum: 47fd1cbd7143b43b84825af8beeb400620c1cca7234ab1c67ae34b1166f6175700370252e6ba917fbc2872c51393dfea5bcdecaabb26f224f3a1a599e2e1c89c + languageName: node + linkType: hard + +"@aws-sdk/util-uri-escape@npm:3.188.0": + version: 3.188.0 + resolution: "@aws-sdk/util-uri-escape@npm:3.188.0" + dependencies: + tslib: ^2.3.1 + checksum: 07f9c7d577e6f4838075a40e3f4196bae27d09474955e77b4de3031a2b3f3fa48684fd10219804490d530413ceb3386ea94f4fe5defcae66f4ad3a589560aa25 + languageName: node + linkType: hard + +"@aws-sdk/util-user-agent-browser@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/util-user-agent-browser@npm:3.198.0" + dependencies: + "@aws-sdk/types": 3.198.0 + bowser: ^2.11.0 + tslib: ^2.3.1 + checksum: f232aed8b2f1637836a0cf0ef3e87fbee9cd6939022309d1f17e2fa7bcd4b9fb3f87a0fc946bc64bc8ea118f04706ee1815020ce1d3c9aaef8bb4d6ed308a924 + languageName: node + linkType: hard + +"@aws-sdk/util-user-agent-node@npm:3.198.0": + version: 3.198.0 + resolution: "@aws-sdk/util-user-agent-node@npm:3.198.0" + dependencies: + "@aws-sdk/node-config-provider": 3.198.0 + "@aws-sdk/types": 3.198.0 + tslib: ^2.3.1 + peerDependencies: + aws-crt: ">=1.0.0" + peerDependenciesMeta: + aws-crt: + optional: true + checksum: 9d36ae6915f7cf391a3f4a5afc74356d95b2fdea3089a2a5907d17b4533ef1c41f685b4aa78df0fe64033620d9404635f92ae1381f2762de37f3997adb2f2717 + languageName: node + linkType: hard + +"@aws-sdk/util-utf8-browser@npm:3.188.0, @aws-sdk/util-utf8-browser@npm:^3.0.0": + version: 3.188.0 + resolution: "@aws-sdk/util-utf8-browser@npm:3.188.0" + dependencies: + tslib: ^2.3.1 + checksum: dacd27164aa0835888434e080b67f04510e2281560540ff73496f2d0aa73b0b7f830ec08491b35c3a51bf6214615579182aff8727e151e54a74a97a197a2ac31 + languageName: node + linkType: hard + +"@aws-sdk/util-utf8-node@npm:3.199.0": + version: 3.199.0 + resolution: "@aws-sdk/util-utf8-node@npm:3.199.0" + dependencies: + "@aws-sdk/util-buffer-from": 3.188.0 + tslib: ^2.3.1 + checksum: e18fe35d270b02ac7de34cd57e951c18613ac4553d90c85a0cd16095b138f60c36b445e1bdcd18e7d2b992b4e3536c15fe244955325c80230ddcf1145936313c + languageName: node + linkType: hard + +"@colors/colors@npm:1.5.0": + version: 1.5.0 + resolution: "@colors/colors@npm:1.5.0" + checksum: d64d5260bed1d5012ae3fc617d38d1afc0329fec05342f4e6b838f46998855ba56e0a73833f4a80fa8378c84810da254f76a8a19c39d038260dc06dc4e007425 + languageName: node + linkType: hard + +"@dabh/diagnostics@npm:^2.0.2": + version: 2.0.3 + resolution: "@dabh/diagnostics@npm:2.0.3" dependencies: colorspace: 1.1.x enabled: 2.0.x kuler: ^2.0.0 - checksum: 4d95cc31249a840b6cc3dba3dc4345a9295265413456068a0d07b69fa0ec6a5a5bc2c39e56ec04c6509ac1f4d9c17fc80baaaddd5caa1abcdd3aaeffe2b63cec + checksum: 4879600c55c8315a0fb85fbb19057bad1adc08f0a080a8cb4e2b63f723c379bfc4283b68123a2b078d367b327dd8df12fcb27464efe791addc0a48b9df6d79a1 languageName: node linkType: hard @@ -24,45 +808,36 @@ __metadata: linkType: hard "@npmcli/fs@npm:^2.1.0": - version: 2.1.1 - resolution: "@npmcli/fs@npm:2.1.1" + version: 2.1.2 + resolution: "@npmcli/fs@npm:2.1.2" dependencies: "@gar/promisify": ^1.1.3 semver: ^7.3.5 - checksum: 4944a0545d38d3e6e29780eeb3cd4be6059c1e9627509d2c9ced635c53b852d28b37cdc615a2adf815b51ab8673adb6507e370401a20a7e90c8a6dc4fac02389 + checksum: 405074965e72d4c9d728931b64d2d38e6ea12066d4fad651ac253d175e413c06fe4350970c783db0d749181da8fe49c42d3880bd1cbc12cd68e3a7964d820225 languageName: node linkType: hard "@npmcli/move-file@npm:^2.0.0": - version: 2.0.0 - resolution: "@npmcli/move-file@npm:2.0.0" + version: 2.0.1 + resolution: "@npmcli/move-file@npm:2.0.1" dependencies: mkdirp: ^1.0.4 rimraf: ^3.0.2 - checksum: 1388777b507b0c592d53f41b9d182e1a8de7763bc625fc07999b8edbc22325f074e5b3ec90af79c89d6987fdb2325bc66d59f483258543c14a43661621f841b0 + checksum: 52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380 languageName: node linkType: hard -"@sindresorhus/is@npm:^0.14.0": - version: 0.14.0 - resolution: "@sindresorhus/is@npm:0.14.0" - checksum: 971e0441dd44ba3909b467219a5e242da0fc584048db5324cfb8048148fa8dcc9d44d71e3948972c4f6121d24e5da402ef191420d1266a95f713bb6d6e59c98a +"@socket.io/component-emitter@npm:~3.1.0": + version: 3.1.0 + resolution: "@socket.io/component-emitter@npm:3.1.0" + checksum: db069d95425b419de1514dffe945cc439795f6a8ef5b9465715acf5b8b50798e2c91b8719cbf5434b3fe7de179d6cdcd503c277b7871cb3dd03febb69bdd50fa languageName: node linkType: hard -"@socket.io/base64-arraybuffer@npm:~1.0.2": - version: 1.0.2 - resolution: "@socket.io/base64-arraybuffer@npm:1.0.2" - checksum: fa3e58c7581643d0557969cd3bece20e198596df77968ff29ede6be329d488e65104bef900e68a67f39d8855abfa59baa2b08d96fb856504bd01cbdd8f52249c - languageName: node - linkType: hard - -"@szmarczak/http-timer@npm:^1.1.2": +"@tootallnate/once@npm:1": version: 1.1.2 - resolution: "@szmarczak/http-timer@npm:1.1.2" - dependencies: - defer-to-connect: ^1.0.1 - checksum: 4d9158061c5f397c57b4988cde33a163244e4f02df16364f103971957a32886beb104d6180902cbe8b38cb940e234d9f98a4e486200deca621923f62f50a06fe + resolution: "@tootallnate/once@npm:1.1.2" + checksum: e1fb1bbbc12089a0cb9433dc290f97bddd062deadb6178ce9bcb93bb7c1aecde5e60184bc7065aec42fe1663622a213493c48bbd4972d931aae48315f18e1be9 languageName: node linkType: hard @@ -73,13 +848,6 @@ __metadata: languageName: node linkType: hard -"@types/component-emitter@npm:^1.2.10": - version: 1.2.11 - resolution: "@types/component-emitter@npm:1.2.11" - checksum: 0e081c5f7a4b113af3732f67ad9ebb487d5c239d440d96938ff9a679d18bb9337a513638e12b5b02a7a921494eef18c5a4d78f1188bc43a12290edd74c42a9c7 - languageName: node - linkType: hard - "@types/cookie@npm:^0.4.1": version: 0.4.1 resolution: "@types/cookie@npm:0.4.1" @@ -94,46 +862,21 @@ __metadata: languageName: node linkType: hard -"@types/keyv@npm:^3.1.1": - version: 3.1.4 - resolution: "@types/keyv@npm:3.1.4" - dependencies: - "@types/node": "*" - checksum: e009a2bfb50e90ca9b7c6e8f648f8464067271fd99116f881073fa6fa76dc8d0133181dd65e6614d5fb1220d671d67b0124aef7d97dc02d7e342ab143a47779d - languageName: node - linkType: hard - -"@types/node@npm:*": - version: 18.6.2 - resolution: "@types/node@npm:18.6.2" - checksum: 644c460baedb1fbbd55369ab621167cb39ddaa727fd4fcf4bc7080183cf936d7ff8c2c886ba93ff42768d6f7a579a540e6d1e63d3adba4e5758fb13671ae68ce - languageName: node - linkType: hard - "@types/node@npm:>=10.0.0": - version: 17.0.16 - resolution: "@types/node@npm:17.0.16" - checksum: 2d452a9e0ee7ec83d447d66dd2baf4dd05ef2fbcda39b06f73d86b36d5150d86c43a733d534d77467e7782104756944d42a35ed4b64113bda341b8334ee4d01d + version: 18.11.8 + resolution: "@types/node@npm:18.11.8" + checksum: 60b358f97c1a029722dc785811b217615ef20249c3fbde60a65869cfd7a5cd5b1872ee95c79c187ef70e5a078f4ac7670d2129803985268b1f021ad6e8040af8 languageName: node linkType: hard -"@types/responselike@npm:^1.0.0": - version: 1.0.0 - resolution: "@types/responselike@npm:1.0.0" - dependencies: - "@types/node": "*" - checksum: e99fc7cc6265407987b30deda54c1c24bb1478803faf6037557a774b2f034c5b097ffd65847daa87e82a61a250d919f35c3588654b0fdaa816906650f596d1b0 - languageName: node - linkType: hard - -"abbrev@npm:1": +"abbrev@npm:1, abbrev@npm:^1.0.0": version: 1.1.1 resolution: "abbrev@npm:1.1.1" checksum: a4a97ec07d7ea112c517036882b2ac22f3109b7b19077dc656316d07d308438aac28e4d9746dc4d84bf6b1e75b4a7b0a5f3cb30592419f128ca9a8cee3bcfa17 languageName: node linkType: hard -"accepts@npm:~1.3.4, accepts@npm:~1.3.7": +"accepts@npm:~1.3.4, accepts@npm:~1.3.8": version: 1.3.8 resolution: "accepts@npm:1.3.8" dependencies: @@ -143,7 +886,23 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:6, agent-base@npm:^6.0.2": +"acorn-walk@npm:^8.2.0": + version: 8.2.0 + resolution: "acorn-walk@npm:8.2.0" + checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 + languageName: node + linkType: hard + +"acorn@npm:^8.7.0": + version: 8.8.1 + resolution: "acorn@npm:8.8.1" + bin: + acorn: bin/acorn + checksum: 4079b67283b94935157698831967642f24a075c52ce3feaaaafe095776dfbe15d86a1b33b1e53860fc0d062ed6c83f4284a5c87c85b9ad51853a01173da6097f + languageName: node + linkType: hard + +"agent-base@npm:6, agent-base@npm:^6.0.0, agent-base@npm:^6.0.2": version: 6.0.2 resolution: "agent-base@npm:6.0.2" dependencies: @@ -173,15 +932,6 @@ __metadata: languageName: node linkType: hard -"ansi-align@npm:^3.0.0": - version: 3.0.1 - resolution: "ansi-align@npm:3.0.1" - dependencies: - string-width: ^4.1.0 - checksum: 6abfa08f2141d231c257162b15292467081fa49a208593e055c866aa0455b57f3a86b5a678c190c618faa79b4c59e254493099cb700dd9cf2293c6be2c8f5d8d - languageName: node - linkType: hard - "ansi-regex@npm:^5.0.1": version: 5.0.1 resolution: "ansi-regex@npm:5.0.1" @@ -236,9 +986,11 @@ __metadata: version: 0.0.0-use.local resolution: "asc.socket.io@workspace:." dependencies: + "@aws-sdk/client-cloudwatch-logs": ^3.199.0 axios: 0.24.0 connect-redis: ~6.0.0 cookie-parser: ~1.4.6 + date-and-time: ^2.4.1 express: ~4.17.2 express-session: ~1.17.2 express-socket.io-session: ~1.3.5 @@ -249,11 +1001,21 @@ __metadata: nodemon: ^2.0.15 redis: ^3.1.2 socket.io: ^4.4.0 - winston: ^3.3.3 + winston: ^3.8.2 + winston-cloudwatch: ^6.1.1 winston-daily-rotate-file: ^4.5.5 languageName: unknown linkType: soft +"ast-types@npm:^0.13.2": + version: 0.13.4 + resolution: "ast-types@npm:0.13.4" + dependencies: + tslib: ^2.0.1 + checksum: 5a51f7b70588ecced3601845a0e203279ca2f5fdc184416a0a1640c93ec0a267241d6090a328e78eebb8de81f8754754e0a4f1558ba2a3d638f8ccbd0b1f0eff + languageName: node + linkType: hard + "async@npm:^1.4.0": version: 1.5.2 resolution: "async@npm:1.5.2" @@ -261,10 +1023,10 @@ __metadata: languageName: node linkType: hard -"async@npm:^3.2.3": - version: 3.2.3 - resolution: "async@npm:3.2.3" - checksum: c4bee57ab2249af3dc83ca3ef9acfa8e822c0d5e5aa41bae3eaf7f673648343cd64ecd7d26091ffd357f3f044428b17b5f00098494b6cf8b6b3e9681f0636ca1 +"async@npm:^3.1.0, async@npm:^3.2.3": + version: 3.2.4 + resolution: "async@npm:3.2.4" + checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89 languageName: node linkType: hard @@ -314,37 +1076,28 @@ __metadata: languageName: node linkType: hard -"body-parser@npm:1.19.1": - version: 1.19.1 - resolution: "body-parser@npm:1.19.1" +"body-parser@npm:1.19.2": + version: 1.19.2 + resolution: "body-parser@npm:1.19.2" dependencies: - bytes: 3.1.1 + bytes: 3.1.2 content-type: ~1.0.4 debug: 2.6.9 depd: ~1.1.2 http-errors: 1.8.1 iconv-lite: 0.4.24 on-finished: ~2.3.0 - qs: 6.9.6 - raw-body: 2.4.2 + qs: 6.9.7 + raw-body: 2.4.3 type-is: ~1.6.18 - checksum: 9197a300a6580b8723c7b6b1e22cebd5ba47cd4a6fd45c153350efcde79293869ddee8d17d95fb52724812d649d89d62775faab072608d3243a0cbb00582234e + checksum: 7f777ea65670e2622ca4a785b5dcb2a68451b3bb8d4d0f41091d307d56b640dba588a9ae04d85dda2cdd5e42788266a783528d5417e5643720fd611fd52522e7 languageName: node linkType: hard -"boxen@npm:^5.0.0": - version: 5.1.2 - resolution: "boxen@npm:5.1.2" - dependencies: - ansi-align: ^3.0.0 - camelcase: ^6.2.0 - chalk: ^4.1.0 - cli-boxes: ^2.2.1 - string-width: ^4.2.2 - type-fest: ^0.20.2 - widest-line: ^3.1.0 - wrap-ansi: ^7.0.0 - checksum: 82d03e42a72576ff235123f17b7c505372fe05c83f75f61e7d4fa4bcb393897ec95ce766fecb8f26b915f0f7a7227d66e5ec7cef43f5b2bd9d3aeed47ec55877 +"bowser@npm:^2.11.0": + version: 2.11.0 + resolution: "bowser@npm:2.11.0" + checksum: 29c3f01f22e703fa6644fc3b684307442df4240b6e10f6cfe1b61c6ca5721073189ca97cdeedb376081148c8518e33b1d818a57f781d70b0b70e1f31fb48814f languageName: node linkType: hard @@ -386,16 +1139,16 @@ __metadata: languageName: node linkType: hard -"bytes@npm:3.1.1": - version: 3.1.1 - resolution: "bytes@npm:3.1.1" - checksum: 949ab99a385d6acf4d2c69f1afc618615dc905936e0b0b9aa94a9e94d722baaba44d6a0851536585a0892ae4d462b5a270ccb1b04c774640742cbde5538ca328 +"bytes@npm:3.1.2": + version: 3.1.2 + resolution: "bytes@npm:3.1.2" + checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e languageName: node linkType: hard "cacache@npm:^16.1.0": - version: 16.1.1 - resolution: "cacache@npm:16.1.1" + version: 16.1.3 + resolution: "cacache@npm:16.1.3" dependencies: "@npmcli/fs": ^2.1.0 "@npmcli/move-file": ^2.0.0 @@ -414,34 +1167,12 @@ __metadata: rimraf: ^3.0.2 ssri: ^9.0.0 tar: ^6.1.11 - unique-filename: ^1.1.1 - checksum: 488524617008b793f0249b0c4ea2c330c710ca997921376e15650cc2415a8054491ae2dee9f01382c2015602c0641f3f977faf2fa7361aa33d2637dcfb03907a + unique-filename: ^2.0.0 + checksum: d91409e6e57d7d9a3a25e5dcc589c84e75b178ae8ea7de05cbf6b783f77a5fae938f6e8fda6f5257ed70000be27a681e1e44829251bfffe4c10216002f8f14e6 languageName: node linkType: hard -"cacheable-request@npm:^6.0.0": - version: 6.1.0 - resolution: "cacheable-request@npm:6.1.0" - dependencies: - clone-response: ^1.0.2 - get-stream: ^5.1.0 - http-cache-semantics: ^4.0.0 - keyv: ^3.0.0 - lowercase-keys: ^2.0.0 - normalize-url: ^4.1.0 - responselike: ^1.0.2 - checksum: b510b237b18d17e89942e9ee2d2a077cb38db03f12167fd100932dfa8fc963424bfae0bfa1598df4ae16c944a5484e43e03df8f32105b04395ee9495e9e4e9f1 - languageName: node - linkType: hard - -"camelcase@npm:^6.2.0": - version: 6.3.0 - resolution: "camelcase@npm:6.3.0" - checksum: 8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d - languageName: node - linkType: hard - -"chalk@npm:^4.1.0": +"chalk@npm:^4.0.0": version: 4.1.2 resolution: "chalk@npm:4.1.2" dependencies: @@ -477,13 +1208,6 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^2.0.0": - version: 2.0.0 - resolution: "ci-info@npm:2.0.0" - checksum: 3b374666a85ea3ca43fa49aa3a048d21c9b475c96eb13c133505d2324e7ae5efd6a454f41efe46a152269e9b6a00c9edbe63ec7fa1921957165aae16625acd67 - languageName: node - linkType: hard - "clean-stack@npm:^2.0.0": version: 2.2.0 resolution: "clean-stack@npm:2.2.0" @@ -491,13 +1215,6 @@ __metadata: languageName: node linkType: hard -"cli-boxes@npm:^2.2.1": - version: 2.2.1 - resolution: "cli-boxes@npm:2.2.1" - checksum: be79f8ec23a558b49e01311b39a1ea01243ecee30539c880cf14bf518a12e223ef40c57ead0cb44f509bffdffc5c129c746cd50d863ab879385370112af4f585 - languageName: node - linkType: hard - "cliui@npm:^7.0.2": version: 7.0.4 resolution: "cliui@npm:7.0.4" @@ -509,15 +1226,6 @@ __metadata: languageName: node linkType: hard -"clone-response@npm:^1.0.2": - version: 1.0.2 - resolution: "clone-response@npm:1.0.2" - dependencies: - mimic-response: ^1.0.0 - checksum: 2d0e61547fc66276e0903be9654ada422515f5a15741691352000d47e8c00c226061221074ce2c0064d12e975e84a8687cfd35d8b405750cb4e772f87b256eda - languageName: node - linkType: hard - "color-convert@npm:^1.9.3": version: 1.9.3 resolution: "color-convert@npm:1.9.3" @@ -551,12 +1259,12 @@ __metadata: linkType: hard "color-string@npm:^1.6.0": - version: 1.9.0 - resolution: "color-string@npm:1.9.0" + version: 1.9.1 + resolution: "color-string@npm:1.9.1" dependencies: color-name: ^1.0.0 simple-swizzle: ^0.2.2 - checksum: 93c6678b847f8cfa47d19677fd19e1d4b19d7a33f100644400357c298266080b5bca64e5f874fa8ac8cc0aa0606ad44f7a838b4e6fd05e6affea190a68555bb4 + checksum: c13fe7cff7885f603f49105827d621ce87f4571d78ba28ef4a3f1a104304748f620615e6bf065ecd2145d0d9dad83a3553f52bb25ede7239d18e9f81622f1cc5 languageName: node linkType: hard @@ -579,13 +1287,6 @@ __metadata: languageName: node linkType: hard -"colors@npm:1.4.0": - version: 1.4.0 - resolution: "colors@npm:1.4.0" - checksum: 98aa2c2418ad87dedf25d781be69dc5fc5908e279d9d30c34d8b702e586a0474605b3a189511482b9d5ed0d20c867515d22749537f7bc546256c6014f3ebdcec - languageName: node - linkType: hard - "colorspace@npm:1.1.x": version: 1.1.4 resolution: "colorspace@npm:1.1.4" @@ -596,13 +1297,6 @@ __metadata: languageName: node linkType: hard -"component-emitter@npm:~1.3.0": - version: 1.3.0 - resolution: "component-emitter@npm:1.3.0" - checksum: b3c46de38ffd35c57d1c02488355be9f218e582aec72d72d1b8bbec95a3ac1b38c96cd6e03ff015577e68f550fbb361a3bfdbd9bb248be9390b7b3745691be6b - languageName: node - linkType: hard - "concat-map@npm:0.0.1": version: 0.0.1 resolution: "concat-map@npm:0.0.1" @@ -610,20 +1304,6 @@ __metadata: languageName: node linkType: hard -"configstore@npm:^5.0.1": - version: 5.0.1 - resolution: "configstore@npm:5.0.1" - dependencies: - dot-prop: ^5.2.0 - graceful-fs: ^4.1.2 - make-dir: ^3.0.0 - unique-string: ^2.0.0 - write-file-atomic: ^3.0.0 - xdg-basedir: ^4.0.0 - checksum: 60ef65d493b63f96e14b11ba7ec072fdbf3d40110a94fb7199d1c287761bdea5c5244e76b2596325f30c1b652213aa75de96ea20afd4a5f82065e61ea090988e - languageName: node - linkType: hard - "connect-redis@npm:~6.0.0": version: 6.0.0 resolution: "connect-redis@npm:6.0.0" @@ -695,13 +1375,20 @@ __metadata: languageName: node linkType: hard -"cookie@npm:~0.4.1": +"cookie@npm:0.4.2, cookie@npm:~0.4.1": version: 0.4.2 resolution: "cookie@npm:0.4.2" checksum: a00833c998bedf8e787b4c342defe5fa419abd96b32f4464f718b91022586b8f1bafbddd499288e75c037642493c83083da426c6a9080d309e3bd90fd11baa9b languageName: node linkType: hard +"core-util-is@npm:~1.0.0": + version: 1.0.3 + resolution: "core-util-is@npm:1.0.3" + checksum: 9de8597363a8e9b9952491ebe18167e3b36e7707569eed0ebf14f8bba773611376466ae34575bca8cfe3c767890c859c74056084738f09d4e4a6f902b2ad7d99 + languageName: node + linkType: hard + "cors@npm:~2.8.5": version: 2.8.5 resolution: "cors@npm:2.8.5" @@ -721,10 +1408,17 @@ __metadata: languageName: node linkType: hard -"crypto-random-string@npm:^2.0.0": - version: 2.0.0 - resolution: "crypto-random-string@npm:2.0.0" - checksum: 0283879f55e7c16fdceacc181f87a0a65c53bc16ffe1d58b9d19a6277adcd71900d02bb2c4843dd55e78c51e30e89b0fec618a7f170ebcc95b33182c28f05fd6 +"data-uri-to-buffer@npm:3": + version: 3.0.1 + resolution: "data-uri-to-buffer@npm:3.0.1" + checksum: c59c3009686a78c071806b72f4810856ec28222f0f4e252aa495ec027ed9732298ceea99c50328cf59b151dd34cbc3ad6150bbb43e41fc56fa19f48c99e9fc30 + languageName: node + linkType: hard + +"date-and-time@npm:^2.4.1": + version: 2.4.1 + resolution: "date-and-time@npm:2.4.1" + checksum: 593d216604deb833ef5a0677b84d6bc0a2cb94aab9f68423200e296b22f07c835a0d4f4472c897622143c1bab22d89ace616c8c529dea3387265f4c662dd6f01 languageName: node linkType: hard @@ -737,7 +1431,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.3.3": +"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.3.0, debug@npm:^4.3.3, debug@npm:~4.3.1, debug@npm:~4.3.2": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -758,38 +1452,22 @@ __metadata: languageName: node linkType: hard -"debug@npm:^4.3.0, debug@npm:~4.3.1, debug@npm:~4.3.2": - version: 4.3.3 - resolution: "debug@npm:4.3.3" +"deep-is@npm:~0.1.3": + version: 0.1.4 + resolution: "deep-is@npm:0.1.4" + checksum: edb65dd0d7d1b9c40b2f50219aef30e116cedd6fc79290e740972c132c09106d2e80aa0bc8826673dd5a00222d4179c84b36a790eef63a4c4bca75a37ef90804 + languageName: node + linkType: hard + +"degenerator@npm:^3.0.2": + version: 3.0.2 + resolution: "degenerator@npm:3.0.2" dependencies: - ms: 2.1.2 - peerDependenciesMeta: - supports-color: - optional: true - checksum: 14472d56fe4a94dbcfaa6dbed2dd3849f1d72ba78104a1a328047bb564643ca49df0224c3a17fa63533fd11dd3d4c8636cd861191232a2c6735af00cc2d4de16 - languageName: node - linkType: hard - -"decompress-response@npm:^3.3.0": - version: 3.3.0 - resolution: "decompress-response@npm:3.3.0" - dependencies: - mimic-response: ^1.0.0 - checksum: 952552ac3bd7de2fc18015086b09468645c9638d98a551305e485230ada278c039c91116e946d07894b39ee53c0f0d5b6473f25a224029344354513b412d7380 - languageName: node - linkType: hard - -"deep-extend@npm:^0.6.0": - version: 0.6.0 - resolution: "deep-extend@npm:0.6.0" - checksum: 7be7e5a8d468d6b10e6a67c3de828f55001b6eb515d014f7aeb9066ce36bd5717161eb47d6a0f7bed8a9083935b465bc163ee2581c8b128d29bf61092fdf57a7 - languageName: node - linkType: hard - -"defer-to-connect@npm:^1.0.1": - version: 1.1.3 - resolution: "defer-to-connect@npm:1.1.3" - checksum: 9491b301dcfa04956f989481ba7a43c2231044206269eb4ab64a52d6639ee15b1252262a789eb4239fb46ab63e44d4e408641bae8e0793d640aee55398cb3930 + ast-types: ^0.13.2 + escodegen: ^1.8.1 + esprima: ^4.0.0 + vm2: ^3.9.8 + checksum: 6a8fffe1ddde692931a1d74c0636d9e6963f2aa16748d4b95f4833cdcbe8df571e5c127e4f1d625a4c340cc60f5a969ac9e5aa14baecfb6f69b85638e180cd97 languageName: node linkType: hard @@ -807,6 +1485,13 @@ __metadata: languageName: node linkType: hard +"depd@npm:2.0.0, depd@npm:~2.0.0": + version: 2.0.0 + resolution: "depd@npm:2.0.0" + checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a + languageName: node + linkType: hard + "depd@npm:^1.1.2, depd@npm:~1.1.2": version: 1.1.2 resolution: "depd@npm:1.1.2" @@ -814,13 +1499,6 @@ __metadata: languageName: node linkType: hard -"depd@npm:~2.0.0": - version: 2.0.0 - resolution: "depd@npm:2.0.0" - checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a - languageName: node - linkType: hard - "destroy@npm:~1.0.4": version: 1.0.4 resolution: "destroy@npm:1.0.4" @@ -828,22 +1506,6 @@ __metadata: languageName: node linkType: hard -"dot-prop@npm:^5.2.0": - version: 5.3.0 - resolution: "dot-prop@npm:5.3.0" - dependencies: - is-obj: ^2.0.0 - checksum: d5775790093c234ef4bfd5fbe40884ff7e6c87573e5339432870616331189f7f5d86575c5b5af2dcf0f61172990f4f734d07844b1f23482fff09e3c4bead05ea - languageName: node - linkType: hard - -"duplexer3@npm:^0.1.4": - version: 0.1.4 - resolution: "duplexer3@npm:0.1.4" - checksum: c2fd6969314607d23439c583699aaa43c4100d66b3e161df55dccd731acc57d5c81a64bb4f250805fbe434ddb1d2623fee2386fb890f5886ca1298690ec53415 - languageName: node - linkType: hard - "ee-first@npm:1.1.1": version: 1.1.1 resolution: "ee-first@npm:1.1.1" @@ -881,27 +1543,16 @@ __metadata: languageName: node linkType: hard -"end-of-stream@npm:^1.1.0": - version: 1.4.4 - resolution: "end-of-stream@npm:1.4.4" - dependencies: - once: ^1.4.0 - checksum: 530a5a5a1e517e962854a31693dbb5c0b2fc40b46dad2a56a2deec656ca040631124f4795823acc68238147805f8b021abbe221f4afed5ef3c8e8efc2024908b +"engine.io-parser@npm:~5.0.3": + version: 5.0.4 + resolution: "engine.io-parser@npm:5.0.4" + checksum: d4ad0cef6ff63c350e35696da9bb3dbd180f67b56e93e90375010cc40393e6c0639b780d5680807e1d93a7e2e3d7b4a1c3b27cf75db28eb8cbf605bc1497da03 languageName: node linkType: hard -"engine.io-parser@npm:~5.0.0": - version: 5.0.3 - resolution: "engine.io-parser@npm:5.0.3" - dependencies: - "@socket.io/base64-arraybuffer": ~1.0.2 - checksum: 88d664420a441dd02db17d110f7bbbd9efe971747918150bf666b82ee138df596a2f5038f461c8a01864c83af67cb202548364e4174543f8c0bf5f4776ca6e0d - languageName: node - linkType: hard - -"engine.io@npm:~6.1.0": - version: 6.1.2 - resolution: "engine.io@npm:6.1.2" +"engine.io@npm:~6.2.0": + version: 6.2.0 + resolution: "engine.io@npm:6.2.0" dependencies: "@types/cookie": ^0.4.1 "@types/cors": ^2.8.12 @@ -911,9 +1562,9 @@ __metadata: cookie: ~0.4.1 cors: ~2.8.5 debug: ~4.3.1 - engine.io-parser: ~5.0.0 + engine.io-parser: ~5.0.3 ws: ~8.2.3 - checksum: bd98d6ce2b1e868e8ff0f65d7667a885b90bce62065d851ea0394a00c86686925be824ab91237151222d6a5acfd5610634f36966fa9b4c502e7cf362fbdf974a + checksum: cc485c5ba2e0c4f6ca02dcafd192b22f9dad89d01dc815005298780d3fb910db4cebab4696e8615290c473c2eeb259e8bee2a1fb7ab594d9c80f9f3485771911 languageName: node linkType: hard @@ -938,13 +1589,6 @@ __metadata: languageName: node linkType: hard -"escape-goat@npm:^2.0.0": - version: 2.1.1 - resolution: "escape-goat@npm:2.1.1" - checksum: ce05c70c20dd7007b60d2d644b625da5412325fdb57acf671ba06cb2ab3cd6789e2087026921a05b665b0a03fadee2955e7fc0b9a67da15a6551a980b260eba7 - languageName: node - linkType: hard - "escape-html@npm:~1.0.3": version: 1.0.3 resolution: "escape-html@npm:1.0.3" @@ -952,6 +1596,49 @@ __metadata: languageName: node linkType: hard +"escodegen@npm:^1.8.1": + version: 1.14.3 + resolution: "escodegen@npm:1.14.3" + dependencies: + esprima: ^4.0.1 + estraverse: ^4.2.0 + esutils: ^2.0.2 + optionator: ^0.8.1 + source-map: ~0.6.1 + dependenciesMeta: + source-map: + optional: true + bin: + escodegen: bin/escodegen.js + esgenerate: bin/esgenerate.js + checksum: 381cdc4767ecdb221206bbbab021b467bbc2a6f5c9a99c9e6353040080bdd3dfe73d7604ad89a47aca6ea7d58bc635f6bd3fbc8da9a1998e9ddfa8372362ccd0 + languageName: node + linkType: hard + +"esprima@npm:^4.0.0, esprima@npm:^4.0.1": + version: 4.0.1 + resolution: "esprima@npm:4.0.1" + bin: + esparse: ./bin/esparse.js + esvalidate: ./bin/esvalidate.js + checksum: b45bc805a613dbea2835278c306b91aff6173c8d034223fa81498c77dcbce3b2931bf6006db816f62eacd9fd4ea975dfd85a5b7f3c6402cfd050d4ca3c13a628 + languageName: node + linkType: hard + +"estraverse@npm:^4.2.0": + version: 4.3.0 + resolution: "estraverse@npm:4.3.0" + checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827 + languageName: node + linkType: hard + +"esutils@npm:^2.0.2": + version: 2.0.3 + resolution: "esutils@npm:2.0.3" + checksum: 22b5b08f74737379a840b8ed2036a5fb35826c709ab000683b092d9054e5c2a82c27818f12604bfc2a9a76b90b6834ef081edbc1c7ae30d1627012e067c6ec87 + languageName: node + linkType: hard + "etag@npm:~1.8.1": version: 1.8.1 resolution: "etag@npm:1.8.1" @@ -960,10 +1647,10 @@ __metadata: linkType: hard "express-session@npm:~1.17.2": - version: 1.17.2 - resolution: "express-session@npm:1.17.2" + version: 1.17.3 + resolution: "express-session@npm:1.17.3" dependencies: - cookie: 0.4.1 + cookie: 0.4.2 cookie-signature: 1.0.6 debug: 2.6.9 depd: ~2.0.0 @@ -971,7 +1658,7 @@ __metadata: parseurl: ~1.3.3 safe-buffer: 5.2.1 uid-safe: ~2.1.5 - checksum: 9e05cff29865c039f2b3a623325a66707a6229598a33f6e6f082c1581b0afa0bf9196d93c70445883e610138a36698842ff9ddeccdafc9c3ef65ff2a6e237d83 + checksum: 1021a793433cbc6a1b32c803fcb2daa1e03a8f50dd907e8745ae57994370315a5cfde5b6ef7b062d9a9a0754ff268844bda211c08240b3a0e01014dcf1073ec5 languageName: node linkType: hard @@ -987,15 +1674,15 @@ __metadata: linkType: hard "express@npm:~4.17.2": - version: 4.17.2 - resolution: "express@npm:4.17.2" + version: 4.17.3 + resolution: "express@npm:4.17.3" dependencies: - accepts: ~1.3.7 + accepts: ~1.3.8 array-flatten: 1.1.1 - body-parser: 1.19.1 + body-parser: 1.19.2 content-disposition: 0.5.4 content-type: ~1.0.4 - cookie: 0.4.1 + cookie: 0.4.2 cookie-signature: 1.0.6 debug: 2.6.9 depd: ~1.1.2 @@ -1010,7 +1697,7 @@ __metadata: parseurl: ~1.3.3 path-to-regexp: 0.1.7 proxy-addr: ~2.0.7 - qs: 6.9.6 + qs: 6.9.7 range-parser: ~1.2.1 safe-buffer: 5.2.1 send: 0.17.2 @@ -1020,14 +1707,39 @@ __metadata: type-is: ~1.6.18 utils-merge: 1.0.1 vary: ~1.1.2 - checksum: 1535d56d20e65a1a39b5f056c025dd635290a744478ac69cc47633aeb4b2ce51458f8eb4080cfb7ba47c853ba5cfd794d404cff822a25127f1556b726ec3914a + checksum: 967e53b74a37eafdf9789b9938c8df86102928b4985b1ad5e385c709deeab405a364de95ca744bc2cc5d05b5d9cc1efc69ae2ae17688a462038648d5a924bfad + languageName: node + linkType: hard + +"fast-levenshtein@npm:~2.0.6": + version: 2.0.6 + resolution: "fast-levenshtein@npm:2.0.6" + checksum: 92cfec0a8dfafd9c7a15fba8f2cc29cd0b62b85f056d99ce448bbcd9f708e18ab2764bda4dd5158364f4145a7c72788538994f0d1787b956ef0d1062b0f7c24c + languageName: node + linkType: hard + +"fast-safe-stringify@npm:^2.0.7": + version: 2.1.1 + resolution: "fast-safe-stringify@npm:2.1.1" + checksum: a851cbddc451745662f8f00ddb622d6766f9bd97642dabfd9a405fb0d646d69fc0b9a1243cbf67f5f18a39f40f6fa821737651ff1bceeba06c9992ca2dc5bd3d + languageName: node + linkType: hard + +"fast-xml-parser@npm:4.0.11": + version: 4.0.11 + resolution: "fast-xml-parser@npm:4.0.11" + dependencies: + strnum: ^1.0.5 + bin: + fxparser: src/cli/cli.js + checksum: d8a08e4d5597e0fc00a86735195872eeb03008913e298830941516f3766e16ee555e2d431acc92e1dda887938edc445252ec5b59494aab60a8389888bd13719c languageName: node linkType: hard "fecha@npm:^4.2.0": - version: 4.2.1 - resolution: "fecha@npm:4.2.1" - checksum: 26993474949d94cd2de5eee7dfe283d671d5cd61acdba8819df478cbc86495273363f4a7e98d15ee51563110a38328d268982a6e9048169bce8f15aeba5931f9 + version: 4.2.3 + resolution: "fecha@npm:4.2.3" + checksum: f94e2fb3acf5a7754165d04549460d3ae6c34830394d20c552197e3e000035d69732d74af04b9bed3283bf29fe2a9ebdcc0085e640b0be3cc3658b9726265e31 languageName: node linkType: hard @@ -1040,6 +1752,13 @@ __metadata: languageName: node linkType: hard +"file-uri-to-path@npm:2": + version: 2.0.0 + resolution: "file-uri-to-path@npm:2.0.0" + checksum: 4a71a99ddaa6ae7ae7bffe2948c34da59982ed465d930a0af9cb59fcc10fcd93366cc356ec3337c18373fde5df7ac52afda4558f155febd1799d135552207edb + languageName: node + linkType: hard + "fill-range@npm:^7.0.1": version: 7.0.1 resolution: "fill-range@npm:7.0.1" @@ -1072,12 +1791,12 @@ __metadata: linkType: hard "follow-redirects@npm:^1.14.4": - version: 1.14.8 - resolution: "follow-redirects@npm:1.14.8" + version: 1.15.2 + resolution: "follow-redirects@npm:1.15.2" peerDependenciesMeta: debug: optional: true - checksum: 40c67899c2e3149a27e8b6498a338ff27f39fe138fde8d7f0756cb44b073ba0bfec3d52af28f20c5bdd67263d564d0d8d7b5efefd431de95c18c42f7b4aef457 + checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190 languageName: node linkType: hard @@ -1095,6 +1814,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:^8.1.0": + version: 8.1.0 + resolution: "fs-extra@npm:8.1.0" + dependencies: + graceful-fs: ^4.2.0 + jsonfile: ^4.0.0 + universalify: ^0.1.0 + checksum: bf44f0e6cea59d5ce071bba4c43ca76d216f89e402dc6285c128abc0902e9b8525135aa808adad72c9d5d218e9f4bcc63962815529ff2f684ad532172a284880 + languageName: node + linkType: hard + "fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -1130,6 +1860,16 @@ __metadata: languageName: node linkType: hard +"ftp@npm:^0.3.10": + version: 0.3.10 + resolution: "ftp@npm:0.3.10" + dependencies: + readable-stream: 1.1.x + xregexp: 2.0.0 + checksum: ddd313c1d44eb7429f3a7d77a0155dc8fe86a4c64dca58f395632333ce4b4e74c61413c6e0ef66ea3f3d32d905952fbb6d028c7117d522f793eb1fa282e17357 + languageName: node + linkType: hard + "gauge@npm:^4.0.3": version: 4.0.4 resolution: "gauge@npm:4.0.4" @@ -1153,21 +1893,17 @@ __metadata: languageName: node linkType: hard -"get-stream@npm:^4.1.0": - version: 4.1.0 - resolution: "get-stream@npm:4.1.0" +"get-uri@npm:3": + version: 3.0.2 + resolution: "get-uri@npm:3.0.2" dependencies: - pump: ^3.0.0 - checksum: 443e1914170c15bd52ff8ea6eff6dfc6d712b031303e36302d2778e3de2506af9ee964d6124010f7818736dcfde05c04ba7ca6cc26883106e084357a17ae7d73 - languageName: node - linkType: hard - -"get-stream@npm:^5.1.0": - version: 5.2.0 - resolution: "get-stream@npm:5.2.0" - dependencies: - pump: ^3.0.0 - checksum: 8bc1a23174a06b2b4ce600df38d6c98d2ef6d84e020c1ddad632ad75bac4e092eeb40e4c09e0761c35fc2dbc5e7fff5dab5e763a383582c4a167dd69a905bd12 + "@tootallnate/once": 1 + data-uri-to-buffer: 3 + debug: 4 + file-uri-to-path: 2 + fs-extra: ^8.1.0 + ftp: ^0.3.10 + checksum: 5325b2906b08ca37529ca421cf52bc50376e75c6a945e0a8064e3f76b4bb67b8ab1e316a2fc7a307c8c606ab36d030720f39a57c97b027ff1134335e12102946 languageName: node linkType: hard @@ -1207,42 +1943,7 @@ __metadata: languageName: node linkType: hard -"global-dirs@npm:^3.0.0": - version: 3.0.0 - resolution: "global-dirs@npm:3.0.0" - dependencies: - ini: 2.0.0 - checksum: 953c17cf14bf6ee0e2100ae82a0d779934eed8a3ec5c94a7a4f37c5b3b592c31ea015fb9a15cf32484de13c79f4a814f3015152f3e1d65976cfbe47c1bfe4a88 - languageName: node - linkType: hard - -"got@npm:^9.6.0": - version: 9.6.0 - resolution: "got@npm:9.6.0" - dependencies: - "@sindresorhus/is": ^0.14.0 - "@szmarczak/http-timer": ^1.1.2 - cacheable-request: ^6.0.0 - decompress-response: ^3.3.0 - duplexer3: ^0.1.4 - get-stream: ^4.1.0 - lowercase-keys: ^1.0.1 - mimic-response: ^1.0.1 - p-cancelable: ^1.0.0 - to-readable-stream: ^1.0.0 - url-parse-lax: ^3.0.0 - checksum: 941807bd9704bacf5eb401f0cc1212ffa1f67c6642f2d028fd75900471c221b1da2b8527f4553d2558f3faeda62ea1cf31665f8b002c6137f5de8732f07370b0 - languageName: node - linkType: hard - -"graceful-fs@npm:^4.1.2": - version: 4.2.9 - resolution: "graceful-fs@npm:4.2.9" - checksum: 68ea4e07ff2c041ada184f9278b830375f8e0b75154e3f080af6b70f66172fabb4108d19b3863a96b53fc068a310b9b6493d86d1291acc5f3861eb4b79d26ad6 - languageName: node - linkType: hard - -"graceful-fs@npm:^4.2.6": +"graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.6": version: 4.2.10 resolution: "graceful-fs@npm:4.2.10" checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da @@ -1270,14 +1971,7 @@ __metadata: languageName: node linkType: hard -"has-yarn@npm:^2.1.0": - version: 2.1.0 - resolution: "has-yarn@npm:2.1.0" - checksum: 5eb1d0bb8518103d7da24532bdbc7124ffc6d367b5d3c10840b508116f2f1bcbcf10fd3ba843ff6e2e991bdf9969fd862d42b2ed58aade88343326c950b7e7f7 - languageName: node - linkType: hard - -"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0": +"http-cache-semantics@npm:^4.1.0": version: 4.1.0 resolution: "http-cache-semantics@npm:4.1.0" checksum: 974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42 @@ -1297,6 +1991,30 @@ __metadata: languageName: node linkType: hard +"http-errors@npm:2.0.0": + version: 2.0.0 + resolution: "http-errors@npm:2.0.0" + dependencies: + depd: 2.0.0 + inherits: 2.0.4 + setprototypeof: 1.2.0 + statuses: 2.0.1 + toidentifier: 1.0.1 + checksum: 9b0a3782665c52ce9dc658a0d1560bcb0214ba5699e4ea15aefb2a496e2ca83db03ebc42e1cce4ac1f413e4e0d2d736a3fd755772c556a9a06853ba2a0b7d920 + languageName: node + linkType: hard + +"http-proxy-agent@npm:^4.0.0, http-proxy-agent@npm:^4.0.1": + version: 4.0.1 + resolution: "http-proxy-agent@npm:4.0.1" + dependencies: + "@tootallnate/once": 1 + agent-base: 6 + debug: 4 + checksum: c6a5da5a1929416b6bbdf77b1aca13888013fe7eb9d59fc292e25d18e041bb154a8dfada58e223fc7b76b9b2d155a87e92e608235201f77d34aa258707963a82 + languageName: node + linkType: hard + "http-proxy-agent@npm:^5.0.0": version: 5.0.0 resolution: "http-proxy-agent@npm:5.0.0" @@ -1308,7 +2026,7 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^5.0.0": +"https-proxy-agent@npm:5, https-proxy-agent@npm:^5.0.0": version: 5.0.1 resolution: "https-proxy-agent@npm:5.0.1" dependencies: @@ -1359,13 +2077,6 @@ __metadata: languageName: node linkType: hard -"import-lazy@npm:^2.1.0": - version: 2.1.0 - resolution: "import-lazy@npm:2.1.0" - checksum: 05294f3b9dd4971d3a996f0d2f176410fb6745d491d6e73376429189f5c1c3d290548116b2960a7cf3e89c20cdf11431739d1d2d8c54b84061980795010e803a - languageName: node - linkType: hard - "imurmurhash@npm:^0.1.4": version: 0.1.4 resolution: "imurmurhash@npm:0.1.4" @@ -1397,24 +2108,24 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3": +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3, inherits@npm:~2.0.1": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1 languageName: node linkType: hard -"ini@npm:2.0.0, ini@npm:^2.0.0": +"ini@npm:^2.0.0": version: 2.0.0 resolution: "ini@npm:2.0.0" checksum: e7aadc5fb2e4aefc666d74ee2160c073995a4061556b1b5b4241ecb19ad609243b9cceafe91bae49c219519394bbd31512516cb22a3b1ca6e66d869e0447e84e languageName: node linkType: hard -"ini@npm:~1.3.0": - version: 1.3.8 - resolution: "ini@npm:1.3.8" - checksum: dfd98b0ca3a4fc1e323e38a6c8eb8936e31a97a918d3b377649ea15bdb15d481207a0dda1021efbd86b464cae29a0d33c1d7dcaf6c5672bee17fa849bc50a1b3 +"ip@npm:^1.1.5": + version: 1.1.8 + resolution: "ip@npm:1.1.8" + checksum: a2ade53eb339fb0cbe9e69a44caab10d6e3784662285eb5d2677117ee4facc33a64679051c35e0dfdb1a3983a51ce2f5d2cb36446d52e10d01881789b76e28fb languageName: node linkType: hard @@ -1448,17 +2159,6 @@ __metadata: languageName: node linkType: hard -"is-ci@npm:^2.0.0": - version: 2.0.0 - resolution: "is-ci@npm:2.0.0" - dependencies: - ci-info: ^2.0.0 - bin: - is-ci: bin.js - checksum: 77b869057510f3efa439bbb36e9be429d53b3f51abd4776eeea79ab3b221337fe1753d1e50058a9e2c650d38246108beffb15ccfd443929d77748d8c0cc90144 - languageName: node - linkType: hard - "is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" @@ -1482,16 +2182,6 @@ __metadata: languageName: node linkType: hard -"is-installed-globally@npm:^0.4.0": - version: 0.4.0 - resolution: "is-installed-globally@npm:0.4.0" - dependencies: - global-dirs: ^3.0.0 - is-path-inside: ^3.0.2 - checksum: 3359840d5982d22e9b350034237b2cda2a12bac1b48a721912e1ab8e0631dd07d45a2797a120b7b87552759a65ba03e819f1bd63f2d7ab8657ec0b44ee0bf399 - languageName: node - linkType: hard - "is-lambda@npm:^1.0.1": version: 1.0.1 resolution: "is-lambda@npm:1.0.1" @@ -1499,13 +2189,6 @@ __metadata: languageName: node linkType: hard -"is-npm@npm:^5.0.0": - version: 5.0.0 - resolution: "is-npm@npm:5.0.0" - checksum: 9baff02b0c69a3d3c79b162cb2f9e67fb40ef6d172c16601b2e2471c21e9a4fa1fc9885a308d7bc6f3a3cd2a324c27fa0bf284c133c3349bb22571ab70d041cc - languageName: node - linkType: hard - "is-number@npm:^7.0.0": version: 7.0.0 resolution: "is-number@npm:7.0.0" @@ -1513,20 +2196,6 @@ __metadata: languageName: node linkType: hard -"is-obj@npm:^2.0.0": - version: 2.0.0 - resolution: "is-obj@npm:2.0.0" - checksum: c9916ac8f4621962a42f5e80e7ffdb1d79a3fab7456ceaeea394cd9e0858d04f985a9ace45be44433bf605673c8be8810540fe4cc7f4266fc7526ced95af5a08 - languageName: node - linkType: hard - -"is-path-inside@npm:^3.0.2": - version: 3.0.3 - resolution: "is-path-inside@npm:3.0.3" - checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 - languageName: node - linkType: hard - "is-stream@npm:^2.0.0": version: 2.0.1 resolution: "is-stream@npm:2.0.1" @@ -1534,17 +2203,10 @@ __metadata: languageName: node linkType: hard -"is-typedarray@npm:^1.0.0": - version: 1.0.0 - resolution: "is-typedarray@npm:1.0.0" - checksum: 3508c6cd0a9ee2e0df2fa2e9baabcdc89e911c7bd5cf64604586697212feec525aa21050e48affb5ffc3df20f0f5d2e2cf79b08caa64e1ccc9578e251763aef7 - languageName: node - linkType: hard - -"is-yarn-global@npm:^0.3.0": - version: 0.3.0 - resolution: "is-yarn-global@npm:0.3.0" - checksum: bca013d65fee2862024c9fbb3ba13720ffca2fe750095174c1c80922fdda16402b5c233f5ac9e265bc12ecb5446e7b7f519a32d9541788f01d4d44e24d2bf481 +"isarray@npm:0.0.1": + version: 0.0.1 + resolution: "isarray@npm:0.0.1" + checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4 languageName: node linkType: hard @@ -1555,19 +2217,15 @@ __metadata: languageName: node linkType: hard -"json-buffer@npm:3.0.0": - version: 3.0.0 - resolution: "json-buffer@npm:3.0.0" - checksum: 0cecacb8025370686a916069a2ff81f7d55167421b6aa7270ee74e244012650dd6bce22b0852202ea7ff8624fce50ff0ec1bdf95914ccb4553426e290d5a63fa - languageName: node - linkType: hard - -"keyv@npm:^3.0.0": - version: 3.1.0 - resolution: "keyv@npm:3.1.0" +"jsonfile@npm:^4.0.0": + version: 4.0.0 + resolution: "jsonfile@npm:4.0.0" dependencies: - json-buffer: 3.0.0 - checksum: bb7e8f3acffdbafbc2dd5b63f377fe6ec4c0e2c44fc82720449ef8ab54f4a7ce3802671ed94c0f475ae0a8549703353a2124561fcf3317010c141b32ca1ce903 + graceful-fs: ^4.1.6 + dependenciesMeta: + graceful-fs: + optional: true + checksum: 6447d6224f0d31623eef9b51185af03ac328a7553efcee30fa423d98a9e276ca08db87d71e17f2310b0263fd3ffa6c2a90a6308367f661dc21580f9469897c9e languageName: node linkType: hard @@ -1578,39 +2236,54 @@ __metadata: languageName: node linkType: hard -"latest-version@npm:^5.1.0": - version: 5.1.0 - resolution: "latest-version@npm:5.1.0" +"levn@npm:~0.3.0": + version: 0.3.0 + resolution: "levn@npm:0.3.0" dependencies: - package-json: ^6.3.0 - checksum: fbc72b071eb66c40f652441fd783a9cca62f08bf42433651937f078cd9ef94bf728ec7743992777826e4e89305aef24f234b515e6030503a2cbee7fc9bdc2c0f + prelude-ls: ~1.1.2 + type-check: ~0.3.2 + checksum: 0d084a524231a8246bb10fec48cdbb35282099f6954838604f3c7fc66f2e16fa66fd9cc2f3f20a541a113c4dafdf181e822c887c8a319c9195444e6c64ac395e languageName: node linkType: hard -"logform@npm:^2.3.2": - version: 2.3.2 - resolution: "logform@npm:2.3.2" +"lodash.assign@npm:^4.2.0": + version: 4.2.0 + resolution: "lodash.assign@npm:4.2.0" + checksum: 75bbc6733c9f577c448031b4051f990f068802708891f94be9d4c2faffd6a9ec67a2c49671dafc908a068d35687765464853282842b4560b662e6c903d11cc90 + languageName: node + linkType: hard + +"lodash.find@npm:^4.6.0": + version: 4.6.0 + resolution: "lodash.find@npm:4.6.0" + checksum: b737f849a4fe36f5c3664ea636780dda2fde18335021faf80cdfdcb300ed75441da6f55cfd6de119092d8bb2ddbc4433f4a8de4b99c0b9c8640465b0901c717c + languageName: node + linkType: hard + +"lodash.isempty@npm:^4.4.0": + version: 4.4.0 + resolution: "lodash.isempty@npm:4.4.0" + checksum: a8118f23f7ed72a1dbd176bf27f297d1e71aa1926288449cb8f7cef99ba1bc7527eab52fe7899ab080fa1dc150aba6e4a6367bf49fa4e0b78da1ecc095f8d8c5 + languageName: node + linkType: hard + +"lodash.iserror@npm:^3.1.1": + version: 3.1.1 + resolution: "lodash.iserror@npm:3.1.1" + checksum: 65e0c6025529b64ca66dad2f15b50461063f41dc09b71cee1c16ddcb5ce435f67b570b3266691c3e7ff8a01001de14e0aa4692e7d46cc017d7965b31b4811038 + languageName: node + linkType: hard + +"logform@npm:^2.3.2, logform@npm:^2.4.0": + version: 2.4.2 + resolution: "logform@npm:2.4.2" dependencies: - colors: 1.4.0 + "@colors/colors": 1.5.0 fecha: ^4.2.0 ms: ^2.1.1 - safe-stable-stringify: ^1.1.0 + safe-stable-stringify: ^2.3.1 triple-beam: ^1.3.0 - checksum: e4ccf22a1355c6f03b635d6b7905d5ac2d75fca8e6d5bf33a801793c654764138d584fec03411b13bffecaafa0003a70e6cf4f2f0af62d0e324d62622921405a - languageName: node - linkType: hard - -"lowercase-keys@npm:^1.0.0, lowercase-keys@npm:^1.0.1": - version: 1.0.1 - resolution: "lowercase-keys@npm:1.0.1" - checksum: 4d045026595936e09953e3867722e309415ff2c80d7701d067546d75ef698dac218a4f53c6d1d0e7368b47e45fd7529df47e6cb56fbb90523ba599f898b3d147 - languageName: node - linkType: hard - -"lowercase-keys@npm:^2.0.0": - version: 2.0.0 - resolution: "lowercase-keys@npm:2.0.0" - checksum: 24d7ebd56ccdf15ff529ca9e08863f3c54b0b9d1edb97a3ae1af34940ae666c01a1e6d200707bce730a8ef76cb57cc10e65f245ecaaf7e6bc8639f2fb460ac23 + checksum: 3d00f4e1ccaf0a86886aabbf66d1f1d207441d5b408f103457da6d64d055aee76c02af4b40a31ca77a1db4cbcdecb007149f731536c39cbd89b7b6ba3dda6d7b languageName: node linkType: hard @@ -1624,6 +2297,15 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^5.1.1": + version: 5.1.1 + resolution: "lru-cache@npm:5.1.1" + dependencies: + yallist: ^3.0.2 + checksum: c154ae1cbb0c2206d1501a0e94df349653c92c8cbb25236d7e85190bcaf4567a03ac6eb43166fabfa36fd35623694da7233e88d9601fbf411a9a481d85dbd2cb + languageName: node + linkType: hard + "lru-cache@npm:^6.0.0": version: 6.0.0 resolution: "lru-cache@npm:6.0.0" @@ -1634,24 +2316,15 @@ __metadata: linkType: hard "lru-cache@npm:^7.7.1": - version: 7.13.1 - resolution: "lru-cache@npm:7.13.1" - checksum: f53c7dd098a7afd6342b23f7182629edff206c7665de79445a7f5455440e768a4d1c6ec52e1a16175580c71535c9437dfb6f6bc22ca1a0e4a7454a97cde87329 - languageName: node - linkType: hard - -"make-dir@npm:^3.0.0": - version: 3.1.0 - resolution: "make-dir@npm:3.1.0" - dependencies: - semver: ^6.0.0 - checksum: 484200020ab5a1fdf12f393fe5f385fc8e4378824c940fba1729dcd198ae4ff24867bc7a5646331e50cead8abff5d9270c456314386e629acec6dff4b8016b78 + version: 7.14.0 + resolution: "lru-cache@npm:7.14.0" + checksum: efdd329f2c1bb790b71d497c6c59272e6bc2d7dd060ba55fc136becd3dd31fc8346edb446275504d94cb60d3c8385dbf5267b79b23789e409b2bdf302d13f0d7 languageName: node linkType: hard "make-fetch-happen@npm:^10.0.3": - version: 10.2.0 - resolution: "make-fetch-happen@npm:10.2.0" + version: 10.2.1 + resolution: "make-fetch-happen@npm:10.2.1" dependencies: agentkeepalive: ^4.2.1 cacache: ^16.1.0 @@ -1669,7 +2342,7 @@ __metadata: promise-retry: ^2.0.1 socks-proxy-agent: ^7.0.0 ssri: ^9.0.0 - checksum: 2f6c294179972f56fab40fd8618f07841e06550692bb78f6da16e7afaa9dca78c345b08cf44a77a8907ef3948e4dc77e93eb7492b8381f1217d7ac057a7522f8 + checksum: 2332eb9a8ec96f1ffeeea56ccefabcb4193693597b132cd110734d50f2928842e22b84cfa1508e921b8385cdfd06dda9ad68645fed62b50fff629a580f5fb72c languageName: node linkType: hard @@ -1681,12 +2354,12 @@ __metadata: linkType: hard "memorystore@npm:^1.6.6": - version: 1.6.6 - resolution: "memorystore@npm:1.6.6" + version: 1.6.7 + resolution: "memorystore@npm:1.6.7" dependencies: debug: ^4.3.0 lru-cache: ^4.0.3 - checksum: 92fbcfac26968f7102366bc7b63c8e16a76ed9997ebbc8f8d1609b2784d6a6e3b3eb50ee955ccf0b4104f948c58c4d8c81afb1e7645c537f95292518bb66eb79 + checksum: caa5cc523ec39ad8b317ddb5560771df28a10266281066f554bd77b2179a34f21f06891fffbcfe875ed1afc79cf7e106714eff98189ded1e6bfc273159d07948 languageName: node linkType: hard @@ -1704,19 +2377,19 @@ __metadata: languageName: node linkType: hard -"mime-db@npm:1.51.0": - version: 1.51.0 - resolution: "mime-db@npm:1.51.0" - checksum: 613b1ac9d6e725cc24444600b124a7f1ce6c60b1baa654f39a3e260d0995a6dffc5693190217e271af7e2a5612dae19f2a73f3e316707d797a7391165f7ef423 +"mime-db@npm:1.52.0": + version: 1.52.0 + resolution: "mime-db@npm:1.52.0" + checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f languageName: node linkType: hard "mime-types@npm:~2.1.24, mime-types@npm:~2.1.34": - version: 2.1.34 - resolution: "mime-types@npm:2.1.34" + version: 2.1.35 + resolution: "mime-types@npm:2.1.35" dependencies: - mime-db: 1.51.0 - checksum: 67013de9e9d6799bde6d669d18785b7e18bcd212e710d3e04a4727f92f67a8ad4e74aee24be28b685adb794944814bde649119b58ee3282ffdbee58f9278d9f3 + mime-db: 1.52.0 + checksum: 89a5b7f1def9f3af5dad6496c5ed50191ae4331cc5389d7c521c8ad28d5fdad2d06fd81baf38fed813dc4e46bb55c8145bb0ff406330818c9cf712fb2e9b3836 languageName: node linkType: hard @@ -1729,23 +2402,7 @@ __metadata: languageName: node linkType: hard -"mimic-response@npm:^1.0.0, mimic-response@npm:^1.0.1": - version: 1.0.1 - resolution: "mimic-response@npm:1.0.1" - checksum: 034c78753b0e622bc03c983663b1cdf66d03861050e0c8606563d149bc2b02d63f62ce4d32be4ab50d0553ae0ffe647fc34d1f5281184c6e1e8cf4d85e8d9823 - languageName: node - linkType: hard - -"minimatch@npm:^3.0.4": - version: 3.0.5 - resolution: "minimatch@npm:3.0.5" - dependencies: - brace-expansion: ^1.1.7 - checksum: a3b84b426eafca947741b864502cee02860c4e7b145de11ad98775cfcf3066fef422583bc0ffce0952ddf4750c1ccf4220b1556430d4ce10139f66247d87d69e - languageName: node - linkType: hard - -"minimatch@npm:^3.1.1": +"minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -1763,13 +2420,6 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.2.0": - version: 1.2.5 - resolution: "minimist@npm:1.2.5" - checksum: 86706ce5b36c16bfc35c5fe3dbb01d5acdc9a22f2b6cc810b6680656a1d2c0e44a0159c9a3ba51fb072bb5c203e49e10b51dcd0eec39c481f4c42086719bae52 - languageName: node - linkType: hard - "minipass-collect@npm:^1.0.2": version: 1.0.2 resolution: "minipass-collect@npm:1.0.2" @@ -1780,8 +2430,8 @@ __metadata: linkType: hard "minipass-fetch@npm:^2.0.3": - version: 2.1.0 - resolution: "minipass-fetch@npm:2.1.0" + version: 2.1.2 + resolution: "minipass-fetch@npm:2.1.2" dependencies: encoding: ^0.1.13 minipass: ^3.1.6 @@ -1790,7 +2440,7 @@ __metadata: dependenciesMeta: encoding: optional: true - checksum: 1334732859a3f7959ed22589bafd9c40384b885aebb5932328071c33f86b3eb181d54c86919675d1825ab5f1c8e4f328878c863873258d113c29d79a4b0c9c9f + checksum: 3f216be79164e915fc91210cea1850e488793c740534985da017a4cbc7a5ff50506956d0f73bb0cb60e4fe91be08b6b61ef35101706d3ef5da2c8709b5f08f91 languageName: node linkType: hard @@ -1850,9 +2500,9 @@ __metadata: linkType: hard "moment@npm:^2.29.1": - version: 2.29.1 - resolution: "moment@npm:2.29.1" - checksum: 1e14d5f422a2687996be11dd2d50c8de3bd577c4a4ca79ba5d02c397242a933e5b941655de6c8cb90ac18f01cc4127e55b4a12ae3c527a6c0a274e455979345e + version: 2.29.4 + resolution: "moment@npm:2.29.4" + checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e languageName: node linkType: hard @@ -1891,14 +2541,14 @@ __metadata: linkType: hard "nconf@npm:^0.11.3": - version: 0.11.3 - resolution: "nconf@npm:0.11.3" + version: 0.11.4 + resolution: "nconf@npm:0.11.4" dependencies: async: ^1.4.0 ini: ^2.0.0 secure-keys: ^1.0.0 yargs: ^16.1.1 - checksum: 708369c9526618936872fc7db4d257dda59cb55fb9e07949afcfac7cf60cdc840027a6bdf5bf3c5703129bea23090de1aa6f6f41aec004086963706c04bf81f5 + checksum: 9fc53590a845b7e5526902a6f6778614e9d4a75f23511b5921c982bd6c8646e14a4ddb30d15b7ecf58d0e3124fde925cbc8112f1d40f62118a6f22a8e6e8b1b4 languageName: node linkType: hard @@ -1909,15 +2559,22 @@ __metadata: languageName: node linkType: hard +"netmask@npm:^2.0.2": + version: 2.0.2 + resolution: "netmask@npm:2.0.2" + checksum: c65cb8d3f7ea5669edddb3217e4c96910a60d0d9a4b52d9847ff6b28b2d0277cd8464eee0ef85133cdee32605c57940cacdd04a9a019079b091b6bba4cb0ec22 + languageName: node + linkType: hard + "node-gyp@npm:latest": - version: 9.1.0 - resolution: "node-gyp@npm:9.1.0" + version: 9.3.0 + resolution: "node-gyp@npm:9.3.0" dependencies: env-paths: ^2.2.0 glob: ^7.1.4 graceful-fs: ^4.2.6 make-fetch-happen: ^10.0.3 - nopt: ^5.0.0 + nopt: ^6.0.0 npmlog: ^6.0.0 rimraf: ^3.0.2 semver: ^7.3.5 @@ -1925,38 +2582,38 @@ __metadata: which: ^2.0.2 bin: node-gyp: bin/node-gyp.js - checksum: 1437fa4a879b5b9010604128e8da8609b57c66034262087539ee04a8b764b8436af2be01bab66f8fc729a3adba2dcc21b10a32b9f552696c3fa8cd657d134fc4 + checksum: 589ddd3ed967724ef425f9624bfa47cf73022640ab3eba6d556e92cdc4ddef33b63fce3a467c93b995a3f61df92eafd3c3d1e8dbe4a2c00c383334487dea99c3 languageName: node linkType: hard "nodemon@npm:^2.0.15": - version: 2.0.15 - resolution: "nodemon@npm:2.0.15" + version: 2.0.20 + resolution: "nodemon@npm:2.0.20" dependencies: chokidar: ^3.5.2 debug: ^3.2.7 ignore-by-default: ^1.0.1 - minimatch: ^3.0.4 + minimatch: ^3.1.2 pstree.remy: ^1.1.8 semver: ^5.7.1 + simple-update-notifier: ^1.0.7 supports-color: ^5.5.0 touch: ^3.1.0 undefsafe: ^2.0.5 - update-notifier: ^5.1.0 bin: nodemon: bin/nodemon.js - checksum: 0569b09b713fdcc76f06734d7cc106950e69e02069cbf44bda3fae8d266926bdfa003aeddd22f8fcdf46ea6ff51ca64f5528f8006536e79820a26e648ef346cf + checksum: 9fe858682414fe703179f4fe36c86e71f40d2693b5345c09803d7b191816a6589c5df8f1f9873bffee92893880183b95a031c86340e46b364ef1b0b7f619edbf languageName: node linkType: hard -"nopt@npm:^5.0.0": - version: 5.0.0 - resolution: "nopt@npm:5.0.0" +"nopt@npm:^6.0.0": + version: 6.0.0 + resolution: "nopt@npm:6.0.0" dependencies: - abbrev: 1 + abbrev: ^1.0.0 bin: nopt: bin/nopt.js - checksum: d35fdec187269503843924e0114c0c6533fb54bbf1620d0f28b4b60ba01712d6687f62565c55cc20a504eff0fbe5c63e22340c3fad549ad40469ffb611b04f2f + checksum: 82149371f8be0c4b9ec2f863cc6509a7fd0fa729929c009f3a58e4eb0c9e4cae9920e8f1f8eb46e7d032fec8fb01bede7f0f41a67eb3553b7b8e14fa53de1dac languageName: node linkType: hard @@ -1978,13 +2635,6 @@ __metadata: languageName: node linkType: hard -"normalize-url@npm:^4.1.0": - version: 4.5.1 - resolution: "normalize-url@npm:4.5.1" - checksum: 9a9dee01df02ad23e171171893e56e22d752f7cff86fb96aafeae074819b572ea655b60f8302e2d85dbb834dc885c972cc1c573892fea24df46b2765065dd05a - languageName: node - linkType: hard - "npmlog@npm:^6.0.0": version: 6.0.2 resolution: "npmlog@npm:6.0.2" @@ -2027,7 +2677,7 @@ __metadata: languageName: node linkType: hard -"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": +"once@npm:^1.3.0": version: 1.4.0 resolution: "once@npm:1.4.0" dependencies: @@ -2045,10 +2695,17 @@ __metadata: languageName: node linkType: hard -"p-cancelable@npm:^1.0.0": - version: 1.1.0 - resolution: "p-cancelable@npm:1.1.0" - checksum: 2db3814fef6d9025787f30afaee4496a8857a28be3c5706432cbad76c688a6db1874308f48e364a42f5317f5e41e8e7b4f2ff5c8ff2256dbb6264bc361704ece +"optionator@npm:^0.8.1": + version: 0.8.3 + resolution: "optionator@npm:0.8.3" + dependencies: + deep-is: ~0.1.3 + fast-levenshtein: ~2.0.6 + levn: ~0.3.0 + prelude-ls: ~1.1.2 + type-check: ~0.3.2 + word-wrap: ~1.2.3 + checksum: b8695ddf3d593203e25ab0900e265d860038486c943ff8b774f596a310f8ceebdb30c6832407a8198ba3ec9debe1abe1f51d4aad94843612db3b76d690c61d34 languageName: node linkType: hard @@ -2061,15 +2718,31 @@ __metadata: languageName: node linkType: hard -"package-json@npm:^6.3.0": - version: 6.5.0 - resolution: "package-json@npm:6.5.0" +"pac-proxy-agent@npm:^5.0.0": + version: 5.0.0 + resolution: "pac-proxy-agent@npm:5.0.0" dependencies: - got: ^9.6.0 - registry-auth-token: ^4.0.0 - registry-url: ^5.0.0 - semver: ^6.2.0 - checksum: cc9f890d3667d7610e6184decf543278b87f657d1ace0deb4a9c9155feca738ef88f660c82200763d3348010f4e42e9c7adc91e96ab0f86a770955995b5351e2 + "@tootallnate/once": 1 + agent-base: 6 + debug: 4 + get-uri: 3 + http-proxy-agent: ^4.0.1 + https-proxy-agent: 5 + pac-resolver: ^5.0.0 + raw-body: ^2.2.0 + socks-proxy-agent: 5 + checksum: cfd26a0e2ebfea4ca6162465018ce093bf147d26cf6c8fb3e7155bc7c184370d80d4d09a1c097e3db7676d0e3f574ea1cb56a4aa7d1d2e5cca6238935fabf010 + languageName: node + linkType: hard + +"pac-resolver@npm:^5.0.0": + version: 5.0.1 + resolution: "pac-resolver@npm:5.0.1" + dependencies: + degenerator: ^3.0.2 + ip: ^1.1.5 + netmask: ^2.0.2 + checksum: e3bd8aada70d173cd4cec1ac810fb56161678b7a597060a740c4a31d9c5f8cd95687b2d0fd90b69c0cafe5ef787404074f38042ba08c8d378fed48973f58e493 languageName: node linkType: hard @@ -2101,10 +2774,10 @@ __metadata: languageName: node linkType: hard -"prepend-http@npm:^2.0.0": - version: 2.0.0 - resolution: "prepend-http@npm:2.0.0" - checksum: 7694a9525405447662c1ffd352fcb41b6410c705b739b6f4e3a3e21cf5fdede8377890088e8934436b8b17ba55365a615f153960f30877bf0d0392f9e93503ea +"prelude-ls@npm:~1.1.2": + version: 1.1.2 + resolution: "prelude-ls@npm:1.1.2" + checksum: c4867c87488e4a0c233e158e4d0d5565b609b105d75e4c05dc760840475f06b731332eb93cc8c9cecb840aa8ec323ca3c9a56ad7820ad2e63f0261dadcb154e4 languageName: node linkType: hard @@ -2135,6 +2808,29 @@ __metadata: languageName: node linkType: hard +"proxy-agent@npm:^5.0.0": + version: 5.0.0 + resolution: "proxy-agent@npm:5.0.0" + dependencies: + agent-base: ^6.0.0 + debug: 4 + http-proxy-agent: ^4.0.0 + https-proxy-agent: ^5.0.0 + lru-cache: ^5.1.1 + pac-proxy-agent: ^5.0.0 + proxy-from-env: ^1.0.0 + socks-proxy-agent: ^5.0.0 + checksum: 3b0bb73a4d3a07711d3cad72b2fa4320880f7a6ec1959cdcc186ac6ffb173db8137d7c4046c27fdfa6e2207b2eb75e802f3d5e14c766700586ec4d47299a5124 + languageName: node + linkType: hard + +"proxy-from-env@npm:^1.0.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 + languageName: node + linkType: hard + "pseudomap@npm:^1.0.2": version: 1.0.2 resolution: "pseudomap@npm:1.0.2" @@ -2149,29 +2845,10 @@ __metadata: languageName: node linkType: hard -"pump@npm:^3.0.0": - version: 3.0.0 - resolution: "pump@npm:3.0.0" - dependencies: - end-of-stream: ^1.1.0 - once: ^1.3.1 - checksum: e42e9229fba14732593a718b04cb5e1cfef8254544870997e0ecd9732b189a48e1256e4e5478148ecb47c8511dca2b09eae56b4d0aad8009e6fac8072923cfc9 - languageName: node - linkType: hard - -"pupa@npm:^2.1.1": - version: 2.1.1 - resolution: "pupa@npm:2.1.1" - dependencies: - escape-goat: ^2.0.0 - checksum: 49529e50372ffdb0cccf0efa0f3b3cb0a2c77805d0d9cc2725bd2a0f6bb414631e61c93a38561b26be1259550b7bb6c2cb92315aa09c8bf93f3bdcb49f2b2fb7 - languageName: node - linkType: hard - -"qs@npm:6.9.6": - version: 6.9.6 - resolution: "qs@npm:6.9.6" - checksum: cb6df402bb8a3dbefa4bd46eba0dfca427079baca923e6b8d28a03e6bfb16a5c1dcdb96e69388f9c5813ac8ff17bb8bbca22f2ecd31fe1e344a55cb531b5fabf +"qs@npm:6.9.7": + version: 6.9.7 + resolution: "qs@npm:6.9.7" + checksum: 5bbd263332ccf320a1f36d04a2019a5834dc20bcb736431eaccde2a39dcba03fb26d2fd00174f5d7bc26aaad1cad86124b18440883ac042ea2a0fca6170c1bf1 languageName: node linkType: hard @@ -2189,29 +2866,39 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:2.4.2": - version: 2.4.2 - resolution: "raw-body@npm:2.4.2" +"raw-body@npm:2.4.3": + version: 2.4.3 + resolution: "raw-body@npm:2.4.3" dependencies: - bytes: 3.1.1 + bytes: 3.1.2 http-errors: 1.8.1 iconv-lite: 0.4.24 unpipe: 1.0.0 - checksum: c6f8d6a75c65c0a047f888cb29efc97f60fb36e950ba2cb31fefce694f98186e844a03367920faa7dc5bffaf33df08aee0b9dd935280e366439fa6492a5b163e + checksum: d2961fa3c71c9c22dc2c3fd60ff377bf36dfed7d7a748f2b25d585934a3e9df565bb9aa5bc2e3a716ea941f4bc2a6ddc795c8b0cf7219fb071029b59b1985394 languageName: node linkType: hard -"rc@npm:^1.2.8": - version: 1.2.8 - resolution: "rc@npm:1.2.8" +"raw-body@npm:^2.2.0": + version: 2.5.1 + resolution: "raw-body@npm:2.5.1" dependencies: - deep-extend: ^0.6.0 - ini: ~1.3.0 - minimist: ^1.2.0 - strip-json-comments: ~2.0.1 - bin: - rc: ./cli.js - checksum: 2e26e052f8be2abd64e6d1dabfbd7be03f80ec18ccbc49562d31f617d0015fbdbcf0f9eed30346ea6ab789e0fdfe4337f033f8016efdbee0df5354751842080e + bytes: 3.1.2 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + unpipe: 1.0.0 + checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e + languageName: node + linkType: hard + +"readable-stream@npm:1.1.x": + version: 1.1.14 + resolution: "readable-stream@npm:1.1.14" + dependencies: + core-util-is: ~1.0.0 + inherits: ~2.0.1 + isarray: 0.0.1 + string_decoder: ~0.10.x + checksum: 17dfeae3e909945a4a1abc5613ea92d03269ef54c49288599507fc98ff4615988a1c39a999dcf9aacba70233d9b7040bc11a5f2bfc947e262dedcc0a8b32b5a0 languageName: node linkType: hard @@ -2270,24 +2957,6 @@ __metadata: languageName: node linkType: hard -"registry-auth-token@npm:^4.0.0": - version: 4.2.1 - resolution: "registry-auth-token@npm:4.2.1" - dependencies: - rc: ^1.2.8 - checksum: aa72060b573a50607cfd2dee16d0e51e13ca58b6a80442e74545325dc24d2c38896e6bad229bdcc1fc9759fa81b4066be8693d4d6f45927318e7c793a93e9cd0 - languageName: node - linkType: hard - -"registry-url@npm:^5.0.0": - version: 5.1.0 - resolution: "registry-url@npm:5.1.0" - dependencies: - rc: ^1.2.8 - checksum: bcea86c84a0dbb66467b53187fadebfea79017cddfb4a45cf27530d7275e49082fe9f44301976eb0164c438e395684bcf3dae4819b36ff9d1640d8cc60c73df9 - languageName: node - linkType: hard - "require-directory@npm:^2.1.1": version: 2.1.1 resolution: "require-directory@npm:2.1.1" @@ -2295,15 +2964,6 @@ __metadata: languageName: node linkType: hard -"responselike@npm:^1.0.2": - version: 1.0.2 - resolution: "responselike@npm:1.0.2" - dependencies: - lowercase-keys: ^1.0.0 - checksum: 2e9e70f1dcca3da621a80ce71f2f9a9cad12c047145c6ece20df22f0743f051cf7c73505e109814915f23f9e34fb0d358e22827723ee3d56b623533cab8eafcd - languageName: node - linkType: hard - "retry@npm:^0.12.0": version: 0.12.0 resolution: "retry@npm:0.12.0" @@ -2336,17 +2996,10 @@ __metadata: languageName: node linkType: hard -"safe-stable-stringify@npm:^1.1.0": - version: 1.1.1 - resolution: "safe-stable-stringify@npm:1.1.1" - checksum: e32a30720e8a2e3043b8b96733f015c1aa7a21a5a328074ce917b8afe4d26b4308c186c74fa92131e5f794b1efc63caa32defafceaa2981accaaedbc8b2c861c - languageName: node - linkType: hard - "safe-stable-stringify@npm:^2.3.1": - version: 2.3.1 - resolution: "safe-stable-stringify@npm:2.3.1" - checksum: a0a0bad0294c3e2a9d1bf3cf2b1096dfb83c162d09a5e4891e488cce082120bd69161d2a92aae7fc48255290f17700decae9c89a07fe139794e61b5c8b411377 + version: 2.4.1 + resolution: "safe-stable-stringify@npm:2.4.1" + checksum: d8e505c462031301040605a4836ca25b52a1744eff01b0939b4d43136638fb8e88e0cec3d3ab6ab8e26f501086e6ba6bf34b228f57bf2ac56cb8d4061355d723 languageName: node linkType: hard @@ -2364,15 +3017,6 @@ __metadata: languageName: node linkType: hard -"semver-diff@npm:^3.1.1": - version: 3.1.1 - resolution: "semver-diff@npm:3.1.1" - dependencies: - semver: ^6.3.0 - checksum: 8bbe5a5d7add2d5e51b72314a9215cd294d71f41cdc2bf6bd59ee76411f3610b576172896f1d191d0d7294cb9f2f847438d2ee158adacc0c224dca79052812fe - languageName: node - linkType: hard - "semver@npm:^5.7.1": version: 5.7.1 resolution: "semver@npm:5.7.1" @@ -2382,34 +3026,23 @@ __metadata: languageName: node linkType: hard -"semver@npm:^6.0.0, semver@npm:^6.2.0, semver@npm:^6.3.0": - version: 6.3.0 - resolution: "semver@npm:6.3.0" - bin: - semver: ./bin/semver.js - checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9 - languageName: node - linkType: hard - -"semver@npm:^7.3.4": - version: 7.3.5 - resolution: "semver@npm:7.3.5" - dependencies: - lru-cache: ^6.0.0 - bin: - semver: bin/semver.js - checksum: 5eafe6102bea2a7439897c1856362e31cc348ccf96efd455c8b5bc2c61e6f7e7b8250dc26b8828c1d76a56f818a7ee907a36ae9fb37a599d3d24609207001d60 - languageName: node - linkType: hard - "semver@npm:^7.3.5": - version: 7.3.7 - resolution: "semver@npm:7.3.7" + version: 7.3.8 + resolution: "semver@npm:7.3.8" dependencies: lru-cache: ^6.0.0 bin: semver: bin/semver.js - checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232 + checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1 + languageName: node + linkType: hard + +"semver@npm:~7.0.0": + version: 7.0.0 + resolution: "semver@npm:7.0.0" + bin: + semver: bin/semver.js + checksum: 272c11bf8d083274ef79fe40a81c55c184dff84dd58e3c325299d0927ba48cece1f020793d138382b85f89bab5002a35a5ba59a3a68a7eebbb597eb733838778 languageName: node linkType: hard @@ -2460,7 +3093,7 @@ __metadata: languageName: node linkType: hard -"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.7": +"signal-exit@npm:^3.0.7": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318 @@ -2476,6 +3109,15 @@ __metadata: languageName: node linkType: hard +"simple-update-notifier@npm:^1.0.7": + version: 1.0.7 + resolution: "simple-update-notifier@npm:1.0.7" + dependencies: + semver: ~7.0.0 + checksum: aaadc1f158ad5101b363d1c7aed1f30fc1cac59a760aa31702633e0e6fe423348f07d0e78185aef0aad29130a7b7f0f188c21c7bc7353f897a0ea3682e051a70 + languageName: node + linkType: hard + "smart-buffer@npm:^4.2.0": version: 4.2.0 resolution: "smart-buffer@npm:4.2.0" @@ -2483,35 +3125,45 @@ __metadata: languageName: node linkType: hard -"socket.io-adapter@npm:~2.3.3": - version: 2.3.3 - resolution: "socket.io-adapter@npm:2.3.3" - checksum: 73890e0a33e48a9e4be83e5fa2b8ea9728d2a35ae2fed373cad4d6744c6512c0e1c735e7820df9821e58c4738dc355bdaec5aae30bc56f4d6a41d999596d0c82 +"socket.io-adapter@npm:~2.4.0": + version: 2.4.0 + resolution: "socket.io-adapter@npm:2.4.0" + checksum: a84639946dce13547b95f6e09fe167cdcd5d80941afc2e46790cc23384e0fd3c901e690ecc9bdd600939ce6292261ee15094a0b486f797ed621cfc8783d87a0c languageName: node linkType: hard -"socket.io-parser@npm:~4.0.4": - version: 4.0.4 - resolution: "socket.io-parser@npm:4.0.4" +"socket.io-parser@npm:~4.2.0": + version: 4.2.1 + resolution: "socket.io-parser@npm:4.2.1" dependencies: - "@types/component-emitter": ^1.2.10 - component-emitter: ~1.3.0 + "@socket.io/component-emitter": ~3.1.0 debug: ~4.3.1 - checksum: c173b4f3747c51e2af802eca35212f4dcfa8fe55d7fdc07b9a01da1ecc956791c1bf6591e307952548eab69e6500bcfe27cea8aff1386b860d9bb51f98e4fafb + checksum: 2582202f22538d7e6b4436991378cb4cea3b2f8219cda24923ae35afd291ab5ad6120e7d093e41738256b6c6ad10c667dd25753c2d9a2340fead04e9286f152d languageName: node linkType: hard "socket.io@npm:^4.4.0": - version: 4.4.1 - resolution: "socket.io@npm:4.4.1" + version: 4.5.3 + resolution: "socket.io@npm:4.5.3" dependencies: accepts: ~1.3.4 base64id: ~2.0.0 debug: ~4.3.2 - engine.io: ~6.1.0 - socket.io-adapter: ~2.3.3 - socket.io-parser: ~4.0.4 - checksum: a559ae52359f1ca3ce5a347368cf985c72259e1ab1bf2bf769ca0add5db34e2a86f4e183a58f37f32676ec482c71fedb7b08d873dc31cf581f5ba0797a8382fe + engine.io: ~6.2.0 + socket.io-adapter: ~2.4.0 + socket.io-parser: ~4.2.0 + checksum: 2a7e4c64bbebb444d211bc66fb8356c14dd0fd4138d31e1781db03fa5a731a3abb7b305fa32cb6c7b57e5ac788601583aad14bea6ff9b8c4ca7b74118ba55f66 + languageName: node + linkType: hard + +"socks-proxy-agent@npm:5, socks-proxy-agent@npm:^5.0.0": + version: 5.0.1 + resolution: "socks-proxy-agent@npm:5.0.1" + dependencies: + agent-base: ^6.0.2 + debug: 4 + socks: ^2.3.3 + checksum: 1b60c4977b2fef783f0fc4dc619cd2758aafdb43f3cf679f1e3627cb6c6e752811cee5513ebb4157ad26786033d2f85029440f197d321e8293b38cc5aab01e06 languageName: node linkType: hard @@ -2526,13 +3178,20 @@ __metadata: languageName: node linkType: hard -"socks@npm:^2.6.2": - version: 2.7.0 - resolution: "socks@npm:2.7.0" +"socks@npm:^2.3.3, socks@npm:^2.6.2": + version: 2.7.1 + resolution: "socks@npm:2.7.1" dependencies: ip: ^2.0.0 smart-buffer: ^4.2.0 - checksum: 0b5d94e2b3c11e7937b40fc5dac1e80d8b92a330e68c51f1d271ce6980c70adca42a3f8cd47c4a5769956bada074823b53374f2dc5f2ea5c2121b222dec6eadf + checksum: 259d9e3e8e1c9809a7f5c32238c3d4d2a36b39b83851d0f573bfde5f21c4b1288417ce1af06af1452569cd1eb0841169afd4998f0e04ba04656f6b7f0e46d748 + languageName: node + linkType: hard + +"source-map@npm:~0.6.1": + version: 0.6.1 + resolution: "source-map@npm:0.6.1" + checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2 languageName: node linkType: hard @@ -2552,6 +3211,13 @@ __metadata: languageName: node linkType: hard +"statuses@npm:2.0.1": + version: 2.0.1 + resolution: "statuses@npm:2.0.1" + checksum: 18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb + languageName: node + linkType: hard + "statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0": version: 1.5.0 resolution: "statuses@npm:1.5.0" @@ -2559,7 +3225,7 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": +"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -2579,6 +3245,13 @@ __metadata: languageName: node linkType: hard +"string_decoder@npm:~0.10.x": + version: 0.10.31 + resolution: "string_decoder@npm:0.10.31" + checksum: fe00f8e303647e5db919948ccb5ce0da7dea209ab54702894dd0c664edd98e5d4df4b80d6fabf7b9e92b237359d21136c95bf068b2f7760b772ca974ba970202 + languageName: node + linkType: hard + "strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": version: 6.0.1 resolution: "strip-ansi@npm:6.0.1" @@ -2588,10 +3261,10 @@ __metadata: languageName: node linkType: hard -"strip-json-comments@npm:~2.0.1": - version: 2.0.1 - resolution: "strip-json-comments@npm:2.0.1" - checksum: 1074ccb63270d32ca28edfb0a281c96b94dc679077828135141f27d52a5a398ef5e78bcf22809d23cadc2b81dfbe345eb5fd8699b385c8b1128907dec4a7d1e1 +"strnum@npm:^1.0.5": + version: 1.0.5 + resolution: "strnum@npm:1.0.5" + checksum: 651b2031db5da1bf4a77fdd2f116a8ac8055157c5420f5569f64879133825915ad461513e7202a16d7fec63c54fd822410d0962f8ca12385c4334891b9ae6dd2 languageName: node linkType: hard @@ -2634,13 +3307,6 @@ __metadata: languageName: node linkType: hard -"to-readable-stream@npm:^1.0.0": - version: 1.0.0 - resolution: "to-readable-stream@npm:1.0.0" - checksum: 2bd7778490b6214a2c40276065dd88949f4cf7037ce3964c76838b8cb212893aeb9cceaaf4352a4c486e3336214c350270f3263e1ce7a0c38863a715a4d9aeb5 - languageName: node - linkType: hard - "to-regex-range@npm:^5.0.1": version: 5.0.1 resolution: "to-regex-range@npm:5.0.1" @@ -2675,10 +3341,26 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.20.2": - version: 0.20.2 - resolution: "type-fest@npm:0.20.2" - checksum: 4fb3272df21ad1c552486f8a2f8e115c09a521ad7a8db3d56d53718d0c907b62c6e9141ba5f584af3f6830d0872c521357e512381f24f7c44acae583ad517d73 +"tslib@npm:^1.11.1": + version: 1.14.1 + resolution: "tslib@npm:1.14.1" + checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd + languageName: node + linkType: hard + +"tslib@npm:^2.0.1, tslib@npm:^2.3.1": + version: 2.4.0 + resolution: "tslib@npm:2.4.0" + checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113 + languageName: node + linkType: hard + +"type-check@npm:~0.3.2": + version: 0.3.2 + resolution: "type-check@npm:0.3.2" + dependencies: + prelude-ls: ~1.1.2 + checksum: dd3b1495642731bc0e1fc40abe5e977e0263005551ac83342ecb6f4f89551d106b368ec32ad3fb2da19b3bd7b2d1f64330da2ea9176d8ddbfe389fb286eb5124 languageName: node linkType: hard @@ -2692,15 +3374,6 @@ __metadata: languageName: node linkType: hard -"typedarray-to-buffer@npm:^3.1.5": - version: 3.1.5 - resolution: "typedarray-to-buffer@npm:3.1.5" - dependencies: - is-typedarray: ^1.0.0 - checksum: 99c11aaa8f45189fcfba6b8a4825fd684a321caa9bd7a76a27cf0c7732c174d198b99f449c52c3818107430b5f41c0ccbbfb75cb2ee3ca4a9451710986d61a60 - languageName: node - linkType: hard - "uid-safe@npm:~2.1.5": version: 2.1.5 resolution: "uid-safe@npm:2.1.5" @@ -2717,30 +3390,28 @@ __metadata: languageName: node linkType: hard -"unique-filename@npm:^1.1.1": - version: 1.1.1 - resolution: "unique-filename@npm:1.1.1" +"unique-filename@npm:^2.0.0": + version: 2.0.1 + resolution: "unique-filename@npm:2.0.1" dependencies: - unique-slug: ^2.0.0 - checksum: cf4998c9228cc7647ba7814e255dec51be43673903897b1786eff2ac2d670f54d4d733357eb08dea969aa5e6875d0e1bd391d668fbdb5a179744e7c7551a6f80 + unique-slug: ^3.0.0 + checksum: 807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f languageName: node linkType: hard -"unique-slug@npm:^2.0.0": - version: 2.0.2 - resolution: "unique-slug@npm:2.0.2" +"unique-slug@npm:^3.0.0": + version: 3.0.0 + resolution: "unique-slug@npm:3.0.0" dependencies: imurmurhash: ^0.1.4 - checksum: 5b6876a645da08d505dedb970d1571f6cebdf87044cb6b740c8dbb24f0d6e1dc8bdbf46825fd09f994d7cf50760e6f6e063cfa197d51c5902c00a861702eb75a + checksum: 49f8d915ba7f0101801b922062ee46b7953256c93ceca74303bd8e6413ae10aa7e8216556b54dc5382895e8221d04f1efaf75f945c2e4a515b4139f77aa6640c languageName: node linkType: hard -"unique-string@npm:^2.0.0": - version: 2.0.0 - resolution: "unique-string@npm:2.0.0" - dependencies: - crypto-random-string: ^2.0.0 - checksum: ef68f639136bcfe040cf7e3cd7a8dff076a665288122855148a6f7134092e6ed33bf83a7f3a9185e46c98dddc445a0da6ac25612afa1a7c38b8b654d6c02498e +"universalify@npm:^0.1.0": + version: 0.1.2 + resolution: "universalify@npm:0.1.2" + checksum: 40cdc60f6e61070fe658ca36016a8f4ec216b29bf04a55dce14e3710cc84c7448538ef4dad3728d0bfe29975ccd7bfb5f414c45e7b78883567fb31b246f02dff languageName: node linkType: hard @@ -2751,37 +3422,6 @@ __metadata: languageName: node linkType: hard -"update-notifier@npm:^5.1.0": - version: 5.1.0 - resolution: "update-notifier@npm:5.1.0" - dependencies: - boxen: ^5.0.0 - chalk: ^4.1.0 - configstore: ^5.0.1 - has-yarn: ^2.1.0 - import-lazy: ^2.1.0 - is-ci: ^2.0.0 - is-installed-globally: ^0.4.0 - is-npm: ^5.0.0 - is-yarn-global: ^0.3.0 - latest-version: ^5.1.0 - pupa: ^2.1.1 - semver: ^7.3.4 - semver-diff: ^3.1.1 - xdg-basedir: ^4.0.0 - checksum: 461e5e5b002419296d3868ee2abe0f9ab3e1846d9db642936d0c46f838872ec56069eddfe662c45ce1af0a8d6d5026353728de2e0a95ab2e3546a22ea077caf1 - languageName: node - linkType: hard - -"url-parse-lax@npm:^3.0.0": - version: 3.0.0 - resolution: "url-parse-lax@npm:3.0.0" - dependencies: - prepend-http: ^2.0.0 - checksum: 1040e357750451173132228036aff1fd04abbd43eac1fb3e4fca7495a078bcb8d33cb765fe71ad7e473d9c94d98fd67adca63bd2716c815a2da066198dd37217 - languageName: node - linkType: hard - "util-deprecate@npm:^1.0.1": version: 1.0.2 resolution: "util-deprecate@npm:1.0.2" @@ -2796,6 +3436,15 @@ __metadata: languageName: node linkType: hard +"uuid@npm:^8.3.2": + version: 8.3.2 + resolution: "uuid@npm:8.3.2" + bin: + uuid: dist/bin/uuid + checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df + languageName: node + linkType: hard + "vary@npm:^1, vary@npm:~1.1.2": version: 1.1.2 resolution: "vary@npm:1.1.2" @@ -2803,6 +3452,18 @@ __metadata: languageName: node linkType: hard +"vm2@npm:^3.9.8": + version: 3.9.11 + resolution: "vm2@npm:3.9.11" + dependencies: + acorn: ^8.7.0 + acorn-walk: ^8.2.0 + bin: + vm2: bin/vm2 + checksum: aab39e6e4b59146d24abacd79f490e854a6e058a8b23d93d2be5aca7720778e2605d2cc028ccc4a5f50d3d91b0c38be9a6247a80d2da1a6de09425cc437770b4 + languageName: node + linkType: hard + "which@npm:^2.0.2": version: 2.0.2 resolution: "which@npm:2.0.2" @@ -2823,18 +3484,28 @@ __metadata: languageName: node linkType: hard -"widest-line@npm:^3.1.0": - version: 3.1.0 - resolution: "widest-line@npm:3.1.0" +"winston-cloudwatch@npm:^6.1.1": + version: 6.1.1 + resolution: "winston-cloudwatch@npm:6.1.1" dependencies: - string-width: ^4.0.0 - checksum: 03db6c9d0af9329c37d74378ff1d91972b12553c7d72a6f4e8525fe61563fa7adb0b9d6e8d546b7e059688712ea874edd5ded475999abdeedf708de9849310e0 + async: ^3.1.0 + chalk: ^4.0.0 + fast-safe-stringify: ^2.0.7 + lodash.assign: ^4.2.0 + lodash.find: ^4.6.0 + lodash.isempty: ^4.4.0 + lodash.iserror: ^3.1.1 + proxy-agent: ^5.0.0 + peerDependencies: + "@aws-sdk/client-cloudwatch-logs": ^3.0.0 + winston: ^3.0.0 + checksum: 57adc419a8235d8b149d72b43542d31210f8203dc4bfb9ead471f18cc1a100e3c8927fc5f6cb86cfb7b369cf8042fda94703b55a83563efdd6556a8dfc1cc9c0 languageName: node linkType: hard "winston-daily-rotate-file@npm:^4.5.5": - version: 4.6.0 - resolution: "winston-daily-rotate-file@npm:4.6.0" + version: 4.7.1 + resolution: "winston-daily-rotate-file@npm:4.7.1" dependencies: file-stream-rotator: ^0.6.1 object-hash: ^2.0.1 @@ -2842,11 +3513,11 @@ __metadata: winston-transport: ^4.4.0 peerDependencies: winston: ^3 - checksum: 9b8a4a772d8cfcce1e54cf7e2c04fa835953bb6fab2691a85a68daf42dd6dacc1559dbc2ca0aa7f7132cf51f8b978ddbad346b835aef900038505eaba905f191 + checksum: 227daea41f722caa017fc7d6f1f80d0e6c428491e57693e6bebc8312b85bcf3aace53cb3a925bda72fab59a6898fa127411d29348ec4b295e2263a7544cda611 languageName: node linkType: hard -"winston-transport@npm:^4.4.0, winston-transport@npm:^4.4.2": +"winston-transport@npm:^4.4.0, winston-transport@npm:^4.5.0": version: 4.5.0 resolution: "winston-transport@npm:4.5.0" dependencies: @@ -2857,21 +3528,29 @@ __metadata: languageName: node linkType: hard -"winston@npm:^3.3.3": - version: 3.5.1 - resolution: "winston@npm:3.5.1" +"winston@npm:^3.8.2": + version: 3.8.2 + resolution: "winston@npm:3.8.2" dependencies: + "@colors/colors": 1.5.0 "@dabh/diagnostics": ^2.0.2 async: ^3.2.3 is-stream: ^2.0.0 - logform: ^2.3.2 + logform: ^2.4.0 one-time: ^1.0.0 readable-stream: ^3.4.0 safe-stable-stringify: ^2.3.1 stack-trace: 0.0.x triple-beam: ^1.3.0 - winston-transport: ^4.4.2 - checksum: 12253f1644c46f90b36b8e675f397b29f862778c6a76cce11ad901c35d7a9b556fe371bfd0c22e180f6aa2e23d7a726a6f4ec1eec637dac3fe76390a0cd5ed09 + winston-transport: ^4.5.0 + checksum: f7b901798b92ab9e93c850110bf6e98500e9a0e762b62dab410cf928b2a4145533dfa6d3d2b24f7bf0dc94b53808d5bd28aaaeff9a4b43b89ea4c798cce308ea + languageName: node + linkType: hard + +"word-wrap@npm:~1.2.3": + version: 1.2.3 + resolution: "word-wrap@npm:1.2.3" + checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f languageName: node linkType: hard @@ -2893,18 +3572,6 @@ __metadata: languageName: node linkType: hard -"write-file-atomic@npm:^3.0.0": - version: 3.0.3 - resolution: "write-file-atomic@npm:3.0.3" - dependencies: - imurmurhash: ^0.1.4 - is-typedarray: ^1.0.0 - signal-exit: ^3.0.2 - typedarray-to-buffer: ^3.1.5 - checksum: c55b24617cc61c3a4379f425fc62a386cc51916a9b9d993f39734d005a09d5a4bb748bc251f1304e7abd71d0a26d339996c275955f527a131b1dcded67878280 - languageName: node - linkType: hard - "ws@npm:~8.2.3": version: 8.2.3 resolution: "ws@npm:8.2.3" @@ -2920,10 +3587,10 @@ __metadata: languageName: node linkType: hard -"xdg-basedir@npm:^4.0.0": - version: 4.0.0 - resolution: "xdg-basedir@npm:4.0.0" - checksum: 0073d5b59a37224ed3a5ac0dd2ec1d36f09c49f0afd769008a6e9cd3cd666bd6317bd1c7ce2eab47e1de285a286bad11a9b038196413cd753b79770361855f3c +"xregexp@npm:2.0.0": + version: 2.0.0 + resolution: "xregexp@npm:2.0.0" + checksum: de62d1f01c9f1a67c80cafe48a3dc081b324249a0e88e65dc9acae9cce6d8e63c9d91c0f97e2ad2d8c5351c856c139c04dc55ebd941e59b7d1d5c1169e164cff languageName: node linkType: hard @@ -2941,6 +3608,13 @@ __metadata: languageName: node linkType: hard +"yallist@npm:^3.0.2": + version: 3.1.1 + resolution: "yallist@npm:3.1.1" + checksum: 48f7bb00dc19fc635a13a39fe547f527b10c9290e7b3e836b9a8f1ca04d4d342e85714416b3c2ab74949c9c66f9cebb0473e6bc353b79035356103b47641285d + languageName: node + linkType: hard + "yallist@npm:^4.0.0": version: 4.0.0 resolution: "yallist@npm:4.0.0" diff --git a/common/services/ASC.ApiSystem/GlobalUsings.cs b/common/services/ASC.ApiSystem/GlobalUsings.cs index 403c00bacb..55123c2149 100644 --- a/common/services/ASC.ApiSystem/GlobalUsings.cs +++ b/common/services/ASC.ApiSystem/GlobalUsings.cs @@ -102,4 +102,6 @@ global using Microsoft.Extensions.Options; global using Newtonsoft.Json.Linq; -global using NLog; \ No newline at end of file +global using NLog; +global using HealthChecks.UI.Client; +global using Microsoft.AspNetCore.Diagnostics.HealthChecks; diff --git a/common/services/ASC.ApiSystem/Program.cs b/common/services/ASC.ApiSystem/Program.cs index 6f4fc3bcd9..45c5be63ed 100644 --- a/common/services/ASC.ApiSystem/Program.cs +++ b/common/services/ASC.ApiSystem/Program.cs @@ -25,6 +25,8 @@ // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode +using StackExchange.Redis.Extensions.Core.Configuration; + var options = new WebApplicationOptions { Args = args, @@ -45,6 +47,16 @@ var logger = LogManager.Setup() }) .LoadConfiguration(builder.Configuration, builder.Environment) .GetLogger(typeof(Startup).Namespace); +var path = builder.Configuration["pathToConf"]; +logger.Debug("path: " + path); +logger.Debug("EnvironmentName: " + builder.Environment.EnvironmentName); + +var redisConfiguration = builder.Configuration.GetSection("Redis").Get(); +logger.Error($"redisConfiguration is null: {redisConfiguration == null}"); +var kafkaConfiguration = builder.Configuration.GetSection("kafka").Get(); +logger.Debug($"kafkaConfiguration is null: {kafkaConfiguration == null}"); +var rabbitMQConfiguration = builder.Configuration.GetSection("RabbitMQ").Get(); +logger.Debug($"rabbitMQConfiguration is null: {rabbitMQConfiguration == null}"); try { diff --git a/common/services/ASC.ApiSystem/Startup.cs b/common/services/ASC.ApiSystem/Startup.cs index ae9bf134a0..9cf9a7f381 100644 --- a/common/services/ASC.ApiSystem/Startup.cs +++ b/common/services/ASC.ApiSystem/Startup.cs @@ -80,7 +80,6 @@ public class Startup services.AddSingleton(jsonOptions); _diHelper.AddControllers(); - _diHelper.TryAdd(); _diHelper.TryAdd(); _diHelper.TryAdd(); _diHelper.TryAdd(); @@ -122,11 +121,19 @@ public class Startup app.UseAuthorization(); - app.UseCultureMiddleware(); - app.UseEndpoints(endpoints => { endpoints.MapCustom(); + + endpoints.MapHealthChecks("/health", new HealthCheckOptions() + { + Predicate = _ => true, + ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse + }); + endpoints.MapHealthChecks("/liveness", new HealthCheckOptions + { + Predicate = r => r.Name.Contains("self") + }); }); } } diff --git a/common/services/ASC.ClearEvents/Extensions/ServiceCollectionExtension.cs b/common/services/ASC.ClearEvents/Extensions/ServiceCollectionExtension.cs index dbd516efda..866d6b6372 100644 --- a/common/services/ASC.ClearEvents/Extensions/ServiceCollectionExtension.cs +++ b/common/services/ASC.ClearEvents/Extensions/ServiceCollectionExtension.cs @@ -24,17 +24,24 @@ // 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 +using ASC.Api.Core.Core; +using ASC.Common.Logging; + namespace ASC.ClearEvents.Extensions; public static class ServiceCollectionExtension { - public static IServiceCollection AddClearEventsServices(this IServiceCollection services) + public static IServiceCollection AddClearEventsServices(this IServiceCollection services, IConfiguration configuration) { var diHelper = new DIHelper(services); + services.AddScoped(); + services.AddHostedService(); diHelper.TryAdd(); services.AddBaseDbContextPool(); + services.AddCustomHealthCheck(configuration); + return services; } diff --git a/common/services/ASC.ClearEvents/Program.cs b/common/services/ASC.ClearEvents/Program.cs index fd0150a435..f21176f1aa 100644 --- a/common/services/ASC.ClearEvents/Program.cs +++ b/common/services/ASC.ClearEvents/Program.cs @@ -24,6 +24,10 @@ // 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 +using ASC.Api.Core.Core; +using HealthChecks.UI.Client; +using Microsoft.AspNetCore.Diagnostics.HealthChecks; + using NLog; var options = new WebApplicationOptions @@ -50,7 +54,7 @@ try { logger.Info("Configuring web host ({applicationContext})...", Program.AppName); builder.Host.ConfigureDefault(); - builder.Services.AddClearEventsServices(); + builder.Services.AddClearEventsServices(builder.Configuration); builder.Host.ConfigureContainer((context, builder) => { @@ -59,6 +63,22 @@ try var app = builder.Build(); + app.UseRouting(); + + app.UseEndpoints(endpoints => + { + endpoints.MapHealthChecks("/health", new HealthCheckOptions() + { + Predicate = _ => true, + ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse + }); + endpoints.MapHealthChecks("/liveness", new HealthCheckOptions + { + Predicate = r => r.Name.Contains("self") + }); + }); + + logger.Info("Starting web host ({applicationContext})...", Program.AppName); await app.RunWithTasksAsync(); } diff --git a/packages/client/public/images/remove.session.svg b/packages/client/public/images/remove.session.svg new file mode 100644 index 0000000000..a218bae0f0 --- /dev/null +++ b/packages/client/public/images/remove.session.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/client/public/images/tick.svg b/packages/client/public/images/tick.svg new file mode 100644 index 0000000000..0eac2a81e9 --- /dev/null +++ b/packages/client/public/images/tick.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/client/public/locales/en/Files.json b/packages/client/public/locales/en/Files.json index f334219095..8b0ec964e7 100644 --- a/packages/client/public/locales/en/Files.json +++ b/packages/client/public/locales/en/Files.json @@ -28,6 +28,7 @@ "EmptyFilterDescriptionTextRooms": "No rooms match this filter. Try a different one or clear filter to view all rooms.", "EmptyFilterSubheadingText": "No files to be displayed for this filter here", "EmptyFolderDecription": "Drop files here or create new ones.", + "EmptyFolderDescriptionUser": "Files and folders uploaded by admins will appeared here.", "EmptyFolderHeader": "No files in this folder", "EmptyRecycleBin": "Empty Trash", "EmptyScreenFolder": "No docs here yet", diff --git a/packages/client/public/locales/en/Profile.json b/packages/client/public/locales/en/Profile.json index e16d1b3551..7119c166ab 100644 --- a/packages/client/public/locales/en/Profile.json +++ b/packages/client/public/locales/en/Profile.json @@ -1,10 +1,13 @@ { + "ActiveSessions": "Active Sessions", "ChangeEmailSuccess": "Email has been changed successfully", "ChangesApplied": "Changes are applied", "ConnectSocialNetworks": "Сonnect your social networks", "ContactInformation": "Contact Information", "CountCodesRemaining": "codes remaining", + "ChangePasswordAfterLoggingOut": "Change password after logging out", "DarkTheme": "Dark theme", + "DescriptionForSecurity": "For more security, you need to change your password.", "EditPhoto": "Edit photo", "EditSubscriptionsBtn": "Edit subscriptions", "EditUser": "Edit profile", @@ -13,6 +16,14 @@ "InviteAgainLbl": "Invite again", "LightTheme": "Light theme", "LoginSettings": "Login settings", + "LogoutAllActiveSessions": "Log out from all active sessions", + "LogoutActiveConnection": "Log out from active connection", + "LogoutAllActiveConnections": "Log out from all active connections", + "LogoutDescription": "Note. All active connections except this connection will be logged out, as it is currently in use.", + "LogoutBtn": "Log out", + "LogoutFrom": "Log out from {{platform}} {{browser}} ?", + "SuccessLogout": "The active connection was logged out: {{platform}}, {{browser}}", + "LogoutAllActiveSessionsDescription": "All active connections except this connection will be logged out, as it is currently in use.", "MessageEmailActivationInstuctionsSentOnEmail": "The email activation instructions have been sent to the {{ email }} email address", "MyProfile": "My profile", "PhoneLbl": "Phone", diff --git a/packages/client/src/HOCs/withContent.js b/packages/client/src/HOCs/withContent.js index 81c37dcf00..dcbe5cb15d 100644 --- a/packages/client/src/HOCs/withContent.js +++ b/packages/client/src/HOCs/withContent.js @@ -77,10 +77,9 @@ export default function withContent(WrappedContent) { access === ShareAccessRights.FullAccess || // only badges? access === ShareAccessRights.None; // TODO: fix access type for owner (now - None) - const linkStyles = - isTrashFolder || isArchiveFolder //|| window.innerWidth <= 1024 - ? { noHover: true } - : { onClick: onFilesClick }; + const linkStyles = isTrashFolder //|| window.innerWidth <= 1024 + ? { noHover: true } + : { onClick: onFilesClick }; if (!isDesktop && !isTrashFolder && !isArchiveFolder) { linkStyles.href = href; diff --git a/packages/client/src/HOCs/withFileActions.js b/packages/client/src/HOCs/withFileActions.js index 34de187b66..a17839d37c 100644 --- a/packages/client/src/HOCs/withFileActions.js +++ b/packages/client/src/HOCs/withFileActions.js @@ -158,8 +158,7 @@ export default function withFileActions(WrappedFileItem) { !!e.target.closest(".lock-file") || !!e.target.closest(".additional-badges") || e.target.closest(".tag") || - isTrashFolder || - isArchiveFolder + isTrashFolder ) return; diff --git a/packages/client/src/components/Article/Body/Items.js b/packages/client/src/components/Article/Body/Items.js index b2d8512150..f2f59bdf4a 100644 --- a/packages/client/src/components/Article/Body/Items.js +++ b/packages/client/src/components/Article/Body/Items.js @@ -353,7 +353,7 @@ const Items = ({ ); if (isVisitor) { - items.length > 1 && items.splice(2, 0, filesHeader); + items.length > 2 && items.splice(2, 0, filesHeader); } else { items.splice(3, 0, filesHeader); } diff --git a/packages/client/src/components/Article/MainButton/index.js b/packages/client/src/components/Article/MainButton/index.js index 1c4550b8ea..357ffe7dc4 100644 --- a/packages/client/src/components/Article/MainButton/index.js +++ b/packages/client/src/components/Article/MainButton/index.js @@ -90,7 +90,8 @@ const ArticleMainButtonContent = (props) => { isOwner, isAdmin, - isVisitor, + + canCreateFiles, setInvitePanelOptions, } = props; @@ -123,6 +124,7 @@ const ArticleMainButtonContent = (props) => { ); const onCreateRoom = React.useCallback(() => { + console.log("click"); const event = new Event(Events.ROOM_CREATE); window.dispatchEvent(event); }, []); @@ -405,7 +407,9 @@ const ArticleMainButtonContent = (props) => { ? t("Common:Invite") : t("Common:Actions"); - const isDisabled = (!canCreate && !canInvite) || isArchiveFolder; + const isDisabled = + ((!canCreate || (!canCreateFiles && !isRoomsFolder)) && !canInvite) || + isArchiveFolder; const isProfile = history.location.pathname === "/accounts/view/@self"; return ( @@ -420,7 +424,7 @@ const ArticleMainButtonContent = (props) => { !isArchiveFolder && !isArticleLoading && !isProfile && - (canCreate || canInvite) && ( + ((canCreate && (canCreateFiles || isRoomsFolder)) || canInvite) && ( { const { isLoaded, firstLoad, isLoading, canCreate } = filesStore; const { @@ -509,6 +514,8 @@ export default inject( const { isAdmin, isOwner, isVisitor } = auth.userStore.user; + const { canCreateFiles } = accessRightsStore; + return { showText: auth.settingsStore.showText, isMobileArticle: auth.settingsStore.isMobileArticle, @@ -525,6 +532,7 @@ export default inject( selectedTreeNode, canCreate, + canCreateFiles, startUpload, diff --git a/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js b/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js index 95310fb54c..a6479d97a5 100644 --- a/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js +++ b/packages/client/src/components/EmptyContainer/EmptyFolderContainer.js @@ -15,6 +15,7 @@ const EmptyFolderContainer = ({ linkStyles, isRooms, sectionWidth, + canCreateFiles, }) => { const onBackToParentFolder = () => { setIsLoading(true); @@ -24,7 +25,7 @@ const EmptyFolderContainer = ({ : fetchFiles(parentId).finally(() => setIsLoading(false)); }; - const buttons = ( + const buttons = canCreateFiles ? ( <>
+ ) : ( + <> ); return ( { - const { fetchFiles, fetchRooms } = filesStore; - const { navigationPath, parentId } = selectedFolderStore; +export default inject( + ({ accessRightsStore, filesStore, selectedFolderStore }) => { + const { fetchFiles, fetchRooms } = filesStore; + const { navigationPath, parentId } = selectedFolderStore; - let isRootRoom, isRoom, id; - if (navigationPath && navigationPath.length) { - const elem = navigationPath[0]; + let isRootRoom, isRoom, id; + if (navigationPath && navigationPath.length) { + const elem = navigationPath[0]; - isRootRoom = elem.isRootRoom; - isRoom = elem.isRoom; - id = elem.id; + isRootRoom = elem.isRootRoom; + isRoom = elem.isRoom; + id = elem.id; + } + + const { canCreateFiles } = accessRightsStore; + + return { + fetchFiles, + fetchRooms, + setIsLoading: filesStore.setIsLoading, + parentId: id ?? parentId, + isRooms: isRoom || isRootRoom, + canCreateFiles, + }; } - - return { - fetchFiles, - fetchRooms, - setIsLoading: filesStore.setIsLoading, - parentId: id ?? parentId, - isRooms: isRoom || isRootRoom, - }; -})(withTranslation(["Files", "Translations"])(observer(EmptyFolderContainer))); +)(withTranslation(["Files", "Translations"])(observer(EmptyFolderContainer))); diff --git a/packages/client/src/components/GlobalEvents/RenameEvent.js b/packages/client/src/components/GlobalEvents/RenameEvent.js index 77fd314aa3..5926a02869 100644 --- a/packages/client/src/components/GlobalEvents/RenameEvent.js +++ b/packages/client/src/components/GlobalEvents/RenameEvent.js @@ -42,7 +42,6 @@ const RenameEvent = ({ const onUpdate = React.useCallback((e, value) => { const originalTitle = getTitleWithoutExst(item); - setIsLoading(true); let timerId; const isSameTitle = @@ -52,7 +51,7 @@ const RenameEvent = ({ if (isSameTitle) { setStartValue(originalTitle); - setIsLoading(false); + onClose(); return editCompleteAction(item, type); @@ -82,7 +81,6 @@ const RenameEvent = ({ timerId = null; clearActiveOperations([item.id]); - setIsLoading(false); onClose(); }) : renameFolder(item.id, value) @@ -106,7 +104,6 @@ const RenameEvent = ({ clearTimeout(timerId); timerId = null; clearActiveOperations(null, [item.id]); - setIsLoading(false); onClose(); }); }, []); diff --git a/packages/client/src/components/SmartBanner/index.js b/packages/client/src/components/SmartBanner/index.js index b3fbb73990..4e93a5fe51 100644 --- a/packages/client/src/components/SmartBanner/index.js +++ b/packages/client/src/components/SmartBanner/index.js @@ -2,6 +2,7 @@ import React, { useState, useEffect } from "react"; import styled from "styled-components"; import { isMobile, isIOS } from "react-device-detect"; import { inject, observer } from "mobx-react"; +import { useLocation } from "react-router-dom"; import SmartBanner from "react-smartbanner"; import "./main.css"; @@ -10,14 +11,9 @@ const Wrapper = styled.div` `; const ReactSmartBanner = (props) => { - const { - t, - ready, - isBannerVisible, - setIsBannerVisible, - currentProductId, - } = props; + const { t, ready, isBannerVisible, setIsBannerVisible } = props; const force = isIOS ? "ios" : "android"; + const location = useLocation(); const [isDocuments, setIsDocuments] = useState(false); @@ -43,12 +39,12 @@ const ReactSmartBanner = (props) => { }, []); useEffect(() => { - if (window.location.pathname.toLowerCase().includes("files")) { + if (window.location.pathname.toLowerCase().includes("rooms")) { setIsDocuments(true); } else { setIsDocuments(false); } - }, [currentProductId]); + }, [location]); const storeText = { ios: t("SmartBanner:AppStore"), @@ -99,10 +95,9 @@ const ReactSmartBanner = (props) => { ); }; -export default inject(({ auth, bannerStore }) => { +export default inject(({ bannerStore }) => { return { isBannerVisible: bannerStore.isBannerVisible, setIsBannerVisible: bannerStore.setIsBannerVisible, - currentProductId: auth.settingsStore.currentProductId, }; })(observer(ReactSmartBanner)); diff --git a/packages/client/src/components/SmartBanner/main.css b/packages/client/src/components/SmartBanner/main.css index fc80dac710..9cebd8aa6d 100644 --- a/packages/client/src/components/SmartBanner/main.css +++ b/packages/client/src/components/SmartBanner/main.css @@ -114,7 +114,6 @@ } .smartbanner-ios { background: #f2f2f2; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); line-height: 80px; } .smartbanner-ios .smartbanner-close { diff --git a/packages/client/src/components/dialogs/LogoutAllConnectionDialog/index.js b/packages/client/src/components/dialogs/LogoutAllConnectionDialog/index.js new file mode 100644 index 0000000000..8e9fa637b6 --- /dev/null +++ b/packages/client/src/components/dialogs/LogoutAllConnectionDialog/index.js @@ -0,0 +1,68 @@ +import React, { useState } from "react"; +import { useTranslation } from "react-i18next"; +import ModalDialog from "@docspace/components/modal-dialog"; +import Checkbox from "@docspace/components/checkbox"; +import Button from "@docspace/components/button"; +import Box from "@docspace/components/box"; +import Text from "@docspace/components/text"; +import ModalDialogContainer from "../ModalDialogContainer"; + +const LogoutAllConnectionDialog = ({ + visible, + onClose, + onRemoveAllSessions, + loading, + onRemoveAllExceptThis, +}) => { + const { t } = useTranslation(["Profile", "Common"]); + const [isChecked, setIsChecked] = useState(false); + + const onChangeCheckbox = () => { + setIsChecked((prev) => !prev); + }; + + return ( + + + {t("Profile:LogoutAllActiveConnections")} + + + {t("Profile:LogoutDescription")} + + {t("Profile:DescriptionForSecurity")} + + + + {t("Profile:ChangePasswordAfterLoggingOut")} + + + +