Исправление работы доставки, прочтения сообщений

.gitignore

@@ -87,13 +87,3 @@ postgres_data/
 tmp/
 
 *.txt
-
-# Android / Kotlin Mobile
-client-mobile/.gradle/
-client-mobile/.idea/
-client-mobile/.run/
-client-mobile/build/
-client-mobile/.cxx/
-client-mobile/local.properties
-client-mobile/*.iml
-client-mobile/.kotlin/

backend/Tests/Conversations/UnitTests/Chats/CreateChatCommandHandlerTests.cs

@@ -7,8 +7,9 @@ using FluentAssertions;
 using NSubstitute;
 using Xunit;
 using Knot.Shared.Kernel;
-using Knot.Contracts.Conversations.Domain;
+using Knot.Modules.Conversations.Domain;
-using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Modules.Messaging.Domain;
+using Knot.Modules.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.Chats.Create;
 
 namespace Knot.Modules.Conversations.UnitTests.Chats;

backend/Tests/Conversations/UnitTests/Chats/GetChatsQueryHandlerTests.cs

@@ -7,10 +7,9 @@ using FluentAssertions;
 using NSubstitute;
 using Xunit;
 using Knot.Shared.Kernel;
-using Knot.Contracts.Conversations.Domain;
+using Knot.Modules.Conversations.Domain;
-using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Modules.Messaging.Domain;
-using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Modules.Conversations.Application.Abstractions;
-using Knot.Contracts.Messaging.Domain;
 using Knot.Modules.Conversations.Application.Chats.GetChats;
 using Knot.Modules.Conversations.Application.DTOs;
 

backend/Tests/Conversations/UnitTests/GetOrCreateFavoritesCommandHandlerTests.cs

@@ -1,8 +1,9 @@
 using FluentAssertions;
 using NSubstitute;
-using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Modules.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.Chats.GetOrCreateFavorites;
-using Knot.Contracts.Conversations.Domain;
+using Knot.Modules.Conversations.Domain;
+using Knot.Modules.Messaging.Domain;
 using Knot.Shared.Kernel;
 using Xunit;
 

backend/Tests/Conversations/UnitTests/Knot.Modules.Conversations.UnitTests.csproj

@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Contracts\Conversations\Knot.Contracts.Conversations.csproj" />
+    <ProjectReference Include="..\..\..\src\Modules\Chats\Knot.Modules.Conversations.csproj" />
     <ProjectReference Include="..\..\..\src\Modules\Messaging\Knot.Modules.Messaging.csproj" />
     <ProjectReference Include="..\..\..\src\Modules\Conversations\Knot.Modules.Conversations.csproj" />
       <ProjectReference Include="..\..\..\src\Modules\Settings\Knot.Modules.Settings.csproj" />

backend/Tests/Conversations/UnitTests/Messages/SendMessageCommandHandlerTests.cs

@@ -5,17 +5,15 @@ using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
 using MediatR;
-using Microsoft.Extensions.Logging;
 using NSubstitute;
 using Xunit;
-using Knot.Contracts.Conversations.Application.Abstractions;
-using Knot.Contracts.Conversations.Domain;
-using Knot.Contracts.Messaging.Application.Abstractions;
-using Knot.Contracts.Messaging.Domain;
 using Knot.Shared.Kernel;
+using Knot.Modules.Conversations.Domain;
+using Knot.Modules.Messaging.Domain;
+using Knot.Modules.Conversations.Application.Abstractions;
 using Knot.Modules.Conversations.Application.Messages.Send;
-using Knot.Contracts.Settings.Application.Abstractions;
+using Knot.Modules.Settings.Application.Settings.Abstractions;
-using Knot.Contracts.Settings.Application.DTOs;
+using Knot.Modules.Settings.Application.Settings.DTOs;
 
 namespace Knot.Modules.Conversations.UnitTests.Messages;
 
@@ -26,8 +24,6 @@ public class SendMessageCommandHandlerTests
     private readonly IChatsUnitOfWork _unitOfWork;
     private readonly IMediator _mediator;
     private readonly IMessagesSettings _messagesSettings;
-    private readonly IIdempotencyStore _idempotencyStore;
-    private readonly ILogger<SendMessageCommandHandler> _logger;
     private readonly SendMessageCommandHandler _handler;
 
     public SendMessageCommandHandlerTests()
@@ -37,13 +33,11 @@ public class SendMessageCommandHandlerTests
         _unitOfWork = Substitute.For<IChatsUnitOfWork>();
         _mediator = Substitute.For<IMediator>();
         _messagesSettings = Substitute.For<IMessagesSettings>();
-        _idempotencyStore = Substitute.For<IIdempotencyStore>();
-        _logger = Substitute.For<ILogger<SendMessageCommandHandler>>();
         
-        var config = new MessagesConfig();
+        var config = new Knot.Modules.Settings.Application.Settings.DTOs.MessagesConfig();
         _messagesSettings.Current.Returns(config);
 
-        _handler = new SendMessageCommandHandler(_chatRepository, _messageRepository, _unitOfWork, _mediator, _messagesSettings, _idempotencyStore, _logger);
+        _handler = new SendMessageCommandHandler(_chatRepository, _messageRepository, _unitOfWork, _mediator, _messagesSettings);
     }
 
     [Fact]

backend/src/Contracts/Conversations/Application/Abstractions/IIdempotencyStore.cs

@@ -1,17 +0,0 @@
-namespace Knot.Contracts.Conversations.Application.Abstractions;
-
-/// <summary>
-/// Хранилище для обеспечения идемпотентности операций.
-/// Если ключ уже существует — возвращает сохранённый результат без повторного выполнения.
-/// </summary>
-public interface IIdempotencyStore
-{
-    /// <summary>
-    /// Возвращает сохранённый результат по ключу или выполняет factory, сохраняет и возвращает результат.
-    /// </summary>
-    Task<T> GetOrCreateAsync<T>(
-        string key,
-        Func<CancellationToken, Task<T>> factory,
-        TimeSpan? expiration = null,
-        CancellationToken cancellationToken = default);
-}

backend/src/Contracts/Messaging/Application/Abstractions/IMessageRepository.cs

@@ -13,6 +13,7 @@ public interface IMessageRepository
 
     Task<List<Message>> GetChatMessagesCursorAsync(Guid chatId, DateTime? cursor, long? sequenceId, int limit, CancellationToken cancellationToken);
     Task<List<Message>> GetChatMessagesAroundAsync(Guid chatId, long sequenceId, int limit, CancellationToken cancellationToken);
+    Task<List<Message>> GetChatMessagesAfterAsync(Guid chatId, long sequenceId, int limit, CancellationToken cancellationToken);
     Task<Message?> GetLastStoryMessageAsync(Guid chatId, Guid storyId, CancellationToken cancellationToken);
 
     Task UpdateAsync(Message message, CancellationToken cancellationToken);

backend/src/Contracts/Messaging/Domain/Message.cs

@@ -23,6 +23,9 @@ public abstract class Message : AggregateRoot<Guid>
     protected List<DeletedMessage> _deletedFor = new();
     public IReadOnlyCollection<DeletedMessage> DeletedFor => _deletedFor.AsReadOnly();
 
+    protected List<Guid> _readByUsers = new();
+    public IReadOnlyCollection<Guid> ReadByUsers => _readByUsers.AsReadOnly();
+
     protected Message() : base(Guid.Empty) { }
 
     protected Message(Guid id, Guid chatId, Guid senderId, Guid? replyToId, Guid? forwardedFromId, DateTime createdAt, bool isImported)
@@ -53,4 +56,14 @@ public abstract class Message : AggregateRoot<Guid>
         if (!_deletedFor.Exists(x => x.UserId == userId))
             _deletedFor.Add(new DeletedMessage(Id, userId));
     }
+
+    public void MarkAsRead(Guid userId)
+    {
+        if (!_readByUsers.Contains(userId))
+        {
+            _readByUsers.Add(userId);
+        }
+    }
+
+    public bool IsReadBy(Guid userId) => _readByUsers.Contains(userId);
 }

backend/src/Host/Program.cs

@@ -32,11 +32,11 @@ using Knot.Modules.TelegramImport.Presentation.Endpoints;
 using Knot.Modules.WebRtc;
 using Knot.Modules.WebRtc.Presentation.Endpoints;
 using Knot.Shared.Infrastructure;
-using MediatR;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
+using MediatR;
 
 
 

backend/src/Modules/Conversations/Application/Messages/GetMessages/GetMessagesQuery.cs

@@ -13,7 +13,7 @@ using MediatR;
 
 namespace Knot.Modules.Conversations.Application.Messages.GetMessages;
 
-public record GetMessagesQuery(Guid UserId, Guid ChatId, string? Cursor, long? Pivot = null, int? Limit = null) : IQuery<List<MessageDetailDto>>;
+public record GetMessagesQuery(Guid UserId, Guid ChatId, string? Cursor, long? Pivot = null, long? AfterSequenceId = null, int? Limit = null) : IQuery<List<MessageDetailDto>>;
 
 internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery, List<MessageDetailDto>>
 {
@@ -41,7 +41,12 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
         List<Message> messages;
         int queryLimit = request.Limit ?? ChatConstants.DefaultMessageQueryLimit;
 
-        if (request.Pivot.HasValue)
+        if (request.AfterSequenceId.HasValue)
+        {
+            // Получаем только сообщения ПОСЛЕ указанного sequenceId (для синхронизации)
+            messages = await _messageRepository.GetChatMessagesAfterAsync(request.ChatId, request.AfterSequenceId.Value, queryLimit, cancellationToken);
+        }
+        else if (request.Pivot.HasValue)
         {
             messages = await _messageRepository.GetChatMessagesAroundAsync(request.ChatId, request.Pivot.Value, queryLimit, cancellationToken);
         }
@@ -154,7 +159,7 @@ internal sealed class GetMessagesQueryHandler : IQueryHandler<GetMessagesQuery,
                 (message as StoryMessage)?.StoryMediaType,
                 (message as MediaMessage)?.Media.Select(m => new MediaDto(m.Id, m.Type, m.Url, m.Filename, m.Size, m.Duration)).ToList() ?? new List<MediaDto>(),
                 sender != null ? new MessageSenderDto(sender.Id, sender.Username, sender.DisplayName, sender.Avatar) : new MessageSenderDto(message.SenderId, "unknown", "Unknown", null),
-                new List<ReadByDto>(), // ReadBy not implemented in this detailed view yet
+                message.ReadByUsers.Select(id => new ReadByDto(id)).ToList(),
                 reactions?.Select(r =>
                 {
                     senders.TryGetValue(r.UserId, out var ru);

backend/src/Modules/Conversations/Application/Messages/Read/ReadMessagesCommandHandler.cs

@@ -1,7 +1,8 @@
-using MediatR;
-using Knot.Contracts.Conversations.Domain;
-using Knot.Shared.Kernel;
 using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Shared.Kernel;
+using MediatR;
 
 namespace Knot.Modules.Conversations.Application.Messages.Read;
 
@@ -11,11 +12,13 @@ public sealed class ReadMessagesCommandHandler : ICommandHandler<ReadMessagesCom
 {
     private readonly IChatRepository _chatRepository;
     private readonly IChatsUnitOfWork _unitOfWork;
+    private readonly IMessageRepository _messageRepository;
 
-    public ReadMessagesCommandHandler(IChatRepository chatRepository, IChatsUnitOfWork unitOfWork)
+    public ReadMessagesCommandHandler(IChatRepository chatRepository, IChatsUnitOfWork unitOfWork, IMessageRepository messageRepository)
     {
         _chatRepository = chatRepository;
         _unitOfWork = unitOfWork;
+        _messageRepository = messageRepository;
     }
 
     public async Task<Result> Handle(ReadMessagesCommand request, CancellationToken cancellationToken)
@@ -28,6 +31,23 @@ public sealed class ReadMessagesCommandHandler : ICommandHandler<ReadMessagesCom
 
         member.UpdateReadCursor(request.LastReadMessageId, request.LastReadSequenceId);
 
+        // Обновляем ReadByUsers для всех сообщений до LastReadSequenceId
+        var messages = await _messageRepository.GetChatMessagesAfterAsync(
+            request.ChatId,
+            0,
+            1000,
+            cancellationToken);
+
+        foreach (var message in messages)
+        {
+            if (message.SequenceId <= request.LastReadSequenceId &&
+                message.SenderId != request.UserId &&
+                !message.IsReadBy(request.UserId))
+            {
+                message.MarkAsRead(request.UserId);
+            }
+        }
+
         await _unitOfWork.SaveChangesAsync(cancellationToken);
 
         return Result.Success();

backend/src/Modules/Conversations/Application/Messages/SearchMessages/SearchMessagesQuery.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
 using Knot.Modules.Conversations.Application.DTOs;
-using Knot.Contracts.Conversations.Domain;
 using Knot.Shared.Kernel;
 using MediatR;
 
@@ -41,7 +41,8 @@ internal sealed class SearchMessagesQueryHandler : IQueryHandler<SearchMessagesQ
         var allReactions = await _reactionRepository.GetReactionsForMessagesAsync(messageIds, cancellationToken);
         var reactionsByMessage = allReactions.GroupBy(r => r.MessageId).ToDictionary(g => g.Key, g => g.ToList());
 
-        var result = messages.Select(message => {
+        var result = messages.Select(message =>
+        {
             var textMessage = message as TextMessage;
             var mediaMessage = message as MediaMessage;
             var storyMessage = message as StoryMessage;
@@ -66,7 +67,7 @@ internal sealed class SearchMessagesQueryHandler : IQueryHandler<SearchMessagesQ
                 mediaMessage?.Media.Select(media => new MediaDto(media.Id, media.Type, media.Url, media.Filename, media.Size)).ToList() ?? new List<MediaDto>(),
                 senders.TryGetValue(message.SenderId, out var senderUser) ? new MessageSenderDto(senderUser.Id, senderUser.Username, senderUser.DisplayName, senderUser.Avatar) : new MessageSenderDto(message.SenderId, "unknown", "Unknown", null),
                 reactionsByMessage.TryGetValue(message.Id, out var mr) ? mr.Select(reaction => new SimpleReactionDto(reaction.UserId, reaction.Emoji)).ToList() : new List<SimpleReactionDto>(),
-                new List<ReadByDto>()
+                message.ReadByUsers.Select(id => new ReadByDto(id)).ToList()
             );
         }).ToList();
 

backend/src/Modules/Conversations/Application/Messages/Send/SendMessageCommandHandler.cs

@@ -4,7 +4,6 @@ using Knot.Contracts.Messaging.Application.Abstractions;
 using Knot.Contracts.Messaging.Domain;
 using Knot.Contracts.Settings.Application.Abstractions;
 using Knot.Shared.Kernel;
-using Microsoft.Extensions.Logging;
 
 namespace Knot.Modules.Conversations.Application.Messages.Send;
 
@@ -31,8 +30,7 @@ public sealed record SendMessageCommand(
     DateTime? PollExpiresAt = null,
     string? CallType = null,
     string? CallStatus = null,
-    int? Duration = null,
+    int? Duration = null) : ICommand<Guid>;
-    string? IdempotencyKey = null) : ICommand<Guid>;
 
 public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageCommand, Guid>
 {
@@ -41,74 +39,64 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
     private readonly IChatsUnitOfWork _unitOfWork;
     private readonly MediatR.IMediator _mediator;
     private readonly IMessagesSettings _messagesSettings;
-    private readonly IIdempotencyStore _idempotencyStore;
-    private readonly ILogger<SendMessageCommandHandler> _logger;
 
     public SendMessageCommandHandler(
         IChatRepository chatRepository,
         IMessageRepository messageRepository,
         IChatsUnitOfWork unitOfWork,
         MediatR.IMediator mediator,
-        IMessagesSettings messagesSettings,
+        IMessagesSettings messagesSettings)
-        IIdempotencyStore idempotencyStore,
-        ILogger<SendMessageCommandHandler> logger)
     {
         _chatRepository = chatRepository;
         _messageRepository = messageRepository;
         _unitOfWork = unitOfWork;
         _mediator = mediator;
         _messagesSettings = messagesSettings;
-        _idempotencyStore = idempotencyStore;
-        _logger = logger;
     }
 
     public async Task<Result<Guid>> Handle(SendMessageCommand request, CancellationToken cancellationToken)
     {
-        if (!string.IsNullOrWhiteSpace(request.IdempotencyKey))
+        // 1. ��������� ������������� ����
-        {
-            var key = $"send_msg:{request.ChatId}:{request.IdempotencyKey}";
-            return await _idempotencyStore.GetOrCreateAsync(
-                key,
-                factory: ct => ExecuteAsync(request, ct),
-                cancellationToken: cancellationToken);
-        }
-
-        return await ExecuteAsync(request, cancellationToken);
-    }
-
-    private async Task<Result<Guid>> ExecuteAsync(SendMessageCommand request, CancellationToken cancellationToken)
-    {
-        // 1. Проверка существования чата
         var chat = await _chatRepository.GetByIdAsync(request.ChatId, cancellationToken);
         if (chat is null)
         {
             return Result.Failure<Guid>(ChatErrors.ChatsNotFound);
         }
 
-        // 2. Проверка, является ли отправитель участником чата
+        // 2. ���������, �������� �� ����������� ����������
         if (!chat.Members.Any(m => m.UserId == request.SenderId))
         {
             return Result.Failure<Guid>(ChatErrors.ChatsForbidden);
         }
 
-        // 3. Создание сообщения
+        // 3. ������� ���������
         Message message;
         if (request.Type == "story_reply" || request.Type == "story_reaction")
         {
             if (!_messagesSettings.Current.AllowMedia) return Result.Failure<Guid>(ChatErrors.MediaDisabled);
 
+
             var parsedStoryMediaType = Enum.TryParse<MediaType>(request.StoryMediaType, true, out var sTypeEnum) ? sTypeEnum : MediaType.Image;
             message = new StoryMessage(
                 Guid.NewGuid(),
+
                 request.ChatId,
+
                 request.SenderId,
+
                 request.StoryId ?? Guid.Empty,
+
                 request.StoryMediaUrl ?? string.Empty,
                 request.StoryMediaType,
+
                 request.Content,
+
                 request.ReplyToId,
+
                 request.ForwardedFromId,
+
                 DateTime.UtcNow,
+
                 false);
         }
         else if (request.Attachments != null && request.Attachments.Any())
@@ -118,17 +106,26 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
             var firstAtt = request.Attachments.First();
             var parsedType = Enum.TryParse<MediaType>(firstAtt.Type, true, out var mTypeEnum) ? mTypeEnum : MediaType.File;
 
+
             message = new MediaMessage(
                 Guid.NewGuid(),
+
                 request.ChatId,
+
                 request.SenderId,
                 parsedType,
+
                 request.Content,
+
                 request.ReplyToId,
+
                 request.ForwardedFromId,
+
                 DateTime.UtcNow,
+
                 false);
 
+
             foreach (var att in request.Attachments)
             {
                 var pType = Enum.TryParse<MediaType>(att.Type, true, out var tEnum) ? tEnum : MediaType.File;
@@ -170,33 +167,46 @@ public sealed class SendMessageCommandHandler : ICommandHandler<SendMessageComma
         {
             message = new TextMessage(
                 Guid.NewGuid(),
+
                 request.ChatId,
+
                 request.SenderId,
+
                 request.Content ?? string.Empty,
+
                 request.ReplyToId,
+
                 request.Quote,
+
                 request.ForwardedFromId,
+
                 DateTime.UtcNow,
+
                 false);
         }
 
-        // 4. Обновление High-Water Mark
+        // 4. ������������������ ��������� High-Water Mark
         chat.IncrementSequenceId();
         message.SetSequenceId(chat.LastMessageSequenceId);
 
         var senderMember = chat.Members.First(m => m.UserId == request.SenderId);
         senderMember.UpdateReadCursor(message.Id, message.SequenceId);
         senderMember.UpdateDeliveredCursor(message.Id);
+        message.MarkAsRead(request.SenderId); // Отправитель всегда "прочитал" своё сообщение
 
-        // 5. Сохранение
+        // 5. ���������
         _messageRepository.Add(message);
         await _unitOfWork.SaveChangesAsync(cancellationToken);
 
         await _mediator.Publish(new MessageSentDomainEvent(
             message.Id,
+
             message.ChatId,
+
             message.SenderId,
+
             message.Content),
+
             cancellationToken);
 
         return Result.Success(message.Id);

backend/src/Modules/Conversations/DependencyInjection.cs

@@ -1,8 +1,6 @@
 using Knot.Contracts.Conversations.Application.Abstractions;
-using Knot.Contracts.Conversations.Domain;
 using Knot.Contracts.Conversations.Infrastructure.Persistence;
-using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
-using Knot.Modules.Conversations.Infrastructure.Idempotency;
 using Knot.Modules.Conversations.Infrastructure.Persistence;
 using Knot.Modules.Conversations.Infrastructure.Persistence.Mongo;
 using Knot.Modules.Conversations.Infrastructure.Services;
@@ -10,6 +8,7 @@ using Knot.Shared.Kernel;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Knot.Contracts.Messaging.Application.Abstractions;
 
 namespace Knot.Modules.Conversations;
 
@@ -44,9 +43,6 @@ public static class DependencyInjection
         services.AddScoped<Knot.Contracts.Conversations.Abstractions.IUserStatusService, UserStatusService>();
         services.AddScoped<Knot.Contracts.Conversations.Abstractions.IUserDeleterService, UserDeleterService>();
         
-        services.AddMemoryCache();
-        services.AddSingleton<Knot.Contracts.Conversations.Application.Abstractions.IIdempotencyStore, MemoryCacheIdempotencyStore>();
-
         return services;
     }
 }

backend/src/Modules/Conversations/Infrastructure/Idempotency/MemoryCacheIdempotencyStore.cs

@@ -1,54 +0,0 @@
-using Knot.Contracts.Conversations.Application.Abstractions;
-using Microsoft.Extensions.Caching.Memory;
-
-namespace Knot.Modules.Conversations.Infrastructure.Idempotency;
-
-/// <summary>
-/// Реализация хранилища идемпотентности на основе IMemoryCache.
-/// Использует семафор для предотвращения race condition при одновременных запросах с одинаковым ключом.
-/// </summary>
-public sealed class MemoryCacheIdempotencyStore : IIdempotencyStore
-{
-    private readonly IMemoryCache _cache;
-    private readonly SemaphoreSlim _semaphore = new(1, 1);
-
-    public MemoryCacheIdempotencyStore(IMemoryCache cache)
-    {
-        _cache = cache;
-    }
-
-    public async Task<T> GetOrCreateAsync<T>(
-        string key,
-        Func<CancellationToken, Task<T>> factory,
-        TimeSpan? expiration = null,
-        CancellationToken cancellationToken = default)
-    {
-        if (_cache.TryGetValue(key, out T? cachedValue) && cachedValue is not null)
-        {
-            return cachedValue;
-        }
-
-        await _semaphore.WaitAsync(cancellationToken);
-        try
-        {
-            // Double-check после получения блокировки
-            if (_cache.TryGetValue(key, out cachedValue) && cachedValue is not null)
-            {
-                return cachedValue;
-            }
-
-            var value = await factory(cancellationToken);
-
-            var options = new MemoryCacheEntryOptions()
-                .SetAbsoluteExpiration(expiration ?? TimeSpan.FromHours(24))
-                .SetPriority(CacheItemPriority.Normal);
-
-            _cache.Set(key, value, options);
-            return value;
-        }
-        finally
-        {
-            _semaphore.Release();
-        }
-    }
-}

backend/src/Modules/Conversations/Infrastructure/SignalR/ChatHub.cs

@@ -1,26 +1,26 @@
 using System.Collections.Concurrent;
 using System.Security.Claims;
+using Knot.Contracts.Auth.Application.Abstractions;
+using Knot.Contracts.Auth.Domain;
+using Knot.Contracts.Conversations.Application.Abstractions;
+using Knot.Contracts.Conversations.Domain;
+using Knot.Contracts.Messaging.Application.Abstractions;
+using Knot.Contracts.Messaging.Domain;
+using Knot.Modules.Conversations.Application.DTOs;
+using Knot.Modules.Conversations.Application.Messages.Delete;
+using Knot.Modules.Conversations.Application.Messages.Edit;
+using Knot.Modules.Conversations.Application.Messages.Pin;
+using Knot.Modules.Conversations.Application.Messages.React;
+using Knot.Modules.Conversations.Application.Messages.Read;
+using Knot.Modules.Conversations.Application.Messages.Send;
+using Knot.Modules.Conversations.Application.Messages.Unpin;
+using Knot.Modules.Conversations.Application.Messages.Vote;
+using Knot.Shared.Kernel;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
-using Knot.Modules.Conversations.Application.Messages.Send;
-using Knot.Modules.Conversations.Application.Messages.Read;
-using Knot.Modules.Conversations.Application.Messages.Delete;
-using Knot.Modules.Conversations.Application.Messages.React;
-using Knot.Contracts.Conversations.Domain;
-using Knot.Shared.Kernel;
 using Microsoft.Extensions.Caching.Memory;
-using Knot.Contracts.Auth.Domain;
+using Microsoft.Extensions.Logging;
-using Knot.Contracts.Auth.Application.Abstractions;
-using Knot.Modules.Conversations.Application.Messages.Pin;
-using Knot.Modules.Conversations.Application.Messages.Unpin;
-using Knot.Modules.Conversations.Application.Messages.Vote;
-using Knot.Modules.Conversations.Application.Messages.Edit;
-using Knot.Modules.Conversations.Application.DTOs;
-using Knot.Contracts.Messaging.Application.Abstractions;
-using Knot.Contracts.Messaging.Domain;
-using Knot.Contracts.Conversations.Application.Abstractions;
 
 namespace Knot.Modules.Conversations.Infrastructure.SignalR;
 
@@ -158,6 +158,7 @@ public sealed class ChatHub : Hub
             await _sender.Send(command);
         }
 
+        // Отправляем событие всем в чате о том, что пользователь прочитал сообщения
         await Clients.Group(request.ChatId.ToString()).SendAsync("messages_read", new
         {
             ChatId = request.ChatId.ToString(),

backend/src/Modules/Conversations/Knot.Modules.Conversations.csproj

@@ -37,7 +37,6 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-    <InternalsVisibleTo Include="Knot.Modules.Conversations.UnitTests" />
   </ItemGroup>
 
 </Project>

backend/src/Modules/Conversations/Presentation/Endpoints/MessagesEndpoints.cs

@@ -19,9 +19,17 @@ public static class MessagesEndpoints
     {
         var group = app.MapGroup("api/messages").RequireAuthorization();
 
-        group.MapGet("chat/{chatId:guid}", async ([FromRoute] Guid chatId, [FromQuery] string? cursor, ISender sender, IUserContext userContext, CancellationToken ct) =>
+        group.MapGet("chat/{chatId:guid}", async (
+            [FromRoute] Guid chatId,
+            [FromQuery] string? cursor,
+            [FromQuery] long? afterSequenceId,
+            [FromQuery] long? pivot,
+            [FromQuery] int? limit,
+            ISender sender,
+            IUserContext userContext,
+            CancellationToken ct) =>
         {
-            var result = await sender.Send(new GetMessagesQuery(userContext.UserId, chatId, cursor), ct);
+            var result = await sender.Send(new GetMessagesQuery(userContext.UserId, chatId, cursor, pivot, afterSequenceId, limit), ct);
             return result.IsSuccess ? Results.Ok(result.Value) : Results.BadRequest(result.Error.Description);
         });
 
@@ -55,14 +63,11 @@ public static class MessagesEndpoints
             return result.IsSuccess ? Results.Ok(result.Value) : Results.BadRequest(result.Error.Description);
         });
 
-        group.MapPost("chat/{chatId:guid}", async ([FromRoute] Guid chatId, [FromBody] SendMessageRequest request, ISender sender, IUserContext userContext, HttpRequest httpRequest, CancellationToken ct) =>
+        group.MapPost("chat/{chatId:guid}", async ([FromRoute] Guid chatId, [FromBody] SendMessageRequest request, ISender sender, IUserContext userContext, CancellationToken ct) =>
         {
             var attachments = request.Attachments?.Select(a =>
                 new AttachmentRequest(a.Type, a.Url, a.FileName, a.FileSize)).ToList();
 
-            // Получаем idempotency ключ из заголовка
-            httpRequest.Headers.TryGetValue("X-Idempotency-Key", out var idempotencyKey);
-
             var command = new SendMessageCommand(
                 chatId,
                 userContext.UserId,
@@ -71,8 +76,7 @@ public static class MessagesEndpoints
                 attachments,
                 request.ReplyToId,
                 request.Quote,
-                request.ForwardedFromId,
+                request.ForwardedFromId);
-                IdempotencyKey: idempotencyKey.ToString());
 
             var result = await sender.Send(command, ct);
             return result.IsSuccess ? Results.Ok(result.Value) : Results.BadRequest(result.Error.Description);

backend/src/Modules/Messaging/Domain/Message.cs

@@ -42,6 +42,10 @@ public abstract class Message : AggregateRoot<Guid>
     protected List<DeletedMessage> _deletedFor = new();
     public IReadOnlyCollection<DeletedMessage> DeletedFor => _deletedFor.AsReadOnly();
 
+    // ================== Прочитано ==================
+    protected List<Guid> _readByUsers = new();
+    public IReadOnlyCollection<Guid> ReadByUsers => _readByUsers.AsReadOnly();
+
     // ================== Инфраструктурный конструктор EF ==================
     protected Message() : base(Guid.Empty) { }
 
@@ -89,6 +93,16 @@ public abstract class Message : AggregateRoot<Guid>
             _deletedFor.Add(new DeletedMessage(Id, userId));
         }
     }
+
+    public void MarkAsRead(Guid userId)
+    {
+        if (!_readByUsers.Contains(userId))
+        {
+            _readByUsers.Add(userId);
+        }
+    }
+
+    public bool IsReadBy(Guid userId) => _readByUsers.Contains(userId);
 }
 
 

backend/src/Modules/Messaging/Infrastructure/Handlers/MessageSentDomainEventHandler.cs

@@ -84,7 +84,7 @@ public sealed class MessageSentDomainEventHandler : INotificationHandler<Message
                 size = m.Size
             }).ToList() ?? (object)Array.Empty<object>(),
             sender = senderObj,
-            readBy = new List<object>(),
+            readBy = message.ReadByUsers.Select(id => new { id }).ToList(),
             storyId = (message as StoryMessage)?.StoryId,
             storyMediaUrl = (message as StoryMessage)?.StoryMediaUrl,
             storyMediaType = (message as StoryMessage)?.StoryMediaType,

backend/src/Modules/Messaging/Infrastructure/Persistence/MessageRepository.cs

@@ -95,6 +95,20 @@ public sealed class MessageRepository : IMessageRepository
             .ToListAsync(cancellationToken);
     }
 
+    public async Task<List<Message>> GetChatMessagesAfterAsync(Guid chatId, long sequenceId, int limit, CancellationToken cancellationToken)
+    {
+        var builder = Builders<Message>.Filter;
+        var filter = builder.And(
+            builder.Eq(m => m.ChatId, chatId),
+            builder.Gt(m => m.SequenceId, sequenceId)
+        );
+
+        return await _messages.Find(filter)
+            .SortBy(m => m.SequenceId)
+            .Limit(limit)
+            .ToListAsync(cancellationToken);
+    }
+
     public async Task<List<Message>> GetChatMessagesAroundAsync(Guid chatId, long sequenceId, int limit, CancellationToken cancellationToken)
     {
         var builder = Builders<Message>.Filter;

client-mobile/.gitignore

@@ -1,44 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-migrate_working_dir/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release

client-mobile/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Tue Apr 14 00:27:15 MSK 2026
+gradle.version=8.5

client-mobile/.gradle/config.properties

@@ -0,0 +1,2 @@
+#Tue Apr 14 00:13:58 MSK 2026
+java.home=C\:\\Program Files\\Android\\Android Studio\\jbr

client-mobile/.metadata

@@ -1,20 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: 5f120583730cedfc49a0e0872e3e1ac7a0a3c8eb
-  channel: stable
-
-project_type: app
-
-# Tracks metadata for the flutter migrate command
-migration:
-  platforms:
-    - platform: root
-      create_revision: 5f120583730cedfc49a0e0872e3e1ac7a0a3c8eb
-      base_revision: 5f120583730cedfc49a0e0872e3e1ac7a0a3c8eb
-    - platform: android
-      create_revision: 5f120583730cedfc49a0e0872e3e1ac7a0a3c8eb
-      base_revision: 5f120583730cedfc49a0e0872e3e1ac7a0a3c8eb

client-mobile/GETTING_STARTED.md

@@ -1,125 +0,0 @@
-# Инструкция по запуску проекта
-
-## Предварительные требования
-
-1. **Flutter SDK** (версия 3.0.0 или выше)
-   - Установите Flutter: https://docs.flutter.dev/get-started/install
-   - Проверьте установку: `flutter doctor`
-
-2. **Android Studio** или **VS Code** с Flutter плагином
-
-3. **Android SDK** (для сборки под Android)
-   - MinSDK: 21
-   - TargetSDK: 34
-   - CompileSDK: 34
-
-## Установка зависимостей
-
-```bash
-cd client-mobile
-flutter pub get
-```
-
-## Генерация кода
-
-Проект использует code generation для:
-- Freezed (immutable модели)
-- AutoRoute (навигация)
-- Isar (база данных)
-
-```bash
-dart run build_runner build --delete-conflicting-outputs
-```
-
-Для автоматической генерации при изменениях:
-```bash
-dart run build_runner watch --delete-conflicting-outputs
-```
-
-## Запуск приложения
-
-### Android
-```bash
-flutter run
-```
-
-### Сборка релиза
-```bash
-flutter build apk --release
-```
-
-## Структура проекта
-
-```
-lib/
-├── core/                    # Общие компоненты
-│   ├── constants/           # Константы приложения
-│   ├── errors/              # Обработка ошибок
-│   ├── network/             # Сетевой клиент (Dio)
-│   └── theme/               # Темы оформления
-├── features/                # Функциональные модули
-│   ├── auth/                # Аутентификация
-│   │   ├── data/            # Data layer
-│   │   ├── domain/          # Domain layer
-│   │   └── presentation/    # UI layer (BLoC, страницы)
-│   ├── chat/                # Чаты
-│   ├── profile/             # Профиль
-│   └── settings/            # Настройки
-└── internal/                # Внутренняя конфигурация
-    ├── di/                  # Dependency Injection (GetIt)
-    └── router/              # Навигация
-```
-
-## Архитектура
-
-Проект следует принципам **Clean Architecture**:
-
-- **Domain Layer**: Бизнес-логика, entities, use cases, repository interfaces
-- **Data Layer**: Реализации репозиториев, datasources, модели
-- **Presentation Layer**: UI, BLoC, страницы, виджеты
-
-## State Management
-
-Используется **flutter_bloc** для управления состоянием:
-- Каждый feature имеет свой BLoC
-- События и состояния генерируются через Freezed
-- DI через GetIt
-
-## Навигация
-
-Используется **auto_route** для декларативной навигации.
-
-## База данных
-
-Используется **Isar** - быстрая NoSQL база данных для Flutter.
-
-## Сетевые запросы
-
-- **Dio** для REST API запросов
-- **SignalR** для real-time обновлений
-
-## Тестирование
-
-```bash
-flutter test
-```
-
-## Полезные команды
-
-```bash
-# Анализ кода
-flutter analyze
-
-# Форматирование
-dart format .
-
-# Очистка
-flutter clean
-
-# Проверка зависимостей
-flutter pub outdated
-```
-
-## Контакты
-
-Для вопросов и предложений обращайтесь к команде разработки.

client-mobile/README.md

@@ -1,51 +0,0 @@
-# Messenger App
-
-A Telegram-like mobile messenger application built with Flutter using Clean Architecture.
-
-## Architecture
-
-This project follows Clean Architecture principles with the following structure:
-
-```
-lib/
-├── core/               # Core utilities, network, errors, theme
-├── features/           # Feature modules (auth, chat, profile, settings)
-│   └── [feature]/
-│       ├── data/       # Data layer (repositories, datasources)
-│       ├── domain/     # Domain layer (entities, usecases, repository interfaces)
-│       └── presentation/ # UI layer (bloc, pages, widgets)
-└── internal/           # App configuration, DI, routing
-```
-
-## Dependencies
-
-- **State Management**: flutter_bloc, bloc
-- **Architecture & DI**: get_it, injectable, freezed_annotation
-- **Network & Real-time**: dio, signalr_netcore
-- **Navigation**: auto_route
-- **Database**: isar, isar_flutter_libs
-
-## Setup
-
-1. Install Flutter dependencies:
-   ```bash
-   flutter pub get
-   ```
-
-2. Generate code:
-   ```bash
-   dart run build_runner build --delete-conflicting-outputs
-   ```
-
-3. Run the app:
-   ```bash
-   flutter run
-   ```
-
-## Features
-
-- Authentication (Login/Register)
-- Real-time Chat
-- Contacts
-- Profile Management
-- Settings

client-mobile/analysis_options.yaml

@@ -1,8 +0,0 @@
-include: package:flutter_lints/flutter.yaml
-
-linter:
-  rules:
-    prefer_const_constructors: true
-    prefer_const_declarations: true
-    avoid_print: false
-    prefer_single_quotes: true

client-mobile/android/.gitignore

@@ -1,7 +0,0 @@
-gradle-wrapper.jar
-/.gradle
-/captures/
-/gradlew
-/gradlew.bat
-/local.properties
-GeneratedPluginRegistrant.java

client-mobile/android/app/build.gradle

@@ -1,69 +0,0 @@
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-android {
-    namespace "com.example.messenger_app"
-    compileSdkVersion 36
-    ndkVersion flutter.ndkVersion
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
-    defaultConfig {
-        applicationId "com.example.messenger_app"
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion 35
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-        multiDexEnabled true
-    }
-
-    packagingOptions {
-        resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
-    }
-
-    buildTypes {
-        release {
-            signingConfig signingConfigs.debug
-        }
-    }
-}
-
-flutter {
-    source '../..'
-}
-
-dependencies {}

client-mobile/android/app/src/main/AndroidManifest.xml

@@ -1,28 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application
-        android:label="Messenger"
-        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
-            <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
-    </application>
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>

client-mobile/android/app/src/main/kotlin/com/example/messenger_app/MainActivity.kt

@@ -1,5 +0,0 @@
-package com.example.messenger_app
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity()

client-mobile/android/app/src/main/res/drawable/launch_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-</layer-list>

client-mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#2481CC" />
-</shape>

client-mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#2481CC" />
-</shape>

client-mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#2481CC" />
-</shape>

client-mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#2481CC" />
-</shape>

client-mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#2481CC" />
-</shape>

client-mobile/android/app/src/main/res/values/styles.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <item name="android:windowBackground">@drawable/launch_background</item>
-    </style>
-    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <item name="android:windowBackground">?android:colorBackground</item>
-    </style>
-</resources>

client-mobile/android/build.gradle

@@ -1,25 +0,0 @@
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.buildDir = '../build'
-
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-    afterEvaluate { project ->
-        if (project.hasProperty("android")) {
-            project.android {
-                if (namespace == null) {
-                    namespace project.group
-                }
-            }
-        }
-    }
-}
-
-tasks.register("clean", Delete) {
-    delete rootProject.buildDir
-}

client-mobile/android/gradle.properties

@@ -1,3 +0,0 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
-android.useAndroidX=true
-android.enableJetifier=true

client-mobile/android/settings.gradle

@@ -1,25 +0,0 @@
-pluginManagement {
-    def flutterSdkPath = {
-        def properties = new Properties()
-        file("local.properties").withInputStream { properties.load(it) }
-        def flutterSdkPath = properties.getProperty("flutter.sdk")
-        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-        return flutterSdkPath
-    }()
-
-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
-
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.6.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
-}
-
-include ":app"

client-mobile/app/build.gradle.kts

@@ -0,0 +1,141 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("com.google.dagger.hilt.android")
+    id("com.google.gms.google-services")
+    kotlin("kapt")
+}
+
+android {
+    namespace = "ru.knot.messager"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "ru.knot.messager"
+        minSdk = 26
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    
+    // Подключаем все наши папки с кодом как sourceSets
+    sourceSets {
+        getByName("main") {
+            java.srcDirs(
+                "src/main/kotlin",
+                "../auth",
+                "../chats",
+                "../core",
+                "../calls",
+                "../stories",
+                "../contacts",
+                "../profiles",
+                "../settings",
+                "../navigation"
+            )
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.8"
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+}
+
+dependencies {
+    // AndroidX & UI
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    implementation("androidx.activity:activity-compose:1.8.1")
+    implementation(platform("androidx.compose:compose-bom:2023.10.01"))
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.ui:ui-graphics")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    implementation("androidx.compose.material3:material3")
+    implementation("com.google.android.material:material:1.11.0")
+    implementation("androidx.navigation:navigation-compose:2.7.5")
+    implementation("androidx.compose.material:material-icons-extended")
+
+    // Hilt
+    implementation("com.google.dagger:hilt-android:2.48")
+    kapt("com.google.dagger:hilt-android-compiler:2.48")
+    implementation("androidx.hilt:hilt-navigation-compose:1.1.0")
+
+    // Network & SignalR
+    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
+    implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
+    implementation("com.microsoft.signalr:signalr:7.0.0")
+
+    // WebRTC
+    implementation("com.github.webrtc-sdk:android:104.5112.01")
+
+    // Media3 (ExoPlayer)
+    implementation("androidx.media3:media3-exoplayer:1.2.0")
+    implementation("androidx.media3:media3-ui:1.2.0")
+    implementation("androidx.media3:media3-common:1.2.0")
+
+    // Images & GIF
+    implementation("io.coil-kt:coil-compose:2.5.0")
+    implementation("io.coil-kt:coil-gif:2.5.0")
+    implementation("io.coil-kt:coil-svg:2.5.0")
+    implementation("io.coil-kt:coil-video:2.5.0")
+
+    // Security
+    implementation("androidx.security:security-crypto:1.1.0-alpha06")
+
+    // UCrop (Image Cropping)
+    implementation("com.github.yalantis:ucrop:2.2.8")
+
+    // Firebase (Push Notifications)
+    implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
+    implementation("com.google.firebase:firebase-messaging-ktx")
+    implementation("com.google.firebase:firebase-analytics-ktx")
+
+    // Room
+    val room_version = "2.6.1"
+    implementation("androidx.room:room-runtime:$room_version")
+    implementation("androidx.room:room-ktx:$room_version")
+    implementation("androidx.room:room-paging:$room_version")
+    kapt("androidx.room:room-compiler:$room_version")
+
+    // Paging 3
+    implementation("androidx.paging:paging-runtime-ktx:3.2.1")
+    implementation("androidx.paging:paging-compose:3.2.1")
+
+    // WorkManager
+    implementation("androidx.work:work-runtime-ktx:2.9.0")
+    implementation("androidx.hilt:hilt-work:1.1.0")
+    kapt("androidx.hilt:hilt-compiler:1.1.0")
+
+    // Testing
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}

client-mobile/app/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "483917912506",
+    "project_id": "knot-bad1a",
+    "storage_bucket": "knot-bad1a.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:483917912506:android:cd39213364869ef9e82583",
+        "android_client_info": {
+          "package_name": "ru.knot.messager"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBAL_bZJYaa7rGERLX63LeFXz-__JXRWQY"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

client-mobile/app/src/main/AndroidManifest.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ru.knot.messager">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
+    <application
+        android:name="com.knot.messenger.MainApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.KnotMessenger"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true">
+
+        <activity
+            android:name="com.knot.messenger.MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustResize"
+            android:theme="@style/Theme.KnotMessenger">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name="core.notifications.data.ForkFirebaseMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
+    </application>
+</manifest>

client-mobile/app/src/main/kotlin/com/knot/messenger/MainActivity.kt

@@ -0,0 +1,60 @@
+package com.knot.messenger
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.ui.Modifier
+import dagger.hilt.android.AndroidEntryPoint
+import navigation.AppNavigation
+import core.presentation.theme.ForkMessengerTheme
+
+@AndroidEntryPoint
+class MainActivity : ComponentActivity() {
+    @javax.inject.Inject
+    lateinit var navigationManager: core.utils.NavigationManager
+
+    @javax.inject.Inject
+    lateinit var signalrNotificationObserver: chats.data.remote.signalr.SignalRNotificationObserver
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        
+        android.util.Log.d("MainActivity", "onCreate called")
+        signalrNotificationObserver.start()
+        android.util.Log.d("MainActivity", "signalrNotificationObserver.start() called")
+
+        intent.getStringExtra("chatId")?.let { chatId ->
+            navigationManager.navigateToChat(chatId)
+        }
+        
+        // Request notifications permission for Android 13+
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) {
+            androidx.core.app.ActivityCompat.requestPermissions(
+                this,
+                arrayOf(android.Manifest.permission.POST_NOTIFICATIONS),
+                101
+            )
+        }
+
+        setContent {
+            ForkMessengerTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    AppNavigation(navigationManager = navigationManager)
+                }
+            }
+        }
+    }
+
+    override fun onNewIntent(intent: android.content.Intent?) {
+        super.onNewIntent(intent)
+        intent?.getStringExtra("chatId")?.let { chatId ->
+            navigationManager.navigateToChat(chatId)
+        }
+    }
+}

client-mobile/app/src/main/kotlin/com/knot/messenger/MainApplication.kt

@@ -0,0 +1,19 @@
+package com.knot.messenger
+
+import android.app.Application
+import coil.ImageLoader
+import coil.ImageLoaderFactory
+import coil.decode.VideoFrameDecoder
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class MainApplication : Application(), ImageLoaderFactory {
+    override fun newImageLoader(): ImageLoader {
+        return ImageLoader.Builder(this)
+            .components {
+                add(VideoFrameDecoder.Factory())
+            }
+            .build()
+    }
+}
+    

client-mobile/app/src/main/res/values-en/strings.xml

@@ -0,0 +1,64 @@
+<resources>
+    <string name="app_name">ForkMessenger</string>
+    <string name="login">Login</string>
+    <string name="register">Register</string>
+    <string name="username">Username</string>
+    <string name="password">Password</string>
+    <string name="display_name">Display Name</string>
+    <string name="settings">Settings</string>
+    <string name="save">Save</string>
+    <string name="back">Back</string>
+    <string name="server_connection">Server Connection</string>
+    <string name="api_base_url">API Base URL</string>
+    <string name="server_features">Server Features</string>
+    <string name="stories">Stories</string>
+    <string name="polls">Polls</string>
+    <string name="calls">Calls</string>
+    <string name="groups">Groups</string>
+    <string name="enabled">Enabled</string>
+    <string name="disabled">Disabled</string>
+    <string name="limits">Limits</string>
+    <string name="max_file_size">Max File Size</string>
+    <string name="max_group_members">Max Group Members</string>
+    <string name="message">Message</string>
+    <string name="call">Call</string>
+    <string name="block">Block</string>
+    <string name="profile">Profile</string>
+    <string name="confirm_password">Confirm Password</string>
+    <string name="passwords_not_match">Passwords do not match</string>
+    <string name="no_account_register">Don\'t have an account? Register</string>
+    <string name="already_have_account">Already have an account? Login</string>
+    <string name="error_occurred">An error occurred</string>
+    <string name="loading">Loading...</string>
+    <string name="chats_title">Chats</string>
+    <string name="contacts_title">Contacts</string>
+    <string name="stories_title">Stories</string>
+    <string name="create_story">Create Story</string>
+    <string name="send_message_hint">Type a message...</string>
+    <string name="reply_to_user">Reply to %1$s...</string>
+    <string name="story_editor">STORY EDITOR</string>
+    <string name="publish">PUBLISH</string>
+    <string name="start_creation">START CREATION</string>
+    <string name="text_tool">TEXT</string>
+    <string name="crop_tool">CROP</string>
+    <string name="stickers_tool">STICKERS</string>
+    <string name="brush_tool">BRUSH</string>
+    <string name="filters_tool">FILTERS</string>
+    <string name="remove">Remove</string>
+    <string name="no_chats_found">No chats found</string>
+    <string name="typing">typing...</string>
+    <string name="video_call">Video Call</string>
+    <string name="emoji">Emoji</string>
+    <string name="attach">Attach</string>
+    <string name="message_placeholder">Message...</string>
+    <string name="voice_message">Voice Message</string>
+    <string name="send">Send</string>
+    <string name="reply_photo">Photo</string>
+    <string name="reply_video">Video</string>
+    <string name="reply_audio">Audio</string>
+    <string name="reply_file">File</string>
+    <string name="reply_gif">GIF</string>
+    <string name="reply_prefix">Reply to </string>
+    <string name="reply_self">yourself</string>
+    <string name="no_messages_yet">No messages yet</string>
+</resources>

client-mobile/app/src/main/res/values/strings.xml

@@ -0,0 +1,86 @@
+<resources>
+    <string name="app_name">ForkMessenger</string>
+    <string name="login">Войти</string>
+    <string name="register">Регистрация</string>
+    <string name="username">Имя пользователя</string>
+    <string name="password">Пароль</string>
+    <string name="display_name">Отображаемое имя</string>
+    <string name="settings">Настройки</string>
+    <string name="save">Сохранить</string>
+    <string name="back">Назад</string>
+    <string name="server_connection">Подключение к серверу</string>
+    <string name="api_base_url">API Base URL</string>
+    <string name="server_features">Функции сервера</string>
+    <string name="stories">Истории</string>
+    <string name="polls">Опросы</string>
+    <string name="calls">Звонки</string>
+    <string name="groups">Группы</string>
+    <string name="enabled">Включено</string>
+    <string name="disabled">Отключено</string>
+    <string name="limits">Лимиты</string>
+    <string name="max_file_size">Макс. размер файла</string>
+    <string name="max_group_members">Макс. участников в группе</string>
+    <string name="message">Сообщение</string>
+    <string name="call">Позвонить</string>
+    <string name="block">Заблокировать</string>
+    <string name="profile">Профиль</string>
+    <string name="confirm_password">Подтвердите пароль</string>
+    <string name="passwords_not_match">Пароли не совпадают</string>
+    <string name="no_account_register">Нет аккаунта? Зарегистрироваться</string>
+    <string name="already_have_account">Уже есть аккаунт? Войти</string>
+    <string name="error_occurred">Произошла ошибка</string>
+    <string name="loading">Загрузка...</string>
+    <string name="chats_title">Чаты</string>
+    <string name="contacts_title">Контакты</string>
+    <string name="stories_title">Истории</string>
+    <string name="create_story">Создать историю</string>
+    <string name="send_message_hint">Напишите сообщение...</string>
+    <string name="reply_to_user">Ответить %1$s...</string>
+    <string name="story_editor">РЕДАКТОР ИСТОРИЙ</string>
+    <string name="publish">ОПУБЛИКОВАТЬ</string>
+    <string name="start_creation">НАЧАТЬ СОЗДАНИЕ</string>
+    <string name="text_tool">ТЕКСТ</string>
+    <string name="crop_tool">ОБРЕЗКА</string>
+    <string name="stickers_tool">СТИКЕРЫ</string>
+    <string name="brush_tool">КИСТЬ</string>
+    <string name="filters_tool">ФИЛЬТРЫ</string>
+    <string name="remove">Удалить</string>
+    <string name="no_chats_found">Чаты не найдены</string>
+    <string name="typing">печатает...</string>
+    <string name="video_call">Видеозвонок</string>
+    <string name="emoji">Эмодзи</string>
+    <string name="attach">Прикрепить</string>
+    <string name="message_placeholder">Сообщение...</string>
+    <string name="voice_message">Голосовое сообщение</string>
+    <string name="send">Отправить</string>
+    <string name="search_hint">Поиск...</string>
+    <string name="online">В сети</string>
+    <string name="last_seen">Был(а): %1$s</string>
+    <string name="last_seen_recently">недавно</string>
+    <string name="all">Все</string>
+    <string name="online_tab">Онлайн</string>
+    <string name="blocked">Заблокированные</string>
+    <string name="media">Медиа</string>
+    <string name="notifications">Уведомления</string>
+    <string name="mute">Без звука</string>
+    <string name="unmute">Включить звук</string>
+    <string name="log_out">Выйти из аккаунта</string>
+    <string name="bio">О себе</string>
+    <string name="edit_profile">Редактировать профиль</string>
+    <string name="username_label">Имя пользователя</string>
+    <string name="change_photo">Изменить фото</string>
+    <string name="cancel">Отмена</string>
+    <string name="crop">Обрезать</string>
+    <string name="chats">Чаты</string>
+    <string name="contacts_tab">Контакты</string>
+    <string name="profile_tab">Профиль</string>
+    <string name="saving">Сохранение...</string>
+    <string name="reply_photo">Фото</string>
+    <string name="reply_video">Видео</string>
+    <string name="reply_audio">Аудио</string>
+    <string name="reply_file">Файл</string>
+    <string name="reply_gif">GIF</string>
+    <string name="reply_prefix">Ответ </string>
+    <string name="reply_self">самому себе</string>
+    <string name="no_messages_yet">Сообщений пока нет</string>
+</resources>

client-mobile/app/src/main/res/values/styles.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.KnotMessenger" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="android:statusBarColor">#0F0F10</item>
+        <item name="android:windowBackground">#0F0F10</item>
+    </style>
+</resources>

client-mobile/app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <!-- Для отладки: доверяем пользовательским сертификатам -->
+    <debug-overrides>
+        <trust-anchors>
+            <certificates src="user" />
+            <certificates src="system" />
+        </trust-anchors>
+    </debug-overrides>
+    
+    <!-- Разрешаем cleartext (HTTP) трафик для локальных IP -->
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">localhost</domain>
+        <domain includeSubdomains="true">127.0.0.1</domain>
+        <domain includeSubdomains="true">10.0.0.0/8</domain>
+        <domain includeSubdomains="true">172.16.0.0/12</domain>
+        <domain includeSubdomains="true">192.168.0.0/16</domain>
+    </domain-config>
+</network-security-config>

client-mobile/auth/data/remote/api/AuthApi.kt

@@ -0,0 +1,29 @@
+package auth.data.remote.api
+
+import auth.data.remote.dto.AuthRequest
+import auth.data.remote.dto.AuthResponse
+import auth.data.remote.dto.RefreshTokenRequest
+import core.domain.model.ServerConfigModel
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Headers
+import retrofit2.http.POST
+
+interface AuthApi {
+    @POST("auth/login")
+    suspend fun login(@Body request: AuthRequest): AuthResponse
+
+    @POST("auth/register")
+    suspend fun register(@Body request: AuthRequest): AuthResponse
+
+    @POST("auth/refresh")
+    suspend fun refreshToken(@Body request: RefreshTokenRequest): AuthResponse
+
+    @GET("config")
+    @Headers("Cache-Control: no-cache")
+    suspend fun getConfig(): ServerConfigModel
+
+    @POST("auth/push-token")
+    @Headers("Cache-Control: no-cache")
+    suspend fun updatePushToken(@Body token: String): Unit
+}

client-mobile/auth/data/remote/dto/AuthDtos.kt

@@ -0,0 +1,28 @@
+package auth.data.remote.dto
+
+import com.google.gson.annotations.SerializedName
+
+data class AuthRequest(
+    @SerializedName("userName") val userName: String,
+    @SerializedName("password") val password: String
+)
+
+data class AuthResponse(
+    @SerializedName("accessToken") val accessToken: String?,
+    @SerializedName("refreshToken") val refreshToken: String?,
+    @SerializedName("user") val user: UserDto?,
+    @SerializedName("userId") val userId: String?,
+    @SerializedName("username") val username: String?,
+    @SerializedName("displayName") val displayName: String?
+)
+
+data class UserDto(
+    @SerializedName("id") val id: String,
+    @SerializedName("userName") val userName: String,
+    @SerializedName("displayName") val displayName: String?,
+    @SerializedName("avatarUrl") val avatarUrl: String?
+)
+
+data class RefreshTokenRequest(
+    @SerializedName("refreshToken") val refreshToken: String
+)

client-mobile/auth/data/repository/AuthRepositoryImpl.kt

@@ -0,0 +1,131 @@
+package auth.data.repository
+
+import auth.data.remote.api.AuthApi
+import auth.data.remote.dto.AuthRequest
+import auth.data.remote.dto.RefreshTokenRequest
+import auth.domain.model.AuthResult
+import auth.domain.repository.AuthRepository
+import core.network.ServerConfig
+import core.security.TokenManager
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import javax.inject.Inject
+
+class AuthRepositoryImpl @Inject constructor(
+    private val api: AuthApi,
+    private val tokenManager: TokenManager,
+    private val serverConfig: ServerConfig
+) : AuthRepository {
+
+    private val _isAuthenticated = kotlinx.coroutines.flow.MutableStateFlow(tokenManager.getToken() != null)
+
+    override suspend fun login(userName: String, password: String): Result<AuthResult> {
+        return try {
+            val response = api.login(AuthRequest(userName, password))
+            val token = response.accessToken ?: return Result.failure(Exception("Token is null"))
+            val userId = response.userId ?: ""
+            
+            tokenManager.saveToken(token, userId, response.refreshToken)
+            _isAuthenticated.value = true
+            fetchConfig()
+            Result.success(
+                AuthResult(
+                    token = token,
+                    refreshToken = response.refreshToken,
+                    userId = userId,
+                    userName = response.username ?: userName,
+                    displayName = response.displayName ?: response.username ?: userName,
+                    avatarUrl = null
+                )
+            )
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    override suspend fun register(userName: String, password: String): Result<AuthResult> {
+        return try {
+            val response = api.register(AuthRequest(userName, password))
+            val token = response.accessToken ?: return Result.failure(Exception("Token is null"))
+            val userId = response.userId ?: ""
+
+            tokenManager.saveToken(token, userId, response.refreshToken)
+            _isAuthenticated.value = true
+            fetchConfig()
+            Result.success(
+                AuthResult(
+                    token = token,
+                    refreshToken = response.refreshToken,
+                    userId = userId,
+                    userName = response.username ?: userName,
+                    displayName = response.displayName ?: response.username ?: userName,
+                    avatarUrl = null
+                )
+            )
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    override suspend fun logout() {
+        tokenManager.deleteToken()
+        _isAuthenticated.value = false
+    }
+
+    override fun isAuthenticated(): Boolean {
+        return _isAuthenticated.value
+    }
+
+    override fun isAuthenticatedFlow(): kotlinx.coroutines.flow.StateFlow<Boolean> {
+        return _isAuthenticated.asStateFlow()
+    }
+
+    override suspend fun fetchConfig(): Result<Unit> {
+        return try {
+            val config = api.getConfig()
+            serverConfig.saveServerConfig(config)
+            Result.success(Unit)
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    override suspend fun updatePushToken(token: String) {
+        try {
+            api.updatePushToken(token)
+        } catch (e: Exception) {
+            // Silent fail
+        }
+    }
+
+    override suspend fun refreshToken(): Result<AuthResult> {
+        val currentRefreshToken = tokenManager.getRefreshToken()
+        if (currentRefreshToken == null) {
+            return Result.failure(Exception("Refresh token is null"))
+        }
+
+        return try {
+            val response = api.refreshToken(RefreshTokenRequest(currentRefreshToken))
+            val newAccessToken = response.accessToken ?: return Result.failure(Exception("New access token is null"))
+            val newRefreshToken = response.refreshToken
+            val userId = response.userId ?: ""
+
+            tokenManager.saveToken(newAccessToken, userId, newRefreshToken)
+            _isAuthenticated.value = true
+
+            Result.success(
+                AuthResult(
+                    token = newAccessToken,
+                    refreshToken = newRefreshToken,
+                    userId = userId,
+                    userName = response.username ?: "",
+                    displayName = response.displayName ?: "",
+                    avatarUrl = null
+                )
+            )
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+}

client-mobile/auth/di/AuthModule.kt

@@ -0,0 +1,34 @@
+package auth.di
+
+import auth.data.remote.api.AuthApi
+import auth.data.repository.AuthRepositoryImpl
+import auth.domain.repository.AuthRepository
+import core.network.ServerConfig
+import core.security.TokenManager
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AuthModule {
+
+    @Provides
+    @Singleton
+    fun provideAuthApi(retrofit: Retrofit): AuthApi {
+        return retrofit.create(AuthApi::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideAuthRepository(
+        api: AuthApi,
+        tokenManager: TokenManager,
+        serverConfig: ServerConfig
+    ): AuthRepository {
+        return AuthRepositoryImpl(api, tokenManager, serverConfig)
+    }
+}

client-mobile/auth/domain/model/AuthModels.kt

@@ -0,0 +1,10 @@
+package auth.domain.model
+
+data class AuthResult(
+    val token: String,
+    val refreshToken: String?,
+    val userId: String,
+    val userName: String,
+    val displayName: String,
+    val avatarUrl: String?
+)

client-mobile/auth/domain/repository/AuthRepository.kt

@@ -0,0 +1,14 @@
+package auth.domain.repository
+
+import auth.domain.model.AuthResult
+
+interface AuthRepository {
+    suspend fun login(userName: String, password: String): Result<AuthResult>
+    suspend fun register(userName: String, password: String): Result<AuthResult>
+    suspend fun logout()
+    suspend fun fetchConfig(): Result<Unit>
+    fun isAuthenticated(): Boolean
+    fun isAuthenticatedFlow(): kotlinx.coroutines.flow.StateFlow<Boolean>
+    suspend fun updatePushToken(token: String)
+    suspend fun refreshToken(): Result<AuthResult>
+}

client-mobile/auth/presentation/AuthViewModel.kt

@@ -0,0 +1,94 @@
+package auth.presentation
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import auth.domain.repository.AuthRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import com.google.firebase.messaging.FirebaseMessaging
+import javax.inject.Inject
+
+data class AuthState(
+    val isLoading: Boolean = false,
+    val error: String? = null,
+    val isAuthenticated: Boolean = false
+)
+
+@HiltViewModel
+class AuthViewModel @Inject constructor(
+    private val repository: AuthRepository
+) : ViewModel() {
+
+    private val _state = MutableStateFlow(AuthState(isAuthenticated = repository.isAuthenticated()))
+    val state: StateFlow<AuthState> = _state.asStateFlow()
+
+    init {
+        viewModelScope.launch {
+            repository.isAuthenticatedFlow().collect { authenticated ->
+                _state.update { it.copy(isAuthenticated = authenticated) }
+                if (authenticated) {
+                    updatePushToken()
+                }
+            }
+        }
+    }
+
+    fun checkAuth() {
+        _state.update { it.copy(isAuthenticated = repository.isAuthenticated()) }
+    }
+
+    fun login(userName: String, password: String) {
+        viewModelScope.launch {
+            _state.update { it.copy(isLoading = true, error = null) }
+            repository.login(userName, password)
+                .onSuccess {
+                    _state.update { it.copy(isLoading = false, isAuthenticated = true) }
+                    updatePushToken()
+                }
+                .onFailure { e ->
+                    _state.update { it.copy(isLoading = false, error = e.message) }
+                }
+        }
+    }
+
+    fun register(userName: String, password: String) {
+        viewModelScope.launch {
+            _state.update { it.copy(isLoading = true, error = null) }
+            repository.register(userName, password)
+                .onSuccess {
+                    _state.update { it.copy(isLoading = false, isAuthenticated = true) }
+                    updatePushToken()
+                }
+                .onFailure { e ->
+                    _state.update { it.copy(isLoading = false, error = e.message) }
+                }
+        }
+    }
+
+    fun refreshToken() {
+        viewModelScope.launch {
+            repository.refreshToken()
+                .onSuccess {
+                    // Token refreshed successfully
+                }
+                .onFailure {
+                    // Refresh failed, will trigger logout via AuthInterceptor
+                }
+        }
+    }
+
+    private fun updatePushToken() {
+        FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
+            if (task.isSuccessful) {
+                val token = task.result
+                viewModelScope.launch {
+                    repository.updatePushToken(token)
+                }
+            }
+        }
+    }
+}

client-mobile/auth/presentation/LoginScreen.kt

@@ -0,0 +1,95 @@
+package auth.presentation
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.unit.dp
+import ru.knot.messager.R
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun LoginScreen(
+    viewModel: AuthViewModel,
+    onNavigateToRegister: () -> Unit,
+    onNavigateToSettings: () -> Unit,
+    onLoginSuccess: () -> Unit
+) {
+    val state by viewModel.state.collectAsState()
+    var userName by remember { mutableStateOf("") }
+    var password by remember { mutableStateOf("") }
+
+    LaunchedEffect(state.isAuthenticated) {
+        if (state.isAuthenticated) {
+            onLoginSuccess()
+        }
+    }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = { Text(stringResource(R.string.login)) },
+                actions = {
+                    IconButton(onClick = onNavigateToSettings) {
+                        Icon(Icons.Default.Settings, contentDescription = stringResource(R.string.settings))
+                    }
+                }
+            )
+        }
+    ) { paddingValues ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(paddingValues)
+                .padding(16.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center
+        ) {
+            OutlinedTextField(
+                value = userName,
+                onValueChange = { userName = it },
+                label = { Text(stringResource(R.string.username)) },
+                modifier = Modifier.fillMaxWidth(),
+                singleLine = true
+            )
+            Spacer(modifier = Modifier.height(8.dp))
+            OutlinedTextField(
+                value = password,
+                onValueChange = { password = it },
+                label = { Text(stringResource(R.string.password)) },
+                modifier = Modifier.fillMaxWidth(),
+                visualTransformation = PasswordVisualTransformation(),
+                singleLine = true
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            
+            if (state.isLoading) {
+                CircularProgressIndicator()
+            } else {
+                Button(
+                    onClick = { viewModel.login(userName, password) },
+                    modifier = Modifier.fillMaxWidth(),
+                    enabled = userName.isNotBlank() && password.isNotBlank()
+                ) {
+                    Text(stringResource(R.string.login))
+                }
+                TextButton(onClick = onNavigateToRegister) {
+                    Text(stringResource(R.string.no_account_register))
+                }
+            }
+
+            if (state.error != null) {
+                Text(
+                    text = state.error!!,
+                    color = MaterialTheme.colorScheme.error,
+                    modifier = Modifier.padding(top = 8.dp)
+                )
+            }
+        }
+    }
+}