@fedify/vocab-runtime 2.4.0-dev.1564 → 2.4.0-dev.1570

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.
Files changed (42) hide show
  1. package/deno.json +1 -2
  2. package/dist/mod.cjs +190 -107
  3. package/dist/mod.d.cts +200 -18
  4. package/dist/mod.d.ts +200 -18
  5. package/dist/mod.js +184 -97
  6. package/dist/tests/decimal.test.cjs +2 -2
  7. package/dist/tests/decimal.test.mjs +2 -2
  8. package/dist/tests/{docloader-CYQvKbtL.mjs → docloader-C76ldE5C.mjs} +10 -97
  9. package/dist/tests/{docloader-UAdXnDwt.cjs → docloader-mvgIWKI7.cjs} +9 -102
  10. package/dist/tests/docloader.test.cjs +6 -58
  11. package/dist/tests/docloader.test.mjs +6 -58
  12. package/dist/tests/{request-DgAlI7RF.mjs → request-BEXkv1ul.mjs} +1 -1
  13. package/dist/tests/{request-DnzhAfki.cjs → request-SworbvLc.cjs} +1 -1
  14. package/dist/tests/request.test.cjs +1 -1
  15. package/dist/tests/request.test.mjs +1 -1
  16. package/dist/tests/{url-2XwVbUS_.cjs → url-C20FhC7p.cjs} +0 -108
  17. package/dist/tests/{url-YWJbnRlf.mjs → url-m9Qzxy-Y.mjs} +1 -85
  18. package/dist/tests/url.test.cjs +1 -104
  19. package/dist/tests/url.test.mjs +2 -105
  20. package/package.json +1 -11
  21. package/src/contexts.ts +0 -2
  22. package/src/docloader.test.ts +6 -102
  23. package/src/docloader.ts +8 -76
  24. package/src/mod.ts +0 -4
  25. package/src/url.test.ts +1 -252
  26. package/src/url.ts +0 -141
  27. package/tsdown.config.ts +1 -6
  28. package/dist/docloader-DnUMWHaJ.d.cts +0 -202
  29. package/dist/docloader-xRGn1azD.d.ts +0 -202
  30. package/dist/internal/jsonld-cache.cjs +0 -279
  31. package/dist/internal/jsonld-cache.d.cts +0 -48
  32. package/dist/internal/jsonld-cache.d.ts +0 -48
  33. package/dist/internal/jsonld-cache.js +0 -275
  34. package/dist/tests/jsonld-cache.test.cjs +0 -652
  35. package/dist/tests/jsonld-cache.test.d.cts +0 -1
  36. package/dist/tests/jsonld-cache.test.d.mts +0 -1
  37. package/dist/tests/jsonld-cache.test.mjs +0 -651
  38. package/dist/url-BAdyyqAa.cjs +0 -315
  39. package/dist/url-BuxPHxK2.js +0 -261
  40. package/src/contexts/fep-7aa9.json +0 -24
  41. package/src/internal/jsonld-cache.ts +0 -538
  42. package/src/jsonld-cache.test.ts +0 -554
package/dist/mod.d.ts CHANGED
@@ -1,10 +1,208 @@
1
1
  /// <reference lib="esnext.temporal" />
2
- import { a as DocumentLoaderOptions, c as getDocumentLoader, d as FetchError, f as GetUserAgentOptions, h as logRequest, i as DocumentLoaderFactoryOptions, l as getRemoteDocument, m as getUserAgent, n as DocumentLoader, o as GetDocumentLoaderOptions, p as createActivityPubRequest, r as DocumentLoaderFactory, s as RemoteDocument, t as AuthenticatedDocumentLoaderFactory, u as CreateRequestOptions } from "./docloader-xRGn1azD.js";
2
+ import { Logger } from "@logtape/logtape";
3
3
  import { TracerProvider } from "@opentelemetry/api";
4
4
 
5
5
  //#region src/contexts.d.ts
6
6
  declare const preloadedContexts: Record<string, unknown>;
7
7
  //#endregion
