@rmdes/indiekit-endpoint-activitypub 2.0.31 → 2.0.32

package/lib/fedidb.js

@@ -2,10 +2,13 @@
  * FediDB API client with MongoDB caching.
  *
  * Wraps https://api.fedidb.org/v1/ endpoints:
- * - /servers?q=... — search known fediverse instances
+ * - /servers — cursor-paginated list of known fediverse instances (ranked by size)
  * - /popular-accounts — top accounts by follower count
  *
- * Responses are cached in ap_kv to avoid hitting the API on every keystroke.
+ * NOTE: The /servers endpoint ignores query params (q, search, name) and always
+ * returns the same ranked list. We paginate through ~500 servers, cache the full
+ * corpus for 24 hours, and filter locally when the user searches.
+ *
  * Cache TTL: 24 hours for both datasets.
  */
 
@@ -71,46 +74,90 @@ async function writeToCache(kvCollection, cacheKey, data) {
 }
 
 /**
- * Search FediDB for instances matching a query.
- * Returns a flat array of { domain, software, description, mau, openRegistration }.
+ * Fetch the FediDB server catalogue by paginating through cursor-based results.
+ * Cached for 24 hours as a single entry. The API ignores the `q` param and
+ * always returns a ranked list, so we collect a large corpus and filter locally.
  *
- * Results are cached per normalized query for 24 hours.
+ * Paginates up to MAX_PAGES (13 pages × 40 = ~520 servers), which covers
+ * all well-known instances. Results are cached in ap_kv for 24 hours.
  *
  * @param {object} kvCollection - MongoDB ap_kv collection
- * @param {string} query - Search term (e.g. "mast")
- * @param {number} [limit=10] - Max results
  * @returns {Promise<Array>}
  */
-export async function searchInstances(kvCollection, query, limit = 10) {
-  const q = (query || "").trim().toLowerCase();
-  if (!q) return [];
+const MAX_PAGES = 13;
 
-  const cacheKey = `fedidb:instances:${q}:${limit}`;
+async function getAllServers(kvCollection) {
+  const cacheKey = "fedidb:servers-all";
   const cached = await getFromCache(kvCollection, cacheKey);
   if (cached) return cached;
 
+  const results = [];
+
   try {
-    const url = `${API_BASE}/servers?q=${encodeURIComponent(q)}&limit=${limit}`;
-    const res = await fetchWithTimeout(url);
-    if (!res.ok) return [];
+    let cursor = null;
+
+    for (let page = 0; page < MAX_PAGES; page++) {
+      let url = `${API_BASE}/servers?limit=40`;
+      if (cursor) url += `&cursor=${cursor}`;
+
+      const res = await fetchWithTimeout(url);
+      if (!res.ok) break;
+
+      const json = await res.json();
+      const servers = json.data || [];
+      if (servers.length === 0) break;
+
+      for (const s of servers) {
+        results.push({
+          domain: s.domain,
+          software: s.software?.name || "Unknown",
+          description: s.description || "",
+          mau: s.stats?.monthly_active_users || 0,
+          userCount: s.stats?.user_count || 0,
+          openRegistration: s.open_registration || false,
+        });
+      }
 
-    const json = await res.json();
-    const servers = json.data || [];
-
-    const results = servers.map((s) => ({
-      domain: s.domain,
-      software: s.software?.name || "Unknown",
-      description: s.description || "",
-      mau: s.stats?.monthly_active_users || 0,
-      userCount: s.stats?.user_count || 0,
-      openRegistration: s.open_registration || false,
-    }));
+      cursor = json.meta?.next_cursor;
+      if (!cursor) break;
+    }
 
-    await writeToCache(kvCollection, cacheKey, results);
-    return results;
+    if (results.length > 0) {
+      await writeToCache(kvCollection, cacheKey, results);
+    }
   } catch {
-    return [];
+    // Return whatever we collected so far
   }
+
+  return results;
+}
+
+/**
+ * Search FediDB for instances matching a query.
+ * Returns a flat array of { domain, software, description, mau, openRegistration }.
+ *
+ * Fetches the full server list once (cached 24h) and filters by domain/software match.
+ * FediDB's /v1/servers endpoint ignores the `q` param and always returns a static
+ * ranked list, so server-side filtering is the only way to get relevant results.
+ *
+ * @param {object} kvCollection - MongoDB ap_kv collection
+ * @param {string} query - Search term (e.g. "mast")
+ * @param {number} [limit=10] - Max results
+ * @returns {Promise<Array>}
+ */
+export async function searchInstances(kvCollection, query, limit = 10) {
+  const q = (query || "").trim().toLowerCase();
+  if (!q) return [];
+
+  const allServers = await getAllServers(kvCollection);
+
+  return allServers
+    .filter(
+      (s) =>
+        s.domain.toLowerCase().includes(q) ||
+        s.software.toLowerCase().includes(q),
+    )
+    .slice(0, limit);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
   "keywords": [
     "indiekit",