Skip to content

refactor(housepanel-push): extract dropClientsForHost helper from duplicated client-removal loops [2032503602] #39

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

Merged
pstuart merged 1 commit into from
Sep 11, 2026
Merged

refactor(housepanel-push): extract dropClientsForHost helper from duplicated client-removal loops [2032503602] #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 19 additions & 18 deletions housepanel-push/housepanel-push.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,23 @@ function locateOptionsFile() {
return null;
}

// shut down any existing client connections coming from the same remote host,
// so a reconnecting dashboard replaces its previous session instead of
// duplicating it. Returns the number of stale connections removed.
function dropClientsForHost(host) {
var removed = 0;
var i = 0;
while ( i < clients.length ) {
if ( clients[i].socket.remoteAddress === host ) {
clients.splice(i, 1);
removed++;
} else {
i++;
}
}
return removed;
}

function updateElements() {
elements = [ ];
hubs = null;
Expand Down Expand Up @@ -326,15 +343,7 @@ if ( wsServer ) {

// shut down any existing connections to same remote host
var host = connection.socket.remoteAddress;
var i = 0;
while ( i < clients.length ) {
var oldhost = clients[i].socket.remoteAddress;
if ( oldhost===host ) {
clients.splice(i, 1);
} else {
i++;
}
}
dropClientsForHost(host);

// report ndex of the connection
// we no longer rely on this to close prior connections
Expand All @@ -356,15 +365,7 @@ if ( wsServer ) {

// remove clients that match this host
// clients.splice(indexsave, 1);
var i = 0;
while ( i < clients.length ) {
var oldhost = clients[i].socket.remoteAddress;
if ( oldhost===host ) {
clients.splice(i, 1);
} else {
i++;
}
}
dropClientsForHost(host);
});

});
Expand Down