pass client Id to server when adding changes so that project update n…

…otifications can be filtered by client id

backend/FwLite/LocalWebApp/BackgroundSyncService.cs

@@ -14,14 +14,19 @@ public class BackgroundSyncService(
 {
     private readonly Channel<CrdtProject> _syncResultsChannel = Channel.CreateUnbounded<CrdtProject>();
 
-    public void TriggerSync(Guid projectId)
+    public void TriggerSync(Guid projectId, Guid? ignoredClientId = null)
     {
         var projectData = CurrentProjectService.LookupProjectById(memoryCache, projectId);
         if (projectData is null)
         {
             logger.LogWarning("Received project update for unknown project {ProjectId}", projectId);
             return;
         }
+        if (ignoredClientId == projectData.ClientId)
+        {
+            logger.LogInformation("Received project update for {ProjectId} triggered by my own change, ignoring", projectId);
+            return;
+        }
 
         var crdtProject = projectsService.GetProject(projectData.Name);
         if (crdtProject is null)

backend/FwLite/LocalWebApp/CrdtHttpSyncService.cs

@@ -57,11 +57,11 @@ public async ValueTask<ISyncable> CreateProjectSyncable(ProjectData project)
             return NullSyncable.Instance;
         }
 
-        return new CrdtProjectSync(RestService.For<ISyncHttp>(client, refitSettings), project.Id, project.OriginDomain, this);
+        return new CrdtProjectSync(RestService.For<ISyncHttp>(client, refitSettings), project.Id, project.ClientId  , project.OriginDomain, this);
     }
 }
 
-public class CrdtProjectSync(ISyncHttp restSyncClient, Guid projectId, string originDomain, CrdtHttpSyncService httpSyncService) : ISyncable
+public class CrdtProjectSync(ISyncHttp restSyncClient, Guid projectId, Guid clientId, string originDomain, CrdtHttpSyncService httpSyncService) : ISyncable
 {
     public ValueTask<bool> ShouldSync()
     {
@@ -70,7 +70,7 @@ public ValueTask<bool> ShouldSync()
 
     async Task ISyncable.AddRangeFromSync(IEnumerable<Commit> commits)
     {
-        await restSyncClient.AddRange(projectId, commits);
+        await restSyncClient.AddRange(projectId, commits, clientId);
     }
 
     async Task<ChangesResult<Commit>> ISyncable.GetChanges(SyncState otherHeads)
@@ -104,7 +104,7 @@ public interface ISyncHttp
     Task<HttpResponseMessage> HealthCheck();
 
     [Post("/api/crdt/{id}/add")]
-    internal Task AddRange(Guid id, IEnumerable<Commit> commits);
+    internal Task AddRange(Guid id, IEnumerable<Commit> commits, Guid? clientId);
 
     [Get("/api/crdt/{id}/get")]
     internal Task<SyncState> GetSyncState(Guid id);

backend/FwLite/LocalWebApp/Services/LexboxProjectService.cs

@@ -90,10 +90,10 @@ public async Task ListenForProjectChanges(ProjectData projectData, CancellationT
 
         //it would be cleaner to pass the callback in to this method however it's not supposed to be generic, it should always trigger a sync
         connection.On(nameof(IProjectChangeListener.OnProjectUpdated),
-            (Guid projectId) =>
+            (Guid projectId, Guid? clientId) =>
             {
                 logger.LogInformation("Received project update for {ProjectId}, triggering sync", projectId);
-                backgroundSyncService.TriggerSync(projectId);
+                backgroundSyncService.TriggerSync(projectId, clientId);
                 return Task.CompletedTask;
             });
 

backend/FwLite/MiniLcm/Push/IProjectChangeListener.cs

@@ -2,5 +2,5 @@
 
 public interface IProjectChangeListener
 {
-    Task OnProjectUpdated(Guid projectId);
+    Task OnProjectUpdated(Guid projectId, Guid? clientId);
 }

backend/LexBoxApi/Controllers/CrdtController.cs

@@ -28,7 +28,7 @@ public async Task<ActionResult<SyncState>> GetSyncState(Guid projectId)
     }
 
     [HttpPost("{projectId}/add")]
-    public async Task<ActionResult> Add(Guid projectId, [FromBody] ServerCommit[] commits)
+    public async Task<ActionResult> Add(Guid projectId, [FromBody] ServerCommit[] commits, Guid? clientId)
     {
         await permissionService.AssertCanSyncProject(projectId);
         foreach (var commit in commits)
@@ -38,7 +38,7 @@ public async Task<ActionResult> Add(Guid projectId, [FromBody] ServerCommit[] co
         }
 
         await dbContext.SaveChangesAsync();
-        await hubContext.Clients.Group(CrdtProjectChangeHub.ProjectGroup(projectId)).OnProjectUpdated(projectId);
+        await hubContext.Clients.Group(CrdtProjectChangeHub.ProjectGroup(projectId)).OnProjectUpdated(projectId, clientId);
         return Ok();
     }