gsadmin/pulse
1
0
Fork 0
mirror of https://github.com/rcourtman/Pulse.git synced 2026-09-10 18:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor(server): Extract socket state sending to sendCurrentStateToSocket helper

Browse Source
This commit is contained in:
courtmanr@gmail.com
2025-05-08 11:18:46 +01:00
parent af531c1524
commit b58169b30d
1 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/index.js
+18 -27
View File
@@ -143,41 +143,32 @@ const io = new Server(server, {
}
});
io.on('connection', (socket) => {
console.log('Client connected');
// Get the flag from state manager
const { isConfigPlaceholder: currentPlaceholderStatus } = stateManager.getState();
const currentState = stateManager.getState();
function sendCurrentStateToSocket(socket) {
const fullCurrentState = stateManager.getState(); // This includes isConfigPlaceholder
const currentPlaceholderStatus = fullCurrentState.isConfigPlaceholder; // Extract for clarity if needed
if (stateManager.hasData()) {
// Emit the flag from state manager
socket.emit('rawData', { ...currentState }); // getState now includes the flag
socket.emit('rawData', fullCurrentState);
} else {
console.log('No data available yet on connect, sending initial state.');
// Emit the flag from state manager
socket.emit('initialState', { loading: true, isConfigPlaceholder: currentPlaceholderStatus });
console.log('No data available yet, sending initial/loading state.');
socket.emit('initialState', { loading: true, isConfigPlaceholder: currentPlaceholderStatus });
}
}
io.on('connection', (socket) => {
console.log('Client connected');
sendCurrentStateToSocket(socket);
socket.on('requestData', async () => {
console.log('Client requested data');
try {
// Get the flag from state manager
const { isConfigPlaceholder: currentPlaceholderStatus } = stateManager.getState();
const currentState = stateManager.getState();
if (stateManager.hasData()) {
// Emit the flag from state manager
socket.emit('rawData', { ...currentState }); // getState now includes the flag
} else {
console.log('No data available yet on request, sending loading state.');
// Emit the flag from state manager
socket.emit('initialState', { loading: true, isConfigPlaceholder: currentPlaceholderStatus });
// Optionally trigger an immediate discovery cycle?
// runDiscoveryCycle(); // Be careful with triggering cycles on demand
}
sendCurrentStateToSocket(socket);
// Optionally trigger an immediate discovery cycle?
// runDiscoveryCycle(); // Be careful with triggering cycles on demand
} catch (error) {
console.error('Error fetching data on client request:', error);
// Notify client of error?
console.error('Error processing requestData event:', error);
// Notify client of error? Consider emitting an error event to the specific socket
// socket.emit('requestError', { message: 'Failed to process your request.' });
}
});
@@ -349,4 +340,4 @@ startServer();
// async function fetchPbsNodeName(...) { ... } // MOVED
// async function fetchAllPbsTasksForProcessing(...) { ... } // MOVED
// function processPbsTasks(...) { ... } // MOVED
// async function fetchPbsDatastoreData(...) { ... } // MOVED
// async function fetchPbsDatastoreData(...) { ... } // MOVED