resize terminal on animation end

.gitignore

@@ -15,3 +15,6 @@ nohup.out
 points.csv
 file.png
 user_data/configs.json
+*.ts
+LICENSE
+README.md

Flask/start.sh

@@ -1,5 +1,5 @@
-nohup bash /app/MsRewards-Reborn/sse.sh &
+nohup redis-server &> nohup_redis.out &
+nohup bash /app/MsRewards-Reborn/sse.sh &> nohup_sse.out &
 service grafana-server start
 service nginx start
-nohup redis-server &
 gunicorn --reload --worker-class gevent -b 0.0.0.0:6666 'app:app'

Flask/static/node_modules/.package-lock.json

@@ -0,0 +1,20 @@
+{
+  "name": "static",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "node_modules/xterm": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz",
+      "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg=="
+    },
+    "node_modules/xterm-addon-fit": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.8.0.tgz",
+      "integrity": "sha512-yj3Np7XlvxxhYF/EJ7p3KHaMt6OdwQ+HDu573Vx1lRXsVxOcnVJs51RgjZOouIZOczTsskaS+CpXspK81/DLqw==",
+      "peerDependencies": {
+        "xterm": "^5.0.0"
+      }
+    }
+  }
+}

Flask/static/node_modules/xterm-addon-fit/lib/xterm-addon-fit.js

@@ -0,0 +1,2 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.FitAddon=t():e.FitAddon=t()}(self,(()=>(()=>{"use strict";var e={};return(()=>{var t=e;Object.defineProperty(t,"__esModule",{value:!0}),t.FitAddon=void 0,t.FitAddon=class{activate(e){this._terminal=e}dispose(){}fit(){const e=this.proposeDimensions();if(!e||!this._terminal||isNaN(e.cols)||isNaN(e.rows))return;const t=this._terminal._core;this._terminal.rows===e.rows&&this._terminal.cols===e.cols||(t._renderService.clear(),this._terminal.resize(e.cols,e.rows))}proposeDimensions(){if(!this._terminal)return;if(!this._terminal.element||!this._terminal.element.parentElement)return;const e=this._terminal._core,t=e._renderService.dimensions;if(0===t.css.cell.width||0===t.css.cell.height)return;const r=0===this._terminal.options.scrollback?0:e.viewport.scrollBarWidth,i=window.getComputedStyle(this._terminal.element.parentElement),o=parseInt(i.getPropertyValue("height")),s=Math.max(0,parseInt(i.getPropertyValue("width"))),n=window.getComputedStyle(this._terminal.element),l=o-(parseInt(n.getPropertyValue("padding-top"))+parseInt(n.getPropertyValue("padding-bottom"))),a=s-(parseInt(n.getPropertyValue("padding-right"))+parseInt(n.getPropertyValue("padding-left")))-r;return{cols:Math.max(2,Math.floor(a/t.css.cell.width)),rows:Math.max(1,Math.floor(l/t.css.cell.height))}}}})(),e})()));
+//# sourceMappingURL=xterm-addon-fit.js.map

Flask/static/node_modules/xterm-addon-fit/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "xterm-addon-fit",
+  "version": "0.8.0",
+  "author": {
+    "name": "The xterm.js authors",
+    "url": "https://xtermjs.org/"
+  },
+  "main": "lib/xterm-addon-fit.js",
+  "types": "typings/xterm-addon-fit.d.ts",
+  "repository": "https://github.com/xtermjs/xterm.js",
+  "license": "MIT",
+  "keywords": [
+    "terminal",
+    "xterm",
+    "xterm.js"
+  ],
+  "scripts": {
+    "build": "../../node_modules/.bin/tsc -p .",
+    "prepackage": "npm run build",
+    "package": "../../node_modules/.bin/webpack",
+    "prepublishOnly": "npm run package"
+  },
+  "peerDependencies": {
+    "xterm": "^5.0.0"
+  }
+}

Flask/static/node_modules/xterm/css/xterm.css

