@rmdes/indiekit-endpoint-lastfm 1.0.5 → 1.0.6

package/lib/config.js

@@ -0,0 +1,26 @@
+/**
+ * Get effective config: DB-stored settings override env var defaults
+ * @param {object} db - MongoDB database instance
+ * @param {object} lastfmConfig - Plugin config from env vars
+ * @returns {Promise<object>} Effective apiKey, username, and other config
+ */
+export async function getEffectiveConfig(db, lastfmConfig) {
+  let apiKey = lastfmConfig?.apiKey || "";
+  let username = lastfmConfig?.username || "";
+
+  if (db) {
+    try {
+      const settings = await db
+        .collection("lastfmMeta")
+        .findOne({ key: "settings" });
+      if (settings) {
+        if (settings.apiKey) apiKey = settings.apiKey;
+        if (settings.username) username = settings.username;
+      }
+    } catch {
+      // Fall through to defaults
+    }
+  }
+
+  return { apiKey, username };
+}

package/lib/controllers/dashboard.js

@@ -1,34 +1,8 @@
 import { LastFmClient } from "../lastfm-client.js";
+import { getEffectiveConfig } from "../config.js";
 import { runSync, getCachedStats, refreshStatsCache } from "../sync.js";
 import * as utils from "../utils.js";
 
-/**
- * Get effective config: DB-stored settings override env var defaults
- * @param {object} db - MongoDB database instance
- * @param {object} lastfmConfig - Plugin config from env vars
- * @returns {Promise<object>} Effective apiKey and username
- */
-async function getEffectiveConfig(db, lastfmConfig) {
-  let apiKey = lastfmConfig?.apiKey || "";
-  let username = lastfmConfig?.username || "";
-
-  if (db) {
-    try {
-      const settings = await db
-        .collection("lastfmMeta")
-        .findOne({ key: "settings" });
-      if (settings) {
-        if (settings.apiKey) apiKey = settings.apiKey;
-        if (settings.username) username = settings.username;
-      }
-    } catch {
-      // Fall through to defaults
-    }
-  }
-
-  return { apiKey, username };
-}
-
 /**
  * Dashboard controller
  */
@@ -115,10 +89,8 @@ export const dashboardController = {
       }
       const summary = cachedStatsData?.summary?.all || null;
 
