mirror of
https://github.com/Retropex/custom-ocean.xyz-dashboard.git
synced 2025-05-12 19:20:45 +02:00
Update workers.js
This commit is contained in:
parent
c1d32f4cfc
commit
315de329c2
@ -198,24 +198,51 @@ function fetchWorkerData(forceRefresh = false) {
|
|||||||
console.log("Fetching worker data...");
|
console.log("Fetching worker data...");
|
||||||
lastManualRefreshTime = Date.now();
|
lastManualRefreshTime = Date.now();
|
||||||
$('#worker-grid').addClass('loading-fade');
|
$('#worker-grid').addClass('loading-fade');
|
||||||
|
showLoader();
|
||||||
|
|
||||||
let allWorkers = [];
|
|
||||||
let aggregatedData = null; // Used to preserve summary stats from page 1
|
|
||||||
const maxPages = 10;
|
const maxPages = 10;
|
||||||
|
const requests = [];
|
||||||
|
|
||||||
function fetchPage(page) {
|
// Create requests for pages 1 through maxPages concurrently
|
||||||
if (page > maxPages) {
|
for (let page = 1; page <= maxPages; page++) {
|
||||||
// Deduplicate workers based on a unique field (e.g., worker.name)
|
const apiUrl = `/api/workers?page=${page}${forceRefresh ? '&force=true' : ''}`;
|
||||||
|
requests.push($.ajax({
|
||||||
|
url: apiUrl,
|
||||||
|
method: 'GET',
|
||||||
|
dataType: 'json',
|
||||||
|
timeout: 15000
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process all requests concurrently
|
||||||
|
Promise.all(requests)
|
||||||
|
.then(pages => {
|
||||||
|
let allWorkers = [];
|
||||||
|
let aggregatedData = null;
|
||||||
|
|
||||||
|
pages.forEach((data, i) => {
|
||||||
|
if (data && data.workers && data.workers.length > 0) {
|
||||||
|
allWorkers = allWorkers.concat(data.workers);
|
||||||
|
if (i === 0) {
|
||||||
|
aggregatedData = data; // preserve stats from first page
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.warn(`No workers found on page ${i + 1}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Deduplicate workers if necessary (using worker.name as unique key)
|
||||||
const uniqueWorkers = allWorkers.filter((worker, index, self) =>
|
const uniqueWorkers = allWorkers.filter((worker, index, self) =>
|
||||||
index === self.findIndex((w) => w.name === worker.name)
|
index === self.findIndex((w) => w.name === worker.name)
|
||||||
);
|
);
|
||||||
|
|
||||||
// After fetching up to maxPages, update the UI with aggregated (and deduplicated) data
|
|
||||||
workerData = aggregatedData || {};
|
workerData = aggregatedData || {};
|
||||||
workerData.workers = uniqueWorkers;
|
workerData.workers = uniqueWorkers;
|
||||||
|
|
||||||
if (typeof BitcoinMinuteRefresh !== 'undefined' && BitcoinMinuteRefresh.notifyRefresh) {
|
if (typeof BitcoinMinuteRefresh !== 'undefined' && BitcoinMinuteRefresh.notifyRefresh) {
|
||||||
BitcoinMinuteRefresh.notifyRefresh();
|
BitcoinMinuteRefresh.notifyRefresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
updateWorkerGrid();
|
updateWorkerGrid();
|
||||||
updateSummaryStats();
|
updateSummaryStats();
|
||||||
updateMiniChart();
|
updateMiniChart();
|
||||||
@ -225,43 +252,15 @@ function fetchWorkerData(forceRefresh = false) {
|
|||||||
connectionRetryCount = 0;
|
connectionRetryCount = 0;
|
||||||
console.log("Worker data updated successfully");
|
console.log("Worker data updated successfully");
|
||||||
$('#worker-grid').removeClass('loading-fade');
|
$('#worker-grid').removeClass('loading-fade');
|
||||||
return;
|
})
|
||||||
}
|
.catch(error => {
|
||||||
|
console.error("Error fetching worker data:", error);
|
||||||
// Build URL with pagination
|
})
|
||||||
const apiUrl = `/api/workers?page=${page}${forceRefresh ? '&force=true' : ''}`;
|
.finally(() => {
|
||||||
$.ajax({
|
hideLoader();
|
||||||
url: apiUrl,
|
|
||||||
method: 'GET',
|
|
||||||
dataType: 'json',
|
|
||||||
timeout: 15000,
|
|
||||||
success: function (data) {
|
|
||||||
if (data && data.workers && data.workers.length > 0) {
|
|
||||||
allWorkers = allWorkers.concat(data.workers);
|
|
||||||
// On the first page, preserve other properties (e.g., summary stats)
|
|
||||||
if (page === 1) {
|
|
||||||
aggregatedData = data;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
console.warn(`No workers found on page ${page}`);
|
|
||||||
// Optionally, stop fetching early if no data is returned:
|
|
||||||
page = maxPages;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
error: function (xhr, status, error) {
|
|
||||||
console.error(`Error fetching worker data on page ${page}:`, error);
|
|
||||||
},
|
|
||||||
complete: function () {
|
|
||||||
// Continue to the next page regardless of success or error
|
|
||||||
fetchPage(page + 1);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
|
||||||
// Start fetching from page 1
|
|
||||||
fetchPage(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Refresh worker data every 60 seconds
|
// Refresh worker data every 60 seconds
|
||||||
setInterval(function () {
|
setInterval(function () {
|
||||||
console.log("Refreshing worker data at " + new Date().toLocaleTimeString());
|
console.log("Refreshing worker data at " + new Date().toLocaleTimeString());
|
||||||
|
Loading…
Reference in New Issue
Block a user