From da784fc6e87a2e59a061a49edfdaeaf67de3fe74 Mon Sep 17 00:00:00 2001 From: George Mandis Date: Mon, 29 Nov 2021 04:19:19 -0500 Subject: [PATCH 1/6] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e79b271..df541a3 100644 --- a/README.md +++ b/README.md @@ -85,7 +85,9 @@ Not the most exciting-looking demos, I'll admit, but they work! The quickest way is to remix the project on Glitch: [https://glitch.com/edit/#!/bubo-rss](https://glitch.com/edit/#!/bubo-rss) -Just changed some feeds in `./config/feeds.json` file and you're set! If you'd like to modify the style or the template you can changed `./public/style.css` file or the `./config/template.html` file respectively. +There is also a `glitch` branch on this repo if you'd prefer to start there. + +Just change some feeds in `./config/feeds.json` file and you're set! If you'd like to modify the style or the template you can changed `./public/style.css` file or the `./config/template.html` file respectively. ## Deploying to Netlify From d115ffb4904fe9e4e6bcc26eb5f578a7568d3b59 Mon Sep 17 00:00:00 2001 From: George Mandis Date: Sun, 5 Dec 2021 01:47:07 -0500 Subject: [PATCH 2/6] Update README.md Added Netlify badge --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index df541a3..f1fe509 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Netlify Status](https://api.netlify.com/api/v1/badges/81dd219c-51cb-4418-a18c-42c8b104c689/deploy-status)](https://app.netlify.com/sites/bubo-rss-demo/deploys) + # 🦉 Bubo Reader (2.0) Bubo Reader is a hyper-minimalist RSS and JSON feed reader you can deploy on your own server, [Netlify](https://netlify.com) in a few steps or [Glitch](https://glitch.com) in even fewer steps! The goal of the project is to generate a webpage that shows a list of links from a collection of feeds organized by category and website. That's it. @@ -7,6 +9,7 @@ It is named after this [silly robot owl](https://www.youtube.com/watch?v=MYSeCfo You can read more about how this project came about on my blog: - [Introducing Bubo RSS: An Absurdly Minimalist RSS Feed Reader](https://george.mand.is/2019/11/introducing-bubo-rss-an-absurdly-minimalist-rss-feed-reader/). + ## Getting Started - Clone or fork the repo and run `npm install` to install the dependencies. From 4afe47bf4f85aa9e77b4e973d96f987173f6b59d Mon Sep 17 00:00:00 2001 From: George Mandis Date: Sat, 4 Dec 2021 22:57:42 -0800 Subject: [PATCH 3/6] Adding feed to error message for more context --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 9b2545e..c99b1c3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -107,7 +107,7 @@ const processFeed = ( } catch (err) { console.log(`${error("Error processing:")} ${feed} ${benchmark(startTime)}`); - errors.push(err); + errors.push(`Error processing: ${feed} | ${err}`); } // if this is the last feed, go ahead and build the output From 16a2525518c9e5cce500a69a6eec5ded5928e79c Mon Sep 17 00:00:00 2001 From: George Mandis Date: Sun, 5 Dec 2021 13:34:59 -0800 Subject: [PATCH 4/6] Adding title fallback + Bubo version to output + formatting --- src/index.ts | 118 +++++++++++++++++++++++++++++------------------ src/renderer.ts | 33 +++++++------ src/utilities.ts | 46 ++++++++++++------ 3 files changed, 123 insertions(+), 74 deletions(-) diff --git a/src/index.ts b/src/index.ts index c99b1c3..e0e3ecd 100644 --- a/src/index.ts +++ b/src/index.ts @@ -15,13 +15,22 @@ import Parser from "rss-parser"; import { Feeds, FeedItem } from "./@types/bubo"; import { Response } from "node-fetch"; import { render } from "./renderer.js"; -import { getLink, getTitle, getTimestamp, parseFeed, getFeedList } from "./utilities.js"; +import { + getLink, + getTitle, + getTimestamp, + parseFeed, + getFeedList, + getBuboInfo +} from "./utilities.js"; import { writeFile } from "fs/promises"; import chalk from "chalk"; +const buboInfo = await getBuboInfo(); const parser = new Parser(); const feedList = await getFeedList(); -const feedListLength = Object.entries(feedList).flat(2).length - Object.keys(feedList).length; +const feedListLength = + Object.entries(feedList).flat(2).length - Object.keys(feedList).length; /** * contentFromAllFeeds = Contains normalized, aggregated feed data and is passed to template renderer at the end @@ -32,7 +41,8 @@ const errors: unknown[] = []; // benchmarking data + utility const initTime = Date.now(); -const benchmark = (startTime: number) => chalk.cyanBright.bold(`(${(Date.now() - startTime) / 1000} seconds)`); +const benchmark = (startTime: number) => + chalk.cyanBright.bold(`${(Date.now() - startTime) / 1000} seconds`); /** * These values are used to control throttling/batching the fetches: @@ -49,7 +59,6 @@ const success = chalk.bold.green; // to feedListLength and know when we're finished. let completed = 0; - /** * finishBuild * -- @@ -62,12 +71,17 @@ const finishBuild: () => void = async () => { // generate the static HTML output from our template renderer const output = render({ data: contentFromAllFeeds, - errors: errors + errors: errors, + info: buboInfo }); // write the output to public/index.html await writeFile("./public/index.html", output); - console.log(`Finished writing to output. ${benchmark(initTime)}`); + console.log( + `\nFinished writing to output:\n- ${feedListLength} feeds in ${benchmark( + initTime + )}\n- ${errors.length} errors` + ); }; /** @@ -77,43 +91,54 @@ const finishBuild: () => void = async () => { * @param { group, feed, startTime} * @returns Promise */ -const processFeed = ( - { - group, feed, startTime - }: { group: string; feed: string, startTime: number } -) => async (response: Response): Promise => { - const body = await parseFeed(response); - completed++; - // skip to the next one if this didn't work out - if (!body) return; +const processFeed = + ({ + group, + feed, + startTime + }: { + group: string; + feed: string; + startTime: number; + }) => + async (response: Response): Promise => { + const body = await parseFeed(response); + completed++; + // skip to the next one if this didn't work out + if (!body) return; - try { - const contents: FeedItem = - (typeof body === "string" ? (await parser.parseString(body)) : body) as FeedItem; + try { + const contents: FeedItem = ( + typeof body === "string" ? await parser.parseString(body) : body + ) as FeedItem; - contents.feed = feed; - contents.title = getTitle(contents); - contents.link = getLink(contents); + contents.feed = feed; + contents.title = getTitle(contents); + contents.link = getLink(contents); - // try to normalize date attribute naming - contents?.items?.forEach((item) => { - item.timestamp = getTimestamp(item); - item.title = getTitle(item); - item.link = getLink(item); - }); + // try to normalize date attribute naming + contents?.items?.forEach(item => { + item.timestamp = getTimestamp(item); + item.title = getTitle(item); + item.link = getLink(item); + }); - contentFromAllFeeds[group].push(contents as object); - console.log(`${success("Successfully fetched:")} ${feed} ${benchmark(startTime)}`); - - } catch (err) { - console.log(`${error("Error processing:")} ${feed} ${benchmark(startTime)}`); - errors.push(`Error processing: ${feed} | ${err}`); - } - - // if this is the last feed, go ahead and build the output - (completed === feedListLength) && finishBuild(); -}; + contentFromAllFeeds[group].push(contents as object); + console.log( + `${success("Successfully fetched:")} ${feed} - ${benchmark(startTime)}` + ); + } catch (err) { + console.log( + `${error("Error processing:")} ${feed} - ${benchmark( + startTime + )}\n${err}` + ); + errors.push(`Error processing: ${feed}\n\t${err}`); + } + // if this is the last feed, go ahead and build the output + completed === feedListLength && finishBuild(); + }; // go through each group of feeds and process const processFeeds = () => { @@ -127,17 +152,18 @@ const processFeeds = () => { setTimeout(() => { console.log(`Fetching: ${feed}...`); - fetch(feed).then(processFeed({ group, feed, startTime })).catch(err => { - console.log(error(`Error fetching ${feed} ${benchmark(startTime)}`)); - errors.push(`Error fetching ${feed} ${err.toString()}`); - }); - + fetch(feed) + .then(processFeed({ group, feed, startTime })) + .catch(err => { + console.log( + error(`Error fetching ${feed} ${benchmark(startTime)}`) + ); + errors.push(`Error fetching ${feed} ${err.toString()}`); + }); }, (idx % (feedListLength / MAX_CONNECTIONS)) * DELAY_MS); idx++; } - } }; - -processFeeds(); \ No newline at end of file +processFeeds(); diff --git a/src/renderer.ts b/src/renderer.ts index d0eb910..2e5a00d 100644 --- a/src/renderer.ts +++ b/src/renderer.ts @@ -1,13 +1,13 @@ /* -* Return our renderer. -* Using Nunjucks out of the box. -* https://mozilla.github.io/nunjucks/ -*/ + * Return our renderer. + * Using Nunjucks out of the box. + * https://mozilla.github.io/nunjucks/ + */ import nunjucks from "nunjucks"; const env: nunjucks.Environment = nunjucks.configure({ autoescape: true }); import { readFile } from "fs/promises"; -import { Feeds } from "./@types/bubo"; +import { Feeds, JSONValue } from "./@types/bubo"; /** * Global filters for my Nunjucks templates @@ -17,21 +17,28 @@ env.addFilter("formatDate", function (dateString): string { return !isNaN(date.getTime()) ? date.toLocaleDateString() : dateString; }); -env.addGlobal("now", (new Date()).toUTCString()); +env.addGlobal("now", new Date().toUTCString()); // load the template -const template: string = - (await readFile( - new URL("../config/template.html", import.meta.url) - )).toString(); +const template: string = ( + await readFile(new URL("../config/template.html", import.meta.url)) +).toString(); // generate the static HTML output from our template renderer -const render = ({ data, errors }: { data: Feeds; errors: unknown[] }) => { +const render = ({ + data, + errors, + info +}: { + data: Feeds; + errors: unknown[]; + info?: JSONValue; +}) => { return env.renderString(template, { data, - errors + errors, + info }); }; - export { render }; diff --git a/src/utilities.ts b/src/utilities.ts index b64a35d..75f4339 100644 --- a/src/utilities.ts +++ b/src/utilities.ts @@ -1,5 +1,5 @@ /* - There's a little inconcistency with how feeds report certain things like + There's a little inconsistency with how feeds report certain things like title, links and timestamps. These helpers try to normalize that bit and provide an order-of-operations list of properties to look for. @@ -13,27 +13,37 @@ import { FeedItem, JSONValue } from "./@types/bubo"; export const getLink = (obj: FeedItem): string => { const link_values: string[] = ["link", "url", "guid", "home_page_url"]; const keys: string[] = Object.keys(obj); - const link_property: string | undefined = link_values.find(link_value => keys.includes(link_value)); - return link_property ? obj[link_property] as string : ""; + const link_property: string | undefined = link_values.find(link_value => + keys.includes(link_value) + ); + return link_property ? (obj[link_property] as string) : ""; }; - -// fallback to URL for the title if not present (coupled to my template) +// fallback to URL for the title if not present +// (title -> url -> link) export const getTitle = (obj: FeedItem): string => { - const title_values: string[] = ["title", "url", "link"]; // fallback to url/link as title if omitted + const title_values: string[] = ["title", "url", "link"]; const keys: string[] = Object.keys(obj); - const title_property: string | undefined = title_values.find(title_value => keys.includes(title_value)); - return title_property ? obj[title_property] as string : ""; + + // if title is empty for some reason, fall back on url or link + const title_property: string | undefined = title_values.find( + title_value => keys.includes(title_value) && obj[title_value] + ); + return title_property ? (obj[title_property] as string) : ""; }; // More dependable way to get timestamps export const getTimestamp = (obj: FeedItem): string => { - const dateString: string = (obj.pubDate || obj.isoDate || obj.date || obj.date_published).toString(); + const dateString: string = ( + obj.pubDate || + obj.isoDate || + obj.date || + obj.date_published + ).toString(); const timestamp: number = new Date(dateString).getTime(); return isNaN(timestamp) ? dateString : timestamp.toString(); }; - // parse RSS/XML or JSON feeds export async function parseFeed(response: Response): Promise { const contentType = response.headers.get("content-type")?.split(";")[0]; @@ -56,19 +66,25 @@ export async function parseFeed(response: Response): Promise { const jsonFeed = [contentType] .map(item => - ["application/json", "application/feed+json"].includes(item) ? response.json() as Promise : false + ["application/json", "application/feed+json"].includes(item) + ? (response.json() as Promise) + : false ) .filter(_ => _)[0]; return (rssFeed && rssFeed) || (jsonFeed && jsonFeed) || {}; } - export const getFeedList = async (): Promise => { return JSON.parse( - (await readFile( - new URL("../config/feeds.json", import.meta.url) - )).toString() + ( + await readFile(new URL("../config/feeds.json", import.meta.url)) + ).toString() ); }; +export const getBuboInfo = async (): Promise => { + return JSON.parse( + (await readFile(new URL("../package.json", import.meta.url))).toString() + ); +}; From 11a4042bdf95f8853ad37c4ce6867424317b0901 Mon Sep 17 00:00:00 2001 From: George Mandis Date: Sun, 5 Dec 2021 13:35:10 -0800 Subject: [PATCH 5/6] Updating default template adding Bubo version --- config/template.html | 94 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/config/template.html b/config/template.html index d1c9732..ab3b100 100644 --- a/config/template.html +++ b/config/template.html @@ -1,56 +1,56 @@ - - - - - 🦉 Bubo Reader - - - + + + + + 🦉 Bubo Reader + + + +

