feedscout 1.7.0 → 1.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/common/discover/utils.cjs +2 -2
- package/dist/common/discover/utils.js +2 -2
- package/dist/common/types.d.cts +1 -1
- package/dist/common/types.d.ts +1 -1
- package/dist/common/uris/guess/utils.cjs +1 -1
- package/dist/common/uris/guess/utils.js +1 -1
- package/dist/common/utils.cjs +5 -1
- package/dist/common/utils.js +5 -1
- package/dist/hubs/feed/index.cjs +4 -4
- package/dist/hubs/feed/index.js +4 -4
- package/dist/hubs/headers/index.cjs +2 -2
- package/dist/hubs/headers/index.js +2 -2
- package/dist/hubs/html/index.cjs +2 -2
- package/dist/hubs/html/index.js +2 -2
- package/package.json +2 -2
|
@@ -48,11 +48,11 @@ const defaultResolveSiteUrlFn = (input) => {
|
|
|
48
48
|
const normalizeUriEntry = (entry, resolveUrlFn, baseUrl) => {
|
|
49
49
|
if (typeof entry.uri === "string") return {
|
|
50
50
|
...entry,
|
|
51
|
-
uri: resolveUrlFn(entry.uri, baseUrl)
|
|
51
|
+
uri: resolveUrlFn(entry.uri, baseUrl) ?? entry.uri
|
|
52
52
|
};
|
|
53
53
|
return {
|
|
54
54
|
...entry,
|
|
55
|
-
uri: entry.uri.map((uri) => resolveUrlFn(uri, baseUrl))
|
|
55
|
+
uri: entry.uri.map((uri) => resolveUrlFn(uri, baseUrl) ?? uri)
|
|
56
56
|
};
|
|
57
57
|
};
|
|
58
58
|
const normalizeMethodsConfig = (sourceInput, siteInput, methods, defaults) => {
|
|
@@ -48,11 +48,11 @@ const defaultResolveSiteUrlFn = (input) => {
|
|
|
48
48
|
const normalizeUriEntry = (entry, resolveUrlFn, baseUrl) => {
|
|
49
49
|
if (typeof entry.uri === "string") return {
|
|
50
50
|
...entry,
|
|
51
|
-
uri: resolveUrlFn(entry.uri, baseUrl)
|
|
51
|
+
uri: resolveUrlFn(entry.uri, baseUrl) ?? entry.uri
|
|
52
52
|
};
|
|
53
53
|
return {
|
|
54
54
|
...entry,
|
|
55
|
-
uri: entry.uri.map((uri) => resolveUrlFn(uri, baseUrl))
|
|
55
|
+
uri: entry.uri.map((uri) => resolveUrlFn(uri, baseUrl) ?? uri)
|
|
56
56
|
};
|
|
57
57
|
};
|
|
58
58
|
const normalizeMethodsConfig = (sourceInput, siteInput, methods, defaults) => {
|
package/dist/common/types.d.cts
CHANGED
|
@@ -20,7 +20,7 @@ type LinkSelector = {
|
|
|
20
20
|
rel: string;
|
|
21
21
|
types?: Array<string>;
|
|
22
22
|
};
|
|
23
|
-
type DiscoverResolveUrlFn = (url: string, baseUrl: string | undefined) => string;
|
|
23
|
+
type DiscoverResolveUrlFn = (url: string, baseUrl: string | undefined) => string | undefined;
|
|
24
24
|
type DiscoverResolveSiteUrlFn = (input: DiscoverInputObject) => string | undefined;
|
|
25
25
|
type DiscoverFetchFnOptions = {
|
|
26
26
|
method?: 'GET' | 'HEAD';
|
package/dist/common/types.d.ts
CHANGED
|
@@ -20,7 +20,7 @@ type LinkSelector = {
|
|
|
20
20
|
rel: string;
|
|
21
21
|
types?: Array<string>;
|
|
22
22
|
};
|
|
23
|
-
type DiscoverResolveUrlFn = (url: string, baseUrl: string | undefined) => string;
|
|
23
|
+
type DiscoverResolveUrlFn = (url: string, baseUrl: string | undefined) => string | undefined;
|
|
24
24
|
type DiscoverResolveSiteUrlFn = (input: DiscoverInputObject) => string | undefined;
|
|
25
25
|
type DiscoverFetchFnOptions = {
|
|
26
26
|
method?: 'GET' | 'HEAD';
|
|
@@ -3,7 +3,7 @@ const ipAddressRegex = /^\d+\.\d+\.\d+\.\d+$/;
|
|
|
3
3
|
const resolveUri = (uri, base, origin, pathname) => {
|
|
4
4
|
if (uri.startsWith("/")) return `${origin}${uri}`;
|
|
5
5
|
if (uri.startsWith("?")) return `${origin}${pathname}${uri}`;
|
|
6
|
-
return new URL(uri, base).
|
|
6
|
+
return new URL(uri, base).href;
|
|
7
7
|
};
|
|
8
8
|
const generateUrlCombinations = (baseUrls, uris) => {
|
|
9
9
|
return baseUrls.flatMap((base) => {
|
|
@@ -3,7 +3,7 @@ const ipAddressRegex = /^\d+\.\d+\.\d+\.\d+$/;
|
|
|
3
3
|
const resolveUri = (uri, base, origin, pathname) => {
|
|
4
4
|
if (uri.startsWith("/")) return `${origin}${uri}`;
|
|
5
5
|
if (uri.startsWith("?")) return `${origin}${pathname}${uri}`;
|
|
6
|
-
return new URL(uri, base).
|
|
6
|
+
return new URL(uri, base).href;
|
|
7
7
|
};
|
|
8
8
|
const generateUrlCombinations = (baseUrls, uris) => {
|
|
9
9
|
return baseUrls.flatMap((base) => {
|
package/dist/common/utils.cjs
CHANGED
|
@@ -53,7 +53,11 @@ const omitEmpty = (array) => {
|
|
|
53
53
|
return result;
|
|
54
54
|
};
|
|
55
55
|
const resolveUrl = (url, baseUrl) => {
|
|
56
|
-
|
|
56
|
+
try {
|
|
57
|
+
return new URL(url, baseUrl).href;
|
|
58
|
+
} catch {
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
57
61
|
};
|
|
58
62
|
const matchesAnyOfLinkSelectors = (rel, type, selectors) => {
|
|
59
63
|
return selectors.some((selector) => {
|
package/dist/common/utils.js
CHANGED
|
@@ -53,7 +53,11 @@ const omitEmpty = (array) => {
|
|
|
53
53
|
return result;
|
|
54
54
|
};
|
|
55
55
|
const resolveUrl = (url, baseUrl) => {
|
|
56
|
-
|
|
56
|
+
try {
|
|
57
|
+
return new URL(url, baseUrl).href;
|
|
58
|
+
} catch {
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
57
61
|
};
|
|
58
62
|
const matchesAnyOfLinkSelectors = (rel, type, selectors) => {
|
|
59
63
|
return selectors.some((selector) => {
|
package/dist/hubs/feed/index.cjs
CHANGED
|
@@ -9,9 +9,9 @@ const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = require_utils.res
|
|
|
9
9
|
const { format, feed } = (0, feedsmith.parseFeed)(content);
|
|
10
10
|
if (format === "json") {
|
|
11
11
|
const hubs = feed.hubs ?? [];
|
|
12
|
-
const topic = feed.feed_url ? resolveUrlFn(feed.feed_url, baseUrl) : baseUrl;
|
|
12
|
+
const topic = feed.feed_url ? resolveUrlFn(feed.feed_url, baseUrl) ?? feed.feed_url : baseUrl;
|
|
13
13
|
return hubs.filter((hub) => hub.url).map((hub) => ({
|
|
14
|
-
hub: resolveUrlFn(hub.url, baseUrl),
|
|
14
|
+
hub: resolveUrlFn(hub.url, baseUrl) ?? hub.url,
|
|
15
15
|
topic
|
|
16
16
|
}));
|
|
17
17
|
}
|
|
@@ -19,9 +19,9 @@ const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = require_utils.res
|
|
|
19
19
|
const hubUris = getLinksWithRel(links, "hub");
|
|
20
20
|
if (hubUris.length > 0) {
|
|
21
21
|
const selfUris = getLinksWithRel(links, "self");
|
|
22
|
-
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
|
|
22
|
+
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
|
|
23
23
|
return hubUris.map((hub) => ({
|
|
24
|
-
hub: resolveUrlFn(hub, baseUrl),
|
|
24
|
+
hub: resolveUrlFn(hub, baseUrl) ?? hub,
|
|
25
25
|
topic
|
|
26
26
|
}));
|
|
27
27
|
}
|
package/dist/hubs/feed/index.js
CHANGED
|
@@ -9,9 +9,9 @@ const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = resolveUrl) => {
|
|
|
9
9
|
const { format, feed } = parseFeed(content);
|
|
10
10
|
if (format === "json") {
|
|
11
11
|
const hubs = feed.hubs ?? [];
|
|
12
|
-
const topic = feed.feed_url ? resolveUrlFn(feed.feed_url, baseUrl) : baseUrl;
|
|
12
|
+
const topic = feed.feed_url ? resolveUrlFn(feed.feed_url, baseUrl) ?? feed.feed_url : baseUrl;
|
|
13
13
|
return hubs.filter((hub) => hub.url).map((hub) => ({
|
|
14
|
-
hub: resolveUrlFn(hub.url, baseUrl),
|
|
14
|
+
hub: resolveUrlFn(hub.url, baseUrl) ?? hub.url,
|
|
15
15
|
topic
|
|
16
16
|
}));
|
|
17
17
|
}
|
|
@@ -19,9 +19,9 @@ const discoverHubsFromFeed = (content, baseUrl, resolveUrlFn = resolveUrl) => {
|
|
|
19
19
|
const hubUris = getLinksWithRel(links, "hub");
|
|
20
20
|
if (hubUris.length > 0) {
|
|
21
21
|
const selfUris = getLinksWithRel(links, "self");
|
|
22
|
-
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
|
|
22
|
+
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
|
|
23
23
|
return hubUris.map((hub) => ({
|
|
24
|
-
hub: resolveUrlFn(hub, baseUrl),
|
|
24
|
+
hub: resolveUrlFn(hub, baseUrl) ?? hub,
|
|
25
25
|
topic
|
|
26
26
|
}));
|
|
27
27
|
}
|
|
@@ -7,9 +7,9 @@ const discoverHubsFromHeaders = (headers, baseUrl, resolveUrlFn = require_utils.
|
|
|
7
7
|
const hubUris = require_index.discoverUrisFromHeaders(headers, { linkSelectors: hubSelector });
|
|
8
8
|
if (hubUris.length === 0) return [];
|
|
9
9
|
const selfUris = require_index.discoverUrisFromHeaders(headers, { linkSelectors: selfSelector });
|
|
10
|
-
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
|
|
10
|
+
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
|
|
11
11
|
return hubUris.map((hub) => ({
|
|
12
|
-
hub: resolveUrlFn(hub, baseUrl),
|
|
12
|
+
hub: resolveUrlFn(hub, baseUrl) ?? hub,
|
|
13
13
|
topic
|
|
14
14
|
}));
|
|
15
15
|
};
|
|
@@ -7,9 +7,9 @@ const discoverHubsFromHeaders = (headers, baseUrl, resolveUrlFn = resolveUrl) =>
|
|
|
7
7
|
const hubUris = discoverUrisFromHeaders(headers, { linkSelectors: hubSelector });
|
|
8
8
|
if (hubUris.length === 0) return [];
|
|
9
9
|
const selfUris = discoverUrisFromHeaders(headers, { linkSelectors: selfSelector });
|
|
10
|
-
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
|
|
10
|
+
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
|
|
11
11
|
return hubUris.map((hub) => ({
|
|
12
|
-
hub: resolveUrlFn(hub, baseUrl),
|
|
12
|
+
hub: resolveUrlFn(hub, baseUrl) ?? hub,
|
|
13
13
|
topic
|
|
14
14
|
}));
|
|
15
15
|
};
|
package/dist/hubs/html/index.cjs
CHANGED
|
@@ -18,9 +18,9 @@ const discoverHubsFromHtml = (content, baseUrl, resolveUrlFn = require_utils.res
|
|
|
18
18
|
...htmlOptions,
|
|
19
19
|
linkSelectors: selfSelector
|
|
20
20
|
});
|
|
21
|
-
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
|
|
21
|
+
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
|
|
22
22
|
return hubUris.map((hub) => ({
|
|
23
|
-
hub: resolveUrlFn(hub, baseUrl),
|
|
23
|
+
hub: resolveUrlFn(hub, baseUrl) ?? hub,
|
|
24
24
|
topic
|
|
25
25
|
}));
|
|
26
26
|
};
|
package/dist/hubs/html/index.js
CHANGED
|
@@ -18,9 +18,9 @@ const discoverHubsFromHtml = (content, baseUrl, resolveUrlFn = resolveUrl) => {
|
|
|
18
18
|
...htmlOptions,
|
|
19
19
|
linkSelectors: selfSelector
|
|
20
20
|
});
|
|
21
|
-
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) : baseUrl;
|
|
21
|
+
const topic = selfUris[0] ? resolveUrlFn(selfUris[0], baseUrl) ?? selfUris[0] : baseUrl;
|
|
22
22
|
return hubUris.map((hub) => ({
|
|
23
|
-
hub: resolveUrlFn(hub, baseUrl),
|
|
23
|
+
hub: resolveUrlFn(hub, baseUrl) ?? hub,
|
|
24
24
|
topic
|
|
25
25
|
}));
|
|
26
26
|
};
|
package/package.json
CHANGED