feat(weather): implement caching for weather data and improve location fetching
This commit is contained in:
parent
c830273651
commit
d68acef41a
2 changed files with 61 additions and 8 deletions
|
|
@ -1,3 +1,12 @@
|
||||||
|
const CACHE_TTL_MS = 1000 * 60 * 20; // 20 minutes
|
||||||
|
|
||||||
|
type CacheEntry = {
|
||||||
|
ts: number;
|
||||||
|
weather: any;
|
||||||
|
};
|
||||||
|
|
||||||
|
const weatherCache = new Map<string, CacheEntry>();
|
||||||
|
|
||||||
export const POST = async (req: Request) => {
|
export const POST = async (req: Request) => {
|
||||||
try {
|
try {
|
||||||
const body: {
|
const body: {
|
||||||
|
|
@ -15,6 +24,16 @@ export const POST = async (req: Request) => {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const cacheKey = `${body.lat.toFixed(4)},${body.lng.toFixed(4)},${body.measureUnit}`;
|
||||||
|
|
||||||
|
// Return cached entry if fresh
|
||||||
|
const cached = weatherCache.get(cacheKey);
|
||||||
|
if (cached && Date.now() - cached.ts < CACHE_TTL_MS) {
|
||||||
|
console.log('Returning cached weather data for ', cacheKey);
|
||||||
|
return Response.json(cached.weather);
|
||||||
|
}
|
||||||
|
console.log('Fetching new weather data for ', cacheKey);
|
||||||
|
|
||||||
const res = await fetch(
|
const res = await fetch(
|
||||||
`https://api.open-meteo.com/v1/forecast?latitude=${body.lat}&longitude=${body.lng}¤t=weather_code,temperature_2m,is_day,relative_humidity_2m,wind_speed_10m&timezone=auto${
|
`https://api.open-meteo.com/v1/forecast?latitude=${body.lat}&longitude=${body.lng}¤t=weather_code,temperature_2m,is_day,relative_humidity_2m,wind_speed_10m&timezone=auto${
|
||||||
body.measureUnit === 'Metric' ? '' : '&temperature_unit=fahrenheit'
|
body.measureUnit === 'Metric' ? '' : '&temperature_unit=fahrenheit'
|
||||||
|
|
@ -159,6 +178,13 @@ export const POST = async (req: Request) => {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// store in cache
|
||||||
|
try {
|
||||||
|
weatherCache.set(cacheKey, { ts: Date.now(), weather });
|
||||||
|
} catch (e) {
|
||||||
|
// ignore cache failures
|
||||||
|
}
|
||||||
|
|
||||||
return Response.json(weather);
|
return Response.json(weather);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('An error occurred while getting home widgets', err);
|
console.error('An error occurred while getting home widgets', err);
|
||||||
|
|
|
||||||
|
|
@ -16,15 +16,42 @@ const WeatherWidget = () => {
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const getApproxLocation = async () => {
|
const IPWHOIS_CACHE_KEY = 'ipwhois_cache_v1';
|
||||||
const res = await fetch('https://ipwhois.app/json/');
|
const IPWHOIS_TTL_MS = 1000 * 60 * 20; // 20 minutes
|
||||||
const data = await res.json();
|
|
||||||
|
|
||||||
return {
|
const getApproxLocation = async () => {
|
||||||
latitude: data.latitude,
|
try {
|
||||||
longitude: data.longitude,
|
const raw = sessionStorage.getItem(IPWHOIS_CACHE_KEY);
|
||||||
city: data.city,
|
if (raw) {
|
||||||
};
|
const parsed = JSON.parse(raw);
|
||||||
|
if (parsed?.ts && Date.now() - parsed.ts < IPWHOIS_TTL_MS && parsed?.data) {
|
||||||
|
return parsed.data;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const res = await fetch('https://ipwhois.app/json/');
|
||||||
|
const data = await res.json();
|
||||||
|
|
||||||
|
const payload = {
|
||||||
|
ts: Date.now(),
|
||||||
|
data: {
|
||||||
|
latitude: data.latitude,
|
||||||
|
longitude: data.longitude,
|
||||||
|
city: data.city,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
sessionStorage.setItem(IPWHOIS_CACHE_KEY, JSON.stringify(payload));
|
||||||
|
} catch (e) {
|
||||||
|
// ignore storage errors (e.g., quota)
|
||||||
|
}
|
||||||
|
|
||||||
|
return payload.data;
|
||||||
|
} catch (err) {
|
||||||
|
// If anything goes wrong, fall back to a safe default
|
||||||
|
return { latitude: 0, longitude: 0, city: '' };
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const getLocation = async (
|
const getLocation = async (
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue