Use server time for computing seconds

.gitea/workflows/cd.yaml

@@ -0,0 +1,41 @@
+name: Continuous Deployment
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  lint:
+    runs-on: linux
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+      - name: Run linter
+        run: make lint
+
+  deploy-chrome:
+    needs: lint
+    runs-on: linux
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v5
+      - name: Deploy project to Chrome Webstore
+        env:
+          CLIENT_ID: ${{ vars.CHROME_CLIENT_ID }}
+          CLIENT_SECRET: ${{ secrets.CHROME_CLIENT_SECRET }}
+          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

.gitignore

@@ -1 +1,2 @@
 web-ext-artifacts/
+.idea/

CHANGELOG.md

@@ -1,5 +1,77 @@
 # Changelog
 
+## 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
+
+## 1.4.9 (2025-11-11)
+
+- test déploiement manuel
+
+## 1.4.8 (2025-11-11)
+
+- suppression de data_collection_permissions car non supporté pour Android
+
+## 1.4.7 (2025-11-11)
+
+- correction du déploiement automatisé
+- ajout de data_collection_permissions dans manifest.json
+
+## 1.4.6 (2025-11-11)
+
+- déploiement automatisé sur firefox
+- correction du bug d'affichage du menu Messages et Rapports
+
+## 1.4.5 (2025-10-14)
+
+- tests de déploiement automatisé
+
+## 1.4.4 (2025-10-11)
+
+- tests de déploiement automatisé
+
+## 1.4.3 (2025-09-15)
+
+- correction de l'affichage du menu en cas de nouveau rapport
+- utilisation de css pure plutôt que d'une image pour les notifs de messages
+
 ## 1.4.2 (2025-09-14)
 
 - annulation de la suppression des tours drapeaux (car impossible de réduire l'écran correctement)

Makefile

@@ -0,0 +1,14 @@
+build:
+	web-ext build --overwrite-dest
+  
+lint:
+	web-ext lint
+
+deploy_chrome:
+	chrome-webstore-upload
+  
+deploy_firefox:
+	web-ext sign --channel listed --amo-metadata metadata.json
+
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

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>

images/notif.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free v7.0.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path fill="#ff0000" d="M64 320C64 178.6 178.6 64 320 64C461.4 64 576 178.6 576 320C576 461.4 461.4 576 320 576C178.6 576 64 461.4 64 320z"/></svg>

manifest.json

@@ -1,14 +1,23 @@
 {
   "manifest_version": 3,
   "name": "KAplus",
-  "version": "1.4.2",
+  "version": "1.7.3",
 
-	"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

@@ -0,0 +1,12 @@
+{
+  "version": {
+    "compatibility": [
+      "android",
+      "firefox"
+    ],
+    "release_notes": {
+      "fr": "- correction bug de calcul des secondes en utilisant le temps du serveur",
+      "en-US": "- fix bug on seconds by using server time"
+    }
+  }
+}

src/kaplus.css

@@ -52,13 +52,14 @@
 			opacity: 1;
 		}
 		a.has_notif::after {
-			background-image: url("moz-extension://__MSG_@@extension_id__/images/notif.svg"), url("chrome-extension://__MSG_@@extension_id__/images/notif.svg");
 			background-size: 13px 13px;
+			background-color: #FF0000;
+			border-radius: 50%;
 			position: absolute;
 			top: -13px;
-			right: -3px;
-			width: 13px;
-			height: 13px;
+			right: 3px;
+			width: 12px;
+			height: 12px;
 			content: "";
 		}
 		.shortcut_element_image {

src/kaplus.js

@@ -3,15 +3,15 @@ function num(s) {
 }
 
 function str(n) {
-	if (n == 0) {
+	if (n === 0) {
 		return "0";
 	}
-	s = "";
+	let s = "";
 	while (n > 0) {
-		if (s != "") {
+		if (s !== "") {
 			s = "." + s;
 		}
-		r = n % 1000;
+		let r = n % 1000;
 		s = r.toString().padStart(3, "0") + s;
 		n = ~~(n/1000);
 	}
@@ -19,51 +19,72 @@ function str(n) {
 }
 
 function createRow(key, value) {
-	keyCell = document.createElement("td");
+	let keyCell = document.createElement("td");
     keyCell.textContent = key;
-  valueCell = document.createElement("td");
+
+    let valueCell = document.createElement("td");
     valueCell.textContent = value;
-  row = document.createElement("tr");
+
+    let row = document.createElement("tr");
     row.appendChild(keyCell);
     row.appendChild(valueCell);
     return row;
 }
 
-function shortcutElementReplace(elt, img, text) {
-	imgElements = elt.getElementsByTagName("img")
-	for (i=0; i<imgElements.length; i++) {
-		if (i == 0) {
-			elt.getElementsByTagName("a")[0].classList.add("has_notif");
-		}
-		imgElements[i].remove();
-		i --;
+function createInput(type, name, value) {
+    let elt = document.createElement("input");
+    elt.setAttribute("type", type);
+    elt.setAttribute("name", name);
+    elt.setAttribute("value", value);
+    return elt;
 }
 
-	spanImageElement = document.createElement("span");
+function shortcutElementReplace(elt, img, text) {
+    // If more than one hyperlink element found,
+    // then keep the last one but with href of the first one.
+    let aElements = elt.getElementsByTagName("a");
+    let imgElements = elt.getElementsByTagName("img");
+    if (aElements.length > 1 || imgElements.length > 0) {
+        aElements[aElements.length - 1].classList.add("has_notif");
+        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 spanImageElement = document.createElement("span");
     spanImageElement.classList.add("shortcut_element_image");
 
-	imgElement = document.createElement("img");
+    let imgElement = document.createElement("img");
     imgElement.setAttribute("src", chrome.runtime.getURL("images/" + img + ".svg"));
     spanImageElement.appendChild(imgElement);
 
-	hyperlinkElement = elt.getElementsByTagName("a")[0];
-	hyperlinkElement.textContent = "";
-	hyperlinkElement.appendChild(spanImageElement);
+    aElements[0].textContent = "";
+    aElements[0].appendChild(spanImageElement);
 
     if (text) {
-		spanDescElement = document.createElement("span");
+        let spanDescElement = document.createElement("span");
         spanDescElement.classList.add("shortcut_element_desc");
         spanDescElement.textContent = text;
-		hyperlinkElement.appendChild(spanDescElement);
+        aElements[0].appendChild(spanDescElement);
     }
 }
 
-/* Improve main menu display */
-layCastleTopElements = document.getElementsByClassName("lay_castle_top");
-if (layCastleTopElements.length == 1) {
+function main() {
+    /* Exit immediately if not on game page */
+    let layCastleTopElements = document.getElementsByClassName("lay_castle_top");
+    if (layCastleTopElements.length === 0) {
+        return;
+    }
+
+    /* Remove iframe banner */
     document.getElementById("banner_skyscraper").remove();
 
-	shortcutElements = layCastleTopElements[0].getElementsByClassName("shortcut_element");
+    /* Improve navbar icons */
+    let shortcutElements = layCastleTopElements[0].getElementsByClassName("shortcut_element");
     shortcutElementReplace(shortcutElements[0], "ranking", shortcutElements[0].textContent.replace(/[^0-9]/g, ""));
     shortcutElementReplace(shortcutElements[1], "ally", "");
     shortcutElementReplace(shortcutElements[2], "profile", "");
@@ -72,34 +93,39 @@ if (layCastleTopElements.length == 1) {
     shortcutElementReplace(shortcutElements[5], "tools", "");
     shortcutElementReplace(shortcutElements[6], "favorites", "");
 
-	shortcutContainers = layCastleTopElements[0].getElementsByClassName("shortcut_container");
+    /* 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 (document.body.id === "info_player") {
-	mainContentPane = document.getElementsByClassName("contentpane")[1];
-	borderLists = mainContentPane.getElementsByClassName("borderlist");
+    if (section === "info_player" && (module === "profile" || module === null)) {
+        let mainContentPane = document.getElementsByClassName("contentpane")[1];
+        let borderLists = mainContentPane.getElementsByClassName("borderlist");
 
-	playerPropertiesTable = borderLists[0];
-	playerPropertiesRows = playerPropertiesTable.getElementsByTagName("tr");
-	totalPoints = num(playerPropertiesRows[2].getElementsByTagName("td")[1].textContent);
-	villagesCount = num(playerPropertiesRows[4].getElementsByTagName("td")[1].textContent);
+        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);
 
-	villagesTable = borderLists[1];
-	villagesRows = villagesTable.getElementsByTagName("tr");
-	villagesPoints = 0;
-	for (i=1; i<villagesRows.length; i+=1) {
+        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);
         }
-	villagesBonus = 2250 * Math.max(0, villagesCount - 1);
+        let villagesBonus = 2250 * Math.max(0, villagesCount - 1);
 
-	armyPoints = totalPoints - villagesPoints - villagesBonus;
+        let armyPoints = totalPoints - villagesPoints - villagesBonus;
+        let armyPercent = "-";
         if (villagesCount > 0) {
             armyPercent = (Math.round(armyPoints / villagesCount) / 100).toString() + " %";
-	} else {
-		armyPercent = "-";
         }
 
         playerPropertiesTable.appendChild(createRow("Points troupes:", str(armyPoints)));
@@ -107,19 +133,124 @@ if (document.body.id === "info_player") {
     }
 
     /* Display unit-points on village overview */
-if (document.body.id === "overview") {
-	settlements = document.getElementById("settlement").textContent.split("|");
-	noborderRows = document.getElementsByClassName("noborder");
-	for (i=0; i<noborderRows.length; i++) {
-		if (noborderRows[i].textContent.startsWith("Points:")) {
-			villagePointsRow = noborderRows[i];
+    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;
             }
         }
-	unitPointsRow = villagePointsRow.cloneNode(true);
+        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 = cells[2].textContent.replace(/.*(\d{3}\|\d{3}).*/, "$1").split("|");
+            let targetPoint = cells[1].textContent.replace(/.*(\d{3}\|\d{3}).*/, "$1").split("|");
+            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[0]));
+            calculatorForm.appendChild(createInput("hidden", "start_y", startPoint[1]));
+            calculatorForm.appendChild(createInput("hidden", "target_x", targetPoint[0]));
+            calculatorForm.appendChild(createInput("hidden", "target_y", targetPoint[1]));
+            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);
+        }
+    }
+}
+
+main();