🐛 Also close udp socket when throwing errors

GiyoMoon · Jan 3, 2022 · bccbdad · bccbdad
1 parent 97d7f06
commit bccbdad
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steam-server-query",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Module which implements the Master Server Query Protocol and Game Server Queries.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/src/gameServer/gameServer.ts b/src/gameServer/gameServer.ts
@@ -70,6 +70,7 @@ class GameServerQuery {
     try {
       resultBuffer = await this._promiseSocket.send(this._buildInfoPacket(), this._host, this._port);
     } catch (err: any) {
+      this._promiseSocket.closeSocket();
       throw new Error(err);
     }
 
@@ -80,6 +81,7 @@ class GameServerQuery {
       try {
         resultBuffer = await this._promiseSocket.send(this._buildInfoPacket(challenge), this._host, this._port);
       } catch (err: any) {
+        this._promiseSocket.closeSocket();
         throw new Error(err);
       }
     }
@@ -95,6 +97,7 @@ class GameServerQuery {
     try {
       challengeResultBuffer = await this._promiseSocket.send(this._buildPacket(Buffer.from([0x55])), this._host, this._port);
     } catch (err: any) {
+      this._promiseSocket.closeSocket();
       throw new Error(err);
     }
 
@@ -104,6 +107,7 @@ class GameServerQuery {
     try {
       resultBuffer = await this._promiseSocket.send(this._buildPacket(Buffer.from([0x55]), challenge), this._host, this._port);
     } catch (err: any) {
+      this._promiseSocket.closeSocket();
       throw new Error(err);
     }
 
@@ -118,6 +122,7 @@ class GameServerQuery {
     try {
       challengeResultBuffer = await this._promiseSocket.send(this._buildPacket(Buffer.from([0x56])), this._host, this._port);
     } catch (err: any) {
+      this._promiseSocket.closeSocket();
       throw new Error(err);
     }
 
@@ -127,6 +132,7 @@ class GameServerQuery {
     try {
       resultBuffer = await this._promiseSocket.send(this._buildPacket(Buffer.from([0x56]), challenge), this._host, this._port);
     } catch (err: any) {
+      this._promiseSocket.closeSocket();
       throw new Error(err);
     }
 

diff --git a/src/masterServer/masterServer.ts b/src/masterServer/masterServer.ts
@@ -41,6 +41,7 @@ class MasterServerQuery {
         resultBuffer = await this._promiseSocket.send(this._buildPacket(), this._host, this._port);
         // catch promise rejections and throw error
       } catch (err: any) {
+        this._promiseSocket.closeSocket();
         throw new Error(err);
       }
 
@@ -53,6 +54,7 @@ class MasterServerQuery {
         this._hosts.length >= this._maxHosts &&
         this._hosts[this._maxHosts - 1] !== ZERO_IP
       ) {
+        this._promiseSocket.closeSocket();
         return this._hosts.slice(0, this._maxHosts);
       }
     } while (this._seedId !== ZERO_IP);