Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(dashmate): report port check errors #2245

Merged
merged 5 commits into from
Oct 19, 2024
Merged

chore(dashmate): report port check errors #2245

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5ed475
chore(dashmate): store port check errors to report
shumkov Oct 16, 2024
b7547b1
refactor(dashmate): remove unused import
shumkov Oct 17, 2024
c4c9590
fix: timeout doesn't work
shumkov Oct 17, 2024
f85aa35
Merge branch 'v1.4-dev' into chore/dashmate/log-port-check-errors
shumkov Oct 18, 2024
00511a4
Merge branch 'v1.4-dev' into chore/dashmate/log-port-check-errors
shumkov Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions packages/dashmate/src/listr/tasks/doctor/collectSamplesTaskFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ export default function collectSamplesTaskFactory(
title: 'Core P2P port',
task: async () => {
const port = config.get('core.p2p.port');
const response = await providers.mnowatch.checkPortStatus(port, config.get('externalIp'));
const response = await providers.mnowatch.checkPortStatus(port, config.get('externalIp'))
.catch((e) => e.toString());

ctx.samples.setServiceInfo('core', 'p2pPort', response);
},
Expand All @@ -177,7 +178,8 @@ export default function collectSamplesTaskFactory(
enabled: () => config.get('platform.enable'),
task: async () => {
const port = config.get('platform.gateway.listeners.dapiAndDrive.port');
const response = await providers.mnowatch.checkPortStatus(port, config.get('externalIp'));
const response = await providers.mnowatch.checkPortStatus(port, config.get('externalIp'))
.catch((e) => e.toString());

ctx.samples.setServiceInfo('gateway', 'httpPort', response);
},
Expand All @@ -186,7 +188,8 @@ export default function collectSamplesTaskFactory(
title: 'Tenderdash P2P port',
task: async () => {
const port = config.get('platform.drive.tenderdash.p2p.port');
const response = await providers.mnowatch.checkPortStatus(port, config.get('externalIp'));
const response = await providers.mnowatch.checkPortStatus(port, config.get('externalIp'))
.catch((e) => e.toString());

ctx.samples.setServiceInfo('drive_tenderdash', 'p2pPort', response);
},
Expand Down
8 changes: 4 additions & 4 deletions packages/dashmate/src/status/providers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import https from 'https';
import { PortStateEnum } from './enums/portState.js';

Check failure on line 2 in packages/dashmate/src/status/providers.js

View workflow job for this annotation

GitHub Actions / JS packages (dashmate) / Linting 

'PortStateEnum' is defined but never used

const MAX_REQUEST_TIMEOUT = 5000;
const MAX_RESPONSE_SIZE = 1 * 1024 * 1024; // 1 MB
Expand Down Expand Up @@ -85,7 +85,7 @@
timeout: MAX_REQUEST_TIMEOUT,
};

return new Promise((resolve) => {
return new Promise((resolve, reject) => {
const req = https.request(options, (res) => {
let data = '';

Expand All @@ -97,7 +97,7 @@
}
// Consume response data to free up memory
res.resume();
resolve(PortStateEnum.ERROR);
reject(new Error(`Invalid status code ${res.statusCode}`));
return;
}

Expand All @@ -109,7 +109,7 @@
data += chunk;

if (data.length > MAX_RESPONSE_SIZE) {
resolve(PortStateEnum.ERROR);
reject(new Error('Response size exceeded'));

if (process.env.DEBUG) {
// eslint-disable-next-line no-console
Expand All @@ -132,7 +132,7 @@
console.warn(`Port check request failed: ${e}`);
}

resolve(PortStateEnum.ERROR);
reject(e);
});

req.end();
Expand Down
4 changes: 3 additions & 1 deletion packages/dashmate/src/status/scopes/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* eslint-disable camelcase */
import { PortStateEnum } from '../enums/portState.js';
import providers from '../providers.js';
import { ServiceStatusEnum } from '../enums/serviceStatus.js';
import { DockerStatusEnum } from '../enums/dockerStatus.js';
Expand Down Expand Up @@ -116,7 +117,8 @@ export default function getCoreScopeFactory(

const providersResult = await Promise.allSettled([
providers.github.release('dashpay/dash'),
providers.mnowatch.checkPortStatus(config.get('core.p2p.port'), config.get('externalIp')),
providers.mnowatch.checkPortStatus(config.get('core.p2p.port'), config.get('externalIp'))
.catch(() => PortStateEnum.ERROR),
providers.insight(config.get('network')).status(),
]);

Expand Down
7 changes: 5 additions & 2 deletions packages/dashmate/src/status/scopes/platform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import prettyMs from 'pretty-ms';
import { PortStateEnum } from '../enums/portState.js';
import providers from '../providers.js';
import { DockerStatusEnum } from '../enums/dockerStatus.js';
import { ServiceStatusEnum } from '../enums/serviceStatus.js';
Expand Down Expand Up @@ -89,8 +90,10 @@ export default function getPlatformScopeFactory(
// Collecting platform data fails if Tenderdash is waiting for core to sync
if (info.serviceStatus === ServiceStatusEnum.up) {
const portStatusResult = await Promise.allSettled([
providers.mnowatch.checkPortStatus(config.get('platform.gateway.listeners.dapiAndDrive.port'), config.get('externalIp')),
providers.mnowatch.checkPortStatus(config.get('platform.drive.tenderdash.p2p.port'), config.get('externalIp')),
providers.mnowatch.checkPortStatus(config.get('platform.gateway.listeners.dapiAndDrive.port'), config.get('externalIp'))
.catch(() => PortStateEnum.ERROR),
providers.mnowatch.checkPortStatus(config.get('platform.drive.tenderdash.p2p.port'), config.get('externalIp'))
.catch(() => PortStateEnum.ERROR),
]);
const [httpPortState, p2pPortState] = portStatusResult.map((result) => (result.status === 'fulfilled' ? result.value : null));

Expand Down
6 changes: 3 additions & 3 deletions packages/dashmate/test/unit/status/scopes/core.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ describe('getCoreScopeFactory', () => {
});

mockGithubProvider.returns('v1337-dev');
mockMNOWatchProvider.returns('OPEN');
mockMNOWatchProvider.resolves('OPEN');
mockInsightProvider.returns({
status: this.sinon.stub().returns({
info: { blocks: 1337 },
Expand Down Expand Up @@ -219,7 +219,7 @@ describe('getCoreScopeFactory', () => {
});

mockGithubProvider.returns('v1337-dev');
mockMNOWatchProvider.returns('OPEN');
mockMNOWatchProvider.resolves('OPEN');
mockInsightProvider.returns({
status: this.sinon.stub().returns({
info: { blocks: 1337 },
Expand Down Expand Up @@ -271,7 +271,7 @@ describe('getCoreScopeFactory', () => {
});

mockGithubProvider.returns(Promise.reject());
mockMNOWatchProvider.returns(PortStateEnum.ERROR);
mockMNOWatchProvider.rejects(PortStateEnum.ERROR);
mockInsightProvider.returns({
status: () => Promise.reject(),
});
Expand Down
Loading