-      // Determine public frontend URL
-      const publicUrl = lastfmEndpoint
-        ? lastfmEndpoint.replace(/api$/, "")
-        : "/lastfm";
+      // Public page is the combined /listening page
+      const publicUrl = "/listening";
 
       response.render("lastfm", {
         title: response.__("lastfm.title"),

package/lib/controllers/loved.js

@@ -1,4 +1,5 @@
 import { LastFmClient } from "../lastfm-client.js";
+import { getEffectiveConfig } from "../config.js";
 import * as utils from "../utils.js";
 
 /**
@@ -11,13 +12,16 @@ export const lovedController = {
    */
   async api(request, response, next) {
     try {
-      const { lastfmConfig } = request.app.locals.application;
+      const { application } = request.app.locals;
+      const { lastfmConfig } = application;
 
       if (!lastfmConfig) {
         return response.status(500).json({ error: "Not configured" });
       }
 
-      const { apiKey, username, cacheTtl, limits } = lastfmConfig;
+      const db = application.getLastfmDb?.();
+      const { apiKey, username } = await getEffectiveConfig(db, lastfmConfig);
+      const limits = lastfmConfig.limits || {};
       const page = parseInt(request.query.page) || 1;
       const limit = Math.min(
         parseInt(request.query.limit) || limits.loved || 20,
@@ -27,7 +31,7 @@ export const lovedController = {
       const client = new LastFmClient({
         apiKey,
         username,
-        cacheTtl,
+        cacheTtl: lastfmConfig.cacheTtl,
       });
 
       const lovedRes = await client.getLovedTracks(page, limit);

package/lib/controllers/now-playing.js

@@ -1,4 +1,5 @@
 import { LastFmClient } from "../lastfm-client.js";
+import { getEffectiveConfig } from "../config.js";
 import * as utils from "../utils.js";
 
 /**
@@ -11,18 +12,20 @@ export const nowPlayingController = {
    */
   async api(request, response, next) {
     try {
-      const { lastfmConfig } = request.app.locals.application;
+      const { application } = request.app.locals;
+      const { lastfmConfig } = application;
 
       if (!lastfmConfig) {
         return response.status(500).json({ error: "Not configured" });
       }
 
-      const { apiKey, username, cacheTtl } = lastfmConfig;
+      const db = application.getLastfmDb?.();
+      const { apiKey, username } = await getEffectiveConfig(db, lastfmConfig);
 
       const client = new LastFmClient({
         apiKey,
         username,
-        cacheTtl: Math.min(cacheTtl, 60_000), // Max 1 minute cache for now playing
+        cacheTtl: Math.min(lastfmConfig.cacheTtl, 60_000),
       });
 
       const track = await client.getLatestScrobble();

package/lib/controllers/scrobbles.js

@@ -1,4 +1,5 @@
 import { LastFmClient } from "../lastfm-client.js";
+import { getEffectiveConfig } from "../config.js";
 import * as utils from "../utils.js";
 
 /**
@@ -11,13 +12,16 @@ export const scrobblesController = {
    */
   async api(request, response, next) {
     try {
-      const { lastfmConfig } = request.app.locals.application;
+      const { application } = request.app.locals;
+      const { lastfmConfig } = application;
 
       if (!lastfmConfig) {
         return response.status(500).json({ error: "Not configured" });
       }
 
-      const { apiKey, username, cacheTtl, limits } = lastfmConfig;
+      const db = application.getLastfmDb?.();
+      const { apiKey, username } = await getEffectiveConfig(db, lastfmConfig);
+      const limits = lastfmConfig.limits || {};
       const page = parseInt(request.query.page) || 1;
       const limit = Math.min(
         parseInt(request.query.limit) || limits.scrobbles || 20,
@@ -27,7 +31,7 @@ export const scrobblesController = {
       const client = new LastFmClient({
         apiKey,
         username,
-        cacheTtl,
+        cacheTtl: lastfmConfig.cacheTtl,
       });
 
       const scrobblesRes = await client.getRecentTracks(page, limit);

package/lib/controllers/stats.js

@@ -1,4 +1,5 @@
 import { LastFmClient } from "../lastfm-client.js";
+import { getEffectiveConfig } from "../config.js";
 import { getAllStats, getScrobbleTrends } from "../stats.js";
 import { getCachedStats } from "../sync.js";
 
@@ -12,21 +13,22 @@ export const statsController = {
    */
   async api(request, response, next) {
     try {
-      const { lastfmConfig } = request.app.locals.application;
+      const { application } = request.app.locals;
+      const { lastfmConfig } = application;
 
       if (!lastfmConfig) {
         return response.status(500).json({ error: "Not configured" });
       }
 
       // Try database first, fall back to cache for public routes
-      const db = request.app.locals.database;
+      const db = application.getLastfmDb?.();
       let stats;
 
       if (db) {
-        // Create client for API-based top artists/albums
+        const { apiKey, username } = await getEffectiveConfig(db, lastfmConfig);
         const client = new LastFmClient({
-          apiKey: lastfmConfig.apiKey,
-          username: lastfmConfig.username,
+          apiKey,
+          username,
           cacheTtl: lastfmConfig.cacheTtl,
         });
 
@@ -64,13 +66,14 @@ export const statsController = {
    */
   async apiTrends(request, response, next) {
     try {
-      const { lastfmConfig } = request.app.locals.application;
+      const { application } = request.app.locals;
+      const { lastfmConfig } = application;
 
       if (!lastfmConfig) {
         return response.status(500).json({ error: "Not configured" });
       }
 
-      const db = request.app.locals.database;
+      const db = application.getLastfmDb?.();
       const days = Math.min(parseInt(request.query.days) || 30, 90);
 
       if (db) {

package/locales/en.json

@@ -40,8 +40,8 @@
       "noConfig": "Last.fm API key and username are required. Configure them below."
     },
     "widget": {
-      "description": "View full scrobble activity on the public page",
-      "view": "View Public Page"
+      "description": "View combined listening activity on the public page",
+      "view": "View Listening Page"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-lastfm",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Last.fm scrobble and listening activity endpoint for Indiekit. Display listening history, loved tracks, and statistics.",
   "keywords": [
     "indiekit",