8
+ //#region src/request.d.ts
9
+ /**
10
+ * Error thrown when fetching a JSON-LD document failed.
11
+ */
12
+ declare class FetchError extends Error {
13
+ /**
14
+ * The URL that failed to fetch.
15
+ */
16
+ url: URL;
17
+ /**
18
+ * The HTTP response that failed, if available.
19
+ */
20
+ response?: Response;
21
+ /**
22
+ * Constructs a new `FetchError`.
23
+ *
24
+ * @param url The URL that failed to fetch.
25
+ * @param message Error message.
26
+ * @param response The failed HTTP response, if available.
27
+ */
28
+ constructor(url: URL | string, message?: string, response?: Response);
29
+ }
30
+ /**
31
+ * Options for creating a request.
32
+ * @internal
33
+ */
34
+ interface CreateRequestOptions {
35
+ userAgent?: GetUserAgentOptions | string;
36
+ }
37
+ /**
38
+ * Creates a request for the given URL.
39
+ * @param url The URL to create the request for.
40
+ * @param options The options for the request.
41
+ * @returns The created request.
42
+ * @internal
43
+ */
44
+ declare function createActivityPubRequest(url: string, options?: CreateRequestOptions): Request;
45
+ /**
46
+ * Options for making `User-Agent` string.
47
+ * @see {@link getUserAgent}
48
+ * @since 1.3.0
49
+ */
50
+ interface GetUserAgentOptions {
51
+ /**
52
+ * An optional software name and version, e.g., `"Hollo/1.0.0"`.
53
+ */
54
+ software?: string | null;
55
+ /**
56
+ * An optional URL to append to the user agent string.
57
+ * Usually the URL of the ActivityPub instance.
58
+ */
59
+ url?: string | URL | null;
60
+ }
61
+ /**
62
+ * Gets the user agent string for the given application and URL.
63
+ * @param options The options for making the user agent string.
64
+ * @returns The user agent string.
65
+ * @since 1.3.0
66
+ */
67
+ declare function getUserAgent({
68
+ software,
69
+ url
70
+ }?: GetUserAgentOptions): string;
71
+ /**
72
+ * Logs the request.
73
+ * @param request The request to log.
74
+ * @internal
75
+ */
76
+ declare function logRequest(logger: Logger, request: Request): void;
77
+ //#endregion
78
+ //#region src/docloader.d.ts
79
+ /**
80
+ * A remote JSON-LD document and its context fetched by
81
+ * a {@link DocumentLoader}.
82
+ */
83
+ interface RemoteDocument {
84
+ /**
85
+ * The URL of the context document.
86
+ */
87
+ contextUrl: string | null;
88
+ /**
89
+ * The fetched JSON-LD document.
90
+ */
91
+ document: unknown;
92
+ /**
93
+ * The URL of the fetched document.
94
+ */
95
+ documentUrl: string;
96
+ }
97
+ /**
98
+ * Options for {@link DocumentLoader}.
99
+ * @since 1.8.0
100
+ */
101
+ interface DocumentLoaderOptions {
102
+ /**
103
+ * An `AbortSignal` for cancellation.
104
+ * @since 1.8.0
105
+ */
106
+ signal?: AbortSignal;
107
+ }
108
+ /**
109
+ * A JSON-LD document loader that fetches documents from the Web.
110
+ * @param url The URL of the document to load.
111
+ * @param options The options for the document loader.
112
+ * @returns The loaded remote document.
113
+ */
114
+ type DocumentLoader = (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>;
115
+ /**
116
+ * A factory function that creates a {@link DocumentLoader} with options.
117
+ * @param options The options for the document loader.
118
+ * @returns The document loader.
119
+ * @since 1.4.0
120
+ */
121
+ type DocumentLoaderFactory = (options?: DocumentLoaderFactoryOptions) => DocumentLoader;
122
+ /**
123
+ * Options for {@link DocumentLoaderFactory}.
124
+ * @see {@link DocumentLoaderFactory}
125
+ * @see {@link AuthenticatedDocumentLoaderFactory}
126
+ * @since 1.4.0
127
+ */
128
+ interface DocumentLoaderFactoryOptions {
129
+ /**
130
+ * Whether to allow fetching private network addresses.
131
+ * Turned off by default.
132
+ * @default `false``
133
+ */
134
+ allowPrivateAddress?: boolean;
135
+ /**
136
+ * Options for making `User-Agent` string.
137
+ * If a string is given, it is used as the `User-Agent` header value.
138
+ * If an object is given, it is passed to {@link getUserAgent} function.
139
+ */
140
+ userAgent?: GetUserAgentOptions | string;
141
+ /**
142
+ * The maximum number of redirections to follow.
143
+ * @default `20`
144
+ * @since 2.2.0
145
+ */
146
+ maxRedirection?: number;
147
+ }
148
+ /**
149
+ * A factory function that creates an authenticated {@link DocumentLoader} for
150
+ * a given identity. This is used for fetching documents that require
151
+ * authentication.
152
+ * @param identity The identity to create the document loader for.
153
+ * The actor's key pair.
154
+ * @param options The options for the document loader.
155
+ * @returns The authenticated document loader.
156
+ * @since 0.4.0
157
+ */
158
+ type AuthenticatedDocumentLoaderFactory = (identity: {
159
+ keyId: URL;
160
+ privateKey: CryptoKey;
161
+ }, options?: DocumentLoaderFactoryOptions) => DocumentLoader;
162
+ /**
163
+ * Gets a {@link RemoteDocument} from the given response.
164
+ * @param url The URL of the document to load.
165
+ * @param response The response to get the document from.
166
+ * @param fetch The function to fetch the document.
167
+ * @returns The loaded remote document.
168
+ * @throws {FetchError} If the response is not OK.
169
+ * @internal
170
+ */
171
+ declare function getRemoteDocument(url: string, response: Response, fetch: (url: string, options?: DocumentLoaderOptions) => Promise<RemoteDocument>): Promise<RemoteDocument>;
172
+ /**
173
+ * Options for {@link getDocumentLoader}.
174
+ * @since 1.3.0
175
+ */
176
+ interface GetDocumentLoaderOptions extends DocumentLoaderFactoryOptions {
177
+ /**
178
+ * Whether to preload the frequently used contexts.
179
+ */
180
+ skipPreloadedContexts?: boolean;
181
+ }
182
+ /**
183
+ * Creates a JSON-LD document loader that utilizes the browser's `fetch` API.
184
+ *
185
+ * The created loader preloads the below frequently used contexts by default
186
+ * (unless `options.skipPreloadedContexts` is set to `true`):
187
+ *
188
+ * - <https://www.w3.org/ns/activitystreams>
189
+ * - <https://w3id.org/security/v1>
190
+ * - <https://w3id.org/security/data-integrity/v1>
191
+ * - <https://www.w3.org/ns/did/v1>
192
+ * - <https://w3id.org/security/multikey/v1>
193
+ * - <https://purl.archive.org/socialweb/webfinger>
194
+ * - <http://schema.org/>
195
+ * @param options Options for the document loader.
196
+ * @returns The document loader.
197
+ * @since 1.3.0
198
+ */
199
+ declare function getDocumentLoader({
200
+ allowPrivateAddress,
201
+ maxRedirection,
202
+ skipPreloadedContexts,
203
+ userAgent
204
+ }?: GetDocumentLoaderOptions): DocumentLoader;
205
+ //#endregion
8
206
  //#region src/key.d.ts
9
207
  /**
10
208
  * Imports a PEM-SPKI formatted public key.
@@ -263,22 +461,6 @@ declare class UrlError extends Error {
263
461
  constructor(message: string);
264
462
  }
265
463
  /**
266
- * Parses a JSON-LD `@id` value as an IRI.
267
- */
268
- declare function parseJsonLdId(id: string | undefined, base?: string | URL): URL | undefined;
269
- /**
270
- * Parses an IRI as a URL, including FEP-ef61 portable ActivityPub IRIs.
271
- */
272
- declare function parseIri(iri: string | URL, base?: string | URL): URL;
273
- /**
274
- * Formats a URL as an IRI, including FEP-ef61 portable ActivityPub IRIs.
275
- */
276
- declare function formatIri(iri: string | URL): string;
277
- /**
278
- * Checks whether two IRIs have the same origin.
279
- */
280
- declare function haveSameIriOrigin(left: URL, right: URL): boolean;
281
- /**
282
464
  * Validates a URL to prevent SSRF attacks.
283
465
  */
284
466
  declare function validatePublicUrl(url: string): Promise<void>;
@@ -286,4 +468,4 @@ declare function isValidPublicIPv4Address(address: string): boolean;
286
468
  declare function isValidPublicIPv6Address(address: string): boolean;
287
469
  declare function expandIPv6Address(address: string): string;
288
470
  //#endregion
289
- export { type AuthenticatedDocumentLoaderFactory, type CreateRequestOptions, type Decimal, type DocumentLoader, type DocumentLoaderFactory, type DocumentLoaderFactoryOptions, type DocumentLoaderOptions, FetchError, type GetDocumentLoaderOptions, type GetUserAgentOptions, type Json, LanguageString, type PropertyPreprocessor, type PropertyPreprocessorContext, type RemoteDocument, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportMultibaseKey, exportSpki, formatIri, getDocumentLoader, getRemoteDocument, getUserAgent, haveSameIriOrigin, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, parseIri, parseJsonLdId, preloadedContexts, validatePublicUrl };
471
+ export { type AuthenticatedDocumentLoaderFactory, type CreateRequestOptions, type Decimal, type DocumentLoader, type DocumentLoaderFactory, type DocumentLoaderFactoryOptions, type DocumentLoaderOptions, FetchError, type GetDocumentLoaderOptions, type GetUserAgentOptions, type Json, LanguageString, type PropertyPreprocessor, type PropertyPreprocessorContext, type RemoteDocument, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportMultibaseKey, exportSpki, getDocumentLoader, getRemoteDocument, getUserAgent, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, preloadedContexts, validatePublicUrl };
package/dist/mod.js CHANGED
@@ -1,8 +1,9 @@
1
1
 
2
- import { a as isValidPublicIPv4Address, c as parseJsonLdId, i as haveSameIriOrigin, l as validatePublicUrl, n as expandIPv6Address, o as isValidPublicIPv6Address, r as formatIri, s as parseIri, t as UrlError } from "./url-BuxPHxK2.js";
3
2
  import { getLogger } from "@logtape/logtape";
4
3
  import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
5
4
  import process from "node:process";
5
+ import { lookup } from "node:dns/promises";
6
+ import { isIP } from "node:net";
6
7
  import { Integer, Sequence } from "asn1js";
7
8
  import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
8
9
  import { decodeBase64Url } from "byte-encodings/base64url";
@@ -4283,28 +4284,6 @@ const preloadedContexts = {
4283
4284
  "@type": "@id"
4284
4285
  }
4285
4286
  } },
