app_store UI: if publisher mirror offline, default to next online mirror

This commit is contained in:
bitful-pannul 2024-09-20 00:15:24 +03:00
parent 28567b891b
commit 78855d534f

View File

@ -21,16 +21,24 @@ const MirrorSelector: React.FC<MirrorSelectorProps> = ({ packageId, onMirrorSele
if (!appData) return; if (!appData) return;
const mirrors = [appData.package_id.publisher_node, ...(appData.metadata?.properties?.mirrors || [])]; const mirrors = [appData.package_id.publisher_node, ...(appData.metadata?.properties?.mirrors || [])];
setAvailableMirrors(mirrors); setAvailableMirrors(mirrors);
setSelectedMirror(appData.package_id.publisher_node);
mirrors.forEach(mirror => { // Start with the publisher node
setSelectedMirror(appData.package_id.publisher_node);
setMirrorStatuses(prev => ({ ...prev, [appData.package_id.publisher_node]: null }));
for (const mirror of mirrors) {
if (mirror.startsWith('http')) { if (mirror.startsWith('http')) {
setMirrorStatuses(prev => ({ ...prev, [mirror]: 'http' })); setMirrorStatuses(prev => ({ ...prev, [mirror]: 'http' }));
setSelectedMirror(mirror);
break;
} else { } else {
setMirrorStatuses(prev => ({ ...prev, [mirror]: null })); const status = await checkMirrorStatus(mirror);
checkMirrorStatus(mirror); if (status) {
setSelectedMirror(mirror);
break;
}
}
} }
});
}, [packageId, fetchListing, checkMirror]); }, [packageId, fetchListing, checkMirror]);
useEffect(() => { useEffect(() => {
@ -41,8 +49,10 @@ const MirrorSelector: React.FC<MirrorSelectorProps> = ({ packageId, onMirrorSele
try { try {
const status = await checkMirror(mirror); const status = await checkMirror(mirror);
setMirrorStatuses(prev => ({ ...prev, [mirror]: status?.is_online ?? false })); setMirrorStatuses(prev => ({ ...prev, [mirror]: status?.is_online ?? false }));
return status?.is_online ?? false;
} catch { } catch {
setMirrorStatuses(prev => ({ ...prev, [mirror]: false })); setMirrorStatuses(prev => ({ ...prev, [mirror]: false }));
return false;
} }
}, [checkMirror]); }, [checkMirror]);
@ -62,7 +72,6 @@ const MirrorSelector: React.FC<MirrorSelectorProps> = ({ packageId, onMirrorSele
setIsCustomMirrorSelected(false); setIsCustomMirrorSelected(false);
setCustomMirror(""); setCustomMirror("");
if (!value.startsWith('http')) { if (!value.startsWith('http')) {
// Recheck the status when a non-HTTP mirror is selected
setMirrorStatuses(prev => ({ ...prev, [value]: null })); setMirrorStatuses(prev => ({ ...prev, [value]: null }));
await checkMirrorStatus(value); await checkMirrorStatus(value);
} }
@ -92,7 +101,6 @@ const MirrorSelector: React.FC<MirrorSelectorProps> = ({ packageId, onMirrorSele
return ( return (
<div className="mirror-selector"> <div className="mirror-selector">
<select value={selectedMirror || ""} onChange={handleMirrorChange}> <select value={selectedMirror || ""} onChange={handleMirrorChange}>
<option value="">Select a mirror</option>
{availableMirrors.map((mirror, index) => ( {availableMirrors.map((mirror, index) => (
<option key={`${mirror}-${index}`} value={mirror}> <option key={`${mirror}-${index}`} value={mirror}>
{mirror} {getMirrorStatus(mirror, mirrorStatuses[mirror])} {mirror} {getMirrorStatus(mirror, mirrorStatuses[mirror])}