fix bug with search regex

.gitea/workflows/cd.yaml

@@ -14,13 +14,28 @@ jobs:
       - name: Run linter
         run: make lint
 
-  deploy:
+  deploy-chrome:
+    needs: lint
     runs-on: linux
     steps:
       - name: Checkout repo
         uses: actions/checkout@v5
-      - name: Deploy project
+      - name: Deploy project to Chrome Webstore
         env:
-          WEB_EXT_API_KEY: ${{ vars.WEB_EXT_API_KEY }}
+          CLIENT_ID: ${{ vars.CHROME_CLIENT_ID }}
-          WEB_EXT_API_SECRET: ${{ secrets.WEB_EXT_API_SECRET }}
+          CLIENT_SECRET: ${{ secrets.CHROME_CLIENT_SECRET }}
-        run: make deploy
+          EXTENSION_ID: ${{ vars.CHROME_EXTENSION_ID }}
+          REFRESH_TOKEN: ${{ secrets.CHROME_REFRESH_TOKEN }}
+        run: make deploy_chrome
+
+  deploy-firefox:
+    needs: lint
+    runs-on: linux
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+      - name: Deploy project to Firefox Addons
+        env:
+          WEB_EXT_API_KEY: ${{ vars.FIREFOX_API_KEY }}
+          WEB_EXT_API_SECRET: ${{ secrets.FIREFOX_API_SECRET }}
+        run: make deploy_firefox

CHANGELOG.md

@@ -1,5 +1,46 @@
 # Changelog
 
+## 1.7.4 (2025-11-16)
+
+- correction bug de calcul des secondes en utilisant search regex
+
+## 1.7.3 (2025-11-16)
+
+- correction bug de calcul des secondes en utilisant le temps du serveur
+
+## 1.7.2 (2025-11-16)
+
+- correction bug de calcul des secondes sur la page des attaques
+
+## 1.7.1 (2025-11-16)
+
+- ajout des secondes dans la page des attaques
+- ajout d'un lien vers le calculateur de trajet dans la page des attaques
+
+## 1.6.1 (2025-11-15)
+
+- correction du bug de sélection de village dans le marché
+
+## 1.5.1 (2025-11-13)
+
+- fonctionnalité de multi-attaques dans la même seconde
+
+## 1.4.14 (2025-11-13)
+
+- correction affichage menu avec rapports
+
+## 1.4.13 (2025-11-13)
+
+- déploiement automatique sur chrome
+
+## 1.4.12 (2025-11-11)
+
+- correction bug menu
+
+## 1.4.11 (2025-11-11)
+
+- ajout des data collection permissions
+
 ## 1.4.10 (2025-11-11)
 
 - correction du fichier metadata.json

Makefile

@@ -3,8 +3,11 @@ build:
   
 lint:
 	web-ext lint
+
+deploy_chrome:
+	chrome-webstore-upload
   
-deploy:
+deploy_firefox:
 	web-ext sign --channel listed --amo-metadata metadata.json
 
 help:

images/calculator.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path fill="#000000" d="M192 64C156.7 64 128 92.7 128 128L128 512C128 547.3 156.7 576 192 576L448 576C483.3 576 512 547.3 512 512L512 128C512 92.7 483.3 64 448 64L192 64zM224 128L416 128C433.7 128 448 142.3 448 160L448 192C448 209.7 433.7 224 416 224L224 224C206.3 224 192 209.7 192 192L192 160C192 142.3 206.3 128 224 128zM240 296C240 309.3 229.3 320 216 320C202.7 320 192 309.3 192 296C192 282.7 202.7 272 216 272C229.3 272 240 282.7 240 296zM320 320C306.7 320 296 309.3 296 296C296 282.7 306.7 272 320 272C333.3 272 344 282.7 344 296C344 309.3 333.3 320 320 320zM448 296C448 309.3 437.3 320 424 320C410.7 320 400 309.3 400 296C400 282.7 410.7 272 424 272C437.3 272 448 282.7 448 296zM216 416C202.7 416 192 405.3 192 392C192 378.7 202.7 368 216 368C229.3 368 240 378.7 240 392C240 405.3 229.3 416 216 416zM344 392C344 405.3 333.3 416 320 416C306.7 416 296 405.3 296 392C296 378.7 306.7 368 320 368C333.3 368 344 378.7 344 392zM424 416C410.7 416 400 405.3 400 392C400 378.7 410.7 368 424 368C437.3 368 448 378.7 448 392C448 405.3 437.3 416 424 416zM192 488C192 474.7 202.7 464 216 464L328 464C341.3 464 352 474.7 352 488C352 501.3 341.3 512 328 512L216 512C202.7 512 192 501.3 192 488zM424 464C437.3 464 448 474.7 448 488C448 501.3 437.3 512 424 512C410.7 512 400 501.3 400 488C400 474.7 410.7 464 424 464z"/></svg>

