torsten/yourpart3
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Update daemon socket configuration and fallback logic in frontend scripts

Browse Source 
- Changed the default value for `VITE_DAEMON_SOCKET` in `deploy-frontend.sh` and `update-frontend.sh` to connect directly to port 4551 instead of using the Apache proxy.
- Updated fallback logic in `frontend/src/store/index.js` to reflect the new direct connection to the daemon on port 4551, enhancing connection reliability.
This commit is contained in:
Torsten Schulz (local)
2025-12-01 11:46:50 +01:00
parent 7e0691eea3
commit 5807c6f3d3
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
deploy-frontend.sh
View File

@@ -26,7 +26,8 @@ fi
# 5. Frontend neu bauen – VITE_* aus Environment übernehmen oder Defaults setzen # 5. Frontend neu bauen – VITE_* aus Environment übernehmen oder Defaults setzen
echo "Baue Frontend neu..." echo "Baue Frontend neu..."
export VITE_API_BASE_URL=${VITE_API_BASE_URL:-https://www.your-part.de} export VITE_API_BASE_URL=${VITE_API_BASE_URL:-https://www.your-part.de}
export VITE_DAEMON_SOCKET=${VITE_DAEMON_SOCKET:-wss://www.your-part.de/ws/} # Standard: Daemon direkt auf Port 4551, nicht über Apache-Proxy
export VITE_DAEMON_SOCKET=${VITE_DAEMON_SOCKET:-wss://www.your-part.de:4551}
export VITE_CHAT_WS_URL=${VITE_CHAT_WS_URL:-wss://www.your-part.de:1235} export VITE_CHAT_WS_URL=${VITE_CHAT_WS_URL:-wss://www.your-part.de:1235}
echo "VITE_API_BASE_URL=$VITE_API_BASE_URL" echo "VITE_API_BASE_URL=$VITE_API_BASE_URL"

6
frontend/src/store/index.js
View File

@@ -270,10 +270,10 @@ const store = createStore({
// Wenn Umgebungsvariable nicht gesetzt ist oder leer, verwende Fallback-Logik // Wenn Umgebungsvariable nicht gesetzt ist oder leer, verwende Fallback-Logik
if (!daemonUrl || (typeof daemonUrl === 'string' && daemonUrl.trim() === '')) { if (!daemonUrl || (typeof daemonUrl === 'string' && daemonUrl.trim() === '')) {
// Fallback: gleiche Origin + Pfad /ws/ (Apache/Proxy routet intern auf Port 4551) // Fallback: direkte Verbindung zum Daemon-Port 4551 (ohne Apache-Proxy)
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
daemonUrl = `${protocol}//${hostname}/ws/`; daemonUrl = `${protocol}//${hostname}:4551/`;
console.log('[Daemon] Verwende Fallback basierend auf Hostname und Protokoll'); console.log('[Daemon] Verwende Fallback basierend auf Hostname, Protokoll und Port 4551');
} else { } else {
console.log('[Daemon] Verwende Umgebungsvariable'); console.log('[Daemon] Verwende Umgebungsvariable');
} }

3
update-frontend.sh
View File

@@ -37,7 +37,8 @@ fi
# 5. Frontend neu bauen – VITE_* aus Environment übernehmen oder Defaults setzen # 5. Frontend neu bauen – VITE_* aus Environment übernehmen oder Defaults setzen
echo "Baue Frontend neu..." echo "Baue Frontend neu..."
export VITE_API_BASE_URL=${VITE_API_BASE_URL:-https://www.your-part.de} export VITE_API_BASE_URL=${VITE_API_BASE_URL:-https://www.your-part.de}
export VITE_DAEMON_SOCKET=${VITE_DAEMON_SOCKET:-wss://www.your-part.de/ws/} # Standard: Daemon direkt auf Port 4551, nicht über Apache-Proxy
export VITE_DAEMON_SOCKET=${VITE_DAEMON_SOCKET:-wss://www.your-part.de:4551}
export VITE_CHAT_WS_URL=${VITE_CHAT_WS_URL:-wss://www.your-part.de:1235} export VITE_CHAT_WS_URL=${VITE_CHAT_WS_URL:-wss://www.your-part.de:1235}
echo "VITE_API_BASE_URL=$VITE_API_BASE_URL" echo "VITE_API_BASE_URL=$VITE_API_BASE_URL"