4286
- "https://w3id.org/fep/7aa9": { "@context": {
4287
- "FeaturedCollection": "https://w3id.org/fep/7aa9#FeaturedCollection",
4288
- "FeaturedItem": "https://w3id.org/fep/7aa9#FeaturedItem",
4289
- "FeatureRequest": "https://w3id.org/fep/7aa9#FeatureRequest",
4290
- "FeatureAuthorization": "https://w3id.org/fep/7aa9#FeatureAuthorization",
4291
- "topic": {
4292
- "@id": "https://w3id.org/fep/7aa9#topic",
4293
- "@type": "@id"
4294
- },
4295
- "featuredObject": {
4296
- "@id": "https://w3id.org/fep/7aa9#featuredObject",
4297
- "@type": "@id"
4298
- },
4299
- "canFeature": {
4300
- "@id": "https://w3id.org/fep/7aa9#canFeature",
4301
- "@type": "@id"
4302
- },
4303
- "featureAuthorization": {
4304
- "@id": "https://w3id.org/fep/7aa9#featureAuthorization",
4305
- "@type": "@id"
4306
- }
4307
- } },
4308
4287
  "https://join-lemmy.org/context.json": { "@context": ["https://w3id.org/security/v1", {
4309
4288
  "as": "https://www.w3.org/ns/activitystreams#",
4310
4289
  "lemmy": "https://join-lemmy.org/ns#",
@@ -4363,7 +4342,7 @@ const preloadedContexts = {
4363
4342
  //#endregion
4364
4343
  //#region deno.json
4365
4344
  var name = "@fedify/vocab-runtime";
4366
- var version = "2.4.0-dev.1564+5a2c6c2c";
4345
+ var version = "2.4.0-dev.1570+f1b6aaa3";
4367
4346
  //#endregion
4368
4347
  //#region src/link.ts
4369
4348
  const parametersNeedLowerCase = ["rel", "type"];
@@ -4616,6 +4595,179 @@ function logRequest(logger, request) {
4616
4595
  });
4617
4596
  }
4618
4597
  //#endregion
4598
+ //#region src/url.ts
4599
+ var UrlError = class extends Error {
4600
+ constructor(message) {
4601
+ super(message);
4602
+ this.name = "UrlError";
4603
+ }
4604
+ };
4605
+ /**
4606
+ * Validates a URL to prevent SSRF attacks.
4607
+ */
4608
+ async function validatePublicUrl(url) {
4609
+ const parsed = new URL(url);
4610
+ if (parsed.protocol !== "http:" && parsed.protocol !== "https:") throw new UrlError(`Unsupported protocol: ${parsed.protocol}`);
4611
+ let hostname = parsed.hostname;
4612
+ if (hostname.startsWith("[") && hostname.endsWith("]")) hostname = hostname.slice(1, -1);
4613
+ if (hostname === "localhost") throw new UrlError("Localhost is not allowed");
4614
+ const hostnameFamily = isIP(hostname);
4615
+ if (hostnameFamily !== 0) {
4616
+ validatePublicIpAddress(hostname, hostnameFamily);
4617
+ return;
4618
+ }
4619
+ if ("Deno" in globalThis && !isIP(hostname)) {
4620
+ if ((await Deno.permissions.query({ name: "net" })).state !== "granted") return;
4621
+ }
4622
+ if ("Bun" in globalThis) {
4623
+ if (hostname === "example.com" || hostname.endsWith(".example.com")) return;
4624
+ else if (hostname === "fedify-test.internal") throw new UrlError("Invalid or private address: fedify-test.internal");
4625
+ }
4626
+ let addresses;
4627
+ try {
4628
+ addresses = await lookup(hostname, { all: true });
4629
+ } catch {
4630
+ addresses = [];
4631
+ }
4632
+ for (const { address, family } of addresses) validatePublicIpAddress(address, family);
4633
+ }
4634
+ function validatePublicIpAddress(address, family) {
4635
+ if (family === 4 && isValidPublicIPv4Address(address) || family === 6 && isValidPublicIPv6Address(address)) return;
4636
+ throw new UrlError(`Invalid or private address: ${address}`);
4637
+ }
4638
+ function isValidPublicIPv4Address(address) {
4639
+ const parts = parseIPv4Address(address);
4640
+ if (parts == null) return false;
4641
+ const value = ipv4PartsToNumber(parts);
4642
+ return !nonPublicIPv4Prefixes.some(({ base, prefix }) => matchesIPv4Prefix(value, base, prefix));
4643
+ }
4644
+ function isValidPublicIPv6Address(address) {
4645
+ const words = parseIPv6Address(address);
4646
+ if (words == null) return false;
4647
+ if (nonPublicIPv6Prefixes.some(({ words: prefixWords, prefix }) => matchesIPv6Prefix(words, prefixWords, prefix))) return false;
4648
+ for (const { extractIPv4, prefix, words: prefixWords } of ipv6WithIPv4Prefixes) {
4649
+ if (!matchesIPv6Prefix(words, prefixWords, prefix)) continue;
4650
+ const ipv4Address = extractIPv4(words);
4651
+ if (ipv4Address != null && !isValidPublicIPv4Address(ipv4Address)) return false;
4652
+ }
4653
+ return true;
4654
+ }
4655
+ function expandIPv6Address(address) {
4656
+ address = address.toLowerCase();
4657
+ const ipv4Delimiter = address.lastIndexOf(":");
4658
+ if (address.includes(".") && ipv4Delimiter >= 0) {
4659
+ const ipv4Parts = parseIPv4Address(address.substring(ipv4Delimiter + 1));
4660
+ if (ipv4Parts == null) return address;
4661
+ const high = (ipv4Parts[0] << 8) + ipv4Parts[1];
4662
+ const low = (ipv4Parts[2] << 8) + ipv4Parts[3];
4663
+ address = address.substring(0, ipv4Delimiter + 1) + high.toString(16) + ":" + low.toString(16);
4664
+ }
4665
+ if (address === "::") return "0000:0000:0000:0000:0000:0000:0000:0000";
4666
+ if (address.startsWith("::")) address = "0000" + address;
4667
+ if (address.endsWith("::")) address = address + "0000";
4668
+ address = address.replace("::", ":0000".repeat(8 - (address.match(/:/g) || []).length) + ":");
4669
+ return address.split(":").map((part) => part.padStart(4, "0")).join(":");
4670
+ }
4671
+ const nonPublicIPv4Prefixes = [
4672
+ ipv4Prefix("0.0.0.0/8", "RFC 6890"),
4673
+ ipv4Prefix("10.0.0.0/8", "RFC 1918"),
4674
+ ipv4Prefix("100.64.0.0/10", "RFC 6598"),
4675
+ ipv4Prefix("127.0.0.0/8", "RFC 1122"),
4676
+ ipv4Prefix("169.254.0.0/16", "RFC 3927"),
4677
+ ipv4Prefix("172.16.0.0/12", "RFC 1918"),
4678
+ ipv4Prefix("192.0.0.0/24", "RFC 6890"),
4679
+ ipv4Prefix("192.0.2.0/24", "RFC 5737"),
4680
+ ipv4Prefix("192.88.99.0/24", "RFC 7526"),
4681
+ ipv4Prefix("192.168.0.0/16", "RFC 1918"),
4682
+ ipv4Prefix("198.18.0.0/15", "RFC 2544"),
4683
+ ipv4Prefix("198.51.100.0/24", "RFC 5737"),
4684
+ ipv4Prefix("203.0.113.0/24", "RFC 5737"),
4685
+ ipv4Prefix("224.0.0.0/4", "RFC 5771"),
4686
+ ipv4Prefix("240.0.0.0/4", "RFC 1112")
4687
+ ];
4688
+ const nonPublicIPv6Prefixes = [
4689
+ ipv6Prefix("::/16", "RFC 4291"),
4690
+ ipv6Prefix("2001::/32", "RFC 4380"),
4691
+ ipv6Prefix("2002::/16", "RFC 3056"),
4692
+ ipv6Prefix("64:ff9b:1::/48", "RFC 8215"),
4693
+ ipv6Prefix("fc00::/7", "RFC 4193"),
4694
+ ipv6Prefix("fe80::/10", "RFC 4291"),
4695
+ ipv6Prefix("ff00::/8", "RFC 4291")
4696
+ ];
4697
+ const ipv6WithIPv4Prefixes = [{
4698
+ ...ipv6Prefix("64:ff9b::/96", "RFC 6052"),
4699
+ extractIPv4: (words) => ipv4FromWords(words[6], words[7])
4700
+ }];
4701
+ function ipv4Prefix(cidr, rfc) {
4702
+ const [address, prefixText] = cidr.split("/");
4703
+ const prefix = parseInt(prefixText, 10);
4704
+ const parts = parseIPv4Address(address);
4705
+ if (parts == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 32) throw new Error(`Invalid IPv4 prefix: ${cidr}`);
4706
+ return {
4707
+ cidr,
4708
+ base: ipv4PartsToNumber(parts),
4709
+ prefix,
4710
+ rfc
4711
+ };
4712
+ }
4713
+ function ipv6Prefix(cidr, rfc) {
4714
+ const [address, prefixText] = cidr.split("/");
4715
+ const prefix = parseInt(prefixText, 10);
4716
+ const words = parseIPv6Address(address);
4717
+ if (words == null || !Number.isInteger(prefix) || prefix < 0 || prefix > 128) throw new Error(`Invalid IPv6 prefix: ${cidr}`);
4718
+ return {
4719
+ cidr,
4720
+ words,
4721
+ prefix,
4722
+ rfc
4723
+ };
4724
+ }
4725
+ function parseIPv4Address(address) {
4726
+ const parts = address.split(".").map((part) => {
4727
+ if (!/^\d+$/.test(part)) return NaN;
4728
+ return parseInt(part, 10);
4729
+ });
4730
+ if (parts.length !== 4 || parts.some((part) => !Number.isInteger(part) || part < 0 || part > 255)) return null;
4731
+ return parts;
4732
+ }
4733
+ function parseIPv6Address(address) {
4734
+ const parts = expandIPv6Address(address).split(":");
4735
+ if (parts.length !== 8) return null;
4736
+ const words = parts.map((part) => {
4737
+ if (!/^[0-9a-f]{1,4}$/i.test(part)) return NaN;
4738
+ return parseInt(part, 16);
4739
+ });
4740
+ if (words.some((word) => !Number.isInteger(word) || word < 0 || word > 65535)) return null;
4741
+ return words;
4742
+ }
4743
+ function ipv4PartsToNumber(parts) {
4744
+ return parts[0] * 2 ** 24 + parts[1] * 2 ** 16 + parts[2] * 2 ** 8 + parts[3];
4745
+ }
4746
+ function ipv4FromWords(highWord, lowWord) {
4747
+ return [
4748
+ highWord >> 8,
4749
+ highWord & 255,
4750
+ lowWord >> 8,
4751
+ lowWord & 255
4752
+ ].join(".");
4753
+ }
4754
+ function matchesIPv4Prefix(address, prefixBase, prefixLength) {
4755
+ const blockSize = 2 ** (32 - prefixLength);
4756
+ return Math.floor(address / blockSize) === Math.floor(prefixBase / blockSize);
4757
+ }
4758
+ function matchesIPv6Prefix(address, prefixWords, prefixLength) {
4759
+ let remaining = prefixLength;
4760
+ for (let i = 0; i < 8 && remaining > 0; i++) if (remaining >= 16) {
4761
+ if (address[i] !== prefixWords[i]) return false;
4762
+ remaining -= 16;
4763
+ } else {
4764
+ const mask = 65535 << 16 - remaining & 65535;
4765
+ if ((address[i] & mask) !== (prefixWords[i] & mask)) return false;
4766
+ remaining = 0;
4767
+ }
4768
+ return true;
4769
+ }
4770
+ //#endregion
4619
4771
  //#region src/docloader.ts
4620
4772
  const logger = getLogger([
4621
4773
  "fedify",
@@ -4623,66 +4775,6 @@ const logger = getLogger([
4623
4775
  "docloader"
4624
4776
  ]);
4625
4777
  const DEFAULT_MAX_REDIRECTION = 20;
4626
- const MAX_HTML_SIZE = 1024 * 1024;
4627
- function createResponseMetadata(response) {
4628
- return new Response(null, {
4629
- headers: response.headers,
4630
- status: response.status,
4631
- statusText: response.statusText
4632
- });
4633
- }
4634
- async function cancelResponseBody(response) {
4635
- if (response.body != null) await response.body.cancel();
4636
- }
4637
- async function readBoundedText(response, maxBytes) {
4638
- const contentLength = response.headers.get("Content-Length");
4639
- if (contentLength != null) {
4640
- const size = Number(contentLength);
4641
- if (size > maxBytes) {
4642
- await cancelResponseBody(response);
4643
- return {
4644
- text: "",
4645
- size,
4646
- tooLarge: true
4647
- };
4648
- }
4649
- }
4650
- if (response.body == null) return {
4651
- text: "",
4652
- size: 0,
4653
- tooLarge: false
4654
- };
4655
- const reader = response.body.getReader();
4656
- const decoder = new TextDecoder();
4657
- let text = "";
4658
- let size = 0;
4659
- try {
4660
- while (true) {
4661
- const result = await reader.read();
4662
- if (result.done) break;
4663
- const chunkSize = result.value.byteLength;
4664
- if (size + chunkSize > maxBytes) {
4665
- size += chunkSize;
4666
- await reader.cancel();
4667
- return {
4668
- text: "",
4669
- size,
4670
- tooLarge: true
4671
- };
4672
- }
4673
- size += chunkSize;
4674
- text += decoder.decode(result.value, { stream: true });
4675
- }
4676
- text += decoder.decode();
4677
- return {
4678
- text,
4679
- size,
4680
- tooLarge: false
4681
- };
4682
- } finally {
4683
- reader.releaseLock();
4684
- }
4685
- }
4686
4778
  /**
4687
4779
  * Gets a {@link RemoteDocument} from the given response.
4688
4780
  * @param url The URL of the document to load.
@@ -4737,19 +4829,19 @@ async function getRemoteDocument(url, response, fetch) {
4737
4829
  }
4738
4830
  let document;
4739
4831
  if (!jsonLd && (contentType === "text/html" || contentType?.startsWith("text/html;") || contentType === "application/xhtml+xml" || contentType?.startsWith("application/xhtml+xml;"))) {
4740
- const errorResponse = createResponseMetadata(response);
4741
- const html = await readBoundedText(response, MAX_HTML_SIZE);
4742
- if (html.tooLarge) {
4832
+ const MAX_HTML_SIZE = 1024 * 1024;
4833
+ const html = await response.text();
4834
+ if (html.length > MAX_HTML_SIZE) {
4743
4835
  logger.warn("HTML response too large, skipping alternate link discovery: {url}", {
4744
4836
  url: documentUrl,
4745
- size: html.size
4837
+ size: html.length
4746
4838
  });
4747
- throw new FetchError(documentUrl, `HTML document is too large to scan for an ActivityPub alternate link (Content-Type: ${contentType})`, errorResponse);
4839
+ document = JSON.parse(html);
4748
4840
  } else {
4749
4841
  const tagPattern = /<(a|link)\s+([^>]*?)\s*\/?>/gi;
4750
4842
  const attrPattern = /([a-z][a-z:_-]*)=(?:"([^"]*)"|'([^']*)'|([^\s>]+))/gi;
4751
4843
  let tagMatch;
4752
- while ((tagMatch = tagPattern.exec(html.text)) !== null) {
4844
+ while ((tagMatch = tagPattern.exec(html)) !== null) {
4753
4845
  const tagContent = tagMatch[2];
4754
4846
  let attrMatch;
4755
4847
  const attribs = {};
@@ -4766,12 +4858,7 @@ async function getRemoteDocument(url, response, fetch) {
4766
4858
  return await fetch(new URL(attribs.href, docUrl).href);
4767
4859
  }
4768
4860
  }
4769
- try {
4770
- document = JSON.parse(html.text);
4771
- } catch (error) {
4772
- if (!(error instanceof SyntaxError)) throw error;
4773
- throw new FetchError(documentUrl, `HTML document has no ActivityPub alternate link (Content-Type: ${contentType})`, errorResponse);
4774
- }
4861
+ document = JSON.parse(html);
4775
4862
  }
4776
4863
  } else document = await response.json();
4777
4864
  logger.debug("Fetched document: {status} {url} {headers}", {
@@ -5476,4 +5563,4 @@ LanguageString.prototype[Symbol.for("nodejs.util.inspect.custom")] = function(_d
5476
5563
  return `<${this.locale.baseName}> ${inspect(this.toString(), options)}`;
5477
5564
  };
5478
5565
  //#endregion
5479
- export { FetchError, LanguageString, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportMultibaseKey, exportSpki, formatIri, getDocumentLoader, getRemoteDocument, getUserAgent, haveSameIriOrigin, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, parseIri, parseJsonLdId, preloadedContexts, validatePublicUrl };
5566
+ export { FetchError, LanguageString, UrlError, canParseDecimal, createActivityPubRequest, decodeMultibase, encodeMultibase, encodingFromBaseData, expandIPv6Address, exportMultibaseKey, exportSpki, getDocumentLoader, getRemoteDocument, getUserAgent, importMultibaseKey, importPem, importPkcs1, importSpki, isDecimal, isValidPublicIPv4Address, isValidPublicIPv6Address, logRequest, parseDecimal, preloadedContexts, validatePublicUrl };
@@ -1,6 +1,6 @@
1
1
  require("./chunk-C2EiDwsr.cjs");
2
- require("./docloader-UAdXnDwt.cjs");
3
- require("./url-2XwVbUS_.cjs");
2
+ require("./docloader-mvgIWKI7.cjs");
3
+ require("./url-C20FhC7p.cjs");
4
4
  require("./key-pMmqUKuo.cjs");
5
5
  require("./multibase-Bz_UUDtL.cjs");
6
6
  require("./langstr-CbAxaeEZ.cjs");
@@ -1,5 +1,5 @@
1
- import "./docloader-CYQvKbtL.mjs";
2
- import "./url-YWJbnRlf.mjs";
1
+ import "./docloader-C76ldE5C.mjs";
2
+ import "./url-m9Qzxy-Y.mjs";
3
3
  import "./key-CrrK9mYh.mjs";
4
4
  import "./multibase-B4bvakyA.mjs";
5
5
  import "./langstr-Di5AvKpB.mjs";