{searchTerm && (
- Showing {filteredArtists.length} of {artists.length} artists
+ Showing {filteredArtists.length} of {uniqueArtists.length} artists
)}
diff --git a/frontend/src/pages/RequestsPage.jsx b/frontend/src/pages/RequestsPage.jsx
index a28b675..38da478 100644
--- a/frontend/src/pages/RequestsPage.jsx
+++ b/frontend/src/pages/RequestsPage.jsx
@@ -17,6 +17,7 @@ import {
} from "../utils/api";
import ArtistImage from "../components/ArtistImage";
import { useToast } from "../contexts/ToastContext";
+import { useWebSocketChannel } from "../hooks/useWebSocket";
function RequestsPage() {
const [requests, setRequests] = useState([]);
@@ -27,6 +28,10 @@ function RequestsPage() {
const navigate = useNavigate();
const { showError, showSuccess } = useToast();
const activeAlbumIdsRef = useRef([]);
+ const requestsRef = useRef([]);
+ const downloadStatusesRef = useRef({});
+ const refreshTimerRef = useRef(null);
+ const cacheKeyRef = useRef("aurral:requestsCache:v1");
const activeAlbumIds = useMemo(() => {
return requests
@@ -46,6 +51,38 @@ function RequestsPage() {
return [...activeAlbumIds].sort().join(",");
}, [activeAlbumIds]);
+ const writeCache = useCallback((nextRequests, nextStatuses) => {
+ try {
+ localStorage.setItem(
+ cacheKeyRef.current,
+ JSON.stringify({
+ requests: Array.isArray(nextRequests) ? nextRequests : [],
+ downloadStatuses:
+ nextStatuses && typeof nextStatuses === "object"
+ ? nextStatuses
+ : {},
+ updatedAt: Date.now(),
+ }),
+ );
+ } catch {}
+ }, []);
+
+ const loadCache = useCallback(() => {
+ try {
+ const raw = localStorage.getItem(cacheKeyRef.current);
+ if (!raw) return;
+ const cached = JSON.parse(raw);
+ if (Array.isArray(cached?.requests)) {
+ setRequests(cached.requests);
+ setLoading(false);
+ }
+ if (cached?.downloadStatuses && typeof cached.downloadStatuses === "object") {
+ setDownloadStatuses(cached.downloadStatuses);
+ downloadStatusesRef.current = cached.downloadStatuses;
+ }
+ } catch {}
+ }, []);
+
const fetchRequests = useCallback(async ({ silent = false } = {}) => {
if (!silent) {
setLoading(true);
@@ -54,6 +91,7 @@ function RequestsPage() {
try {
const data = await getRequests();
setRequests(data);
+ writeCache(data, downloadStatusesRef.current);
setError(null);
} catch {
setError("Failed to load requests history.");
@@ -62,7 +100,7 @@ function RequestsPage() {
setLoading(false);
}
}
- }, []);
+ }, [writeCache]);
const fetchActiveDownloadStatus = useCallback(async (albumIds) => {
const ids = Array.isArray(albumIds)
@@ -70,18 +108,69 @@ function RequestsPage() {
: activeAlbumIdsRef.current;
if (!ids.length) {
setDownloadStatuses({});
+ downloadStatusesRef.current = {};
+ writeCache(requestsRef.current, {});
return;
}
try {
const statuses = await getDownloadStatus(ids);
- setDownloadStatuses(statuses || {});
+ const nextStatuses = statuses || {};
+ setDownloadStatuses(nextStatuses);
+ downloadStatusesRef.current = nextStatuses;
+ writeCache(requestsRef.current, nextStatuses);
} catch {}
- }, []);
+ }, [writeCache]);
+
+ const scheduleRefresh = useCallback(
+ (refreshStatuses = false) => {
+ if (refreshTimerRef.current) return;
+ refreshTimerRef.current = setTimeout(() => {
+ refreshTimerRef.current = null;
+ fetchRequests({ silent: true });
+ if (refreshStatuses) {
+ fetchActiveDownloadStatus();
+ }
+ }, 500);
+ },
+ [fetchRequests, fetchActiveDownloadStatus],
+ );
useEffect(() => {
activeAlbumIdsRef.current = activeAlbumIds;
}, [activeAlbumIds]);
+ useEffect(() => {
+ requestsRef.current = requests;
+ }, [requests]);
+
+ useEffect(() => {
+ loadCache();
+ return () => {
+ if (refreshTimerRef.current) {
+ clearTimeout(refreshTimerRef.current);
+ refreshTimerRef.current = null;
+ }
+ };
+ }, [loadCache]);
+
+ useWebSocketChannel("queue", (msg) => {
+ if (msg.type === "queue_update") {
+ scheduleRefresh(true);
+ }
+ });
+
+ useWebSocketChannel("library", (msg) => {
+ if (msg.type === "library_update") {
+ scheduleRefresh(true);
+ }
+ });
+
+ useWebSocketChannel("downloads", (msg) => {
+ if (msg.type && msg.type.startsWith("download_")) {
+ scheduleRefresh(true);
+ }
+ });
+
useEffect(() => {
fetchRequests();
@@ -124,7 +213,7 @@ function RequestsPage() {
};
pollDownloadStatus();
- const interval = setInterval(pollDownloadStatus, 15000);
+ const interval = setInterval(pollDownloadStatus, 60000);
return () => {
cancelled = true;
clearInterval(interval);
@@ -137,7 +226,7 @@ function RequestsPage() {
request.inQueue ||
(request.status && request.status !== "available" && request.status !== "failed"),
);
- const intervalMs = hasActive ? 15000 : 60000;
+ const intervalMs = hasActive ? 60000 : 180000;
const interval = setInterval(() => {
fetchRequests({ silent: true });
}, intervalMs);
@@ -339,6 +428,11 @@ function RequestsPage() {
: null;
const isFailed =
albumStatus?.status === "failed" || request.status === "failed";
+ const isActiveDownload =
+ albumStatus &&
+ ["adding", "searching", "downloading", "moving", "processing"].includes(
+ albumStatus.status
+ );
const isReSearching =
request.albumId &&
String(request.albumId) === reSearchingAlbumId;
@@ -447,7 +541,7 @@ function RequestsPage() {
{getStatusBadge(request)}
- {isFailed && request.albumId && (
+ {isFailed && request.albumId && !isActiveDownload && (
diff --git a/server.js b/server.js
index e7a5c48..9c12f0d 100644
--- a/server.js
+++ b/server.js
@@ -15,6 +15,8 @@ import {
getDiscoveryCache,
} from "./backend/services/discoveryService.js";
import { websocketService } from "./backend/services/websocketService.js";
+import { lidarrSignalRService } from "./backend/services/lidarrClient.js";
+import { libraryManager } from "./backend/services/libraryManager.js";
import settingsRouter from "./backend/routes/settings.js";
import onboardingRouter from "./backend/routes/onboarding.js";
@@ -184,6 +186,9 @@ websocketService.initialize(httpServer);
httpServer.listen(PORT, "0.0.0.0", async () => {
console.log(`Server running on port ${PORT}`);
+ console.log(`WebSocket available at ws://localhost:${PORT}/ws`);
+ lidarrSignalRService.start();
+ libraryManager.startActivityPolling();
});
httpServer.on("error", (error) => {