manifest.json

@@ -1,14 +1,23 @@
 {
   "manifest_version": 3,
   "name": "KAplus",
-  "version": "1.4.10",
+  "version": "1.7.4",
 
-  "author": "Samuel Campos - netoik.io",
+  "developer": {
+    "name": "Samuel Campos",
+    "url": "https://git.netoik.io/samuel/kaplus"
+  },
   "description": "Extension développée pour améliorer l'expérience de jeu KingsAge (fonctionne avec ou sans premium)",
 
   "browser_specific_settings": {
     "gecko": {
-      "id": "{e750d6a9-86ff-4129-aed6-542de03deb79}"
+      "id": "{e750d6a9-86ff-4129-aed6-542de03deb79}",
+      "data_collection_permissions": {
+        "required": [
+          "websiteContent",
+          "websiteActivity"
+        ]
+      }
     }
   },
 

metadata.json

@@ -5,7 +5,8 @@
       "firefox"
     ],
     "release_notes": {
-      "fr": "- correction du fichier metadata.json"
+      "fr": "- correction bug de calcul des secondes en utilisant search regex",
+      "en-US": "- fix bug on seconds by using search regex"
     }
   }
 }

src/kaplus.js

@@ -31,104 +31,232 @@ function createRow(key, value) {
     return row;
 }
 
+function createInput(type, name, value) {
+    let elt = document.createElement("input");
+    elt.setAttribute("type", type);
+    elt.setAttribute("name", name);
+    elt.setAttribute("value", value);
+    return elt;
+}
+
+function searchPoint(text) {
+    let index = text.search(/\d{3}\|\d{3}/);
+    let point = text.slice(index, index + 7).split("|");
+    return {x: point[0], y: point[1]}
+}
+
 function shortcutElementReplace(elt, img, text) {
-	let imgElements = elt.getElementsByTagName("img");
+    // If more than one hyperlink element found,
-	for (let i=0; i<imgElements.length; i++) {
+    // then keep the last one but with href of the first one.
-		if (i === 0) {
+    let aElements = elt.getElementsByTagName("a");
-			elt.getElementsByTagName("a")[0].classList.add("has_notif");
+    let imgElements = elt.getElementsByTagName("img");
-		}
+    if (aElements.length > 1 || imgElements.length > 0) {
-		imgElements[i].remove();
+        aElements[aElements.length - 1].classList.add("has_notif");
-		i --;
+        aElements[aElements.length - 1].setAttribute("href", aElements[0].getAttribute("href"));
-	}
+        for (let i = imgElements.length - 1; i >= 0; i--) {
+            imgElements[i].remove();
+        }
+        for (let i = aElements.length - 2; i >= 0; i--) {
+            aElements[i].remove();
+        }
+    }
 
-	let aElements = elt.getElementsByTagName("a");
+    let spanImageElement = document.createElement("span");
-	for (i=0; i<aElements.length; i++) {
+    spanImageElement.classList.add("shortcut_element_image");
-		if (i > 0) {
-			aElements[i].remove();
-			i --;
-		}
-	}
-	
-	let spanImageElement = document.createElement("span");
-	spanImageElement.classList.add("shortcut_element_image");
 
-	let imgElement = document.createElement("img");
+    let imgElement = document.createElement("img");
-	imgElement.setAttribute("src", chrome.runtime.getURL("images/"+img+".svg"));
+    imgElement.setAttribute("src", chrome.runtime.getURL("images/" + img + ".svg"));
-	spanImageElement.appendChild(imgElement);
+    spanImageElement.appendChild(imgElement);
 
-	aElements[0].textContent = "";
+    aElements[0].textContent = "";
-	aElements[0].appendChild(spanImageElement);
+    aElements[0].appendChild(spanImageElement);
 
-	if (text) {
+    if (text) {
-		let spanDescElement = document.createElement("span");
+        let spanDescElement = document.createElement("span");
-		spanDescElement.classList.add("shortcut_element_desc");
+        spanDescElement.classList.add("shortcut_element_desc");
-		spanDescElement.textContent = text;
+        spanDescElement.textContent = text;
-		aElements[0].appendChild(spanDescElement);
+        aElements[0].appendChild(spanDescElement);
-	}
+    }
 }
 