@@ -0,0 +1,209 @@
+/**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * https://github.com/chjj/term.js
+ * @license MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Originally forked from (with the author's permission):
+ *   Fabrice Bellard's javascript vt100 for jslinux:
+ *   http://bellard.org/jslinux/
+ *   Copyright (c) 2011 Fabrice Bellard
+ *   The original design remains. The terminal itself
+ *   has been extended to include xterm CSI codes, among
+ *   other features.
+ */
+
+/**
+ *  Default styles for xterm.js
+ */
+
+.xterm {
+    cursor: text;
+    position: relative;
+    user-select: none;
+    -ms-user-select: none;
+    -webkit-user-select: none;
+}
+
+.xterm.focus,
+.xterm:focus {
+    outline: none;
+}
+
+.xterm .xterm-helpers {
+    position: absolute;
+    top: 0;
+    /**
+     * The z-index of the helpers must be higher than the canvases in order for
+     * IMEs to appear on top.
+     */
+    z-index: 5;
+}
+
+.xterm .xterm-helper-textarea {
+    padding: 0;
+    border: 0;
+    margin: 0;
+    /* Move textarea out of the screen to the far left, so that the cursor is not visible */
+    position: absolute;
+    opacity: 0;
+    left: -9999em;
+    top: 0;
+    width: 0;
+    height: 0;
+    z-index: -5;
+    /** Prevent wrapping so the IME appears against the textarea at the correct position */
+    white-space: nowrap;
+    overflow: hidden;
+    resize: none;
+}
+
+.xterm .composition-view {
+    /* TODO: Composition position got messed up somewhere */
+    background: #000;
+    color: #FFF;
+    display: none;
+    position: absolute;
+    white-space: nowrap;
+    z-index: 1;
+}
+
+.xterm .composition-view.active {
+    display: block;
+}
+
+.xterm .xterm-viewport {
+    /* On OS X this is required in order for the scroll bar to appear fully opaque */
+    background-color: #000;
+    overflow-y: scroll;
+    cursor: default;
+    position: absolute;
+    right: 0;
+    left: 0;
+    top: 0;
+    bottom: 0;
+}
+
+.xterm .xterm-screen {
+    position: relative;
+}
+
+.xterm .xterm-screen canvas {
+    position: absolute;
+    left: 0;
+    top: 0;
+}
+
+.xterm .xterm-scroll-area {
+    visibility: hidden;
+}
+
+.xterm-char-measure-element {
+    display: inline-block;
+    visibility: hidden;
+    position: absolute;
+    top: 0;
+    left: -9999em;
+    line-height: normal;
+}
+
+.xterm.enable-mouse-events {
+    /* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
+    cursor: default;
+}
+
+.xterm.xterm-cursor-pointer,
+.xterm .xterm-cursor-pointer {
+    cursor: pointer;
+}
+
+.xterm.column-select.focus {
+    /* Column selection mode */
+    cursor: crosshair;
+}
+
+.xterm .xterm-accessibility,
+.xterm .xterm-message {
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 10;
+    color: transparent;
+    pointer-events: none;
+}
+
+.xterm .live-region {
+    position: absolute;
+    left: -9999px;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+}
+
+.xterm-dim {
+    /* Dim should not apply to background, so the opacity of the foreground color is applied
+     * explicitly in the generated class and reset to 1 here */
+    opacity: 1 !important;
+}
+
+.xterm-underline-1 { text-decoration: underline; }
+.xterm-underline-2 { text-decoration: double underline; }
+.xterm-underline-3 { text-decoration: wavy underline; }
+.xterm-underline-4 { text-decoration: dotted underline; }
+.xterm-underline-5 { text-decoration: dashed underline; }
+
+.xterm-overline {
+    text-decoration: overline;
+}
+
+.xterm-overline.xterm-underline-1 { text-decoration: overline underline; }
+.xterm-overline.xterm-underline-2 { text-decoration: overline double underline; }
+.xterm-overline.xterm-underline-3 { text-decoration: overline wavy underline; }
+.xterm-overline.xterm-underline-4 { text-decoration: overline dotted underline; }
+.xterm-overline.xterm-underline-5 { text-decoration: overline dashed underline; }
+
+.xterm-strikethrough {
+    text-decoration: line-through;
+}
+
+.xterm-screen .xterm-decoration-container .xterm-decoration {
+	z-index: 6;
+	position: absolute;
+}
+
+.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer {
+	z-index: 7;
+}
+
+.xterm-decoration-overview-ruler {
+    z-index: 8;
+    position: absolute;
+    top: 0;
+    right: 0;
+    pointer-events: none;
+}
+
+.xterm-decoration-top {
+    z-index: 2;
+    position: relative;
+}

Flask/static/node_modules/xterm/package.json

