@geekity/cms 0.56.1 → 0.57.0
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/admin/pages/tools/export.njk +6 -0
- package/admin/pages/tools/personal-data.njk +9 -0
- package/admin/static/admin.css +812 -1406
- package/admin/static/editor.js +26 -26
- package/dist/admin/federation.d.ts.map +1 -1
- package/dist/admin/federation.js +2 -1
- package/dist/admin/federation.js.map +1 -1
- package/dist/admin/indieauth-consent.js +1 -1
- package/dist/admin/indieauth-consent.js.map +1 -1
- package/dist/admin/personal-data.d.ts.map +1 -1
- package/dist/admin/personal-data.js +11 -2
- package/dist/admin/personal-data.js.map +1 -1
- package/dist/cli/export.d.ts.map +1 -1
- package/dist/cli/export.js +5 -1
- package/dist/cli/export.js.map +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +12 -1
- package/dist/cms/services.js.map +1 -1
- package/dist/comments/conversation.d.ts +4 -3
- package/dist/comments/conversation.d.ts.map +1 -1
- package/dist/comments/intake.d.ts +19 -12
- package/dist/comments/intake.d.ts.map +1 -1
- package/dist/comments/intake.js +46 -16
- package/dist/comments/intake.js.map +1 -1
- package/dist/comments/migrations.d.ts.map +1 -1
- package/dist/comments/migrations.js +16 -2
- package/dist/comments/migrations.js.map +1 -1
- package/dist/comments/records.d.ts +24 -11
- package/dist/comments/records.d.ts.map +1 -1
- package/dist/comments/records.js +168 -63
- package/dist/comments/records.js.map +1 -1
- package/dist/config-entry.d.ts +1 -1
- package/dist/config-entry.d.ts.map +1 -1
- package/dist/config.d.ts +47 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +16 -2
- package/dist/config.js.map +1 -1
- package/dist/content/image-tags.js +2 -2
- package/dist/content/image-tags.js.map +1 -1
- package/dist/content/sanitize.d.ts.map +1 -1
- package/dist/content/sanitize.js +27 -13
- package/dist/content/sanitize.js.map +1 -1
- package/dist/content/search.d.ts.map +1 -1
- package/dist/content/search.js +1 -28
- package/dist/content/search.js.map +1 -1
- package/dist/content/sqlite/catalog.js +3 -0
- package/dist/content/sqlite/catalog.js.map +1 -1
- package/dist/content/sqlite/schema.d.ts.map +1 -1
- package/dist/content/sqlite/schema.js +13 -0
- package/dist/content/sqlite/schema.js.map +1 -1
- package/dist/content/store.d.ts +2 -0
- package/dist/content/store.d.ts.map +1 -1
- package/dist/content/store.js.map +1 -1
- package/dist/export/site-export.d.ts +1 -0
- package/dist/export/site-export.d.ts.map +1 -1
- package/dist/export/site-export.js +2 -0
- package/dist/export/site-export.js.map +1 -1
- package/dist/export/site-import.d.ts.map +1 -1
- package/dist/export/site-import.js +1 -0
- package/dist/export/site-import.js.map +1 -1
- package/dist/exports.d.ts +1 -1
- package/dist/exports.d.ts.map +1 -1
- package/dist/exports.js.map +1 -1
- package/dist/federation/federation.d.ts +3 -0
- package/dist/federation/federation.d.ts.map +1 -1
- package/dist/federation/federation.js +5 -2
- package/dist/federation/federation.js.map +1 -1
- package/dist/federation/profiles.d.ts.map +1 -1
- package/dist/federation/profiles.js +5 -1
- package/dist/federation/profiles.js.map +1 -1
- package/dist/federation/public-loaders.d.ts +14 -0
- package/dist/federation/public-loaders.d.ts.map +1 -0
- package/dist/federation/public-loaders.js +41 -0
- package/dist/federation/public-loaders.js.map +1 -0
- package/dist/files/data-files.d.ts +1 -0
- package/dist/files/data-files.d.ts.map +1 -1
- package/dist/files/data-files.js +6 -0
- package/dist/files/data-files.js.map +1 -1
- package/dist/following/list.d.ts.map +1 -1
- package/dist/following/list.js +4 -3
- package/dist/following/list.js.map +1 -1
- package/dist/forms/protection.d.ts +8 -0
- package/dist/forms/protection.d.ts.map +1 -1
- package/dist/forms/protection.js +8 -0
- package/dist/forms/protection.js.map +1 -1
- package/dist/indieauth/client.js +2 -2
- package/dist/indieauth/client.js.map +1 -1
- package/dist/mcp/endpoint.d.ts.map +1 -1
- package/dist/mcp/endpoint.js +3 -0
- package/dist/mcp/endpoint.js.map +1 -1
- package/dist/mcp/inspect/remote.js +2 -2
- package/dist/mcp/inspect/remote.js.map +1 -1
- package/dist/mcp/profile.d.ts +3 -0
- package/dist/mcp/profile.d.ts.map +1 -0
- package/dist/mcp/profile.js +143 -0
- package/dist/mcp/profile.js.map +1 -0
- package/dist/mcp/tools.d.ts +1 -1
- package/dist/mcp/tools.d.ts.map +1 -1
- package/dist/mcp/tools.js.map +1 -1
- package/dist/notifications/comments.d.ts +3 -2
- package/dist/notifications/comments.d.ts.map +1 -1
- package/dist/notifications/comments.js +10 -7
- package/dist/notifications/comments.js.map +1 -1
- package/dist/privacy/erase.d.ts +6 -1
- package/dist/privacy/erase.d.ts.map +1 -1
- package/dist/privacy/erase.js +24 -9
- package/dist/privacy/erase.js.map +1 -1
- package/dist/privacy/retention.d.ts.map +1 -1
- package/dist/privacy/retention.js +7 -2
- package/dist/privacy/retention.js.map +1 -1
- package/dist/site/users.d.ts +14 -0
- package/dist/site/users.d.ts.map +1 -1
- package/dist/site/users.js +23 -1
- package/dist/site/users.js.map +1 -1
- package/dist/store/admin-store.d.ts +1 -1
- package/dist/store/admin-store.d.ts.map +1 -1
- package/dist/store/admin-store.js +1 -1
- package/dist/store/admin-store.js.map +1 -1
- package/dist/store/comments.d.ts +14 -0
- package/dist/store/comments.d.ts.map +1 -1
- package/dist/store/comments.js +40 -2
- package/dist/store/comments.js.map +1 -1
- package/dist/store/schema.d.ts.map +1 -1
- package/dist/store/schema.js +4 -0
- package/dist/store/schema.js.map +1 -1
- package/dist/util/html-entities.d.ts +5 -0
- package/dist/util/html-entities.d.ts.map +1 -0
- package/dist/util/html-entities.js +2239 -0
- package/dist/util/html-entities.js.map +1 -0
- package/dist/util/html-tree.d.ts +13 -6
- package/dist/util/html-tree.d.ts.map +1 -1
- package/dist/util/html-tree.js +171 -44
- package/dist/util/html-tree.js.map +1 -1
- package/dist/util/html.d.ts +7 -0
- package/dist/util/html.d.ts.map +1 -1
- package/dist/util/html.js +68 -19
- package/dist/util/html.js.map +1 -1
- package/dist/util/public-address.d.ts +11 -2
- package/dist/util/public-address.d.ts.map +1 -1
- package/dist/util/public-address.js +86 -13
- package/dist/util/public-address.js.map +1 -1
- package/dist/util/queue.d.ts +5 -0
- package/dist/util/queue.d.ts.map +1 -1
- package/dist/util/queue.js +18 -0
- package/dist/util/queue.js.map +1 -1
- package/dist/util/url.d.ts +11 -0
- package/dist/util/url.d.ts.map +1 -1
- package/dist/util/url.js +23 -0
- package/dist/util/url.js.map +1 -1
- package/dist/web/activity-folding.d.ts.map +1 -1
- package/dist/web/activity-folding.js +7 -3
- package/dist/web/activity-folding.js.map +1 -1
- package/dist/web/bounded-body.d.ts +12 -0
- package/dist/web/bounded-body.d.ts.map +1 -0
- package/dist/web/bounded-body.js +55 -0
- package/dist/web/bounded-body.js.map +1 -0
- package/dist/web/comment-routes.d.ts.map +1 -1
- package/dist/web/comment-routes.js +8 -2
- package/dist/web/comment-routes.js.map +1 -1
- package/dist/web/contact-routes.d.ts.map +1 -1
- package/dist/web/contact-routes.js +7 -1
- package/dist/web/contact-routes.js.map +1 -1
- package/dist/web/conversation.d.ts.map +1 -1
- package/dist/web/conversation.js +15 -7
- package/dist/web/conversation.js.map +1 -1
- package/dist/web/pingback-routes.d.ts +2 -1
- package/dist/web/pingback-routes.d.ts.map +1 -1
- package/dist/web/pingback-routes.js +59 -34
- package/dist/web/pingback-routes.js.map +1 -1
- package/dist/web/request.d.ts +0 -5
- package/dist/web/request.d.ts.map +1 -1
- package/dist/web/request.js +2 -13
- package/dist/web/request.js.map +1 -1
- package/dist/web/routes.d.ts.map +1 -1
- package/dist/web/routes.js +5 -3
- package/dist/web/routes.js.map +1 -1
- package/dist/web/site-view.d.ts +15 -0
- package/dist/web/site-view.d.ts.map +1 -1
- package/dist/web/site-view.js +1 -1
- package/dist/web/site-view.js.map +1 -1
- package/dist/web/throttle.d.ts +6 -0
- package/dist/web/throttle.d.ts.map +1 -1
- package/dist/web/throttle.js +1 -1
- package/dist/web/throttle.js.map +1 -1
- package/dist/web/webmention-routes.d.ts +14 -2
- package/dist/web/webmention-routes.d.ts.map +1 -1
- package/dist/web/webmention-routes.js +65 -19
- package/dist/web/webmention-routes.js.map +1 -1
- package/dist/webmention/checks.d.ts +43 -0
- package/dist/webmention/checks.d.ts.map +1 -0
- package/dist/webmention/checks.js +103 -0
- package/dist/webmention/checks.js.map +1 -0
- package/dist/webmention/discovery.js +2 -2
- package/dist/webmention/discovery.js.map +1 -1
- package/dist/webmention/endpoint.d.ts +2 -0
- package/dist/webmention/endpoint.d.ts.map +1 -1
- package/dist/webmention/endpoint.js +2 -0
- package/dist/webmention/endpoint.js.map +1 -1
- package/dist/webmention/fetch-public.d.ts +5 -0
- package/dist/webmention/fetch-public.d.ts.map +1 -1
- package/dist/webmention/fetch-public.js +19 -1
- package/dist/webmention/fetch-public.js.map +1 -1
- package/dist/webmention/index.d.ts +2 -1
- package/dist/webmention/index.d.ts.map +1 -1
- package/dist/webmention/index.js.map +1 -1
- package/dist/webmention/links.d.ts.map +1 -1
- package/dist/webmention/links.js +4 -11
- package/dist/webmention/links.js.map +1 -1
- package/dist/webmention/microformats.d.ts +32 -9
- package/dist/webmention/microformats.d.ts.map +1 -1
- package/dist/webmention/microformats.js +341 -110
- package/dist/webmention/microformats.js.map +1 -1
- package/dist/webmention/pingback.d.ts +7 -0
- package/dist/webmention/pingback.d.ts.map +1 -1
- package/dist/webmention/pingback.js +108 -34
- package/dist/webmention/pingback.js.map +1 -1
- package/dist/webmention/receive.d.ts +28 -21
- package/dist/webmention/receive.d.ts.map +1 -1
- package/dist/webmention/receive.js +286 -65
- package/dist/webmention/receive.js.map +1 -1
- package/dist/webmention/reply-context/feed.js +2 -2
- package/dist/webmention/reply-context/feed.js.map +1 -1
- package/dist/webmention/reply-context/page.js +2 -2
- package/dist/webmention/reply-context/page.js.map +1 -1
- package/dist/webmention/service.d.ts +51 -12
- package/dist/webmention/service.d.ts.map +1 -1
- package/dist/webmention/service.js +202 -38
- package/dist/webmention/service.js.map +1 -1
- package/dist/webmention/syndication.d.ts +2 -0
- package/dist/webmention/syndication.d.ts.map +1 -1
- package/dist/webmention/syndication.js +57 -20
- package/dist/webmention/syndication.js.map +1 -1
- package/package.json +5 -5
- package/themes/default/mail/comment-digest.txt.njk +1 -1
- package/themes/default/mail/comment-pending.html.njk +20 -0
- package/themes/default/mail/comment-pending.txt.njk +31 -4
- package/themes/default/mail/comment-reply.txt.njk +1 -1
- package/themes/default/mail/contact-message.txt.njk +4 -2
- package/themes/default/mail/password-changed.txt.njk +1 -1
- package/themes/default/mail/password-reset.txt.njk +1 -1
- package/themes/default/mail/test.txt.njk +1 -1
package/dist/util/html.js
CHANGED
|
@@ -1,34 +1,83 @@
|
|
|
1
|
+
import { LEGACY_REFERENCES, NAMED_REFERENCES } from './html-entities.js';
|
|
1
2
|
export function escapeText(value) {
|
|
2
3
|
return value.replaceAll('&', '&').replaceAll('<', '<').replaceAll('>', '>');
|
|
3
4
|
}
|
|
4
5
|
export function escapeAttribute(value) {
|
|
5
6
|
return escapeText(value).replaceAll('"', '"').replaceAll("'", ''');
|
|
6
7
|
}
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
lt: '<',
|
|
10
|
-
gt: '>',
|
|
11
|
-
quot: '"',
|
|
12
|
-
apos: "'",
|
|
13
|
-
nbsp: '\u00a0',
|
|
14
|
-
};
|
|
8
|
+
const LONGEST_LEGACY_NAME = Math.max(...[...LEGACY_REFERENCES].map((name) => name.length));
|
|
9
|
+
/** Text with its character references resolved, as HTML reads them in text. */
|
|
15
10
|
export function decodeEntities(value) {
|
|
11
|
+
return decode(value, false);
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* An attribute value with its character references resolved. HTML keeps a
|
|
15
|
+
* legacy name without its semicolon as written when `=` or a letter or digit
|
|
16
|
+
* follows it, so `?a=1©=2` is still a query string.
|
|
17
|
+
*/
|
|
18
|
+
export function decodeAttribute(value) {
|
|
19
|
+
return decode(value, true);
|
|
20
|
+
}
|
|
21
|
+
function decode(value, inAttribute) {
|
|
16
22
|
if (!value.includes('&'))
|
|
17
23
|
return value;
|
|
18
|
-
return value.replace(/&(
|
|
19
|
-
if (
|
|
20
|
-
return codePoint(Number.parseInt(
|
|
24
|
+
return value.replace(/&(?:#([0-9]+);?|#[xX]([0-9a-fA-F]+);?|([A-Za-z][A-Za-z0-9]*)(;?))/g, (whole, decimal, hex, name, semicolon, offset) => {
|
|
25
|
+
if (hex !== undefined)
|
|
26
|
+
return codePoint(Number.parseInt(hex, 16));
|
|
27
|
+
if (decimal !== undefined)
|
|
28
|
+
return codePoint(Number.parseInt(decimal, 10));
|
|
29
|
+
if (name === undefined)
|
|
30
|
+
return whole;
|
|
31
|
+
if (semicolon === ';') {
|
|
32
|
+
const characters = NAMED_REFERENCES.get(name);
|
|
33
|
+
if (characters !== undefined)
|
|
34
|
+
return characters;
|
|
35
|
+
}
|
|
36
|
+
for (let length = Math.min(name.length, LONGEST_LEGACY_NAME); length > 0; length -= 1) {
|
|
37
|
+
const legacy = name.slice(0, length);
|
|
38
|
+
if (!LEGACY_REFERENCES.has(legacy))
|
|
39
|
+
continue;
|
|
40
|
+
const after = length < name.length ? name[length] : value[offset + whole.length];
|
|
41
|
+
if (inAttribute && after !== undefined && /[=A-Za-z0-9]/.test(after))
|
|
42
|
+
return whole;
|
|
43
|
+
return `${NAMED_REFERENCES.get(legacy) ?? ''}${whole.slice(length + 1)}`;
|
|
21
44
|
}
|
|
22
|
-
|
|
23
|
-
return codePoint(Number.parseInt(body.slice(1), 10)) ?? whole;
|
|
24
|
-
return ENTITIES[body] ?? whole;
|
|
45
|
+
return whole;
|
|
25
46
|
});
|
|
26
47
|
}
|
|
48
|
+
const WINDOWS_1252 = new Map([
|
|
49
|
+
[0x80, 0x20ac],
|
|
50
|
+
[0x82, 0x201a],
|
|
51
|
+
[0x83, 0x0192],
|
|
52
|
+
[0x84, 0x201e],
|
|
53
|
+
[0x85, 0x2026],
|
|
54
|
+
[0x86, 0x2020],
|
|
55
|
+
[0x87, 0x2021],
|
|
56
|
+
[0x88, 0x02c6],
|
|
57
|
+
[0x89, 0x2030],
|
|
58
|
+
[0x8a, 0x0160],
|
|
59
|
+
[0x8b, 0x2039],
|
|
60
|
+
[0x8c, 0x0152],
|
|
61
|
+
[0x8e, 0x017d],
|
|
62
|
+
[0x91, 0x2018],
|
|
63
|
+
[0x92, 0x2019],
|
|
64
|
+
[0x93, 0x201c],
|
|
65
|
+
[0x94, 0x201d],
|
|
66
|
+
[0x95, 0x2022],
|
|
67
|
+
[0x96, 0x2013],
|
|
68
|
+
[0x97, 0x2014],
|
|
69
|
+
[0x98, 0x02dc],
|
|
70
|
+
[0x99, 0x2122],
|
|
71
|
+
[0x9a, 0x0161],
|
|
72
|
+
[0x9b, 0x203a],
|
|
73
|
+
[0x9c, 0x0153],
|
|
74
|
+
[0x9e, 0x017e],
|
|
75
|
+
[0x9f, 0x0178],
|
|
76
|
+
]);
|
|
77
|
+
/** A numeric reference read as the HTML tokenizer reads it. */
|
|
27
78
|
function codePoint(value) {
|
|
28
|
-
if (
|
|
29
|
-
return
|
|
30
|
-
|
|
31
|
-
return undefined;
|
|
32
|
-
return String.fromCodePoint(value);
|
|
79
|
+
if (value === 0 || value > 0x10ffff || (value >= 0xd800 && value <= 0xdfff))
|
|
80
|
+
return '\ufffd';
|
|
81
|
+
return String.fromCodePoint(WINDOWS_1252.get(value) ?? value);
|
|
33
82
|
}
|
|
34
83
|
//# sourceMappingURL=html.js.map
|
package/dist/util/html.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"html.js","sourceRoot":"","sources":["../../src/util/html.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,OAAO,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACxF,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAa;IAC3C,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,
|
|
1
|
+
{"version":3,"file":"html.js","sourceRoot":"","sources":["../../src/util/html.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,14 @@ import type { LookupFunction } from 'node:net';
|
|
|
19
19
|
export type HostLookup = (hostname: string) => Promise<readonly string[]>;
|
|
20
20
|
/** Resolve a name through the system resolver, every address it has. */
|
|
21
21
|
export declare const systemHostLookup: HostLookup;
|
|
22
|
+
/**
|
|
23
|
+
* `lookup`, carrying addresses the operator denies besides the private ones:
|
|
24
|
+
* the server's own public addresses, say, which a request from inside
|
|
25
|
+
* reaches without passing the firewall that hides them from outside. Each
|
|
26
|
+
* entry is an address or a CIDR range.
|
|
27
|
+
*/
|
|
28
|
+
export declare function withDeniedAddresses(lookup: HostLookup, entries: readonly string[]): HostLookup;
|
|
29
|
+
export declare function isAddressOrRange(entry: string): boolean;
|
|
22
30
|
export declare function isLocalAddress(address: string): boolean;
|
|
23
31
|
/**
|
|
24
32
|
* Whether a hostname, as written, is one only this network can see: a
|
|
@@ -28,9 +36,10 @@ export declare function isLocalAddress(address: string): boolean;
|
|
|
28
36
|
export declare function isPrivateHost(hostname: string): boolean;
|
|
29
37
|
/**
|
|
30
38
|
* Whether a host is on the public internet: not private as written, and every
|
|
31
|
-
* address it resolves to public. A name that does not resolve is not.
|
|
39
|
+
* address it resolves to public. A name that does not resolve is not. When
|
|
40
|
+
* `signal` aborts before the name resolves, this rejects with its reason.
|
|
32
41
|
*/
|
|
33
|
-
export declare function publicHost(hostname: string, lookup: HostLookup): Promise<boolean>;
|
|
42
|
+
export declare function publicHost(hostname: string, lookup: HostLookup, signal?: AbortSignal): Promise<boolean>;
|
|
34
43
|
/**
|
|
35
44
|
* The type `fetch` takes: Node's copy of undici's, which the npm package's
|
|
36
45
|
* duplicates with a drift in method signatures, so an Agent is cast to it.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-address.d.ts","sourceRoot":"","sources":["../../src/util/public-address.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAI/C;;;;;;;;;;;;;;;GAeG;AAEH,kFAAkF;AAClF,MAAM,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;AAE1E,wEAAwE;AACxE,eAAO,MAAM,gBAAgB,EAAE,UAC2C,CAAC;
|
|
1
|
+
{"version":3,"file":"public-address.d.ts","sourceRoot":"","sources":["../../src/util/public-address.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAI/C;;;;;;;;;;;;;;;GAeG;AAEH,kFAAkF;AAClF,MAAM,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;AAE1E,wEAAwE;AACxE,eAAO,MAAM,gBAAgB,EAAE,UAC2C,CAAC;AA+D3E;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,CAY9F;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEvD;AAsBD,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAOvD;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,OAAO,CAAC,CAclB;AAmBD;;;GAGG;AACH,KAAK,eAAe,GAAG,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;AAI9D;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,eAAe,CAQpE;AAED,sGAAsG;AACtG,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,cAAc,CAsB/D"}
|
|
@@ -14,22 +14,29 @@ const LOCAL = [
|
|
|
14
14
|
['fe80::', 10, 'ipv6'],
|
|
15
15
|
];
|
|
16
16
|
/**
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
17
|
+
* The IANA special-purpose ranges that are not globally reachable, plus the
|
|
18
|
+
* IPv6 prefixes that carry an IPv4 address inside them (IPv4-compatible,
|
|
19
|
+
* SIIT, NAT64, 6to4, Teredo): a gateway or relay turns those into a
|
|
20
|
+
* connection to the embedded address, which may be a private one. The
|
|
21
|
+
* documentation ranges are left public: nothing routes to them.
|
|
20
22
|
*/
|
|
21
23
|
const RESERVED = [
|
|
22
24
|
['0.0.0.0', 8, 'ipv4'],
|
|
23
25
|
['100.64.0.0', 10, 'ipv4'],
|
|
24
26
|
['192.0.0.0', 24, 'ipv4'],
|
|
27
|
+
['192.88.99.0', 24, 'ipv4'],
|
|
25
28
|
['198.18.0.0', 15, 'ipv4'],
|
|
26
29
|
['224.0.0.0', 4, 'ipv4'],
|
|
27
30
|
['240.0.0.0', 4, 'ipv4'],
|
|
28
31
|
['::', 96, 'ipv6'],
|
|
32
|
+
['::ffff:0:0:0', 96, 'ipv6'],
|
|
29
33
|
['64:ff9b::', 96, 'ipv6'],
|
|
30
34
|
['64:ff9b:1::', 48, 'ipv6'],
|
|
31
|
-
['
|
|
35
|
+
['100::', 64, 'ipv6'],
|
|
36
|
+
['100:0:0:1::', 64, 'ipv6'],
|
|
37
|
+
['2001::', 23, 'ipv6'],
|
|
32
38
|
['2002::', 16, 'ipv6'],
|
|
39
|
+
['5f00::', 16, 'ipv6'],
|
|
33
40
|
['fec0::', 10, 'ipv6'],
|
|
34
41
|
['ff00::', 8, 'ipv6'],
|
|
35
42
|
];
|
|
@@ -50,8 +57,48 @@ function onRanges(ranges, address) {
|
|
|
50
57
|
return undefined;
|
|
51
58
|
return ranges.check(address, version === 4 ? 'ipv4' : 'ipv6');
|
|
52
59
|
}
|
|
53
|
-
|
|
54
|
-
|
|
60
|
+
const denied = new WeakMap();
|
|
61
|
+
/**
|
|
62
|
+
* `lookup`, carrying addresses the operator denies besides the private ones:
|
|
63
|
+
* the server's own public addresses, say, which a request from inside
|
|
64
|
+
* reaches without passing the firewall that hides them from outside. Each
|
|
65
|
+
* entry is an address or a CIDR range.
|
|
66
|
+
*/
|
|
67
|
+
export function withDeniedAddresses(lookup, entries) {
|
|
68
|
+
const list = new BlockList();
|
|
69
|
+
for (const entry of entries) {
|
|
70
|
+
const range = addressRange(entry);
|
|
71
|
+
if (range === undefined) {
|
|
72
|
+
throw new TypeError(`${JSON.stringify(entry)} is not an IP address or a CIDR range`);
|
|
73
|
+
}
|
|
74
|
+
list.addSubnet(...range);
|
|
75
|
+
}
|
|
76
|
+
const carrying = (hostname) => lookup(hostname);
|
|
77
|
+
denied.set(carrying, list);
|
|
78
|
+
return carrying;
|
|
79
|
+
}
|
|
80
|
+
export function isAddressOrRange(entry) {
|
|
81
|
+
return addressRange(entry) !== undefined;
|
|
82
|
+
}
|
|
83
|
+
function addressRange(entry) {
|
|
84
|
+
const [network = '', prefix, ...rest] = entry.trim().split('/');
|
|
85
|
+
const version = isIP(network);
|
|
86
|
+
if (version === 0 || rest.length > 0)
|
|
87
|
+
return undefined;
|
|
88
|
+
const longest = version === 4 ? 32 : 128;
|
|
89
|
+
const bits = prefix === undefined ? longest : Number(prefix);
|
|
90
|
+
if (!/^\d+$/.test(prefix ?? '0') || bits > longest)
|
|
91
|
+
return undefined;
|
|
92
|
+
return [network, bits, version === 4 ? 'ipv4' : 'ipv6'];
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Whether an IP address is on a loopback, private, link-local or reserved
|
|
96
|
+
* range, or one the operator denied on `lookup`.
|
|
97
|
+
*/
|
|
98
|
+
function isPrivateAddress(address, lookup) {
|
|
99
|
+
const deniedList = lookup === undefined ? undefined : denied.get(lookup);
|
|
100
|
+
if (deniedList !== undefined && onRanges(deniedList, address) === true)
|
|
101
|
+
return true;
|
|
55
102
|
return onRanges(PRIVATE_RANGES, address) ?? true;
|
|
56
103
|
}
|
|
57
104
|
export function isLocalAddress(address) {
|
|
@@ -63,29 +110,51 @@ export function isLocalAddress(address) {
|
|
|
63
110
|
* that merely resolves to one is {@link publicHost}'s to catch.
|
|
64
111
|
*/
|
|
65
112
|
export function isPrivateHost(hostname) {
|
|
66
|
-
const host = hostname
|
|
113
|
+
const host = hostname
|
|
114
|
+
.toLowerCase()
|
|
115
|
+
.replace(/^\[|\]$/g, '')
|
|
116
|
+
.replace(/\.$/, '');
|
|
67
117
|
if (host === 'localhost' || host.endsWith('.localhost') || host.endsWith('.local'))
|
|
68
118
|
return true;
|
|
69
119
|
return isIP(host) !== 0 && isPrivateAddress(host);
|
|
70
120
|
}
|
|
71
121
|
/**
|
|
72
122
|
* Whether a host is on the public internet: not private as written, and every
|
|
73
|
-
* address it resolves to public. A name that does not resolve is not.
|
|
123
|
+
* address it resolves to public. A name that does not resolve is not. When
|
|
124
|
+
* `signal` aborts before the name resolves, this rejects with its reason.
|
|
74
125
|
*/
|
|
75
|
-
export async function publicHost(hostname, lookup) {
|
|
126
|
+
export async function publicHost(hostname, lookup, signal) {
|
|
76
127
|
if (isPrivateHost(hostname))
|
|
77
128
|
return false;
|
|
78
129
|
const host = hostname.replace(/^\[|\]$/g, '');
|
|
79
130
|
if (isIP(host) !== 0)
|
|
80
|
-
return
|
|
131
|
+
return !isPrivateAddress(host, lookup);
|
|
81
132
|
let addresses;
|
|
82
133
|
try {
|
|
83
|
-
addresses = await lookup(host);
|
|
134
|
+
addresses = await untilAborted(lookup(host), signal);
|
|
84
135
|
}
|
|
85
136
|
catch {
|
|
137
|
+
signal?.throwIfAborted();
|
|
86
138
|
return false;
|
|
87
139
|
}
|
|
88
|
-
return addresses.length > 0 && !addresses.some(isPrivateAddress);
|
|
140
|
+
return addresses.length > 0 && !addresses.some((address) => isPrivateAddress(address, lookup));
|
|
141
|
+
}
|
|
142
|
+
function untilAborted(promise, signal) {
|
|
143
|
+
if (signal === undefined)
|
|
144
|
+
return promise;
|
|
145
|
+
return new Promise((resolve, reject) => {
|
|
146
|
+
const abort = () => {
|
|
147
|
+
reject(signal.reason);
|
|
148
|
+
};
|
|
149
|
+
if (signal.aborted) {
|
|
150
|
+
abort();
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
signal.addEventListener('abort', abort, { once: true });
|
|
154
|
+
promise.then(resolve, reject).finally(() => {
|
|
155
|
+
signal.removeEventListener('abort', abort);
|
|
156
|
+
});
|
|
157
|
+
});
|
|
89
158
|
}
|
|
90
159
|
const dispatchers = new WeakMap();
|
|
91
160
|
/**
|
|
@@ -107,9 +176,13 @@ export function publicDispatcher(lookup) {
|
|
|
107
176
|
/** The resolver a socket is handed: `lookup`'s answer when every address is public, else an error. */
|
|
108
177
|
export function pinnedLookup(lookup) {
|
|
109
178
|
return (hostname, options, callback) => {
|
|
179
|
+
if (isPrivateHost(hostname)) {
|
|
180
|
+
callback(notPublic(hostname), '', undefined);
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
110
183
|
lookup(hostname).then((addresses) => {
|
|
111
184
|
const [first, ...rest] = addresses.map((address) => ({ address, family: isIP(address) }));
|
|
112
|
-
if (first === undefined || addresses.some(isPrivateAddress)) {
|
|
185
|
+
if (first === undefined || addresses.some((address) => isPrivateAddress(address, lookup))) {
|
|
113
186
|
callback(notPublic(hostname), '', undefined);
|
|
114
187
|
}
|
|
115
188
|
else if (options.all === true) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-address.js","sourceRoot":"","sources":["../../src/util/public-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAG3C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAsB/B,wEAAwE;AACxE,MAAM,CAAC,MAAM,gBAAgB,GAAe,KAAK,EAAE,QAAQ,EAAE,EAAE,CAC7D,CAAC,MAAM,SAAS,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAI3E,MAAM,KAAK,GAAqB;IAC9B,CAAC,UAAU,EAAE,CAAC,EAAE,MAAM,CAAC;IACvB,CAAC,WAAW,EAAE,CAAC,EAAE,MAAM,CAAC;IACxB,CAAC,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC;IAC3B,CAAC,YAAY,EAAE,EAAE,EAAE,MAAM,CAAC;IAC1B,CAAC,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC;IAC3B,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC;IACpB,CAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"public-address.js","sourceRoot":"","sources":["../../src/util/public-address.ts"],"names":[],"mappings":"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"}
|
package/dist/util/queue.d.ts
CHANGED
|
@@ -9,4 +9,9 @@ export interface ConcurrencyLimit {
|
|
|
9
9
|
run<T>(job: () => Promise<T>): Promise<T>;
|
|
10
10
|
}
|
|
11
11
|
export declare function createConcurrencyLimit(limit: number): ConcurrencyLimit;
|
|
12
|
+
/** A {@link ConcurrencyLimit} for each key, kept only while it has a job running or waiting. */
|
|
13
|
+
export interface KeyedConcurrencyLimit {
|
|
14
|
+
run<T>(key: string, job: () => Promise<T>): Promise<T>;
|
|
15
|
+
}
|
|
16
|
+
export declare function createKeyedConcurrencyLimit(limit: number): KeyedConcurrencyLimit;
|
|
12
17
|
//# sourceMappingURL=queue.d.ts.map
|
package/dist/util/queue.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/util/queue.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,IAAI,MAAM,CAAC;CACnB;AAED,wBAAgB,iBAAiB,IAAI,WAAW,CAsB/C;AAED,iFAAiF;AACjF,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC3C;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAoBtE"}
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/util/queue.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,IAAI,MAAM,CAAC;CACnB;AAED,wBAAgB,iBAAiB,IAAI,WAAW,CAsB/C;AAED,iFAAiF;AACjF,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC3C;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAoBtE;AAED,gGAAgG;AAChG,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CACxD;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAgBhF"}
|
package/dist/util/queue.js
CHANGED
|
@@ -40,5 +40,23 @@ export function createConcurrencyLimit(limit) {
|
|
|
40
40
|
},
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
|
+
export function createKeyedConcurrencyLimit(limit) {
|
|
44
|
+
const limits = new Map();
|
|
45
|
+
return {
|
|
46
|
+
async run(key, job) {
|
|
47
|
+
const held = limits.get(key) ?? { limit: createConcurrencyLimit(limit), jobs: 0 };
|
|
48
|
+
limits.set(key, held);
|
|
49
|
+
held.jobs += 1;
|
|
50
|
+
try {
|
|
51
|
+
return await held.limit.run(job);
|
|
52
|
+
}
|
|
53
|
+
finally {
|
|
54
|
+
held.jobs -= 1;
|
|
55
|
+
if (held.jobs === 0)
|
|
56
|
+
limits.delete(key);
|
|
57
|
+
}
|
|
58
|
+
},
|
|
59
|
+
};
|
|
60
|
+
}
|
|
43
61
|
function ignore() { }
|
|
44
62
|
//# sourceMappingURL=queue.js.map
|
package/dist/util/queue.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/util/queue.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,iBAAiB;IAC/B,IAAI,IAAI,GAAqB,OAAO,CAAC,OAAO,EAAE,CAAC;IAC/C,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,OAAO;QACL,GAAG,CAAC,GAAG;YACL,KAAK,IAAI,CAAC,CAAC;YACX,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;gBACzC,KAAK,IAAI,CAAC,CAAC;YACb,CAAC,CAAC,CAAC;YACH,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACnC,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,KAAK,CAAC,OAAO;YACX,OAAO,KAAK,GAAG,CAAC;gBAAE,MAAM,IAAI,CAAC;QAC/B,CAAC;QAED,OAAO;YACL,OAAO,KAAK,CAAC;QACf,CAAC;KACF,CAAC;AACJ,CAAC;AAOD,MAAM,UAAU,sBAAsB,CAAC,KAAa;IAClD,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,MAAM,OAAO,GAAmB,EAAE,CAAC;IAEnC,OAAO;QACL,KAAK,CAAC,GAAG,CAAC,GAAG;YACX,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC;gBACrB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;oBAClC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACxB,CAAC,CAAC,CAAC;YACL,CAAC;YACD,OAAO,IAAI,CAAC,CAAC;YACb,IAAI,CAAC;gBACH,OAAO,MAAM,GAAG,EAAE,CAAC;YACrB,CAAC;oBAAS,CAAC;gBACT,OAAO,IAAI,CAAC,CAAC;gBACb,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC;YACtB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,KAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/util/queue.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,iBAAiB;IAC/B,IAAI,IAAI,GAAqB,OAAO,CAAC,OAAO,EAAE,CAAC;IAC/C,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,OAAO;QACL,GAAG,CAAC,GAAG;YACL,KAAK,IAAI,CAAC,CAAC;YACX,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;gBACzC,KAAK,IAAI,CAAC,CAAC;YACb,CAAC,CAAC,CAAC;YACH,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACnC,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,KAAK,CAAC,OAAO;YACX,OAAO,KAAK,GAAG,CAAC;gBAAE,MAAM,IAAI,CAAC;QAC/B,CAAC;QAED,OAAO;YACL,OAAO,KAAK,CAAC;QACf,CAAC;KACF,CAAC;AACJ,CAAC;AAOD,MAAM,UAAU,sBAAsB,CAAC,KAAa;IAClD,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,MAAM,OAAO,GAAmB,EAAE,CAAC;IAEnC,OAAO;QACL,KAAK,CAAC,GAAG,CAAC,GAAG;YACX,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC;gBACrB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;oBAClC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACxB,CAAC,CAAC,CAAC;YACL,CAAC;YACD,OAAO,IAAI,CAAC,CAAC;YACb,IAAI,CAAC;gBACH,OAAO,MAAM,GAAG,EAAE,CAAC;YACrB,CAAC;oBAAS,CAAC;gBACT,OAAO,IAAI,CAAC,CAAC;gBACb,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC;YACtB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAOD,MAAM,UAAU,2BAA2B,CAAC,KAAa;IACvD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAqD,CAAC;IAE5E,OAAO;QACL,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG;YAChB,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,sBAAsB,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YAClF,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;YACf,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;gBACf,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC;oBAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,KAAU,CAAC"}
|
package/dist/util/url.d.ts
CHANGED
|
@@ -8,6 +8,11 @@ export declare function withTrailingSlash(value: string): string;
|
|
|
8
8
|
* would drop `/blog`.
|
|
9
9
|
*/
|
|
10
10
|
export declare function absoluteUrl(pathname: string, baseUrl: string): string;
|
|
11
|
+
/**
|
|
12
|
+
* A URL path percent-decoded, because permalinks are stored decoded. A path
|
|
13
|
+
* whose escapes are malformed comes back as it was, which names nothing.
|
|
14
|
+
*/
|
|
15
|
+
export declare function decodedPath(pathname: string): string;
|
|
11
16
|
/** A decoded path with each segment percent-encoded, so `#`, `?`, `%` and spaces name the file rather than end the path. */
|
|
12
17
|
export declare function encodePath(pathname: string): string;
|
|
13
18
|
/**
|
|
@@ -18,4 +23,10 @@ export declare function encodePath(pathname: string): string;
|
|
|
18
23
|
export declare function plainRelativePath(decoded: string): string | undefined;
|
|
19
24
|
/** A relative URL path decoded segment by segment, then held to {@link plainRelativePath}. */
|
|
20
25
|
export declare function decodedRelativePath(encoded: string): string | undefined;
|
|
26
|
+
/**
|
|
27
|
+
* Whether a URL is on the site at `site`, by either of http and https and with
|
|
28
|
+
* or without `www.` in front of the host: an old link or an imported post
|
|
29
|
+
* names the site the way it was spelled then.
|
|
30
|
+
*/
|
|
31
|
+
export declare function isOnSite(url: URL, site: URL): boolean;
|
|
21
32
|
//# sourceMappingURL=url.d.ts.map
|
package/dist/util/url.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../src/util/url.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,qFAAqF;AACrF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAKrE;AAED,4HAA4H;AAC5H,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKnD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAIrE;AAED,8FAA8F;AAC9F,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMvE"}
|
|
1
|
+
{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../src/util/url.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,qFAAqF;AACrF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAKrE;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMpD;AAED,4HAA4H;AAC5H,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKnD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAIrE;AAED,8FAA8F;AAC9F,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMvE;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAErD"}
|
package/dist/util/url.js
CHANGED
|
@@ -17,6 +17,18 @@ export function absoluteUrl(pathname, baseUrl) {
|
|
|
17
17
|
const resolved = pathname.startsWith('/') ? `${basePath}${pathname}` : pathname;
|
|
18
18
|
return URL.parse(resolved, base)?.toString() ?? pathname;
|
|
19
19
|
}
|
|
20
|
+
/**
|
|
21
|
+
* A URL path percent-decoded, because permalinks are stored decoded. A path
|
|
22
|
+
* whose escapes are malformed comes back as it was, which names nothing.
|
|
23
|
+
*/
|
|
24
|
+
export function decodedPath(pathname) {
|
|
25
|
+
try {
|
|
26
|
+
return decodeURIComponent(pathname);
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
return pathname;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
20
32
|
/** A decoded path with each segment percent-encoded, so `#`, `?`, `%` and spaces name the file rather than end the path. */
|
|
21
33
|
export function encodePath(pathname) {
|
|
22
34
|
return pathname
|
|
@@ -44,4 +56,15 @@ export function decodedRelativePath(encoded) {
|
|
|
44
56
|
return undefined;
|
|
45
57
|
}
|
|
46
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* Whether a URL is on the site at `site`, by either of http and https and with
|
|
61
|
+
* or without `www.` in front of the host: an old link or an imported post
|
|
62
|
+
* names the site the way it was spelled then.
|
|
63
|
+
*/
|
|
64
|
+
export function isOnSite(url, site) {
|
|
65
|
+
return url.port === site.port && bareHost(url.hostname) === bareHost(site.hostname);
|
|
66
|
+
}
|
|
67
|
+
function bareHost(hostname) {
|
|
68
|
+
return hostname.startsWith('www.') ? hostname.slice(4) : hostname;
|
|
69
|
+
}
|
|
47
70
|
//# sourceMappingURL=url.js.map
|
package/dist/util/url.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/util/url.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACnC,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC7C,OAAO,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,OAAe;IAC3D,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;IAChF,OAAO,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,QAAQ,CAAC;AAC3D,CAAC;AAED,4HAA4H;AAC5H,MAAM,UAAU,UAAU,CAAC,QAAgB;IACzC,OAAO,QAAQ;SACZ,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;SAC7C,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IACxF,OAAO,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AACrC,CAAC;AAED,8FAA8F;AAC9F,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,IAAI,CAAC;QACH,OAAO,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACjF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/util/url.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,MAAM,UAAU,oBAAoB,CAAC,KAAa;IAChD,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACnC,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC7C,OAAO,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,OAAe;IAC3D,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;IAChF,OAAO,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,QAAQ,CAAC;AAC3D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,QAAgB;IAC1C,IAAI,CAAC;QACH,OAAO,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,QAAQ,CAAC;IAClB,CAAC;AACH,CAAC;AAED,4HAA4H;AAC5H,MAAM,UAAU,UAAU,CAAC,QAAgB;IACzC,OAAO,QAAQ;SACZ,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;SAC7C,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IACxF,OAAO,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AACrC,CAAC;AAED,8FAA8F;AAC9F,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,IAAI,CAAC;QACH,OAAO,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACjF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CAAC,GAAQ,EAAE,IAAS;IAC1C,OAAO,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,QAAQ,CAAC,QAAgB;IAChC,OAAO,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AACpE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-folding.d.ts","sourceRoot":"","sources":["../../src/web/activity-folding.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"activity-folding.d.ts","sourceRoot":"","sources":["../../src/web/activity-folding.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAMnG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAgB,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAQpG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEzD,MAAM,MAAM,KAAK,GAAG,SAAS,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;AAE5E,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC,CAM7D,CAAC;AAEF,MAAM,WAAW,IAAI;IACnB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;IAC1D,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACjD,QAAQ,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC1C;AAaD,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,SAAS,aAAa,EAAE,CAAC;IAC9C,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACzC;AAED,wBAAgB,UAAU,CACxB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,SAAS,WAAW,EAAE,GAC7B,KAAK,CAMP;AAUD,wBAAgB,cAAc,CAC5B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,SAAS,WAAW,EAAE,EAC9B,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAC7C,IAAI,CA4BN;AAkBD,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAAG,IAAI,CAgB9F;AAgCD,wBAAgB,UAAU,CACxB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,MAAM,EAAE,EAC5B,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAC7C,IAAI,CAON;AAGD,wBAAgB,QAAQ,CACtB,KAAK,EAAE,UAAU,EACjB,SAAS,EAAE,SAAS,wBAAwB,EAAE,EAC9C,SAAS,EAAE,SAAS,MAAM,EAAE,EAC5B,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,GAC7C,WAAW,EAAE,CA0Bf;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EACpF,MAAM,EAAE,iBAAiB,GACxB,WAAW,CAab;AAMD,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,KAAK,GAAG,MAAM,GAAG,UAAU,CAAC,CAE1F;AA0DD,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,iBAAiB,CAwBtF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { avatarHref } from '../avatars/avatars.js';
|
|
2
2
|
import { heldComment } from '../comments/conversation.js';
|
|
3
|
+
import { isWebUrl } from '../content/enclosure.js';
|
|
3
4
|
import { repliesKey } from '../content/guids.js';
|
|
4
5
|
import { RSVP_LABELS } from '../content/rsvp.js';
|
|
5
6
|
import { sanitizeCommentHtml } from '../content/sanitize.js';
|
|
@@ -133,7 +134,7 @@ export function quotesOf(admin, approvals, objectIds, naming) {
|
|
|
133
134
|
source: 'activitypub',
|
|
134
135
|
kind: 'mention',
|
|
135
136
|
author: naming(quote.actorId),
|
|
136
|
-
url: quote.url,
|
|
137
|
+
url: webAddress(quote.url),
|
|
137
138
|
content: sanitizeCommentHtml(quote.html),
|
|
138
139
|
published: quote.published,
|
|
139
140
|
inReplyTo: null,
|
|
@@ -151,7 +152,7 @@ export function federatedInteraction(reply, author) {
|
|
|
151
152
|
source: 'activitypub',
|
|
152
153
|
kind: 'reply',
|
|
153
154
|
author,
|
|
154
|
-
url: reply.url,
|
|
155
|
+
url: webAddress(reply.url),
|
|
155
156
|
content: sanitizeCommentHtml(reply.html),
|
|
156
157
|
published: reply.published,
|
|
157
158
|
inReplyTo: reply.inReplyTo,
|
|
@@ -159,6 +160,9 @@ export function federatedInteraction(reply, author) {
|
|
|
159
160
|
replies: [],
|
|
160
161
|
};
|
|
161
162
|
}
|
|
163
|
+
function webAddress(value) {
|
|
164
|
+
return isWebUrl(value) ? value : null;
|
|
165
|
+
}
|
|
162
166
|
export function unstored(id) {
|
|
163
167
|
return { id, key: repliesKey(id), guid: id, migrated: false };
|
|
164
168
|
}
|
|
@@ -225,7 +229,7 @@ export function authorNaming(admin) {
|
|
|
225
229
|
const author = {
|
|
226
230
|
name: profile?.name ?? handle ?? guessedName(actorId),
|
|
227
231
|
handle,
|
|
228
|
-
url: profile?.url ?? actorId,
|
|
232
|
+
url: webAddress(profile?.url ?? actorId),
|
|
229
233
|
avatar: icon === null ? null : avatarHref(icon),
|
|
230
234
|
actorId,
|
|
231
235
|
feed: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-folding.js","sourceRoot":"","sources":["../../src/web/activity-folding.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"activity-folding.js","sourceRoot":"","sources":["../../src/web/activity-folding.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Read a request body as text, or `undefined` when it is longer than `max`
|
|
3
|
+
* bytes, by its `Content-Length` or by the bytes that arrive.
|
|
4
|
+
*/
|
|
5
|
+
export declare function readBounded(request: Request, max: number): Promise<string | undefined>;
|
|
6
|
+
/**
|
|
7
|
+
* Read a form body, urlencoded or multipart, as its text fields. `too-large`
|
|
8
|
+
* when it is longer than `max` bytes, and `malformed` when it does not parse
|
|
9
|
+
* as the type it says it is.
|
|
10
|
+
*/
|
|
11
|
+
export declare function readBoundedForm(request: Request, max: number): Promise<Record<string, string> | 'too-large' | 'malformed'>;
|
|
12
|
+
//# sourceMappingURL=bounded-body.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bounded-body.d.ts","sourceRoot":"","sources":["../../src/web/bounded-body.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAsB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAoB5F;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,WAAW,GAAG,WAAW,CAAC,CAkB7D"}
|