-/* Improve main menu display */
+function main() {
-let layCastleTopElements = document.getElementsByClassName("lay_castle_top");
+    /* Exit immediately if not on game page */
-if (layCastleTopElements.length === 1) {
+    let layCastleTopElements = document.getElementsByClassName("lay_castle_top");
-	document.getElementById("banner_skyscraper").remove();
+    if (layCastleTopElements.length === 0) {
+        return;
+    }
 
-	let shortcutElements = layCastleTopElements[0].getElementsByClassName("shortcut_element");
+    /* Remove iframe banner */
-	shortcutElementReplace(shortcutElements[0], "ranking", shortcutElements[0].textContent.replace(/[^0-9]/g, ""));
+    document.getElementById("banner_skyscraper").remove();
-	shortcutElementReplace(shortcutElements[1], "ally", "");
+
-	shortcutElementReplace(shortcutElements[2], "profile", "");
+    /* Improve navbar icons */
-	shortcutElementReplace(shortcutElements[3], "premium", "");
+    let shortcutElements = layCastleTopElements[0].getElementsByClassName("shortcut_element");
-	shortcutElementReplace(shortcutElements[4], "messages", "");
+    shortcutElementReplace(shortcutElements[0], "ranking", shortcutElements[0].textContent.replace(/[^0-9]/g, ""));
-	shortcutElementReplace(shortcutElements[5], "tools", "");
+    shortcutElementReplace(shortcutElements[1], "ally", "");
-	shortcutElementReplace(shortcutElements[6], "favorites", "");
+    shortcutElementReplace(shortcutElements[2], "profile", "");
-	
+    shortcutElementReplace(shortcutElements[3], "premium", "");
-	let shortcutContainers = layCastleTopElements[0].getElementsByClassName("shortcut_container");
+    shortcutElementReplace(shortcutElements[4], "messages", "");
-	shortcutContainers[0].classList.add("shortcut_container_left");
+    shortcutElementReplace(shortcutElements[5], "tools", "");
-	shortcutContainers[2].classList.add("shortcut_container_right"); 
+    shortcutElementReplace(shortcutElements[6], "favorites", "");
+
+    /* Center navbar */
+    let shortcutContainers = layCastleTopElements[0].getElementsByClassName("shortcut_container");
+    shortcutContainers[0].classList.add("shortcut_container_left");
+    shortcutContainers[2].classList.add("shortcut_container_right");
+
+    /* Parse url params and switch case */
+    let urlParams = new URLSearchParams(window.location.search);
+    let section = urlParams.get("s");
+    let module = urlParams.get("m");
+    let sub = urlParams.get("sub");
+
+    /* Display unit-points on user profile */
+    if (section === "info_player" && (module === "profile" || module === null)) {
+        let mainContentPane = document.getElementsByClassName("contentpane")[1];
+        let borderLists = mainContentPane.getElementsByClassName("borderlist");
+
+        let playerPropertiesTable = borderLists[0];
+        let playerPropertiesRows = playerPropertiesTable.getElementsByTagName("tr");
+        let totalPoints = num(playerPropertiesRows[2].getElementsByTagName("td")[1].textContent);
+        let villagesCount = num(playerPropertiesRows[4].getElementsByTagName("td")[1].textContent);
+
+        let villagesTable = borderLists[1];
+        let villagesRows = villagesTable.getElementsByTagName("tr");
+        let villagesPoints = 0;
+        for (let i = 1; i < villagesRows.length; i += 1) {
+            villagesPoints += num(villagesRows[i].getElementsByTagName("td")[2].textContent);
+        }
+        let villagesBonus = 2250 * Math.max(0, villagesCount - 1);
+
+        let armyPoints = totalPoints - villagesPoints - villagesBonus;
+        let armyPercent = "-";
+        if (villagesCount > 0) {
+            armyPercent = (Math.round(armyPoints / villagesCount) / 100).toString() + " %";
+        }
+
+        playerPropertiesTable.appendChild(createRow("Points troupes:", str(armyPoints)));
+        playerPropertiesTable.appendChild(createRow("% points troupes:", armyPercent));
+    }
+
+    /* Display unit-points on village overview */
+    if (section === "overview") {
+        let settlements = document.getElementById("settlement").textContent.split("|");
+        let noBorderRows = document.getElementsByClassName("noborder");
+        let villagePointsRow = noBorderRows[0];
+        for (let i = 0; i < noBorderRows.length; i++) {
+            if (noBorderRows[i].textContent.startsWith("Points:")) {
+                villagePointsRow = noBorderRows[i];
+                break;
+            }
+        }
+        let unitPointsRow = villagePointsRow.cloneNode(true);
+        villagePointsRow.getElementsByTagName("td")[1].textContent = "Points village: " + settlements[3];
+        unitPointsRow.getElementsByTagName("td")[1].textContent = "Points troupes: " + settlements[4];
+        villagePointsRow.after(unitPointsRow);
+    }
+
+    /* Allow multiple attacks */
+    if (section === "build_barracks" && module === "command" && sub === "send") {
+        let table = document.createElement("table");
+        table.classList.add("borderlist");
+        let tbody = document.createElement("tbody");
+        let tr = document.createElement("tr");
+        let th = document.createElement("th");
+        th.textContent = "Nombre d'attaques:";
+        tr.appendChild(th)
+        let td = document.createElement("td");
+        let input = document.createElement("input");
+        input.setAttribute("type", "number");
+        input.setAttribute("name", "attack_count");
+        input.setAttribute("value", "1");
+        td.appendChild(input);
+        tr.appendChild(td);
+        tbody.appendChild(tr);
+        table.appendChild(tbody);
+
+        let form = document.getElementsByTagName("form")[0];
+        let firstInput = form.getElementsByTagName("input")[0];
+        form.insertBefore(table, firstInput);
+        form.addEventListener("submit", function (event) {
+            event.preventDefault();
+            let formData = new FormData(this);
+            let attackCount = parseInt(formData.get("attack_count").toString());
+            formData.delete("attack_count");
+
+            let sent = 0;
+            for (let i = 0; i < attackCount; i++) {
+                let xhr = new XMLHttpRequest();
+                xhr.onload = function () {
+                    sent++;
+                    if (sent === attackCount) {
+                        window.location.replace(xhr.responseURL);
+                    }
+                }
+                xhr.open(this.method, this.action, true);
+                xhr.send(formData);
+            }
+        });
+    }
+
+    /* Fix select bug in market */
+    if (section === "build_market" && (module === "send" || module === null)) {
+        let select = document.getElementsByName("village_name")[0];
+        select.removeAttribute("onchange");
+        select.addEventListener("change", function () {
+            let sendX = document.getElementById("send_x");
+            let sendY = document.getElementById("send_y");
+            if (this.selectedIndex === 0) {
+                sendX.value = "";
+                sendY.value = "";
+            } else {
+                let xy = this.value.split("|");
+                sendX.value = xy[0];
+                sendY.value = xy[1];
+            }
+        });
+    }
+
+    /* Improve attacks display */
+    if (section === "ally" && module === "attacks") {
+        let serverTime = parseInt(document.getElementById("servertime").getAttribute("time"));
+        let contentPane = document.getElementsByClassName("contentpane")[1]
+        let table = contentPane.getElementsByClassName("borderlist")[0];
+        let rows = table.getElementsByTagName("tr");
+
+        let headCell = document.createElement("th");
+        rows[0].appendChild(headCell);
+
+        for (let i = 1; i < rows.length; i ++) {
+            let cells = rows[i].getElementsByTagName("td");
+            let arrivalDateCell = cells[3]
+            let arrivalTimeCell = cells[4];
+
+            let seconds = parseInt(arrivalTimeCell.getElementsByTagName("span")[0].getAttribute("time"));
+            let arrival = new Date((serverTime + seconds) * 1000);
+            let hour = arrival.toLocaleTimeString("fr-FR");
+            arrivalDateCell.textContent = arrivalDateCell.textContent.replace(/(.*)\d\d:\d\d(.*)/, "$1" + hour + "$2");
+
+            let startPoint = searchPoint(cells[2].textContent);
+            let targetPoint = searchPoint(cells[1].textContent);
+            let calculatorCell = document.createElement("td");
+            let calculatorForm = document.createElement("form");
+            calculatorForm.setAttribute("method", "post");
+            calculatorForm.setAttribute("action", "/?s=tools&m=runtime_calculator&inta=calculate");
+            calculatorForm.appendChild(createInput("hidden", "start_x", startPoint.x));
+            calculatorForm.appendChild(createInput("hidden", "start_y", startPoint.y));
+            calculatorForm.appendChild(createInput("hidden", "target_x", targetPoint.x));
+            calculatorForm.appendChild(createInput("hidden", "target_y", targetPoint.y));
+            let calculatorImg = document.createElement("input");
+            calculatorImg.setAttribute("type", "image");
+            calculatorImg.setAttribute("src", chrome.runtime.getURL("images/calculator.svg"));
+            calculatorImg.style.width = "20px";
+            calculatorImg.style.height = "20px";
+            calculatorImg.style.border = "none";
+            calculatorForm.appendChild(calculatorImg);
+            calculatorCell.appendChild(calculatorForm);
+            rows[i].appendChild(calculatorCell);
+        }
+    }
 }
 
-/* Display unit-points on user profile */
+main();
-if (document.body.id === "info_player") {
-	let mainContentPane = document.getElementsByClassName("contentpane")[1];
-	let borderLists = mainContentPane.getElementsByClassName("borderlist");
-	
-	let playerPropertiesTable = borderLists[0];
-	let playerPropertiesRows = playerPropertiesTable.getElementsByTagName("tr");
-	let totalPoints = num(playerPropertiesRows[2].getElementsByTagName("td")[1].textContent);
-	let villagesCount = num(playerPropertiesRows[4].getElementsByTagName("td")[1].textContent);
-
-    let villagesTable = borderLists[1];
-    let villagesRows = villagesTable.getElementsByTagName("tr");
-    let villagesPoints = 0;
-	for (let i=1; i<villagesRows.length; i+=1) {
-		villagesPoints += num(villagesRows[i].getElementsByTagName("td")[2].textContent);
-	}
-    let villagesBonus = 2250 * Math.max(0, villagesCount - 1);
-
-    let armyPoints = totalPoints - villagesPoints - villagesBonus;
-    let armyPercent = "-";
-	if (villagesCount > 0) {
-        armyPercent = (Math.round(armyPoints / villagesCount) / 100).toString() + " %";
-	}
-
-    playerPropertiesTable.appendChild(createRow("Points troupes:", str(armyPoints)));
-	playerPropertiesTable.appendChild(createRow("% points troupes:", armyPercent));
-}
-
-/* Display unit-points on village overview */
-if (document.body.id === "overview") {
-    let settlements = document.getElementById("settlement").textContent.split("|");
-    let noBorderRows = document.getElementsByClassName("noborder");
-    let villagePointsRow = noBorderRows[0];
-	for (let i=0; i<noBorderRows.length; i++) {
-		if (noBorderRows[i].textContent.startsWith("Points:")) {
-            villagePointsRow = noBorderRows[i];
-			break;
-		}
-	}
-	let unitPointsRow = villagePointsRow.cloneNode(true);
-	villagePointsRow.getElementsByTagName("td")[1].textContent = "Points village: " + settlements[3];
-	unitPointsRow.getElementsByTagName("td")[1].textContent = "Points troupes: " + settlements[4];
-	villagePointsRow.after(unitPointsRow);
-}
-
-