Skip to content

Commit 21a4bbe

Browse files
committed
Migrated to the new cloudflare task
1 parent 551db60 commit 21a4bbe

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

server/tasks/speedtest.js

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const controller = require("../controller/recommendations");
55
const parseData = require('../util/providers/parseData');
66
let {setState, sendRunning, sendError, sendFinished} = require("./integrations");
77
const serverController = require("../controller/servers");
8+
const cloudflareTask = require("./cloudflare");
89

910
let isRunning = false;
1011

@@ -33,26 +34,6 @@ const createRecommendations = async () => {
3334
}
3435
}
3536

36-
module.exports.executeCloudflare = async () => {
37-
try {
38-
const {default: SpeedTest} = await import('@cloudflare/speedtest');
39-
40-
// This needs to be disabled because of a library issue
41-
// See https://github.com/cloudflare/speedtest/issues/17
42-
console.warn = () => {};
43-
44-
const startTime = new Date().getTime();
45-
return await new Promise(resolve => {
46-
const speedTest = new SpeedTest();
47-
speedTest.onFinish = results => {
48-
resolve({...results.getSummary(), elapsed: new Date().getTime() - startTime});
49-
}
50-
});
51-
} catch (error) {
52-
console.error('Error loading SpeedTest module:', error);
53-
}
54-
}
55-
5637
module.exports.run = async (retryAuto = false) => {
5738
setRunning(true);
5839
let mode = await config.getValue("provider");
@@ -69,7 +50,9 @@ module.exports.run = async (retryAuto = false) => {
6950

7051
let speedtest;
7152
if (mode === "cloudflare") {
72-
speedtest = await this.executeCloudflare();
53+
const startTime = new Date().getTime();
54+
speedtest = await cloudflareTask();
55+
speedtest = {...speedtest, elapsed: (new Date().getTime() - startTime) / 1000};
7356
} else {
7457
speedtest = await (retryAuto ? speedTest(mode) : speedTest(mode, serverId));
7558
}

0 commit comments

Comments
 (0)