🦉 Bubo Reader

-

🦉 Bubo Reader

- - {% for group, feeds in data %} -

{{ group }}

- {% for feed in feeds %} -
- - {{ feed.title }} - ({{ feed.feed }}) - -
    - {% for item in feed.items %} -
  • - {{ item.timestamp | formatDate }} - {{ item.title }} -
    • - {% endfor %} -
-
- {% endfor %} - {% endfor %} - - {% if errors | length > 0 %} + {% for group, feeds in data %} +

{{ group }}

+ {% for feed in feeds %} +
+ + {{ feed.title }} + ({{ feed.feed }}) + +
    + {% for item in feed.items %} +
  • + {{ item.timestamp | formatDate }} - + {{ item.title }} +
    • + {% endfor %} +
+
+ {% endfor %} {% endfor %} {% if errors | length > 0 %}

Errors

There were errors trying to parse these feeds:

    - {% for error in errors %} + {% for error in errors %}
  • {{ error }}
    • - {% endfor %} + {% endfor %}
- {% endif %} + {% endif %} -
-
-

- Last updated {{ now }}. -

-

- Powered by Bubo Reader (2.0.0), a project by George Mandis. -

-

- ❤️ Sponsor on GitHub -

- - - \ No newline at end of file +
+
+

Last updated {{ now }}.

