@rmdes/indiekit-endpoint-funkwhale 1.0.0 → 1.0.2

package/index.js

@@ -1,4 +1,6 @@
 import express from "express";
+import { fileURLToPath } from "node:url";
+import path from "node:path";
 
 import { dashboardController } from "./lib/controllers/dashboard.js";
 import { listeningsController } from "./lib/controllers/listenings.js";
@@ -7,6 +9,8 @@ import { statsController } from "./lib/controllers/stats.js";
 import { nowPlayingController } from "./lib/controllers/now-playing.js";
 import { startSync } from "./lib/sync.js";
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
 const protectedRouter = express.Router();
 const publicRouter = express.Router();
 
@@ -37,6 +41,14 @@ export default class FunkwhaleEndpoint {
     return ["FUNKWHALE_TOKEN", "FUNKWHALE_INSTANCE", "FUNKWHALE_USERNAME"];
   }
 
+  get localesDirectory() {
+    return path.join(__dirname, "locales");
+  }
+
+  get styles() {
+    return path.join(__dirname, "assets", "styles.css");
+  }
+
   get navigationItems() {
     return {
       href: this.options.mountPath,

package/lib/controllers/stats.js

@@ -1,4 +1,5 @@
 import { getAllStats, getListeningTrends } from "../stats.js";
+import { getCachedStats } from "../sync.js";
 import { formatTotalTime } from "../utils.js";
 
 /**
@@ -84,13 +85,23 @@ export const statsController = {
         return response.status(500).json({ error: "Not configured" });
       }
 
+      // Try database first, fall back to cache for public routes
       const db = request.app.locals.database;
-      if (!db) {
-        return response.status(500).json({ error: "Database not available" });
+      let stats;
+
+      if (db) {
+        stats = await getAllStats(db, funkwhaleConfig.limits);
+      } else {
+        // Public routes don't have DB access, use cached stats
+        stats = getCachedStats();
+        if (!stats) {
+          return response.status(503).json({
+            error: "Stats not available yet",
+            message: "Stats are computed during background sync. Please try again shortly.",
+          });
+        }
       }
 
-      const stats = await getAllStats(db, funkwhaleConfig.limits);
-
       // Add formatted durations
       stats.summary.all.totalDurationFormatted = formatTotalTime(
         stats.summary.all.totalDuration
@@ -122,14 +133,23 @@ export const statsController = {
       }
 
       const db = request.app.locals.database;
-      if (!db) {
-        return response.status(500).json({ error: "Database not available" });
+      const days = Math.min(parseInt(request.query.days) || 30, 90);
+
+      if (db) {
+        const trends = await getListeningTrends(db, days);
+        return response.json({ trends, days });
       }
 
-      const days = Math.min(parseInt(request.query.days) || 30, 90);
-      const trends = await getListeningTrends(db, days);
+      // Fall back to cached stats for public routes
+      const cachedStats = getCachedStats();
+      if (cachedStats?.trends) {
+        return response.json({ trends: cachedStats.trends, days: 30 });
+      }
 
-      response.json({ trends, days });
+      return response.status(503).json({
+        error: "Trends not available yet",
+        message: "Trends are computed during background sync. Please try again shortly.",
+      });
     } catch (error) {
       console.error("[Funkwhale] Trends API error:", error);
       response.status(500).json({ error: error.message });

package/lib/sync.js

@@ -1,8 +1,35 @@
 import { FunkwhaleClient } from "./funkwhale-client.js";
 import { getCoverUrl, getArtistName } from "./utils.js";
+import { getAllStats, getListeningTrends } from "./stats.js";
 
 let syncInterval = null;
 
+// In-memory cache for stats (accessible to public routes)
+let cachedStats = null;
+let cachedStatsTime = null;
+const STATS_CACHE_TTL = 300_000; // 5 minutes
+
+/**
+ * Get cached stats (for public API routes that can't access DB)
+ * @returns {object|null} - Cached stats or null
+ */
+export function getCachedStats() {
+  if (!cachedStats) return null;
+  if (cachedStatsTime && Date.now() - cachedStatsTime > STATS_CACHE_TTL) {
+    return cachedStats; // Return stale cache, sync will refresh
+  }
+  return cachedStats;
+}
+
+/**
+ * Update stats cache
+ * @param {object} stats - Stats to cache
+ */
+export function setCachedStats(stats) {
+  cachedStats = stats;
+  cachedStatsTime = Date.now();
+}
+
 /**
  * Start background sync process
  * @param {object} Indiekit - Indiekit instance
@@ -61,7 +88,18 @@ export async function runSync(Indiekit, options) {
     cacheTtl: 60_000, // Short cache for sync
   });
 
-  return syncListenings(db, client);
+  const result = await syncListenings(db, client);
+
+  // Update stats cache after sync
+  try {
+    const stats = await getAllStats(db, options.limits || {});
+    setCachedStats(stats);
+    console.log("[Funkwhale] Stats cache updated");
+  } catch (err) {
+    console.error("[Funkwhale] Failed to cache stats:", err.message);
+  }
+
+  return result;
 }
 
 /**

package/locales/en.json

@@ -1,29 +1,37 @@
 {
-  "funkwhale.title": "Funkwhale",
-  "funkwhale.listenings": "Listening History",
-  "funkwhale.favorites": "Favorites",
-  "funkwhale.stats": "Statistics",
-  "funkwhale.nowPlaying": "Now Playing",
-  "funkwhale.recentlyPlayed": "Recently Played",
-  "funkwhale.lastPlayed": "Last Played",
-  "funkwhale.allTime": "All Time",
-  "funkwhale.thisWeek": "This Week",
-  "funkwhale.thisMonth": "This Month",
-  "funkwhale.trends": "Trends",
-  "funkwhale.listeningTrend": "Listening Trend (30 days)",
-  "funkwhale.topArtists": "Top Artists",
-  "funkwhale.topAlbums": "Top Albums",
-  "funkwhale.plays": "plays",
-  "funkwhale.tracks": "tracks",
-  "funkwhale.artists": "artists",
-  "funkwhale.albums": "albums",
-  "funkwhale.listeningTime": "Listening Time",
-  "funkwhale.noRecentPlays": "No music played recently",
-  "funkwhale.noFavorites": "No favorite tracks yet",
-  "funkwhale.viewAll": "View All",
-  "funkwhale.viewStats": "View Statistics",
-  "funkwhale.error.connection": "Could not connect to Funkwhale",
-  "funkwhale.error.noConfig": "Funkwhale endpoint not configured correctly",
-  "funkwhale.widget.description": "View your Funkwhale listening activity",
-  "funkwhale.widget.view": "View Activity"
+  "funkwhale": {
+    "title": "Funkwhale",
+    "listenings": "Listening History",
+    "favorites": "Favorites",
+    "stats": "Statistics",
+    "nowPlaying": "Now Playing",
+    "recentlyPlayed": "Recently Played",
+    "lastPlayed": "Last Played",
+    "allTime": "All Time",
+    "thisWeek": "This Week",
+    "thisMonth": "This Month",
+    "trends": "Trends",
+    "listeningTrend": "Listening Trend (30 days)",
+    "topArtists": "Top Artists",
+    "topAlbums": "Top Albums",
+    "plays": "plays",
+    "tracks": "tracks",
+    "artists": "artists",
+    "albums": "albums",
+    "listeningTime": "Listening Time",
+    "noRecentPlays": "No music played recently",
+    "noFavorites": "No favorite tracks yet",
+    "viewAll": "View All",
+    "viewStats": "View Statistics",
+    "sync": "Sync Now",
+    "lastSync": "Last sync",
+    "error": {
+      "connection": "Could not connect to Funkwhale",
+      "noConfig": "Funkwhale endpoint not configured correctly"
+    },
+    "widget": {
+      "description": "View your Funkwhale listening activity",
+      "view": "View Activity"
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-funkwhale",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Funkwhale listening activity endpoint for Indiekit. Display listening history, favorites, and statistics.",
   "keywords": [
     "indiekit",