diff --git a/src/app.controller.ts b/src/app.controller.ts index 3348493..685d26a 100644 --- a/src/app.controller.ts +++ b/src/app.controller.ts @@ -18,12 +18,13 @@ export class AppController { getClientInfo(@Param('clientId') clientId: string) { const workers = this.stratumV1Service.clients.filter(client => client.clientAuthorization.address === clientId); return { - workers: workers.length, - workerIds: workers.map(worker => { + workersCount: workers.length, + workers: workers.map(worker => { return { id: worker.id, - bestDifficulty: worker.statistics.bestDifficulty, - hashrate: worker.statistics.getHashrate() + name: worker.clientAuthorization.worker, + bestDifficulty: Math.floor(worker.statistics.bestDifficulty), + hashRate: Math.floor(worker.statistics.getHashRate()), } }) } @@ -33,7 +34,10 @@ export class AppController { getWorkerInfo(@Param('clientId') clientId: string, @Param('workerId') workerId: string) { const worker = this.stratumV1Service.clients.find(client => client.clientAuthorization.address === clientId && client.id === workerId); return { - id: worker.id + id: worker.id, + name: worker.clientAuthorization.worker, + bestDifficulty: Math.floor(worker.statistics.bestDifficulty), + hashData: worker.statistics.historicSubmissions } } } diff --git a/src/main.ts b/src/main.ts index 6d4f8ae..af0c0b7 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,8 +4,8 @@ import { FastifyAdapter, NestFastifyApplication } from '@nestjs/platform-fastify import { AppModule } from './app.module'; - async function bootstrap() { + const app = await NestFactory.create(AppModule, new FastifyAdapter()); app.setGlobalPrefix('api') app.useGlobalPipes( @@ -18,7 +18,9 @@ async function bootstrap() { ); app.enableCors(); - await app.listen(process.env.PORT, '0.0.0.0'); - console.log(`http listening on port ${process.env.PORT}`) + await app.listen(process.env.PORT, '0.0.0.0', () => { + console.log(`https listening on port ${process.env.PORT}`); + }); + } bootstrap(); diff --git a/src/models/StratumV1ClientStatistics.ts b/src/models/StratumV1ClientStatistics.ts index 58cfcad..3141ec6 100644 --- a/src/models/StratumV1ClientStatistics.ts +++ b/src/models/StratumV1ClientStatistics.ts @@ -24,7 +24,7 @@ export class StratumV1ClientStatistics { } } - public getHashrate() { + public getHashRate() { return this.historicSubmissions.reduce((pre, cur, idx, arr) => { if (idx === 0) { pre.time = cur.time;