Skip to content

Improve WebSocket host failover for Emma chat #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
techno-optimist wants to merge 5 commits into
base: emmaintelligenceupdate
Choose a base branch
from
Open

Improve WebSocket host failover for Emma chat #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d904751
Improve Emma WebSocket failover
techno-optimist Nov 20, 2025
9f77429
Make chat WebSocket URL resolution merge-safe
techno-optimist Nov 20, 2025
808f82b
Add chat WebSocket override fallback
techno-optimist Nov 21, 2025
dbd9657
Improve chat connection resilience and offline fallback
techno-optimist Nov 21, 2025
616889b
Harden chat WebSocket recovery and fallback handling
techno-optimist Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions chat.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<script src="js/emma-vault-primary.js"></script>
<script src="js/emma-web-vault.js"></script>
<script src="js/web-vault-status.js"></script>
<script src="js/emma-unified-intelligence.js"></script>

<link rel="stylesheet" href="css/emma-chat-clean.css">
<style>
Expand All @@ -32,10 +33,36 @@
display: flex;
flex-direction: column;
}

.chat-status {
display: flex;
align-items: center;
gap: 8px;
padding: 10px 12px;
background: #f4f3ff;
border: 1px solid #d9d6ff;
color: #4534ac;
border-radius: 10px;
font-weight: 600;
margin: 0 0 10px 0;
}

.chat-status.offline {
background: #fff6f6;
border-color: #ffd6d6;
color: #9b1c1c;
}

.chat-status.connected {
background: #eefcf3;
border-color: #b9e6c9;
color: #1b6b35;
}
</style>
</head>
<body>
<div class="chat-container">
<div id="chat-connection-status" class="chat-status">Connecting to Emma…</div>
<div class="chat-messages" id="chat-messages">
<div id="welcome-message">
<h2>Welcome to Emma Chat</h2>
Expand Down
51 changes: 45 additions & 6 deletions js/emma-browser-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ class EmmaBrowserClient {
: null;
this._lastSentApiKey = undefined;
this.voicePlaybackEnabled = true;
this.socketGeneration = 0;
this.heartbeatInterval = null;
this.failedWsUrls = new Set();
this.lastKnownWsUrl = (() => {
try {
return sessionStorage.getItem('emma-last-ws-url');
} catch (_) {
return null;
}
})();

console.log('🎙️ Emma Browser Client initialized');

Expand Down Expand Up @@ -223,12 +233,15 @@ class EmmaBrowserClient {
const wsCandidates = [];

const pushCandidate = (url) => {
if (url && !seen.has(url)) {
if (url && !seen.has(url) && !this.failedWsUrls.has(url)) {
seen.add(url);
wsCandidates.push(url);
}
};

// Sticky preference for last known good URL
pushCandidate(this.lastKnownWsUrl);

// Preferred runtime override
pushCandidate(options.wsUrl);

Expand Down Expand Up @@ -273,9 +286,11 @@ class EmmaBrowserClient {

try {
await this._attemptWebSocketConnection(candidate);
try { sessionStorage.setItem('emma-last-ws-url', candidate); } catch (_) {}
return; // Successful connection
} catch (error) {
lastError = error;
this.failedWsUrls.add(candidate);
console.warn(`⚠️ WebSocket connect failed for ${candidate}:`, error?.message || error);
}
}
Expand All @@ -290,6 +305,7 @@ class EmmaBrowserClient {
try {
const websocket = new WebSocket(wsUrl);
let resolved = false;
const socketId = ++this.socketGeneration;

const cleanup = (err) => {
if (resolved) return;
Expand All @@ -312,7 +328,8 @@ class EmmaBrowserClient {
}

this.websocket = websocket;
this.setupWebSocketHandlers();
this.setupWebSocketHandlers(websocket, socketId);
this.startHeartbeat();

console.log('✅ Connected to Emma agent', wsUrl);
this.isConnected = true;
Expand Down Expand Up @@ -459,8 +476,11 @@ class EmmaBrowserClient {
/**
* Setup WebSocket event handlers
*/
setupWebSocketHandlers() {
this.websocket.onmessage = async (event) => {
setupWebSocketHandlers(websocket, socketId) {
const isStaleSocket = () => socketId !== this.socketGeneration;

websocket.onmessage = async (event) => {
if (isStaleSocket()) return;
try {
const message = JSON.parse(event.data);
console.log('📨 Emma message:', message.type);
Expand Down Expand Up @@ -566,12 +586,15 @@ class EmmaBrowserClient {
}
};

this.websocket.onerror = (error) => {
websocket.onerror = (error) => {
if (isStaleSocket()) return;
console.error('❌ WebSocket error:', error);
this.showError('Connection error', 'Lost connection to Emma');
};

this.websocket.onclose = () => {
websocket.onclose = () => {
if (isStaleSocket()) return;
this.stopHeartbeat();
console.log('🔇 Emma agent connection closed');
this.isConnected = false;
this.setState('idle');
Expand All @@ -581,6 +604,22 @@ class EmmaBrowserClient {
};
}

startHeartbeat() {
this.stopHeartbeat();
this.heartbeatInterval = setInterval(() => {
if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
this.sendToAgent({ type: 'ping', timestamp: Date.now() });
}
}, 15000);
}

stopHeartbeat() {
if (this.heartbeatInterval) {
clearInterval(this.heartbeatInterval);
this.heartbeatInterval = null;
}
}

/**
* Handle tool requests from Emma agent (privacy-first execution)
*/
Expand Down
Loading