inbox: sync inbox items

Notesnook.API/Accessors/SyncItemsRepositoryAccessor.cs

@@ -44,7 +44,7 @@ namespace Notesnook.API.Accessors
         public Repository<UserSettings> UsersSettings { get; }
         public Repository<Monograph> Monographs { get; }
         public Repository<InboxApiKey> InboxApiKey { get; }
-        public SyncItemsRepository InboxItems { get; }
+        public Repository<InboxSyncItem> InboxItems { get; }
 
         public SyncItemsRepositoryAccessor(IDbContext dbContext,
 
@@ -72,15 +72,14 @@ namespace Notesnook.API.Accessors
         IMongoCollection<SyncItem> vaults,
         [FromKeyedServices(Collections.TagsKey)]
         IMongoCollection<SyncItem> tags,
-        [FromKeyedServices(Collections.InboxItems)]
-        IMongoCollection<SyncItem> inboxItems,
 
         Repository<UserSettings> usersSettings, Repository<Monograph> monographs,
-        Repository<InboxApiKey> inboxApiKey)
+        Repository<InboxApiKey> inboxApiKey, Repository<InboxSyncItem> inboxItems)
         {
             UsersSettings = usersSettings;
             Monographs = monographs;
             InboxApiKey = inboxApiKey;
+            InboxItems = inboxItems;
             Notebooks = new SyncItemsRepository(dbContext, notebooks);
             Notes = new SyncItemsRepository(dbContext, notes);
             Contents = new SyncItemsRepository(dbContext, content);
@@ -93,7 +92,6 @@ namespace Notesnook.API.Accessors
             Colors = new SyncItemsRepository(dbContext, colors);
             Vaults = new SyncItemsRepository(dbContext, vaults);
             Tags = new SyncItemsRepository(dbContext, tags);
-            InboxItems = new SyncItemsRepository(dbContext, inboxItems);
         }
     }
 }

Notesnook.API/Controllers/InboxController.cs

@@ -19,15 +19,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
 using System.Security.Claims;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using MongoDB.Bson;
 using Notesnook.API.Authorization;
-using Notesnook.API.Interfaces;
 using Notesnook.API.Models;
-using Notesnook.API.Repositories;
+using Notesnook.API.Services;
 using Streetwriters.Common;
+using Streetwriters.Common.Messages;
 using Streetwriters.Data.Repositories;
 
 namespace Notesnook.API.Controllers
@@ -38,16 +39,16 @@ namespace Notesnook.API.Controllers
     {
         private readonly Repository<InboxApiKey> InboxApiKey;
         private readonly Repository<UserSettings> UserSetting;
-        private SyncItemsRepository InboxItems;
+        private Repository<InboxSyncItem> InboxItems;
 
         public InboxController(
             Repository<InboxApiKey> inboxApiKeysRepository,
             Repository<UserSettings> userSettingsRepository,
-            ISyncItemsRepositoryAccessor syncItemsRepositoryAccessor)
+            Repository<InboxSyncItem> inboxItemsRepository)
         {
             InboxApiKey = inboxApiKeysRepository;
             UserSetting = userSettingsRepository;
-            InboxItems = syncItemsRepositoryAccessor.InboxItems;
+            InboxItems = inboxItemsRepository;
         }
 
         [HttpGet("api-keys")]
@@ -189,6 +190,18 @@ namespace Notesnook.API.Controllers
                 request.UserId = userId;
                 request.ItemId = ObjectId.GenerateNewId().ToString();
                 await InboxItems.InsertAsync(request);
+                new SyncDeviceService(new SyncDevice(userId, string.Empty))
+                    .AddIdsToAllDevices([$"{request.ItemId}:inboxItems"]);
+                await WampServers.MessengerServer.PublishMessageAsync(MessengerServerTopics.SendSSETopic, new SendSSEMessage
+                {
+                    OriginTokenId = null,
+                    UserId = userId,
+                    Message = new Message
+                    {
+                        Type = "triggerSync",
+                        Data = JsonSerializer.Serialize(new { reason = "Inbox items updated." })
+                    }
+                });
                 return Ok();
             }
             catch (Exception ex)

Notesnook.API/Hubs/SyncV2Hub.cs

