From 6da243ea7fabc1ad0ea13931475b08b8115e0759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20S=C3=A1?= Date: Wed, 20 Oct 2021 10:36:00 +0100 Subject: [PATCH 1/3] feat: send ping and speedtest URLs to machine --- lib/routes.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/routes.js b/lib/routes.js index baee01ea..e2337ddb 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -51,6 +51,20 @@ const settingsCache = {} const devMode = argv.dev || options.http +const urlsToPing = [ + `us.archive.ubuntu.com`, + `uk.archive.ubuntu.com`, + `za.archive.ubuntu.com`, + `cn.archive.ubuntu.com` +] + +const speedtestFiles = [ + { + url: `https://github.com/lamassu/lamassu-machine/releases/download/v7.5.3/python-defaults_2.7.18-3.tar.gz`, + size: 8900 + } +] + function checkHasLightning (settings) { return configManager.getWalletSettings('BTC', settings.config).layer2 !== 'no-layer2' } @@ -110,7 +124,9 @@ function poll (req, res, next) { receipt, operatorInfo, machineInfo, - triggers + triggers, + speedtestFiles, + urlsToPing } // BACKWARDS_COMPATIBILITY 7.5 // machines before 7.5 expect old compliance From fc51f0347b4d109f84f0fb9158882bc5cbad35a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20S=C3=A1?= Date: Fri, 22 Oct 2021 10:12:16 +0100 Subject: [PATCH 2/3] feat: show ping time and network speed --- .../src/pages/Maintenance/MachineDetailsCard.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js index 4519c4a9..7ce99c00 100644 --- a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js +++ b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js @@ -1,6 +1,6 @@ import { Grid /*, Divider */ } from '@material-ui/core' import { makeStyles } from '@material-ui/core/styles' -// import BigNumber from 'bignumber.js' +import BigNumber from 'bignumber.js' import moment from 'moment' import React from 'react' @@ -106,7 +106,7 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess }) => { machine={machine} onActionSuccess={onActionSuccess}> - {/* + {machine.downloadSpeed @@ -132,7 +132,7 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess }) => { ' %' : 'unavailable'} - */} + From 00aabe1bbef8947258153c60a115b6cfe27a28d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20S=C3=A1?= Date: Wed, 3 Nov 2021 09:35:35 +0000 Subject: [PATCH 3/3] chore: update speedtest URL and size --- lib/routes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/routes.js b/lib/routes.js index e2337ddb..a30d91e6 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -60,8 +60,8 @@ const urlsToPing = [ const speedtestFiles = [ { - url: `https://github.com/lamassu/lamassu-machine/releases/download/v7.5.3/python-defaults_2.7.18-3.tar.gz`, - size: 8900 + url: 'https://github.com/lamassu/speed-test-assets/raw/main/python-defaults_2.7.18-3.tar.gz', + size: 44668 } ]