Merge pull request #932 from WGDashboard/dependabot/npm_and_yarn/src/static/app/npm-11.6.1

Bump npm from 11.6.0 to 11.6.1 in /src/static/app

.github/dependabot.yml

@@ -8,24 +8,24 @@ updates:
   - package-ecosystem: "pip"
     directory: "/src"
     schedule:
-      interval: "daily"
+      interval: "weekly"
 
   - package-ecosystem: "npm"
     directory: "/src/static/app"
     schedule:
-      interval: "daily"
+      interval: "weekly"
       
   - package-ecosystem: "github-actions"
     directory: "/.github"
     schedule:
-      interval: "daily"
+      interval: "weekly"
 
   - package-ecosystem: "docker"
     directory: "/docker"
     schedule:
-      interval: "daily"
+      interval: "weekly"
 
   - package-ecosystem: "docker-compose"
     directory: "/docker"
     schedule:
-      interval: "daily"
+      interval: "weekly"

docker/entrypoint.sh

@@ -13,15 +13,15 @@ hash_password() {
 set_ini() {
   local section="$1" key="$2" value="$3"
   local current_value
-  
+
   # Add section if it doesn't exist
   grep -q "^\[${section}\]" "$config_file" \
     || printf "\n[%s]\n" "${section}" >> "$config_file"
-  
+
   # Check current value if key exists
   if grep -q "^[[:space:]]*${key}[[:space:]]*=" "$config_file"; then
     current_value=$(grep "^[[:space:]]*${key}[[:space:]]*=" "$config_file" | cut -d= -f2- | xargs)
-    
+
     # Don't display actual value if it's a password field
     if [[ "$key" == *"password"* ]]; then
       if [ "$current_value" = "$value" ]; then
@@ -40,7 +40,7 @@ set_ini() {
     fi
   else
     sed -i "/^\[${section}\]/a ${key} = ${value}" "$config_file"
-    
+
     # Don't display actual value if it's a password field
     if [[ "$key" == *"password"* ]]; then
       echo "- Added new setting $key (value hidden)"
@@ -61,58 +61,58 @@ echo "Starting the WGDashboard Docker container."
 
 ensure_installation() {
   echo "Quick-installing..."
-  
+
   # Make the wgd.sh script executable.
   chmod +x "${WGDASH}"/src/wgd.sh
   cd "${WGDASH}"/src || exit
-  
+
   # Github issue: https://github.com/donaldzou/WGDashboard/issues/723
   echo "Checking for stale pids..."
   if [[ -f ${WGDASH}/src/gunicorn.pid ]]; then
     echo "Found stale pid, removing..."
     rm ${WGDASH}/src/gunicorn.pid
   fi
-  
+
   # Removing clear shell command from the wgd.sh script to enhance docker logging.
   echo "Removing clear command from wgd.sh for better Docker logging."
   sed -i '/clear/d' ./wgd.sh
-  
+
   # Create required directories and links
   if [ ! -d "/data/db" ]; then
     echo "Creating database dir"
     mkdir -p /data/db
   fi
-  
+
   if [ ! -d "${WGDASH}/src/db" ]; then
     ln -s /data/db "${WGDASH}/src/db"
   fi
-  
+
   if [ ! -f "${config_file}" ]; then
     echo "Creating wg-dashboard.ini file"
     touch "${config_file}"
   fi
-  
+
   if [ ! -f "${WGDASH}/src/wg-dashboard.ini" ]; then
     ln -s "${config_file}" "${WGDASH}/src/wg-dashboard.ini"
   fi
 
   # Create the Python virtual environment.
   . "${WGDASH}/src/venv/bin/activate"
-  
+
   # Use the bash interpreter to install WGDashboard according to the wgd.sh script.
   /bin/bash ./wgd.sh install
-  
+
   echo "Looks like the installation succeeded. Moving on."
-  
+
   # Setup WireGuard if needed
-  if [ ! -f "/etc/wireguard/wg0.conf" ]; then
+  if [ -z "$(ls -A /etc/wireguard)" ]; then
     cp -a "/configs/wg0.conf.template" "/etc/wireguard/wg0.conf"
-    
+
     echo "Setting a secure private key."
     local privateKey
     privateKey=$(wg genkey)
     sed -i "s|^PrivateKey *=.*$|PrivateKey = ${privateKey}|g" /etc/wireguard/wg0.conf
-    
+
     echo "Done setting template."
   else
     echo "Existing wg0 configuration file found, using that."
@@ -121,51 +121,51 @@ ensure_installation() {
 
 set_envvars() {
   printf "\n------------- SETTING ENVIRONMENT VARIABLES ----------------\n"
-  
+
   # Check if config file is empty
   if [ ! -s "${config_file}" ]; then
     echo "Config file is empty. Creating initial structure."
   fi
-  
+
   echo "Checking basic configuration:"
   set_ini Peers peer_global_dns "${global_dns}"
-  
+
   if [ -z "${public_ip}" ]; then
     public_ip=$(curl -s ifconfig.me)
     echo "Automatically detected public IP: ${public_ip}" 
   fi
-  
+
   set_ini Peers remote_endpoint "${public_ip}"
   set_ini Server app_port "${wgd_port}"
-  
+
   # Account settings - process all parameters
   [[ -n "$username" ]] && echo "Configuring user account:"
   # Basic account variables
   [[ -n "$username" ]] && set_ini Account username "${username}"
-  
+
   if [[ -n "$password" ]]; then
     echo "- Setting password"
     set_ini Account password "$(hash_password "${password}")"
   fi
-  
+
   # Additional account variables
   [[ -n "$enable_totp" ]] && set_ini Account enable_totp "${enable_totp}"
   [[ -n "$totp_verified" ]] && set_ini Account totp_verified "${totp_verified}"
   [[ -n "$totp_key" ]] && set_ini Account totp_key "${totp_key}"
-  
+
   # Welcome session
   [[ -n "$welcome_session" ]] && set_ini Other welcome_session "${welcome_session}"
   # If username and password are set but welcome_session isn't, disable it
   if [[ -n "$username" && -n "$password" && -z "$welcome_session" ]]; then
     set_ini Other welcome_session "false"
   fi
-  
+
   # Autostart WireGuard
   if [[ -n "$wg_autostart" ]]; then
     echo "Configuring WireGuard autostart:"
     set_ini WireGuardConfiguration autostart "${wg_autostart}"
   fi
-  
+
   # Email (check if any settings need to be configured)
   email_vars=("email_server" "email_port" "email_encryption" "email_username" "email_password" "email_from" "email_template")
   for var in "${email_vars[@]}"; do
@@ -174,12 +174,12 @@ set_envvars() {
       break
     fi
   done
-  
+
   # Email (iterate through all possible fields)
   email_fields=("server:email_server" "port:email_port" "encryption:email_encryption" 
                 "username:email_username" "email_password:email_password" 
                 "send_from:email_from" "email_template:email_template")
-  
+
   for field_pair in "${email_fields[@]}"; do
     IFS=: read -r field var <<< "$field_pair"
     [[ -n "${!var}" ]] && set_ini Email "$field" "${!var}"
@@ -189,7 +189,7 @@ set_envvars() {
 # Start service and monitor logs
 start_and_monitor() {
   printf "\n---------------------- STARTING CORE -----------------------\n"
-  
+
   # Due to some instances complaining about this, making sure its there every time.
   mkdir -p /dev/net
   mknod /dev/net/tun c 10 200
@@ -198,15 +198,15 @@ start_and_monitor() {
   # Actually starting WGDashboard
   echo "Activating Python venv and executing the WireGuard Dashboard service."
   bash ./wgd.sh start
-  
+
   # Wait a second before continuing, to give the python program some time to get ready.
   sleep 1
   echo -e "\nEnsuring container continuation."
-  
+
   # Find and monitor log file
   local logdir="${WGDASH}/src/log"
   latestErrLog=$(find "$logdir" -name "error_*.log" -type f -print | sort -r | head -n 1)
-  
+
   # Only tail the logs if they are found
   if [ -n "$latestErrLog" ]; then
     tail -f "$latestErrLog" &
@@ -221,4 +221,4 @@ start_and_monitor() {
 # Main execution flow
 ensure_installation
 set_envvars
-start_and_monitor
+start_and_monitor

src/modules/PeerJobs.py

@@ -184,7 +184,7 @@ class PeerJobs:
                                   f"Somehow can't find this peer {job.Peer} from {c.Name} failed {job.Action}ed."
                                   )
             else:
-                current_app.logger.warning(f"Somehow can't find this peer {job.Peer} from {c.Name} failed {job.Action}ed.")
+                current_app.logger.warning(f"Somehow can't find this peer {job.Peer} from {job.Configuration} failed {job.Action}ed.")
                 self.JobLogger.log(job.JobID, False,
                               f"Somehow can't find this peer {job.Peer} from {job.Configuration} failed {job.Action}ed."
                               )

src/static/app/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@volar/language-server": "2.4.23",
-    "@vue/language-server": "3.0.7",
+    "@vue/language-server": "3.1.0",
     "@vuepic/vue-datepicker": "^11.0.2",
     "@vueuse/core": "^13.5.0",
     "@vueuse/shared": "^13.5.0",
@@ -27,20 +27,20 @@
     "fuse.js": "^7.0.0",
     "i": "^0.3.7",
     "is-cidr": "^5.0.3",
-    "npm": "^10.5.0",
+    "npm": "^11.6.1",
     "ol": "^10.2.1",
     "pinia": "^3.0.3",
     "pinia-plugin-persistedstate": "^4.5.0",
     "qrcode": "^1.5.3",
     "qrcodejs": "^1.0.0",
     "simple-code-editor": "^2.0.9",
-    "uuid": "^11.1.0",
-    "vue": "^3.5.17",
+    "uuid": "^13.0.0",
+    "vue": "^3.5.22",
     "vue-chartjs": "^5.3.0",
     "vue-router": "^4.2.5"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^6.0.0",
-    "vite": "^7.1.6"
+    "vite": "^7.1.7"
   }
 }

src/wgd.sh

@@ -464,47 +464,6 @@ stop_wgd() {
 	fi
 }
 
-# ============= Docker Functions =============
-startwgd_docker() {
-	_checkWireguard
-	printf "[WGDashboard][Docker] WireGuard configuration started\n"
-	{ date; start_core ; printf "\n\n"; } >> ./log/install.txt
-    gunicorn_start
-}
-
-start_core() {
-	# Re-assign config_files to ensure it includes any newly created configurations
-	local config_files=$(find /etc/wireguard -type f -name "*.conf")
-	
-	# Set file permissions
-	find /etc/wireguard -type f -name "*.conf" -exec chmod 600 {} \;
-	find "$iptable_dir" -type f -name "*.sh" -exec chmod +x {} \;
-	
-	# Start WireGuard for each config file
-	for file in $config_files; do
-		config_name=$(basename "$file" ".conf")
-		wg-quick up "$config_name"
-	done
-}
-
-newconf_wgd() {
-    local wg_port_listen=$wg_port
-    local wg_addr_range=$wg_net
-    private_key=$(wg genkey)
-    public_key=$(echo "$private_key" | wg pubkey)
-    cat <<EOF >"/etc/wireguard/wg0.conf"
-[Interface]
-PrivateKey = $private_key
-Address = $wg_addr_range
-ListenPort = $wg_port_listen
-SaveConfig = true
-PostUp = /opt/wireguarddashboard/src/iptable-rules/postup.sh
-PreDown = /opt/wireguarddashboard/src/iptable-rules/postdown.sh
-EOF
-}
-
-# ============= Docker Functions =============
-
 start_wgd_debug() {
 	_checkWireguard
 	printf "[WGDashboard] Starting WGDashboard in the foreground.\n"
@@ -600,4 +559,4 @@ else
 		help
 	fi
 fi
-printf "%s\n" "$dashes"
+printf "%s\n" "$dashes"