+

+ Powered by + Bubo Reader (v{{ info.version }}), a project by George Mandis. ❤️ + Sponsor on GitHub +

+ + From bbab21c0caef5173697b93f2394971afc38d3235 Mon Sep 17 00:00:00 2001 From: George Mandis Date: Sun, 5 Dec 2021 13:35:24 -0800 Subject: [PATCH 6/6] Version bumpb, license update, added info --- package-lock.json | 6 +++--- package.json | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ba4603..07a9666 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "name": "bubo-reader", - "version": "1.0.3", + "version": "2.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bubo-reader", - "version": "1.0.3", - "license": "ISC", + "version": "2.0.1", + "license": "MIT", "dependencies": { "chalk": "^5.0.0", "node-fetch": "^3.1.0", diff --git a/package.json b/package.json index 6a0cfbb..5d1ca23 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,8 @@ { "name": "bubo-reader", - "version": "2.0.0", + "version": "2.0.1", "description": "A simple but effective feed reader (RSS, JSON)", + "homepage": "https://github.com/georgemandis/bubo-rss", "main": "src/index.js", "type": "module", "scripts": { @@ -20,7 +21,11 @@ "type": "github", "url": "https://github.com/sponsors/georgemandis" }, - "license": "ISC", + "bugs": { + "url": "https://github.com/georgemandis/bubo-rss/issues", + "email": "george+bubo@mand.is" + }, + "license": "MIT", "dependencies": { "chalk": "^5.0.0", "node-fetch": "^3.1.0", @@ -37,4 +42,4 @@ "tslib": "^2.3.1", "typescript": "^4.5.2" } -} +} \ No newline at end of file