Ändere WebSocket-Proxy-Konfiguration in Apache und Frontend: Aktualisiere die Ports für Daemon-WebSocket-Verbindungen von 2020 auf 4551. Dies verbessert die Konsistenz der Verbindungen und stellt sicher, dass die richtigen Endpunkte verwendet werden.
This commit is contained in:
@@ -128,35 +128,36 @@ const store = createStore({
|
|||||||
if (currentDaemonSocket) {
|
if (currentDaemonSocket) {
|
||||||
currentDaemonSocket.disconnect();
|
currentDaemonSocket.disconnect();
|
||||||
}
|
}
|
||||||
console.log('🔌 Initializing Daemon WebSocket connection to:', import.meta.env.VITE_API_BASE_URL);
|
console.log('🔌 Initializing Daemon WebSocket connection to:', import.meta.env.VITE_DAEMON_SOCKET);
|
||||||
try {
|
try {
|
||||||
// Use Socket.io for daemon connection instead of native WebSocket
|
const daemonSocket = new WebSocket(import.meta.env.VITE_DAEMON_SOCKET);
|
||||||
const daemonSocket = io(import.meta.env.VITE_API_BASE_URL, {
|
|
||||||
secure: true,
|
|
||||||
transports: ['websocket', 'polling']
|
|
||||||
});
|
|
||||||
|
|
||||||
daemonSocket.on('connect', () => {
|
daemonSocket.onopen = () => {
|
||||||
console.log('✅ Daemon Socket.io connected successfully');
|
console.log('✅ Daemon WebSocket connected successfully');
|
||||||
daemonSocket.emit('setUserId', state.user.id);
|
const payload = JSON.stringify({
|
||||||
|
event: 'setUserId',
|
||||||
|
data: { userId: state.user.id }
|
||||||
});
|
});
|
||||||
|
daemonSocket.send(payload);
|
||||||
|
};
|
||||||
|
|
||||||
daemonSocket.on('disconnect', (reason) => {
|
daemonSocket.onclose = (event) => {
|
||||||
console.warn('❌ Daemon Socket.io disconnected:', reason);
|
console.warn('❌ Daemon WebSocket disconnected:', event.reason);
|
||||||
retryConnection(connectDaemonSocket);
|
retryConnection(connectDaemonSocket);
|
||||||
});
|
};
|
||||||
|
|
||||||
daemonSocket.on('connect_error', (error) => {
|
daemonSocket.onerror = (error) => {
|
||||||
console.error('❌ Daemon Socket.io error:', error);
|
console.error('❌ Daemon WebSocket error:', error);
|
||||||
retryConnection(connectDaemonSocket);
|
retryConnection(connectDaemonSocket);
|
||||||
});
|
};
|
||||||
|
|
||||||
daemonSocket.on('message', (data) => {
|
daemonSocket.addEventListener('message', (event) => {
|
||||||
if (data === "ping") {
|
const message = event.data;
|
||||||
daemonSocket.emit("pong");
|
if (message === "ping") {
|
||||||
|
daemonSocket.send("pong");
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
const parsedData = JSON.parse(data);
|
const data = JSON.parse(message);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error parsing message:", error);
|
console.error("Error parsing message:", error);
|
||||||
}
|
}
|
||||||
@@ -165,8 +166,8 @@ const store = createStore({
|
|||||||
|
|
||||||
commit('setDaemonSocket', daemonSocket);
|
commit('setDaemonSocket', daemonSocket);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('❌ Failed to create Daemon Socket.io:', error);
|
console.error('❌ Failed to create Daemon WebSocket:', error);
|
||||||
console.error('❌ URL attempted:', import.meta.env.VITE_API_BASE_URL);
|
console.error('❌ URL attempted:', import.meta.env.VITE_DAEMON_SOCKET);
|
||||||
retryConnection(connectDaemonSocket);
|
retryConnection(connectDaemonSocket);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -27,8 +27,8 @@
|
|||||||
ProxyPassReverse "/socket.io/" "http://localhost:2020/socket.io/"
|
ProxyPassReverse "/socket.io/" "http://localhost:2020/socket.io/"
|
||||||
|
|
||||||
# WebSocket-Proxy für Daemon-Verbindungen
|
# WebSocket-Proxy für Daemon-Verbindungen
|
||||||
ProxyPass "/ws/" "ws://localhost:2020/"
|
ProxyPass "/ws/" "ws://localhost:4551/"
|
||||||
ProxyPassReverse "/ws/" "ws://localhost:2020/"
|
ProxyPassReverse "/ws/" "ws://localhost:4551/"
|
||||||
|
|
||||||
# WebSocket-Upgrade-Header für Socket.io
|
# WebSocket-Upgrade-Header für Socket.io
|
||||||
RewriteEngine on
|
RewriteEngine on
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
# WebSocket-Upgrade-Header für Daemon-Verbindungen
|
# WebSocket-Upgrade-Header für Daemon-Verbindungen
|
||||||
RewriteCond %{HTTP:Upgrade} websocket [NC]
|
RewriteCond %{HTTP:Upgrade} websocket [NC]
|
||||||
RewriteCond %{HTTP:Connection} upgrade [NC]
|
RewriteCond %{HTTP:Connection} upgrade [NC]
|
||||||
RewriteRule ^/ws/(.*)$ "ws://localhost:2020/$1" [P,L]
|
RewriteRule ^/ws/(.*)$ "ws://localhost:4551/$1" [P,L]
|
||||||
|
|
||||||
ErrorLog /var/log/apache2/yourpart.error.log
|
ErrorLog /var/log/apache2/yourpart.error.log
|
||||||
CustomLog /var/log/apache2/yourpart.access.log combined
|
CustomLog /var/log/apache2/yourpart.access.log combined
|
||||||
|
|||||||
Reference in New Issue
Block a user