@geekity/cms 0.45.0 → 0.46.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/federation/followers.njk +1 -1
- package/admin/pages/settings/discussion.njk +78 -0
- package/admin/static/editor.js +24 -24
- 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/settings-discussion.d.ts +9 -0
- package/dist/admin/settings-discussion.d.ts.map +1 -1
- package/dist/admin/settings-discussion.js +147 -2
- package/dist/admin/settings-discussion.js.map +1 -1
- package/dist/cli/help.js +2 -2
- package/dist/cms/app.d.ts.map +1 -1
- package/dist/cms/app.js +4 -1
- package/dist/cms/app.js.map +1 -1
- package/dist/cms/boot.d.ts.map +1 -1
- package/dist/cms/boot.js +4 -3
- package/dist/cms/boot.js.map +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +11 -0
- package/dist/cms/services.js.map +1 -1
- package/dist/comments/form.d.ts +10 -0
- package/dist/comments/form.d.ts.map +1 -1
- package/dist/comments/form.js +2 -1
- package/dist/comments/form.js.map +1 -1
- package/dist/comments/hcaptcha.d.ts +26 -0
- package/dist/comments/hcaptcha.d.ts.map +1 -0
- package/dist/comments/hcaptcha.js +118 -0
- package/dist/comments/hcaptcha.js.map +1 -0
- package/dist/comments/index.d.ts +3 -0
- package/dist/comments/index.d.ts.map +1 -1
- package/dist/comments/index.js +1 -0
- package/dist/comments/index.js.map +1 -1
- package/dist/comments/intake.d.ts +2 -0
- package/dist/comments/intake.d.ts.map +1 -1
- package/dist/comments/intake.js +1 -1
- package/dist/comments/intake.js.map +1 -1
- package/dist/comments/page-form.d.ts +3 -1
- package/dist/comments/page-form.d.ts.map +1 -1
- package/dist/comments/page-form.js +4 -3
- package/dist/comments/page-form.js.map +1 -1
- package/dist/comments/submission.d.ts +3 -0
- package/dist/comments/submission.d.ts.map +1 -1
- package/dist/comments/submission.js +7 -0
- package/dist/comments/submission.js.map +1 -1
- package/dist/config.d.ts +20 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/contact/form.d.ts +8 -0
- package/dist/contact/form.d.ts.map +1 -1
- package/dist/contact/form.js +2 -1
- package/dist/contact/form.js.map +1 -1
- package/dist/contact/submission.d.ts +3 -0
- package/dist/contact/submission.d.ts.map +1 -1
- package/dist/contact/submission.js +16 -2
- package/dist/contact/submission.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/forgotten-deliveries.d.ts +15 -0
- package/dist/federation/forgotten-deliveries.d.ts.map +1 -0
- package/dist/federation/forgotten-deliveries.js +16 -0
- package/dist/federation/forgotten-deliveries.js.map +1 -0
- package/dist/federation/retry-job.d.ts.map +1 -1
- package/dist/federation/retry-job.js +4 -2
- package/dist/federation/retry-job.js.map +1 -1
- package/dist/forms/challenge.d.ts +86 -0
- package/dist/forms/challenge.d.ts.map +1 -0
- package/dist/forms/challenge.js +44 -0
- package/dist/forms/challenge.js.map +1 -0
- package/dist/mcp/inspect/schemas.d.ts +3 -3
- package/dist/mcp/repair/retry.js +2 -2
- package/dist/mcp/repair/retry.js.map +1 -1
- package/dist/settings/hcaptcha.d.ts +10 -0
- package/dist/settings/hcaptcha.d.ts.map +1 -0
- package/dist/settings/hcaptcha.js +38 -0
- package/dist/settings/hcaptcha.js.map +1 -0
- package/dist/settings/names.d.ts +1 -1
- package/dist/settings/names.d.ts.map +1 -1
- package/dist/settings/names.js +1 -0
- package/dist/settings/names.js.map +1 -1
- package/dist/settings/registry.d.ts.map +1 -1
- package/dist/settings/registry.js +2 -1
- package/dist/settings/registry.js.map +1 -1
- package/dist/store/deliveries.d.ts +18 -2
- package/dist/store/deliveries.d.ts.map +1 -1
- package/dist/store/deliveries.js +35 -4
- package/dist/store/deliveries.js.map +1 -1
- package/dist/store/queue-database.d.ts +6 -0
- package/dist/store/queue-database.d.ts.map +1 -1
- package/dist/store/queue-database.js +34 -7
- package/dist/store/queue-database.js.map +1 -1
- package/dist/web/comment-routes.d.ts.map +1 -1
- package/dist/web/comment-routes.js +6 -3
- 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 +5 -1
- package/dist/web/contact-routes.js.map +1 -1
- package/dist/web/document-render.d.ts.map +1 -1
- package/dist/web/document-render.js +12 -1
- package/dist/web/document-render.js.map +1 -1
- package/dist/web/env.d.ts +6 -0
- package/dist/web/env.d.ts.map +1 -1
- package/dist/web/page-sources.d.ts.map +1 -1
- package/dist/web/page-sources.js +3 -1
- package/dist/web/page-sources.js.map +1 -1
- package/dist/web/render-scope.d.ts +3 -0
- package/dist/web/render-scope.d.ts.map +1 -1
- package/dist/web/render-scope.js +3 -0
- package/dist/web/render-scope.js.map +1 -1
- package/package.json +10 -10
- package/templates/site/content/pages/privacy.md +13 -0
- package/themes/default/layouts/base.njk +3 -0
- package/themes/default/partials/comment-form.njk +4 -1
- package/themes/default/partials/contact-form.njk +4 -1
- package/themes/default/partials/form-challenge.njk +9 -0
- package/themes/default/src/style.css +9 -0
- package/themes/default/static/hcaptcha.js +31 -0
- package/themes/default/static/style.css +12 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/settings/registry.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/settings/registry.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAYnD,OAAO,KAAK,EAEV,iBAAiB,EAOjB,gBAAgB,EAChB,WAAW,EACX,QAAQ,EACT,MAAM,YAAY,CAAC;AAIpB,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAC5D,QAAQ,CAAC,iBAAiB,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAC3D;AA8DD,wBAAgB,YAAY,CAAC,CAAC,SAAS,iBAAiB,EACtD,QAAQ,EAAE,CAAC,EACX,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACxC,QAAQ,CAAC,CAAC,CAAC,CAQb;AAED,wBAAgB,QAAQ,CAAC,CAAC,SAAS,iBAAiB,EAClD,QAAQ,EAAE,CAAC,EACX,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,EACnB,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAC1C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOzB;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAWtD;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAEvD;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAUvD;AA2CD,wBAAgB,sBAAsB,CAAC,EACrC,MAAM,EACN,GAAiB,EACjB,iBAAsB,GACvB,EAAE,6BAA6B,GAAG,gBAAgB,CAyUlD"}
|
|
@@ -7,11 +7,12 @@ import { dataPath, declareDataFile, writtenPrivately } from '../files/data-files
|
|
|
7
7
|
import { isRecord } from '../util/guards.js';
|
|
8
8
|
import { AKISMET } from './akismet.js';
|
|
9
9
|
import { DEV_MODE } from './dev-mode.js';
|
|
10
|
+
import { HCAPTCHA } from './hcaptcha.js';
|
|
10
11
|
import { MAIL } from './mail.js';
|
|
11
12
|
import { MAINTENANCE } from './maintenance.js';
|
|
12
13
|
import { TMDB } from './tmdb.js';
|
|
13
14
|
import { CORE_NAMESPACES, reservedNamespaceProblem, settingVariable } from './names.js';
|
|
14
|
-
const CORE = [MAINTENANCE, DEV_MODE, MAIL, AKISMET, TMDB];
|
|
15
|
+
const CORE = [MAINTENANCE, DEV_MODE, MAIL, AKISMET, TMDB, HCAPTCHA];
|
|
15
16
|
function mapNonEmpty(items, map) {
|
|
16
17
|
const [first, ...rest] = items;
|
|
17
18
|
return [map(first), ...rest.map(map)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/settings/registry.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/settings/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import type { DatabaseSync } from 'node:sqlite';
|
|
|
2
2
|
import type { Clock } from '../util/clock.ts';
|
|
3
3
|
import type { ListPageOptions, Page } from './rows.ts';
|
|
4
4
|
/** How one delivery of one activity to one follower ended. */
|
|
5
|
-
export declare const DELIVERY_STATUSES: readonly ['sent', 'queued', 'retrying', 'failed'];
|
|
5
|
+
export declare const DELIVERY_STATUSES: readonly ['sent', 'queued', 'retrying', 'failed', 'unknown'];
|
|
6
6
|
/**
|
|
7
7
|
* One of {@link DELIVERY_STATUSES}.
|
|
8
8
|
*
|
|
@@ -10,7 +10,10 @@ export declare const DELIVERY_STATUSES: readonly ['sent', 'queued', 'retrying',
|
|
|
10
10
|
* Fedify's outbox queue and not yet settled. `retrying` is one whose last
|
|
11
11
|
* attempt failed, with that error, and which the queue will try again.
|
|
12
12
|
* `failed` is a delivery Fedify gave up on, or one that threw before it
|
|
13
|
-
* reached the queue, with the reason in the row.
|
|
13
|
+
* reached the queue, with the reason in the row. `unknown` is one left
|
|
14
|
+
* `queued` or `retrying` with nothing for it in the queue any more: a version
|
|
15
|
+
* that did not settle outcomes wrote it, or the queue lost it, so how it
|
|
16
|
+
* ended was never seen.
|
|
14
17
|
*/
|
|
15
18
|
export type DeliveryStatus = (typeof DELIVERY_STATUSES)[number];
|
|
16
19
|
/**
|
|
@@ -64,6 +67,11 @@ export interface DeliveryOutcome {
|
|
|
64
67
|
export type NewDelivery = Omit<Delivery, 'attemptedAt'> & {
|
|
65
68
|
attemptedAt?: string | undefined;
|
|
66
69
|
};
|
|
70
|
+
/** One delivery a message in the queue still carries. */
|
|
71
|
+
export interface WaitingDelivery {
|
|
72
|
+
readonly activityId: string;
|
|
73
|
+
readonly inbox: string;
|
|
74
|
+
}
|
|
67
75
|
export interface SentActivity {
|
|
68
76
|
readonly activityId: string;
|
|
69
77
|
readonly activityType: string;
|
|
@@ -90,6 +98,14 @@ export interface DeliveryStore {
|
|
|
90
98
|
*/
|
|
91
99
|
recordDelivery(delivery: NewDelivery): Delivery;
|
|
92
100
|
settleDeliveries(outcome: DeliveryOutcome): void;
|
|
101
|
+
/**
|
|
102
|
+
* Turn every `queued` or `retrying` row attempted before `before` that no
|
|
103
|
+
* waiting message carries into `unknown`, keeping its error and its time.
|
|
104
|
+
*/
|
|
105
|
+
markUnsettledDeliveriesUnknown(unsettled: {
|
|
106
|
+
readonly before: string;
|
|
107
|
+
readonly waiting: readonly WaitingDelivery[];
|
|
108
|
+
}): void;
|
|
93
109
|
/** Every follower's outcome for one activity, in follower order. */
|
|
94
110
|
listDeliveries(activityId: string): Delivery[];
|
|
95
111
|
/** How many followers this activity stands at each status with. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliveries.d.ts","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"deliveries.d.ts","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"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"}
|
package/dist/store/deliveries.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { decodeEntities } from '../util/html.js';
|
|
1
2
|
import { allRows, countByStatus, getRow, NO_LIMIT, nullableText, oneOf, readCount, } from './rows.js';
|
|
2
3
|
/** How one delivery of one activity to one follower ended. */
|
|
3
|
-
export const DELIVERY_STATUSES = ['sent', 'queued', 'retrying', 'failed'];
|
|
4
|
+
export const DELIVERY_STATUSES = ['sent', 'queued', 'retrying', 'failed', 'unknown'];
|
|
4
5
|
const DELIVERY_SEARCH = `
|
|
5
6
|
WHERE (:objectIds IS NULL OR object_id IN (SELECT value FROM json_each(:objectIds)))
|
|
6
7
|
AND (:activityId IS NULL OR activity_id = :activityId)
|
|
@@ -28,6 +29,16 @@ export function openDeliveryStore(db, clock) {
|
|
|
28
29
|
settleDeliveries: db.prepare(`
|
|
29
30
|
UPDATE ap_deliveries SET status = ?, error = ?, attempted_at = ?
|
|
30
31
|
WHERE activity_id = ? AND inbox_id = ?
|
|
32
|
+
`),
|
|
33
|
+
markUnsettledDeliveriesUnknown: db.prepare(`
|
|
34
|
+
UPDATE ap_deliveries SET status = 'unknown'
|
|
35
|
+
WHERE status IN ('queued', 'retrying')
|
|
36
|
+
AND attempted_at < :before
|
|
37
|
+
AND NOT EXISTS (
|
|
38
|
+
SELECT 1 FROM json_each(:waiting) AS waiting
|
|
39
|
+
WHERE json_extract(waiting.value, '$.activityId') = ap_deliveries.activity_id
|
|
40
|
+
AND json_extract(waiting.value, '$.inbox') = ap_deliveries.inbox_id
|
|
41
|
+
)
|
|
31
42
|
`),
|
|
32
43
|
listDeliveries: db.prepare(`
|
|
33
44
|
SELECT * FROM ap_deliveries WHERE activity_id = ? ORDER BY actor_id
|
|
@@ -74,14 +85,17 @@ export function openDeliveryStore(db, clock) {
|
|
|
74
85
|
};
|
|
75
86
|
return {
|
|
76
87
|
recordDelivery(delivery) {
|
|
77
|
-
const recorded = getRow(statements.recordDelivery, toDelivery, delivery.activityId, delivery.activityType, delivery.objectId, delivery.slug, delivery.actorId, delivery.inboxId, delivery.status, delivery.error, delivery.attemptedAt ?? clock().toISOString());
|
|
88
|
+
const recorded = getRow(statements.recordDelivery, toDelivery, delivery.activityId, delivery.activityType, delivery.objectId, delivery.slug, delivery.actorId, delivery.inboxId, delivery.status, withHtmlPageAsTitle(delivery.error), delivery.attemptedAt ?? clock().toISOString());
|
|
78
89
|
if (recorded === undefined) {
|
|
79
90
|
throw new Error(`The delivery of "${delivery.activityId}" to "${delivery.actorId}" was not recorded.`);
|
|
80
91
|
}
|
|
81
92
|
return recorded;
|
|
82
93
|
},
|
|
83
94
|
settleDeliveries(outcome) {
|
|
84
|
-
statements.settleDeliveries.run(outcome.status, outcome.error, clock().toISOString(), outcome.activityId, outcome.inbox);
|
|
95
|
+
statements.settleDeliveries.run(outcome.status, withHtmlPageAsTitle(outcome.error), clock().toISOString(), outcome.activityId, outcome.inbox);
|
|
96
|
+
},
|
|
97
|
+
markUnsettledDeliveriesUnknown({ before, waiting }) {
|
|
98
|
+
statements.markUnsettledDeliveriesUnknown.run({ before, waiting: JSON.stringify(waiting) });
|
|
85
99
|
},
|
|
86
100
|
listDeliveries(activityId) {
|
|
87
101
|
return allRows(statements.listDeliveries, toDelivery, activityId);
|
|
@@ -141,10 +155,27 @@ function toDelivery(row) {
|
|
|
141
155
|
actorId: String(row['actor_id']),
|
|
142
156
|
inboxId: String(row['inbox_id']),
|
|
143
157
|
status: deliveryStatus(row['status']),
|
|
144
|
-
error: nullableText(row['error']),
|
|
158
|
+
error: withHtmlPageAsTitle(nullableText(row['error'])),
|
|
145
159
|
attemptedAt: String(row['attempted_at']),
|
|
146
160
|
};
|
|
147
161
|
}
|
|
162
|
+
const HTML_PAGE = /^\s*<(?:!doctype\s+html|html)\b/i;
|
|
163
|
+
const PAGE_TITLE = /<title[^>]*>([\s\S]*?)<\/title>/i;
|
|
164
|
+
function withHtmlPageAsTitle(error) {
|
|
165
|
+
if (error === null)
|
|
166
|
+
return null;
|
|
167
|
+
const lineEnd = error.indexOf('\n');
|
|
168
|
+
if (lineEnd === -1)
|
|
169
|
+
return error;
|
|
170
|
+
const body = error.slice(lineEnd + 1);
|
|
171
|
+
if (!HTML_PAGE.test(body))
|
|
172
|
+
return error;
|
|
173
|
+
const title = decodeEntities(PAGE_TITLE.exec(body)?.[1] ?? '')
|
|
174
|
+
.replace(/\s+/g, ' ')
|
|
175
|
+
.trim();
|
|
176
|
+
const page = title === '' ? 'An HTML page.' : `An HTML page titled "${title}".`;
|
|
177
|
+
return `${error.slice(0, lineEnd)}\n${page}`;
|
|
178
|
+
}
|
|
148
179
|
/**
|
|
149
180
|
* A stored status, or `failed` for one this version does not know.
|
|
150
181
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DatabaseSync } from 'node:sqlite';
|
|
2
|
+
import type { WaitingDelivery } from './deliveries.ts';
|
|
2
3
|
export declare const FEDERATION_QUEUE_TABLE = "federation_messages";
|
|
3
4
|
export declare function queueFile(dataDir: string): string;
|
|
4
5
|
/**
|
|
@@ -14,4 +15,9 @@ export declare function countWaitingMessages(dataDir: string): number;
|
|
|
14
15
|
* failure, and takes it out for good once the inbox accepts it.
|
|
15
16
|
*/
|
|
16
17
|
export declare function countRetryingDeliveries(dataDir: string, since: string): number;
|
|
18
|
+
/**
|
|
19
|
+
* Each delivery a message in the queue still carries: an outbox message's
|
|
20
|
+
* inbox, and every inbox a fanout has yet to split into outbox messages.
|
|
21
|
+
*/
|
|
22
|
+
export declare function listWaitingDeliveries(dataDir: string): WaitingDelivery[];
|
|
17
23
|
//# sourceMappingURL=queue-database.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-database.d.ts","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"queue-database.d.ts","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,eAAO,MAAM,sBAAsB,wBAAwB,CAAC;AAI5D,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAM/D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAQ9E;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,EAAE,CAuBxE"}
|
|
@@ -31,21 +31,48 @@ export function countRetryingDeliveries(dataDir, since) {
|
|
|
31
31
|
AND json_extract(message, '$.attempt') >= 1
|
|
32
32
|
AND json_extract(message, '$.started') >= ?`, [since]);
|
|
33
33
|
}
|
|
34
|
+
/**
|
|
35
|
+
* Each delivery a message in the queue still carries: an outbox message's
|
|
36
|
+
* inbox, and every inbox a fanout has yet to split into outbox messages.
|
|
37
|
+
*/
|
|
38
|
+
export function listWaitingDeliveries(dataDir) {
|
|
39
|
+
return readQueue(dataDir, [], (db) => db
|
|
40
|
+
.prepare(`SELECT json_extract(message, '$.activityId') AS activity_id,
|
|
41
|
+
json_extract(message, '$.inbox') AS inbox
|
|
42
|
+
FROM ${FEDERATION_QUEUE_TABLE}
|
|
43
|
+
WHERE json_extract(message, '$.type') = 'outbox'
|
|
44
|
+
UNION ALL
|
|
45
|
+
SELECT json_extract(queued.message, '$.activityId'), inboxes.key
|
|
46
|
+
FROM ${FEDERATION_QUEUE_TABLE} AS queued,
|
|
47
|
+
json_each(queued.message, '$.inboxes') AS inboxes
|
|
48
|
+
WHERE json_extract(queued.message, '$.type') = 'fanout'`)
|
|
49
|
+
.all()
|
|
50
|
+
.flatMap((row) => {
|
|
51
|
+
const activityId = row['activity_id'];
|
|
52
|
+
const inbox = row['inbox'];
|
|
53
|
+
return typeof activityId === 'string' && typeof inbox === 'string'
|
|
54
|
+
? [{ activityId, inbox }]
|
|
55
|
+
: [];
|
|
56
|
+
}));
|
|
57
|
+
}
|
|
34
58
|
function countMessages(dataDir, where, values) {
|
|
59
|
+
return readQueue(dataDir, 0, (db) => {
|
|
60
|
+
const row = db
|
|
61
|
+
.prepare(`SELECT count(*) AS waiting FROM ${FEDERATION_QUEUE_TABLE} ${where}`)
|
|
62
|
+
.get(...values);
|
|
63
|
+
return Number(row?.['waiting'] ?? 0);
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
function readQueue(dataDir, empty, read) {
|
|
35
67
|
const file = queueFile(dataDir);
|
|
36
68
|
if (!existsSync(file))
|
|
37
|
-
return
|
|
69
|
+
return empty;
|
|
38
70
|
const db = new DatabaseSync(file, { readOnly: true, timeout: BUSY_TIMEOUT_MS });
|
|
39
71
|
try {
|
|
40
72
|
const table = db
|
|
41
73
|
.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?")
|
|
42
74
|
.get(FEDERATION_QUEUE_TABLE);
|
|
43
|
-
|
|
44
|
-
return 0;
|
|
45
|
-
const row = db
|
|
46
|
-
.prepare(`SELECT count(*) AS waiting FROM ${FEDERATION_QUEUE_TABLE} ${where}`)
|
|
47
|
-
.get(...values);
|
|
48
|
-
return Number(row?.['waiting'] ?? 0);
|
|
75
|
+
return table === undefined ? empty : read(db);
|
|
49
76
|
}
|
|
50
77
|
finally {
|
|
51
78
|
db.close();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-database.js","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"queue-database.js","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comment-routes.d.ts","sourceRoot":"","sources":["../../src/web/comment-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"comment-routes.d.ts","sourceRoot":"","sources":["../../src/web/comment-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AA2B1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAI3C;;;;;;;;;;;;GAYG;AAEH,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CA4HzD"}
|
|
@@ -7,6 +7,7 @@ import { submitReplyPost } from '../comments/reply-post.js';
|
|
|
7
7
|
import { COMMENT_FIELDS, COMMENT_RATE_LIMIT, COMMENT_RATE_WINDOW_SECONDS, submitComment, } from '../comments/submission.js';
|
|
8
8
|
import { commenterOf } from '../comments/viewer.js';
|
|
9
9
|
import { stringOrEmpty } from '../util/forms.js';
|
|
10
|
+
import { challengeTokenOf } from '../forms/challenge.js';
|
|
10
11
|
import { documentSite } from './document-site.js';
|
|
11
12
|
import { CROSS_SITE_REFUSAL, crossSiteWrite, csrfTokenMatches } from './session.js';
|
|
12
13
|
import { clientAddress, createLoginThrottle } from './throttle.js';
|
|
@@ -70,7 +71,7 @@ export function mountComments(app) {
|
|
|
70
71
|
// themselves that it is. Saying so is more honest than pretending the
|
|
71
72
|
// URL is wrong, and a closed post is a state rather than a mistake.
|
|
72
73
|
return page(c, document, 403, viewer, {
|
|
73
|
-
...drawnFor(refilledCommentForm(document, valuesOf(form), {}, now), viewer),
|
|
74
|
+
...drawnFor(refilledCommentForm(document, valuesOf(form), {}, now), viewer, c.var.challengeWidget),
|
|
74
75
|
error: 'This post is not taking comments any more.',
|
|
75
76
|
});
|
|
76
77
|
}
|
|
@@ -98,6 +99,8 @@ export function mountComments(app) {
|
|
|
98
99
|
dataDir: config.dataDir,
|
|
99
100
|
baseUrl: config.baseUrl,
|
|
100
101
|
checker: config.commentChecker,
|
|
102
|
+
challenge: config.formChallenge,
|
|
103
|
+
challengeToken: challengeTokenOf(body, config.formChallenge),
|
|
101
104
|
// Who hears about what lands is the intake's to decide, and neither
|
|
102
105
|
// message is awaited: the reader is redirected now and they go out
|
|
103
106
|
// behind them.
|
|
@@ -136,7 +139,7 @@ function refusedPage(c, document, viewer, form, refusal, now) {
|
|
|
136
139
|
if (refusal.kind === 'rate-limited') {
|
|
137
140
|
c.header('Retry-After', String(refusal.retryAfter));
|
|
138
141
|
return page(c, document, 429, viewer, {
|
|
139
|
-
...drawnFor(refilledCommentForm(document, valuesOf(form), {}, now), viewer),
|
|
142
|
+
...drawnFor(refilledCommentForm(document, valuesOf(form), {}, now), viewer, c.var.challengeWidget),
|
|
140
143
|
error: 'That is a lot of comments in a short time. Try again in a few minutes.',
|
|
141
144
|
});
|
|
142
145
|
}
|
|
@@ -146,7 +149,7 @@ function refusedPage(c, document, viewer, form, refusal, now) {
|
|
|
146
149
|
? 'That form had been open a long time. Here it is again — the words are still there.'
|
|
147
150
|
: undefined;
|
|
148
151
|
return page(c, document, 400, viewer, {
|
|
149
|
-
...drawnFor(refilledCommentForm(document, valuesOf(form), problemsOf(refusal), now), viewer),
|
|
152
|
+
...drawnFor(refilledCommentForm(document, valuesOf(form), problemsOf(refusal), now), viewer, c.var.challengeWidget),
|
|
150
153
|
...(message === undefined ? {} : { error: message }),
|
|
151
154
|
});
|
|
152
155
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comment-routes.js","sourceRoot":"","sources":["../../src/web/comment-routes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,QAAQ,GACT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,2BAA2B,EAC3B,aAAa,GACd,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEnE;;;;;;;;;;;;GAYG;AAEH,iEAAiE;AACjE,MAAM,UAAU,aAAa,CAAC,GAAqB;IACjD,6EAA6E;IAC7E,0EAA0E;IAC1E,wEAAwE;IACxE,qEAAqE;IACrE,IAAI,OAAoC,CAAC;IAEzC,SAAS,QAAQ,CAAC,MAAsB;QACtC,OAAO,KAAK,mBAAmB,CAAC;YAC9B,QAAQ,EAAE,kBAAkB;YAC5B,cAAc,EAAE,2BAA2B;YAC3C,GAAG,EAAE,MAAM,CAAC,GAAG;SAChB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;QACjD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,yEAAyE;QACzE,kEAAkE;QAClE,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC/B,MAAM,MAAM,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAExE,yEAAyE;QACzE,yEAAyE;QACzE,2EAA2E;QAC3E,wEAAwE;QACxE,wDAAwD;QACxD,EAAE;QACF,0EAA0E;QAC1E,0EAA0E;QAC1E,qDAAqD;QACrD,IAAI,MAAM,KAAK,SAAS,IAAI,cAAc,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;QACtF,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3E,OAAO,CAAC,CAAC,IAAI,CAAC,wEAAwE,EAAE,GAAG,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YAC/D,OAAO,CAAC,CAAC,IAAI,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;YACnE,qEAAqE;YACrE,sEAAsE;YACtE,oEAAoE;YACpE,OAAO,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE;gBACpC,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"comment-routes.js","sourceRoot":"","sources":["../../src/web/comment-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-routes.d.ts","sourceRoot":"","sources":["../../src/web/contact-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAM1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"contact-routes.d.ts","sourceRoot":"","sources":["../../src/web/contact-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAM1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAqB3C;;;;;;;;;;;GAWG;AAEH,iEAAiE;AACjE,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CA4FxD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { clientAddress, createLoginThrottle } from './throttle.js';
|
|
2
2
|
import { isServed } from '../content/served.js';
|
|
3
3
|
import { stringOrEmpty } from '../util/forms.js';
|
|
4
|
+
import { challengeTokenOf, withChallenge } from '../forms/challenge.js';
|
|
4
5
|
import { sendContactMessage } from '../contact/delivery.js';
|
|
5
6
|
import { CONTACT_ANCHOR, CONTACT_FIELDS, CONTACT_NOTICE_PARAM, CONTACT_POST_PATH, contactOpen, contactValuesOf, refilledContactForm, } from '../contact/form.js';
|
|
6
7
|
import { CONTACT_RATE_LIMIT, CONTACT_RATE_WINDOW_SECONDS, submitContactMessage, } from '../contact/submission.js';
|
|
@@ -52,6 +53,8 @@ export function mountContact(app) {
|
|
|
52
53
|
baseUrl: config.baseUrl,
|
|
53
54
|
// The same checker comments go through, told this is a contact form.
|
|
54
55
|
checker: config.commentChecker,
|
|
56
|
+
challenge: config.formChallenge,
|
|
57
|
+
challengeToken: challengeTokenOf(body, config.formChallenge),
|
|
55
58
|
address: clientAddress(c, config),
|
|
56
59
|
userAgent: c.req.header('user-agent'),
|
|
57
60
|
referrer: c.req.header('referer'),
|
|
@@ -103,7 +106,8 @@ function sentUrl(document) {
|
|
|
103
106
|
/** The page itself, rendered again with this form on it. */
|
|
104
107
|
function page(c, document, status, form) {
|
|
105
108
|
c.status(status);
|
|
106
|
-
|
|
109
|
+
const challenged = withChallenge(form, c.var.challengeWidget);
|
|
110
|
+
return c.html(c.var.renderer.renderDocument(document, { contactForm: challenged }));
|
|
107
111
|
}
|
|
108
112
|
/** The per-field messages a refusal carries, if it carries any. */
|
|
109
113
|
function problemsOf(refusal) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-routes.js","sourceRoot":"","sources":["../../src/web/contact-routes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"contact-routes.js","sourceRoot":"","sources":["../../src/web/contact-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document-render.d.ts","sourceRoot":"","sources":["../../src/web/document-render.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"document-render.d.ts","sourceRoot":"","sources":["../../src/web/document-render.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAgBvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAY1D,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,iBAAiB,KAAK,YAAY,CAAC;CACvF;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,YAAY,GACrB,aAAa,CAiCf"}
|
|
@@ -5,6 +5,7 @@ import { visibilityOf } from '../content/visibility.js';
|
|
|
5
5
|
import { currentObjectId, readObjectIds } from '../federation/object-ids.js';
|
|
6
6
|
import { MAXIMUM_FORM_AGE_SECONDS } from '../forms/protection.js';
|
|
7
7
|
import { authorContext } from '../site/authors.js';
|
|
8
|
+
import { isRecord } from '../util/guards.js';
|
|
8
9
|
import { pingbackEndpointFor } from '../webmention/pingback.js';
|
|
9
10
|
import { webmentionEndpointFor } from '../webmention/endpoint.js';
|
|
10
11
|
import { handSyndicationOf } from '../webmention/syndication.js';
|
|
@@ -48,7 +49,7 @@ function documentPageContext(deps, contexts, document, { url: servedAt, extra, v
|
|
|
48
49
|
const settings = requestSite();
|
|
49
50
|
const either = options.neighbours?.(document) ?? {};
|
|
50
51
|
const shared = options.location?.(document, settings);
|
|
51
|
-
|
|
52
|
+
const drawn = {
|
|
52
53
|
...context,
|
|
53
54
|
...(writer === undefined ? {} : { siteAuthor: writer }),
|
|
54
55
|
...neighbourContext('previous', either.previous, citedPage),
|
|
@@ -67,6 +68,16 @@ function documentPageContext(deps, contexts, document, { url: servedAt, extra, v
|
|
|
67
68
|
...(visibilityOf(document) === 'unlisted' ? { noindex: true } : {}),
|
|
68
69
|
...extra,
|
|
69
70
|
};
|
|
71
|
+
const challenge = pageChallengeOf(drawn);
|
|
72
|
+
return challenge === undefined ? drawn : { ...drawn, pageChallenge: challenge };
|
|
73
|
+
}
|
|
74
|
+
function pageChallengeOf(context) {
|
|
75
|
+
const contactFormShown = context['contactNotice'] === undefined;
|
|
76
|
+
return (challengeOf(context['commentForm']) ??
|
|
77
|
+
(contactFormShown ? challengeOf(context['contactForm']) : undefined));
|
|
78
|
+
}
|
|
79
|
+
function challengeOf(form) {
|
|
80
|
+
return isRecord(form) ? form['challenge'] : undefined;
|
|
70
81
|
}
|
|
71
82
|
function objectIdOf({ config }, document, now) {
|
|
72
83
|
const naturalId = activityStreamsId(document, config.baseUrl, now);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document-render.js","sourceRoot":"","sources":["../../src/web/document-render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"document-render.js","sourceRoot":"","sources":["../../src/web/document-render.ts"],"names":[],"mappings":"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"}
|
package/dist/web/env.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import type { FontStore } from '../fonts/index.ts';
|
|
|
4
4
|
import type { SignedInAccount } from '../comments/viewer.ts';
|
|
5
5
|
import type { ResolvedConfig } from '../config.ts';
|
|
6
6
|
import type { Document } from '../content/document.ts';
|
|
7
|
+
import type { ChallengeWidget } from '../forms/challenge.ts';
|
|
7
8
|
import type { ArchiveReader, BacklinkReader, CatalogReader, DocumentLookup, IndexClock, IndexWriter, ReplyReader, SearchReader, TaxonomyReader } from '../content/store.ts';
|
|
8
9
|
import type { SiteRecords } from '../content/write.ts';
|
|
9
10
|
import type { DocumentChange, SyncResult } from '../content/sync.ts';
|
|
@@ -44,6 +45,11 @@ export interface GeekityEnv {
|
|
|
44
45
|
devMode: boolean;
|
|
45
46
|
/** Whether the site can send mail, read once per request (see `MailService.configured`). */
|
|
46
47
|
mailConfigured: boolean;
|
|
48
|
+
/**
|
|
49
|
+
* What the site's form challenge draws on this request's forms, or
|
|
50
|
+
* `undefined` while none is on. Read once per request.
|
|
51
|
+
*/
|
|
52
|
+
challengeWidget: ChallengeWidget | undefined;
|
|
47
53
|
siteAtRequestStart: SiteSettings;
|
|
48
54
|
store: RequestIndex;
|
|
49
55
|
/** Users and sessions, the part of the database that is not derived. */
|