@geekity/cms 0.53.0 → 0.55.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/media/file.njk +16 -1
- package/admin/pages/settings/reading.njk +24 -0
- package/dist/admin/dashboard.d.ts.map +1 -1
- package/dist/admin/dashboard.js +2 -2
- package/dist/admin/dashboard.js.map +1 -1
- package/dist/admin/index.d.ts +1 -1
- package/dist/admin/index.d.ts.map +1 -1
- package/dist/admin/index.js +1 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/media.d.ts +3 -1
- package/dist/admin/media.d.ts.map +1 -1
- package/dist/admin/media.js +89 -2
- package/dist/admin/media.js.map +1 -1
- package/dist/admin/routes.js +6 -2
- package/dist/admin/routes.js.map +1 -1
- package/dist/admin/settings-fields.d.ts.map +1 -1
- package/dist/admin/settings-fields.js +8 -1
- package/dist/admin/settings-fields.js.map +1 -1
- package/dist/admin/settings-reading.d.ts.map +1 -1
- package/dist/admin/settings-reading.js +3 -0
- package/dist/admin/settings-reading.js.map +1 -1
- package/dist/admin/widgets.d.ts +3 -2
- package/dist/admin/widgets.d.ts.map +1 -1
- package/dist/admin/widgets.js +6 -5
- package/dist/admin/widgets.js.map +1 -1
- package/dist/cms/app.d.ts.map +1 -1
- package/dist/cms/app.js +0 -2
- package/dist/cms/app.js.map +1 -1
- package/dist/cms/create.d.ts +7 -0
- package/dist/cms/create.d.ts.map +1 -1
- package/dist/cms/create.js +1 -0
- package/dist/cms/create.js.map +1 -1
- package/dist/cms/services.d.ts +2 -0
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +7 -0
- package/dist/cms/services.js.map +1 -1
- package/dist/content/save.d.ts +21 -0
- package/dist/content/save.d.ts.map +1 -1
- package/dist/content/save.js +58 -0
- package/dist/content/save.js.map +1 -1
- package/dist/exports.d.ts +1 -0
- package/dist/exports.d.ts.map +1 -1
- package/dist/federation/article.d.ts +6 -0
- package/dist/federation/article.d.ts.map +1 -1
- package/dist/federation/article.js +47 -64
- package/dist/federation/article.js.map +1 -1
- 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 +46 -0
- package/dist/following/list.d.ts.map +1 -0
- package/dist/following/list.js +244 -0
- package/dist/following/list.js.map +1 -0
- package/dist/following/opml.d.ts +18 -0
- package/dist/following/opml.d.ts.map +1 -0
- package/dist/following/opml.js +92 -0
- package/dist/following/opml.js.map +1 -0
- package/dist/media/uploads.d.ts +13 -0
- package/dist/media/uploads.d.ts.map +1 -1
- package/dist/media/uploads.js +47 -14
- package/dist/media/uploads.js.map +1 -1
- package/dist/site/namespace.d.ts +1 -0
- package/dist/site/namespace.d.ts.map +1 -1
- package/dist/site/namespace.js +10 -1
- package/dist/site/namespace.js.map +1 -1
- package/dist/site/setting-values.d.ts +1 -0
- package/dist/site/setting-values.d.ts.map +1 -1
- package/dist/site/setting-values.js +10 -0
- package/dist/site/setting-values.js.map +1 -1
- package/dist/web/asset-routes.d.ts +1 -3
- package/dist/web/asset-routes.d.ts.map +1 -1
- package/dist/web/asset-routes.js +1 -3
- package/dist/web/asset-routes.js.map +1 -1
- package/dist/web/following-opml.d.ts +14 -0
- package/dist/web/following-opml.d.ts.map +1 -0
- package/dist/web/following-opml.js +42 -0
- package/dist/web/following-opml.js.map +1 -0
- package/dist/web/routes.d.ts.map +1 -1
- package/dist/web/routes.js +3 -0
- package/dist/web/routes.js.map +1 -1
- package/dist/web/social-profile.d.ts +28 -0
- package/dist/web/social-profile.d.ts.map +1 -0
- package/dist/web/social-profile.js +127 -0
- package/dist/web/social-profile.js.map +1 -0
- package/dist/web/theme-environment.d.ts.map +1 -1
- package/dist/web/theme-environment.js +17 -0
- package/dist/web/theme-environment.js.map +1 -1
- package/dist/web/well-known.d.ts +0 -1
- package/dist/web/well-known.d.ts.map +1 -1
- package/dist/web/well-known.js +18 -1
- package/dist/web/well-known.js.map +1 -1
- package/package.json +1 -1
- package/themes/default/layouts/base.njk +3 -0
|
@@ -0,0 +1,244 @@
|
|
|
1
|
+
import { statSync } from 'node:fs';
|
|
2
|
+
import { readFileIfPresentSync, writeFileAtomically } from '../files/atomic.js';
|
|
3
|
+
import { dataPath, FOLLOWING_LIST } from '../files/data-files.js';
|
|
4
|
+
import { systemNotificationTimers } from '../notifications/digest.js';
|
|
5
|
+
import { SITE } from '../site/namespace.js';
|
|
6
|
+
import { isRecord } from '../util/guards.js';
|
|
7
|
+
import { messageOf } from '../util/errors.js';
|
|
8
|
+
import { createSerialQueue } from '../util/queue.js';
|
|
9
|
+
import { readWithin, requestPublic } from '../webmention/fetch-public.js';
|
|
10
|
+
import { opmlAlternate, parseOpml } from './opml.js';
|
|
11
|
+
export const FOLLOWING_REFRESH_MS = 6 * 60 * 60 * 1000;
|
|
12
|
+
const FOLLOWING_EXCHANGE_TIMEOUT_MS = 15_000;
|
|
13
|
+
const FOLLOWING_MAX_BYTES = 2_000_000;
|
|
14
|
+
const ACCEPT = 'text/x-opml, application/xml;q=0.9, text/xml;q=0.8, text/html;q=0.1';
|
|
15
|
+
const HTML_TYPE = /^\s*(?:text\/html|application\/xhtml\+xml)\s*(?:;|$)/i;
|
|
16
|
+
const parsedUntilFileChanges = new Map();
|
|
17
|
+
export function readFollowing(dataDir) {
|
|
18
|
+
const file = dataPath(dataDir, FOLLOWING_LIST);
|
|
19
|
+
const stats = statSync(file, { throwIfNoEntry: false });
|
|
20
|
+
if (stats === undefined)
|
|
21
|
+
return undefined;
|
|
22
|
+
const stamp = `${String(stats.ino)}:${String(stats.mtimeMs)}:${String(stats.size)}`;
|
|
23
|
+
const known = parsedUntilFileChanges.get(file);
|
|
24
|
+
if (known?.stamp === stamp)
|
|
25
|
+
return known.record;
|
|
26
|
+
const text = readFileIfPresentSync(file);
|
|
27
|
+
let record;
|
|
28
|
+
try {
|
|
29
|
+
record = text === undefined ? undefined : recordOf(JSON.parse(text));
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
record = undefined;
|
|
33
|
+
}
|
|
34
|
+
parsedUntilFileChanges.set(file, { stamp, record });
|
|
35
|
+
return record;
|
|
36
|
+
}
|
|
37
|
+
export function servedFollowing(dataDir, source) {
|
|
38
|
+
return listFor(readFollowing(dataDir), source);
|
|
39
|
+
}
|
|
40
|
+
export function followingStatus(dataDir, source) {
|
|
41
|
+
const record = readFollowing(dataDir);
|
|
42
|
+
if (source === '' || record?.source !== source)
|
|
43
|
+
return undefined;
|
|
44
|
+
return {
|
|
45
|
+
...(record.list === undefined
|
|
46
|
+
? {}
|
|
47
|
+
: { fetchedAt: record.list.fetchedAt, feedCount: record.list.feeds.length }),
|
|
48
|
+
...(record.failure === undefined ? {} : { failure: record.failure }),
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
function listFor(record, source) {
|
|
52
|
+
return source !== '' && record?.source === source ? record.list : undefined;
|
|
53
|
+
}
|
|
54
|
+
async function fetchFollowing(source, held, lookup) {
|
|
55
|
+
const signal = AbortSignal.timeout(FOLLOWING_EXCHANGE_TIMEOUT_MS);
|
|
56
|
+
const ask = (url) => get(url, held?.opmlUrl === url ? held : undefined, lookup, signal);
|
|
57
|
+
let opmlUrl = source;
|
|
58
|
+
let answer = await ask(source);
|
|
59
|
+
if (answer.kind === 'body' && HTML_TYPE.test(answer.type)) {
|
|
60
|
+
const alternate = opmlAlternate(answer.text, answer.url);
|
|
61
|
+
if (alternate === undefined) {
|
|
62
|
+
return { kind: 'failed', reason: 'it answered a web page that names no OPML alternate' };
|
|
63
|
+
}
|
|
64
|
+
opmlUrl = alternate;
|
|
65
|
+
answer = await ask(alternate);
|
|
66
|
+
if (answer.kind === 'body' && HTML_TYPE.test(answer.type)) {
|
|
67
|
+
return { kind: 'failed', reason: `its OPML alternate ${alternate} answered a web page` };
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
if (answer.kind !== 'body')
|
|
71
|
+
return answer;
|
|
72
|
+
const parsed = parseOpml(answer.text);
|
|
73
|
+
if (!parsed.ok)
|
|
74
|
+
return { kind: 'failed', reason: `it is not OPML: ${parsed.problem}` };
|
|
75
|
+
return {
|
|
76
|
+
kind: 'list',
|
|
77
|
+
feeds: parsed.feeds,
|
|
78
|
+
opmlUrl,
|
|
79
|
+
...(answer.etag === undefined ? {} : { etag: answer.etag }),
|
|
80
|
+
...(answer.lastModified === undefined ? {} : { lastModified: answer.lastModified }),
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
async function get(url, validators, lookup, signal) {
|
|
84
|
+
const headers = { accept: ACCEPT };
|
|
85
|
+
if (validators?.etag !== undefined)
|
|
86
|
+
headers['if-none-match'] = validators.etag;
|
|
87
|
+
if (validators?.lastModified !== undefined) {
|
|
88
|
+
headers['if-modified-since'] = validators.lastModified;
|
|
89
|
+
}
|
|
90
|
+
const answered = await requestPublic(url, { lookup, signal, headers });
|
|
91
|
+
if (!answered.ok)
|
|
92
|
+
return { kind: 'failed', reason: answered.reason };
|
|
93
|
+
const { response } = answered;
|
|
94
|
+
try {
|
|
95
|
+
if (response.status === 304) {
|
|
96
|
+
await response.body?.cancel();
|
|
97
|
+
return { kind: 'unchanged' };
|
|
98
|
+
}
|
|
99
|
+
if (!response.ok) {
|
|
100
|
+
await response.body?.cancel();
|
|
101
|
+
return { kind: 'failed', reason: `${url} answered ${String(response.status)}` };
|
|
102
|
+
}
|
|
103
|
+
const read = await readWithin(response, FOLLOWING_MAX_BYTES, 'refuse');
|
|
104
|
+
if (read === undefined) {
|
|
105
|
+
return {
|
|
106
|
+
kind: 'failed',
|
|
107
|
+
reason: `${url} is larger than ${String(FOLLOWING_MAX_BYTES)} bytes`,
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
const etag = response.headers.get('etag') ?? undefined;
|
|
111
|
+
const lastModified = response.headers.get('last-modified') ?? undefined;
|
|
112
|
+
return {
|
|
113
|
+
kind: 'body',
|
|
114
|
+
url: answered.url,
|
|
115
|
+
type: response.headers.get('content-type') ?? '',
|
|
116
|
+
text: new TextDecoder().decode(read.body),
|
|
117
|
+
...(etag === undefined ? {} : { etag }),
|
|
118
|
+
...(lastModified === undefined ? {} : { lastModified }),
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
catch (thrown) {
|
|
122
|
+
return { kind: 'failed', reason: messageOf(thrown) };
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
function afterFetch(record, source, fetched, now) {
|
|
126
|
+
const at = now.toISOString();
|
|
127
|
+
const held = listFor(record, source);
|
|
128
|
+
switch (fetched.kind) {
|
|
129
|
+
case 'failed':
|
|
130
|
+
return {
|
|
131
|
+
source,
|
|
132
|
+
...(held === undefined ? {} : { list: held }),
|
|
133
|
+
failure: { at, reason: fetched.reason },
|
|
134
|
+
};
|
|
135
|
+
case 'unchanged':
|
|
136
|
+
return held === undefined
|
|
137
|
+
? { source, failure: { at, reason: 'it answered 304 to a request that held no list' } }
|
|
138
|
+
: { source, list: { ...held, fetchedAt: at } };
|
|
139
|
+
case 'list': {
|
|
140
|
+
const { kind: _kind, ...fresh } = fetched;
|
|
141
|
+
const same = held !== undefined && JSON.stringify(held.feeds) === JSON.stringify(fetched.feeds);
|
|
142
|
+
return { source, list: { ...fresh, fetchedAt: at, changedAt: same ? held.changedAt : at } };
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
export function createFollowingService(options) {
|
|
147
|
+
const { config, settings } = options;
|
|
148
|
+
const timers = options.timers ?? systemNotificationTimers;
|
|
149
|
+
const logger = options.logger ?? console;
|
|
150
|
+
const fetches = createSerialQueue();
|
|
151
|
+
let handle;
|
|
152
|
+
async function refreshOnce() {
|
|
153
|
+
const source = await settings.get(SITE.following_opml);
|
|
154
|
+
if (source === '')
|
|
155
|
+
return undefined;
|
|
156
|
+
const record = readFollowing(config.dataDir);
|
|
157
|
+
const fetched = await fetchFollowing(source, listFor(record, source), config.hostLookup);
|
|
158
|
+
const next = afterFetch(record, source, fetched, config.now());
|
|
159
|
+
await writeFileAtomically(dataPath(config.dataDir, FOLLOWING_LIST), `${JSON.stringify(next, null, 2)}\n`);
|
|
160
|
+
if (next.failure !== undefined) {
|
|
161
|
+
logger.warn(`The subscription list at ${source} was not fetched: ${next.failure.reason}`);
|
|
162
|
+
}
|
|
163
|
+
return next;
|
|
164
|
+
}
|
|
165
|
+
async function due() {
|
|
166
|
+
const source = await settings.get(SITE.following_opml);
|
|
167
|
+
if (source === '')
|
|
168
|
+
return false;
|
|
169
|
+
const list = servedFollowing(config.dataDir, source);
|
|
170
|
+
return (list === undefined ||
|
|
171
|
+
config.now().getTime() - new Date(list.fetchedAt).getTime() >= FOLLOWING_REFRESH_MS);
|
|
172
|
+
}
|
|
173
|
+
const service = {
|
|
174
|
+
refresh() {
|
|
175
|
+
return fetches.run(refreshOnce).catch((thrown) => {
|
|
176
|
+
logger.warn(`The subscription list could not be refreshed: ${messageOf(thrown)}`);
|
|
177
|
+
return undefined;
|
|
178
|
+
});
|
|
179
|
+
},
|
|
180
|
+
start() {
|
|
181
|
+
if (handle !== undefined)
|
|
182
|
+
return;
|
|
183
|
+
handle = timers.set(() => void service.refresh(), FOLLOWING_REFRESH_MS);
|
|
184
|
+
void fetches
|
|
185
|
+
.run(async () => ((await due()) ? await refreshOnce() : undefined))
|
|
186
|
+
.catch((thrown) => {
|
|
187
|
+
logger.warn(`The subscription list could not be refreshed: ${messageOf(thrown)}`);
|
|
188
|
+
});
|
|
189
|
+
},
|
|
190
|
+
settingChanged() {
|
|
191
|
+
if (handle !== undefined)
|
|
192
|
+
void service.refresh();
|
|
193
|
+
},
|
|
194
|
+
stop() {
|
|
195
|
+
if (handle !== undefined)
|
|
196
|
+
timers.clear(handle);
|
|
197
|
+
handle = undefined;
|
|
198
|
+
},
|
|
199
|
+
async settled() {
|
|
200
|
+
await fetches.settled();
|
|
201
|
+
},
|
|
202
|
+
};
|
|
203
|
+
return service;
|
|
204
|
+
}
|
|
205
|
+
function recordOf(raw) {
|
|
206
|
+
if (!isRecord(raw) || typeof raw['source'] !== 'string')
|
|
207
|
+
return undefined;
|
|
208
|
+
const list = listOf(raw['list']);
|
|
209
|
+
const failure = raw['failure'];
|
|
210
|
+
return {
|
|
211
|
+
source: raw['source'],
|
|
212
|
+
...(list === undefined ? {} : { list }),
|
|
213
|
+
...(isRecord(failure) &&
|
|
214
|
+
typeof failure['at'] === 'string' &&
|
|
215
|
+
typeof failure['reason'] === 'string'
|
|
216
|
+
? { failure: { at: failure['at'], reason: failure['reason'] } }
|
|
217
|
+
: {}),
|
|
218
|
+
};
|
|
219
|
+
}
|
|
220
|
+
function listOf(raw) {
|
|
221
|
+
if (!isRecord(raw) || !Array.isArray(raw['feeds']))
|
|
222
|
+
return undefined;
|
|
223
|
+
const { fetchedAt, changedAt, opmlUrl, etag, lastModified } = raw;
|
|
224
|
+
if (typeof fetchedAt !== 'string' ||
|
|
225
|
+
typeof changedAt !== 'string' ||
|
|
226
|
+
typeof opmlUrl !== 'string') {
|
|
227
|
+
return undefined;
|
|
228
|
+
}
|
|
229
|
+
return {
|
|
230
|
+
feeds: raw['feeds'].filter(isFeed),
|
|
231
|
+
fetchedAt,
|
|
232
|
+
changedAt,
|
|
233
|
+
opmlUrl,
|
|
234
|
+
...(typeof etag === 'string' ? { etag } : {}),
|
|
235
|
+
...(typeof lastModified === 'string' ? { lastModified } : {}),
|
|
236
|
+
};
|
|
237
|
+
}
|
|
238
|
+
function isFeed(raw) {
|
|
239
|
+
return (isRecord(raw) &&
|
|
240
|
+
typeof raw['text'] === 'string' &&
|
|
241
|
+
typeof raw['xmlUrl'] === 'string' &&
|
|
242
|
+
['htmlUrl', 'description', 'category'].every((key) => raw[key] === undefined || typeof raw[key] === 'string'));
|
|
243
|
+
}
|
|
244
|
+
//# sourceMappingURL=list.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/following/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export interface FollowedFeed {
|
|
2
|
+
readonly text: string;
|
|
3
|
+
readonly xmlUrl: string;
|
|
4
|
+
readonly htmlUrl?: string;
|
|
5
|
+
readonly description?: string;
|
|
6
|
+
/** The folders it sat in, as OPML 2.0's `category` writes a path: `/Indieweb`, `/Software/Tools`. */
|
|
7
|
+
readonly category?: string;
|
|
8
|
+
}
|
|
9
|
+
export type ParsedOpml = {
|
|
10
|
+
readonly ok: true;
|
|
11
|
+
readonly feeds: readonly FollowedFeed[];
|
|
12
|
+
} | {
|
|
13
|
+
readonly ok: false;
|
|
14
|
+
readonly problem: string;
|
|
15
|
+
};
|
|
16
|
+
export declare function parseOpml(xml: string): ParsedOpml;
|
|
17
|
+
export declare function opmlAlternate(html: string, pageUrl: string): string | undefined;
|
|
18
|
+
//# sourceMappingURL=opml.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opml.d.ts","sourceRoot":"","sources":["../../src/following/opml.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,qGAAqG;IACrG,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,MAAM,UAAU,GAClB;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;CAAE,GAC9D;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAErD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAuDjD;AAMD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAa/E"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import sax from 'sax';
|
|
2
|
+
import { normalizeWebAddress } from '../site/setting-values.js';
|
|
3
|
+
import { elementsIn, hasRel, parseHtml } from '../util/html-tree.js';
|
|
4
|
+
import { messageOf } from '../util/errors.js';
|
|
5
|
+
export function parseOpml(xml) {
|
|
6
|
+
const parser = sax.parser(true, { trim: false, normalize: false });
|
|
7
|
+
const open = [];
|
|
8
|
+
const folders = [];
|
|
9
|
+
const feeds = [];
|
|
10
|
+
const seen = new Set();
|
|
11
|
+
let sawBody = false;
|
|
12
|
+
let problem;
|
|
13
|
+
parser.onerror = (error) => {
|
|
14
|
+
problem ??= `not well-formed XML: ${messageOf(error).split('\n')[0] ?? ''}`;
|
|
15
|
+
throw error;
|
|
16
|
+
};
|
|
17
|
+
parser.onopentag = (tag) => {
|
|
18
|
+
const name = tag.name.toLowerCase();
|
|
19
|
+
if (open.length === 0 && name !== 'opml')
|
|
20
|
+
problem ??= `the root element is <${tag.name}>, not <opml>`;
|
|
21
|
+
if (name === 'body' && open.length === 1 && open[0] === 'opml')
|
|
22
|
+
sawBody = true;
|
|
23
|
+
open.push(name);
|
|
24
|
+
if (name !== 'outline' || !inBody(open))
|
|
25
|
+
return;
|
|
26
|
+
const attributes = tag.attributes;
|
|
27
|
+
const attribute = (key) => attributes[key];
|
|
28
|
+
const xmlUrl = optionalWebAddress(attribute('xmlUrl'));
|
|
29
|
+
if (attribute('xmlUrl') === undefined) {
|
|
30
|
+
folders.push(oneLine(attribute('text') ?? attribute('title') ?? ''));
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
folders.push(undefined);
|
|
34
|
+
if (xmlUrl === undefined || seen.has(xmlUrl))
|
|
35
|
+
return;
|
|
36
|
+
seen.add(xmlUrl);
|
|
37
|
+
const path = folders.filter((folder) => folder !== undefined && folder !== '');
|
|
38
|
+
const text = oneLine(attribute('text') ?? attribute('title') ?? '');
|
|
39
|
+
const description = oneLine(attribute('description') ?? '');
|
|
40
|
+
const htmlUrl = optionalWebAddress(attribute('htmlUrl'));
|
|
41
|
+
feeds.push({
|
|
42
|
+
text: text === '' ? xmlUrl : text,
|
|
43
|
+
xmlUrl,
|
|
44
|
+
...(htmlUrl === undefined ? {} : { htmlUrl }),
|
|
45
|
+
...(description === '' ? {} : { description }),
|
|
46
|
+
...(path.length === 0 ? {} : { category: `/${path.join('/')}` }),
|
|
47
|
+
});
|
|
48
|
+
};
|
|
49
|
+
parser.onclosetag = () => {
|
|
50
|
+
if (open.pop() === 'outline' && inBody(open))
|
|
51
|
+
folders.pop();
|
|
52
|
+
};
|
|
53
|
+
try {
|
|
54
|
+
parser.write(xml).close();
|
|
55
|
+
}
|
|
56
|
+
catch (thrown) {
|
|
57
|
+
problem ??= messageOf(thrown);
|
|
58
|
+
}
|
|
59
|
+
if (problem !== undefined)
|
|
60
|
+
return { ok: false, problem };
|
|
61
|
+
if (!sawBody)
|
|
62
|
+
return { ok: false, problem: 'the OPML has no <body>' };
|
|
63
|
+
return { ok: true, feeds };
|
|
64
|
+
}
|
|
65
|
+
function inBody(open) {
|
|
66
|
+
return open[0] === 'opml' && open[1] === 'body';
|
|
67
|
+
}
|
|
68
|
+
export function opmlAlternate(html, pageUrl) {
|
|
69
|
+
for (const element of elementsIn(parseHtml(html))) {
|
|
70
|
+
if (element.name !== 'link' || !hasRel(element, 'alternate'))
|
|
71
|
+
continue;
|
|
72
|
+
if (!/^\s*text\/x-opml\s*(;|$)/i.test(element.attributes['type'] ?? ''))
|
|
73
|
+
continue;
|
|
74
|
+
const href = element.attributes['href'];
|
|
75
|
+
if (href === undefined)
|
|
76
|
+
continue;
|
|
77
|
+
try {
|
|
78
|
+
return optionalWebAddress(new URL(href, pageUrl).href);
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return undefined;
|
|
85
|
+
}
|
|
86
|
+
function oneLine(value) {
|
|
87
|
+
return value.replace(/\s+/g, ' ').trim();
|
|
88
|
+
}
|
|
89
|
+
function optionalWebAddress(value) {
|
|
90
|
+
return value === undefined ? undefined : normalizeWebAddress(value);
|
|
91
|
+
}
|
|
92
|
+
//# sourceMappingURL=opml.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opml.js","sourceRoot":"","sources":["../../src/following/opml.ts"],"names":[],"mappings":"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"}
|
package/dist/media/uploads.d.ts
CHANGED
|
@@ -64,6 +64,19 @@ export declare function refusedUpload<Accepted extends object>(outcome: Accepted
|
|
|
64
64
|
* what a site accepts.
|
|
65
65
|
*/
|
|
66
66
|
export declare function storeUpload(file: unknown, config: UploadConfig, options?: StoreUploadOptions): Promise<StoredUpload | UploadRefusal>;
|
|
67
|
+
/**
|
|
68
|
+
* Write a submitted file over an upload already in the library, or say why it
|
|
69
|
+
* cannot be.
|
|
70
|
+
*
|
|
71
|
+
* The file goes through every rule {@link storeUpload} applies, and then has
|
|
72
|
+
* to be the same format as the one it replaces: posts, feeds and the media
|
|
73
|
+
* type the site serves it with all name the file by its extension. The path,
|
|
74
|
+
* and so the alt text the library keeps under it, stays. The derived sizes
|
|
75
|
+
* are made again from the new bytes.
|
|
76
|
+
*/
|
|
77
|
+
export declare function replaceUpload(file: unknown, relative: string, config: UploadConfig): Promise<{
|
|
78
|
+
media: UploadMediaType;
|
|
79
|
+
} | UploadRefusal>;
|
|
67
80
|
export interface AcceptedUpload {
|
|
68
81
|
extension: string;
|
|
69
82
|
media: UploadMediaType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["../../src/media/uploads.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"uploads.d.ts","sourceRoot":"","sources":["../../src/media/uploads.ts"],"names":[],"mappings":"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"}
|
package/dist/media/uploads.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { mkdir, writeFile } from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import {
|
|
3
|
+
import { writeFileAtomically } from '../files/atomic.js';
|
|
4
|
+
import { canonicalType, matchesSignature, UPLOAD_MEDIA_TYPES } from '../files/upload-types.js';
|
|
4
5
|
import { stripMetadata, UnreadableMetadataError } from '../content/metadata/index.js';
|
|
5
6
|
import { slugify } from '../content/slug.js';
|
|
6
7
|
import { UPLOAD_ASSET_PREFIX, UPLOAD_DIRECTORY } from '../content/uploads.js';
|
|
8
|
+
import { sourceFile } from '../images/paths.js';
|
|
7
9
|
import { generateImageVariants } from '../images/variants.js';
|
|
8
10
|
import { messageOf } from '../util/errors.js';
|
|
9
11
|
/** The form field the file arrives in. */
|
|
@@ -50,25 +52,46 @@ export async function storeUpload(file, config, options = {}) {
|
|
|
50
52
|
await mkdir(directory, { recursive: true });
|
|
51
53
|
const stem = slugify(original.slice(0, original.length - extension.length)) || 'upload';
|
|
52
54
|
const name = await writeWithoutOverwriting(directory, stem, extension, clean);
|
|
53
|
-
|
|
54
|
-
// is paid for by whoever uploaded the file and not by whoever reads the
|
|
55
|
-
// post. A format with nothing to derive — a GIF, a PDF, a text file — comes
|
|
56
|
-
// straight back, and a failure is reported and swallowed: a
|
|
57
|
-
// stored file with no variants is a site that serves the original, which is
|
|
58
|
-
// what it did before this feature existed.
|
|
59
|
-
try {
|
|
60
|
-
await generateImageVariants(config, `${month}/${name}`);
|
|
61
|
-
}
|
|
62
|
-
catch (error) {
|
|
63
|
-
const message = messageOf(error);
|
|
64
|
-
console.warn(`Stored ${month}/${name} but could not derive its variants: ${message}`);
|
|
65
|
-
}
|
|
55
|
+
await deriveVariants(config, `${month}/${name}`);
|
|
66
56
|
return {
|
|
67
57
|
url: `${UPLOAD_ASSET_PREFIX}${month}/${name}`,
|
|
68
58
|
media,
|
|
69
59
|
label: original.slice(0, original.length - extension.length).trim() || name,
|
|
70
60
|
};
|
|
71
61
|
}
|
|
62
|
+
/**
|
|
63
|
+
* Write a submitted file over an upload already in the library, or say why it
|
|
64
|
+
* cannot be.
|
|
65
|
+
*
|
|
66
|
+
* The file goes through every rule {@link storeUpload} applies, and then has
|
|
67
|
+
* to be the same format as the one it replaces: posts, feeds and the media
|
|
68
|
+
* type the site serves it with all name the file by its extension. The path,
|
|
69
|
+
* and so the alt text the library keeps under it, stays. The derived sizes
|
|
70
|
+
* are made again from the new bytes.
|
|
71
|
+
*/
|
|
72
|
+
export async function replaceUpload(file, relative, config) {
|
|
73
|
+
const target = sourceFile(config, relative);
|
|
74
|
+
const current = UPLOAD_MEDIA_TYPES.get(path.extname(relative).toLowerCase());
|
|
75
|
+
if (target === undefined || current === undefined) {
|
|
76
|
+
return { status: 415, error: `${relative} is not a kind of file this site can replace.` };
|
|
77
|
+
}
|
|
78
|
+
if (!(file instanceof File)) {
|
|
79
|
+
return { status: 400, error: 'That upload carried no file.' };
|
|
80
|
+
}
|
|
81
|
+
const accepted = acceptUpload(baseName(file.name), declaredType(file.type), new Uint8Array(await file.arrayBuffer()), config);
|
|
82
|
+
if (refusedUpload(accepted))
|
|
83
|
+
return accepted;
|
|
84
|
+
if (canonicalType(accepted.media) !== canonicalType(current)) {
|
|
85
|
+
return {
|
|
86
|
+
status: 415,
|
|
87
|
+
error: `That file is ${canonicalType(accepted.media)} and this one is ${canonicalType(current)}. ` +
|
|
88
|
+
'A replacement has to be the same format, because everything that uses the file names it by its extension.',
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
await writeFileAtomically(target, accepted.bytes);
|
|
92
|
+
await deriveVariants(config, relative);
|
|
93
|
+
return { media: accepted.media };
|
|
94
|
+
}
|
|
72
95
|
export function acceptUpload(name, declared, bytes, config, options = {}) {
|
|
73
96
|
const extension = path.extname(name).toLowerCase();
|
|
74
97
|
if (!config.uploadTypes.includes(extension)) {
|
|
@@ -111,6 +134,16 @@ export function acceptUpload(name, declared, bytes, config, options = {}) {
|
|
|
111
134
|
};
|
|
112
135
|
}
|
|
113
136
|
}
|
|
137
|
+
/** Make the upload's derived sizes now, logging a failure rather than throwing it. */
|
|
138
|
+
async function deriveVariants(config, relative) {
|
|
139
|
+
try {
|
|
140
|
+
await generateImageVariants(config, relative);
|
|
141
|
+
}
|
|
142
|
+
catch (error) {
|
|
143
|
+
const message = messageOf(error);
|
|
144
|
+
console.warn(`Stored ${relative} but could not derive its variants: ${message}`);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
114
147
|
/**
|
|
115
148
|
* The largest file of this kind a site accepts: audio and video have a limit
|
|
116
149
|
* of their own, since an episode is far bigger than any picture.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploads.js","sourceRoot":"","sources":["../../src/media/uploads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"uploads.js","sourceRoot":"","sources":["../../src/media/uploads.ts"],"names":[],"mappings":"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"}
|
package/dist/site/namespace.d.ts
CHANGED
|
@@ -50,6 +50,7 @@ export declare const SITE: import("../settings/types.ts").DeclaredNamespace & {
|
|
|
50
50
|
readonly webmentions_send: import("../settings/types.ts").SettingRef<boolean>;
|
|
51
51
|
readonly webmentions_receive: import("../settings/types.ts").SettingRef<boolean>;
|
|
52
52
|
readonly notify_server: import("../settings/types.ts").SettingRef<string>;
|
|
53
|
+
readonly following_opml: import("../settings/types.ts").SettingRef<string>;
|
|
53
54
|
readonly feed_update_period: import("../settings/types.ts").SettingRef<"daily" | "hourly" | "monthly" | "weekly" | "yearly">;
|
|
54
55
|
readonly feed_update_frequency: import("../settings/types.ts").SettingRef<number>;
|
|
55
56
|
readonly ai_crawlers: import("../settings/types.ts").SettingRef<"allow" | "block-all" | "block-training">;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../src/site/namespace.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAe9E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,KAAK,EACV,SAAS,EAET,gBAAgB,EAEhB,QAAQ,EACT,MAAM,sBAAsB,CAAC;AAc9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../src/site/namespace.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAe9E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,KAAK,EACV,SAAS,EAET,gBAAgB,EAEhB,QAAQ,EACT,MAAM,sBAAsB,CAAC;AAc9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAcvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAExE,eAAO,MAAM,iCAAiC,KAAK,CAAC;AAEpD;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,0DAA0D;IAC1D,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,uFAAuF;IACvF,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,kEAAkE;IAClE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAuID,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACtC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAIzB;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,gBAAgB,EAC1B,EAAE,EAAE,SAAS,GACZ,OAAO,CAAC,IAAI,CAAC,CAYf;AA4BD;;;;;;;;;GASG;AACH,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgYf,CAAC;AAEH,qCAAqC;AACrC,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC;AAcjD,wBAAgB,cAAc,CAAC,OAAO,EAAE,6BAA6B,GAAG,gBAAgB,CAEvF;AAED,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOrE"}
|
package/dist/site/namespace.js
CHANGED
|
@@ -18,7 +18,7 @@ import { DEFAULT_FEED_CADENCE, DEFAULT_NOTIFY_SERVER, UPDATE_PERIODS } from './f
|
|
|
18
18
|
import { generateIndexNowKey, isIndexNowKey } from './indexnow-key.js';
|
|
19
19
|
import { menusOf } from './navigation.js';
|
|
20
20
|
import { AI_CRAWLER_POLICIES, robotsRuleLines } from './robots.js';
|
|
21
|
-
import { clientsWithoutPkceOf, EMAIL_PATTERN, isLicenseChoice, isValidTimezone, normalizeBaseUrl, normalizeLanguageList, normalizeSecurityPolicy, relayList, securityContactList, } from './setting-values.js';
|
|
21
|
+
import { clientsWithoutPkceOf, EMAIL_PATTERN, isLicenseChoice, isValidTimezone, normalizeBaseUrl, normalizeLanguageList, normalizeSecurityPolicy, normalizeWebAddress, relayList, securityContactList, } from './setting-values.js';
|
|
22
22
|
export const DEFAULT_COMMENTS_CLOSE_AFTER_DAYS = 14;
|
|
23
23
|
const NO_SITE_LICENSE = { choice: '', url: '', name: '' };
|
|
24
24
|
const license = {
|
|
@@ -285,6 +285,15 @@ export const SITE = declareNamespace({
|
|
|
285
285
|
? undefined
|
|
286
286
|
: 'A notify server is an absolute http:// or https:// URL, or empty.',
|
|
287
287
|
},
|
|
288
|
+
following_opml: {
|
|
289
|
+
fileKey: 'followingOpml',
|
|
290
|
+
type: normalized(normalizeWebAddress),
|
|
291
|
+
default: '',
|
|
292
|
+
description: 'The OPML subscription list served flat at /.well-known/following.opml. Empty serves none.',
|
|
293
|
+
check: (value) => value === '' || normalizeWebAddress(value) !== undefined
|
|
294
|
+
? undefined
|
|
295
|
+
: 'A subscription list is an absolute http:// or https:// URL, or empty.',
|
|
296
|
+
},
|
|
288
297
|
feed_update_period: {
|
|
289
298
|
fileKey: 'feedUpdatePeriod',
|
|
290
299
|
type: oneOf(UPDATE_PERIODS),
|