diff --git a/src/app.module.ts b/src/app.module.ts index 0cc83eb..70067c5 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -40,7 +40,7 @@ const ORMModules = [ cache: true, logging: false, enableWAL: true, - busyTimeout: 30 * 1000 + busyTimeout: 60 * 1000 }), CacheModule.register(), ScheduleModule.forRoot(), diff --git a/src/models/StratumV1Client.ts b/src/models/StratumV1Client.ts index d64a7e2..7637a75 100644 --- a/src/models/StratumV1Client.ts +++ b/src/models/StratumV1Client.ts @@ -60,13 +60,6 @@ export class StratumV1Client extends EasyUnsubscribe { ) { super(); - this.sessionStart = new Date(); - - this.statistics = new StratumV1ClientStatistics(this.clientStatisticsService); - this.extraNonceAndSessionId = this.getRandomHexString(); - - console.log(`New client ID: : ${this.extraNonceAndSessionId}`); - this.promiseSocket.socket.on('data', (data: Buffer) => { data.toString() .split('\n') @@ -80,6 +73,11 @@ export class StratumV1Client extends EasyUnsubscribe { } }) }); + + this.sessionStart = new Date(); + this.statistics = new StratumV1ClientStatistics(this.clientStatisticsService); + this.extraNonceAndSessionId = this.getRandomHexString(); + console.log(`New client ID: : ${this.extraNonceAndSessionId}`); } private getRandomHexString() { @@ -100,7 +98,6 @@ export class StratumV1Client extends EasyUnsubscribe { } catch (e) { console.log("Invalid JSON"); this.promiseSocket.socket.emit('end', true); - console.error(e); return; } diff --git a/src/services/stratum-v1.service.ts b/src/services/stratum-v1.service.ts index 7aa3f68..61ec702 100644 --- a/src/services/stratum-v1.service.ts +++ b/src/services/stratum-v1.service.ts @@ -39,7 +39,7 @@ export class StratumV1Service implements OnModuleInit { } private startSocketServer() { - new Server({ allowHalfOpen: true }, async (s: Socket) => { + new Server(async (s: Socket) => { const promiseSocket = new PromiseSocket(s); @@ -56,11 +56,6 @@ export class StratumV1Service implements OnModuleInit { ); - - const clientCount = await this.clientService.connectedClientCount(); - - console.log(`New client connected: ${promiseSocket.socket.remoteAddress}, ${clientCount} total clients`); - promiseSocket.socket.on('end', async (error: Error) => { // Handle socket disconnection client.destroy();