From 68bf8558fddd56802063eb81d1987ee103b693a6 Mon Sep 17 00:00:00 2001
From: Roman Davydov <15850461+rdavydov@users.noreply.github.com>
Date: Tue, 31 Oct 2023 23:36:34 +0300
Subject: [PATCH 1/7] analytics-log prototype

---
 .../TwitchChannelPointsMiner.py               |  2 +-
 .../classes/AnalyticsServer.py                | 14 ++++++++
 assets/charts.html                            | 21 +++++++++---
 assets/dark-theme.css                         | 10 ++++++
 assets/script.js                              | 34 +++++++++++++++++++
 assets/style.css                              |  7 ++++
 6 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py
index 950c272a..f937351a 100644
--- a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py
+++ b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py
@@ -191,7 +191,7 @@ def analytics(
             from TwitchChannelPointsMiner.classes.AnalyticsServer import AnalyticsServer
 
             http_server = AnalyticsServer(
-                host=host, port=port, refresh=refresh, days_ago=days_ago
+                host=host, port=port, refresh=refresh, days_ago=days_ago, username=self.username
             )
             http_server.daemon = True
             http_server.name = "Analytics Thread"
diff --git a/TwitchChannelPointsMiner/classes/AnalyticsServer.py b/TwitchChannelPointsMiner/classes/AnalyticsServer.py
index 7b59c586..e3feff28 100644
--- a/TwitchChannelPointsMiner/classes/AnalyticsServer.py
+++ b/TwitchChannelPointsMiner/classes/AnalyticsServer.py
@@ -230,6 +230,7 @@ def __init__(
         port: int = 5000,
         refresh: int = 5,
         days_ago: int = 7,
+        username: str = None
     ):
         super(AnalyticsServer, self).__init__()
 
@@ -239,6 +240,17 @@ def __init__(
         self.port = port
         self.refresh = refresh
         self.days_ago = days_ago
+        self.username = username
+
+        def generate_log():
+            logs_path = os.path.join(Path().absolute(), "logs")
+            log_file_path = os.path.join(logs_path, f"{username}.log")
+            try:
+                with open(log_file_path, "r") as log_file:
+                    log_content = log_file.read()
+                    return Response(log_content, status=200, mimetype="text/plain")
+            except FileNotFoundError:
+                return Response("Log file not found.", status=404, mimetype="text/plain")
 
         self.app = Flask(
             __name__,
@@ -259,6 +271,8 @@ def __init__(
         )
         self.app.add_url_rule("/json_all", "json_all",
                               json_all, methods=["GET"])
+        self.app.add_url_rule(
+            "/log", "log", generate_log, methods=["GET"])
 
     def run(self):
         logger.info(
diff --git a/assets/charts.html b/assets/charts.html
index 39be35c6..d8e5efcc 100644
--- a/assets/charts.html
+++ b/assets/charts.html
@@ -27,14 +27,15 @@
     <div class="container has-text-centered" style="height: 100vh;">
         <div class="columns" id="header">
             <div class="column has-text-right">
-                <img style="margin-top: -20px;" width="600px" src="{{url_for('static', filename='banner.png')}}"
-                    alt="banner">
+                <a href="https://github.com/rdavydov/Twitch-Channel-Points-Miner-v2" target="_blank"><img
+                        style="margin-top: -20px;" width="600px" src="{{url_for('static', filename='banner.png')}}"
+                        alt="banner"></a>
             </div>
             <div class="column is-4 has-text-left" style="margin-top: 35px;">
                 <table>
                     <tr>
-                        <td>Tkd-Alex</td>
-                        <td>rdavydov</td>
+                        <td><a stylehref="https://github.com/Tkd-Alex" target="_blank">Tkd-Alex</a></td>
+                        <td><a href="https://github.com/rdavydov" target="_blank">rdavydov</a></td>
                     </tr>
                     <tr>
                         <td><a href="https://github.com/Tkd-Alex/Twitch-Channel-Points-Miner-v2/blob/master/LICENSE">
@@ -152,6 +153,10 @@
                 <input class="input" type="date" id="endDate">
             </div>
             <div class="column has-text-right" style="margin: auto">
+                <label class="checkbox checkbox-label">
+                    Log
+                    <input type="checkbox" checked="true" id="log">
+                </label>
                 <label class="checkbox checkbox-label">
                     Annotations
                     <input type="checkbox" checked="true" id="annotations">
@@ -176,6 +181,14 @@
                 <div class="box" id="chart" style="padding: 0.30rem;"></div>
             </div>
         </div>
+        <div class="columns">
+            <div class="column is-12">
+                <div class="box" id="log-box" style="padding: 0.30rem;">
+                    <pre
+                        id="log-content">In your run.py file set save=True in logger_settings to save logs to a file</pre>
+                </div>
+            </div>
+        </div>
     </div>
 </body>
 
diff --git a/assets/dark-theme.css b/assets/dark-theme.css
index f79bdc14..437a6769 100644
--- a/assets/dark-theme.css
+++ b/assets/dark-theme.css
@@ -2,6 +2,12 @@ body {
     background: #343E59;
     color: #fff;
 }
+a {
+    color: #fff;
+}
+a:hover {
+    color: #f9826c;
+}
 .box {
     background-color: #2B2D3E;
 }
@@ -27,3 +33,7 @@ body {
 .checkbox:hover{
     color: #f9826c;
 }
+#log-content {
+    color: #fff;
+    background-color: #2B2D3E;
+}
\ No newline at end of file
diff --git a/assets/script.js b/assets/script.js
index 48b67ae6..9864953a 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -91,6 +91,35 @@ var startDate = new Date();
 startDate.setDate(startDate.getDate() - daysAgo);
 var endDate = new Date();
 
+// Function to get the full log content
+function getFullLog() {
+    $.get("/log", function (data) {
+        // Update the log content with the full log
+        $("#log-content").text(data);
+        // Scroll to the bottom of the log content
+        $("#log-content").scrollTop($("#log-content")[0].scrollHeight);
+    });
+}
+
+// Function to continuously update the log content
+function updateLogContent() {
+    // Get the current log content
+    var currentLogContent = $("#log-content").text();
+
+    // Fetch the updated log content
+    $.get("/log", function (data) {
+        // If the log content has changed, update the displayed log
+        if (data !== currentLogContent) {
+            // Update the log content with the new log data
+            $("#log-content").text(data);
+            // Scroll to the bottom of the log content
+            $("#log-content").scrollTop($("#log-content")[0].scrollHeight);
+        }
+        // Schedule the next update after 1 second
+        setTimeout(updateLogContent, 1000);
+    });
+}
+
 $(document).ready(function () {
     // Retrieve the saved header visibility preference from localStorage
     var headerVisibility = localStorage.getItem('headerVisibility');
@@ -153,6 +182,11 @@ $(document).ready(function () {
 
     updateAnnotations();
     toggleDarkMode();
+
+    // Get the full log content when the document is ready
+    getFullLog();
+    // Start continuously updating the log content
+    updateLogContent();
 });
 
 function formatDate(date) {
diff --git a/assets/style.css b/assets/style.css
index 34a78e05..e11f2d9a 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -53,3 +53,10 @@ a {
 ::-webkit-scrollbar-thumb:hover {
     background-color: #a8bbbf;
 }
+
+#log-content {
+    text-align: left;
+    white-space: pre-wrap;
+    max-height: 500px;
+    padding: 0;
+}
\ No newline at end of file

From 7c80b16962c01c1523aefc13b3063a9b1377ef66 Mon Sep 17 00:00:00 2001
From: Roman Davydov <15850461+rdavydov@users.noreply.github.com>
Date: Tue, 31 Oct 2023 23:49:36 +0300
Subject: [PATCH 2/7] typo fix

---
 assets/charts.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/charts.html b/assets/charts.html
index d8e5efcc..e3fd5f1a 100644
--- a/assets/charts.html
+++ b/assets/charts.html
@@ -34,7 +34,7 @@
             <div class="column is-4 has-text-left" style="margin-top: 35px;">
                 <table>
                     <tr>
-                        <td><a stylehref="https://github.com/Tkd-Alex" target="_blank">Tkd-Alex</a></td>
+                        <td><a href="https://github.com/Tkd-Alex" target="_blank">Tkd-Alex</a></td>
                         <td><a href="https://github.com/rdavydov" target="_blank">rdavydov</a></td>
                     </tr>
                     <tr>

From 14e6645789d02f01cade9493532075b702931ce5 Mon Sep 17 00:00:00 2001
From: Roman Davydov <15850461+rdavydov@users.noreply.github.com>
Date: Tue, 31 Oct 2023 23:56:31 +0300
Subject: [PATCH 3/7] 1.8.9

---
 TwitchChannelPointsMiner/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TwitchChannelPointsMiner/__init__.py b/TwitchChannelPointsMiner/__init__.py
index 039dde84..44f8c186 100644
--- a/TwitchChannelPointsMiner/__init__.py
+++ b/TwitchChannelPointsMiner/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.8.8"
+__version__ = "1.8.9"
 from .TwitchChannelPointsMiner import TwitchChannelPointsMiner
 
 __all__ = [

From 08539794607d8e5b5b55119b8efe0fe35a203248 Mon Sep 17 00:00:00 2001
From: Roman Davydov <15850461+rdavydov@users.noreply.github.com>
Date: Wed, 1 Nov 2023 00:12:44 +0300
Subject: [PATCH 4/7] replit gitignore

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index ba8ac244..5ed07d3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -150,3 +150,8 @@ logs/*
 screenshots/*
 htmls/*
 analytics/*
+
+# Replit
+keep_replit_alive.py
+.replit
+replit.nix

From d8292f3875ed28e2a9629f46bf1cb527311a8adf Mon Sep 17 00:00:00 2001
From: Roman Davydov <15850461+rdavydov@users.noreply.github.com>
Date: Wed, 1 Nov 2023 22:30:12 +0300
Subject: [PATCH 5/7] fix #247 fix #317 fix #202

---
 .../classes/WebSocketsPool.py                 | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/TwitchChannelPointsMiner/classes/WebSocketsPool.py b/TwitchChannelPointsMiner/classes/WebSocketsPool.py
index 258b2b27..7af4c483 100644
--- a/TwitchChannelPointsMiner/classes/WebSocketsPool.py
+++ b/TwitchChannelPointsMiner/classes/WebSocketsPool.py
@@ -2,7 +2,9 @@
 import logging
 import random
 import time
+# import os
 from threading import Thread, Timer
+# from pathlib import Path
 
 from dateutil import parser
 
@@ -404,7 +406,25 @@ def on_message(ws, message):
                     )
 
         elif response["type"] == "RESPONSE" and len(response.get("error", "")) > 0:
-            raise RuntimeError(f"Error while trying to listen for a topic: {response}")
+            # raise RuntimeError(f"Error while trying to listen for a topic: {response}")
+            error_message = response.get("error", "")
+            logger.error(f"Error while trying to listen for a topic: {error_message}")
+            
+            # Check if the error message indicates an authentication issue (ERR_BADAUTH)
+            if "ERR_BADAUTH" in error_message:
+                # Inform the user about the potential outdated cookie file
+                username = ws.twitch.twitch_login.username
+                logger.error(f"Received the ERR_BADAUTH error, most likely you have an outdated cookie file \"cookies\\{username}.pkl\". Delete this file and try again.")
+                # Attempt to delete the outdated cookie file
+                # try:
+                #     cookie_file_path = os.path.join("cookies", f"{username}.pkl")
+                #     if os.path.exists(cookie_file_path):
+                #         os.remove(cookie_file_path)
+                #         logger.info(f"Deleted outdated cookie file for user: {username}")
+                #     else:
+                #         logger.warning(f"Cookie file not found for user: {username}")
+                # except Exception as e:
+                #     logger.error(f"Error occurred while deleting cookie file: {str(e)}")
 
         elif response["type"] == "RECONNECT":
             logger.info(f"#{ws.index} - Reconnection required")

From 7298d01d6ade537c5775350300ba5399910069a2 Mon Sep 17 00:00:00 2001
From: Roman Davydov <15850461+rdavydov@users.noreply.github.com>
Date: Thu, 2 Nov 2023 14:52:25 +0300
Subject: [PATCH 6/7] logCheckboxState logic

---
 assets/charts.html |  4 +--
 assets/script.js   | 86 +++++++++++++++++++++++++++++++---------------
 2 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/assets/charts.html b/assets/charts.html
index e3fd5f1a..3afb4c80 100644
--- a/assets/charts.html
+++ b/assets/charts.html
@@ -155,7 +155,7 @@
             <div class="column has-text-right" style="margin: auto">
                 <label class="checkbox checkbox-label">
                     Log
-                    <input type="checkbox" checked="true" id="log">
+                    <input type="checkbox" id="log">
                 </label>
                 <label class="checkbox checkbox-label">
                     Annotations
@@ -183,7 +183,7 @@
         </div>
         <div class="columns">
             <div class="column is-12">
-                <div class="box" id="log-box" style="padding: 0.30rem;">
+                <div class="box" id="log-box" style="padding: 0.30rem; display: none;">
                     <pre
                         id="log-content">In your run.py file set save=True in logger_settings to save logs to a file</pre>
                 </div>
diff --git a/assets/script.js b/assets/script.js
index 9864953a..2a4a7e5f 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -91,36 +91,43 @@ var startDate = new Date();
 startDate.setDate(startDate.getDate() - daysAgo);
 var endDate = new Date();
 
-// Function to get the full log content
-function getFullLog() {
-    $.get("/log", function (data) {
-        // Update the log content with the full log
-        $("#log-content").text(data);
-        // Scroll to the bottom of the log content
-        $("#log-content").scrollTop($("#log-content")[0].scrollHeight);
-    });
-}
-
-// Function to continuously update the log content
-function updateLogContent() {
-    // Get the current log content
-    var currentLogContent = $("#log-content").text();
+$(document).ready(function () {
+    // Variable to keep track of whether log checkbox is checked
+    var isLogCheckboxChecked = $('#log').prop('checked');
 
-    // Fetch the updated log content
-    $.get("/log", function (data) {
-        // If the log content has changed, update the displayed log
-        if (data !== currentLogContent) {
-            // Update the log content with the new log data
+    // Function to get the full log content
+    function getFullLog() {
+        $.get("/log", function (data) {
+            // Update the log content with the full log
             $("#log-content").text(data);
             // Scroll to the bottom of the log content
             $("#log-content").scrollTop($("#log-content")[0].scrollHeight);
+        });
+    }
+
+    // Function to continuously update the log content
+    function updateLogContent() {
+        if (isLogCheckboxChecked) {
+            // Get the current log content
+            var currentLogContent = $("#log-content").text();
+
+            // Fetch the updated log content
+            $.get("/log", function (data) {
+                // If the log checkbox is still checked, update the displayed log
+                if (isLogCheckboxChecked && data !== currentLogContent) {
+                    // Update the log content with the new log data
+                    $("#log-content").text(data);
+                    // Scroll to the bottom of the log content
+                    $("#log-content").scrollTop($("#log-content")[0].scrollHeight);
+                }
+                // Schedule the next update after 1 second if the log checkbox is still checked
+                if (isLogCheckboxChecked) {
+                    setTimeout(updateLogContent, 1000);
+                }
+            });
         }
-        // Schedule the next update after 1 second
-        setTimeout(updateLogContent, 1000);
-    });
-}
+    }
 
-$(document).ready(function () {
     // Retrieve the saved header visibility preference from localStorage
     var headerVisibility = localStorage.getItem('headerVisibility');
 
@@ -183,10 +190,33 @@ $(document).ready(function () {
     updateAnnotations();
     toggleDarkMode();
 
-    // Get the full log content when the document is ready
-    getFullLog();
-    // Start continuously updating the log content
-    updateLogContent();
+    // Retrieve log checkbox state from localStorage and update UI accordingly
+    var logCheckboxState = localStorage.getItem('logCheckboxState');
+    $('#log').prop('checked', logCheckboxState === 'true');
+    if (logCheckboxState === 'true') {
+        isLogCheckboxChecked = true;
+        $('#log-box').show();
+        // Get the full log content when the document is ready
+        getFullLog();
+        // Start continuously updating the log content
+        updateLogContent();
+    }
+
+    // Handle the log checkbox change event
+    $('#log').change(function () {
+        isLogCheckboxChecked = $(this).prop('checked');
+        localStorage.setItem('logCheckboxState', isLogCheckboxChecked);
+
+        if (isLogCheckboxChecked) {
+            $('#log-box').show();
+            getFullLog();
+            updateLogContent();
+        } else {
+            $('#log-box').hide();
+            // Clear log content when checkbox is unchecked
+            // $("#log-content").text('');
+        }
+    });
 });
 
 function formatDate(date) {

From 4a2edbb22e160c55810ae28db150f7aa8d8b004a Mon Sep 17 00:00:00 2001
From: Roman Davydov <15850461+rdavydov@users.noreply.github.com>
Date: Thu, 2 Nov 2023 16:48:38 +0300
Subject: [PATCH 7/7] get only new log entries

---
 .../classes/AnalyticsServer.py                | 14 +++++-
 assets/charts.html                            |  2 +-
 assets/script.js                              | 49 +++++++------------
 3 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/TwitchChannelPointsMiner/classes/AnalyticsServer.py b/TwitchChannelPointsMiner/classes/AnalyticsServer.py
index e3feff28..0aabbe10 100644
--- a/TwitchChannelPointsMiner/classes/AnalyticsServer.py
+++ b/TwitchChannelPointsMiner/classes/AnalyticsServer.py
@@ -222,6 +222,7 @@ def check_assets():
                 download_assets(assets_folder, required_files)
                 break
 
+last_sent_log_index = 0
 
 class AnalyticsServer(Thread):
     def __init__(
@@ -243,12 +244,23 @@ def __init__(
         self.username = username
 
         def generate_log():
+            global last_sent_log_index  # Use the global variable
+
+            # Get the last received log index from the client request parameters
+            last_received_index = int(request.args.get("lastIndex", last_sent_log_index))
+
             logs_path = os.path.join(Path().absolute(), "logs")
             log_file_path = os.path.join(logs_path, f"{username}.log")
             try:
                 with open(log_file_path, "r") as log_file:
                     log_content = log_file.read()
-                    return Response(log_content, status=200, mimetype="text/plain")
+
+                # Extract new log entries since the last received index
+                new_log_entries = log_content[last_received_index:]
+                last_sent_log_index = len(log_content)  # Update the last sent index
+
+                return Response(new_log_entries, status=200, mimetype="text/plain")
+
             except FileNotFoundError:
                 return Response("Log file not found.", status=404, mimetype="text/plain")
 
diff --git a/assets/charts.html b/assets/charts.html
index 3afb4c80..844bc630 100644
--- a/assets/charts.html
+++ b/assets/charts.html
@@ -185,7 +185,7 @@
             <div class="column is-12">
                 <div class="box" id="log-box" style="padding: 0.30rem; display: none;">
                     <pre
-                        id="log-content">In your run.py file set save=True in logger_settings to save logs to a file</pre>
+                        id="log-content">In your run.py file set save=True in logger_settings to save logs to a file.&#10;&#13;</pre>
                 </div>
             </div>
         </div>
diff --git a/assets/script.js b/assets/script.js
index 2a4a7e5f..5fc1d3ee 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -95,35 +95,23 @@ $(document).ready(function () {
     // Variable to keep track of whether log checkbox is checked
     var isLogCheckboxChecked = $('#log').prop('checked');
 
-    // Function to get the full log content
-    function getFullLog() {
-        $.get("/log", function (data) {
-            // Update the log content with the full log
-            $("#log-content").text(data);
-            // Scroll to the bottom of the log content
-            $("#log-content").scrollTop($("#log-content")[0].scrollHeight);
-        });
-    }
+    // Variable to keep track of the last received log index
+    var lastReceivedLogIndex = 0;
 
-    // Function to continuously update the log content
-    function updateLogContent() {
+    // Function to get the full log content
+    function getLog() {
         if (isLogCheckboxChecked) {
-            // Get the current log content
-            var currentLogContent = $("#log-content").text();
-
-            // Fetch the updated log content
-            $.get("/log", function (data) {
-                // If the log checkbox is still checked, update the displayed log
-                if (isLogCheckboxChecked && data !== currentLogContent) {
-                    // Update the log content with the new log data
-                    $("#log-content").text(data);
-                    // Scroll to the bottom of the log content
-                    $("#log-content").scrollTop($("#log-content")[0].scrollHeight);
-                }
-                // Schedule the next update after 1 second if the log checkbox is still checked
-                if (isLogCheckboxChecked) {
-                    setTimeout(updateLogContent, 1000);
-                }
+            $.get(`/log?lastIndex=${lastReceivedLogIndex}`, function (data) {
+                // Process and display the new log entries received
+                $("#log-content").append(data);
+                // Scroll to the bottom of the log content
+                $("#log-content").scrollTop($("#log-content")[0].scrollHeight);
+
+                // Update the last received log index
+                lastReceivedLogIndex += data.length;
+
+                // Call getLog() again after a certain interval (e.g., 1 second)
+                setTimeout(getLog, 1000);
             });
         }
     }
@@ -196,10 +184,8 @@ $(document).ready(function () {
     if (logCheckboxState === 'true') {
         isLogCheckboxChecked = true;
         $('#log-box').show();
-        // Get the full log content when the document is ready
-        getFullLog();
         // Start continuously updating the log content
-        updateLogContent();
+        getLog();
     }
 
     // Handle the log checkbox change event
@@ -209,8 +195,7 @@ $(document).ready(function () {
 
         if (isLogCheckboxChecked) {
             $('#log-box').show();
-            getFullLog();
-            updateLogContent();
+            getLog();
         } else {
             $('#log-box').hide();
             // Clear log content when checkbox is unchecked