@rmdes/indiekit-endpoint-blogroll 1.0.3 → 1.0.5

package/index.js

@@ -86,6 +86,9 @@ export default class BlogrollEndpoint {
     protectedRouter.post("/blogs/:id/delete", blogsController.remove);
     protectedRouter.post("/blogs/:id/refresh", blogsController.refresh);
 
+    // Feed discovery (protected to prevent abuse)
+    protectedRouter.get("/api/discover", apiController.discover);
+
     return protectedRouter;
   }
 

package/lib/controllers/api.js

@@ -8,6 +8,7 @@ import { getBlogs, countBlogs, getBlog, getCategories } from "../storage/blogs.j
 import { getItems, getItemsForBlog } from "../storage/items.js";
 import { getSyncStatus } from "../sync/scheduler.js";
 import { generateOpml } from "../sync/opml.js";
+import { discoverFeeds } from "../utils/feed-discovery.js";
 
 /**
  * List blogs with optional filtering
@@ -185,6 +186,26 @@ async function exportOpmlCategory(request, response) {
   }
 }
 
+/**
+ * Discover feeds from a website URL
+ * GET /api/discover?url=...
+ */
+async function discover(request, response) {
+  const { url } = request.query;
+
+  if (!url) {
+    return response.status(400).json({ error: "URL parameter required" });
+  }
+
+  try {
+    const result = await discoverFeeds(url);
+    response.json(result);
+  } catch (error) {
+    console.error("[Blogroll API] discover error:", error);
+    response.status(500).json({ error: "Failed to discover feeds" });
+  }
+}
+
 // Helper functions
 
 /**
@@ -237,4 +258,5 @@ export const apiController = {
   status,
   exportOpml,
   exportOpmlCategory,
+  discover,
 };

package/lib/controllers/sources.js

@@ -20,7 +20,17 @@ async function list(request, response) {
   const { application } = request.app.locals;
 
   try {
-    const sources = await getSources(application);
+    const rawSources = await getSources(application);
+
+    // Convert Date objects to ISO strings for template date filter compatibility
+    const sources = rawSources.map((source) => ({
+      ...source,
+      lastSyncAt: source.lastSyncAt
+        ? (source.lastSyncAt instanceof Date
+            ? source.lastSyncAt.toISOString()
+            : source.lastSyncAt)
+        : null,
+    }));
 
     response.render("blogroll-sources", {
       title: request.__("blogroll.sources.title"),
@@ -83,25 +93,19 @@ async function create(request, response) {
     });
 
     // Trigger initial sync for OPML sources
-    if (source.type === "opml_url" || source.type === "opml_file") {
-      try {
-        await syncOpmlSource(application, source);
-        request.session.messages = [
-          { type: "success", content: request.__("blogroll.sources.created_synced") },
-        ];
-      } catch (syncError) {
-        request.session.messages = [
-          {
-            type: "warning",
-            content: request.__("blogroll.sources.created_sync_failed", {
-              error: syncError.message,
-            }),
-          },
-        ];
-      }
-    } else {
+    try {
+      await syncOpmlSource(application, source);
+      request.session.messages = [
+        { type: "success", content: request.__("blogroll.sources.created_synced") },
+      ];
+    } catch (syncError) {
       request.session.messages = [
-        { type: "success", content: request.__("blogroll.sources.created") },
+        {
+          type: "warning",
+          content: request.__("blogroll.sources.created_sync_failed", {
+            error: syncError.message,
+          }),
+        },
       ];
     }
 

package/lib/utils/feed-discovery.js

@@ -0,0 +1,164 @@
+/**
+ * RSS/Atom feed discovery from website URLs
+ * @module utils/feed-discovery
+ */
+
+/**
+ * Discover RSS/Atom feeds from a website URL
+ * @param {string} websiteUrl - The website URL to check
+ * @param {number} timeout - Fetch timeout in ms
+ * @returns {Promise<object>} Discovery result with feeds array
+ */
+export async function discoverFeeds(websiteUrl, timeout = 10000) {
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), timeout);
+
+  try {
+    // Normalize URL
+    let url = websiteUrl.trim();
+    if (!url.startsWith("http://") && !url.startsWith("https://")) {
+      url = "https://" + url;
+    }
+
+    const response = await fetch(url, {
+      signal: controller.signal,
+      headers: {
+        "User-Agent": "Indiekit-Blogroll/1.0 (Feed Discovery)",
+        Accept: "text/html,application/xhtml+xml",
+      },
+    });
+
+    if (!response.ok) {
+      return { success: false, error: `HTTP ${response.status}`, feeds: [] };
+    }
+
+    const html = await response.text();
+    const feeds = [];
+    const baseUrl = new URL(url);
+
+    // Find <link rel="alternate"> feeds in HTML
+    const linkRegex =
+      /<link[^>]+rel=["']alternate["'][^>]*>/gi;
+    const typeRegex = /type=["']([^"']+)["']/i;
+    const hrefRegex = /href=["']([^"']+)["']/i;
+    const titleRegex = /title=["']([^"']+)["']/i;
+
+    const feedTypes = [
+      "application/rss+xml",
+      "application/atom+xml",
+      "application/feed+json",
+      "application/json",
+      "text/xml",
+    ];
+
+    let match;
+    while ((match = linkRegex.exec(html)) !== null) {
+      const linkTag = match[0];
+      const typeMatch = typeRegex.exec(linkTag);
+      const hrefMatch = hrefRegex.exec(linkTag);
+
+      if (hrefMatch) {
+        const type = typeMatch ? typeMatch[1].toLowerCase() : "";
+        const href = hrefMatch[1];
+        const titleMatch = titleRegex.exec(linkTag);
+        const title = titleMatch ? titleMatch[1] : null;
+
+        // Check if it's a feed type
+        if (feedTypes.some((ft) => type.includes(ft.split("/")[1]))) {
+          // Resolve relative URLs
+          const feedUrl = new URL(href, baseUrl).href;
+
+          feeds.push({
+            url: feedUrl,
+            type: type.includes("atom")
+              ? "atom"
+              : type.includes("json")
+                ? "json"
+                : "rss",
+            title,
+          });
+        }
+      }
+    }
+
+    // Also check common feed paths if no feeds found in HTML
+    if (feeds.length === 0) {
+      const commonPaths = [
+        "/feed",
+        "/feed.xml",
+        "/rss",
+        "/rss.xml",
+        "/atom.xml",
+        "/feed/atom",
+        "/feed/rss",
+        "/index.xml",
+        "/blog/feed",
+        "/blog/rss",
+        "/.rss",
+        "/feed.json",
+      ];
+
+      for (const path of commonPaths) {
+        try {
+          const feedUrl = new URL(path, baseUrl).href;
+          const feedResponse = await fetch(feedUrl, {
+            method: "HEAD",
+            signal: controller.signal,
+            headers: {
+              "User-Agent": "Indiekit-Blogroll/1.0 (Feed Discovery)",
+            },
+          });
+
+          if (feedResponse.ok) {
+            const contentType = feedResponse.headers.get("content-type") || "";
+            if (
+              contentType.includes("xml") ||
+              contentType.includes("rss") ||
+              contentType.includes("atom") ||
+              contentType.includes("json")
+            ) {
+              feeds.push({
+                url: feedUrl,
+                type: contentType.includes("atom")
+                  ? "atom"
+                  : contentType.includes("json")
+                    ? "json"
+                    : "rss",
+                title: null,
+              });
+              break; // Found one, stop checking
+            }
+          }
+        } catch {
+          // Ignore individual path errors
+        }
+      }
+    }
+
+    // Try to extract page title for blog name
+    let pageTitle = null;
+    const titleTagMatch = /<title[^>]*>([^<]+)<\/title>/i.exec(html);
+    if (titleTagMatch) {
+      pageTitle = titleTagMatch[1].trim();
+      // Clean up common suffixes
+      pageTitle = pageTitle
+        .replace(/\s*[-|–—]\s*.*$/, "")
+        .replace(/\s*:\s*Home.*$/i, "")
+        .trim();
+    }
+
+    return {
+      success: true,
+      feeds,
+      pageTitle,
+      siteUrl: baseUrl.origin,
+    };
+  } catch (error) {
+    if (error.name === "AbortError") {
+      return { success: false, error: "Request timed out", feeds: [] };
+    }
+    return { success: false, error: error.message, feeds: [] };
+  } finally {
+    clearTimeout(timeoutId);
+  }
+}

