feedscout 1.6.2 → 1.7.1

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

@@ -1,5 +1,10 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/reddit.ts
+const commentsPathRegex = /^\/r\/([^/]+)\/comments\/([^/]+)/;
+const subredditPathRegex = /^\/r\/([^/]+)(?:\/([^/]+))?/;
+const multiredditPathRegex = /^\/user\/([^/]+)\/m\/([^/]+)/;
+const userPathRegex = /^\/(u|user)\/([^/]+)/;
+const domainPathRegex = /^\/domain\/([^/]+)/;
 const hosts = [
 	"reddit.com",
 	"www.reddit.com",
@@ -23,12 +28,12 @@ const redditHandler = {
 			uri: "https://www.reddit.com/.rss",
 			hint: require_utils.composeHint("reddit:posts")
 		}];
-		const commentsMatch = pathname.match(/^\/r\/([^/]+)\/comments\/([^/]+)/);
+		const commentsMatch = pathname.match(commentsPathRegex);
 		if (commentsMatch?.[1] && commentsMatch?.[2]) return [{
 			uri: `https://www.reddit.com/r/${commentsMatch[1]}/comments/${commentsMatch[2]}/.rss`,
 			hint: require_utils.composeHint("reddit:post-comments")
 		}];
-		const subredditMatch = pathname.match(/^\/r\/([^/]+)(?:\/([^/]+))?/);
+		const subredditMatch = pathname.match(subredditPathRegex);
 		if (subredditMatch?.[1]) {
 			const subreddit = subredditMatch[1];
 			const sort = subredditMatch[2];
@@ -47,17 +52,17 @@ const redditHandler = {
 			});
 			return uris;
 		}
-		const multiredditMatch = pathname.match(/^\/user\/([^/]+)\/m\/([^/]+)/);
+		const multiredditMatch = pathname.match(multiredditPathRegex);
 		if (multiredditMatch?.[1] && multiredditMatch?.[2]) return [{
 			uri: `https://www.reddit.com/user/${multiredditMatch[1]}/m/${multiredditMatch[2]}/.rss`,
 			hint: require_utils.composeHint("reddit:multireddit")
 		}];
-		const userMatch = pathname.match(/^\/(u|user)\/([^/]+)/);
+		const userMatch = pathname.match(userPathRegex);
 		if (userMatch?.[2]) return [{
 			uri: `https://www.reddit.com/user/${userMatch[2]}/.rss`,
 			hint: require_utils.composeHint("reddit:posts")
 		}];