@@ -0,0 +1,100 @@
+{
+  "name": "xterm",
+  "description": "Full xterm terminal, in your browser",
+  "version": "5.3.0",
+  "main": "lib/xterm.js",
+  "style": "css/xterm.css",
+  "types": "typings/xterm.d.ts",
+  "repository": "https://github.com/xtermjs/xterm.js",
+  "license": "MIT",
+  "keywords": [
+    "cli",
+    "command-line",
+    "console",
+    "pty",
+    "shell",
+    "ssh",
+    "styles",
+    "terminal-emulator",
+    "terminal",
+    "tty",
+    "vt100",
+    "webgl",
+    "xterm"
+  ],
+  "scripts": {
+    "prepackage": "npm run build",
+    "package": "webpack",
+    "package-headless": "webpack --config ./webpack.config.headless.js",
+    "postpackage-headless": "node ./bin/package_headless.js",
+    "start": "node demo/start",
+    "build-demo": "webpack --config ./demo/webpack.config.js",
+    "start-debug": "node --inspect-brk demo/start",
+    "lint": "eslint -c .eslintrc.json --max-warnings 0 --ext .ts src/ addons/",
+    "lint-api": "eslint --no-eslintrc -c .eslintrc.json.typings --max-warnings 0 --no-ignore --ext .d.ts typings/",
+    "test": "npm run test-unit",
+    "posttest": "npm run lint",
+    "test-api": "npm run test-api-chromium",
+    "test-api-chromium": "node ./bin/test_api.js --browser=chromium --timeout=20000",
+    "test-api-firefox": "node ./bin/test_api.js --browser=firefox --timeout=20000",
+    "test-api-webkit": "node ./bin/test_api.js --browser=webkit --timeout=20000",
+    "test-playwright": "playwright test -c ./out-test/playwright/playwright.config.js --workers 4",
+    "test-playwright-chromium": "playwright test -c ./out-test/playwright/playwright.config.js --workers 4 --project='Chrome Stable'",
+    "test-playwright-firefox": "playwright test -c ./out-test/playwright/playwright.config.js --workers 4 --project='Firefox Stable'",
+    "test-playwright-webkit": "playwright test -c ./out-test/playwright/playwright.config.js --workers 4 --project='WebKit'",
+    "test-playwright-debug": "playwright test -c ./out-test/playwright/playwright.config.js --headed --workers 1 --timeout 30000",
+    "test-unit": "node ./bin/test.js",
+    "test-unit-coverage": "node ./bin/test.js --coverage",
+    "test-unit-dev": "cross-env NODE_PATH='./out' mocha",
+    "build": "tsc -b ./tsconfig.all.json",
+    "install-addons": "node ./bin/install-addons.js",
+    "presetup": "npm run install-addons",
+    "setup": "npm run build",
+    "prepublishOnly": "npm run package",
+    "watch": "tsc -b -w ./tsconfig.all.json --preserveWatchOutput",
+    "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json",
+    "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --baseline out-test/benchmark/test/benchmark/*benchmark.js",
+    "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c test/benchmark/benchmark.json --eval out-test/benchmark/test/benchmark/*benchmark.js",
+    "clean": "rm -rf lib out addons/*/lib addons/*/out",
+    "vtfeatures": "node bin/extract_vtfeatures.js src/**/*.ts src/*.ts"
+  },
+  "devDependencies": {
+    "@playwright/test": "^1.37.1",
+    "@types/chai": "^4.2.22",
+    "@types/debug": "^4.1.7",
+    "@types/deep-equal": "^1.0.1",
+    "@types/express": "4",
+    "@types/express-ws": "^3.0.1",
+    "@types/glob": "^7.2.0",
+    "@types/jsdom": "^16.2.13",
+    "@types/mocha": "^9.0.0",
+    "@types/node": "^18.16.0",
+    "@types/utf8": "^3.0.0",
+    "@types/webpack": "^5.28.0",
+    "@types/ws": "^8.2.0",
+    "@typescript-eslint/eslint-plugin": "^6.2.00",
+    "@typescript-eslint/parser": "^6.2.00",
+    "chai": "^4.3.4",
+    "cross-env": "^7.0.3",
+    "deep-equal": "^2.0.5",
+    "eslint": "^8.45.0",
+    "eslint-plugin-jsdoc": "^39.3.6",
+    "express": "^4.17.1",
+    "express-ws": "^5.0.2",
+    "glob": "^7.2.0",
+    "jsdom": "^18.0.1",
+    "mocha": "^10.1.0",
+    "mustache": "^4.2.0",
+    "node-pty": "^0.10.1",
+    "nyc": "^15.1.0",
+    "source-map-loader": "^3.0.0",
+    "source-map-support": "^0.5.20",
+    "ts-loader": "^9.3.1",
+    "typescript": "^5.1.6",
+    "utf8": "^3.0.0",
+    "webpack": "^5.61.0",
+    "webpack-cli": "^4.9.1",
+    "ws": "^8.2.3",
+    "xterm-benchmark": "^0.3.1"
+  }
+}

