fix: resend client sources if usergroups are changed

olzzon · Jan 17, 2024 · b5a7212 · b5a7212
1 parent d6a525e
commit b5a7212
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/server/index.ts b/src/server/index.ts
@@ -12,15 +12,15 @@ import {
   filterSourcesForClient,
   hasSourceLinksChanged,
   updateRecievedSourceLink,
-  updateSettingsInSourceLinks
+  updateSettingsInSourceLinks,
 } from "./utils/handleSourceLinks";
 import { getSettings } from "./utils/storage";
 
 let oldSettings: ISource[] = [];
 let sourceLinks: ISource[] = [];
 const updateSourceListTimer = setInterval(() => {
   const settings = getSettings();
-  if (hasSourceLinksChanged(settings, oldSettings)) {    
+  if (hasSourceLinksChanged(settings, oldSettings)) {
     oldSettings = settings;
     sourceLinks = updateSettingsInSourceLinks(sourceLinks, settings);
   }
@@ -30,20 +30,28 @@ const updateSourceListTimer = setInterval(() => {
 io.on("connection", (socket: any) => {
   console.log("User connected :", socket.id);
   let clientUserGroups: string[];
+  let clientOldUserGroups: string[];
   let clientsOldSourceLinks: ISource[] = [];
 
   const sendSourcesToClient = () => {
-    if (hasSourceLinksChanged(clientsOldSourceLinks, sourceLinks)) {
       const clientSideSources = filterSourcesForClient(
         sourceLinks,
         clientUserGroups
       );
       console.log("Sending sources");
       socket.emit(IO.SOURCE_LIST, clientSideSources);
       clientsOldSourceLinks = JSON.parse(JSON.stringify(sourceLinks));
-    }
   };
-  const thisClientTimer = setInterval(() => sendSourcesToClient(), 1000);
+
+  const thisClientTimer = setInterval(() => {
+    if (
+      hasSourceLinksChanged(clientsOldSourceLinks, sourceLinks) ||
+      clientUserGroups !== clientOldUserGroups
+    ) {
+      clientOldUserGroups = clientUserGroups;
+      sendSourcesToClient();
+    }
+  }, 5000);
 
   socket
     .on(IO.GET_SOURCES, (userGroups: string[]) => {