Verbesserung: Implementierung eines Protokoll-Fallbacks für die Daemon WebSocket-Verbindung
Änderungen: - Der Verbindungsaufbau des Daemon WebSockets wurde angepasst, um zuerst mit einem spezifischen Subprotokoll zu versuchen und bei Misserfolg auf eine Verbindung ohne Subprotokoll zurückzugreifen. - Zusätzliche Protokollausgaben wurden hinzugefügt, um den Verbindungsstatus und Fehlerdetails besser nachzuvollziehen. Diese Anpassungen erhöhen die Robustheit der WebSocket-Verbindung und verbessern die Fehlerdiagnose.
This commit is contained in:
@@ -131,70 +131,105 @@ const store = createStore({
|
||||
console.log('🔌 Initializing Daemon WebSocket connection to:', daemonUrl);
|
||||
|
||||
const connectDaemonSocket = () => {
|
||||
try {
|
||||
const daemonSocket = new WebSocket(daemonUrl, 'yourpart-protocol');
|
||||
console.log('🔌 Protocol: yourpart-protocol');
|
||||
// Protokoll-Fallback: zuerst mit Subprotokoll, dann ohne
|
||||
const protocols = ['yourpart-protocol', undefined];
|
||||
let attemptIndex = 0;
|
||||
|
||||
daemonSocket.onopen = () => {
|
||||
console.log('✅ Daemon WebSocket connected successfully');
|
||||
retryCount = 0; // Reset retry counter on successful connection
|
||||
const payload = JSON.stringify({
|
||||
user_id: state.user.id,
|
||||
event: 'setUserId',
|
||||
data: { userId: state.user.id }
|
||||
});
|
||||
daemonSocket.send(payload);
|
||||
};
|
||||
const tryConnectWithProtocol = () => {
|
||||
const currentProtocol = protocols[attemptIndex];
|
||||
try {
|
||||
const daemonSocket = currentProtocol
|
||||
? new WebSocket(daemonUrl, currentProtocol)
|
||||
: new WebSocket(daemonUrl);
|
||||
console.log('🔌 Protocol:', currentProtocol ?? 'none (fallback)');
|
||||
|
||||
daemonSocket.onclose = (event) => {
|
||||
console.warn('❌ Daemon WebSocket disconnected:', event.reason);
|
||||
console.warn('❌ Close details:', {
|
||||
code: event.code,
|
||||
reason: event.reason,
|
||||
wasClean: event.wasClean,
|
||||
readyState: daemonSocket.readyState
|
||||
});
|
||||
retryConnection(connectDaemonSocket);
|
||||
};
|
||||
let opened = false;
|
||||
|
||||
daemonSocket.onerror = (error) => {
|
||||
console.error('❌ Daemon WebSocket error:', error);
|
||||
console.error('❌ Error details:', {
|
||||
type: error.type,
|
||||
target: error.target,
|
||||
readyState: daemonSocket.readyState,
|
||||
url: daemonSocket.url,
|
||||
protocol: daemonSocket.protocol
|
||||
});
|
||||
console.error('❌ Browser info:', {
|
||||
userAgent: navigator.userAgent,
|
||||
location: window.location.href,
|
||||
isSecure: window.location.protocol === 'https:'
|
||||
});
|
||||
retryConnection(connectDaemonSocket);
|
||||
};
|
||||
daemonSocket.onopen = () => {
|
||||
opened = true;
|
||||
console.log('✅ Daemon WebSocket connected successfully');
|
||||
retryCount = 0; // Reset retry counter on successful connection
|
||||
const payload = JSON.stringify({
|
||||
user_id: state.user.id,
|
||||
event: 'setUserId',
|
||||
data: { userId: state.user.id }
|
||||
});
|
||||
daemonSocket.send(payload);
|
||||
};
|
||||
|
||||
daemonSocket.addEventListener('message', (event) => {
|
||||
const message = event.data;
|
||||
if (message === "ping") {
|
||||
daemonSocket.send("pong");
|
||||
} else {
|
||||
try {
|
||||
const data = JSON.parse(message);
|
||||
// Handle daemon messages here
|
||||
console.log('📨 Daemon message received:', data);
|
||||
} catch (error) {
|
||||
console.error("Error parsing daemon message:", error);
|
||||
daemonSocket.onclose = (event) => {
|
||||
console.warn('❌ Daemon WebSocket disconnected:', event.reason);
|
||||
console.warn('❌ Close details:', {
|
||||
code: event.code,
|
||||
reason: event.reason,
|
||||
wasClean: event.wasClean,
|
||||
readyState: daemonSocket.readyState
|
||||
});
|
||||
// Falls Verbindungsaufbau nicht offen war und es noch einen Fallback gibt → nächsten Versuch ohne Subprotokoll
|
||||
if (!opened && attemptIndex < protocols.length - 1) {
|
||||
attemptIndex += 1;
|
||||
console.warn('🔄 Fallback: versuche erneut ohne Subprotokoll...');
|
||||
tryConnectWithProtocol();
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
retryConnection(connectDaemonSocket);
|
||||
};
|
||||
|
||||
commit('setDaemonSocket', daemonSocket);
|
||||
} catch (error) {
|
||||
console.error('❌ Failed to create Daemon WebSocket:', error);
|
||||
console.error('❌ URL attempted:', import.meta.env.VITE_DAEMON_SOCKET);
|
||||
retryConnection(connectDaemonSocket);
|
||||
}
|
||||
daemonSocket.onerror = (error) => {
|
||||
console.error('❌ Daemon WebSocket error:', error);
|
||||
console.error('❌ Error details:', {
|
||||
type: error.type,
|
||||
target: error.target,
|
||||
readyState: daemonSocket.readyState,
|
||||
url: daemonSocket.url,
|
||||
protocol: daemonSocket.protocol
|
||||
});
|
||||
console.error('❌ Browser info:', {
|
||||
userAgent: navigator.userAgent,
|
||||
location: window.location.href,
|
||||
isSecure: window.location.protocol === 'https:'
|
||||
});
|
||||
// Bei Fehler vor Open: Fallback versuchen
|
||||
if (!opened && attemptIndex < protocols.length - 1) {
|
||||
attemptIndex += 1;
|
||||
console.warn('🔄 Fallback: versuche erneut ohne Subprotokoll (onerror)...');
|
||||
tryConnectWithProtocol();
|
||||
return;
|
||||
}
|
||||
retryConnection(connectDaemonSocket);
|
||||
};
|
||||
|
||||
daemonSocket.addEventListener('message', (event) => {
|
||||
const message = event.data;
|
||||
if (message === "ping") {
|
||||
daemonSocket.send("pong");
|
||||
} else {
|
||||
try {
|
||||
const data = JSON.parse(message);
|
||||
// Handle daemon messages here
|
||||
console.log('📨 Daemon message received:', data);
|
||||
} catch (error) {
|
||||
console.error("Error parsing daemon message:", error);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
commit('setDaemonSocket', daemonSocket);
|
||||
} catch (error) {
|
||||
console.error('❌ Failed to create Daemon WebSocket:', error);
|
||||
console.error('❌ URL attempted:', import.meta.env.VITE_DAEMON_SOCKET);
|
||||
// Beim Konstruktionsfehler ebenfalls Fallback versuchen
|
||||
if (attemptIndex < protocols.length - 1) {
|
||||
attemptIndex += 1;
|
||||
console.warn('🔄 Fallback: Konstruktion ohne Subprotokoll...');
|
||||
tryConnectWithProtocol();
|
||||
return;
|
||||
}
|
||||
retryConnection(connectDaemonSocket);
|
||||
}
|
||||
};
|
||||
|
||||
tryConnectWithProtocol();
|
||||
};
|
||||
|
||||
let retryCount = 0;
|
||||
|
||||
Reference in New Issue
Block a user