@geekity/cms 0.49.0 → 0.50.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/admin/pages/federation/followers.njk +78 -55
- package/admin/pages/federation/resend.njk +70 -0
- package/dist/admin/assets.d.ts +1 -1
- package/dist/admin/assets.d.ts.map +1 -1
- package/dist/admin/assets.js +3 -5
- package/dist/admin/assets.js.map +1 -1
- package/dist/admin/federation.d.ts +7 -2
- package/dist/admin/federation.d.ts.map +1 -1
- package/dist/admin/federation.js +60 -11
- package/dist/admin/federation.js.map +1 -1
- package/dist/admin/menu.js +3 -3
- package/dist/admin/menu.js.map +1 -1
- package/dist/admin/preview.js +1 -1
- package/dist/admin/preview.js.map +1 -1
- package/dist/admin/routes.js +1 -1
- package/dist/admin/routes.js.map +1 -1
- package/dist/admin/settings-general.js +4 -3
- package/dist/admin/settings-general.js.map +1 -1
- package/dist/admin/templates.d.ts +1 -0
- package/dist/admin/templates.d.ts.map +1 -1
- package/dist/admin/templates.js +1 -0
- package/dist/admin/templates.js.map +1 -1
- package/dist/admin/widget-health.d.ts.map +1 -1
- package/dist/admin/widget-health.js +5 -6
- package/dist/admin/widget-health.js.map +1 -1
- package/dist/avatars/avatars.d.ts +12 -9
- package/dist/avatars/avatars.d.ts.map +1 -1
- package/dist/avatars/avatars.js +66 -33
- package/dist/avatars/avatars.js.map +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +2 -0
- package/dist/cms/services.js.map +1 -1
- package/dist/content/image-tags.d.ts +5 -1
- package/dist/content/image-tags.d.ts.map +1 -1
- package/dist/content/image-tags.js +8 -11
- package/dist/content/image-tags.js.map +1 -1
- package/dist/content/review.d.ts +2 -0
- package/dist/content/review.d.ts.map +1 -1
- package/dist/content/review.js +23 -6
- package/dist/content/review.js.map +1 -1
- package/dist/content/uploads.js +2 -3
- package/dist/content/uploads.js.map +1 -1
- package/dist/files/static-files.js +7 -4
- package/dist/files/static-files.js.map +1 -1
- package/dist/files/upload-types.d.ts +2 -5
- package/dist/files/upload-types.d.ts.map +1 -1
- package/dist/files/upload-types.js +2 -5
- package/dist/files/upload-types.js.map +1 -1
- package/dist/fonts/index.d.ts +1 -1
- package/dist/fonts/index.d.ts.map +1 -1
- package/dist/fonts/index.js +1 -1
- package/dist/fonts/index.js.map +1 -1
- package/dist/fonts/roles.d.ts +11 -2
- package/dist/fonts/roles.d.ts.map +1 -1
- package/dist/fonts/roles.js +57 -11
- package/dist/fonts/roles.js.map +1 -1
- package/dist/fonts/store.d.ts.map +1 -1
- package/dist/fonts/store.js +9 -7
- package/dist/fonts/store.js.map +1 -1
- package/dist/images/derived-sets.d.ts +56 -0
- package/dist/images/derived-sets.d.ts.map +1 -0
- package/dist/images/derived-sets.js +116 -0
- package/dist/images/derived-sets.js.map +1 -0
- package/dist/images/icon-setting.d.ts.map +1 -1
- package/dist/images/icon-setting.js +6 -10
- package/dist/images/icon-setting.js.map +1 -1
- package/dist/images/icons.d.ts +16 -13
- package/dist/images/icons.d.ts.map +1 -1
- package/dist/images/icons.js +103 -43
- package/dist/images/icons.js.map +1 -1
- package/dist/images/markup.d.ts.map +1 -1
- package/dist/images/markup.js +2 -12
- package/dist/images/markup.js.map +1 -1
- package/dist/images/paths.d.ts +32 -1
- package/dist/images/paths.d.ts.map +1 -1
- package/dist/images/paths.js +27 -3
- package/dist/images/paths.js.map +1 -1
- package/dist/images/variants.d.ts +34 -32
- package/dist/images/variants.d.ts.map +1 -1
- package/dist/images/variants.js +157 -168
- package/dist/images/variants.js.map +1 -1
- package/dist/mcp/inspect/status.d.ts.map +1 -1
- package/dist/mcp/inspect/status.js +5 -2
- package/dist/mcp/inspect/status.js.map +1 -1
- package/dist/media/library.js +3 -3
- package/dist/media/library.js.map +1 -1
- package/dist/store/deliveries.d.ts +1 -1
- package/dist/store/deliveries.d.ts.map +1 -1
- package/dist/store/deliveries.js +13 -5
- package/dist/store/deliveries.js.map +1 -1
- package/dist/theme/assets.d.ts +8 -0
- package/dist/theme/assets.d.ts.map +1 -1
- package/dist/theme/assets.js +92 -9
- package/dist/theme/assets.js.map +1 -1
- package/dist/util/public-address.d.ts +19 -1
- package/dist/util/public-address.d.ts.map +1 -1
- package/dist/util/public-address.js +51 -1
- 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 +21 -0
- package/dist/util/queue.js.map +1 -1
- package/dist/util/url.d.ts +10 -0
- package/dist/util/url.d.ts.map +1 -1
- package/dist/util/url.js +27 -0
- package/dist/util/url.js.map +1 -1
- package/dist/web/asset-routes.d.ts.map +1 -1
- package/dist/web/asset-routes.js +33 -33
- package/dist/web/asset-routes.js.map +1 -1
- package/dist/web/avatar-routes.d.ts.map +1 -1
- package/dist/web/avatar-routes.js +5 -7
- package/dist/web/avatar-routes.js.map +1 -1
- package/dist/web/compression.d.ts +1 -0
- package/dist/web/compression.d.ts.map +1 -1
- package/dist/web/compression.js +22 -8
- package/dist/web/compression.js.map +1 -1
- package/dist/web/context.js +3 -4
- package/dist/web/context.js.map +1 -1
- package/dist/web/document-page.js +2 -2
- package/dist/web/document-page.js.map +1 -1
- package/dist/web/font-routes.d.ts.map +1 -1
- package/dist/web/font-routes.js +2 -4
- package/dist/web/font-routes.js.map +1 -1
- package/dist/web/markdown-representation.js +2 -2
- package/dist/web/markdown-representation.js.map +1 -1
- package/dist/web/opensearch.js +2 -2
- package/dist/web/opensearch.js.map +1 -1
- package/dist/web/paths.js +1 -1
- package/dist/web/paths.js.map +1 -1
- package/dist/web/request.d.ts +6 -2
- package/dist/web/request.d.ts.map +1 -1
- package/dist/web/request.js +9 -7
- package/dist/web/request.js.map +1 -1
- package/dist/web/routes.d.ts.map +1 -1
- package/dist/web/routes.js +2 -1
- package/dist/web/routes.js.map +1 -1
- package/dist/web/site-index.js +2 -2
- package/dist/web/site-index.js.map +1 -1
- package/dist/webmention/cited-picture.d.ts.map +1 -1
- package/dist/webmention/cited-picture.js +2 -1
- package/dist/webmention/cited-picture.js.map +1 -1
- package/dist/webmention/fetch-public.d.ts.map +1 -1
- package/dist/webmention/fetch-public.js +5 -3
- package/dist/webmention/fetch-public.js.map +1 -1
- package/package.json +3 -2
- package/themes/default/src/style.css +24 -0
- package/themes/default/static/style.css +52 -0
package/dist/store/deliveries.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { decodeEntities } from '../util/html.js';
|
|
2
|
-
import { allRows, countByStatus, getRow, NO_LIMIT, nullableText, oneOf
|
|
2
|
+
import { allRows, countByStatus, getRow, NO_LIMIT, nullableText, oneOf } from './rows.js';
|
|
3
3
|
/** How one delivery of one activity to one follower ended. */
|
|
4
4
|
export const DELIVERY_STATUSES = ['sent', 'queued', 'retrying', 'failed', 'unknown'];
|
|
5
5
|
const DELIVERY_SEARCH = `
|
|
@@ -59,8 +59,16 @@ export function openDeliveryStore(db, clock) {
|
|
|
59
59
|
listDeletedObjectIds: db.prepare(`
|
|
60
60
|
SELECT DISTINCT object_id FROM ap_deliveries WHERE activity_type = 'Delete' ORDER BY object_id
|
|
61
61
|
`),
|
|
62
|
-
|
|
63
|
-
SELECT
|
|
62
|
+
listStandingFailuresSince: db.prepare(`
|
|
63
|
+
SELECT * FROM ap_deliveries AS failure
|
|
64
|
+
WHERE status = 'failed' AND attempted_at >= ?
|
|
65
|
+
AND NOT EXISTS (
|
|
66
|
+
SELECT 1 FROM ap_deliveries AS later
|
|
67
|
+
WHERE later.actor_id = failure.actor_id
|
|
68
|
+
AND COALESCE(later.slug, later.object_id) = COALESCE(failure.slug, failure.object_id)
|
|
69
|
+
AND (later.attempted_at, later.rowid) > (failure.attempted_at, failure.rowid)
|
|
70
|
+
)
|
|
71
|
+
ORDER BY attempted_at DESC, rowid DESC
|
|
64
72
|
`),
|
|
65
73
|
listSentActivitiesAbout: db.prepare(`
|
|
66
74
|
SELECT activity_id, activity_type, object_id, slug,
|
|
@@ -112,8 +120,8 @@ export function openDeliveryStore(db, clock) {
|
|
|
112
120
|
listDeletedObjectIds() {
|
|
113
121
|
return allRows(statements.listDeletedObjectIds, (row) => String(row['object_id']));
|
|
114
122
|
},
|
|
115
|
-
|
|
116
|
-
return
|
|
123
|
+
listStandingFailuresSince(since) {
|
|
124
|
+
return allRows(statements.listStandingFailuresSince, toDelivery, since);
|
|
117
125
|
},
|
|
118
126
|
listSentActivitiesAbout(objectIds) {
|
|
119
127
|
return allRows(statements.listSentActivitiesAbout, toSentActivity, JSON.stringify(objectIds));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,
|
|
1
|
+
{"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"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"}
|
package/dist/theme/assets.d.ts
CHANGED
|
@@ -50,6 +50,12 @@ export declare function assetVersion(asset: StaticAsset): string;
|
|
|
50
50
|
* have anyway.
|
|
51
51
|
*/
|
|
52
52
|
export declare function themeAssetUrl(relative: string, themeDirs: readonly string[]): string;
|
|
53
|
+
export declare function assetReply(asset: StaticAsset, request: Headers, options?: AssetResponseOptions): Response;
|
|
54
|
+
/**
|
|
55
|
+
* `If-None-Match` decides alone when it is sent; `If-Modified-Since` is read
|
|
56
|
+
* only without it, as RFC 9110 §13.2.2 orders them.
|
|
57
|
+
*/
|
|
58
|
+
export declare function isNotModified(asset: StaticAsset, request: Headers): boolean;
|
|
53
59
|
/** The response body and headers for an asset. */
|
|
54
60
|
export declare function assetResponse(asset: StaticAsset, options?: AssetResponseOptions): Response;
|
|
55
61
|
/**
|
|
@@ -62,6 +68,8 @@ export declare function assetResponse(asset: StaticAsset, options?: AssetRespons
|
|
|
62
68
|
* several, or one that cannot be read, gets the whole file, which is what
|
|
63
69
|
* HTTP allows a server that ignores `Range` to send. So does a request whose
|
|
64
70
|
* `If-Range` no longer names this file: its earlier part was of other bytes.
|
|
71
|
+
* An empty file has no last bytes to send, so a suffix range of it gets the
|
|
72
|
+
* whole, empty file too.
|
|
65
73
|
*
|
|
66
74
|
* Returns `undefined` when the whole file is the answer.
|
|
67
75
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/theme/assets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/theme/assets.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,yDAAyD;AACzD,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAE5C,qFAAqF;AACrF,eAAO,MAAM,oBAAoB,QAAQ,CAAC;AAE1C,sEAAsE;AACtE,eAAO,MAAM,gBAAgB,WAAW,CAAC;AAEzC,+EAA+E;AAC/E,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC;;;GAGG;AACH,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD,+EAA+E;AAC/E,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC,0EAA0E;AAC1E,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC;AAErC;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,MAAM,EAAE,GAC3B,UAAU,GAAG,SAAS,CAKxB;AAED,0EAA0E;AAC1E,MAAM,WAAW,oBAAoB;IACnC,wDAAwD;IACxD,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,wFAAwF;IACxF,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CACjC;AAED,4DAA4D;AAC5D,eAAO,MAAM,eAAe,EAAE,oBAG7B,CAAC;AAIF;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAOvD;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAKpF;AAED,wBAAgB,UAAU,CACxB,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,oBAAyB,GACjC,QAAQ,CAIV;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAK3E;AAED,kDAAkD;AAClD,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,GAAE,oBAAyB,GAAG,QAAQ,CAI9F;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,WAAW,EAClB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,GAAE,oBAAyB,GACjC,QAAQ,GAAG,SAAS,CA8BtB;AAmBD,iFAAiF;AACjF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,GAAE,oBAAyB,GAAG,QAAQ,CAKjG;AAED,2DAA2D;AAC3D,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,QAAQ,CAE9D;AAED,8DAA8D;AAC9D,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,UAAU,GAAG,QAAQ,CAEjE;AAED,6DAA6D;AAC7D,wBAAgB,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAOlF"}
|
package/dist/theme/assets.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createHash } from 'node:crypto';
|
|
2
|
-
import {
|
|
2
|
+
import { readFileSync } from 'node:fs';
|
|
3
|
+
import { open } from 'node:fs/promises';
|
|
3
4
|
import path from 'node:path';
|
|
4
|
-
import { Readable } from 'node:stream';
|
|
5
5
|
import { findAsset } from '../files/static-files.js';
|
|
6
6
|
/** URL prefix the theme's own files are served under. */
|
|
7
7
|
export const THEME_ASSET_PREFIX = '/theme/';
|
|
@@ -64,10 +64,27 @@ export function themeAssetUrl(relative, themeDirs) {
|
|
|
64
64
|
return pathname;
|
|
65
65
|
return `${pathname}?${ASSET_VERSION_PARAM}=${assetVersion(asset)}`;
|
|
66
66
|
}
|
|
67
|
+
export function assetReply(asset, request, options = {}) {
|
|
68
|
+
return isNotModified(asset, request)
|
|
69
|
+
? assetNotModified(asset, options)
|
|
70
|
+
: assetResponse(asset, options);
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* `If-None-Match` decides alone when it is sent; `If-Modified-Since` is read
|
|
74
|
+
* only without it, as RFC 9110 §13.2.2 orders them.
|
|
75
|
+
*/
|
|
76
|
+
export function isNotModified(asset, request) {
|
|
77
|
+
const ifNoneMatch = request.get('if-none-match');
|
|
78
|
+
if (ifNoneMatch !== null)
|
|
79
|
+
return matchesEtag(ifNoneMatch, asset.etag);
|
|
80
|
+
const since = Date.parse(request.get('if-modified-since') ?? '');
|
|
81
|
+
return !Number.isNaN(since) && lastModifiedSecond(asset) <= since;
|
|
82
|
+
}
|
|
67
83
|
/** The response body and headers for an asset. */
|
|
68
84
|
export function assetResponse(asset, options = {}) {
|
|
69
|
-
|
|
70
|
-
|
|
85
|
+
return new Response(lazyFileBody(asset, 0, asset.stats.size - 1), {
|
|
86
|
+
headers: assetHeaders(asset, options),
|
|
87
|
+
});
|
|
71
88
|
}
|
|
72
89
|
/**
|
|
73
90
|
* Part of an asset, for a request that asked for one byte range of it.
|
|
@@ -79,15 +96,17 @@ export function assetResponse(asset, options = {}) {
|
|
|
79
96
|
* several, or one that cannot be read, gets the whole file, which is what
|
|
80
97
|
* HTTP allows a server that ignores `Range` to send. So does a request whose
|
|
81
98
|
* `If-Range` no longer names this file: its earlier part was of other bytes.
|
|
99
|
+
* An empty file has no last bytes to send, so a suffix range of it gets the
|
|
100
|
+
* whole, empty file too.
|
|
82
101
|
*
|
|
83
102
|
* Returns `undefined` when the whole file is the answer.
|
|
84
103
|
*/
|
|
85
104
|
export function assetRangeResponse(asset, range, ifRange, options = {}) {
|
|
86
105
|
if (range === undefined)
|
|
87
106
|
return undefined;
|
|
88
|
-
if (ifRange !== undefined && ifRange.trim()
|
|
107
|
+
if (ifRange !== undefined && !stillNamed(asset, ifRange.trim()))
|
|
89
108
|
return undefined;
|
|
90
|
-
const match = /^bytes=(\d*)-(\d*)
|
|
109
|
+
const match = /^bytes=(\d*)-(\d*)$/i.exec(range.trim());
|
|
91
110
|
if (match === null)
|
|
92
111
|
return undefined;
|
|
93
112
|
const [, first = '', last = ''] = match;
|
|
@@ -96,6 +115,8 @@ export function assetRangeResponse(asset, range, ifRange, options = {}) {
|
|
|
96
115
|
if (first !== '' && last !== '' && Number(last) < Number(first))
|
|
97
116
|
return undefined;
|
|
98
117
|
const size = asset.stats.size;
|
|
118
|
+
if (first === '' && size === 0 && Number(last) > 0)
|
|
119
|
+
return undefined;
|
|
99
120
|
// `bytes=-500` is the last five hundred bytes; `bytes=500-` is all but the first five hundred.
|
|
100
121
|
const start = first === '' ? Math.max(0, size - Number(last)) : Number(first);
|
|
101
122
|
const end = first === '' || last === '' ? size - 1 : Math.min(Number(last), size - 1);
|
|
@@ -103,14 +124,28 @@ export function assetRangeResponse(asset, range, ifRange, options = {}) {
|
|
|
103
124
|
headers.set('accept-ranges', 'bytes');
|
|
104
125
|
if (start >= size) {
|
|
105
126
|
headers.delete('content-type');
|
|
127
|
+
headers.set('cache-control', 'no-store');
|
|
106
128
|
headers.set('content-length', '0');
|
|
107
129
|
headers.set('content-range', `bytes */${String(size)}`);
|
|
108
130
|
return new Response(null, { status: 416, headers });
|
|
109
131
|
}
|
|
110
132
|
headers.set('content-length', String(end - start + 1));
|
|
111
133
|
headers.set('content-range', `bytes ${String(start)}-${String(end)}/${String(size)}`);
|
|
112
|
-
|
|
113
|
-
|
|
134
|
+
return new Response(lazyFileBody(asset, start, end), { status: 206, headers });
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* Whether an `If-Range` still names this file. A date counts only when it is
|
|
138
|
+
* a strong validator: the file has gone at least a second unchanged, so no
|
|
139
|
+
* second write could share its Last-Modified (RFC 9110 §8.8.2.2). A weak
|
|
140
|
+
* tag never counts.
|
|
141
|
+
*/
|
|
142
|
+
function stillNamed(asset, ifRange) {
|
|
143
|
+
if (ifRange.startsWith('"') || ifRange.startsWith('W/'))
|
|
144
|
+
return ifRange === asset.etag;
|
|
145
|
+
return (Date.parse(ifRange) === lastModifiedSecond(asset) && Date.now() - asset.stats.mtimeMs >= 1000);
|
|
146
|
+
}
|
|
147
|
+
function lastModifiedSecond(asset) {
|
|
148
|
+
return Math.floor(asset.stats.mtimeMs / 1000) * 1000;
|
|
114
149
|
}
|
|
115
150
|
/** The 304 an unchanged asset gets, which carries the validators and no body. */
|
|
116
151
|
export function assetNotModified(asset, options = {}) {
|
|
@@ -138,6 +173,54 @@ export function matchesEtag(ifNoneMatch, etag) {
|
|
|
138
173
|
.map((candidate) => candidate.trim().replace(/^W\//, ''))
|
|
139
174
|
.includes(etag);
|
|
140
175
|
}
|
|
176
|
+
const CHUNK_BYTES = 64 * 1024;
|
|
177
|
+
const PULL_ONLY_WHEN_READ = { highWaterMark: 0 };
|
|
178
|
+
function lazyFileBody(asset, start, endInclusive) {
|
|
179
|
+
let handle;
|
|
180
|
+
let position = start;
|
|
181
|
+
async function close() {
|
|
182
|
+
const current = handle;
|
|
183
|
+
handle = undefined;
|
|
184
|
+
await current?.close();
|
|
185
|
+
}
|
|
186
|
+
return new ReadableStream({
|
|
187
|
+
async pull(controller) {
|
|
188
|
+
try {
|
|
189
|
+
handle ??= await openUnchangedSinceStat(asset);
|
|
190
|
+
const length = Math.min(CHUNK_BYTES, endInclusive + 1 - position);
|
|
191
|
+
if (length > 0) {
|
|
192
|
+
const { bytesRead, buffer } = await handle.read(new Uint8Array(length), 0, length, position);
|
|
193
|
+
if (bytesRead === 0)
|
|
194
|
+
throw new Error(`${asset.file} ended before its stated length`);
|
|
195
|
+
position += bytesRead;
|
|
196
|
+
controller.enqueue(buffer.subarray(0, bytesRead));
|
|
197
|
+
}
|
|
198
|
+
if (position > endInclusive) {
|
|
199
|
+
await close();
|
|
200
|
+
controller.close();
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
catch (error) {
|
|
204
|
+
await close();
|
|
205
|
+
throw error;
|
|
206
|
+
}
|
|
207
|
+
},
|
|
208
|
+
cancel: close,
|
|
209
|
+
}, PULL_ONLY_WHEN_READ);
|
|
210
|
+
}
|
|
211
|
+
async function openUnchangedSinceStat(asset) {
|
|
212
|
+
const handle = await open(asset.file, 'r');
|
|
213
|
+
const opened = await handle.stat();
|
|
214
|
+
const { stats } = asset;
|
|
215
|
+
if (opened.dev !== stats.dev ||
|
|
216
|
+
opened.ino !== stats.ino ||
|
|
217
|
+
opened.size !== stats.size ||
|
|
218
|
+
opened.mtimeMs !== stats.mtimeMs) {
|
|
219
|
+
await handle.close();
|
|
220
|
+
throw new Error(`${asset.file} changed after its headers were written`);
|
|
221
|
+
}
|
|
222
|
+
return handle;
|
|
223
|
+
}
|
|
141
224
|
function assetHeaders(asset, options) {
|
|
142
225
|
const maxAge = options.maxAge ?? THEME_ASSET_MAX_AGE;
|
|
143
226
|
const immutable = options.immutable === true ? ', immutable' : '';
|
|
@@ -145,7 +228,7 @@ function assetHeaders(asset, options) {
|
|
|
145
228
|
'content-type': asset.contentType,
|
|
146
229
|
'content-length': String(asset.stats.size),
|
|
147
230
|
'cache-control': `public, max-age=${String(maxAge)}${immutable}`,
|
|
148
|
-
'last-modified': new Date(asset
|
|
231
|
+
'last-modified': new Date(lastModifiedSecond(asset)).toUTCString(),
|
|
149
232
|
etag: asset.etag,
|
|
150
233
|
});
|
|
151
234
|
}
|
package/dist/theme/assets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/theme/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/theme/assets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { LookupFunction } from 'node:net';
|
|
1
2
|
/**
|
|
2
3
|
* Whether a host is somebody else's, before this site fetches from it.
|
|
3
4
|
*
|
|
@@ -10,7 +11,9 @@
|
|
|
10
11
|
* and refuses it when any address it resolves to is private.
|
|
11
12
|
*
|
|
12
13
|
* Neither pins the address the connection then goes to, so a name that
|
|
13
|
-
* resolves differently a moment later (DNS rebinding)
|
|
14
|
+
* resolves differently a moment later (DNS rebinding) would get past them.
|
|
15
|
+
* {@link publicDispatcher} is what does: the socket connects to the answer
|
|
16
|
+
* the check saw, and to nothing else.
|
|
14
17
|
*/
|
|
15
18
|
/** The addresses a host name resolves to. Injected so a test resolves nothing. */
|
|
16
19
|
export type HostLookup = (hostname: string) => Promise<readonly string[]>;
|
|
@@ -28,4 +31,19 @@ export declare function isPrivateHost(hostname: string): boolean;
|
|
|
28
31
|
* address it resolves to public. A name that does not resolve is not.
|
|
29
32
|
*/
|
|
30
33
|
export declare function publicHost(hostname: string, lookup: HostLookup): Promise<boolean>;
|
|
34
|
+
/**
|
|
35
|
+
* The type `fetch` takes: Node's copy of undici's, which the npm package's
|
|
36
|
+
* duplicates with a drift in method signatures, so an Agent is cast to it.
|
|
37
|
+
*/
|
|
38
|
+
type FetchDispatcher = NonNullable<RequestInit['dispatcher']>;
|
|
39
|
+
/**
|
|
40
|
+
* The dispatcher a public fetch goes through. Its sockets resolve a name
|
|
41
|
+
* through `lookup`, refuse to connect when any answer is private, and connect
|
|
42
|
+
* to the answer they checked, so the address checked and the address dialled
|
|
43
|
+
* are the same resolution. One per lookup, so connections are pooled.
|
|
44
|
+
*/
|
|
45
|
+
export declare function publicDispatcher(lookup: HostLookup): FetchDispatcher;
|
|
46
|
+
/** The resolver a socket is handed: `lookup`'s answer when every address is public, else an error. */
|
|
47
|
+
export declare function pinnedLookup(lookup: HostLookup): LookupFunction;
|
|
48
|
+
export {};
|
|
31
49
|
//# sourceMappingURL=public-address.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"public-address.d.ts","sourceRoot":"","sources":["../../src/util/public-address.ts"],"names":[],"mappings":"
|
|
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;AA2D3E,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAIvD;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAavF;AAED;;;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,CAkB/D"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { lookup as dnsLookup } from 'node:dns/promises';
|
|
2
2
|
import { BlockList, isIP } from 'node:net';
|
|
3
|
+
import { Agent } from 'undici';
|
|
3
4
|
/** Resolve a name through the system resolver, every address it has. */
|
|
4
5
|
export const systemHostLookup = async (hostname) => (await dnsLookup(hostname, { all: true })).map((found) => found.address);
|
|
5
6
|
const LOCAL = [
|
|
@@ -12,6 +13,11 @@ const LOCAL = [
|
|
|
12
13
|
['fc00::', 7, 'ipv6'],
|
|
13
14
|
['fe80::', 10, 'ipv6'],
|
|
14
15
|
];
|
|
16
|
+
/**
|
|
17
|
+
* Reserved, plus the IPv6 prefixes that carry an IPv4 address inside them
|
|
18
|
+
* (IPv4-compatible, NAT64, 6to4, Teredo): a gateway or relay turns those
|
|
19
|
+
* into a connection to the embedded address, which may be a private one.
|
|
20
|
+
*/
|
|
15
21
|
const RESERVED = [
|
|
16
22
|
['0.0.0.0', 8, 'ipv4'],
|
|
17
23
|
['100.64.0.0', 10, 'ipv4'],
|
|
@@ -19,7 +25,12 @@ const RESERVED = [
|
|
|
19
25
|
['198.18.0.0', 15, 'ipv4'],
|
|
20
26
|
['224.0.0.0', 4, 'ipv4'],
|
|
21
27
|
['240.0.0.0', 4, 'ipv4'],
|
|
22
|
-
['::',
|
|
28
|
+
['::', 96, 'ipv6'],
|
|
29
|
+
['64:ff9b::', 96, 'ipv6'],
|
|
30
|
+
['64:ff9b:1::', 48, 'ipv6'],
|
|
31
|
+
['2001::', 32, 'ipv6'],
|
|
32
|
+
['2002::', 16, 'ipv6'],
|
|
33
|
+
['fec0::', 10, 'ipv6'],
|
|
23
34
|
['ff00::', 8, 'ipv6'],
|
|
24
35
|
];
|
|
25
36
|
function blockList(ranges) {
|
|
@@ -76,4 +87,43 @@ export async function publicHost(hostname, lookup) {
|
|
|
76
87
|
}
|
|
77
88
|
return addresses.length > 0 && !addresses.some(isPrivateAddress);
|
|
78
89
|
}
|
|
90
|
+
const dispatchers = new WeakMap();
|
|
91
|
+
/**
|
|
92
|
+
* The dispatcher a public fetch goes through. Its sockets resolve a name
|
|
93
|
+
* through `lookup`, refuse to connect when any answer is private, and connect
|
|
94
|
+
* to the answer they checked, so the address checked and the address dialled
|
|
95
|
+
* are the same resolution. One per lookup, so connections are pooled.
|
|
96
|
+
*/
|
|
97
|
+
export function publicDispatcher(lookup) {
|
|
98
|
+
const held = dispatchers.get(lookup);
|
|
99
|
+
if (held !== undefined)
|
|
100
|
+
return held;
|
|
101
|
+
const made = new Agent({
|
|
102
|
+
connect: { lookup: pinnedLookup(lookup) },
|
|
103
|
+
});
|
|
104
|
+
dispatchers.set(lookup, made);
|
|
105
|
+
return made;
|
|
106
|
+
}
|
|
107
|
+
/** The resolver a socket is handed: `lookup`'s answer when every address is public, else an error. */
|
|
108
|
+
export function pinnedLookup(lookup) {
|
|
109
|
+
return (hostname, options, callback) => {
|
|
110
|
+
lookup(hostname).then((addresses) => {
|
|
111
|
+
const [first, ...rest] = addresses.map((address) => ({ address, family: isIP(address) }));
|
|
112
|
+
if (first === undefined || addresses.some(isPrivateAddress)) {
|
|
113
|
+
callback(notPublic(hostname), '', undefined);
|
|
114
|
+
}
|
|
115
|
+
else if (options.all === true) {
|
|
116
|
+
callback(null, [first, ...rest], undefined);
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
callback(null, first.address, first.family);
|
|
120
|
+
}
|
|
121
|
+
}, (thrown) => {
|
|
122
|
+
callback(thrown instanceof Error ? thrown : new Error(String(thrown)), '', undefined);
|
|
123
|
+
});
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
function notPublic(hostname) {
|
|
127
|
+
return Object.assign(new Error(`${hostname} is not a public address`), { code: 'ENOTFOUND' });
|
|
128
|
+
}
|
|
79
129
|
//# sourceMappingURL=public-address.js.map
|
|
@@ -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;
|
|
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
|
@@ -4,4 +4,9 @@ export interface SerialQueue {
|
|
|
4
4
|
pending(): number;
|
|
5
5
|
}
|
|
6
6
|
export declare function createSerialQueue(): SerialQueue;
|
|
7
|
+
/** Runs jobs at most `limit` at a time, the rest waiting their turn in order. */
|
|
8
|
+
export interface ConcurrencyLimit {
|
|
9
|
+
run<T>(job: () => Promise<T>): Promise<T>;
|
|
10
|
+
}
|
|
11
|
+
export declare function createConcurrencyLimit(limit: number): ConcurrencyLimit;
|
|
7
12
|
//# 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"}
|
|
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"}
|
package/dist/util/queue.js
CHANGED
|
@@ -19,5 +19,26 @@ export function createSerialQueue() {
|
|
|
19
19
|
},
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
|
+
export function createConcurrencyLimit(limit) {
|
|
23
|
+
let running = 0;
|
|
24
|
+
const waiting = [];
|
|
25
|
+
return {
|
|
26
|
+
async run(job) {
|
|
27
|
+
if (running >= limit) {
|
|
28
|
+
await new Promise((resolve) => {
|
|
29
|
+
waiting.push(resolve);
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
running += 1;
|
|
33
|
+
try {
|
|
34
|
+
return await job();
|
|
35
|
+
}
|
|
36
|
+
finally {
|
|
37
|
+
running -= 1;
|
|
38
|
+
waiting.shift()?.();
|
|
39
|
+
}
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
}
|
|
22
43
|
function ignore() { }
|
|
23
44
|
//# 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;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;AAED,SAAS,MAAM,KAAU,CAAC"}
|
package/dist/util/url.d.ts
CHANGED
|
@@ -8,4 +8,14 @@ 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
|
+
/** A decoded path with each segment percent-encoded, so `#`, `?`, `%` and spaces name the file rather than end the path. */
|
|
12
|
+
export declare function encodePath(pathname: string): string;
|
|
13
|
+
/**
|
|
14
|
+
* A decoded relative path, or `undefined` when a segment is empty, `.` or `..`
|
|
15
|
+
* or it holds a NUL, so each file has one spelling and no path resolves
|
|
16
|
+
* somewhere its text does not say.
|
|
17
|
+
*/
|
|
18
|
+
export declare function plainRelativePath(decoded: string): string | undefined;
|
|
19
|
+
/** A relative URL path decoded segment by segment, then held to {@link plainRelativePath}. */
|
|
20
|
+
export declare function decodedRelativePath(encoded: string): string | undefined;
|
|
11
21
|
//# 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"}
|
|
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"}
|
package/dist/util/url.js
CHANGED
|
@@ -17,4 +17,31 @@ 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
|
+
/** A decoded path with each segment percent-encoded, so `#`, `?`, `%` and spaces name the file rather than end the path. */
|
|
21
|
+
export function encodePath(pathname) {
|
|
22
|
+
return pathname
|
|
23
|
+
.split('/')
|
|
24
|
+
.map((segment) => encodeURIComponent(segment))
|
|
25
|
+
.join('/');
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* A decoded relative path, or `undefined` when a segment is empty, `.` or `..`
|
|
29
|
+
* or it holds a NUL, so each file has one spelling and no path resolves
|
|
30
|
+
* somewhere its text does not say.
|
|
31
|
+
*/
|
|
32
|
+
export function plainRelativePath(decoded) {
|
|
33
|
+
if (decoded.includes('\0'))
|
|
34
|
+
return undefined;
|
|
35
|
+
const plain = decoded.split('/').every((segment) => !['', '.', '..'].includes(segment));
|
|
36
|
+
return plain ? decoded : undefined;
|
|
37
|
+
}
|
|
38
|
+
/** A relative URL path decoded segment by segment, then held to {@link plainRelativePath}. */
|
|
39
|
+
export function decodedRelativePath(encoded) {
|
|
40
|
+
try {
|
|
41
|
+
return plainRelativePath(encoded.split('/').map(decodeURIComponent).join('/'));
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
return undefined;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
20
47
|
//# 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"}
|
|
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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-routes.d.ts","sourceRoot":"","sources":["../../src/web/asset-routes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"asset-routes.d.ts","sourceRoot":"","sources":["../../src/web/asset-routes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAQ1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAoB3C;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,QAAQ,CAS3D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAU5E;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CASvE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAgB9F"}
|