diff --git a/apps/client/src/common/utils/socket.ts b/apps/client/src/common/utils/socket.ts index 5b7310182..ce925b1d9 100644 --- a/apps/client/src/common/utils/socket.ts +++ b/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 - const { ping, ...serverPayload } = payload; - patchRuntime(serverPayload); - updateDevTools(serverPayload); - break; - } - case MessageTag.RuntimePatch: { - const patch = payload; - patchRuntime(patch); - updateDevTools(patch); + patchRuntime(payload); + updateDevTools(payload); break; } case MessageTag.Refetch: { diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts index 914ca1a11..361979638 100644 --- a/apps/server/src/app.ts +++ b/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 diff --git a/apps/server/src/stores/EventStore.ts b/apps/server/src/stores/EventStore.ts index fa58a8ecd..18134664b 100644 --- a/apps/server/src/stores/EventStore.ts +++ b/apps/server/src/stores/EventStore.ts @@ -23,7 +23,7 @@ export const eventStore = { }, set(key: T, value: RuntimeStore[T]) { store[key] = value; - socket.sendAsJson(MessageTag.RuntimePatch, { [key]: value }); + socket.sendAsJson(MessageTag.RuntimeData, { [key]: value }); }, createBatch() { const patch: Partial = {}; @@ -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); }, }; }, diff --git a/packages/types/src/api/websocket/data.type.ts b/packages/types/src/api/websocket/data.type.ts index 8c8a1ff3e..d66dc6659 100644 --- a/packages/types/src/api/websocket/data.type.ts +++ b/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 }; @@ -35,8 +34,7 @@ type ListClientPacket = { tag: MessageTag.ClientList; payload: Record; }; -type RuntimePacket = { tag: MessageTag.RuntimeData; payload: RuntimeStore }; -type RuntimePatchPacket = { tag: MessageTag.RuntimePatch; payload: Partial }; +type RuntimePacket = { tag: MessageTag.RuntimeData; payload: Partial }; type RefetchPacket = { tag: MessageTag.Refetch; @@ -59,5 +57,4 @@ export type WsPacketToClient = | LogPacket | ListClientPacket | RuntimePacket - | RuntimePatchPacket | RefetchPacket; diff --git a/packages/types/src/definitions/runtime/RuntimeStore.ts b/packages/types/src/definitions/runtime/RuntimeStore.ts index 5f0bd8de9..685561f75 100644 --- a/packages/types/src/definitions/runtime/RuntimeStore.ts +++ b/packages/types/src/definitions/runtime/RuntimeStore.ts @@ -64,5 +64,5 @@ export const runtimeStorePlaceholder: Readonly = { duration: 0, playback: SimplePlayback.Stop, }, - ping: -1, + ping: 1, };