Flask/static/package-lock.json

@@ -0,0 +1,26 @@
+{
+  "name": "static",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "xterm": "^5.3.0",
+        "xterm-addon-fit": "^0.8.0"
+      }
+    },
+    "node_modules/xterm": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/xterm/-/xterm-5.3.0.tgz",
+      "integrity": "sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg=="
+    },
+    "node_modules/xterm-addon-fit": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/xterm-addon-fit/-/xterm-addon-fit-0.8.0.tgz",
+      "integrity": "sha512-yj3Np7XlvxxhYF/EJ7p3KHaMt6OdwQ+HDu573Vx1lRXsVxOcnVJs51RgjZOouIZOczTsskaS+CpXspK81/DLqw==",
+      "peerDependencies": {
+        "xterm": "^5.0.0"
+      }
+    }
+  }
+}

Flask/static/package.json

@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "xterm": "^5.3.0",
+    "xterm-addon-fit": "^0.8.0"
+  }
+}

Flask/templates/vnc_post.html

@@ -1,35 +1,48 @@
-
 {% extends "base.html" %}
 {% block left_pannel %}override{% endblock %}
 
 {% block content %}
 
-{%if not current_user.is_authenticated %}
-    <button class="unselected" onclick="location.href = '/login';">login</button>
-{% else %}
-<table>
-    <tr>
-        <td width="20%" height="90%">
-            <div id="console"></div>
-        </td>
-        <td width="80%">
-            <iframe src="/novnc/vnc.html?resize=scale&path=novnc/websockify&autoconnect=true&view_only" width="100%" height="100%" frameborder="0"></iframe>
-        </td>
-    </tr>
-</table>
+    {% if not current_user.is_authenticated %}
+        <button class="unselected" onclick="location.href = '/login';">login</button>
+    {% else %}
+        <link rel="stylesheet" href="{{ url_for('static', filename='node_modules/xterm/css/xterm.css') }}"/>
+        <script src="{{ url_for('static', filename='node_modules/xterm/lib/xterm.js') }}"></script>
+        <script src="{{ url_for('static', filename='node_modules/xterm-addon-fit/lib/xterm-addon-fit.js') }}"></script>
+        <script>
+            document.getElementsByClassName("content")[0].style.padding = "0 0"
+        </script>
+        <div style="height: 100%">
 
+            <div id="console" style="height: 100%; width: 20%; float:left;"></div>
 
+            <div style="height: 100%; width: 80%; float:left;">
+                <iframe src="/novnc/vnc.html?resize=scale&path=novnc/websockify&autoconnect=true&view_only"
+                        width="100%" height="100%" frameborder="0"></iframe>
+            </div>
+        </div>
 
-<script>
-    const consoleElement = document.getElementById('console');
-    const eventSource = new EventSource('/stream');
+        <script>
+            var term = new Terminal();
+            const fitAddon = new FitAddon.FitAddon();
+            term.loadAddon(fitAddon);
+            term.open(document.getElementById('console'));
+            fitAddon.fit()
+            addEventListener("transitionend", (event) => {
+                fitAddon.fit()
+            });
 
-    eventSource.onmessage = (event) => {
-        document.getElementById("console").innerHTML = event.data + document.getElementById("console").innerHTML
-    };
-    
-</script>
+            document.getElementById("console").style.textAlign = "left"
+            const eventSource = new EventSource('/stream');
 
-{% endif %}
+            eventSource.onmessage = (event) => {
+                term.writeln(event.data)
+            };
+            addEventListener("resize", (event) => {
+                fitAddon.fit()
+            });
+        </script>
 
-{%endblock %}
+    {% endif %}
+
+{% endblock %}

V6.py

@@ -12,21 +12,21 @@ from modules.error import *
 
 # create a webdriver 
 def create_driver(mobile=False):
