Skip to content

fix: ensure multiple socket servers aren't created #204

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
nsrCodes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: ensure multiple socket servers aren't created #204

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
22 changes: 18 additions & 4 deletions src/renderer/actions/helperSocketServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { installCert } from "./apps/os/ca";
import { ipcRenderer } from "electron";

const activeSockets = new Map<string, webSocket>();
let helperSocketServer: webSocket.Server;

export const sendMessageToExtension = (
clientId: string,
Expand Down Expand Up @@ -93,10 +94,23 @@ const sendHeartbeat = () => {
}, 20000);
};

export const stopHelperSocketServer = () => {
if (helperSocketServer) {
helperSocketServer.close(() => {
console.log("Helper socket server stopped");
});
activeSockets.clear();
}
}


export const startHelperSocketServer = (port: number): webSocket.Server => {
const server = new webSocket.Server({ port });
if(helperSocketServer) {
stopHelperSocketServer();
}
helperSocketServer = new webSocket.Server({ port });

server.on("connection", (socket: webSocket, req) => {
helperSocketServer.on("connection", (socket: webSocket, req) => {
const clientId = `${req.socket.remoteAddress}:${req.socket.remotePort}`;
console.log(`Client connected: ${clientId}`);

Expand All @@ -121,5 +135,5 @@ export const startHelperSocketServer = (port: number): webSocket.Server => {
});
});

return server;
};
return helperSocketServer;
};