Skip to content

Commit b9d0d4b

Browse files
committed
refactor: code
1 parent b7210e7 commit b9d0d4b

File tree

1 file changed

+21
-27
lines changed

1 file changed

+21
-27
lines changed

lib/Server.js

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -60,31 +60,6 @@ class Server {
6060
return /^[a-zA-Z][a-zA-Z\d+\-.]*:/.test(URL);
6161
}
6262

63-
static killable(server) {
64-
let sockets = [];
65-
66-
server.on("connection", (socket) => {
67-
// add socket to list
68-
sockets.push(socket);
69-
70-
socket.once("close", () => {
71-
// remove socket from list
72-
sockets.splice(sockets.indexOf(socket), 1);
73-
});
74-
});
75-
76-
server.kill = (cb) => {
77-
server.close(cb);
78-
sockets.forEach((socket) => {
79-
socket.destroy();
80-
});
81-
// reset so the server can be restarted
82-
sockets = [];
83-
};
84-
85-
return server;
86-
}
87-
8863
static async getHostname(hostname) {
8964
if (hostname === "local-ip") {
9065
return (await internalIp.v4()) || (await internalIp.v6()) || "0.0.0.0";
@@ -706,8 +681,6 @@ class Server {
706681
this.setupFeatures();
707682
this.createServer();
708683

709-
Server.killable(this.server);
710-
711684
if (this.options.setupExitSignals) {
712685
const signals = ["SIGINT", "SIGTERM"];
713686

@@ -1762,6 +1735,27 @@ class Server {
17621735

17631736
await this.initialize();
17641737

1738+
let sockets = [];
1739+
1740+
this.server.on("connection", (socket) => {
1741+
// add socket to list
1742+
sockets.push(socket);
1743+
1744+
socket.once("close", () => {
1745+
// remove socket from list
1746+
sockets.splice(sockets.indexOf(socket), 1);
1747+
});
1748+
});
1749+
1750+
this.server.kill = (cb) => {
1751+
this.server.close(cb);
1752+
sockets.forEach((socket) => {
1753+
socket.destroy();
1754+
});
1755+
// reset so the server can be restarted
1756+
sockets = [];
1757+
};
1758+
17651759
const listenOptions = this.options.ipc
17661760
? { path: this.options.ipc }
17671761
: { host: this.options.host, port: this.options.port };

0 commit comments

Comments
 (0)