@@ -43,6 +43,7 @@ namespace Notesnook.API.Hubs
         Task<bool> SendItems(SyncTransferItemV2 transferItem);
         Task<bool> SendVaultKey(EncryptedData vaultKey);
         Task<bool> SendMonographs(IEnumerable<MonographMetadata> monographs);
+        Task<bool> SendInboxItems(IEnumerable<InboxSyncItem> inboxItems);
         Task PushCompleted();
     }
 
@@ -197,15 +198,20 @@ namespace Notesnook.API.Hubs
 
         public async Task<SyncV2Metadata> RequestFetch(string deviceId)
         {
-            return await HandleRequestFetch(deviceId, false);
+            return await HandleRequestFetch(deviceId, false, false);
         }
 
         public async Task<SyncV2Metadata> RequestFetchV2(string deviceId)
         {
-            return await HandleRequestFetch(deviceId, true);
+            return await HandleRequestFetch(deviceId, true, false);
         }
 
-        private async Task<SyncV2Metadata> HandleRequestFetch(string deviceId, bool includeMonographs)
+        public async Task<SyncV2Metadata> RequestFetchV3(string deviceId)
+        {
+            return await HandleRequestFetch(deviceId, true, true);
+        }
+
+        private async Task<SyncV2Metadata> HandleRequestFetch(string deviceId, bool includeMonographs, bool includeInboxItems)
         {
             var userId = Context.User?.FindFirstValue("sub") ?? throw new HubException("Please login to sync.");
 
@@ -285,6 +291,19 @@ namespace Notesnook.API.Hubs
                     device.HasInitialMonographsSync = true;
                 }
 
+                if (includeInboxItems)
+                {
+                    var unsyncedInboxItems = ids.Where((id) => id.EndsWith(":inboxItems")).ToHashSet();
+                    var unsyncedInboxItemIds = unsyncedInboxItems.Select((id) => id.Split(":")[0]).ToArray();
+                    var userInboxItems = isResetSync
+                        ? await Repositories.InboxItems.FindAsync(m => m.UserId == userId)
+                        : await Repositories.InboxItems.FindAsync(m => m.UserId == userId && unsyncedInboxItemIds.Contains(m.ItemId));
+                    if (userInboxItems.Any() && !await Clients.Caller.SendInboxItems(userInboxItems).WaitAsync(TimeSpan.FromMinutes(10)))
+                    {
+                        throw new HubException("Client rejected inbox items.");
+                    }
+                }
+
                 deviceService.Reset();
 
                 return new SyncV2Metadata

Notesnook.API/Interfaces/ISyncItemsRepositoryAccessor.cs

@@ -38,9 +38,9 @@ namespace Notesnook.API.Interfaces
         SyncItemsRepository Colors { get; }
         SyncItemsRepository Vaults { get; }
         SyncItemsRepository Tags { get; }
-        SyncItemsRepository InboxItems { get; }
         Repository<UserSettings> UsersSettings { get; }
         Repository<Monograph> Monographs { get; }
         Repository<InboxApiKey> InboxApiKey { get; }
+        Repository<InboxSyncItem> InboxItems { get; }
     }
 }

Notesnook.API/Models/SyncItem.cs

@@ -44,7 +44,7 @@ namespace Notesnook.API.Models
         [DataMember(Name = "userId")]
         [JsonPropertyName("userId")]
         [MessagePack.Key("userId")]
-        public string UserId
+        public string? UserId
         {
             get; set;
         }
@@ -71,7 +71,7 @@ namespace Notesnook.API.Models
         [DataMember(Name = "id")]
         [JsonPropertyName("id")]
         [MessagePack.Key("id")]
-        public string ItemId
+        public string? ItemId
         {
             get; set;
         }

Notesnook.API/Startup.cs

@@ -173,7 +173,8 @@ namespace Notesnook.API
             services.AddRepository<UserSettings>("user_settings", "notesnook")
                     .AddRepository<Monograph>("monographs", "notesnook")
                     .AddRepository<Announcement>("announcements", "notesnook")
-                    .AddRepository<InboxApiKey>(Collections.InboxApiKeysKey, "notesnook");
+                    .AddRepository<InboxApiKey>(Collections.InboxApiKeysKey, "notesnook")
+                    .AddRepository<InboxSyncItem>(Collections.InboxItems, "notesnook");
 
             services.AddMongoCollection(Collections.SettingsKey)
                     .AddMongoCollection(Collections.AttachmentsKey)