From 481c540542ef2af91def3c965909fd5fe85fc4ab Mon Sep 17 00:00:00 2001
From: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Date: Fri, 25 Mar 2022 19:51:50 -0400
Subject: [PATCH] Adds timeout for long lived sockets(timeout is disabled when
 the socket is not in use ofc) + removes extra console.log

---
 package-lock.json  | 4 ++--
 package.json       | 2 +-
 src/http2byond.ts  | 8 +++++---
 src/types.ts       | 4 ++--
 typings/types.d.ts | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9f3a866..2007a85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "http2byond",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "http2byond",
-      "version": "2.1.1",
+      "version": "2.2.0",
       "license": "MIT",
       "devDependencies": {
         "@types/node": "^17.0.22",
diff --git a/package.json b/package.json
index 1b60833..aeb0007 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "http2byond",
   "description": "Communication layer between node.js and BYOND game servers.",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "scripts": {
     "prepare": "npx tsc"
   },
diff --git a/src/http2byond.ts b/src/http2byond.ts
index f743bd8..8cc7c9b 100644
--- a/src/http2byond.ts
+++ b/src/http2byond.ts
@@ -10,6 +10,9 @@ export function _sendTopic(socket: Socket, _topic: string): Promise<TopicReturnT
                     _topic
 
   return new Promise((resolve, reject) => {
+    //Get rid of all listeners to prepare the socket to be reused
+    socket.removeAllListeners()
+
     function errorHandler(reason: string) {
       return function(originalError?: Error) {
         originalError ?
@@ -28,8 +31,6 @@ export function _sendTopic(socket: Socket, _topic: string): Promise<TopicReturnT
     let bodyBuffer: Buffer;
 
     function processResponse() {
-      //Get rid of all listeners to prepare the socket to be reused
-      socket.removeAllListeners()
       const type = bodyBuffer[0];
       switch (type) {
         case 0x00: {
@@ -109,7 +110,6 @@ export function _sendTopic(socket: Socket, _topic: string): Promise<TopicReturnT
       ptr += topicBuffer.length
       dataBuffer[ptr] = 0x00
 
-      console.log(dataBuffer)
       socket.write(dataBuffer)
     }
 
@@ -149,6 +149,7 @@ export function createTopicConnection(config: SocketConfig): TopicConnection {
     const next = queue.shift()
     if(!next) {
       busy = false
+      socket.setTimeout(0)
       return value
     }
     const [topic, resolve, reject] = next;
@@ -165,6 +166,7 @@ export function createTopicConnection(config: SocketConfig): TopicConnection {
       //Immediate
       if(!busy) {
         busy = true
+        socket.setTimeout(config.timeout ?? 10000)
         return _sendTopic(socket, topic).then(runNextTopic)
       }
 
diff --git a/src/types.ts b/src/types.ts
index 09a3ba8..91c4033 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -3,13 +3,13 @@ export interface SocketConfig {
   host: string;
   //Port to connect to
   port: number;
+  //Time to wait before aborting connection
+  timeout?: number;
 }
 
 export interface SingleRunConfiguration extends SocketConfig {
   //URL params to send to BYOND
   topic: string;
-  //Time to wait before aborting connection
-  timeout?: number;
 }
 
 export type TopicReturnType = string | number | null
diff --git a/typings/types.d.ts b/typings/types.d.ts
index 83925b3..0472479 100644
--- a/typings/types.d.ts
+++ b/typings/types.d.ts
@@ -1,10 +1,10 @@
 export interface SocketConfig {
     host: string;
     port: number;
+    timeout?: number;
 }
 export interface SingleRunConfiguration extends SocketConfig {
     topic: string;
-    timeout?: number;
 }
 export declare type TopicReturnType = string | number | null;
 export interface TopicConnection {