From 4511af2fdc61881f3bd716ccd8008ac5ffc6a6e6 Mon Sep 17 00:00:00 2001
From: JasonReed-2 <Jreed21649@gmail.com>
Date: Sat, 14 Oct 2023 22:20:50 -0500
Subject: [PATCH 1/3] Client side of idle tracking

---
 .../components/battle/BattleComponent.vue     | 11 +++++++
 src/renderer/utils/idle-timer.ts              | 33 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 src/renderer/utils/idle-timer.ts

diff --git a/src/renderer/components/battle/BattleComponent.vue b/src/renderer/components/battle/BattleComponent.vue
index 22eb9404..14c928d3 100644
--- a/src/renderer/components/battle/BattleComponent.vue
+++ b/src/renderer/components/battle/BattleComponent.vue
@@ -215,6 +215,7 @@ import { AbstractBattle } from "@/model/battle/abstract-battle";
 import { StartPosType } from "@/model/battle/battle-types";
 import { LuaOptionSection } from "@/model/lua-options";
 import { CurrentUser } from "@/model/user";
+import { setIdleTimer } from "@/utils/idle-timer";
 import { StartBoxOrientation } from "@/utils/start-boxes";
 import { isOfflineBattle, isSpadsBattle } from "@/utils/type-checkers";
 
@@ -237,6 +238,8 @@ const gameOptionsOpen = ref(false);
 const gameOptions: Ref<LuaOptionSection[]> = ref([]);
 const isGameRunning = api.game.isGameRunning;
 
+setIdleTimer(onIdle, onBack, 5);
+
 function openMapList() {
     mapListOpen.value = true;
 }
