From 4ffc3720fe4f9926096accdfd2b1f324040862a4 Mon Sep 17 00:00:00 2001
From: koningcool <justjoostnl@outlook.com>
Date: Sat, 25 Feb 2023 18:03:02 +0100
Subject: [PATCH] update to the improved analytics API

---
 src/main/main.js                       | 58 ++++++++++++++++++--------
 src/static/home/index.html             |  2 +-
 src/static/settings/colorSettings.html |  2 +-
 src/static/settings/settings.html      |  2 +-
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/main/main.js b/src/main/main.js
index dfdeb74..a4c25df 100644
--- a/src/main/main.js
+++ b/src/main/main.js
@@ -140,6 +140,8 @@ let allIkeaDevices = [];
 
 let noUpdateFound = false;
 
+let userActiveUniqueID;
+
 const Sentry = require("@sentry/electron");
 Sentry.init({
     dsn: "https://e64c3ec745124566b849043192e58711@o4504289317879808.ingest.sentry.io/4504289338392576",
@@ -188,6 +190,11 @@ function createWindow() {
             console.log(r)
         }
     })
+    getUniqueID().then(r => {
+        if (alwaysFalse) {
+            console.log(r)
+        }
+    });
     if (BrowserWindow.getAllWindows().length === 0) {
         setTimeout(function () {
             initIntegrations().then(r => {
@@ -251,18 +258,6 @@ app.whenReady().then(() => {
         })
     }
 
-    const body = JSON.stringify({
-        "userActive": "true"
-    });
-    const userActiveURL = APIURL + "/f1mv-lights-integration/analytics/useractive"
-    fetch(userActiveURL, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        body: body
-    })
-
     autoUpdater.checkForUpdates().then(r => {
         if (alwaysFalse) {
             console.log(r)
@@ -277,6 +272,18 @@ app.whenReady().then(() => {
     })
 })
 
+async function getUniqueID(){
+    const getUniqueIDURL = APIURL + "/f1mv-lights-integration/analytics/useractive/getUniqueID"
+    const response = await fetch(getUniqueIDURL, {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+    })
+    const data = await response.json()
+    userActiveUniqueID = data.uniqueID
+}
+
 app.on('window-all-closed', async () => {
     await sendAnalytics()
     if(streamDeckOnline){
@@ -829,6 +836,9 @@ async function simulateFlag(arg) {
 
 
 async function sendAllAPIStatus() {
+    if (userActiveUniqueID === undefined) {
+        await getUniqueID();
+    }
     if(!goveeDisabled && goveeInitialized){
         goveeOnline = govee.devicesArray.length > 0;
     } else {
@@ -2072,6 +2082,19 @@ async function checkMiscAPIS() {
         errorCheck = true;
     }
 
+    const userActiveURL = APIURL + "/f1mv-lights-integration/analytics/useractive"
+    const body = {
+        uniqueID: userActiveUniqueID,
+        userActive: true
+    }
+    await fetch(userActiveURL, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(body)
+    })
+
 
     const liveSessionCheckURL = APIURL + "/f1tv/live-session"
     const liveSessionRes = await fetch(liveSessionCheckURL)
@@ -2083,16 +2106,17 @@ async function sendAnalytics() {
     let analyticsIDReturned;
     let analyticsSuccess = false;
     let userActiveSuccess = false;
-    const userActiveBody = JSON.stringify({
-        "userActive": "false"
-    });
+    const userActiveBody = {
+        uniqueID: userActiveUniqueID,
+        userActive: false
+    }
     const userActiveURL = APIURL + "/f1mv-lights-integration/analytics/useractive"
     const userActiveRes = await fetch(userActiveURL, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json'
         },
-        body: userActiveBody
+        body: JSON.stringify(userActiveBody)
     });
     if (userActiveRes.status === 200) {
         userActiveSuccess = true;
@@ -2140,7 +2164,7 @@ async function sendAnalytics() {
             },
             body: JSON.stringify(data)
         }
-        const analyticsURL = APIURL + "/f1mv-lights-integration/analytics"
+        const analyticsURL = APIURL + "/f1mv-lights-integration/analytics/post"
         const response = await fetch(analyticsURL, options); {
             const responseData = await response.json();
             if (debugPreference) {
diff --git a/src/static/home/index.html b/src/static/home/index.html
index d6003e4..a90416d 100644
--- a/src/static/home/index.html
+++ b/src/static/home/index.html
@@ -35,7 +35,7 @@
                     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Pro 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></svg>
                 </a>
             </li>
-            <li><a align="left" id="versionNumber">V1.1.5</a></li>
+            <li><a align="left" id="versionNumber">V1.1.6</a></li>
         </ul>
     </div>
 </nav>
diff --git a/src/static/settings/colorSettings.html b/src/static/settings/colorSettings.html
index f016aa4..3cb41eb 100644
--- a/src/static/settings/colorSettings.html
+++ b/src/static/settings/colorSettings.html
@@ -35,7 +35,7 @@
                     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Pro 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></svg>
                 </a>
             </li>
-            <li><a align="left" id="versionNumber">V1.1.5</a></li>
+            <li><a align="left" id="versionNumber">V1.1.6</a></li>
         </ul>
     </div>
 </nav>
diff --git a/src/static/settings/settings.html b/src/static/settings/settings.html
index 746be3a..402adac 100644
--- a/src/static/settings/settings.html
+++ b/src/static/settings/settings.html
@@ -28,7 +28,7 @@
                     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Pro 6.2.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc. --><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></svg>
                 </a>
             </li>
-            <li><a align="left" id="versionNumber">V1.1.5</a></li>
+            <li><a align="left" id="versionNumber">V1.1.6</a></li>
         </ul>
     </div>
 </nav>