-		const domainMatch = pathname.match(/^\/domain\/([^/]+)/);
+		const domainMatch = pathname.match(domainPathRegex);
 		if (domainMatch?.[1]) return [{
 			uri: `https://www.reddit.com/domain/${domainMatch[1]}/.rss`,
 			hint: require_utils.composeHint("reddit:posts")

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

@@ -1,5 +1,10 @@
 import { composeHint, isAnyOf, isHostOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/reddit.ts
+const commentsPathRegex = /^\/r\/([^/]+)\/comments\/([^/]+)/;
+const subredditPathRegex = /^\/r\/([^/]+)(?:\/([^/]+))?/;
+const multiredditPathRegex = /^\/user\/([^/]+)\/m\/([^/]+)/;
+const userPathRegex = /^\/(u|user)\/([^/]+)/;
+const domainPathRegex = /^\/domain\/([^/]+)/;
 const hosts = [
 	"reddit.com",
 	"www.reddit.com",
@@ -23,12 +28,12 @@ const redditHandler = {
 			uri: "https://www.reddit.com/.rss",
 			hint: composeHint("reddit:posts")
 		}];
-		const commentsMatch = pathname.match(/^\/r\/([^/]+)\/comments\/([^/]+)/);
+		const commentsMatch = pathname.match(commentsPathRegex);
 		if (commentsMatch?.[1] && commentsMatch?.[2]) return [{
 			uri: `https://www.reddit.com/r/${commentsMatch[1]}/comments/${commentsMatch[2]}/.rss`,
 			hint: composeHint("reddit:post-comments")
 		}];
-		const subredditMatch = pathname.match(/^\/r\/([^/]+)(?:\/([^/]+))?/);
+		const subredditMatch = pathname.match(subredditPathRegex);
 		if (subredditMatch?.[1]) {
 			const subreddit = subredditMatch[1];
 			const sort = subredditMatch[2];
@@ -47,17 +52,17 @@ const redditHandler = {
 			});
 			return uris;
 		}
-		const multiredditMatch = pathname.match(/^\/user\/([^/]+)\/m\/([^/]+)/);
+		const multiredditMatch = pathname.match(multiredditPathRegex);
 		if (multiredditMatch?.[1] && multiredditMatch?.[2]) return [{
 			uri: `https://www.reddit.com/user/${multiredditMatch[1]}/m/${multiredditMatch[2]}/.rss`,
 			hint: composeHint("reddit:multireddit")
 		}];
-		const userMatch = pathname.match(/^\/(u|user)\/([^/]+)/);
+		const userMatch = pathname.match(userPathRegex);
 		if (userMatch?.[2]) return [{
 			uri: `https://www.reddit.com/user/${userMatch[2]}/.rss`,
 			hint: composeHint("reddit:posts")
 		}];
-		const domainMatch = pathname.match(/^\/domain\/([^/]+)/);
+		const domainMatch = pathname.match(domainPathRegex);
 		if (domainMatch?.[1]) return [{
 			uri: `https://www.reddit.com/domain/${domainMatch[1]}/.rss`,
 			hint: composeHint("reddit:posts")

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

@@ -1,5 +1,6 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/soundcloud.ts
+const userIdRegex = /soundcloud:\/\/users:(\d+)/;
 const hosts = [
 	"soundcloud.com",
 	"www.soundcloud.com",
@@ -15,14 +16,14 @@ const excludedPaths = [
 	"messages"
 ];
 const extractUserIdFromContent = (content) => {
-	return content.match(/soundcloud:\/\/users:(\d+)/)?.[1];
+	return content.match(userIdRegex)?.[1];
 };
 const soundcloudHandler = {
 	match: (url) => {
 		if (!require_utils.isHostOf(url, hosts)) return false;
 		const { pathname } = new URL(url);
 		const pathSegments = pathname.split("/").filter(Boolean);
-		return pathSegments.length >= 1 && !require_utils.isAnyOf(pathSegments[0], excludedPaths);
+		return pathSegments.length > 0 && !require_utils.isAnyOf(pathSegments[0], excludedPaths);
 	},
 	resolve: (_url, content) => {
 		if (!content) return [];

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

@@ -1,5 +1,6 @@
 import { composeHint, isAnyOf, isHostOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/soundcloud.ts
+const userIdRegex = /soundcloud:\/\/users:(\d+)/;
 const hosts = [
 	"soundcloud.com",
 	"www.soundcloud.com",
@@ -15,14 +16,14 @@ const excludedPaths = [
 	"messages"
 ];
 const extractUserIdFromContent = (content) => {
-	return content.match(/soundcloud:\/\/users:(\d+)/)?.[1];
+	return content.match(userIdRegex)?.[1];
 };
 const soundcloudHandler = {
 	match: (url) => {
 		if (!isHostOf(url, hosts)) return false;
 		const { pathname } = new URL(url);
 		const pathSegments = pathname.split("/").filter(Boolean);
-		return pathSegments.length >= 1 && !isAnyOf(pathSegments[0], excludedPaths);
+		return pathSegments.length > 0 && !isAnyOf(pathSegments[0], excludedPaths);
 	},
 	resolve: (_url, content) => {
 		if (!content) return [];

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

@@ -1,5 +1,8 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/stackExchange.ts
+const tagPathRegex = /^\/questions\/tagged\/([\w.+-]+)/;
+const questionPathRegex = /^\/questions\/(\d+)/;
+const userPathRegex = /^\/users\/(\d+)/;
 const domains = [
 	"stackoverflow.com",
 	"serverfault.com",
@@ -15,17 +18,17 @@ const stackExchangeHandler = {
 	},
 	resolve: (url) => {
 		const { origin, pathname } = new URL(url);
-		const tagMatch = pathname.match(/^\/questions\/tagged\/([\w.+-]+)/);
+		const tagMatch = pathname.match(tagPathRegex);
 		if (tagMatch?.[1]) return [{
 			uri: `${origin}/feeds/tag/${tagMatch[1]}`,
 			hint: require_utils.composeHint("stackexchange:tag")
 		}];
-		const questionMatch = pathname.match(/^\/questions\/(\d+)/);
+		const questionMatch = pathname.match(questionPathRegex);
 		if (questionMatch?.[1]) return [{
 			uri: `${origin}/feeds/question/${questionMatch[1]}`,
 			hint: require_utils.composeHint("stackexchange:question")
 		}];
-		const userMatch = pathname.match(/^\/users\/(\d+)/);
+		const userMatch = pathname.match(userPathRegex);
 		if (userMatch?.[1]) return [{
 			uri: `${origin}/feeds/user/${userMatch[1]}`,
 			hint: require_utils.composeHint("stackexchange:user")

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

@@ -1,5 +1,8 @@
 import { composeHint, isHostOf, isSubdomainOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/stackExchange.ts
+const tagPathRegex = /^\/questions\/tagged\/([\w.+-]+)/;
+const questionPathRegex = /^\/questions\/(\d+)/;
+const userPathRegex = /^\/users\/(\d+)/;
 const domains = [
 	"stackoverflow.com",
 	"serverfault.com",
@@ -15,17 +18,17 @@ const stackExchangeHandler = {
 	},
 	resolve: (url) => {
 		const { origin, pathname } = new URL(url);
-		const tagMatch = pathname.match(/^\/questions\/tagged\/([\w.+-]+)/);
+		const tagMatch = pathname.match(tagPathRegex);
 		if (tagMatch?.[1]) return [{
 			uri: `${origin}/feeds/tag/${tagMatch[1]}`,
 			hint: composeHint("stackexchange:tag")
 		}];
-		const questionMatch = pathname.match(/^\/questions\/(\d+)/);
+		const questionMatch = pathname.match(questionPathRegex);
 		if (questionMatch?.[1]) return [{
 			uri: `${origin}/feeds/question/${questionMatch[1]}`,
 			hint: composeHint("stackexchange:question")
 		}];
-		const userMatch = pathname.match(/^\/users\/(\d+)/);
+		const userMatch = pathname.match(userPathRegex);
 		if (userMatch?.[1]) return [{
 			uri: `${origin}/feeds/user/${userMatch[1]}`,
 			hint: composeHint("stackexchange:user")

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

@@ -1,5 +1,7 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/steam.ts
+const appPathRegex = /^\/(?:news\/)?app\/(\d+)/;
+const groupPathRegex = /^\/groups\/([^/]+)/;
 const hosts = ["store.steampowered.com", "steamcommunity.com"];
 const steamHandler = {
 	match: (url) => {
@@ -7,13 +9,13 @@ const steamHandler = {
 	},
 	resolve: (url) => {
 		const { hostname, pathname } = new URL(url);
-		const appMatch = pathname.match(/^\/(?:news\/)?app\/(\d+)/);
+		const appMatch = pathname.match(appPathRegex);
 		if (appMatch?.[1]) return [{
 			uri: `https://store.steampowered.com/feeds/news/app/${appMatch[1]}/`,
 			hint: require_utils.composeHint("steam:news")
 		}];
 		if (hostname === "steamcommunity.com") {
-			const groupMatch = pathname.match(/^\/groups\/([^/]+)/);
+			const groupMatch = pathname.match(groupPathRegex);
 			if (groupMatch?.[1]) return [{
 				uri: `https://steamcommunity.com/groups/${groupMatch[1]}/rss`,
 				hint: require_utils.composeHint("steam:group")

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

@@ -1,5 +1,7 @@
 import { composeHint, isHostOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/steam.ts
+const appPathRegex = /^\/(?:news\/)?app\/(\d+)/;
+const groupPathRegex = /^\/groups\/([^/]+)/;
 const hosts = ["store.steampowered.com", "steamcommunity.com"];
 const steamHandler = {
 	match: (url) => {
@@ -7,13 +9,13 @@ const steamHandler = {
 	},
 	resolve: (url) => {
 		const { hostname, pathname } = new URL(url);
-		const appMatch = pathname.match(/^\/(?:news\/)?app\/(\d+)/);
+		const appMatch = pathname.match(appPathRegex);
 		if (appMatch?.[1]) return [{
 			uri: `https://store.steampowered.com/feeds/news/app/${appMatch[1]}/`,
 			hint: composeHint("steam:news")
 		}];
 		if (hostname === "steamcommunity.com") {
-			const groupMatch = pathname.match(/^\/groups\/([^/]+)/);
+			const groupMatch = pathname.match(groupPathRegex);
 			if (groupMatch?.[1]) return [{
 				uri: `https://steamcommunity.com/groups/${groupMatch[1]}/rss`,
 				hint: composeHint("steam:group")

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

@@ -1,5 +1,7 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/v2ex.ts
+const nodePathRegex = /^\/go\/([^/]+)/;
+const memberPathRegex = /^\/member\/([^/]+)/;
 const hosts = ["www.v2ex.com", "v2ex.com"];
 const v2exHandler = {
 	match: (url) => {
@@ -7,12 +9,12 @@ const v2exHandler = {
 	},
 	resolve: (url) => {
 		const { pathname, searchParams } = new URL(url);
-		const nodeMatch = pathname.match(/^\/go\/([^/]+)/);
+		const nodeMatch = pathname.match(nodePathRegex);
 		if (nodeMatch?.[1]) return [{
 			uri: `https://www.v2ex.com/feed/${nodeMatch[1]}.xml`,
 			hint: require_utils.composeHint("v2ex:node")
 		}];
-		const memberMatch = pathname.match(/^\/member\/([^/]+)/);
+		const memberMatch = pathname.match(memberPathRegex);
 		if (memberMatch?.[1]) return [{
 			uri: `https://www.v2ex.com/feed/member/${memberMatch[1]}.xml`,
 			hint: require_utils.composeHint("v2ex:member")

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

@@ -1,5 +1,7 @@
 import { composeHint, isHostOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/v2ex.ts
+const nodePathRegex = /^\/go\/([^/]+)/;
+const memberPathRegex = /^\/member\/([^/]+)/;
 const hosts = ["www.v2ex.com", "v2ex.com"];
 const v2exHandler = {
 	match: (url) => {
@@ -7,12 +9,12 @@ const v2exHandler = {
 	},
 	resolve: (url) => {
 		const { pathname, searchParams } = new URL(url);
-		const nodeMatch = pathname.match(/^\/go\/([^/]+)/);
+		const nodeMatch = pathname.match(nodePathRegex);
 		if (nodeMatch?.[1]) return [{
 			uri: `https://www.v2ex.com/feed/${nodeMatch[1]}.xml`,
 			hint: composeHint("v2ex:node")
 		}];
-		const memberMatch = pathname.match(/^\/member\/([^/]+)/);
+		const memberMatch = pathname.match(memberPathRegex);
 		if (memberMatch?.[1]) return [{
 			uri: `https://www.v2ex.com/feed/member/${memberMatch[1]}.xml`,
 			hint: composeHint("v2ex:member")

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

@@ -1,5 +1,6 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/vimeo.ts
+const numericPathRegex = /^\d+$/;
 const hosts = ["vimeo.com", "www.vimeo.com"];
 const excludedPaths = [
 	"about",
@@ -47,9 +48,9 @@ const vimeoHandler = {
 			uri: `${origin}/groups/${pathSegments[1]}/videos/rss`,
 			hint: require_utils.composeHint("vimeo:group")
 		}];
-		if (pathSegments.length >= 1) {
+		if (pathSegments.length > 0) {
 			const user = pathSegments[0];
-			if (!require_utils.isAnyOf(user, excludedPaths) && !/^\d+$/.test(user)) {
+			if (!require_utils.isAnyOf(user, excludedPaths) && !numericPathRegex.test(user)) {
 				const feeds = [{
 					uri: `${origin}/${user}/videos/rss`,
 					hint: require_utils.composeHint("vimeo:videos")

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

@@ -1,5 +1,6 @@
 import { composeHint, isAnyOf, isHostOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/vimeo.ts
+const numericPathRegex = /^\d+$/;
 const hosts = ["vimeo.com", "www.vimeo.com"];
 const excludedPaths = [
 	"about",
@@ -47,9 +48,9 @@ const vimeoHandler = {
 			uri: `${origin}/groups/${pathSegments[1]}/videos/rss`,
 			hint: composeHint("vimeo:group")
 		}];
-		if (pathSegments.length >= 1) {
+		if (pathSegments.length > 0) {
 			const user = pathSegments[0];
-			if (!isAnyOf(user, excludedPaths) && !/^\d+$/.test(user)) {
+			if (!isAnyOf(user, excludedPaths) && !numericPathRegex.test(user)) {
 				const feeds = [{
 					uri: `${origin}/${user}/videos/rss`,
 					hint: composeHint("vimeo:videos")

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

@@ -1,5 +1,6 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/ximalaya.ts
+const albumPathRegex = /^\/album\/(\d+)/;
 const hosts = ["www.ximalaya.com", "ximalaya.com"];
 const ximalayaHandler = {
 	match: (url) => {
@@ -7,7 +8,7 @@ const ximalayaHandler = {
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const id = pathname.match(/^\/album\/(\d+)/)?.[1];
+		const id = pathname.match(albumPathRegex)?.[1];
 		if (!id) return [];
 		return [{
 			uri: `https://www.ximalaya.com/album/${id}.xml`,

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

@@ -1,5 +1,6 @@
 import { composeHint, isHostOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/ximalaya.ts
+const albumPathRegex = /^\/album\/(\d+)/;
 const hosts = ["www.ximalaya.com", "ximalaya.com"];
 const ximalayaHandler = {
 	match: (url) => {
@@ -7,7 +8,7 @@ const ximalayaHandler = {
 	},
 	resolve: (url) => {
 		const { pathname } = new URL(url);
-		const id = pathname.match(/^\/album\/(\d+)/)?.[1];
+		const id = pathname.match(albumPathRegex)?.[1];
 		if (!id) return [];
 		return [{
 			uri: `https://www.ximalaya.com/album/${id}.xml`,

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

@@ -1,5 +1,11 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/youtube.ts
+const channelIdRegex = /"(?:channelId|externalId)":"(UC[a-zA-Z0-9_-]+)"/;
+const channelPathRegex = /^\/channel\/(UC[a-zA-Z0-9_-]+)/;
+const handlePathRegex = /^\/@([^/]+)/;
+const userPathRegex = /^\/user\/([^/]+)/;
+const customPathRegex = /^\/c\/([^/]+)/;
+const channelPrefixRegex = /^UC/;
 const hosts = [
 	"youtube.com",
 	"www.youtube.com",
@@ -7,25 +13,20 @@ const hosts = [
 	"youtu.be",
 	"www.youtu.be"
 ];
-const channelIdRegex = /"(?:channelId|externalId)":"(UC[a-zA-Z0-9_-]+)"/;
-const channelPathRegex = /^\/channel\/(UC[a-zA-Z0-9_-]+)/;
-const handlePathRegex = /^\/@([^/]+)/;
-const userPathRegex = /^\/user\/([^/]+)/;
-const customPathRegex = /^\/c\/([^/]+)/;
 const extractChannelIdFromContent = (content) => {
 	return content.match(channelIdRegex)?.[1];
 };
 const getAllUploadsPlaylistId = (channelId) => {
-	return channelId.replace(/^UC/, "UU");
+	return channelId.replace(channelPrefixRegex, "UU");
 };
 const getVideosOnlyPlaylistId = (channelId) => {
-	return channelId.replace(/^UC/, "UULF");
+	return channelId.replace(channelPrefixRegex, "UULF");
 };
 const getShortsOnlyPlaylistId = (channelId) => {
-	return channelId.replace(/^UC/, "UUSH");
+	return channelId.replace(channelPrefixRegex, "UUSH");
 };
 const getLiveStreamsOnlyPlaylistId = (channelId) => {
-	return channelId.replace(/^UC/, "UULV");
+	return channelId.replace(channelPrefixRegex, "UULV");
 };
 const feedUrl = (param, value) => {
 	return `https://www.youtube.com/feeds/videos.xml?${param}=${value}`;

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

@@ -1,5 +1,11 @@
 import { composeHint, isHostOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/youtube.ts
+const channelIdRegex = /"(?:channelId|externalId)":"(UC[a-zA-Z0-9_-]+)"/;
+const channelPathRegex = /^\/channel\/(UC[a-zA-Z0-9_-]+)/;
+const handlePathRegex = /^\/@([^/]+)/;
+const userPathRegex = /^\/user\/([^/]+)/;
+const customPathRegex = /^\/c\/([^/]+)/;
+const channelPrefixRegex = /^UC/;
 const hosts = [
 	"youtube.com",
 	"www.youtube.com",
@@ -7,25 +13,20 @@ const hosts = [
 	"youtu.be",
 	"www.youtu.be"
 ];
-const channelIdRegex = /"(?:channelId|externalId)":"(UC[a-zA-Z0-9_-]+)"/;
-const channelPathRegex = /^\/channel\/(UC[a-zA-Z0-9_-]+)/;
-const handlePathRegex = /^\/@([^/]+)/;
-const userPathRegex = /^\/user\/([^/]+)/;
-const customPathRegex = /^\/c\/([^/]+)/;
 const extractChannelIdFromContent = (content) => {
 	return content.match(channelIdRegex)?.[1];
 };
 const getAllUploadsPlaylistId = (channelId) => {
-	return channelId.replace(/^UC/, "UU");
+	return channelId.replace(channelPrefixRegex, "UU");
 };
 const getVideosOnlyPlaylistId = (channelId) => {
-	return channelId.replace(/^UC/, "UULF");
+	return channelId.replace(channelPrefixRegex, "UULF");
 };
 const getShortsOnlyPlaylistId = (channelId) => {
-	return channelId.replace(/^UC/, "UUSH");
+	return channelId.replace(channelPrefixRegex, "UUSH");
 };
 const getLiveStreamsOnlyPlaylistId = (channelId) => {
-	return channelId.replace(/^UC/, "UULV");
+	return channelId.replace(channelPrefixRegex, "UULV");
 };
 const feedUrl = (param, value) => {
 	return `https://www.youtube.com/feeds/videos.xml?${param}=${value}`;

package/dist/hubs/discover/index.cjs

@@ -10,19 +10,19 @@ const discoverHubs = async (input, options = {}) => {
 		"headers",
 		"feed",
 		"html"
-	], fetchFn = require_utils$1.defaultFetchFn, normalizeUrlFn = require_utils.normalizeUrl } = options;
+	], fetchFn = require_utils$1.defaultFetchFn, resolveUrlFn = require_utils.resolveUrl } = options;
 	const normalizedInput = await require_utils$2.normalizeInput(input, fetchFn);
 	const results = [];
 	if (methods.includes("headers") && normalizedInput.headers) {
-		const headerHubs = require_index$1.discoverHubsFromHeaders(normalizedInput.headers, normalizedInput.url, normalizeUrlFn);
+		const headerHubs = require_index$1.discoverHubsFromHeaders(normalizedInput.headers, normalizedInput.url, resolveUrlFn);
 		results.push(...headerHubs);
 	}
 	if (methods.includes("feed") && normalizedInput.content) {
-		const feedHubs = require_index.discoverHubsFromFeed(normalizedInput.content, normalizedInput.url);
+		const feedHubs = require_index.discoverHubsFromFeed(normalizedInput.content, normalizedInput.url, resolveUrlFn);
 		results.push(...feedHubs);
 	}
 	if (methods.includes("html") && normalizedInput.content) {
-		const htmlHubs = require_index$2.discoverHubsFromHtml(normalizedInput.content, normalizedInput.url, normalizeUrlFn);
+		const htmlHubs = require_index$2.discoverHubsFromHtml(normalizedInput.content, normalizedInput.url, resolveUrlFn);
 		results.push(...htmlHubs);
 	}
 	return results;

package/dist/hubs/discover/index.js

@@ -1,4 +1,4 @@
-import { normalizeUrl } from "../../common/utils.js";
+import { resolveUrl } from "../../common/utils.js";
 import { defaultFetchFn } from "../../common/discover/utils.js";
 import { discoverHubsFromFeed } from "../feed/index.js";
 import { discoverHubsFromHeaders } from "../headers/index.js";
@@ -10,19 +10,19 @@ const discoverHubs = async (input, options = {}) => {
 		"headers",
 		"feed",
 		"html"
-	], fetchFn = defaultFetchFn, normalizeUrlFn = normalizeUrl } = options;
+	], fetchFn = defaultFetchFn, resolveUrlFn = resolveUrl } = options;
 	const normalizedInput = await normalizeInput(input, fetchFn);
 	const results = [];
 	if (methods.includes("headers") && normalizedInput.headers) {
-		const headerHubs = discoverHubsFromHeaders(normalizedInput.headers, normalizedInput.url, normalizeUrlFn);
+		const headerHubs = discoverHubsFromHeaders(normalizedInput.headers, normalizedInput.url, resolveUrlFn);
 		results.push(...headerHubs);
 	}
 	if (methods.includes("feed") && normalizedInput.content) {
-		const feedHubs = discoverHubsFromFeed(normalizedInput.content, normalizedInput.url);
+		const feedHubs = discoverHubsFromFeed(normalizedInput.content, normalizedInput.url, resolveUrlFn);
 		results.push(...feedHubs);
 	}
 	if (methods.includes("html") && normalizedInput.content) {
-		const htmlHubs = discoverHubsFromHtml(normalizedInput.content, normalizedInput.url, normalizeUrlFn);
+		const htmlHubs = discoverHubsFromHtml(normalizedInput.content, normalizedInput.url, resolveUrlFn);
 		results.push(...htmlHubs);
 	}
 	return results;

package/dist/hubs/discover/types.d.cts

@@ -1,4 +1,4 @@
-import { DiscoverFetchFn, DiscoverNormalizeUrlFn } from "../../common/types.cjs";
+import { DiscoverFetchFn, DiscoverResolveUrlFn } from "../../common/types.cjs";
 
 //#region src/hubs/discover/types.d.ts
 type HubResult = {
@@ -9,7 +9,7 @@ type DiscoverHubsMethodsConfig = Array<'headers' | 'html' | 'feed'>;
 type DiscoverHubsOptions = {
   methods?: DiscoverHubsMethodsConfig;
   fetchFn?: DiscoverFetchFn;
-  normalizeUrlFn?: DiscoverNormalizeUrlFn;
+  resolveUrlFn?: DiscoverResolveUrlFn;
 };
 //#endregion
 export { DiscoverHubsMethodsConfig, DiscoverHubsOptions, HubResult };

package/dist/hubs/discover/types.d.ts

@@ -1,4 +1,4 @@
-import { DiscoverFetchFn, DiscoverNormalizeUrlFn } from "../../common/types.js";
+import { DiscoverFetchFn, DiscoverResolveUrlFn } from "../../common/types.js";
 
 //#region src/hubs/discover/types.d.ts
 type HubResult = {
@@ -9,7 +9,7 @@ type DiscoverHubsMethodsConfig = Array<'headers' | 'html' | 'feed'>;
 type DiscoverHubsOptions = {
   methods?: DiscoverHubsMethodsConfig;
   fetchFn?: DiscoverFetchFn;
-  normalizeUrlFn?: DiscoverNormalizeUrlFn;
+  resolveUrlFn?: DiscoverResolveUrlFn;
 };
 //#endregion
 export { DiscoverHubsMethodsConfig, DiscoverHubsOptions, HubResult };

package/dist/hubs/feed/index.cjs

@@ -1,25 +1,27 @@
+const require_utils = require("../../common/utils.cjs");
 let feedsmith = require("feedsmith");
 //#region src/hubs/feed/index.ts
 const getLinksWithRel = (links, rel) => {
 	return links?.filter((link) => link.rel === rel && link.href).map((link) => link.href) ?? [];
 };
-const discoverHubsFromFeed = (content, baseUrl) => {
+const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = require_utils.resolveUrl) => {
 	try {
 		const { format, feed } = (0, feedsmith.parseFeed)(content);
 		if (format === "json") {
 			const hubs = feed.hubs ?? [];
-			const topic = feed.feed_url ?? baseUrl;
+			const topic = feed.feed_url ? resolveUrlFn(feed.feed_url, baseUrl) ?? feed.feed_url : baseUrl;
 			return hubs.filter((hub) => hub.url).map((hub) => ({
-				hub: hub.url,
+				hub: resolveUrlFn(hub.url, baseUrl) ?? hub.url,
 				topic
 			}));
 		}
 		const links = format === "atom" ? feed.links : feed.atom?.links;
 		const hubUris = getLinksWithRel(links, "hub");
 		if (hubUris.length > 0) {
-			const topic = getLinksWithRel(links, "self")[0] ?? baseUrl;
+			const selfUris = getLinksWithRel(links, "self");
+			const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
 			return hubUris.map((hub) => ({
-				hub,
+				hub: resolveUrlFn(hub, baseUrl) ?? hub,
 				topic
 			}));
 		}

package/dist/hubs/feed/index.js

@@ -1,25 +1,27 @@
+import { resolveUrl } from "../../common/utils.js";
 import { parseFeed } from "feedsmith";
 //#region src/hubs/feed/index.ts
 const getLinksWithRel = (links, rel) => {
 	return links?.filter((link) => link.rel === rel && link.href).map((link) => link.href) ?? [];
 };
-const discoverHubsFromFeed = (content, baseUrl) => {
+const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = resolveUrl) => {
 	try {
 		const { format, feed } = parseFeed(content);
 		if (format === "json") {
 			const hubs = feed.hubs ?? [];
-			const topic = feed.feed_url ?? baseUrl;
+			const topic = feed.feed_url ? resolveUrlFn(feed.feed_url, baseUrl) ?? feed.feed_url : baseUrl;
 			return hubs.filter((hub) => hub.url).map((hub) => ({
-				hub: hub.url,
+				hub: resolveUrlFn(hub.url, baseUrl) ?? hub.url,
 				topic
 			}));
 		}
 		const links = format === "atom" ? feed.links : feed.atom?.links;
 		const hubUris = getLinksWithRel(links, "hub");
 		if (hubUris.length > 0) {
-			const topic = getLinksWithRel(links, "self")[0] ?? baseUrl;
+			const selfUris = getLinksWithRel(links, "self");
+			const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
 			return hubUris.map((hub) => ({
-				hub,
+				hub: resolveUrlFn(hub, baseUrl) ?? hub,
 				topic
 			}));
 		}

package/dist/hubs/headers/index.cjs

@@ -3,13 +3,13 @@ const require_index = require("../../common/uris/headers/index.cjs");
 //#region src/hubs/headers/index.ts
 const hubSelector = [{ rel: "hub" }];
 const selfSelector = [{ rel: "self" }];
-const discoverHubsFromHeaders = (headers, baseUrl, normalizeUrlFn = require_utils.normalizeUrl) => {
+const discoverHubsFromHeaders = (headers, baseUrl, resolveUrlFn = require_utils.resolveUrl) => {
 	const hubUris = require_index.discoverUrisFromHeaders(headers, { linkSelectors: hubSelector });
 	if (hubUris.length === 0) return [];
 	const selfUris = require_index.discoverUrisFromHeaders(headers, { linkSelectors: selfSelector });
-	const topic = selfUris[0] ? normalizeUrlFn(selfUris[0], baseUrl) : baseUrl;
+	const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
 	return hubUris.map((hub) => ({
-		hub: normalizeUrlFn(hub, baseUrl),
+		hub: resolveUrlFn(hub, baseUrl) ?? hub,
 		topic
 	}));
 };