@@ -335,6 +338,14 @@ function leave() {
 async function start() {
     props.battle.start();
 }
+
+function onIdle() {
+    console.log("Is Away!");
+}
+
+function onBack() {
+    console.log("Is Back!");
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/renderer/utils/idle-timer.ts b/src/renderer/utils/idle-timer.ts
new file mode 100644
index 00000000..dd0a7b36
--- /dev/null
+++ b/src/renderer/utils/idle-timer.ts
@@ -0,0 +1,33 @@
+import { onMounted, onUnmounted } from "vue";
+
+export function setIdleTimer(onIdle: () => void, onBack: () => void, seconds: number) {
+    let timer, timer_running;
+
+    setupTimer();
+
+    onMounted(() => {
+        window.addEventListener("mousemove", resetTimer);
+        window.addEventListener("keypress", resetTimer);
+    });
+
+    onUnmounted(() => {
+        window.removeEventListener("mousemove", resetTimer);
+        window.removeEventListener("keypress", resetTimer);
+    });
+
+    function setupTimer() {
+        timer = setTimeout(() => {
+            onIdle();
+            timer_running = false;
+        }, seconds * 1000);
+        timer_running = true;
+    }
+
+    function resetTimer() {
+        if (!timer_running) {
+            onBack();
+        }
+        clearTimeout(timer);
+        setupTimer();
+    }
+}

From ec925bf5411ec01cc15fcd6debd1cf4b05807469 Mon Sep 17 00:00:00 2001
From: JasonReed-2 <Jreed21649@gmail.com>
Date: Fri, 12 Jan 2024 20:06:42 -0600
Subject: [PATCH 2/3] Created an idleTimer composable

---
 src/renderer/App.vue                          |  6 ++++
 .../components/battle/BattleComponent.vue     | 14 +++++++--
 src/renderer/utils/idle-timer.ts              | 29 ++++++++++++++++---
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 8c31b030..018ee697 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -73,6 +73,7 @@ import Notifications from "@/components/notifications/Notifications.vue";
 import PromptContainer from "@/components/prompts/PromptContainer.vue";
 import { defaultMaps } from "@/config/default-maps";
 import { defaultEngineVersion, defaultGameVersion } from "@/config/default-versions";
+import { setIdleTimer } from "@/utils/idle-timer";
 import { playRandomMusic } from "@/utils/play-random-music";
 
 const router = useRouter();
@@ -100,6 +101,11 @@ provide("toggleFriends", toggleFriends);
 const toggleDownloads: Ref<((open?: boolean) => void) | undefined> = ref();
 provide("toggleDownloads", toggleDownloads);
 
+const setIdleBehavior = setIdleTimer({
+    onBack: () => {console.log("back")}
+});
+provide("idleTimer", setIdleBehavior)
+
 playRandomMusic();
 
 router.afterEach(async (to, from) => {
diff --git a/src/renderer/components/battle/BattleComponent.vue b/src/renderer/components/battle/BattleComponent.vue
index 14c928d3..9b41f341 100644
--- a/src/renderer/components/battle/BattleComponent.vue
+++ b/src/renderer/components/battle/BattleComponent.vue
@@ -197,7 +197,7 @@
 import { Icon } from "@iconify/vue";
 import cogIcon from "@iconify-icons/mdi/cog";
 import listIcon from "@iconify-icons/mdi/format-list-bulleted";
-import { computed, Ref, ref } from "vue";
+import { computed, inject, Ref, ref } from "vue";
 
 import BattleChat from "@/components/battle/BattleChat.vue";
 import BattleTitleComponent from "@/components/battle/BattleTitleComponent.vue";
@@ -215,7 +215,7 @@ import { AbstractBattle } from "@/model/battle/abstract-battle";
 import { StartPosType } from "@/model/battle/battle-types";
 import { LuaOptionSection } from "@/model/lua-options";
 import { CurrentUser } from "@/model/user";
-import { setIdleTimer } from "@/utils/idle-timer";
+import { IdleBehavior } from "@/utils/idle-timer";
 import { StartBoxOrientation } from "@/utils/start-boxes";
 import { isOfflineBattle, isSpadsBattle } from "@/utils/type-checkers";
 
@@ -238,7 +238,15 @@ const gameOptionsOpen = ref(false);
 const gameOptions: Ref<LuaOptionSection[]> = ref([]);
 const isGameRunning = api.game.isGameRunning;
 
-setIdleTimer(onIdle, onBack, 5);
+const updateIdleBehavior: ((update: IdleBehavior) => void) | undefined = inject("idleTimer")
+
+if (updateIdleBehavior != undefined) {
+    updateIdleBehavior({
+        onBack: () => {
+            console.log("Back in lobby!")
+        }
+    })
+}
 
 function openMapList() {
     mapListOpen.value = true;
diff --git a/src/renderer/utils/idle-timer.ts b/src/renderer/utils/idle-timer.ts
index dd0a7b36..fcfb5167 100644
--- a/src/renderer/utils/idle-timer.ts
+++ b/src/renderer/utils/idle-timer.ts
@@ -1,8 +1,20 @@
 import { onMounted, onUnmounted } from "vue";
 
-export function setIdleTimer(onIdle: () => void, onBack: () => void, seconds: number) {
+export interface IdleBehavior {
+    onIdle?: () => void
+    onBack?: () => void
+    seconds?: number 
+}
+
+export function setIdleTimer(initial: IdleBehavior) {
     let timer, timer_running;
 
+    const {onIdle, onBack, seconds} = initial;
+
+    let currentOnIdle = onIdle ?? (() => {let x});
+    let currentOnBack = onBack ?? (() => {let x});
+    let currentSeconds = seconds ?? 5;
+
     setupTimer();
 
     onMounted(() => {
@@ -17,17 +29,26 @@ export function setIdleTimer(onIdle: () => void, onBack: () => void, seconds: nu
 
     function setupTimer() {
         timer = setTimeout(() => {
-            onIdle();
+            currentOnIdle();
             timer_running = false;
-        }, seconds * 1000);
+        }, currentSeconds * 1000);
         timer_running = true;
     }
 
     function resetTimer() {
         if (!timer_running) {
-            onBack();
+            currentOnBack();
         }
         clearTimeout(timer);
         setupTimer();
     }
+
+    function setIdleBehavior(update: IdleBehavior) {
+        const {onIdle, onBack, seconds} = update;
+        if (onIdle != null) currentOnIdle = onIdle;
+        if (onBack != null) currentOnBack = onBack;
+        if (seconds != null) currentSeconds = seconds;
+    }
+    
+    return setIdleBehavior;
 }

From 248c25c17120af55d9f4c620cd2793092dfe125b Mon Sep 17 00:00:00 2001
From: JasonReed-2 <Jreed21649@gmail.com>
Date: Fri, 12 Jan 2024 20:16:05 -0600
Subject: [PATCH 3/3] formatting

---
 src/renderer/App.vue                          |  6 +++--
 .../components/battle/BattleComponent.vue     | 16 +++---------
 src/renderer/utils/idle-timer.ts              | 26 ++++++++++++-------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 018ee697..96ace067 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -102,9 +102,11 @@ const toggleDownloads: Ref<((open?: boolean) => void) | undefined> = ref();
 provide("toggleDownloads", toggleDownloads);
 
 const setIdleBehavior = setIdleTimer({
-    onBack: () => {console.log("back")}
+    onBack: () => {
+        console.log("back");
+    },
 });
-provide("idleTimer", setIdleBehavior)
+provide("idleTimer", setIdleBehavior);
 
 playRandomMusic();
 
diff --git a/src/renderer/components/battle/BattleComponent.vue b/src/renderer/components/battle/BattleComponent.vue
index 9b41f341..f435e815 100644
--- a/src/renderer/components/battle/BattleComponent.vue
+++ b/src/renderer/components/battle/BattleComponent.vue
@@ -238,14 +238,14 @@ const gameOptionsOpen = ref(false);
 const gameOptions: Ref<LuaOptionSection[]> = ref([]);
 const isGameRunning = api.game.isGameRunning;
 
-const updateIdleBehavior: ((update: IdleBehavior) => void) | undefined = inject("idleTimer")
+const updateIdleBehavior: ((update: IdleBehavior) => void) | undefined = inject("idleTimer");
 
 if (updateIdleBehavior != undefined) {
     updateIdleBehavior({
         onBack: () => {
-            console.log("Back in lobby!")
-        }
-    })
+            console.log("Back in lobby!");
+        },
+    });
 }
 
 function openMapList() {
@@ -346,14 +346,6 @@ function leave() {
 async function start() {
     props.battle.start();
 }
-
-function onIdle() {
-    console.log("Is Away!");
-}
-
-function onBack() {
-    console.log("Is Back!");
-}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/renderer/utils/idle-timer.ts b/src/renderer/utils/idle-timer.ts
index fcfb5167..26b7246b 100644
--- a/src/renderer/utils/idle-timer.ts
+++ b/src/renderer/utils/idle-timer.ts
@@ -1,18 +1,26 @@
 import { onMounted, onUnmounted } from "vue";
 
 export interface IdleBehavior {
-    onIdle?: () => void
-    onBack?: () => void
-    seconds?: number 
+    onIdle?: () => void;
+    onBack?: () => void;
+    seconds?: number;
 }
 
 export function setIdleTimer(initial: IdleBehavior) {
     let timer, timer_running;
 
-    const {onIdle, onBack, seconds} = initial;
-
-    let currentOnIdle = onIdle ?? (() => {let x});
-    let currentOnBack = onBack ?? (() => {let x});
+    const { onIdle, onBack, seconds } = initial;
+
+    let currentOnIdle =
+        onIdle ??
+        (() => {
+            let x;
+        });
+    let currentOnBack =
+        onBack ??
+        (() => {
+            let x;
+        });
     let currentSeconds = seconds ?? 5;
 
     setupTimer();
@@ -44,11 +52,11 @@ export function setIdleTimer(initial: IdleBehavior) {
     }
 
     function setIdleBehavior(update: IdleBehavior) {
-        const {onIdle, onBack, seconds} = update;
+        const { onIdle, onBack, seconds } = update;
         if (onIdle != null) currentOnIdle = onIdle;
         if (onBack != null) currentOnBack = onBack;
         if (seconds != null) currentSeconds = seconds;
     }
-    
+
     return setIdleBehavior;
 }