Meik/Pickup-Config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aktueller Stand

Browse Source
This commit is contained in:
root
2025-11-09 15:22:33 +01:00
parent 685d50d56a
commit 4fa7217fc3
3 changed files with 100 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
server.js
View File

@@ -11,6 +11,7 @@ const adminConfig = require('./services/adminConfig');
const ONE_YEAR_MS = 365 * 24 * 60 * 60 * 1000; const ONE_YEAR_MS = 365 * 24 * 60 * 60 * 1000;
const adminEmail = (process.env.ADMIN_EMAIL || '').toLowerCase(); const adminEmail = (process.env.ADMIN_EMAIL || '').toLowerCase();
const SIXTY_DAYS_MS = 60 * 24 * 60 * 60 * 1000;
const app = express(); const app = express();
const port = process.env.PORT || 3000; const port = process.env.PORT || 3000;
@@ -82,6 +83,32 @@ function mergeStoresIntoConfig(config = [], stores = []) {
return { merged: Array.from(map.values()), changed }; return { merged: Array.from(map.values()), changed };
} }
async function loadStoresForSession(session, settings, { forceRefresh = false } = {}) {
if (!session?.profile?.id) {
return { stores: [], refreshed: false };
}
const cache = session.storesCache;
const now = Date.now();
const isCacheValid =
cache &&
Array.isArray(cache.data) &&
Number.isFinite(cache.fetchedAt) &&
now - cache.fetchedAt <= SIXTY_DAYS_MS;
if (isCacheValid && !forceRefresh) {
return { stores: cache.data, refreshed: false };
}
const stores = await foodsharingClient.fetchStores(session.cookieHeader, session.profile.id, {
delayBetweenRequestsMs: settings.storePickupCheckDelayMs
});
sessionStore.update(session.id, {
storesCache: { data: stores, fetchedAt: now }
});
return { stores, refreshed: true };
}
async function restoreSessionsFromDisk() { async function restoreSessionsFromDisk() {
const saved = credentialStore.loadAll(); const saved = credentialStore.loadAll();
const entries = Object.entries(saved); const entries = Object.entries(saved);
@@ -126,6 +153,9 @@ async function restoreSessionsFromDisk() {
password: credentials.password, password: credentials.password,
token: session.id token: session.id
}); });
sessionStore.update(session.id, {
storesCache: { data: stores, fetchedAt: Date.now() }
});
scheduleConfig(session.id, config, schedulerSettings); scheduleConfig(session.id, config, schedulerSettings);
console.log(`[RESTORE] Session fuer Profil ${profile.id} (${profile.name}) reaktiviert.`); console.log(`[RESTORE] Session fuer Profil ${profile.id} (${profile.name}) reaktiviert.`);
} catch (error) { } catch (error) {
@@ -198,6 +228,9 @@ app.post('/api/auth/login', async (req, res) => {
}, existingToken, ONE_YEAR_MS); }, existingToken, ONE_YEAR_MS);
credentialStore.save(profile.id, { email, password, token: session.id }); credentialStore.save(profile.id, { email, password, token: session.id });
sessionStore.update(session.id, {
storesCache: { data: stores, fetchedAt: Date.now() }
});
scheduleConfig(session.id, config, settings); scheduleConfig(session.id, config, settings);
return res.json({ return res.json({
@@ -222,14 +255,13 @@ app.post('/api/auth/logout', requireAuth, (req, res) => {
app.get('/api/auth/session', requireAuth, async (req, res) => { app.get('/api/auth/session', requireAuth, async (req, res) => {
const settings = adminConfig.readSettings(); const settings = adminConfig.readSettings();
const stores = await foodsharingClient.fetchStores(req.session.cookieHeader, req.session.profile.id, { const { stores, refreshed } = await loadStoresForSession(req.session, settings);
delayBetweenRequestsMs: settings.storePickupCheckDelayMs if (refreshed) {
}); let config = readConfig(req.session.profile.id);
let config = readConfig(req.session.profile.id); const { merged, changed } = mergeStoresIntoConfig(config, stores);
const { merged, changed } = mergeStoresIntoConfig(config, stores); if (changed) {
if (changed) { writeConfig(req.session.profile.id, merged);
config = merged; }
writeConfig(req.session.profile.id, config);
} }
res.json({ res.json({
profile: req.session.profile, profile: req.session.profile,
@@ -262,14 +294,13 @@ app.post('/api/config', requireAuth, (req, res) => {
app.get('/api/stores', requireAuth, async (req, res) => { app.get('/api/stores', requireAuth, async (req, res) => {
const settings = adminConfig.readSettings(); const settings = adminConfig.readSettings();
const stores = await foodsharingClient.fetchStores(req.session.cookieHeader, req.session.profile.id, { const { stores, refreshed } = await loadStoresForSession(req.session, settings, { forceRefresh: true });
delayBetweenRequestsMs: settings.storePickupCheckDelayMs if (refreshed) {
}); let config = readConfig(req.session.profile.id);
let config = readConfig(req.session.profile.id); const { merged, changed } = mergeStoresIntoConfig(config, stores);
const { merged, changed } = mergeStoresIntoConfig(config, stores); if (changed) {
if (changed) { writeConfig(req.session.profile.id, merged);
config = merged; }
writeConfig(req.session.profile.id, config);
} }
res.json(stores); res.json(stores);
}); });

8
services/foodsharingClient.js
View File

@@ -168,7 +168,13 @@ async function annotateStoresWithPickupSlots(stores, cookieHeader, delayBetweenR
const pickups = await fetchPickups(store.id, cookieHeader); const pickups = await fetchPickups(store.id, cookieHeader);
hasPickupSlots = Array.isArray(pickups) && pickups.length > 0; hasPickupSlots = Array.isArray(pickups) && pickups.length > 0;
} catch (error) { } catch (error) {
console.warn(`Pickups für Store ${store.id} konnten nicht geprüft werden:`, error.message); const status = error?.response?.status;
if (status === 403) {
hasPickupSlots = false;
console.warn(`Pickups für Store ${store.id} nicht erlaubt (403) – wird als ohne Slots behandelt.`);
} else {
console.warn(`Pickups für Store ${store.id} konnten nicht geprüft werden:`, error.message);
}
} }
annotated.push({ ...store, hasPickupSlots }); annotated.push({ ...store, hasPickupSlots });
} }

87
src/App.js
View File

@@ -101,15 +101,13 @@ function App() {
}, [resetSessionState]); }, [resetSessionState]);
const bootstrapSession = useCallback( const bootstrapSession = useCallback(
async (token, { withProgress = false } = {}) => { async (token, { progress } = {}) => {
if (!token) { if (!token) {
return; return;
} }
setLoading(true); setLoading(true);
setError(''); setError('');
if (withProgress) { progress?.update?.('Session wird aufgebaut...', 20);
startSyncProgress('Session wird aufgebaut...', 10, true);
}
try { try {
const response = await fetch('/api/auth/session', { const response = await fetch('/api/auth/session', {
headers: { Authorization: `Bearer ${token}` } headers: { Authorization: `Bearer ${token}` }
@@ -123,9 +121,7 @@ function App() {
} }
const data = await response.json(); const data = await response.json();
setSession({ token, profile: data.profile, isAdmin: data.isAdmin }); setSession({ token, profile: data.profile, isAdmin: data.isAdmin });
if (withProgress) { progress?.update?.('Betriebe werden geprüft...', 45);
updateSyncProgress('Betriebe werden geprüft...', 45);
}
setStores(Array.isArray(data.stores) ? data.stores : []); setStores(Array.isArray(data.stores) ? data.stores : []);
setAdminSettings(data.isAdmin ? normalizeAdminSettings(data.adminSettings) : null); setAdminSettings(data.isAdmin ? normalizeAdminSettings(data.adminSettings) : null);
@@ -140,35 +136,35 @@ function App() {
throw new Error(`HTTP ${configResponse.status}`); throw new Error(`HTTP ${configResponse.status}`);
} }
const configData = await configResponse.json(); const configData = await configResponse.json();
if (withProgress) { progress?.update?.('Konfiguration wird geladen...', 75);
updateSyncProgress('Konfiguration wird geladen...', 75);
}
setConfig(Array.isArray(configData) ? configData : []); setConfig(Array.isArray(configData) ? configData : []);
if (withProgress) { progress?.update?.('Synchronisierung abgeschlossen', 95);
updateSyncProgress('Synchronisierung abgeschlossen', 95);
}
} catch (err) { } catch (err) {
setError(`Session konnte nicht wiederhergestellt werden: ${err.message}`); setError(`Session konnte nicht wiederhergestellt werden: ${err.message}`);
} finally { } finally {
setLoading(false); setLoading(false);
if (withProgress) {
finishSyncProgress();
}
} }
}, },
[handleUnauthorized, normalizeAdminSettings, startSyncProgress, updateSyncProgress, finishSyncProgress] [handleUnauthorized, normalizeAdminSettings]
); );
useEffect(() => { useEffect(() => {
try { try {
const storedToken = localStorage.getItem(TOKEN_STORAGE_KEY); const storedToken = localStorage.getItem(TOKEN_STORAGE_KEY);
if (storedToken) { if (storedToken) {
bootstrapSession(storedToken); startSyncProgress('Session wird wiederhergestellt...', 5, true);
(async () => {
try {
await bootstrapSession(storedToken, { progress: { update: updateSyncProgress } });
} finally {
finishSyncProgress();
}
})();
} }
} catch (err) { } catch (err) {
console.warn('Konnte gespeicherten Token nicht lesen:', err); console.warn('Konnte gespeicherten Token nicht lesen:', err);
} }
}, [bootstrapSession]); }, [bootstrapSession, startSyncProgress, updateSyncProgress, finishSyncProgress]);
const authorizedFetch = useCallback( const authorizedFetch = useCallback(
async (url, options = {}, tokenOverride) => { async (url, options = {}, tokenOverride) => {
@@ -231,6 +227,7 @@ function App() {
setLoading(true); setLoading(true);
setError(''); setError('');
setStatus(''); setStatus('');
startSyncProgress('Anmeldung wird geprüft...', 5, true);
try { try {
const response = await fetch('/api/auth/login', { const response = await fetch('/api/auth/login', {
@@ -249,12 +246,15 @@ function App() {
} catch (storageError) { } catch (storageError) {
console.warn('Konnte Token nicht speichern:', storageError); console.warn('Konnte Token nicht speichern:', storageError);
} }
await bootstrapSession(data.token, { withProgress: true }); updateSyncProgress('Zugang bestätigt. Session wird aufgebaut...', 25);
await bootstrapSession(data.token, { progress: { update: updateSyncProgress } });
updateSyncProgress('Login abgeschlossen', 95);
setStatus('Anmeldung erfolgreich. Konfiguration geladen.'); setStatus('Anmeldung erfolgreich. Konfiguration geladen.');
setTimeout(() => setStatus(''), 3000); setTimeout(() => setStatus(''), 3000);
} catch (err) { } catch (err) {
setError(`Login fehlgeschlagen: ${err.message}`); setError(`Login fehlgeschlagen: ${err.message}`);
} finally { } finally {
finishSyncProgress();
setLoading(false); setLoading(false);
} }
}; };
@@ -273,7 +273,7 @@ function App() {
} }
}; };
const fetchConfig = async (tokenOverride, { silent = false } = {}) => { const fetchConfig = useCallback(async (tokenOverride, { silent = false } = {}) => {
const tokenToUse = tokenOverride || session?.token; const tokenToUse = tokenOverride || session?.token;
if (!tokenToUse) { if (!tokenToUse) {
return; return;
@@ -299,9 +299,9 @@ function App() {
} finally { } finally {
setLoading(false); setLoading(false);
} }
}; }, [session?.token, authorizedFetch]);
const fetchStoresList = async () => { const fetchStoresList = useCallback(async () => {
if (!session?.token) { if (!session?.token) {
return; return;
} }
@@ -314,13 +314,12 @@ function App() {
} }
const data = await response.json(); const data = await response.json();
setStores(Array.isArray(data) ? data : []); setStores(Array.isArray(data) ? data : []);
await fetchConfig(undefined, { silent: true });
setStatus('Betriebe aktualisiert.'); setStatus('Betriebe aktualisiert.');
setTimeout(() => setStatus(''), 3000); setTimeout(() => setStatus(''), 3000);
} catch (err) { } catch (err) {
setError(`Fehler beim Laden der Betriebe: ${err.message}`); setError(`Fehler beim Laden der Betriebe: ${err.message}`);
} }
}; }, [session?.token, authorizedFetch]);
const refreshStoresAndConfig = useCallback( const refreshStoresAndConfig = useCallback(
async ({ block = false } = {}) => { async ({ block = false } = {}) => {
@@ -661,8 +660,9 @@ function App() {
if (!session?.token) { if (!session?.token) {
return ( return (
<div className="min-h-screen flex items-center justify-center bg-gray-100"> <>
<form className="bg-white shadow-lg rounded-lg p-8 w-full max-w-md space-y-6" onSubmit={handleLogin}> <div className="min-h-screen flex items-center justify-center bg-gray-100">
<form className="bg-white shadow-lg rounded-lg p-8 w-full max-w-md space-y-6" onSubmit={handleLogin}>
<div> <div>
<h1 className="text-2xl font-bold mb-2 text-center text-gray-800">Pickup Config Login</h1> <h1 className="text-2xl font-bold mb-2 text-center text-gray-800">Pickup Config Login</h1>
<p className="text-sm text-gray-500 text-center"> <p className="text-sm text-gray-500 text-center">
@@ -702,26 +702,31 @@ function App() {
required required
/> />
</div> </div>
<button <button
type="submit" type="submit"
disabled={loading} disabled={loading}
className="w-full bg-blue-500 hover:bg-blue-600 text-white px-4 py-2 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 disabled:opacity-60" className="w-full bg-blue-500 hover:bg-blue-600 text-white px-4 py-2 rounded focus:outline-none focus:ring-2 focus:ring-blue-500 disabled:opacity-60"
> >
{loading ? 'Prüfe Zugang...' : 'Anmelden'} {loading ? 'Anmeldung läuft...' : 'Anmelden'}
</button> </button>
</form> </form>
</div> </div>
<StoreSyncOverlay state={syncProgress} />
</>
); );
} }
if (loading) { if (loading) {
return ( return (
<div className="flex justify-center items-center min-h-screen bg-gray-100"> <>
<div className="text-center p-8"> <div className="flex justify-center items-center min-h-screen bg-gray-100">
<div className="animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto mb-4"></div> <div className="text-center p-8">
<p className="text-xl">Lade Daten...</p> <div className="animate-spin rounded-full h-12 w-12 border-t-2 border-b-2 border-blue-500 mx-auto mb-4"></div>
<p className="text-xl">Lade Daten...</p>
</div>
</div> </div>
</div> <StoreSyncOverlay state={syncProgress} />
</>
); );
} }