forvent string som WS melding

Author: Jesperpaulsen

v3/packages/dev-server/index.ts

@@ -76,7 +76,7 @@ const serve = () => {
     } else if (eventType === 'NY_AKTIV_ENHET') {
       context.aktivEnhet = verdi
     }
-    broadCastToClients({ type: 'control', data: eventType });
+    broadCastToClients(eventType);
 
     return new SuccessResponse({...context});
   });
@@ -137,10 +137,9 @@ const serve = () => {
     },
   });
 
-  const broadCastToClients = (message: any) => {
-    const stringifiedMessage = JSON.stringify(message);
+  const broadCastToClients = (message: string) => {
     for (const client of Object.values(clients)) {
-      client.send(stringifiedMessage);
+      client.send(message);
     }
   };
 

v3/packages/internarbeidsflate-decorator-v3/src/__mocks__/mock-handlers.ts

@@ -45,10 +45,6 @@ export const updateMockContext = (newContext: Partial<Context>) => {
   }
 };
 
-const controlSignal = (data: 'NY_AKTIV_ENHET' | 'NY_AKTIV_BRUKER') => {
-  return JSON.stringify({ type: 'control', data });
-};
-
 
 export const getHandlers = (
   ws: WS,
@@ -65,14 +61,14 @@ export const getHandlers = (
           return getErrorResponse();
         }
         context.aktivEnhet = verdi;
-        ws.send(controlSignal('NY_AKTIV_ENHET'));
+        ws.send('NY_AKTIV_ENHET');
         return getSuccessResponse();
       } else if (eventType === 'NY_AKTIV_BRUKER') {
         if (errorConfig.contextholder.updateBruker) {
           return getErrorResponse();
         }
         context.aktivBruker = verdi;
-        ws.send(controlSignal('NY_AKTIV_BRUKER'));
+        ws.send('NY_AKTIV_BRUKER');
         return getSuccessResponse();
       } else {
         return getErrorResponse();
@@ -83,15 +79,15 @@ export const getHandlers = (
         return getErrorResponse();
       }
       context.aktivEnhet = null;
-      ws.send(controlSignal('NY_AKTIV_ENHET'));
+      ws.send('NY_AKTIV_ENHET');
       return getSuccessResponse();
     }),
     http.delete(getUrl('/context/aktivbruker'), () => {
       if (errorConfig.contextholder.deleteBruker) {
         return getErrorResponse();
       }
       context.aktivBruker = null;
-      ws.send(controlSignal('NY_AKTIV_BRUKER'));
+      ws.send('NY_AKTIV_BRUKER');
       return getSuccessResponse();
     }),
     http.get(getUrl('/context/v2/aktivenhet'), () => {

v3/packages/internarbeidsflate-decorator-v3/src/store/EventHandler.ts

@@ -34,12 +34,12 @@ export class EventHandler extends SubstateHandler {
     this.registerShutdown('websocketwrapper', this.#webSocketWrapper.close);
   };
 
-  #onWSMessage = (message: MessageEvent) => {
-    const data = JSON.parse(message.data) as WebSocketMessage;
+  #onWSMessage = (message: MessageEvent<WebSocketMessage>) => {
+    const data = message.data;
     console.log('Recieved data', data);
-    if (data.data === 'NY_AKTIV_BRUKER') {
+    if (data === 'NY_AKTIV_BRUKER') {
       this.#handleFnrChangedExternally();
-    } else if (data.data === 'NY_AKTIV_ENHET') {
+    } else if (data === 'NY_AKTIV_ENHET') {
       this.#handleEnhetChangedExternally();
     }
   };

v3/packages/internarbeidsflate-decorator-v3/src/store/__test__/StoreHandler.test.ts

@@ -53,7 +53,7 @@ describe('StoreHandler test', () => {
   });
 
   const sendWSMessage = (message: 'NY_AKTIV_BRUKER' | 'NY_AKTIV_ENHET') => {
-    ws.send(JSON.stringify({ type: 'control', data: message }));
+    ws.send(message);
   };
 
   it('skal fungere så lenge den klarer å hente veileder detaljer', async () => {

v3/packages/internarbeidsflate-decorator-v3/src/types/WebsocketMessage.ts

@@ -1,6 +1,2 @@
-export type WebSocketMessageType = 'NY_AKTIV_BRUKER' | 'NY_AKTIV_ENHET';
+export type WebSocketMessage = 'NY_AKTIV_BRUKER' | 'NY_AKTIV_ENHET';
 
-export interface WebSocketMessage {
-  type: string;
-  data: WebSocketMessageType;
-}