build(deps): bump vue-router from 4.6.3 to 4.6.4 in /src/static/app

Bumps [vue-router](https://github.com/vuejs/router) from 4.6.3 to 4.6.4. - [Release notes](https://github.com/vuejs/router/releases) - [Commits](https://github.com/vuejs/router/compare/v4.6.3...v4.6.4) --- updated-dependencies: - dependency-name: vue-router dependency-version: 4.6.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
refac: some exit logic
2025-12-16 08:26:17 +00:00 · 2025-12-15 20:32:25 +00:00 · 2025-12-14 20:56:18 +01:00 · 2025-12-14 17:32:46 +01:00
3 changed files with 50 additions and 32 deletions
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,6 +1,7 @@
 #!/bin/bash

 config_file="/data/wg-dashboard.ini"
+runtime_pid=""

 trap 'stop_service' SIGTERM

@@ -52,7 +53,31 @@ set_ini() {

 stop_service() {
  echo "[WGDashboard] Stopping WGDashboard..."
-  /bin/bash ./wgd.sh stop
+
+  local max_rounds="10"
+  local round="0"
+  local runtime_pid=""
+
+  while true; do
+    round=$((round + 1))
+
+    if [[ -f ${WGDASH}/src/gunicorn.pid ]]; then
+      runtime_pid=$(cat ${WGDASH}/src/gunicorn.pid)
+
+      echo "Running as PID: ${runtime_pid}"
+      return 0
+    fi
+
+    if [[ $round -eq $max_rounds ]]; then
+      echo "Reached breaking point!"
+      return 1
+
+    fi
+
+    sleep 0.5s
+  done
+
+  kill $runtime_pid
  exit 0
 }

@@ -192,9 +217,10 @@ start_and_monitor() {

  [[ ! -d ${WGDASH}/src/log ]] && mkdir ${WGDASH}/src/log
  [[ ! -d ${WGDASH}/src/download ]] && mkdir ${WGDASH}/src/download
+
  ${WGDASH}/src/venv/bin/gunicorn --config ${WGDASH}/src/gunicorn.conf.py

-  resolvconf -u
+  /usr/sbin/resolvconf -u

  if [ $? -ne 0 ]; then
    echo "Loading WGDashboard failed... Look above for details."
@@ -203,13 +229,14 @@ start_and_monitor() {
  # Wait a second before continuing, to give the python program some time to get ready.
  echo -e "\nEnsuring container continuation."

-  max_rounds="10"
-  round="0"
+  local max_rounds="10"
+  local round="0"

  # Hang in there for 10s for Gunicorn to get ready
  while true; do
    round=$((round + 1))
-    latest_error=$(ls -t ${WGDASH}/src/log/error_*.log 2> /dev/null | head -n 1)
+
+    local latest_error=$(ls -t ${WGDASH}/src/log/error_*.log 2> /dev/null | head -n 1)

    if [[ $round -eq $max_rounds ]]; then
      echo "Reached breaking point!"
@@ -235,13 +262,10 @@ start_and_monitor() {

  else
    tail -f "$latest_error" &
-    wait $!
+    tail_pid=$!

+    wait $tail_pid
  fi
-
-  echo "The blocking command has been broken! Script will exit in 3 minutes... Investigate!"
-  sleep 180s
-  exit 1
 }

 # Main execution flow
--- a/src/static/app/package-lock.json
+++ b/src/static/app/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "app",
-  "version": "4.3.0.3",
+  "version": "4.3.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "app",
-      "version": "4.3.0.3",
+      "version": "4.3.1",
      "dependencies": {
        "@volar/language-server": "2.4.26",
        "@vue/language-server": "3.1.8",
@@ -33,7 +33,7 @@
        "uuid": "^13.0.0",
        "vue": "^3.5.24",
        "vue-chartjs": "^5.3.0",
-        "vue-router": "^4.6.3"
+        "vue-router": "^4.6.4"
      },
      "devDependencies": {
        "@vitejs/plugin-vue": "^6.0.0",
@@ -384,7 +384,6 @@
      "integrity": "sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==",
      "license": "BSD-2-Clause",
      "optional": true,
-      "peer": true,
      "dependencies": {
        "cross-dirname": "^0.1.0",
        "debug": "^4.3.4",
@@ -405,7 +404,6 @@
      "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==",
      "license": "MIT",
      "optional": true,
-      "peer": true,
      "dependencies": {
        "graceful-fs": "^4.2.0",
        "jsonfile": "^6.0.1",
@@ -1113,8 +1111,7 @@
      "version": "0.3.4",
      "resolved": "https://registry.npmmirror.com/@kurkle/color/-/color-0.3.4.tgz",
      "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/@malept/cross-spawn-promise": {
      "version": "2.0.0",
@@ -2089,6 +2086,7 @@
      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz",
      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "fast-deep-equal": "^3.1.1",
        "fast-json-stable-stringify": "^2.0.0",
@@ -2894,8 +2892,7 @@
      "resolved": "https://registry.npmmirror.com/cross-dirname/-/cross-dirname-0.1.0.tgz",
      "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
      "license": "MIT",
-      "optional": true,
-      "peer": true
+      "optional": true
    },
    "node_modules/cross-spawn": {
      "version": "7.0.6",
@@ -3081,6 +3078,7 @@
      "resolved": "https://registry.npmmirror.com/dmg-builder/-/dmg-builder-26.0.12.tgz",
      "integrity": "sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "app-builder-lib": "26.0.12",
        "builder-util": "26.0.11",
@@ -3246,7 +3244,6 @@
      "integrity": "sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==",
      "hasInstallScript": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@electron/asar": "^3.2.1",
        "debug": "^4.1.1",
@@ -3266,7 +3263,6 @@
      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-7.0.1.tgz",
      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "graceful-fs": "^4.1.2",
        "jsonfile": "^4.0.0",
@@ -3281,7 +3277,6 @@
      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-4.0.0.tgz",
      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
      "license": "MIT",
-      "peer": true,
      "optionalDependencies": {
        "graceful-fs": "^4.1.6"
      }
@@ -3291,7 +3286,6 @@
      "resolved": "https://registry.npmmirror.com/universalify/-/universalify-0.1.2.tgz",
      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">= 4.0.0"
      }
@@ -6591,6 +6585,7 @@
      "version": "4.0.3",
      "inBundle": true,
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -6996,6 +6991,7 @@
      "resolved": "https://registry.npmmirror.com/pinia/-/pinia-3.0.3.tgz",
      "integrity": "sha512-ttXO/InUULUXkMHpTdp9Fj4hLpD/2AoJdmAbAeW2yu1iy1k+pkFekQXw5VpC0/5p51IOR/jDaDRfRWRnMMsGOA==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@vue/devtools-api": "^7.7.2"
      },
@@ -7094,7 +7090,6 @@
      "integrity": "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==",
      "license": "MIT",
      "optional": true,
-      "peer": true,
      "dependencies": {
        "commander": "^9.4.0"
      },
@@ -7111,7 +7106,6 @@
      "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==",
      "license": "MIT",
      "optional": true,
-      "peer": true,
      "engines": {
        "node": "^12.20.0 || >=14"
      }
@@ -7835,7 +7829,6 @@
      "resolved": "https://registry.npmmirror.com/temp/-/temp-0.9.4.tgz",
      "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "mkdirp": "^0.5.1",
        "rimraf": "~2.6.2"
@@ -7859,7 +7852,6 @@
      "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz",
      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "minimist": "^1.2.6"
      },
@@ -7873,7 +7865,6 @@
      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
      "deprecated": "Rimraf versions prior to v4 are no longer supported",
      "license": "ISC",
-      "peer": true,
      "dependencies": {
        "glob": "^7.1.3"
      },
@@ -7954,6 +7945,7 @@
      "resolved": "https://registry.npmmirror.com/typescript/-/typescript-5.9.2.tgz",
      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
      "license": "Apache-2.0",
+      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -8065,6 +8057,7 @@
      "integrity": "sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.5.0",
@@ -8367,6 +8360,7 @@
      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.24.tgz",
      "integrity": "sha512-uTHDOpVQTMjcGgrqFPSb8iO2m1DUvo+WbGqoXQz8Y1CeBYQ0FXf2z1gLRaBtHjlRz7zZUBHxjVB5VTLzYkvftg==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@vue/compiler-dom": "3.5.24",
        "@vue/compiler-sfc": "3.5.24",
@@ -8394,9 +8388,9 @@
      }
    },
    "node_modules/vue-router": {
-      "version": "4.6.3",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.6.3.tgz",
-      "integrity": "sha512-ARBedLm9YlbvQomnmq91Os7ck6efydTSpRP3nuOKCvgJOHNrhRoJDSKtee8kcL1Vf7nz6U+PMBL+hTvR3bTVQg==",
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.6.4.tgz",
+      "integrity": "sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==",
      "license": "MIT",
      "dependencies": {
        "@vue/devtools-api": "^6.6.4"
--- a/src/static/app/package.json
+++ b/src/static/app/package.json
@@ -37,7 +37,7 @@
    "uuid": "^13.0.0",
    "vue": "^3.5.24",
    "vue-chartjs": "^5.3.0",
-    "vue-router": "^4.6.3"
+    "vue-router": "^4.6.4"
  },
  "devDependencies": {
    "@vitejs/plugin-vue": "^6.0.0",
Author	SHA1	Message	Date
dependabot[bot]	589fd9effb	build(deps): bump vue-router from 4.6.3 to 4.6.4 in /src/static/app Bumps [vue-router](https://github.com/vuejs/router) from 4.6.3 to 4.6.4. - [Release notes](https://github.com/vuejs/router/releases) - [Commits](https://github.com/vuejs/router/compare/v4.6.3...v4.6.4) --- updated-dependencies: - dependency-name: vue-router dependency-version: 4.6.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-12-15 20:32:25 +00:00
Daan Selen	306e17eb4d	refac: some exit logic Some checks failed CodeQL / Analyze (javascript) (push) Has been cancelled Details CodeQL / Analyze (python) (push) Has been cancelled Details Docker Build and Push / docker_build (push) Has been cancelled Details Docker Build and Push / docker_scan (push) Has been cancelled Details Mark stale issues and pull requests / stale (push) Has been cancelled Details	2025-12-14 20:56:18 +01:00
DaanSelen	d75c7ad418	feat: add better docker stopping response (#1025 )	2025-12-14 17:32:46 +01:00