package/locales/en.json

@@ -32,30 +32,30 @@
     },
 
     "sources": {
-      "title": "Sources",
-      "manage": "Manage Sources",
-      "add": "Add Source",
-      "new": "New Source",
-      "edit": "Edit Source",
-      "create": "Create Source",
-      "save": "Save Source",
-      "empty": "No sources configured yet.",
-      "recent": "Recent Sources",
+      "title": "OPML Sync",
+      "manage": "OPML Sync",
+      "add": "Add OPML Source",
+      "new": "New OPML Source",
+      "edit": "Edit OPML Source",
+      "create": "Create",
+      "save": "Save",
+      "empty": "No OPML sources configured. Use this to bulk-import blogs from FreshRSS or other feed readers.",
+      "recent": "OPML Sources",
       "interval": "Every %{minutes} min",
       "lastSync": "Last synced",
-      "deleteConfirm": "Delete this source? Blogs imported from it will remain.",
-      "created": "Source created successfully.",
-      "created_synced": "Source created and synced successfully.",
-      "created_sync_failed": "Source created, but sync failed: %{error}",
-      "updated": "Source updated successfully.",
-      "deleted": "Source deleted successfully.",
+      "deleteConfirm": "Delete this OPML source? Blogs imported from it will remain.",
+      "created": "OPML source created successfully.",
+      "created_synced": "OPML source created and synced successfully.",
+      "created_sync_failed": "OPML source created, but sync failed: %{error}",
+      "updated": "OPML source updated successfully.",
+      "deleted": "OPML source deleted successfully.",
       "synced": "Synced successfully. Added: %{added}, Updated: %{updated}",
       "form": {
         "name": "Name",
-        "type": "Type",
-        "typeHint": "How to import blogs from this source",
+        "type": "Import Type",
+        "typeHint": "URL syncs periodically, File is a one-time import",
         "url": "OPML URL",
-        "urlHint": "URL of the OPML file to import",
+        "urlHint": "URL to your OPML file (e.g., FreshRSS export URL)",
         "opmlContent": "OPML Content",
         "opmlContentHint": "Paste the full OPML XML content here",
         "syncInterval": "Sync Interval",
@@ -91,6 +91,17 @@
       "deleted": "Blog deleted successfully.",
       "refreshed": "Blog refreshed. Added %{items} new items.",
       "form": {
+        "discoverUrl": "Website URL",
+        "discover": "Discover Feed",
+        "discoverHint": "Enter a website URL to auto-discover its RSS/Atom feed",
+        "discoverNoUrl": "Please enter a website URL",
+        "discovering": "Discovering...",
+        "discoveringHint": "Checking for RSS/Atom feeds...",
+        "discoverFailed": "Failed to discover feeds",
+        "discoverNoFeeds": "No feeds found on this website",
+        "discoverFoundOne": "Found feed:",
+        "discoverFoundMultiple": "Multiple feeds found. Click one to select:",
+        "discoverSelected": "Selected feed:",
         "feedUrl": "Feed URL",
         "feedUrlHint": "RSS, Atom, or JSON Feed URL",
         "title": "Title",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-blogroll",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Blogroll endpoint for Indiekit. Aggregates blog feeds from OPML, JSON feeds, or manual entry.",
   "keywords": [
     "indiekit",

package/views/blogroll-blog-edit.njk

@@ -107,6 +107,93 @@
     text-align: center;
     padding: var(--space-m, 1rem);
   }
+
+  .br-discover-section {
+    background: var(--color-offset, #f5f5f5);
+    border-radius: var(--border-radius-small, 0.5rem);
+    padding: var(--space-m, 1rem);
+    margin-block-end: var(--space-m, 1rem);
+  }
+
+  .br-discover-section .br-field {
+    margin-block-end: var(--space-s, 0.75rem);
+  }
+
+  .br-discover-input {
+    display: flex;
+    gap: var(--space-s, 0.75rem);
+  }
+
+  .br-discover-input input {
+    flex: 1;
+    appearance: none;
+    background-color: var(--color-background, #fff);
+    border: 1px solid var(--color-outline-variant, #ccc);
+    border-radius: var(--border-radius-small, 0.25rem);
+    font: var(--font-body, 0.875rem/1.4 sans-serif);
+    padding: calc(var(--space-s, 0.75rem) / 2) var(--space-s, 0.75rem);
+  }
+
+  .br-discover-result {
+    margin-block-start: var(--space-s, 0.75rem);
+    padding: var(--space-s, 0.75rem);
+    background: var(--color-background, #fff);
+    border-radius: var(--border-radius-small, 0.25rem);
+    font: var(--font-caption, 0.875rem/1.4 sans-serif);
+  }
+
+  .br-discover-result.br-discover-result--error {
+    color: var(--color-error, #dc3545);
+  }
+
+  .br-discover-result.br-discover-result--success {
+    color: var(--color-success, #28a745);
+  }
+
+  .br-discover-feeds {
+    list-style: none;
+    padding: 0;
+    margin: var(--space-xs, 0.5rem) 0 0 0;
+    display: flex;
+    flex-direction: column;
+    gap: var(--space-xs, 0.5rem);
+  }
+
+  .br-discover-feed {
+    display: flex;
+    align-items: center;
+    gap: var(--space-s, 0.75rem);
+    padding: var(--space-xs, 0.5rem);
+    background: var(--color-offset, #f5f5f5);
+    border-radius: var(--border-radius-small, 0.25rem);
+    cursor: pointer;
+  }
+
+  .br-discover-feed:hover {
+    background: var(--color-primary-offset, #e6f0ff);
+  }
+
+  .br-discover-feed-url {
+    flex: 1;
+    font-family: monospace;
+    font-size: 0.75rem;
+    word-break: break-all;
+  }
+
+  .br-discover-feed-type {
+    background: var(--color-primary, #0066cc);
+    color: white;
+    padding: 0.125rem 0.5rem;
+    border-radius: 0.25rem;
+    font-size: 0.625rem;
+    text-transform: uppercase;
+  }
+
+  .br-divider {
+    border: none;
+    border-block-start: 1px solid var(--color-outline-variant, #ddd);
+    margin: var(--space-m, 1rem) 0;
+  }
 </style>
 
 <header class="page-header">
@@ -121,6 +208,23 @@
 {% endfor %}
 
 <form method="post" action="{% if isNew %}{{ baseUrl }}/blogs{% else %}{{ baseUrl }}/blogs/{{ blog._id }}{% endif %}" class="br-form">
+  {% if isNew %}
+  <div class="br-discover-section">
+    <div class="br-field">
+      <label for="discoverUrl">{{ __("blogroll.blogs.form.discoverUrl") }}</label>
+      <div class="br-discover-input">
+        <input type="url" id="discoverUrl" placeholder="https://tantek.com">
+        <button type="button" id="discoverBtn" class="button button--secondary">
+          {{ __("blogroll.blogs.form.discover") }}
+        </button>
+      </div>
+      <span class="br-field-hint">{{ __("blogroll.blogs.form.discoverHint") }}</span>
+    </div>
+    <div id="discoverResult" class="br-discover-result" style="display: none;"></div>
+  </div>
+  <hr class="br-divider">
+  {% endif %}
+
   <div class="br-field">
     <label for="feedUrl">{{ __("blogroll.blogs.form.feedUrl") }}</label>
     <input type="url" id="feedUrl" name="feedUrl" value="{{ blog.feedUrl if blog else '' }}" required placeholder="https://example.com/feed.xml">
@@ -196,4 +300,127 @@
   {% endif %}
 </div>
 {% endif %}
+
+{% if isNew %}
+<script>
+(function() {
+  const discoverBtn = document.getElementById('discoverBtn');
+  const discoverUrl = document.getElementById('discoverUrl');
+  const discoverResult = document.getElementById('discoverResult');
+  const feedUrlInput = document.getElementById('feedUrl');
+  const titleInput = document.getElementById('title');
+  const siteUrlInput = document.getElementById('siteUrl');
+
+  function showResult(message, isError, isSuccess) {
+    discoverResult.style.display = 'block';
+    discoverResult.className = 'br-discover-result' +
+      (isError ? ' br-discover-result--error' : '') +
+      (isSuccess ? ' br-discover-result--success' : '');
+    discoverResult.textContent = '';
+
+    const span = document.createElement('span');
+    span.textContent = message;
+    discoverResult.appendChild(span);
+  }
+
+  function showFeedUrl(message, url) {
+    discoverResult.style.display = 'block';
+    discoverResult.className = 'br-discover-result br-discover-result--success';
+    discoverResult.textContent = '';
+
+    const span = document.createElement('span');
+    span.textContent = message + ' ';
+    discoverResult.appendChild(span);
+
+    const code = document.createElement('code');
+    code.textContent = url;
+    discoverResult.appendChild(code);
+  }
+
+  discoverBtn.addEventListener('click', async function() {
+    const url = discoverUrl.value.trim();
+    if (!url) {
+      showResult('{{ __("blogroll.blogs.form.discoverNoUrl") }}', true, false);
+      return;
+    }
+
+    discoverBtn.disabled = true;
+    discoverBtn.textContent = '{{ __("blogroll.blogs.form.discovering") }}';
+    showResult('{{ __("blogroll.blogs.form.discoveringHint") }}', false, false);
+
+    try {
+      const response = await fetch('{{ baseUrl }}/api/discover?url=' + encodeURIComponent(url));
+      const data = await response.json();
+
+      if (!data.success) {
+        showResult(data.error || '{{ __("blogroll.blogs.form.discoverFailed") }}', true, false);
+        return;
+      }
+
+      if (data.feeds.length === 0) {
+        showResult('{{ __("blogroll.blogs.form.discoverNoFeeds") }}', true, false);
+        return;
+      }
+
+      // Auto-fill siteUrl and title if available
+      if (data.siteUrl) {
+        siteUrlInput.value = data.siteUrl;
+      }
+      if (data.pageTitle && !titleInput.value) {
+        titleInput.value = data.pageTitle;
+      }
+
+      // If only one feed, auto-select it
+      if (data.feeds.length === 1) {
+        feedUrlInput.value = data.feeds[0].url;
+        showFeedUrl('{{ __("blogroll.blogs.form.discoverFoundOne") }}', data.feeds[0].url);
+        return;
+      }
+
+      // Multiple feeds - let user choose
+      showResult('{{ __("blogroll.blogs.form.discoverFoundMultiple") }}', false, true);
+
+      const feedList = document.createElement('ul');
+      feedList.className = 'br-discover-feeds';
+
+      data.feeds.forEach(function(feed) {
+        const li = document.createElement('li');
+        li.className = 'br-discover-feed';
+
+        const typeSpan = document.createElement('span');
+        typeSpan.className = 'br-discover-feed-type';
+        typeSpan.textContent = feed.type;
+        li.appendChild(typeSpan);
+
+        const urlSpan = document.createElement('span');
+        urlSpan.className = 'br-discover-feed-url';
+        urlSpan.textContent = feed.url;
+        li.appendChild(urlSpan);
+
+        li.addEventListener('click', function() {
+          feedUrlInput.value = feed.url;
+          showFeedUrl('{{ __("blogroll.blogs.form.discoverSelected") }}', feed.url);
+        });
+        feedList.appendChild(li);
+      });
+
+      discoverResult.appendChild(feedList);
+    } catch (error) {
+      showResult(error.message || '{{ __("blogroll.blogs.form.discoverFailed") }}', true, false);
+    } finally {
+      discoverBtn.disabled = false;
+      discoverBtn.textContent = '{{ __("blogroll.blogs.form.discover") }}';
+    }
+  });
+
+  // Allow pressing Enter in the URL field
+  discoverUrl.addEventListener('keypress', function(e) {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      discoverBtn.click();
+    }
+  });
+})();
+</script>
+{% endif %}
 {% endblock %}

package/views/blogroll-source-edit.njk

@@ -78,9 +78,8 @@
   <div class="br-field">
     <label for="type">{{ __("blogroll.sources.form.type") }}</label>
     <select id="type" name="type" required onchange="toggleTypeFields()">
-      <option value="opml_url" {% if source.type == 'opml_url' %}selected{% endif %}>OPML URL</option>
-      <option value="opml_file" {% if source.type == 'opml_file' %}selected{% endif %}>OPML File (paste content)</option>
-      <option value="manual" {% if source.type == 'manual' %}selected{% endif %}>Manual (add blogs individually)</option>
+      <option value="opml_url" {% if source.type == 'opml_url' %}selected{% endif %}>OPML URL (auto-sync)</option>
+      <option value="opml_file" {% if source.type == 'opml_file' %}selected{% endif %}>OPML File (one-time import)</option>
     </select>
     <span class="br-field-hint">{{ __("blogroll.sources.form.typeHint") }}</span>
   </div>
@@ -134,9 +133,6 @@ function toggleTypeFields() {
   } else if (type === 'opml_file') {
     urlField.style.display = 'none';
     opmlContentField.style.display = 'flex';
-  } else {
-    urlField.style.display = 'none';
-    opmlContentField.style.display = 'none';
   }
 }