feedscout 1.7.0 → 1.8.0

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

@@ -1,13 +1,20 @@
-import { composeHint, isSubdomainOf } from "../../../common/utils.js";
+import { composeHint, isHostOf, isSubdomainOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/substack.ts
+const profileRegex = /^\/@([\w-]+)/;
 const substackHandler = {
 	match: (url) => {
-		return isSubdomainOf(url, "substack.com");
+		if (isSubdomainOf(url, "substack.com")) return true;
+		return isHostOf(url, "substack.com") && profileRegex.test(new URL(url).pathname);
 	},
 	resolve: (url) => {
-		const { origin } = new URL(url);
+		const parsed = new URL(url);
+		const profileMatch = parsed.pathname.match(profileRegex);
+		if (isHostOf(url, "substack.com") && profileMatch?.[1]) return [{
+			uri: `https://${profileMatch[1]}.substack.com/feed`,
+			hint: composeHint("substack:newsletter")
+		}];
 		return [{
-			uri: `${origin}/feed`,
+			uri: `${parsed.origin}/feed`,
 			hint: composeHint("substack:newsletter")
 		}];
 	}

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

@@ -1,14 +1,14 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/tumblr.ts
 const domains = ["tumblr.com"];
-const tagPathRegex = /^\/tagged\/([^/]+)/;
+const tagRegex = /^\/tagged\/([^/]+)/;
 const tumblrHandler = {
 	match: (url) => {
 		return require_utils.isSubdomainOf(url, domains);
 	},
 	resolve: (url) => {
 		const { origin, pathname } = new URL(url);
-		const tagMatch = pathname.match(tagPathRegex);
+		const tagMatch = pathname.match(tagRegex);
 		if (tagMatch?.[1]) return [{
 			uri: `${origin}/tagged/${tagMatch[1]}/rss`,
 			hint: require_utils.composeHint("tumblr:tag")

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

@@ -1,14 +1,14 @@
 import { composeHint, isSubdomainOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/tumblr.ts
 const domains = ["tumblr.com"];
-const tagPathRegex = /^\/tagged\/([^/]+)/;
+const tagRegex = /^\/tagged\/([^/]+)/;
 const tumblrHandler = {
 	match: (url) => {
 		return isSubdomainOf(url, domains);
 	},
 	resolve: (url) => {
 		const { origin, pathname } = new URL(url);
-		const tagMatch = pathname.match(tagPathRegex);
+		const tagMatch = pathname.match(tagRegex);
 		if (tagMatch?.[1]) return [{
 			uri: `${origin}/tagged/${tagMatch[1]}/rss`,
 			hint: composeHint("tumblr:tag")

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

@@ -1,7 +1,7 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/v2ex.ts
-const nodePathRegex = /^\/go\/([^/]+)/;
-const memberPathRegex = /^\/member\/([^/]+)/;
+const nodeRegex = /^\/go\/([^/]+)/;
+const memberRegex = /^\/member\/([^/]+)/;
 const hosts = ["www.v2ex.com", "v2ex.com"];
 const v2exHandler = {
 	match: (url) => {
@@ -9,12 +9,12 @@ const v2exHandler = {
 	},
 	resolve: (url) => {
 		const { pathname, searchParams } = new URL(url);
-		const nodeMatch = pathname.match(nodePathRegex);
+		const nodeMatch = pathname.match(nodeRegex);
 		if (nodeMatch?.[1]) return [{
 			uri: `https://www.v2ex.com/feed/${nodeMatch[1]}.xml`,
 			hint: require_utils.composeHint("v2ex:node")
 		}];
-		const memberMatch = pathname.match(memberPathRegex);
+		const memberMatch = pathname.match(memberRegex);
 		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,7 +1,7 @@
 import { composeHint, isHostOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/v2ex.ts
-const nodePathRegex = /^\/go\/([^/]+)/;
-const memberPathRegex = /^\/member\/([^/]+)/;
+const nodeRegex = /^\/go\/([^/]+)/;
+const memberRegex = /^\/member\/([^/]+)/;
 const hosts = ["www.v2ex.com", "v2ex.com"];
 const v2exHandler = {
 	match: (url) => {
@@ -9,12 +9,12 @@ const v2exHandler = {
 	},
 	resolve: (url) => {
 		const { pathname, searchParams } = new URL(url);
-		const nodeMatch = pathname.match(nodePathRegex);
+		const nodeMatch = pathname.match(nodeRegex);
 		if (nodeMatch?.[1]) return [{
 			uri: `https://www.v2ex.com/feed/${nodeMatch[1]}.xml`,
 			hint: composeHint("v2ex:node")
 		}];
-		const memberMatch = pathname.match(memberPathRegex);
+		const memberMatch = pathname.match(memberRegex);
 		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,6 +1,6 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/vimeo.ts
-const numericPathRegex = /^\d+$/;
+const numericRegex = /^\d+$/;
 const hosts = ["vimeo.com", "www.vimeo.com"];
 const excludedPaths = [
 	"about",
@@ -50,7 +50,7 @@ const vimeoHandler = {
 		}];
 		if (pathSegments.length > 0) {
 			const user = pathSegments[0];
-			if (!require_utils.isAnyOf(user, excludedPaths) && !numericPathRegex.test(user)) {
+			if (!require_utils.isAnyOf(user, excludedPaths) && !numericRegex.test(user)) {
 				const feeds = [{
 					uri: `${origin}/${user}/videos/rss`,
 					hint: require_utils.composeHint("vimeo:videos")

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

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

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

@@ -1,8 +1,8 @@
 const require_utils = require("../../../common/utils.cjs");
 //#region src/feeds/platform/handlers/wordpress.ts
-const categoryPathRegex = /^\/category\/([^/]+)/;
-const tagPathRegex = /^\/tag\/([^/]+)/;
-const authorPathRegex = /^\/author\/([^/]+)/;
+const categoryRegex = /^\/category\/([^/]+)/;
+const tagRegex = /^\/tag\/([^/]+)/;
+const authorRegex = /^\/author\/([^/]+)/;
 const wordpressHandler = {
 	match: (url) => {
 		return require_utils.isSubdomainOf(url, "wordpress.com");
@@ -10,17 +10,17 @@ const wordpressHandler = {
 	resolve: (url) => {
 		const { origin, pathname } = new URL(url);
 		const uris = [];
-		const categoryMatch = pathname.match(categoryPathRegex);
+		const categoryMatch = pathname.match(categoryRegex);
 		if (categoryMatch?.[1]) uris.push({
 			uri: [`${origin}/category/${categoryMatch[1]}/feed/`, `${origin}/category/${categoryMatch[1]}/?feed=rss`],
 			hint: require_utils.composeHint("wordpress:category")
 		});
-		const tagMatch = pathname.match(tagPathRegex);
+		const tagMatch = pathname.match(tagRegex);
 		if (tagMatch?.[1]) uris.push({
 			uri: [`${origin}/tag/${tagMatch[1]}/feed/`, `${origin}/tag/${tagMatch[1]}/?feed=rss`],
 			hint: require_utils.composeHint("wordpress:tag")
 		});
-		const authorMatch = pathname.match(authorPathRegex);
+		const authorMatch = pathname.match(authorRegex);
 		if (authorMatch?.[1]) uris.push({
 			uri: [`${origin}/author/${authorMatch[1]}/feed/`, `${origin}/author/${authorMatch[1]}/?feed=rss`],
 			hint: require_utils.composeHint("wordpress:author")

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

@@ -1,8 +1,8 @@
 import { composeHint, isSubdomainOf } from "../../../common/utils.js";
 //#region src/feeds/platform/handlers/wordpress.ts
-const categoryPathRegex = /^\/category\/([^/]+)/;
-const tagPathRegex = /^\/tag\/([^/]+)/;
-const authorPathRegex = /^\/author\/([^/]+)/;
+const categoryRegex = /^\/category\/([^/]+)/;
+const tagRegex = /^\/tag\/([^/]+)/;
+const authorRegex = /^\/author\/([^/]+)/;
 const wordpressHandler = {
 	match: (url) => {
 		return isSubdomainOf(url, "wordpress.com");
@@ -10,17 +10,17 @@ const wordpressHandler = {
 	resolve: (url) => {
 		const { origin, pathname } = new URL(url);
 		const uris = [];
-		const categoryMatch = pathname.match(categoryPathRegex);
+		const categoryMatch = pathname.match(categoryRegex);
 		if (categoryMatch?.[1]) uris.push({
 			uri: [`${origin}/category/${categoryMatch[1]}/feed/`, `${origin}/category/${categoryMatch[1]}/?feed=rss`],
 			hint: composeHint("wordpress:category")
 		});
-		const tagMatch = pathname.match(tagPathRegex);
+		const tagMatch = pathname.match(tagRegex);
 		if (tagMatch?.[1]) uris.push({
 			uri: [`${origin}/tag/${tagMatch[1]}/feed/`, `${origin}/tag/${tagMatch[1]}/?feed=rss`],
 			hint: composeHint("wordpress:tag")
 		});
-		const authorMatch = pathname.match(authorPathRegex);
+		const authorMatch = pathname.match(authorRegex);
 		if (authorMatch?.[1]) uris.push({
 			uri: [`${origin}/author/${authorMatch[1]}/feed/`, `${origin}/author/${authorMatch[1]}/?feed=rss`],
 			hint: composeHint("wordpress:author")

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

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

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

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

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

@@ -1,10 +1,10 @@
 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 channelRegex = /^\/channel\/(UC[a-zA-Z0-9_-]+)/;
+const handleRegex = /^\/@([^/]+)/;
+const userRegex = /^\/user\/([^/]+)/;
+const customRegex = /^\/c\/([^/]+)/;
 const channelPrefixRegex = /^UC/;
 const hosts = [
 	"youtube.com",
@@ -16,38 +16,53 @@ const hosts = [
 const extractChannelIdFromContent = (content) => {
 	return content.match(channelIdRegex)?.[1];
 };
-const getAllUploadsPlaylistId = (channelId) => {
-	return channelId.replace(channelPrefixRegex, "UU");
-};
-const getVideosOnlyPlaylistId = (channelId) => {
-	return channelId.replace(channelPrefixRegex, "UULF");
-};
-const getShortsOnlyPlaylistId = (channelId) => {
-	return channelId.replace(channelPrefixRegex, "UUSH");
-};
-const getLiveStreamsOnlyPlaylistId = (channelId) => {
-	return channelId.replace(channelPrefixRegex, "UULV");
+const playlistPrefix = (prefix, channelId) => {
+	return channelId.replace(channelPrefixRegex, prefix);
 };
 const feedUrl = (param, value) => {
 	return `https://www.youtube.com/feeds/videos.xml?${param}=${value}`;
 };
 const pushChannelUris = (uris, channelId) => {
 	uris.push({
-		uri: [feedUrl("channel_id", channelId), feedUrl("playlist_id", getAllUploadsPlaylistId(channelId))],
+		uri: [feedUrl("channel_id", channelId), feedUrl("playlist_id", playlistPrefix("UU", channelId))],
 		hint: require_utils.composeHint("youtube:all")
 	});
 	uris.push({
-		uri: feedUrl("playlist_id", getVideosOnlyPlaylistId(channelId)),
+		uri: feedUrl("playlist_id", playlistPrefix("UULF", channelId)),
 		hint: require_utils.composeHint("youtube:videos")
 	});
 	uris.push({
-		uri: feedUrl("playlist_id", getShortsOnlyPlaylistId(channelId)),
+		uri: feedUrl("playlist_id", playlistPrefix("UUSH", channelId)),
 		hint: require_utils.composeHint("youtube:shorts")
 	});
 	uris.push({
-		uri: feedUrl("playlist_id", getLiveStreamsOnlyPlaylistId(channelId)),
+		uri: feedUrl("playlist_id", playlistPrefix("UULV", channelId)),
 		hint: require_utils.composeHint("youtube:live")
 	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UULP", channelId)),
+		hint: require_utils.composeHint("youtube:popular-videos")
+	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UUPS", channelId)),
+		hint: require_utils.composeHint("youtube:popular-shorts")
+	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UUPV", channelId)),
+		hint: require_utils.composeHint("youtube:popular-live")
+	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UUMO", channelId)),
+		hint: require_utils.composeHint("youtube:member-videos")
+	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UUMS", channelId)),
+		hint: require_utils.composeHint("youtube:member-shorts")
+	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UUMV", channelId)),
+		hint: require_utils.composeHint("youtube:member-live")
+	});
 };
 const youtubeHandler = {
 	match: (url) => {
@@ -56,7 +71,7 @@ const youtubeHandler = {
 	resolve: (url, content) => {
 		const parsedUrl = new URL(url);
 		const uris = [];
-		const channelMatch = parsedUrl.pathname.match(channelPathRegex);
+		const channelMatch = parsedUrl.pathname.match(channelRegex);
 		if (channelMatch?.[1]) {
 			const channelId = channelMatch[1];
 			pushChannelUris(uris, channelId);
@@ -67,7 +82,7 @@ const youtubeHandler = {
 			hint: require_utils.composeHint("youtube:playlist")
 		});
 		if (uris.length === 0 && content) {
-			if (parsedUrl.searchParams.has("v") || parsedUrl.hostname.includes("youtu.be") && parsedUrl.pathname.length > 1 || parsedUrl.pathname.match(handlePathRegex) || parsedUrl.pathname.match(userPathRegex) || parsedUrl.pathname.match(customPathRegex)) {
+			if (parsedUrl.searchParams.has("v") || parsedUrl.hostname.includes("youtu.be") && parsedUrl.pathname.length > 1 || parsedUrl.pathname.match(handleRegex) || parsedUrl.pathname.match(userRegex) || parsedUrl.pathname.match(customRegex)) {
 				const channelId = extractChannelIdFromContent(content);
 				if (channelId) pushChannelUris(uris, channelId);
 			}

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

@@ -1,10 +1,10 @@
 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 channelRegex = /^\/channel\/(UC[a-zA-Z0-9_-]+)/;
+const handleRegex = /^\/@([^/]+)/;
+const userRegex = /^\/user\/([^/]+)/;
+const customRegex = /^\/c\/([^/]+)/;
 const channelPrefixRegex = /^UC/;
 const hosts = [
 	"youtube.com",
@@ -16,38 +16,53 @@ const hosts = [
 const extractChannelIdFromContent = (content) => {
 	return content.match(channelIdRegex)?.[1];
 };
-const getAllUploadsPlaylistId = (channelId) => {
-	return channelId.replace(channelPrefixRegex, "UU");
-};
-const getVideosOnlyPlaylistId = (channelId) => {
-	return channelId.replace(channelPrefixRegex, "UULF");
-};
-const getShortsOnlyPlaylistId = (channelId) => {
-	return channelId.replace(channelPrefixRegex, "UUSH");
-};
-const getLiveStreamsOnlyPlaylistId = (channelId) => {
-	return channelId.replace(channelPrefixRegex, "UULV");
+const playlistPrefix = (prefix, channelId) => {
+	return channelId.replace(channelPrefixRegex, prefix);
 };
 const feedUrl = (param, value) => {
 	return `https://www.youtube.com/feeds/videos.xml?${param}=${value}`;
 };
 const pushChannelUris = (uris, channelId) => {
 	uris.push({
-		uri: [feedUrl("channel_id", channelId), feedUrl("playlist_id", getAllUploadsPlaylistId(channelId))],
+		uri: [feedUrl("channel_id", channelId), feedUrl("playlist_id", playlistPrefix("UU", channelId))],
 		hint: composeHint("youtube:all")
 	});
 	uris.push({
-		uri: feedUrl("playlist_id", getVideosOnlyPlaylistId(channelId)),
+		uri: feedUrl("playlist_id", playlistPrefix("UULF", channelId)),
 		hint: composeHint("youtube:videos")
 	});
 	uris.push({
-		uri: feedUrl("playlist_id", getShortsOnlyPlaylistId(channelId)),
+		uri: feedUrl("playlist_id", playlistPrefix("UUSH", channelId)),
 		hint: composeHint("youtube:shorts")
 	});
 	uris.push({
-		uri: feedUrl("playlist_id", getLiveStreamsOnlyPlaylistId(channelId)),
+		uri: feedUrl("playlist_id", playlistPrefix("UULV", channelId)),
 		hint: composeHint("youtube:live")
 	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UULP", channelId)),
+		hint: composeHint("youtube:popular-videos")
+	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UUPS", channelId)),
+		hint: composeHint("youtube:popular-shorts")
+	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UUPV", channelId)),
+		hint: composeHint("youtube:popular-live")
+	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UUMO", channelId)),
+		hint: composeHint("youtube:member-videos")
+	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UUMS", channelId)),
+		hint: composeHint("youtube:member-shorts")
+	});
+	uris.push({
+		uri: feedUrl("playlist_id", playlistPrefix("UUMV", channelId)),
+		hint: composeHint("youtube:member-live")
+	});
 };
 const youtubeHandler = {
 	match: (url) => {
@@ -56,7 +71,7 @@ const youtubeHandler = {
 	resolve: (url, content) => {
 		const parsedUrl = new URL(url);
 		const uris = [];
-		const channelMatch = parsedUrl.pathname.match(channelPathRegex);
+		const channelMatch = parsedUrl.pathname.match(channelRegex);
 		if (channelMatch?.[1]) {
 			const channelId = channelMatch[1];
 			pushChannelUris(uris, channelId);
@@ -67,7 +82,7 @@ const youtubeHandler = {
 			hint: composeHint("youtube:playlist")
 		});
 		if (uris.length === 0 && content) {
-			if (parsedUrl.searchParams.has("v") || parsedUrl.hostname.includes("youtu.be") && parsedUrl.pathname.length > 1 || parsedUrl.pathname.match(handlePathRegex) || parsedUrl.pathname.match(userPathRegex) || parsedUrl.pathname.match(customPathRegex)) {
+			if (parsedUrl.searchParams.has("v") || parsedUrl.hostname.includes("youtu.be") && parsedUrl.pathname.length > 1 || parsedUrl.pathname.match(handleRegex) || parsedUrl.pathname.match(userRegex) || parsedUrl.pathname.match(customRegex)) {
 				const channelId = extractChannelIdFromContent(content);
 				if (channelId) pushChannelUris(uris, channelId);
 			}

package/dist/hubs/discover/index.cjs

@@ -3,7 +3,6 @@ const require_utils$1 = require("../../common/discover/utils.cjs");
 const require_index = require("../feed/index.cjs");
 const require_index$1 = require("../headers/index.cjs");
 const require_index$2 = require("../html/index.cjs");
-const require_utils$2 = require("./utils.cjs");
 //#region src/hubs/discover/index.ts
 const discoverHubs = async (input, options = {}) => {
 	const { methods = [
@@ -11,7 +10,7 @@ const discoverHubs = async (input, options = {}) => {
 		"feed",
 		"html"
 	], fetchFn = require_utils$1.defaultFetchFn, resolveUrlFn = require_utils.resolveUrl } = options;
-	const normalizedInput = await require_utils$2.normalizeInput(input, fetchFn);
+	const normalizedInput = await require_utils$1.normalizeInput(input, fetchFn);
 	const results = [];
 	if (methods.includes("headers") && normalizedInput.headers) {
 		const headerHubs = require_index$1.discoverHubsFromHeaders(normalizedInput.headers, normalizedInput.url, resolveUrlFn);

package/dist/hubs/discover/index.js

@@ -1,9 +1,8 @@
 import { resolveUrl } from "../../common/utils.js";
-import { defaultFetchFn } from "../../common/discover/utils.js";
+import { defaultFetchFn, normalizeInput } from "../../common/discover/utils.js";
 import { discoverHubsFromFeed } from "../feed/index.js";
 import { discoverHubsFromHeaders } from "../headers/index.js";
 import { discoverHubsFromHtml } from "../html/index.js";
-import { normalizeInput } from "./utils.js";
 //#region src/hubs/discover/index.ts
 const discoverHubs = async (input, options = {}) => {
 	const { methods = [

package/dist/hubs/feed/index.cjs

@@ -9,9 +9,9 @@ const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = require_utils.res
 		const { format, feed } = (0, feedsmith.parseFeed)(content);
 		if (format === "json") {
 			const hubs = feed.hubs ?? [];
-			const topic = feed.feed_url ? resolveUrlFn(feed.feed_url, baseUrl) : baseUrl;
+			const topic = feed.feed_url ? resolveUrlFn(feed.feed_url, baseUrl) ?? feed.feed_url : baseUrl;
 			return hubs.filter((hub) => hub.url).map((hub) => ({
-				hub: resolveUrlFn(hub.url, baseUrl),
+				hub: resolveUrlFn(hub.url, baseUrl) ?? hub.url,
 				topic
 			}));
 		}
@@ -19,9 +19,9 @@ const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = require_utils.res
 		const hubUris = getLinksWithRel(links, "hub");
 		if (hubUris.length > 0) {
 			const selfUris = getLinksWithRel(links, "self");
-			const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
+			const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
 			return hubUris.map((hub) => ({
-				hub: resolveUrlFn(hub, baseUrl),
+				hub: resolveUrlFn(hub, baseUrl) ?? hub,
 				topic
 			}));
 		}

package/dist/hubs/feed/index.js

@@ -9,9 +9,9 @@ const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = resolveUrl) => {
 		const { format, feed } = parseFeed(content);
 		if (format === "json") {
 			const hubs = feed.hubs ?? [];
-			const topic = feed.feed_url ? resolveUrlFn(feed.feed_url, baseUrl) : baseUrl;
+			const topic = feed.feed_url ? resolveUrlFn(feed.feed_url, baseUrl) ?? feed.feed_url : baseUrl;
 			return hubs.filter((hub) => hub.url).map((hub) => ({
-				hub: resolveUrlFn(hub.url, baseUrl),
+				hub: resolveUrlFn(hub.url, baseUrl) ?? hub.url,
 				topic
 			}));
 		}
@@ -19,9 +19,9 @@ const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = resolveUrl) => {
 		const hubUris = getLinksWithRel(links, "hub");
 		if (hubUris.length > 0) {
 			const selfUris = getLinksWithRel(links, "self");
-			const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
+			const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
 			return hubUris.map((hub) => ({
-				hub: resolveUrlFn(hub, baseUrl),
+				hub: resolveUrlFn(hub, baseUrl) ?? hub,
 				topic
 			}));
 		}

package/dist/hubs/headers/index.cjs

@@ -7,9 +7,9 @@ const discoverHubsFromHeaders = (headers, baseUrl, resolveUrlFn = require_utils.
 	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] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
+	const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
 	return hubUris.map((hub) => ({
-		hub: resolveUrlFn(hub, baseUrl),
+		hub: resolveUrlFn(hub, baseUrl) ?? hub,
 		topic
 	}));
 };

package/dist/hubs/headers/index.js

@@ -7,9 +7,9 @@ const discoverHubsFromHeaders = (headers, baseUrl, resolveUrlFn = resolveUrl) =>
 	const hubUris = discoverUrisFromHeaders(headers, { linkSelectors: hubSelector });
 	if (hubUris.length === 0) return [];
 	const selfUris = discoverUrisFromHeaders(headers, { linkSelectors: selfSelector });
-	const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
+	const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
 	return hubUris.map((hub) => ({
-		hub: resolveUrlFn(hub, baseUrl),
+		hub: resolveUrlFn(hub, baseUrl) ?? hub,
 		topic
 	}));
 };

package/dist/hubs/html/index.cjs

@@ -18,9 +18,9 @@ const discoverHubsFromHtml = (content, baseUrl, resolveUrlFn = require_utils.res
 		...htmlOptions,
 		linkSelectors: selfSelector
 	});
-	const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
+	const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
 	return hubUris.map((hub) => ({
-		hub: resolveUrlFn(hub, baseUrl),
+		hub: resolveUrlFn(hub, baseUrl) ?? hub,
 		topic
 	}));
 };

package/dist/hubs/html/index.js

@@ -18,9 +18,9 @@ const discoverHubsFromHtml = (content, baseUrl, resolveUrlFn = resolveUrl) => {
 		...htmlOptions,
 		linkSelectors: selfSelector
 	});
-	const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
+	const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
 	return hubUris.map((hub) => ({
-		hub: resolveUrlFn(hub, baseUrl),
+		hub: resolveUrlFn(hub, baseUrl) ?? hub,
 		topic
 	}));
 };

package/package.json

@@ -108,13 +108,14 @@
   },
   "dependencies": {
     "feedsmith": "^2.9.1",
-    "htmlparser2": "^10.1.0"
+    "htmlparser2": "^10.1.0",
+    "typescript": "^6.0.2"
   },
   "devDependencies": {
     "@types/bun": "^1.3.11",
-    "kvalita": "1.12.2",
+    "kvalita": "1.12.4",
     "tsdown": "^0.21.7",
     "vitepress": "^2.0.0-alpha.17"
   },
-  "version": "1.7.0"
+  "version": "1.8.0"
 }

package/dist/hubs/discover/utils.cjs

@@ -1,18 +0,0 @@
-//#region src/hubs/discover/utils.ts
-const normalizeInput = async (input, fetchFn) => {
-	if (typeof input === "string") {
-		const response = await fetchFn(input);
-		return {
-			url: response.url,
-			content: typeof response.body === "string" ? response.body : void 0,
-			headers: response.headers
-		};
-	}
-	return {
-		url: input.url,
-		content: input.content,
-		headers: input.headers
-	};
-};
-//#endregion
-exports.normalizeInput = normalizeInput;

package/dist/hubs/discover/utils.js

@@ -1,18 +0,0 @@
-//#region src/hubs/discover/utils.ts
-const normalizeInput = async (input, fetchFn) => {
-	if (typeof input === "string") {
-		const response = await fetchFn(input);
-		return {
-			url: response.url,
-			content: typeof response.body === "string" ? response.body : void 0,
-			headers: response.headers
-		};
-	}
-	return {
-		url: input.url,
-		content: input.content,
-		headers: input.headers
-	};
-};
-//#endregion
-export { normalizeInput };