From 5a1147866cffbaba1c92e389cd6fe87ed30222c9 Mon Sep 17 00:00:00 2001
From: kharhamel <oognic@gmail.com>
Date: Tue, 10 Nov 2020 15:24:02 +0100
Subject: [PATCH] FIX: in dev mode, sockets won't be closed to prevent
 conflicts with live-reloading

---
 back/src/Enum/EnvironmentVariable.ts | 2 ++
 back/src/Services/IoSocketHelpers.ts | 2 ++
 docker-compose.yaml                  | 1 +
 3 files changed, 5 insertions(+)

diff --git a/back/src/Enum/EnvironmentVariable.ts b/back/src/Enum/EnvironmentVariable.ts
index 55fd1bb7..8be8d54d 100644
--- a/back/src/Enum/EnvironmentVariable.ts
+++ b/back/src/Enum/EnvironmentVariable.ts
@@ -10,6 +10,7 @@ const CPU_OVERHEAT_THRESHOLD = Number(process.env.CPU_OVERHEAT_THRESHOLD) || 80;
 const JITSI_URL : string|undefined = (process.env.JITSI_URL === '') ? undefined : process.env.JITSI_URL;
 const JITSI_ISS = process.env.JITSI_ISS || '';
 const SECRET_JITSI_KEY = process.env.SECRET_JITSI_KEY || '';
+const DEV_MODE = process.env.DEV_MODE || false;
 
 export {
     SECRET_KEY,
@@ -21,6 +22,7 @@ export {
     GROUP_RADIUS,
     ALLOW_ARTILLERY,
     CPU_OVERHEAT_THRESHOLD,
+    DEV_MODE,
     JITSI_URL,
     JITSI_ISS,
     SECRET_JITSI_KEY
diff --git a/back/src/Services/IoSocketHelpers.ts b/back/src/Services/IoSocketHelpers.ts
index acaa0bb9..1dbfa0bd 100644
--- a/back/src/Services/IoSocketHelpers.ts
+++ b/back/src/Services/IoSocketHelpers.ts
@@ -1,5 +1,6 @@
 import {ExSocketInterface} from "_Model/Websocket/ExSocketInterface";
 import {BatchMessage, ErrorMessage, ServerToClientMessage, SubMessage} from "../Messages/generated/messages_pb";
+import {DEV_MODE} from "../Enum/EnvironmentVariable";
 
 export function emitInBatch(socket: ExSocketInterface, payload: SubMessage): void {
     socket.batchedMessages.addPayload(payload);
@@ -52,6 +53,7 @@ export function emitError(Client: ExSocketInterface, message: string): void {
 export const pongMaxInterval = 30000; // the maximum duration (in ms) between pongs before we shutdown the connexion.
 
 export function refresLogoutTimerOnPong(ws: ExSocketInterface): void {
+    if (DEV_MODE) return; //this feature is disabled in dev mode as it clashes with live reload.
     if(ws.pongTimeout) clearTimeout(ws.pongTimeout);
     ws.pongTimeout = setTimeout(() => {
         ws.close();
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 482dfbcb..5deccb4d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -78,6 +78,7 @@ services:
       ADMIN_API_TOKEN: "$ADMIN_API_TOKEN"
       JITSI_URL: $JITSI_URL
       JITSI_ISS: $JITSI_ISS
+      DEV_MODE: "1"
     volumes:
       - ./back:/usr/src/app
     labels: