url/checkcle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Display uptime history in service table

Browse Source
This commit is contained in:
Tola Leng
2025-06-19 14:47:20 +07:00
parent 93b58cfa2c
commit 907fdaa0dc
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/src/services/uptimeService.ts
+31 -13
View File
@@ -10,6 +10,24 @@ const uptimeCache = new Map<string, {
const CACHE_TTL = 3000; // 3 seconds for faster updates const CACHE_TTL = 3000; // 3 seconds for faster updates
// Map service types to their corresponding collections
const getCollectionForServiceType = (serviceType: string): string => {
const type = serviceType.toLowerCase();
switch (type) {
case 'ping':
case 'icmp':
return 'ping_data';
case 'dns':
return 'dns_data';
case 'tcp':
return 'tcp_data';
case 'http':
case 'https':
default:
return 'uptime_data';
}
};
export const uptimeService = { export const uptimeService = {
async recordUptimeData(data: UptimeData): Promise<void> { async recordUptimeData(data: UptimeData): Promise<void> {
try { try {
@@ -42,10 +60,11 @@ export const uptimeService = {
serviceId: string, serviceId: string,
limit: number = 200, limit: number = 200,
startDate?: Date, startDate?: Date,
endDate?: Date endDate?: Date,
serviceType?: string
): Promise<UptimeData[]> { ): Promise<UptimeData[]> {
try { try {
const cacheKey = `uptime_${serviceId}_${limit}_${startDate?.toISOString() || ''}_${endDate?.toISOString() || ''}`; const cacheKey = `uptime_${serviceId}_${limit}_${startDate?.toISOString() || ''}_${endDate?.toISOString() || ''}_${serviceType || 'default'}`;
// Check cache // Check cache
const cached = uptimeCache.get(cacheKey); const cached = uptimeCache.get(cacheKey);
@@ -54,19 +73,18 @@ export const uptimeService = {
return cached.data; return cached.data;
} }
console.log(`Fetching uptime history for service ${serviceId}, limit: ${limit}`); // Determine the correct collection based on service type
const collection = serviceType ? getCollectionForServiceType(serviceType) : 'uptime_data';
console.log(`Fetching uptime history for service ${serviceId} from collection ${collection}, limit: ${limit}`);
let filter = `service_id='${serviceId}'`; let filter = `service_id='${serviceId}'`;
// Add date range filtering if provided // Add date range filtering if provided
if (startDate && endDate) { if (startDate && endDate) {
// Convert dates to UTC strings in the format PocketBase expects
const startUTC = startDate.toISOString(); const startUTC = startDate.toISOString();
const endUTC = endDate.toISOString(); const endUTC = endDate.toISOString();
console.log(`Date filter: ${startUTC} to ${endUTC}`); console.log(`Date filter: ${startUTC} to ${endUTC}`);
// Use proper PocketBase date filtering syntax
filter += ` && timestamp >= "${startUTC}" && timestamp <= "${endUTC}"`; filter += ` && timestamp >= "${startUTC}" && timestamp <= "${endUTC}"`;
} }
@@ -77,25 +95,25 @@ export const uptimeService = {
$cancelKey: `uptime_history_${serviceId}_${Date.now()}` $cancelKey: `uptime_history_${serviceId}_${Date.now()}`
}; };
console.log(`Filter query: ${filter}`); console.log(`Filter query: ${filter} on collection: ${collection}`);
const response = await pb.collection('uptime_data').getList(1, limit, options); const response = await pb.collection(collection).getList(1, limit, options);
console.log(`Fetched ${response.items.length} uptime records for service ${serviceId}`); console.log(`Fetched ${response.items.length} uptime records for service ${serviceId} from ${collection}`);
if (response.items.length > 0) { if (response.items.length > 0) {
console.log(`Date range in results: ${response.items[response.items.length - 1].timestamp} to ${response.items[0].timestamp}`); console.log(`Date range in results: ${response.items[response.items.length - 1].timestamp} to ${response.items[0].timestamp}`);
} else { } else {
console.log(`No records found for filter: ${filter}`); console.log(`No records found for filter: ${filter} in collection: ${collection}`);
// Try a fallback query without date filter to see if there's any data at all // Try a fallback query without date filter to see if there's any data at all
const fallbackResponse = await pb.collection('uptime_data').getList(1, 10, { const fallbackResponse = await pb.collection(collection).getList(1, 10, {
filter: `service_id='${serviceId}'`, filter: `service_id='${serviceId}'`,
sort: '-timestamp', sort: '-timestamp',
$autoCancel: false $autoCancel: false
}); });
console.log(`Fallback query found ${fallbackResponse.items.length} total records for service`); console.log(`Fallback query found ${fallbackResponse.items.length} total records for service in ${collection}`);
if (fallbackResponse.items.length > 0) { if (fallbackResponse.items.length > 0) {
console.log(`Latest record timestamp: ${fallbackResponse.items[0].timestamp}`); console.log(`Latest record timestamp: ${fallbackResponse.items[0].timestamp}`);
console.log(`Oldest record timestamp: ${fallbackResponse.items[fallbackResponse.items.length - 1].timestamp}`); console.log(`Oldest record timestamp: ${fallbackResponse.items[fallbackResponse.items.length - 1].timestamp}`);
@@ -124,7 +142,7 @@ export const uptimeService = {
console.error("Error fetching uptime history:", error); console.error("Error fetching uptime history:", error);
// Try to return cached data as fallback // Try to return cached data as fallback
const cacheKey = `uptime_${serviceId}_${limit}_${startDate?.toISOString() || ''}_${endDate?.toISOString() || ''}`; const cacheKey = `uptime_${serviceId}_${limit}_${startDate?.toISOString() || ''}_${endDate?.toISOString() || ''}_${serviceType || 'default'}`;
const cached = uptimeCache.get(cacheKey); const cached = uptimeCache.get(cacheKey);
if (cached) { if (cached) {
console.log(`Using expired cached data for service ${serviceId} due to fetch error`); console.log(`Using expired cached data for service ${serviceId} due to fetch error`);