-    PC_USER_AGENT = (
+    pc_user_agent = (
         "Mozilla/5.0 (X11; Linux x86_64)"
         "AppleWebKit/537.36 (KHTML, like Gecko)"
         "Chrome/122.0.0.0 Safari/537.36 Edg/122.0.2088.46"
     )
-    MOBILE_USER_AGENT = (
+    mobile_user_agent = (
         "Mozilla/5.0 (Linux; Android 7.0; Nexus 5 Build/MRA58N)"
         "AppleWebKit/537.36 (KHTML, like Gecko)"
         "Chrome/22 Mobile Safari/537.36"
     )
     chrome_options = webdriver.ChromeOptions()
     if mobile:
-        chrome_options.add_argument(f"--user-agent={MOBILE_USER_AGENT}")
+        chrome_options.add_argument(f"--user-agent={mobile_user_agent}")
     else:
-        chrome_options.add_argument(f"--user-agent={PC_USER_AGENT}")
+        chrome_options.add_argument(f"--user-agent={pc_user_agent}")
     # disabled as it may cause detection
     if config.proxy.is_enabled():
         chrome_options.add_argument(f'--proxy-server={config.proxy.ip}:{config.proxy.port}')
@@ -54,8 +54,12 @@ def play_quiz2(override=10) -> None:
         custom_sleep(uniform(3, 5))
         js_function = """
         function get_correct_answer(){
-            function br(n) { for (var r, t = 0, i = 0; i < n.length; i++)t += n.charCodeAt(i); return r = parseInt(_G.IG.substr(_G.IG.length - 2), 16), t += r, t.toString() } // Ms check function
-            function namedRAValue() { //allow calls to getRAvalue
+            function br(n) { 
+                for (var r, t = 0, i = 0; i < n.length; i++)
+                    t += n.charCodeAt(i);
+                return r = parseInt(_G.IG.substr(_G.IG.length - 2), 16), t += r, t.toString() 
+            } // Ms check function
+            function namedRAValue() { //allow calls to getRAValue
                 return _w.getRAValue()
             }; 
             if (br(document.getElementById("rqAnswerOption0").attributes["data-option"].value) == namedRAValue()){
@@ -91,13 +95,13 @@ def play_quiz8():
         for _ in range(override):
             sleep(uniform(3, 5))
             correct_answers = []
-            for i in range(1, 9):  # todo: remove this odd 1-offset
+            for i in range(8):
                 try:
-                    element = driver.find_element(By.ID, f"rqAnswerOption{i - 1}")
+                    element = driver.find_element(By.ID, f"rqAnswerOption{i}")
                     if 'iscorrectoption="True"' in element.get_attribute("outerHTML"):
-                        correct_answers.append(f'rqAnswerOption{i - 1}')
+                        correct_answers.append(f'rqAnswerOption{i}')
                 except Exception as e:
-                    warning(f"can't find rqAnswerOption{i - 1}. Probably already clicked" + str(e))
+                    warning(f"can't find rqAnswerOption{i}. Probably already clicked" + str(e))
             shuffle(correct_answers)
             for answer_id in correct_answers:
                 wait_until_visible(By.ID, answer_id, timeout=20, browser=driver)
@@ -171,92 +175,83 @@ def do_poll():
 
 
 # Find each playable card and tries to click on it to earn points
-# todo : refactor
 def all_cards():
     driver = config.WebDriver.driver
     driver.get("https://rewards.bing.com")
     wait_until_visible(By.CLASS_NAME, "c-card-content", 10, driver)
-    liste = driver.find_elements(By.CLASS_NAME, "c-card-content")
+
+    card_list = driver.find_elements(By.CLASS_NAME, "c-card-content")
     custom_sleep(2)
+
     try:
         promo()
     except Exception as e:
+        debug(e)
         info("no promo card")
-    if (len(liste) < 10):  # most likely an error during loading
+
+    if len(card_list) < 10:  # most likely an error during loading
         if "suspendu" in driver.page_source:
             raise Banned()
         driver.refresh()
-        liste = driver.find_elements(By.CLASS_NAME, "c-card-content")
-        if (len(liste) < 10):
+        card_list = driver.find_elements(By.CLASS_NAME, "c-card-content")
+        if len(card_list) < 10:
             log_error("Less than 10 cards. Most likely an error with login.")
-            return ("PAS ASSEZ DE CARTES")
-    if (len(liste) < 20):  # most likely not in france
-        error("moins de 20 cartes. Probablement pas en France.")
-    for i in range(len(liste)):
+            return "Not enough cards"
+
+    for i in range(len(card_list)):
         debug(f"carte {i}")
+        checked = False
         try:
-            checked = ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML"))
+            checked = "mee-icon-AddMedium" in card_list[i].get_attribute("innerHTML")
+
         except StaleElementReferenceException:
             driver.refresh()
-            liste = driver.find_elements(By.CLASS_NAME, "c-card-content")
-            warning(f"staled, {len(liste)}")
-            checked = ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML"))
+            card_list = driver.find_elements(By.CLASS_NAME, "c-card-content")
+            warning(f"staled, {len(card_list)}")
+            checked = "mee-icon-AddMedium" in card_list[i].get_attribute("innerHTML")
+
         except IndexError:
             driver.get("https://rewards.bing.com")
             custom_sleep(10)
-            liste = driver.find_elements(By.CLASS_NAME, "c-card-content")
+            card_list = driver.find_elements(By.CLASS_NAME, "c-card-content")
             try:
-                checked = ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML"))
+                checked = "mee-icon-AddMedium" in card_list[i].get_attribute("innerHTML")
             except IndexError:
-                if i == len(liste) & i > 15:
+                if i == len(card_list) and i > 15:
                     checked = False
+
         if checked:
             custom_sleep(1.5)
-            driver.execute_script("arguments[0].scrollIntoView();", liste[i])
+            driver.execute_script("arguments[0].scrollIntoView();", card_list[i])
             custom_sleep(1.5)
-            liste[i].click()
+            card_list[i].click()
+
             if len(driver.window_handles) > 1:
                 driver.switch_to.window(driver.window_handles[1])
                 try_play(driver.title)
                 close_tab(driver.window_handles[1])
-                try:
-                    driver.refresh()
-                    liste = driver.find_elements(By.CLASS_NAME, "c-card-content")
-                    if ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML")):
-                        warning(f"carte {i} not okay. Retrying.")
+
+            try:
+                driver.refresh()
+                card_list = driver.find_elements(By.CLASS_NAME, "c-card-content")
+
+                if "mee-icon-AddMedium" in card_list[i].get_attribute("innerHTML"):
+                    driver.execute_script("arguments[0].scrollIntoView();", card_list[i])
+                    card_list[i].click()
+                    driver.switch_to.window(driver.window_handles[1])
+                    custom_sleep(10)
+                    log_error(f"Card {i} Can't be completed. Why MS ?")
+                    try:
+                        try_play(driver.title)  # go back to the main page
                         try:
-                            liste[i].click()
-                        except:
-                            log_error("problème inconnu ? sauf si c'est un element obscure...")
-                            driver.get("https://rewards.bing.com")
-                            checked = ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML"))
-                        driver.switch_to.window(driver.window_handles[1])
-                        try_play(driver.title)
-                        close_tab(driver.window_handles[1])
-                        if ("mee-icon-AddMedium" in liste[i].get_attribute("innerHTML")):
-                            driver.execute_script("arguments[0].scrollIntoView();", liste[i])
-                            log_error(f"Card {i} Can't be completed. Why MS ?")
-                            liste[i].click()
-                            driver.switch_to.window(driver.window_handles[1])
-                            log_error(f"Cart completion - log - 2")
-                            custom_sleep(10)
-                            log_error(f"Cart completion - log - 3 - after 10 sec")
-                            try:
-                                try_play(driver.title)  # go back to the main page
-                                try:
-                                    close_tab(driver.window_handles[1])
-                                except:
-                                    pass
-                            except:
-                                driver.get("https://rewards.bing.com")
-                except:
-                    pass
-            else:
-                try:
-                    welcome_tour(liste[i], driver)
-                except Exception as e:
-                    error("no new windows" + format_error(e))
-                    driver.get("https://rewards.bing.com")
+                            close_tab(driver.window_handles[1])
+                        except Exception as e:
+                            debug(e)
+                    except Exception as e:
+                        debug(e)
+                        driver.get("https://rewards.bing.com")
+            except Exception as err:
+                log_error(err)
             custom_sleep(3)
 
 
@@ -268,7 +263,7 @@ def promo():
         if not elm:
             break
         if i > 3:
-            log_error("plus de 3 promo cards, probablement une pa skipable")
+            log_error("There is more than 3 promo cards, most likely an unskippable one.")
             try:
                 driver.find_element(By.CSS_SELECTOR,
                                     'i[class="mee-icon pull-left icon mee-icon-Cancel ng-scope"]').click()
@@ -279,7 +274,7 @@ def promo():
             elm.click()
         except Exception as e:
             driver.execute_script("arguments[0].click();", elm)
-            warning(f"that should't be there (promo), but the workarround seemed to work {e}")
+            warning(f"that shouldn't be there (promo), but the workaround seemed to work {e}")
         custom_sleep(3)
         if len(driver.window_handles) > 1:
             driver.switch_to.window(driver.window_handles[len(driver.window_handles) - 1])
@@ -288,15 +283,15 @@ def promo():
         else:
             try:
                 spotify(driver)
-            except:
-                warning("no new windows")
+            except Exception as e:
+                warning(f"no new windows {format_error(e)}")
                 driver.get("https://rewards.bing.com")
         driver.refresh()
         custom_sleep(3)
 
 
 # Find out which type of action to do
-def try_play(nom="inconnu"):
+def try_play(nom="unknown"):
     driver = config.WebDriver.driver
     rgpd_popup(config)
 
@@ -350,7 +345,7 @@ def try_play(nom="inconnu"):
 
     elif "rqQuestionState" in driver.page_source:
         number = driver.page_source.count("rqAnswerOption")
-        warning(f"recovery détecté. quiz : {number}")
+        warning(f"recovery detected. quiz : {number}")
         play(number - 1)
 
     else:
@@ -466,26 +461,22 @@ def bing_pc_search(override=randint(35, 40)):
                 log_error(f"clear la barre de recherche - {format_error(e)}")  # what is this message ??? todo
 
 
-# Sends points to database, discord and whatever service you want
-# todo: refactor
+# Sends current account's points to database
 def log_points():
     driver = config.WebDriver.driver
     account = config.UserCredentials.get_mail()
 
-    def get_points():
-        driver.get("https://rewards.bing.com")
-        custom_sleep(1)
-        wait_until_visible(By.CSS_SELECTOR, 'span[mee-element-ready="$ctrl.loadCounterAnimation()"]', browser=driver)
-        try:
-            point = search('availablePoints\":([\d]+)', driver.page_source)[1]
-        except Exception as e:
-            log_error(
-                f"Dev error, checking why it doesn't work (waited a bit, is this still white ?) {format_error(e)}")
-            error("Can't get points.")
-            return -1
-        return point
+    driver.get("https://rewards.bing.com")
+    custom_sleep(1)
+    wait_until_visible(By.CSS_SELECTOR, 'span[mee-element-ready="$ctrl.loadCounterAnimation()"]', browser=driver)
+    try:
+        points = search('availablePoints\":([\d]+)', driver.page_source)[1]
+    except Exception as err:
+        log_error(
+            f"Dev error, checking why it doesn't work (waited a bit, is this still white ?) {format_error(err)}")
+        error(f"Can't get points. {format_error(err)}")
+        return -1
 
-    points = get_points()
     custom_sleep(uniform(3, 20))
     account_name = account.split("@")[0]
 
@@ -518,15 +509,15 @@ def fidelity():
                 try:
                     button_text = search('<span class="pull-left margin-right-15">([^<^>]+)</span>',
                                          card_elem.get_attribute("innerHTML"))[1]
-                    bouton_card = driver.find_element(By.XPATH, f'//span[text()="{button_text}"]')
-                    bouton_card.click()
+                    button_card = driver.find_element(By.XPATH, f'//span[text()="{button_text}"]')
+                    button_card.click()
                 except Exception as e1:
                     try:
                         recover_elem = driver.find_element(By.XPATH,
                                                            '/html/body/div[1]/div[2]/main/div[2]/div[2]/div[7]/div[3]/div[1]/a')
                         recover_elem.click()
                     except Exception as e2:
-                        log_error(f"fidélité - double erreur - e1 : {format_error(e1)} - e2 {format_error(e2)}")
+                        log_error(f"Fidelity: Multiples error - e1 : {format_error(e1)} - e2 {format_error(e2)}")
                         break
                 custom_sleep(uniform(3, 5))
                 driver.switch_to.window(driver.window_handles[2])
@@ -543,17 +534,16 @@ def fidelity():
     if driver.current_url != "https://rewards.bing.com":
         driver.get("https://rewards.bing.com")
     try:
-        pause = driver.find_element(By.CSS_SELECTOR,
-                                    f'[class="c-action-toggle c-glyph f-toggle glyph-pause"]')  # mettre le truc en pause
+        pause = driver.find_element(By.CSS_SELECTOR, f'[class="c-action-toggle c-glyph f-toggle glyph-pause"]')
         pause.click()
     except Exception as e:
-        error(f"erreur lors du click de pause: probablement pas de cartes {e}")
+        error(f"Error while clicking pause. Probably no cards. {e}")
         return "no cards"
     cartes = driver.find_elements(By.CSS_SELECTOR, f'[ng-repeat="item in $ctrl.transcludedItems"]')
     nb_cartes = len(cartes)
     checked_list_all = driver.find_elements(By.CSS_SELECTOR, f'[ng-if="$ctrl.complete"]')
     for i in range(nb_cartes):
-        cartes[i].click()  # affiche la bonne carte
+        cartes[i].click()
         checked_txt = checked_list_all[i].get_attribute("innerHTML")
         ok = checked_txt.count("StatusCircleOuter checkmark")
         total = checked_txt.count("StatusCircleOuter")
@@ -661,8 +651,8 @@ def json_start(json_entry, cred: UserCredentials):
 
     config.set_display(SmartDisplay(backend="xvnc", size=(1920, 1080), rfbport=2345, color_depth=24))
     config.display.start()
-
-    for account_id in range(5):
+    account_id = 0
+    while config.UserCredentials.is_valid():
         start = False
         for action in ["unban", "tout", "pc", "mobile", "daily"]:
             try:
@@ -673,6 +663,7 @@ def json_start(json_entry, cred: UserCredentials):
                 pass
         if start:
             config.WebDriver.set_pc_driver(create_driver())
+            config.WebDriver.switch_to_driver("PC")
             driver = config.WebDriver.driver
             try:
                 if str(account_id) in json_entry["unban"]:
@@ -723,6 +714,7 @@ def json_start(json_entry, cred: UserCredentials):
                     error(f"CustomStart {e}")
             driver.close()
         cred.next_account()
+        account_id += 1
     config.display.stop()
 
 
@@ -762,10 +754,11 @@ def default_start():
 
 
 def log_error(msg):
-    DiscordLogger(config)
+    DiscordLogger(config).send(msg)
 
 
 def check_updated():
+    debug(f"updated: {config.has_been_updated()}")
     if config.has_been_updated():
         config.discord.wh.send(f"Updated to {config.version}", username="update",
                                avatar_url="https://cdn-icons-png.flaticon.com/512/1688/1688988.png")
@@ -774,7 +767,6 @@ def check_updated():
 if __name__ == "__main__":
     config = Config(args)
     check_updated()
-
     match config.start:
         case "json":
             json_start(config.json_entry, config.UserCredentials)

docker-compose.yml

@@ -16,4 +16,4 @@ services:
       - "2345:2345"
     shm_size: 2gb
     volumes:
-      - "./:/data"
+      - "./data/:/data"

modules/Classes/DiscordLogger.py

@@ -1,8 +1,7 @@
 from discord import Embed, Colour, File
 
 from modules.Classes.Config import Config
-from modules.Classes.UserCredentials import UserCredentials
-from modules.Tools.logger import info, warning, error, critical
+from modules.Tools.logger import error
 from modules.Tools.tools import format_error
 
 
@@ -25,7 +24,7 @@ class DiscordLogger:
         img.save("screenshot.png")
 
         embed = Embed(
-            title="An Error has occured",
+            title="An Error has occurred",
             description=str(message),
             colour=Colour.red(),
         )
@@ -35,4 +34,3 @@ class DiscordLogger:
 
         self.config.discord.wh.send(embed=embed, username="error", file=file, avatar_url=self.config.discord.avatar_url)
         self.config.discord.wh.send(username="error", file=File("page.html"), avatar_url=self.config.discord.avatar_url)
-

modules/Classes/UserCredentials.py

@@ -1,5 +1,3 @@
-import json
-
 from pyotp import TOTP
 
 from modules.Tools.logger import debug, warning
@@ -12,7 +10,8 @@ class UserCredentials:
         self.total = 0
 
     def add(self, username: str, password: str, tfa: str = None):
-        debug(f"adding account with data : Username: {username}, Password: {password}, 2FA: {'None' if tfa == '' else tfa}")
+        debug(
+            f"adding account with data : Username: {username}, Password: {password}, 2FA: {'None' if tfa == '' else tfa}")
         self.data[self.total] = {
             "username": username,
             "password": password,
@@ -36,7 +35,10 @@ class UserCredentials:
 
     def next_account(self):
         self.current += 1
-        debug(f"New credentials: {self.data[self.current]}")
+        if self.is_valid():
+            debug(f"New credentials: {self.data[self.current]}")
+        else:
+            debug("No new credentials.")
 
     def is_valid(self):
         return self.current < self.total

modules/Tools/logger.py

@@ -29,7 +29,7 @@ class ColoredFormatter(logging.Formatter):
 
 
 # Set up the root logger
-root_logger = logging.getLogger()
+root_logger = logging.getLogger(__name__)
 root_logger.setLevel(logging.DEBUG)
 
 # Create a console handler and set the formatter

requirements.txt

@@ -4,7 +4,7 @@ selenium
 pillow
 pyvirtualdisplay
 undetected_chromedriver
-requests
+requests>=2.31.0
 flask
 flask_sse
 EasyProcess

test.py

@@ -1,6 +0,0 @@
-from modules.Classes.WordList import WordList
-
-w = WordList("/usr/share/dict/french")
-
-for i in range(100):
-    print(w.get_word())

version

@@ -1 +1 @@
-v6.8.20
+v6.8.38