feedscout 1.6.2 → 1.7.1

package/dist/common/utils.cjs

@@ -1,5 +1,6 @@
 const require_locales = require("./locales.cjs");
 //#region src/common/utils.ts
+const whitespaceRegex = /\s+/;
 const composeHint = (key) => ({
 	key,
 	label: require_locales.hints[key]
@@ -30,7 +31,7 @@ const isAnyOf = (value, patterns, parser) => {
 	return patterns.some((pattern) => parsedValue === pattern.toLowerCase().trim());
 };
 const anyWordMatchesAnyOf = (value, patterns) => {
-	return value.toLowerCase().split(/\s+/).some((word) => isAnyOf(word, patterns));
+	return value.toLowerCase().split(whitespaceRegex).some((word) => isAnyOf(word, patterns));
 };
 const endsWithAnyOf = (value, patterns) => {
 	const lowerValue = value.toLowerCase();
@@ -41,13 +42,22 @@ const isOfAllowedMimeType = (type, allowedTypes) => {
 	if (!type) return false;
 	return isAnyOf(type, allowedTypes, normalizeMimeType);
 };
+const hasMetaContent = (content, name, value) => {
+	const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	const escapedValue = value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	return new RegExp(`<meta(?=[^>]*(?:name|property)=["']${escapedName}["'])(?=[^>]*content=["']${escapedValue})`, "i").test(content);
+};
 const omitEmpty = (array) => {
 	const result = [];
 	for (const item of array) if (item != null && item !== "") result.push(item);
 	return result;
 };
-const normalizeUrl = (url, baseUrl) => {
-	return baseUrl ? new URL(url, baseUrl).href : url;
+const resolveUrl = (url, baseUrl) => {
+	try {
+		return new URL(url, baseUrl).href;
+	} catch {
+		return;
+	}
 };
 const matchesAnyOfLinkSelectors = (rel, type, selectors) => {
 	return selectors.some((selector) => {
@@ -76,11 +86,12 @@ const processConcurrently = async (items, processFn, options) => {
 exports.anyWordMatchesAnyOf = anyWordMatchesAnyOf;
 exports.composeHint = composeHint;
 exports.endsWithAnyOf = endsWithAnyOf;
+exports.hasMetaContent = hasMetaContent;
 exports.includesAnyOf = includesAnyOf;
 exports.isAnyOf = isAnyOf;
 exports.isHostOf = isHostOf;
 exports.isSubdomainOf = isSubdomainOf;
 exports.matchesAnyOfLinkSelectors = matchesAnyOfLinkSelectors;
-exports.normalizeUrl = normalizeUrl;
 exports.omitEmpty = omitEmpty;
 exports.processConcurrently = processConcurrently;
+exports.resolveUrl = resolveUrl;

package/dist/common/utils.js

@@ -1,5 +1,6 @@
 import { hints } from "./locales.js";
 //#region src/common/utils.ts
+const whitespaceRegex = /\s+/;
 const composeHint = (key) => ({
 	key,
 	label: hints[key]
@@ -30,7 +31,7 @@ const isAnyOf = (value, patterns, parser) => {
 	return patterns.some((pattern) => parsedValue === pattern.toLowerCase().trim());
 };
 const anyWordMatchesAnyOf = (value, patterns) => {
-	return value.toLowerCase().split(/\s+/).some((word) => isAnyOf(word, patterns));
+	return value.toLowerCase().split(whitespaceRegex).some((word) => isAnyOf(word, patterns));
 };
 const endsWithAnyOf = (value, patterns) => {
 	const lowerValue = value.toLowerCase();
@@ -41,13 +42,22 @@ const isOfAllowedMimeType = (type, allowedTypes) => {
 	if (!type) return false;
 	return isAnyOf(type, allowedTypes, normalizeMimeType);
 };
+const hasMetaContent = (content, name, value) => {
+	const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	const escapedValue = value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+	return new RegExp(`<meta(?=[^>]*(?:name|property)=["']${escapedName}["'])(?=[^>]*content=["']${escapedValue})`, "i").test(content);
+};
 const omitEmpty = (array) => {
 	const result = [];
 	for (const item of array) if (item != null && item !== "") result.push(item);
 	return result;
 };
-const normalizeUrl = (url, baseUrl) => {
-	return baseUrl ? new URL(url, baseUrl).href : url;
+const resolveUrl = (url, baseUrl) => {
+	try {
+		return new URL(url, baseUrl).href;
+	} catch {
+		return;
+	}
 };
 const matchesAnyOfLinkSelectors = (rel, type, selectors) => {
 	return selectors.some((selector) => {
@@ -73,4 +83,4 @@ const processConcurrently = async (items, processFn, options) => {
 	}
 };
 //#endregion
-export { anyWordMatchesAnyOf, composeHint, endsWithAnyOf, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf, matchesAnyOfLinkSelectors, normalizeUrl, omitEmpty, processConcurrently };
+export { anyWordMatchesAnyOf, composeHint, endsWithAnyOf, hasMetaContent, includesAnyOf, isAnyOf, isHostOf, isSubdomainOf, matchesAnyOfLinkSelectors, omitEmpty, processConcurrently, resolveUrl };

package/dist/favicons/extractors.cjs

@@ -1,11 +1,23 @@
 //#region src/favicons/extractors.ts
-const defaultExtractor = async ({ url, status }) => {
-	if (status !== void 0 && status >= 200 && status < 400) return {
-		url,
+const isImageContentType = (headers) => {
+	return headers?.get("content-type")?.startsWith("image/") ?? false;
+};
+const isImageContent = (content) => {
+	if (content.includes("<html")) return false;
+	const trimmed = content.trimStart();
+	const head = trimmed.slice(0, 200);
+	return trimmed.startsWith("<svg") || trimmed.startsWith("<?xml") && head.includes("<svg") || content.slice(1, 4) === "PNG" || content.startsWith("GIF8") || content.startsWith("RIFF") && content.includes("WEBP");
+};
+const isSuccessStatus = (status) => {
+	return status !== void 0 && status >= 200 && status < 400;
+};
+const defaultExtractor = (input) => {
+	if (isImageContentType(input.headers) || isImageContent(input.content) || isSuccessStatus(input.status)) return {
+		url: input.url,
 		isValid: true
 	};
 	return {
-		url,
+		url: input.url,
 		isValid: false
 	};
 };

package/dist/favicons/extractors.js

@@ -1,11 +1,23 @@
 //#region src/favicons/extractors.ts
-const defaultExtractor = async ({ url, status }) => {
-	if (status !== void 0 && status >= 200 && status < 400) return {
-		url,
+const isImageContentType = (headers) => {
+	return headers?.get("content-type")?.startsWith("image/") ?? false;
+};
+const isImageContent = (content) => {
+	if (content.includes("<html")) return false;
+	const trimmed = content.trimStart();
+	const head = trimmed.slice(0, 200);
+	return trimmed.startsWith("<svg") || trimmed.startsWith("<?xml") && head.includes("<svg") || content.slice(1, 4) === "PNG" || content.startsWith("GIF8") || content.startsWith("RIFF") && content.includes("WEBP");
+};
+const isSuccessStatus = (status) => {
+	return status !== void 0 && status >= 200 && status < 400;
+};
+const defaultExtractor = (input) => {
+	if (isImageContentType(input.headers) || isImageContent(input.content) || isSuccessStatus(input.status)) return {
+		url: input.url,
 		isValid: true
 	};
 	return {
-		url,
+		url: input.url,
 		isValid: false
 	};
 };

package/dist/favicons/index.cjs

@@ -4,7 +4,7 @@ const require_index = require("../common/discover/index.cjs");
 const require_defaults = require("./defaults.cjs");
 const require_extractors = require("./extractors.cjs");
 //#region src/favicons/index.ts
-const discoverFavicons = async (input, options = {}) => {
+const discoverFavicons = (input, options = {}) => {
 	return require_index.discover(input, {
 		...options,
 		methods: options.methods ?? [
@@ -16,7 +16,8 @@ const discoverFavicons = async (input, options = {}) => {
 		],
 		fetchFn: options.fetchFn ?? require_utils$1.defaultFetchFn,
 		extractFn: options.extractFn ?? require_extractors.defaultExtractor,
-		normalizeUrlFn: options.normalizeUrlFn ?? require_utils.normalizeUrl
+		resolveUrlFn: options.resolveUrlFn ?? require_utils.resolveUrl,
+		resolveSiteUrlFn: options.resolveSiteUrlFn ?? require_utils$1.defaultResolveSiteUrlFn
 	}, {
 		platform: require_defaults.defaultPlatformOptions,
 		feed: require_defaults.defaultFeedOptions,

package/dist/favicons/index.js

@@ -1,10 +1,10 @@
-import { normalizeUrl } from "../common/utils.js";
-import { defaultFetchFn } from "../common/discover/utils.js";
+import { resolveUrl } from "../common/utils.js";
+import { defaultFetchFn, defaultResolveSiteUrlFn } from "../common/discover/utils.js";
 import { discover } from "../common/discover/index.js";
 import { defaultFeedOptions, defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions } from "./defaults.js";
 import { defaultExtractor } from "./extractors.js";
 //#region src/favicons/index.ts
-const discoverFavicons = async (input, options = {}) => {
+const discoverFavicons = (input, options = {}) => {
 	return discover(input, {
 		...options,
 		methods: options.methods ?? [
@@ -16,7 +16,8 @@ const discoverFavicons = async (input, options = {}) => {
 		],
 		fetchFn: options.fetchFn ?? defaultFetchFn,
 		extractFn: options.extractFn ?? defaultExtractor,
-		normalizeUrlFn: options.normalizeUrlFn ?? normalizeUrl
+		resolveUrlFn: options.resolveUrlFn ?? resolveUrl,
+		resolveSiteUrlFn: options.resolveSiteUrlFn ?? defaultResolveSiteUrlFn
 	}, {
 		platform: defaultPlatformOptions,
 		feed: defaultFeedOptions,

package/dist/favicons/platform/handlers/bluesky.cjs

@@ -1,4 +1,5 @@
 const require_utils = require("../../../common/utils.cjs");
+const require_utils$1 = require("../../utils.cjs");
 //#region src/favicons/platform/handlers/bluesky.ts
 const hosts = ["bsky.app", "www.bsky.app"];
 const isProfilePath = (pathname) => {
@@ -16,9 +17,8 @@ const blueskyHandler = {
 		if (!fetchFn) return [];
 		try {
 			const { pathname } = new URL(url);
-			const response = await fetchFn(`https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=${pathname.split("/").filter(Boolean)[1]}`);
-			const data = JSON.parse(typeof response.body === "string" ? response.body : "");
-			if (typeof data.avatar === "string" && data.avatar.length > 0) return [{ uri: data.avatar }];
+			const data = require_utils$1.parseBodyJson((await fetchFn(`https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=${pathname.split("/").filter(Boolean)[1]}`)).body);
+			if (require_utils$1.isNonEmptyString(data.avatar)) return [{ uri: data.avatar }];
 		} catch {}
 		return [];
 	}

package/dist/favicons/platform/handlers/bluesky.js

@@ -1,4 +1,5 @@
 import { isHostOf } from "../../../common/utils.js";
+import { isNonEmptyString, parseBodyJson } from "../../utils.js";
 //#region src/favicons/platform/handlers/bluesky.ts
 const hosts = ["bsky.app", "www.bsky.app"];
 const isProfilePath = (pathname) => {
@@ -16,9 +17,8 @@ const blueskyHandler = {
 		if (!fetchFn) return [];
 		try {
 			const { pathname } = new URL(url);
-			const response = await fetchFn(`https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=${pathname.split("/").filter(Boolean)[1]}`);
-			const data = JSON.parse(typeof response.body === "string" ? response.body : "");
-			if (typeof data.avatar === "string" && data.avatar.length > 0) return [{ uri: data.avatar }];
+			const data = parseBodyJson((await fetchFn(`https://public.api.bsky.app/xrpc/app.bsky.actor.getProfile?actor=${pathname.split("/").filter(Boolean)[1]}`)).body);
+			if (isNonEmptyString(data.avatar)) return [{ uri: data.avatar }];
 		} catch {}
 		return [];
 	}

package/dist/favicons/platform/handlers/mastodon.cjs

@@ -1,13 +1,16 @@
+const require_utils = require("../../../common/utils.cjs");
+const require_utils$1 = require("../../utils.cjs");
 //#region src/favicons/platform/handlers/mastodon.ts
+const mastodonRegex = /mastodon/i;
 const isProfilePath = (pathname) => {
 	const segments = pathname.split("/").filter(Boolean);
 	return segments.length === 1 && segments[0].startsWith("@");
 };
 const isMastodonHtml = (content) => {
-	return /<meta[^>]+name=["']generator["'][^>]+content=["']Mastodon/i.test(content);
+	return require_utils.hasMetaContent(content, "generator", "Mastodon");
 };
 const isMastodonHeaders = (headers) => {
-	return /mastodon/i.test(headers.get("server") ?? "");
+	return mastodonRegex.test(headers.get("server") ?? "");
 };
 const mastodonHandler = {
 	match: (url, content, headers) => {
@@ -23,9 +26,8 @@ const mastodonHandler = {
 		if (!fetchFn) return [];
 		try {
 			const { hostname, pathname } = new URL(url);
-			const response = await fetchFn(`https://${hostname}/api/v1/accounts/lookup?acct=${pathname.split("/").filter(Boolean)[0].replace("@", "")}`);
-			const data = JSON.parse(typeof response.body === "string" ? response.body : "");
-			if (typeof data.avatar === "string" && data.avatar.length > 0) return [{ uri: data.avatar }];
+			const data = require_utils$1.parseBodyJson((await fetchFn(`https://${hostname}/api/v1/accounts/lookup?acct=${pathname.split("/").filter(Boolean)[0].replace("@", "")}`)).body);
+			if (require_utils$1.isNonEmptyString(data.avatar)) return [{ uri: data.avatar }];
 		} catch {}
 		return [];
 	}

package/dist/favicons/platform/handlers/mastodon.js

@@ -1,13 +1,16 @@
+import { hasMetaContent } from "../../../common/utils.js";
+import { isNonEmptyString, parseBodyJson } from "../../utils.js";
 //#region src/favicons/platform/handlers/mastodon.ts
+const mastodonRegex = /mastodon/i;
 const isProfilePath = (pathname) => {
 	const segments = pathname.split("/").filter(Boolean);
 	return segments.length === 1 && segments[0].startsWith("@");
 };
 const isMastodonHtml = (content) => {
-	return /<meta[^>]+name=["']generator["'][^>]+content=["']Mastodon/i.test(content);
+	return hasMetaContent(content, "generator", "Mastodon");
 };
 const isMastodonHeaders = (headers) => {
-	return /mastodon/i.test(headers.get("server") ?? "");
+	return mastodonRegex.test(headers.get("server") ?? "");
 };
 const mastodonHandler = {
 	match: (url, content, headers) => {
@@ -23,9 +26,8 @@ const mastodonHandler = {
 		if (!fetchFn) return [];
 		try {
 			const { hostname, pathname } = new URL(url);
-			const response = await fetchFn(`https://${hostname}/api/v1/accounts/lookup?acct=${pathname.split("/").filter(Boolean)[0].replace("@", "")}`);
-			const data = JSON.parse(typeof response.body === "string" ? response.body : "");
-			if (typeof data.avatar === "string" && data.avatar.length > 0) return [{ uri: data.avatar }];
+			const data = parseBodyJson((await fetchFn(`https://${hostname}/api/v1/accounts/lookup?acct=${pathname.split("/").filter(Boolean)[0].replace("@", "")}`)).body);
+			if (isNonEmptyString(data.avatar)) return [{ uri: data.avatar }];
 		} catch {}
 		return [];
 	}

package/dist/favicons/platform/handlers/reddit.cjs

@@ -1,4 +1,5 @@
 const require_utils = require("../../../common/utils.cjs");
+const require_utils$1 = require("../../utils.cjs");
 const require_reddit = require("../../../feeds/platform/handlers/reddit.cjs");
 //#region src/favicons/platform/handlers/reddit.ts
 const isSubredditPath = (pathname) => {
@@ -22,16 +23,14 @@ const redditHandler = {
 		try {
 			const { pathname } = new URL(url);
 			if (isSubredditPath(pathname)) {
-				const response = await fetchFn(`https://www.reddit.com/r/${pathname.split("/").filter(Boolean)[1]}/about.json`);
-				const data = JSON.parse(typeof response.body === "string" ? response.body : "");
+				const data = require_utils$1.parseBodyJson((await fetchFn(`https://www.reddit.com/r/${pathname.split("/").filter(Boolean)[1]}/about.json`)).body);
 				const icon = data?.data?.community_icon?.split("?")[0] || data?.data?.icon_img;
-				if (typeof icon === "string" && icon.length > 0) return [{ uri: icon }];
+				if (require_utils$1.isNonEmptyString(icon)) return [{ uri: icon }];
 			}
 			if (isUserPath(pathname)) {
-				const response = await fetchFn(`https://www.reddit.com/user/${pathname.split("/").filter(Boolean)[1]}/about.json`);
-				const data = JSON.parse(typeof response.body === "string" ? response.body : "");
+				const data = require_utils$1.parseBodyJson((await fetchFn(`https://www.reddit.com/user/${pathname.split("/").filter(Boolean)[1]}/about.json`)).body);
 				const icon = data?.data?.icon_img || data?.data?.snoovatar_img;
-				if (typeof icon === "string" && icon.length > 0) return [{ uri: icon }];
+				if (require_utils$1.isNonEmptyString(icon)) return [{ uri: icon }];
 			}
 		} catch {}
 		return [];

package/dist/favicons/platform/handlers/reddit.js

@@ -1,4 +1,5 @@
 import { isHostOf } from "../../../common/utils.js";
+import { isNonEmptyString, parseBodyJson } from "../../utils.js";
 import { hosts } from "../../../feeds/platform/handlers/reddit.js";
 //#region src/favicons/platform/handlers/reddit.ts
 const isSubredditPath = (pathname) => {
@@ -22,16 +23,14 @@ const redditHandler = {
 		try {
 			const { pathname } = new URL(url);
 			if (isSubredditPath(pathname)) {
-				const response = await fetchFn(`https://www.reddit.com/r/${pathname.split("/").filter(Boolean)[1]}/about.json`);
-				const data = JSON.parse(typeof response.body === "string" ? response.body : "");
+				const data = parseBodyJson((await fetchFn(`https://www.reddit.com/r/${pathname.split("/").filter(Boolean)[1]}/about.json`)).body);
 				const icon = data?.data?.community_icon?.split("?")[0] || data?.data?.icon_img;
-				if (typeof icon === "string" && icon.length > 0) return [{ uri: icon }];
+				if (isNonEmptyString(icon)) return [{ uri: icon }];
 			}
 			if (isUserPath(pathname)) {
-				const response = await fetchFn(`https://www.reddit.com/user/${pathname.split("/").filter(Boolean)[1]}/about.json`);
-				const data = JSON.parse(typeof response.body === "string" ? response.body : "");
+				const data = parseBodyJson((await fetchFn(`https://www.reddit.com/user/${pathname.split("/").filter(Boolean)[1]}/about.json`)).body);
 				const icon = data?.data?.icon_img || data?.data?.snoovatar_img;
-				if (typeof icon === "string" && icon.length > 0) return [{ uri: icon }];
+				if (isNonEmptyString(icon)) return [{ uri: icon }];
 			}
 		} catch {}
 		return [];

package/dist/favicons/utils.cjs

@@ -0,0 +1,10 @@
+//#region src/favicons/utils.ts
+const parseBodyJson = (body) => {
+	return JSON.parse(typeof body === "string" ? body : "");
+};
+const isNonEmptyString = (value) => {
+	return typeof value === "string" && value.length > 0;
+};
+//#endregion
+exports.isNonEmptyString = isNonEmptyString;
+exports.parseBodyJson = parseBodyJson;

package/dist/favicons/utils.js

@@ -0,0 +1,9 @@
+//#region src/favicons/utils.ts
+const parseBodyJson = (body) => {
+	return JSON.parse(typeof body === "string" ? body : "");
+};
+const isNonEmptyString = (value) => {
+	return typeof value === "string" && value.length > 0;
+};
+//#endregion
+export { isNonEmptyString, parseBodyJson };

package/dist/feeds/defaults.cjs

@@ -19,6 +19,7 @@ const require_hashnode = require("./platform/handlers/hashnode.cjs");
 const require_hatenablog = require("./platform/handlers/hatenablog.cjs");
 const require_itchio = require("./platform/handlers/itchio.cjs");
 const require_kickstarter = require("./platform/handlers/kickstarter.cjs");
+const require_lemmy = require("./platform/handlers/lemmy.cjs");
 const require_letterboxd = require("./platform/handlers/letterboxd.cjs");
 const require_mastodon = require("./platform/handlers/mastodon.cjs");
 const require_medium = require("./platform/handlers/medium.cjs");
@@ -139,6 +140,7 @@ const defaultPlatformOptions = { handlers: [
 	require_gitlab.gitlabHandler,
 	require_itchio.itchioHandler,
 	require_kickstarter.kickstarterHandler,
+	require_lemmy.lemmyHandler,
 	require_letterboxd.letterboxdHandler,
 	require_lobsters.lobstersHandler,
 	require_mastodon.mastodonHandler,

package/dist/feeds/defaults.js

@@ -19,6 +19,7 @@ import { hashnodeHandler } from "./platform/handlers/hashnode.js";
 import { hatenablogHandler } from "./platform/handlers/hatenablog.js";
 import { itchioHandler } from "./platform/handlers/itchio.js";
 import { kickstarterHandler } from "./platform/handlers/kickstarter.js";
+import { lemmyHandler } from "./platform/handlers/lemmy.js";
 import { letterboxdHandler } from "./platform/handlers/letterboxd.js";
 import { mastodonHandler } from "./platform/handlers/mastodon.js";
 import { mediumHandler } from "./platform/handlers/medium.js";
@@ -139,6 +140,7 @@ const defaultPlatformOptions = { handlers: [
 	gitlabHandler,
 	itchioHandler,
 	kickstarterHandler,
+	lemmyHandler,
 	letterboxdHandler,
 	lobstersHandler,
 	mastodonHandler,

package/dist/feeds/extractors.cjs

@@ -1,22 +1,24 @@
+const require_utils = require("../common/utils.cjs");
+const require_utils$1 = require("../common/discover/utils.cjs");
 let feedsmith = require("feedsmith");
 //#region src/feeds/extractors.ts
-const getLinkOfType = (links, rel) => {
-	return links?.find((link) => link.rel === rel);
-};
-const defaultExtractor = async ({ content, url }) => {
+const defaultExtractor = ({ content, url }) => {
 	if (!content) return {
 		url,
 		isValid: false
 	};
 	try {
-		const { format, feed } = (0, feedsmith.parseFeed)(content);
+		const parsed = (0, feedsmith.parseFeed)(content);
+		const { format, feed } = parsed;
+		const rawSiteUrl = require_utils$1.getFeedSiteUrl(parsed);
+		const siteUrl = rawSiteUrl ? require_utils.resolveUrl(rawSiteUrl, url) : void 0;
 		if (format === "rss" || format === "rdf") return {
 			url,
 			isValid: true,
 			format,
 			title: feed.title,
 			description: feed.description,
-			siteUrl: getLinkOfType(feed.atom?.links, "alternate")?.href || feed.link
+			siteUrl
 		};
 		if (format === "atom") return {
 			url,
@@ -24,7 +26,7 @@ const defaultExtractor = async ({ content, url }) => {
 			format,
 			title: feed.title,
 			description: feed.subtitle,
-			siteUrl: getLinkOfType(feed.links, "alternate")?.href
+			siteUrl
 		};
 		if (format === "json") return {
 			url,
@@ -32,7 +34,7 @@ const defaultExtractor = async ({ content, url }) => {
 			format,
 			title: feed.title,
 			description: feed.description,
-			siteUrl: feed.home_page_url
+			siteUrl
 		};
 	} catch {}
 	return {

package/dist/feeds/extractors.js

@@ -1,22 +1,24 @@
+import { resolveUrl } from "../common/utils.js";
+import { getFeedSiteUrl } from "../common/discover/utils.js";
 import { parseFeed } from "feedsmith";
 //#region src/feeds/extractors.ts
-const getLinkOfType = (links, rel) => {
-	return links?.find((link) => link.rel === rel);
-};
-const defaultExtractor = async ({ content, url }) => {
+const defaultExtractor = ({ content, url }) => {
 	if (!content) return {
 		url,
 		isValid: false
 	};
 	try {
-		const { format, feed } = parseFeed(content);
+		const parsed = parseFeed(content);
+		const { format, feed } = parsed;
+		const rawSiteUrl = getFeedSiteUrl(parsed);
+		const siteUrl = rawSiteUrl ? resolveUrl(rawSiteUrl, url) : void 0;
 		if (format === "rss" || format === "rdf") return {
 			url,
 			isValid: true,
 			format,
 			title: feed.title,
 			description: feed.description,
-			siteUrl: getLinkOfType(feed.atom?.links, "alternate")?.href || feed.link
+			siteUrl
 		};
 		if (format === "atom") return {
 			url,
@@ -24,7 +26,7 @@ const defaultExtractor = async ({ content, url }) => {
 			format,
 			title: feed.title,
 			description: feed.subtitle,
-			siteUrl: getLinkOfType(feed.links, "alternate")?.href
+			siteUrl
 		};
 		if (format === "json") return {
 			url,
@@ -32,7 +34,7 @@ const defaultExtractor = async ({ content, url }) => {
 			format,
 			title: feed.title,
 			description: feed.description,
-			siteUrl: feed.home_page_url
+			siteUrl
 		};
 	} catch {}
 	return {

package/dist/feeds/index.cjs

@@ -4,7 +4,7 @@ const require_index = require("../common/discover/index.cjs");
 const require_defaults = require("./defaults.cjs");
 const require_extractors = require("./extractors.cjs");
 //#region src/feeds/index.ts
-const discoverFeeds = async (input, options = {}) => {
+const discoverFeeds = (input, options = {}) => {
 	return require_index.discover(input, {
 		...options,
 		methods: options.methods ?? [
@@ -15,7 +15,7 @@ const discoverFeeds = async (input, options = {}) => {
 		],
 		fetchFn: options.fetchFn ?? require_utils$1.defaultFetchFn,
 		extractFn: options.extractFn ?? require_extractors.defaultExtractor,
-		normalizeUrlFn: options.normalizeUrlFn ?? require_utils.normalizeUrl
+		resolveUrlFn: options.resolveUrlFn ?? require_utils.resolveUrl
 	}, {
 		platform: require_defaults.defaultPlatformOptions,
 		html: require_defaults.defaultHtmlOptions,

package/dist/feeds/index.js

@@ -1,10 +1,10 @@
-import { normalizeUrl } from "../common/utils.js";
+import { resolveUrl } from "../common/utils.js";
 import { defaultFetchFn } from "../common/discover/utils.js";
 import { discover } from "../common/discover/index.js";
 import { defaultGuessOptions, defaultHeadersOptions, defaultHtmlOptions, defaultPlatformOptions } from "./defaults.js";
 import { defaultExtractor } from "./extractors.js";
 //#region src/feeds/index.ts
-const discoverFeeds = async (input, options = {}) => {
+const discoverFeeds = (input, options = {}) => {
 	return discover(input, {
 		...options,
 		methods: options.methods ?? [
@@ -15,7 +15,7 @@ const discoverFeeds = async (input, options = {}) => {
 		],
 		fetchFn: options.fetchFn ?? defaultFetchFn,
 		extractFn: options.extractFn ?? defaultExtractor,
-		normalizeUrlFn: options.normalizeUrlFn ?? normalizeUrl
+		resolveUrlFn: options.resolveUrlFn ?? resolveUrl
 	}, {
 		platform: defaultPlatformOptions,
 		html: defaultHtmlOptions,

package/dist/feeds/platform/handlers/blogspot.cjs

@@ -1,6 +1,7 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/blogspot.ts
 const blogspotDomainRegex = /^.+\.blogspot\.(?:com|co\.[a-z]{2}|com\.[a-z]{2}|[a-z]{2,3})$/;
+const labelRegex = /^\/search\/label\/([^/]+)/;
 const blogspotHandler = {
 	match: (url) => {
 		try {
@@ -12,7 +13,7 @@ const blogspotHandler = {
 	resolve: (url) => {
 		const { origin, pathname } = new URL(url);
 		const uris = [];
-		const labelMatch = pathname.match(/^\/search\/label\/([^/]+)/);
+		const labelMatch = pathname.match(labelRegex);
 		if (labelMatch?.[1]) {
 			const label = labelMatch[1];
 			uris.push({

package/dist/feeds/platform/handlers/blogspot.js

@@ -1,6 +1,7 @@
 import { composeHint } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/blogspot.ts
 const blogspotDomainRegex = /^.+\.blogspot\.(?:com|co\.[a-z]{2}|com\.[a-z]{2}|[a-z]{2,3})$/;
+const labelRegex = /^\/search\/label\/([^/]+)/;
 const blogspotHandler = {
 	match: (url) => {
 		try {
@@ -12,7 +13,7 @@ const blogspotHandler = {
 	resolve: (url) => {
 		const { origin, pathname } = new URL(url);
 		const uris = [];
-		const labelMatch = pathname.match(/^\/search\/label\/([^/]+)/);
+		const labelMatch = pathname.match(labelRegex);
 		if (labelMatch?.[1]) {
 			const label = labelMatch[1];
 			uris.push({

package/dist/feeds/platform/handlers/bluesky.cjs

@@ -1,5 +1,6 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/bluesky.ts
+const profileRegex = /^\/profile\/([^/]+)/;
 const hosts = ["bsky.app", "www.bsky.app"];
 const blueskyHandler = {
 	match: (url) => {
@@ -7,7 +8,7 @@ const blueskyHandler = {
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const handle = pathname.match(/^\/profile\/([^/]+)/)?.[1];
+		const handle = pathname.match(profileRegex)?.[1];
 		if (!handle) return [];
 		return [{
 			uri: `https://bsky.app/profile/${handle}/rss`,

package/dist/feeds/platform/handlers/bluesky.js

@@ -1,5 +1,6 @@
 import { composeHint, isHostOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/bluesky.ts
+const profileRegex = /^\/profile\/([^/]+)/;
 const hosts = ["bsky.app", "www.bsky.app"];
 const blueskyHandler = {
 	match: (url) => {
@@ -7,7 +8,7 @@ const blueskyHandler = {
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const handle = pathname.match(/^\/profile\/([^/]+)/)?.[1];
+		const handle = pathname.match(profileRegex)?.[1];
 		if (!handle) return [];
 		return [{
 			uri: `https://bsky.app/profile/${handle}/rss`,

package/dist/feeds/platform/handlers/csdn.cjs

@@ -1,5 +1,6 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/csdn.ts
+const userRegex = /^\/([^/]+)/;
 const hosts = ["blog.csdn.net"];
 const csdnHandler = {
 	match: (url) => {
@@ -7,7 +8,7 @@ const csdnHandler = {
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const username = pathname.match(/^\/([^/]+)/)?.[1];
+		const username = pathname.match(userRegex)?.[1];
 		if (!username) return [];
 		return [{
 			uri: [`https://rss.csdn.net/${username}/rss/map`, `https://blog.csdn.net/${username}/rss/list`],