refactor: simplify messages

apps/client/src/common/utils/socket.ts

@@ -142,16 +142,8 @@ export const connectSocket = () => {
           break;
         }
         case MessageTag.RuntimeData: {
-          // eslint-disable-next-line @typescript-eslint/no-unused-vars -- removing the key from the payload
+          patchRuntime(payload);
-          const { ping, ...serverPayload } = payload;
+          updateDevTools(payload);
-          patchRuntime(serverPayload);
-          updateDevTools(serverPayload);
-          break;
-        }
-        case MessageTag.RuntimePatch: {
-          const patch = payload;
-          patchRuntime(patch);
-          updateDevTools(patch);
           break;
         }
         case MessageTag.Refetch: {

apps/server/src/app.ts

@@ -208,7 +208,7 @@ export const startServer = async (): Promise<{ message: string; serverPort: numb
       playback: SimplePlayback.Stop,
       direction: SimpleDirection.CountDown,
     },
-    ping: -1,
+    ping: 1,
   });
 
   // initialise rundown service

apps/server/src/stores/EventStore.ts

@@ -23,7 +23,7 @@ export const eventStore = {
   },
   set<T extends keyof RuntimeStore>(key: T, value: RuntimeStore[T]) {
     store[key] = value;
-    socket.sendAsJson(MessageTag.RuntimePatch, { [key]: value });
+    socket.sendAsJson(MessageTag.RuntimeData, { [key]: value });
   },
   createBatch() {
     const patch: Partial<RuntimeStore> = {};
@@ -34,7 +34,7 @@ export const eventStore = {
       send() {
         if (isEmptyObject(patch)) return;
         store = { ...store, ...patch };
-        socket.sendAsJson(MessageTag.RuntimePatch, patch);
+        socket.sendAsJson(MessageTag.RuntimeData, patch);
       },
     };
   },

packages/types/src/api/websocket/data.type.ts

@@ -16,11 +16,10 @@ export enum MessageTag {
   Dialog = 'dialog',
   Log = 'log',
   RuntimeData = 'runtime-data',
-  RuntimePatch = 'runtime-patch',
   Refetch = 'refetch',
 }
 
-//CLIENT TO SERVER
+// CLIENT TO SERVER
 type PingPacket = { tag: MessageTag.Ping; payload: Date };
 type SetClientPacket = { tag: MessageTag.ClientSetPath; payload: string };
 type SetClientPathPacket = { tag: MessageTag.ClientSet; payload: Partial<Client> };
@@ -35,8 +34,7 @@ type ListClientPacket = {
   tag: MessageTag.ClientList;
   payload: Record<string, Client>;
 };
-type RuntimePacket = { tag: MessageTag.RuntimeData; payload: RuntimeStore };
+type RuntimePacket = { tag: MessageTag.RuntimeData; payload: Partial<RuntimeStore> };
-type RuntimePatchPacket = { tag: MessageTag.RuntimePatch; payload: Partial<RuntimeStore> };
 
 type RefetchPacket = {
   tag: MessageTag.Refetch;
@@ -59,5 +57,4 @@ export type WsPacketToClient =
   | LogPacket
   | ListClientPacket
   | RuntimePacket
-  | RuntimePatchPacket
   | RefetchPacket;

packages/types/src/definitions/runtime/RuntimeStore.ts

@@ -64,5 +64,5 @@ export const runtimeStorePlaceholder: Readonly<RuntimeStore> = {
     duration: 0,
     playback: SimplePlayback.Stop,
   },
-  ping: -1,
+  ping: 1,
 };