From 674b02ca9d59d50dcfb7f12fdec2fcdc3bc59db5 Mon Sep 17 00:00:00 2001
From: Benjamin Wilson <admin@opensourceminer.com>
Date: Mon, 3 Feb 2025 15:39:03 -0500
Subject: [PATCH] socket cleanup

---
 src/services/stratum-v1.service.ts | 75 ++++++++++++++++++------------
 1 file changed, 44 insertions(+), 31 deletions(-)

diff --git a/src/services/stratum-v1.service.ts b/src/services/stratum-v1.service.ts
index 6d2503d..e381722 100644
--- a/src/services/stratum-v1.service.ts
+++ b/src/services/stratum-v1.service.ts
@@ -43,48 +43,61 @@ export class StratumV1Service implements OnModuleInit {
 
   private startSocketServer(port: number) {
     const server = new Server(async (socket: Socket) => {
+        // Set 5-minute timeout
+        socket.setTimeout(1000 * 60 * 5);
 
-      //5 min
-      socket.setTimeout(1000 * 60 * 5);
+        const client = new StratumV1Client(
+            socket,
+            this.stratumV1JobsService,
+            this.bitcoinRpcService,
+            this.clientService,
+            this.clientStatisticsService,
+            this.notificationService,
+            this.blocksService,
+            this.configService,
+            this.addressSettingsService
+        );
 
-      const client = new StratumV1Client(
-        socket,
-        this.stratumV1JobsService,
-        this.bitcoinRpcService,
-        this.clientService,
-        this.clientStatisticsService,
-        this.notificationService,
-        this.blocksService,
-        this.configService,
-        this.addressSettingsService
-      );
+        // Unified cleanup function
+        const cleanup = async (reason: string) => {
+            if (client.extraNonceAndSessionId != null) {
+                await client.destroy();
+                console.log(`Client ${client.extraNonceAndSessionId} disconnected, Reason: ${reason}`);
+            }
+            if (!socket.destroyed) {
+                socket.end();
+                socket.destroy();
+            }
+        };
 
+        // Handle client disconnection
+        socket.on('close', async (hadError: boolean) => {
+            await cleanup(hadError ? "Error" : "Normal Closure");
+        });
 
-      socket.on('close', async (hadError: boolean) => {
-        if (client.extraNonceAndSessionId != null) {
-          // Handle socket disconnection
-          await client.destroy();
-          //console.log(`Client ${client.extraNonceAndSessionId} disconnected, hadError?:${hadError}`);
-        }
-      });
+        // Handle socket timeouts
+        socket.on('timeout', async () => {
+            console.log(`Socket timeout ${socket.remoteAddress}, ${socket.bytesRead}/${socket.bytesWritten}, ${client.clientSubscription?.userAgent}`);
+            await cleanup("Timeout");
+        });
 
-      socket.on('timeout', () => {
-        console.log(`socket timeout ${socket.remoteAddress}, ${socket.bytesRead}/${socket.bytesWritten}, ${client.clientSubscription?.userAgent}`);
-        socket.end();
-        socket.destroy();
-      });
-
-      socket.on('error', async (error: Error) => { });
-
-      //   //console.log(`Client disconnected, socket error,  ${client.extraNonceAndSessionId}`);
+        // Handle errors properly
+        socket.on('error', async (error: Error) => {
+            console.log(`Socket error: ${error.message}`);
+            await cleanup("Error");
+        });
 
+    });
 
+    // Ensure server itself handles errors
+    server.on('error', (err) => {
+        console.error(`Server error: ${err.message}`);
     });
 
     server.listen(port, () => {
-      console.log(`Stratum server is listening on port ${port}`);
+        console.log(`Stratum server is listening on port ${port}`);
     });
+}
 
-  }
 
 }
\ No newline at end of file