@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
package/dist/contact/form.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Document } from '../content/document.ts';
|
|
2
|
+
import type { ChallengeWidget } from '../forms/challenge.ts';
|
|
2
3
|
/**
|
|
3
4
|
* The contact form: what it is called, what it carries, and when a page has
|
|
4
5
|
* one at all.
|
|
@@ -83,6 +84,12 @@ export interface ContactFormContext {
|
|
|
83
84
|
subjectLength: number;
|
|
84
85
|
/** The longest a message may be, for the textarea's `maxlength`. */
|
|
85
86
|
messageLength: number;
|
|
87
|
+
/**
|
|
88
|
+
* What the theme draws the site's form challenge from, and absent while
|
|
89
|
+
* there is none. A theme that draws no widget from it still has a working
|
|
90
|
+
* form, but every message sent from it is filed as spam.
|
|
91
|
+
*/
|
|
92
|
+
challenge?: ChallengeWidget | undefined;
|
|
86
93
|
}
|
|
87
94
|
/** Whether this document offers a contact form. */
|
|
88
95
|
export declare function contactOpen(document: Document): boolean;
|
|
@@ -108,6 +115,7 @@ export declare function contactValuesOf(form: ContactForm): ContactFormContext['
|
|
|
108
115
|
export declare function contactFormFor(options: {
|
|
109
116
|
document: Document;
|
|
110
117
|
now: Date;
|
|
118
|
+
challenge?: ChallengeWidget | undefined;
|
|
111
119
|
}): ContactFormContext | undefined;
|
|
112
120
|
/**
|
|
113
121
|
* The thank-you a sender is shown after a submission, from the query the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../src/contact/form.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../../src/contact/form.ts"],"names":[],"mappings":"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"}
|
package/dist/contact/form.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CONTACT_FRONT_MATTER_KEY } from '../content/contact.js';
|
|
2
|
+
import { withChallenge } from '../forms/challenge.js';
|
|
2
3
|
import { FORM_LOADED_FIELD, FORM_TRAP_FIELD } from '../forms/protection.js';
|
|
3
4
|
/**
|
|
4
5
|
* The contact form: what it is called, what it carries, and when a page has
|
|
@@ -102,7 +103,7 @@ export function contactValuesOf(form) {
|
|
|
102
103
|
export function contactFormFor(options) {
|
|
103
104
|
if (!contactOpen(options.document))
|
|
104
105
|
return undefined;
|
|
105
|
-
return contactForm(options.document, options.now);
|
|
106
|
+
return withChallenge(contactForm(options.document, options.now), options.challenge);
|
|
106
107
|
}
|
|
107
108
|
/**
|
|
108
109
|
* The thank-you a sender is shown after a submission, from the query the
|
package/dist/contact/form.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/contact/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE5E;;;;;;;;;;GAUG;AAEH,gEAAgE;AAChE,MAAM,CAAC,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAErD,yDAAyD;AACzD,MAAM,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC;AAE9C,iFAAiF;AACjF,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC;AAExC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAqC;IAC/D,IAAI,EAAE,yCAAyC;CAChD,CAAC;AAEF,2CAA2C;AAC3C,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,+CAA+C;IAC/C,IAAI,EAAE,MAAM;IACZ,mCAAmC;IACnC,IAAI,EAAE,MAAM;IACZ,2DAA2D;IAC3D,KAAK,EAAE,OAAO;IACd,kCAAkC;IAClC,OAAO,EAAE,SAAS;IAClB,mDAAmD;IACnD,OAAO,EAAE,SAAS;IAClB,sEAAsE;IACtE,IAAI,EAAE,eAAe;IACrB,yDAAyD;IACzD,MAAM,EAAE,iBAAiB;CACjB,CAAC;AAQX,iCAAiC;AACjC,MAAM,CAAC,MAAM,2BAA2B,GAAG,EAAE,CAAC;AAE9C,2CAA2C;AAC3C,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,CAAC;AAEhD,oCAAoC;AACpC,MAAM,CAAC,MAAM,8BAA8B,GAAG,GAAG,CAAC;AAElD,mDAAmD;AACnD,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"form.js","sourceRoot":"","sources":["../../src/contact/form.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { CommentChecker } from '../forms/checker.ts';
|
|
2
|
+
import type { FormChallenge } from '../forms/challenge.ts';
|
|
2
3
|
import type { Document } from '../content/document.ts';
|
|
3
4
|
import type { ContactForm, ContactProblems } from './form.ts';
|
|
4
5
|
import type { ContactMessage } from './records.ts';
|
|
@@ -81,6 +82,8 @@ export interface SubmitContactMessageOptions {
|
|
|
81
82
|
baseUrl: string;
|
|
82
83
|
/** The checker, when the site has one. */
|
|
83
84
|
checker?: CommentChecker | undefined;
|
|
85
|
+
challenge?: FormChallenge | undefined;
|
|
86
|
+
challengeToken?: string | undefined;
|
|
84
87
|
/** Where the request came from, as far as the site can tell. */
|
|
85
88
|
address?: string | undefined;
|
|
86
89
|
/** The `User-Agent` header, for the checker. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submission.d.ts","sourceRoot":"","sources":["../../src/contact/submission.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"submission.d.ts","sourceRoot":"","sources":["../../src/contact/submission.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,qBAAqB,CAAC;AAE1E,OAAO,KAAK,EAAoB,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAMvD,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,oEAAoE;AACpE,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC,2EAA2E;AAC3E,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAE/C,2DAA2D;AAC3D,MAAM,WAAW,eAAe;IAC9B,kEAAkE;IAClE,UAAU,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAAC;IACxD,uCAAuC;IACvC,IAAI,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CACrC;AAED,qDAAqD;AACrD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAEjE;AAED,iDAAiD;AACjD,MAAM,MAAM,cAAc;AACxB,sDAAsD;AACpD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,eAAe,CAAA;CAAE;AAChD,yDAAyD;GACvD;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE;AACvB,0DAA0D;GACxD;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE;AACnB,wEAAwE;GACtE;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE;AAC9C,sEAAsE;GACpE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1B,mCAAmC;AACnC,MAAM,MAAM,cAAc,GACxB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,cAAc,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,cAAc,CAAA;CAAE,CAAC;AAE7F,yDAAyD;AACzD,MAAM,WAAW,2BAA2B;IAC1C,kEAAkE;IAClE,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC;IAChC,QAAQ,EAAE,QAAQ,CAAC;IACnB,0BAA0B;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,iDAAiD;IACjD,OAAO,EAAE,MAAM,CAAC;IAChB,0CAA0C;IAC1C,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,SAAS,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,gEAAgE;IAChE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,gDAAgD;IAChD,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,sEAAsE;IACtE,QAAQ,EAAE,eAAe,CAAC;IAC1B,iBAAiB;IACjB,GAAG,EAAE,IAAI,CAAC;CACX;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,cAAc,CAAC,CAyDzB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { askChallenge } from '../forms/challenge.js';
|
|
1
2
|
import { postLabel } from '../content/post-type.js';
|
|
2
3
|
import { formTimingRefusal, hashClientAddress, trapped } from '../forms/protection.js';
|
|
3
4
|
import { messageOf } from '../util/errors.js';
|
|
@@ -71,8 +72,14 @@ export async function submitContactMessage(options) {
|
|
|
71
72
|
message: form.message.trim(),
|
|
72
73
|
addressHash: hashClientAddress(options.dataDir, options.address),
|
|
73
74
|
};
|
|
75
|
+
const challenged = await askChallenge(options.challenge, {
|
|
76
|
+
token: options.challengeToken ?? '',
|
|
77
|
+
address: options.address,
|
|
78
|
+
type: 'contact-form',
|
|
79
|
+
});
|
|
74
80
|
const verdict = await ask(options, proposed, now);
|
|
75
|
-
|
|
81
|
+
const status = contactStatusFor(verdict, challenged);
|
|
82
|
+
if (status === 'discard') {
|
|
76
83
|
// Counted against the address even so: a machine sending rubbish should
|
|
77
84
|
// not get unlimited free attempts because the rubbish was recognised.
|
|
78
85
|
throttle.fail(keys);
|
|
@@ -83,11 +90,18 @@ export async function submitContactMessage(options) {
|
|
|
83
90
|
// which is a worse failure than a spam list to glance at.
|
|
84
91
|
const message = await addContactMessage(options.dataDir, {
|
|
85
92
|
...proposed,
|
|
86
|
-
status
|
|
93
|
+
status,
|
|
87
94
|
});
|
|
88
95
|
throttle.fail(keys);
|
|
89
96
|
return { kind: 'stored', message };
|
|
90
97
|
}
|
|
98
|
+
function contactStatusFor(verdict, challenge) {
|
|
99
|
+
if (verdict === 'discard')
|
|
100
|
+
return 'discard';
|
|
101
|
+
if (verdict === 'spam' || challenge === 'fail')
|
|
102
|
+
return 'spam';
|
|
103
|
+
return 'received';
|
|
104
|
+
}
|
|
91
105
|
/** Ask the checker, if there is one, and treat a broken one as no opinion. */
|
|
92
106
|
async function ask(options, proposed, now) {
|
|
93
107
|
const checker = options.checker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submission.js","sourceRoot":"","sources":["../../src/contact/submission.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"submission.js","sourceRoot":"","sources":["../../src/contact/submission.ts"],"names":[],"mappings":"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"}
|
package/dist/exports.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export { createUser, listUsers, setUserProfile } from './admin/index.ts';
|
|
|
14
14
|
export { SITE } from './site/namespace.ts';
|
|
15
15
|
export type { SiteLicense } from './site/namespace.ts';
|
|
16
16
|
export type { CommentAuthor, CommentContent, CommentKind, CommentRecord, CommentSource, CommentStatus, CreateUserInput, Delivery, DeliveryStatus, PostComment, ProfileLink, Relay, RelayState, Session, SiteSettings, User, UserProfile, } from './admin/index.ts';
|
|
17
|
-
export type { CommentChecker, CommentFormContext, CommentNotices, CommentProblems, CommentRecords, CommentReport, CommentSubmission, CommentVerdict, CommentViewer, SubmissionType, } from './comments/index.ts';
|
|
17
|
+
export type { ChallengeAttempt, ChallengeVerdict, ChallengeWidget, CommentChecker, CommentFormContext, CommentNotices, CommentProblems, CommentRecords, CommentReport, CommentSubmission, CommentVerdict, CommentViewer, FormChallenge, SubmissionType, } from './comments/index.ts';
|
|
18
18
|
export { CONTACT_FIELDS, CONTACT_POST_PATH } from './contact/index.ts';
|
|
19
19
|
export type { ContactFormContext, ContactProblems } from './contact/index.ts';
|
|
20
20
|
export { createMemoryMailProvider } from './mail/index.ts';
|
package/dist/exports.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../src/exports.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"exports.d.ts","sourceRoot":"","sources":["../src/exports.ts"],"names":[],"mappings":"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"}
|
package/dist/exports.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exports.js","sourceRoot":"","sources":["../src/exports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAW1D,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,OAAO,GACR,MAAM,oBAAoB,CAAC;AAoB5B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAInE,OAAO,EACL,QAAQ,EACR,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,OAAO,EACP,mBAAmB,EACnB,QAAQ,GACT,MAAM,gBAAgB,CAAC;AAwCxB,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,qBAAqB,EACrB,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"exports.js","sourceRoot":"","sources":["../src/exports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAW1D,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,OAAO,GACR,MAAM,oBAAoB,CAAC;AAoB5B,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAInE,OAAO,EACL,QAAQ,EACR,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,OAAO,EACP,mBAAmB,EACnB,QAAQ,GACT,MAAM,gBAAgB,CAAC;AAwCxB,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,qBAAqB,EACrB,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAqC3C,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { MessageQueue } from '@fedify/fedify';
|
|
2
|
+
import type { DeliveryStore } from '../store/deliveries.ts';
|
|
3
|
+
import type { Clock } from '../util/clock.ts';
|
|
4
|
+
/**
|
|
5
|
+
* Mark `unknown` every delivery still recorded as waiting that the queue no
|
|
6
|
+
* longer holds a message for. Runs before anything can send, so a row written
|
|
7
|
+
* just before its message was enqueued is never caught. A queue the site
|
|
8
|
+
* supplies cannot be read, so its rows are left as they are.
|
|
9
|
+
*/
|
|
10
|
+
export declare function markForgottenDeliveries(deliveries: Pick<DeliveryStore, 'markUnsettledDeliveriesUnknown'>, site: {
|
|
11
|
+
readonly dataDir: string;
|
|
12
|
+
readonly queue: MessageQueue | null | undefined;
|
|
13
|
+
readonly now: Clock;
|
|
14
|
+
}): void;
|
|
15
|
+
//# sourceMappingURL=forgotten-deliveries.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"forgotten-deliveries.d.ts","sourceRoot":"","sources":["../../src/federation/forgotten-deliveries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,IAAI,CAAC,aAAa,EAAE,gCAAgC,CAAC,EACjE,IAAI,EAAE;IACJ,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC;IAChD,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC;CACrB,GACA,IAAI,CAMN"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { listWaitingDeliveries } from '../store/queue-database.js';
|
|
2
|
+
/**
|
|
3
|
+
* Mark `unknown` every delivery still recorded as waiting that the queue no
|
|
4
|
+
* longer holds a message for. Runs before anything can send, so a row written
|
|
5
|
+
* just before its message was enqueued is never caught. A queue the site
|
|
6
|
+
* supplies cannot be read, so its rows are left as they are.
|
|
7
|
+
*/
|
|
8
|
+
export function markForgottenDeliveries(deliveries, site) {
|
|
9
|
+
if (site.queue !== undefined && site.queue !== null)
|
|
10
|
+
return;
|
|
11
|
+
deliveries.markUnsettledDeliveriesUnknown({
|
|
12
|
+
before: site.now().toISOString(),
|
|
13
|
+
waiting: site.queue === null ? [] : listWaitingDeliveries(site.dataDir),
|
|
14
|
+
});
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=forgotten-deliveries.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"forgotten-deliveries.js","sourceRoot":"","sources":["../../src/federation/forgotten-deliveries.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,UAAiE,EACjE,IAIC;IAED,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI;QAAE,OAAO;IAC5D,UAAU,CAAC,8BAA8B,CAAC;QACxC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;QAChC,OAAO,EAAE,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC;KACxE,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-job.d.ts","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"retry-job.d.ts","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAQ,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAA4B,MAAM,yBAAyB,CAAC;AAIpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,MAAM,MAAM,WAAW,GACnB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACxD;IAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,cAAc,EAAE,CAAA;CAAE,CAAC;AAErF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS;QACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;KAC1C,EAAE,CAAC;CACL,CAAC;AAIF,eAAO,MAAM,oBAAoB,8DAAwD,CAAC;AAE1F,uEAAuE;AACvE,eAAO,MAAM,aAAa,OAAO,CAAC;AAElC,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,aAAa,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;IACrD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;CACpD;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,CA4CvF;AAaD,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,GAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CACE,GAC5C,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC,CA4BzC"}
|
|
@@ -6,6 +6,7 @@ import { isRecord } from '../util/guards.js';
|
|
|
6
6
|
import { postBySlug } from './delivery.js';
|
|
7
7
|
import { objectIdsOf, readObjectIds } from './object-ids.js';
|
|
8
8
|
import { resendActivity } from './resend-job.js';
|
|
9
|
+
const RETRIED = new Set(['failed', 'unknown']);
|
|
9
10
|
export const RETRY_DELIVERIES_JOB = jobName('retry-deliveries');
|
|
10
11
|
/** A burst of deliveries to one server can trip its bot protection. */
|
|
11
12
|
export const RETRY_PACE_MS = 2000;
|
|
@@ -37,15 +38,16 @@ export function failedRetries(services, filter) {
|
|
|
37
38
|
}
|
|
38
39
|
const retries = new Map();
|
|
39
40
|
for (const [key, { slug, row }] of newest) {
|
|
40
|
-
if (row.status
|
|
41
|
+
if (!RETRIED.has(row.status))
|
|
41
42
|
continue;
|
|
43
|
+
const create = newestCreate.get(key);
|
|
42
44
|
if (filter.inbox !== null && row.inboxId !== filter.inbox)
|
|
43
45
|
continue;
|
|
44
46
|
const recipient = {
|
|
45
47
|
actorId: row.actorId,
|
|
46
48
|
inboxId: row.inboxId,
|
|
47
49
|
error: row.error,
|
|
48
|
-
missedAnnouncement:
|
|
50
|
+
missedAnnouncement: create !== undefined && RETRIED.has(create.status),
|
|
49
51
|
};
|
|
50
52
|
const held = retries.get(slug);
|
|
51
53
|
if (held === undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-job.js","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAwBjD,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAA2B,kBAAkB,CAAC,CAAC;AAE1F,uEAAuE;AACvE,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC;AAYlC,MAAM,UAAU,aAAa,CAAC,QAA2B,EAAE,MAAmB;IAC5E,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IACnC,IAAI,SAA+B,CAAC;IACpC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,EAAE,CAAC;QACtC,SAAS,GAAG;YACV,GAAG,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;SACzF,CAAC;IACJ,CAAC;IACD,MAAM,GAAG,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAChC,MAAM,UAAU,GAAG,KAAK,CAAC,gBAAgB,CACvC,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,IAAI,SAAS,EAAE,EACjD,GAAG,CACJ,CAAC,KAAK,CAAC;IACR,MAAM,OAAO,GACX,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IAE5F,MAAM,MAAM,GAAG,IAAI,GAAG,EAA2C,CAAC;IAClE,MAAM,YAAY,GAAG,IAAI,GAAG,EAAoB,CAAC;IACjD,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC;QACrC,IAAI,IAAI,KAAK,IAAI;YAAE,SAAS;QAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QACrD,IAAI,GAAG,CAAC,YAAY,KAAK,QAAQ,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1F,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAA4B,CAAC;IACpD,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,MAAM,EAAE,CAAC;QAC1C,IAAI,GAAG,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"retry-job.js","sourceRoot":"","sources":["../../src/federation/retry-job.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import type { SubmissionType } from './checker.ts';
|
|
2
|
+
/**
|
|
3
|
+
* A challenge a stranger answers in the browser before a public form is sent:
|
|
4
|
+
* the one seam anything like hCaptcha plugs into.
|
|
5
|
+
*
|
|
6
|
+
* A site names one as `formChallenge` in its config; with none named, the
|
|
7
|
+
* package builds its hCaptcha challenge, which does nothing until a site key
|
|
8
|
+
* and a secret are stored. The contact form and a stranger's comment form ask
|
|
9
|
+
* it about every submission that gets past the honeypot, the form's age and
|
|
10
|
+
* the rate limit, before the `CommentChecker` is asked.
|
|
11
|
+
*
|
|
12
|
+
* It never refuses anything. A form has to keep working with JavaScript off,
|
|
13
|
+
* so a submission that brings no answer, or a wrong one, is stored as spam
|
|
14
|
+
* rather than turned away, and a challenge that cannot be reached has no
|
|
15
|
+
* opinion at all.
|
|
16
|
+
*/
|
|
17
|
+
export interface FormChallenge {
|
|
18
|
+
/**
|
|
19
|
+
* The form field the widget puts its answer in, which is the field the
|
|
20
|
+
* server reads the token from.
|
|
21
|
+
*/
|
|
22
|
+
readonly field: string;
|
|
23
|
+
/**
|
|
24
|
+
* What a theme needs to draw the widget, or `undefined` while the challenge
|
|
25
|
+
* is off.
|
|
26
|
+
*
|
|
27
|
+
* Asked per render: the admin can turn it on or off while the site runs.
|
|
28
|
+
*/
|
|
29
|
+
widget(): Promise<ChallengeWidget | undefined>;
|
|
30
|
+
/** What the challenge says about one submission's answer. */
|
|
31
|
+
verify(attempt: ChallengeAttempt): Promise<ChallengeVerdict>;
|
|
32
|
+
}
|
|
33
|
+
/** What a theme draws a challenge from. */
|
|
34
|
+
export interface ChallengeWidget {
|
|
35
|
+
/** Which service it is, for a theme that draws more than one. */
|
|
36
|
+
readonly provider: string;
|
|
37
|
+
/** The public key the widget is drawn with. Printed in the page. */
|
|
38
|
+
readonly siteKey: string;
|
|
39
|
+
/** The script that draws it. */
|
|
40
|
+
readonly scriptUrl: string;
|
|
41
|
+
/** The form field its answer is posted in. */
|
|
42
|
+
readonly field: string;
|
|
43
|
+
}
|
|
44
|
+
/** One submission's answer, and what is known about who sent it. */
|
|
45
|
+
export interface ChallengeAttempt {
|
|
46
|
+
/** What the widget put in its field: empty when nothing did. */
|
|
47
|
+
token: string;
|
|
48
|
+
/** Where the request came from, **unhashed**, for a service that wants it. */
|
|
49
|
+
address: string | undefined;
|
|
50
|
+
/** Which form it came from. */
|
|
51
|
+
type: Exclude<SubmissionType, 'webmention'>;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* What a challenge can say.
|
|
55
|
+
*
|
|
56
|
+
* `pass` lets the submission on to the checker as if nothing had asked.
|
|
57
|
+
* `fail` — no answer, or one the service rejected — files it as spam, so it
|
|
58
|
+
* is stored where somebody can look and nobody is told about it. `unknown` is
|
|
59
|
+
* no opinion: the challenge is off, or its service could not be asked, and the
|
|
60
|
+
* submission goes on exactly as it would without one.
|
|
61
|
+
*/
|
|
62
|
+
export type ChallengeVerdict = 'pass' | 'fail' | 'unknown';
|
|
63
|
+
/**
|
|
64
|
+
* Ask a challenge about one submission, when the site has one.
|
|
65
|
+
*
|
|
66
|
+
* A challenge that throws is no opinion.
|
|
67
|
+
*/
|
|
68
|
+
export declare function askChallenge(challenge: FormChallenge | undefined, attempt: ChallengeAttempt, logger?: {
|
|
69
|
+
warn(message: string): void;
|
|
70
|
+
}): Promise<ChallengeVerdict>;
|
|
71
|
+
/** What a challenge's widget posted in a submitted body, or empty for none. */
|
|
72
|
+
export declare function challengeTokenOf(body: Record<string, unknown>, challenge: FormChallenge | undefined): string;
|
|
73
|
+
/**
|
|
74
|
+
* What a challenge's widget is for this request, or `undefined` while it is
|
|
75
|
+
* off.
|
|
76
|
+
*
|
|
77
|
+
* A widget that throws is off.
|
|
78
|
+
*/
|
|
79
|
+
export declare function challengeWidgetOf(challenge: FormChallenge | undefined, logger?: {
|
|
80
|
+
warn(message: string): void;
|
|
81
|
+
}): Promise<ChallengeWidget | undefined>;
|
|
82
|
+
/** The same form with a challenge's widget on it, or untouched while there is none. */
|
|
83
|
+
export declare function withChallenge<Form extends {
|
|
84
|
+
challenge?: ChallengeWidget | undefined;
|
|
85
|
+
}>(form: Form, widget: ChallengeWidget | undefined): Form;
|
|
86
|
+
//# sourceMappingURL=challenge.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"challenge.d.ts","sourceRoot":"","sources":["../../src/forms/challenge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,MAAM,IAAI,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;IAC/C,6DAA6D;IAC7D,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC9D;AAED,2CAA2C;AAC3C,MAAM,WAAW,eAAe;IAC9B,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,oEAAoE;IACpE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,gCAAgC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,8CAA8C;IAC9C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,oEAAoE;AACpE,MAAM,WAAW,gBAAgB;IAC/B,gEAAgE;IAChE,KAAK,EAAE,MAAM,CAAC;IACd,8EAA8E;IAC9E,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,+BAA+B;IAC/B,IAAI,EAAE,OAAO,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;CAC7C;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;AAE3D;;;;GAIG;AACH,wBAAsB,YAAY,CAChC,SAAS,EAAE,aAAa,GAAG,SAAS,EACpC,OAAO,EAAE,gBAAgB,EACzB,MAAM,GAAE;IAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAY,GAChD,OAAO,CAAC,gBAAgB,CAAC,CAS3B;AAED,+EAA+E;AAC/E,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,SAAS,EAAE,aAAa,GAAG,SAAS,GACnC,MAAM,CAER;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,aAAa,GAAG,SAAS,EACpC,MAAM,GAAE;IAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAY,GAChD,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAStC;AAED,uFAAuF;AACvF,wBAAgB,aAAa,CAAC,IAAI,SAAS;IAAE,SAAS,CAAC,EAAE,eAAe,GAAG,SAAS,CAAA;CAAE,EACpF,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,eAAe,GAAG,SAAS,GAClC,IAAI,CAEN"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { messageOf } from '../util/errors.js';
|
|
2
|
+
import { stringOrEmpty } from '../util/forms.js';
|
|
3
|
+
/**
|
|
4
|
+
* Ask a challenge about one submission, when the site has one.
|
|
5
|
+
*
|
|
6
|
+
* A challenge that throws is no opinion.
|
|
7
|
+
*/
|
|
8
|
+
export async function askChallenge(challenge, attempt, logger = console) {
|
|
9
|
+
if (challenge === undefined)
|
|
10
|
+
return 'unknown';
|
|
11
|
+
try {
|
|
12
|
+
return await challenge.verify(attempt);
|
|
13
|
+
}
|
|
14
|
+
catch (error) {
|
|
15
|
+
logger.warn(`The form challenge refused to answer: ${messageOf(error)}`);
|
|
16
|
+
return 'unknown';
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
/** What a challenge's widget posted in a submitted body, or empty for none. */
|
|
20
|
+
export function challengeTokenOf(body, challenge) {
|
|
21
|
+
return challenge === undefined ? '' : stringOrEmpty(body[challenge.field]);
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* What a challenge's widget is for this request, or `undefined` while it is
|
|
25
|
+
* off.
|
|
26
|
+
*
|
|
27
|
+
* A widget that throws is off.
|
|
28
|
+
*/
|
|
29
|
+
export async function challengeWidgetOf(challenge, logger = console) {
|
|
30
|
+
if (challenge === undefined)
|
|
31
|
+
return undefined;
|
|
32
|
+
try {
|
|
33
|
+
return await challenge.widget();
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
36
|
+
logger.warn(`The form challenge could not say how to draw itself: ${messageOf(error)}`);
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
/** The same form with a challenge's widget on it, or untouched while there is none. */
|
|
41
|
+
export function withChallenge(form, widget) {
|
|
42
|
+
return widget === undefined ? form : { ...form, challenge: widget };
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=challenge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"challenge.js","sourceRoot":"","sources":["../../src/forms/challenge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAoEjD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,SAAoC,EACpC,OAAyB,EACzB,MAAM,GAAoC,OAAO;IAEjD,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAE9C,IAAI,CAAC;QACH,OAAO,MAAM,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,yCAAyC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzE,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,gBAAgB,CAC9B,IAA6B,EAC7B,SAAoC;IAEpC,OAAO,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7E,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,SAAoC,EACpC,MAAM,GAAoC,OAAO;IAEjD,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAE9C,IAAI,CAAC;QACH,OAAO,MAAM,SAAS,CAAC,MAAM,EAAE,CAAC;IAClC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,wDAAwD,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxF,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,aAAa,CAC3B,IAAU,EACV,MAAmC;IAEnC,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;AACtE,CAAC"}
|
|
@@ -9,10 +9,10 @@ export declare function countsOf<const V extends readonly [string, ...string[]]>
|
|
|
9
9
|
};
|
|
10
10
|
export declare const STATUS_COUNTS: {
|
|
11
11
|
readonly type: 'object';
|
|
12
|
-
readonly properties: Record<"failed" | "queued" | "retrying" | "sent", {
|
|
12
|
+
readonly properties: Record<"failed" | "queued" | "retrying" | "sent" | "unknown", {
|
|
13
13
|
readonly type: 'integer';
|
|
14
14
|
}>;
|
|
15
|
-
readonly required: readonly ["sent", "queued", "retrying", "failed"];
|
|
15
|
+
readonly required: readonly ["sent", "queued", "retrying", "failed", "unknown"];
|
|
16
16
|
readonly description: 'How many recipients stand at each delivery status.';
|
|
17
17
|
};
|
|
18
18
|
export declare const DELIVERY: {
|
|
@@ -47,7 +47,7 @@ export declare const DELIVERY: {
|
|
|
47
47
|
};
|
|
48
48
|
readonly status: {
|
|
49
49
|
readonly type: 'string';
|
|
50
|
-
readonly enum: readonly ["sent", "queued", "retrying", "failed"];
|
|
50
|
+
readonly enum: readonly ["sent", "queued", "retrying", "failed", "unknown"];
|
|
51
51
|
};
|
|
52
52
|
readonly error: {
|
|
53
53
|
readonly anyOf: readonly [{
|
package/dist/mcp/repair/retry.js
CHANGED
|
@@ -6,7 +6,7 @@ import { JOB, QUEUED, queuedJob, REPAIR } from './schemas.js';
|
|
|
6
6
|
export const retryDeliveries = defineTool({
|
|
7
7
|
name: 'retry_deliveries',
|
|
8
8
|
title: 'Retry failed deliveries',
|
|
9
|
-
description: 'Find the recipients whose newest delivery of a post failed, for one post, for one inbox, or both, and queue a job that sends each post again, as it reads now, to those recipients alone, at the inbox each uses now. A recipient whose Create failed is sent the Create; the rest are sent an Update. Posts go one at a time with a pause between. Returns what will be retried and the queued job; outcomes appear in post_federation as the queue settles them.',
|
|
9
|
+
description: 'Find the recipients whose newest delivery of a post failed or has an unknown outcome, for one post, for one inbox, or both, and queue a job that sends each post again, as it reads now, to those recipients alone, at the inbox each uses now. A recipient whose Create failed is sent the Create; the rest are sent an Update. Posts go one at a time with a pause between. Returns what will be retried and the queued job; outcomes appear in post_federation as the queue settles them.',
|
|
10
10
|
scope: 'repair',
|
|
11
11
|
annotations: REPAIR,
|
|
12
12
|
inputSchema: {
|
|
@@ -15,7 +15,7 @@ export const retryDeliveries = defineTool({
|
|
|
15
15
|
post: { ...POST_INPUT, description: `${POST_INPUT.description} Give this, inbox, or both.` },
|
|
16
16
|
inbox: {
|
|
17
17
|
type: 'string',
|
|
18
|
-
description: 'Only deliveries
|
|
18
|
+
description: 'Only deliveries to this inbox, often a shared one.',
|
|
19
19
|
},
|
|
20
20
|
},
|
|
21
21
|
additionalProperties: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../src/mcp/repair/retry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAEpF,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE9D,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC;IACxC,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,yBAAyB;IAChC,WAAW,EACT,
|
|
1
|
+
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../../src/mcp/repair/retry.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare const HCAPTCHA_PAIR_STATUSES: readonly ['valid', 'invalid', 'unchecked'];
|
|
2
|
+
export type HcaptchaPairStatus = (typeof HCAPTCHA_PAIR_STATUSES)[number];
|
|
3
|
+
export declare const HCAPTCHA_FILE: import("../files/data-files.ts").DataFileDeclaration;
|
|
4
|
+
export declare const HCAPTCHA: import("./types.ts").DeclaredNamespace & {
|
|
5
|
+
readonly site_key: import("./types.ts").SettingRef<string>;
|
|
6
|
+
readonly secret: import("./types.ts").SettingRef<string>;
|
|
7
|
+
readonly status: import("./types.ts").SettingRef<"invalid" | "unchecked" | "valid">;
|
|
8
|
+
readonly checked_at: import("./types.ts").SettingRef<string>;
|
|
9
|
+
};
|
|
10
|
+
//# sourceMappingURL=hcaptcha.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hcaptcha.d.ts","sourceRoot":"","sources":["../../src/settings/hcaptcha.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB,YAAI,OAAO,EAAE,SAAS,EAAE,WAAW,CAAU,CAAC;AAEjF,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEzE,eAAO,MAAM,aAAa,sDAIxB,CAAC;AAEH,eAAO,MAAM,QAAQ;;;;;CA2BnB,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { declareDataFile } from '../files/data-files.js';
|
|
2
|
+
import { declareNamespace } from './declare.js';
|
|
3
|
+
import { instantOrEmpty, oneOf, text } from './kinds.js';
|
|
4
|
+
export const HCAPTCHA_PAIR_STATUSES = ['valid', 'invalid', 'unchecked'];
|
|
5
|
+
export const HCAPTCHA_FILE = declareDataFile({
|
|
6
|
+
pattern: 'hcaptcha.json',
|
|
7
|
+
dataClass: { kind: 'credential' },
|
|
8
|
+
lost: 'The hCaptcha site key and secret, typed in again on Settings > Discussion.',
|
|
9
|
+
});
|
|
10
|
+
export const HCAPTCHA = declareNamespace({
|
|
11
|
+
namespace: 'hcaptcha',
|
|
12
|
+
storage: { kind: 'file', under: 'data', file: HCAPTCHA_FILE },
|
|
13
|
+
envPrefix: 'GEEKITY_HCAPTCHA',
|
|
14
|
+
settings: {
|
|
15
|
+
site_key: {
|
|
16
|
+
type: text,
|
|
17
|
+
default: '',
|
|
18
|
+
description: 'The hCaptcha site key, printed in the page. Empty challenges no form.',
|
|
19
|
+
},
|
|
20
|
+
secret: {
|
|
21
|
+
type: text,
|
|
22
|
+
default: '',
|
|
23
|
+
secret: true,
|
|
24
|
+
description: 'The hCaptcha secret that checks a token. Empty challenges no form.',
|
|
25
|
+
},
|
|
26
|
+
status: {
|
|
27
|
+
type: oneOf(HCAPTCHA_PAIR_STATUSES),
|
|
28
|
+
default: 'unchecked',
|
|
29
|
+
description: 'What hCaptcha said about the site key and secret when they were last checked.',
|
|
30
|
+
},
|
|
31
|
+
checked_at: {
|
|
32
|
+
type: instantOrEmpty,
|
|
33
|
+
default: '',
|
|
34
|
+
description: 'When the site key and secret were last checked, as an instant.',
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
});
|
|
38
|
+
//# sourceMappingURL=hcaptcha.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hcaptcha.js","sourceRoot":"","sources":["../../src/settings/hcaptcha.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,WAAW,CAAU,CAAC;AAIjF,MAAM,CAAC,MAAM,aAAa,GAAG,eAAe,CAAC;IAC3C,OAAO,EAAE,eAAe;IACxB,SAAS,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;IACjC,IAAI,EAAE,4EAA4E;CACnF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,QAAQ,GAAG,gBAAgB,CAAC;IACvC,SAAS,EAAE,UAAU;IACrB,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;IAC7D,SAAS,EAAE,kBAAkB;IAC7B,QAAQ,EAAE;QACR,QAAQ,EAAE;YACR,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,uEAAuE;SACrF;QACD,MAAM,EAAE;YACN,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,oEAAoE;SAClF;QACD,MAAM,EAAE;YACN,IAAI,EAAE,KAAK,CAAC,sBAAsB,CAAC;YACnC,OAAO,EAAE,WAAW;YACpB,WAAW,EAAE,+EAA+E;SAC7F;QACD,UAAU,EAAE;YACV,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,gEAAgE;SAC9E;KACF;CACF,CAAC,CAAC"}
|
package/dist/settings/names.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const SETTING_NAME: RegExp;
|
|
2
|
-
export declare const CORE_NAMESPACES: readonly ['site', 'maintenance', 'dev_mode', 'mail', 'akismet', 'tmdb'];
|
|
2
|
+
export declare const CORE_NAMESPACES: readonly ['site', 'maintenance', 'dev_mode', 'mail', 'akismet', 'tmdb', 'hcaptcha'];
|
|
3
3
|
export declare function coreEnvPrefix(namespace: string): string;
|
|
4
4
|
export declare function pluginEnvPrefix(name: string): string;
|
|
5
5
|
export declare function settingVariable(envPrefix: string, key: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"names.d.ts","sourceRoot":"","sources":["../../src/settings/names.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,QAAoC,CAAC;AAE9D,eAAO,MAAM,eAAe,YAC1B,MAAM,EACN,aAAa,EACb,UAAU,EACV,MAAM,EACN,SAAS,EACT,MAAM,
|
|
1
|
+
{"version":3,"file":"names.d.ts","sourceRoot":"","sources":["../../src/settings/names.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,QAAoC,CAAC;AAE9D,eAAO,MAAM,eAAe,YAC1B,MAAM,EACN,aAAa,EACb,UAAU,EACV,MAAM,EACN,SAAS,EACT,MAAM,EACN,UAAU,CACF,CAAC;AASX,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAYjG"}
|
package/dist/settings/names.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../src/settings/names.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,iCAAiC,CAAC;AAE9D,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM;IACN,aAAa;IACb,UAAU;IACV,MAAM;IACN,SAAS;IACT,MAAM;
|
|
1
|
+
{"version":3,"file":"names.js","sourceRoot":"","sources":["../../src/settings/names.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,iCAAiC,CAAC;AAE9D,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,MAAM;IACN,aAAa;IACb,UAAU;IACV,MAAM;IACN,SAAS;IACT,MAAM;IACN,UAAU;CACF,CAAC;AAEX,SAAS,UAAU,CAAC,IAAY;IAC9B,OAAO,IAAI;SACR,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,SAAiB;IAC7C,OAAO,WAAW,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,SAAiB,EAAE,GAAW;IAC5D,OAAO,GAAG,SAAS,KAAK,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,SAAiB,EAAE,SAAiB;IAC3E,IAAK,eAAqC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QAC/D,OAAO,0BAA0B,SAAS,iCAAiC,CAAC;IAC9E,CAAC;IACD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,8EAA8E,CAAC;IACxF,CAAC;IACD,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC,CAAC;IAC/E,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,yCAAyC,SAAS,iBAAiB,IAAI,eAAe,CAAC;IAChG,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|