mirrors/mindcraft
1
0
Fork 0
mirror of https://github.com/kolbytn/mindcraft.git synced 2025-08-29 10:23:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

better connection logic for ui

Browse source
This commit is contained in:
MaxRobinsonTheGreat 2025-08-28 16:02:05 -05:00
parent b7697723bc
commit 7e3d9c0c85
4 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings.js
View file

@ -6,7 +6,7 @@ const settings = {
// the mindserver manages all agents and hosts the UI
"mindserver_port": 8080,
"auto_open_ui": true,
"auto_open_ui": true, // opens UI in browser on startup
"base_profile": "assistant", // survival, assistant, creative, or god_mode
"profiles": [

1
src/agent/mindserver_proxy.js
View file

@ -88,6 +88,7 @@ class MindServerProxy {
return reject(new Error(response.error));
}
setSettings(response.settings);
this.socket.emit('connect-agent-process', name);
resolve();
});
});

11
src/mindcraft/mindserver.js
View file

@ -101,6 +101,13 @@ export function createMindServer(host_public = false, port = 8080) {
}
});
socket.on('connect-agent-process', (agentName) => {
if (agent_connections[agentName]) {
agent_connections[agentName].socket = socket;
agentsStatusUpdate();
}
});
socket.on('login-agent', (agentName) => {
if (agent_connections[agentName]) {
agent_connections[agentName].socket = socket;
@ -117,6 +124,7 @@ export function createMindServer(host_public = false, port = 8080) {
if (agent_connections[curAgentName]) {
console.log(`Agent ${curAgentName} disconnected`);
agent_connections[curAgentName].in_game = false;
agent_connections[curAgentName].socket = null;
agentsStatusUpdate();
}
if (agent_listeners.includes(socket)) {
@ -221,7 +229,8 @@ function agentsStatusUpdate(socket) {
agents.push({
name: agentName,
in_game: conn.in_game,
viewerPort: conn.viewer_port
viewerPort: conn.viewer_port,
socket_connected: !!conn.socket
});
};
socket.emit('agents-status', agents);

18
src/mindcraft/public/index.html
View file

@ -759,7 +759,7 @@
<div class="agent" id="agent-${agent.name}">
<div class="agent-grid">
<div class="cell title" style="grid-column: 1 / -1; display:flex; align-items:center; justify-content:space-between;">
<span><span class="status-icon ${agent.in_game ? 'online' : 'offline'}">●</span>${agent.name}
<span><span class="status-icon ${agent.in_game ? 'online' : 'offline'}">●</span>${agent.name}${agent.socket_connected && !agent.in_game ? '<span style="margin-left:6px;color:#f0ad4e;">joining...</span>' : ''}
<button class="gear-btn" title="Settings" onclick="openAgentSettings('${agent.name}')">⚙</button>
<button class="gear-btn" title="Inventory" onclick="toggleDetails('${agent.name}')">Inventory</button>
</span>
@ -789,7 +789,7 @@
<button class="neutral-btn" onclick="sendMessage('${agent.name}', '!stop')" ${!agent.in_game ? 'disabled' : ''}>Stop Action</button>
<button class="neutral-btn" onclick="sendMessage('${agent.name}', '!stay(-1)')" ${!agent.in_game ? 'disabled' : ''}>Stay Still</button>
<button class="neutral-btn" onclick="restartAgent('${agent.name}')" ${!agent.in_game ? 'disabled' : ''}>Restart</button>
<button class="neutral-btn" onclick="${agent.in_game ? 'disconnectAgent' : 'startAgent'}('${agent.name}')">${agent.in_game ? 'Disconnect' : 'Connect'}</button>
<button class="neutral-btn" ${agent.in_game ? `onclick=\"disconnectAgent('${agent.name}')\"` : (agent.socket_connected ? 'disabled' : `onclick=\"startAgent('${agent.name}')\"`)}>${agent.in_game ? 'Disconnect' : (agent.socket_connected ? 'Connecting...' : 'Connect')}</button>
<button class="stop-btn" onclick="destroyAgent('${agent.name}')">Remove</button>
</div>
</div>`;
@ -817,7 +817,7 @@
const prevAgents = currentAgents.reduce((acc, a) => ({ ...acc, [a.name]: a }), {});
const changedAgents = agents.filter(a => {
const prev = prevAgents[a.name];
return !prev || prev.in_game !== a.in_game || prev.viewerPort !== a.viewerPort;
return !prev || prev.in_game !== a.in_game || prev.viewerPort !== a.viewerPort || prev.socket_connected !== a.socket_connected;
});
// Update only changed agents
@ -859,7 +859,7 @@
const prevAgents = currentAgents.reduce((acc, a) => ({ ...acc, [a.name]: a }), {});
const changedAgents = agents.filter(a => {
const prev = prevAgents[a.name];
return !prev || prev.in_game !== a.in_game || prev.viewerPort !== a.viewerPort;
return !prev || prev.in_game !== a.in_game || prev.viewerPort !== a.viewerPort || prev.socket_connected !== a.socket_connected;
});
// Update current agents list
@ -907,6 +907,16 @@
if (btn) {
btn.textContent = 'Connecting...';
btn.disabled = true;
// Re-enable after 10s if still disabled (agent failed to connect)
setTimeout(() => {
const retryBtn = document.querySelector(`button[onclick=\\"startAgent('${n}')\\"]`);
const agentState = (window.currentAgents || []).find(a => a.name === n);
const stillWaiting = agentState ? (!agentState.in_game && !agentState.socket_connected) : true;
if (retryBtn && stillWaiting) {
retryBtn.disabled = false;
retryBtn.textContent = 'Connect';
}
}, 10000);
}
socket.emit('start-agent', n);
}