@velocity-astro/cms-astro 0.1.0-beta.3 → 0.1.0-beta.4
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/dist/admin-files.d.ts +2 -2
- package/dist/admin-files.d.ts.map +1 -1
- package/dist/admin-files.js +13 -7
- package/dist/admin-files.js.map +1 -1
- package/dist/challenge.d.ts +35 -0
- package/dist/challenge.d.ts.map +1 -0
- package/dist/challenge.js +84 -0
- package/dist/challenge.js.map +1 -0
- package/dist/connection.d.ts.map +1 -1
- package/dist/connection.js +22 -11
- package/dist/connection.js.map +1 -1
- package/dist/editor.d.ts +2 -0
- package/dist/editor.d.ts.map +1 -1
- package/dist/editor.js +9 -1
- package/dist/editor.js.map +1 -1
- package/dist/form-post.d.ts +9 -1
- package/dist/form-post.d.ts.map +1 -1
- package/dist/form-post.js +10 -3
- package/dist/form-post.js.map +1 -1
- package/dist/index.d.ts +6 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -3
- package/dist/index.js.map +1 -1
- package/dist/media-store.d.ts +9 -0
- package/dist/media-store.d.ts.map +1 -1
- package/dist/media-store.js +17 -1
- package/dist/media-store.js.map +1 -1
- package/dist/resend-mailer.d.ts +18 -1
- package/dist/resend-mailer.d.ts.map +1 -1
- package/dist/resend-mailer.js +24 -3
- package/dist/resend-mailer.js.map +1 -1
- package/dist/site-editor.d.ts +1 -1
- package/dist/site-editor.d.ts.map +1 -1
- package/dist/site-editor.js +28 -6
- package/dist/site-editor.js.map +1 -1
- package/dist/site-forms.d.ts +11 -0
- package/dist/site-forms.d.ts.map +1 -1
- package/dist/site-forms.js +29 -16
- package/dist/site-forms.js.map +1 -1
- package/dist/site-mail.d.ts +45 -0
- package/dist/site-mail.d.ts.map +1 -0
- package/dist/site-mail.js +84 -0
- package/dist/site-mail.js.map +1 -0
- package/dist/site-name.d.ts +9 -0
- package/dist/site-name.d.ts.map +1 -0
- package/dist/site-name.js +21 -0
- package/dist/site-name.js.map +1 -0
- package/dist/site-storage.d.ts +34 -0
- package/dist/site-storage.d.ts.map +1 -0
- package/dist/site-storage.js +118 -0
- package/dist/site-storage.js.map +1 -0
- package/package.json +7 -7
- package/routes/form-client.js.ts +68 -0
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,UAAU,EAAE,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAE,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,KAAK,SAAS,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -2,7 +2,9 @@ export { sharedConnection } from './connection.js';
|
|
|
2
2
|
export { AdminFiles } from './admin-files.js';
|
|
3
3
|
export { EditorHost, LogMailer } from './editor.js';
|
|
4
4
|
export { default } from './integration.js';
|
|
5
|
-
export { ResendMailer, englishMailWords, mailerFromEnv } from './resend-mailer.js';
|
|
5
|
+
export { ResendMailer, MailRefusedError, englishMailWords, mailerFromEnv } from './resend-mailer.js';
|
|
6
|
+
export { SiteMail } from './site-mail.js';
|
|
7
|
+
export { SiteMediaStore } from './site-storage.js';
|
|
6
8
|
// What a site's own plugin file needs, so it imports from the one package the site installed.
|
|
7
9
|
export { definePlugin } from '@velocity-astro/cms-core';
|
|
8
10
|
export { registerSitePlugins } from './site-plugins.js';
|
|
@@ -12,14 +14,15 @@ export { isEditorPreview, isPreview } from './preview.js';
|
|
|
12
14
|
export { pageHead } from './page-head.js';
|
|
13
15
|
export { entryPage, entryPageAddresses } from './entry-page.js';
|
|
14
16
|
export { linkTo } from './link.js';
|
|
15
|
-
export { FORM_ABOUT_FIELD, FORM_LOCALE_FIELD, FORM_PAGE_FIELD, FORM_TOKEN_FIELD, FORM_TRAP_FIELD, FormPosts, MemoryRateLimiter, aboutMark, englishFormPostWords, } from './form-post.js';
|
|
17
|
+
export { FORM_ABOUT_FIELD, FORM_CHALLENGE_KEY_FIELD, FORM_LOCALE_FIELD, FORM_PAGE_FIELD, FORM_TOKEN_FIELD, FORM_TRAP_FIELD, FormPosts, MemoryRateLimiter, aboutMark, englishFormPostWords, } from './form-post.js';
|
|
18
|
+
export { FORM_CHALLENGE_FIELD, SiteChallenge, TURNSTILE_HOST, TURNSTILE_SCRIPT, TURNSTILE_VERIFY } from './challenge.js';
|
|
16
19
|
export { FORM_SCRIPT, siteForm, siteFormPosts } from './site-forms.js';
|
|
17
20
|
export { menuLinks } from './menu.js';
|
|
18
21
|
export { single } from './single.js';
|
|
19
22
|
export { cmsLoader } from './loader.js';
|
|
20
23
|
export { liveAddresses, liveCollections, matchLocalizedPage, matchParams, } from './live-pages.js';
|
|
21
24
|
export { SharpImageOptimizer } from './image-optimizer.js';
|
|
22
|
-
export { FolderMediaStore, S3MediaStore, mediaStoreFromEnv } from './media-store.js';
|
|
25
|
+
export { FolderMediaStore, S3MediaStore, StorageRefusedError, bucketFromEnv, folderFromEnv, mediaStoreFromEnv } from './media-store.js';
|
|
23
26
|
export { hasSiteSecret } from './secret.js';
|
|
24
27
|
export { refreshUploadedImages, uploadedFile, uploadedImage } from './site-media.js';
|
|
25
28
|
export { folderImages } from './site-images.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA2C,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAyB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,SAAS,EAA0B,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA2C,MAAM,iBAAiB,CAAC;AAC5F,OAAO,EAAE,UAAU,EAAyB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,SAAS,EAA0B,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,EAA2D,MAAM,oBAAoB,CAAC;AAC9J,OAAO,EAAE,QAAQ,EAAwB,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,cAAc,EAA8B,MAAM,mBAAmB,CAAC;AAC/E,8FAA8F;AAC9F,OAAO,EAAE,YAAY,EAA6C,MAAM,0BAA0B,CAAC;AACnG,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAA2B,MAAM,kBAAkB,CAAC;AACvI,OAAO,EACL,aAAa,EACb,QAAQ,EACR,qBAAqB,EACrB,kBAAkB,EAClB,OAAO,GAIR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAkB,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAyC,MAAM,iBAAiB,CAAC;AACvG,OAAO,EAAE,MAAM,EAAmB,MAAM,WAAW,CAAC;AACpD,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,SAAS,EACT,iBAAiB,EACjB,SAAS,EACT,oBAAoB,GAOrB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,cAAc,EAAE,gBAAgB,EAAE,gBAAgB,EAAkD,MAAM,gBAAgB,CAAC;AACzK,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAwD,MAAM,iBAAiB,CAAC;AAC7H,OAAO,EAAE,SAAS,EAAoD,MAAM,WAAW,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,SAAS,EAAyB,MAAM,aAAa,CAAC;AAC/D,OAAO,EACL,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,WAAW,GAKZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,mBAAmB,EAAmC,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,aAAa,EAAE,iBAAiB,EAA4B,MAAM,kBAAkB,CAAC;AAClK,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAkB,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAsC,MAAM,aAAa,CAAC"}
|
package/dist/media-store.d.ts
CHANGED
|
@@ -26,6 +26,11 @@ export interface S3MediaStoreOptions {
|
|
|
26
26
|
/** Defaults to now. */
|
|
27
27
|
readonly now?: () => Date;
|
|
28
28
|
}
|
|
29
|
+
/** The bucket answered and refused. `status` is its answer; the message holds its own words, for the server's log. */
|
|
30
|
+
export declare class StorageRefusedError extends Error {
|
|
31
|
+
readonly status: number;
|
|
32
|
+
constructor(status: number, message: string);
|
|
33
|
+
}
|
|
29
34
|
/**
|
|
30
35
|
* Keeps uploads in a bucket that speaks the S3 protocol: Cloudflare R2, Amazon S3, Backblaze B2,
|
|
31
36
|
* MinIO and others. For a site on a host with no disk of its own. The bucket stays private: the
|
|
@@ -49,4 +54,8 @@ export declare class S3MediaStore implements MediaStore {
|
|
|
49
54
|
* - Neither, with a hosted database: nowhere, and the site takes no uploads.
|
|
50
55
|
*/
|
|
51
56
|
export declare function mediaStoreFromEnv(databaseUrl: string, env?: Readonly<Record<string, string | undefined>>): MediaStore | undefined;
|
|
57
|
+
/** The bucket the server's own settings name, or none. Settings that name only part of one are refused. */
|
|
58
|
+
export declare function bucketFromEnv(env?: Readonly<Record<string, string | undefined>>): S3MediaStore | undefined;
|
|
59
|
+
/** The folder on the server's disk uploads are kept in: the one its settings name, or `media` beside a database that is a file. */
|
|
60
|
+
export declare function folderFromEnv(databaseUrl: string, env?: Readonly<Record<string, string | undefined>>): FolderMediaStore | undefined;
|
|
52
61
|
//# sourceMappingURL=media-store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-store.d.ts","sourceRoot":"","sources":["../src/media-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAYvE,yFAAyF;AACzF,qBAAa,gBAAiB,YAAW,UAAU;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,MAAM;IAExC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAU5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzC;AAED,MAAM,WAAW,mBAAmB;IAClC,yHAAyH;IACzH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,6DAA6D;IAC7D,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,4CAA4C;IAC5C,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IACzC,uBAAuB;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAcD;;;;GAIG;AACH,qBAAa,YAAa,YAAW,UAAU;;gBAMjC,OAAO,EAAE,mBAAmB;IASlC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAQ5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkDzC;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAAG,UAAU,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"media-store.d.ts","sourceRoot":"","sources":["../src/media-store.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAYvE,yFAAyF;AACzF,qBAAa,gBAAiB,YAAW,UAAU;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,MAAM;IAExC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAU5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzC;AAED,MAAM,WAAW,mBAAmB;IAClC,yHAAyH;IACzH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,6DAA6D;IAC7D,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,4CAA4C;IAC5C,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IACzC,uBAAuB;IACvB,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAcD,sHAAsH;AACtH,qBAAa,mBAAoB,SAAQ,KAAK;IAE1C,QAAQ,CAAC,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM,EACvB,OAAO,EAAE,MAAM;CAIlB;AAED;;;;GAIG;AACH,qBAAa,YAAa,YAAW,UAAU;;gBAMjC,OAAO,EAAE,mBAAmB;IASlC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAQ5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAkDzC;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAAG,UAAU,GAAG,SAAS,CAE9I;AAED,2GAA2G;AAC3G,wBAAgB,aAAa,CAAC,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAAG,YAAY,GAAG,SAAS,CAiBvH;AAED,mIAAmI;AACnI,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAAG,gBAAgB,GAAG,SAAS,CAIhJ"}
|
package/dist/media-store.js
CHANGED
|
@@ -45,6 +45,14 @@ async function hmac(key, text) {
|
|
|
45
45
|
const imported = await crypto.subtle.importKey('raw', key, { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']);
|
|
46
46
|
return crypto.subtle.sign('HMAC', imported, encoder.encode(text));
|
|
47
47
|
}
|
|
48
|
+
/** The bucket answered and refused. `status` is its answer; the message holds its own words, for the server's log. */
|
|
49
|
+
export class StorageRefusedError extends Error {
|
|
50
|
+
status;
|
|
51
|
+
constructor(status, message) {
|
|
52
|
+
super(message);
|
|
53
|
+
this.status = status;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
48
56
|
/**
|
|
49
57
|
* Keeps uploads in a bucket that speaks the S3 protocol: Cloudflare R2, Amazon S3, Backblaze B2,
|
|
50
58
|
* MinIO and others. For a site on a host with no disk of its own. The bucket stays private: the
|
|
@@ -126,7 +134,7 @@ export class S3MediaStore {
|
|
|
126
134
|
/** What went wrong, in the storage service's words. It goes to the server's log, not to the person. */
|
|
127
135
|
async #failure(doing, key, response) {
|
|
128
136
|
const said = (await response.text().catch(() => '')).replace(/\s+/g, ' ').slice(0, 300);
|
|
129
|
-
return new
|
|
137
|
+
return new StorageRefusedError(response.status, `The storage bucket "${this.#options.bucket}" refused to ${doing} "${key}" (${response.status}). ${said}`.trim());
|
|
130
138
|
}
|
|
131
139
|
}
|
|
132
140
|
/**
|
|
@@ -140,6 +148,10 @@ export class S3MediaStore {
|
|
|
140
148
|
* - Neither, with a hosted database: nowhere, and the site takes no uploads.
|
|
141
149
|
*/
|
|
142
150
|
export function mediaStoreFromEnv(databaseUrl, env = process.env) {
|
|
151
|
+
return bucketFromEnv(env) ?? folderFromEnv(databaseUrl, env);
|
|
152
|
+
}
|
|
153
|
+
/** The bucket the server's own settings name, or none. Settings that name only part of one are refused. */
|
|
154
|
+
export function bucketFromEnv(env = process.env) {
|
|
143
155
|
const s3 = {
|
|
144
156
|
bucket: env.VELOCITY_CMS_S3_BUCKET,
|
|
145
157
|
endpoint: env.VELOCITY_CMS_S3_ENDPOINT,
|
|
@@ -153,6 +165,10 @@ export function mediaStoreFromEnv(databaseUrl, env = process.env) {
|
|
|
153
165
|
if (given > 0) {
|
|
154
166
|
throw new Error('Uploads are set up only in part. A bucket needs all four of VELOCITY_CMS_S3_BUCKET, VELOCITY_CMS_S3_ENDPOINT, VELOCITY_CMS_S3_ACCESS_KEY_ID and VELOCITY_CMS_S3_SECRET_ACCESS_KEY.');
|
|
155
167
|
}
|
|
168
|
+
return undefined;
|
|
169
|
+
}
|
|
170
|
+
/** The folder on the server's disk uploads are kept in: the one its settings name, or `media` beside a database that is a file. */
|
|
171
|
+
export function folderFromEnv(databaseUrl, env = process.env) {
|
|
156
172
|
if (env.VELOCITY_CMS_MEDIA_DIR)
|
|
157
173
|
return new FolderMediaStore(path.resolve(env.VELOCITY_CMS_MEDIA_DIR));
|
|
158
174
|
if (databaseUrl.startsWith('file:'))
|
package/dist/media-store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-store.js","sourceRoot":"","sources":["../src/media-store.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"media-store.js","sourceRoot":"","sources":["../src/media-store.ts"],"names":[],"mappings":"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"}
|
package/dist/resend-mailer.d.ts
CHANGED
|
@@ -16,6 +16,10 @@ export interface MailWords {
|
|
|
16
16
|
readonly noticeIntro?: (formName: string, siteName: string) => string;
|
|
17
17
|
readonly noticeSentFrom?: string;
|
|
18
18
|
readonly noticeReply?: string;
|
|
19
|
+
/** The email an owner asks for to see that the settings work. Left out, these are in English. */
|
|
20
|
+
readonly testSubject?: (siteName: string) => string;
|
|
21
|
+
readonly testGreeting?: (name: string) => string;
|
|
22
|
+
readonly testBody?: (siteName: string) => string;
|
|
19
23
|
}
|
|
20
24
|
export declare const englishMailWords: MailWords;
|
|
21
25
|
export interface ResendMailerOptions {
|
|
@@ -27,6 +31,17 @@ export interface ResendMailerOptions {
|
|
|
27
31
|
/** Defaults to the platform's own `fetch`. */
|
|
28
32
|
readonly fetch?: typeof globalThis.fetch;
|
|
29
33
|
}
|
|
34
|
+
/** A test email to send: to the person who asked for it. */
|
|
35
|
+
export interface TestMail {
|
|
36
|
+
readonly email: string;
|
|
37
|
+
readonly name: string;
|
|
38
|
+
readonly siteName: string;
|
|
39
|
+
}
|
|
40
|
+
/** The provider answered and refused. `status` is its answer; the message holds its own words, for the server's log. */
|
|
41
|
+
export declare class MailRefusedError extends Error {
|
|
42
|
+
readonly status: number;
|
|
43
|
+
constructor(status: number, detail: string);
|
|
44
|
+
}
|
|
30
45
|
/**
|
|
31
46
|
* Sends the CMS's emails through Resend, over plain HTTP: no SDK, so it runs wherever the site
|
|
32
47
|
* does. A site that uses another provider writes its own `Mailer` the same way.
|
|
@@ -36,11 +51,13 @@ export declare class ResendMailer implements Mailer, NoticeMailer {
|
|
|
36
51
|
constructor(options: ResendMailerOptions);
|
|
37
52
|
sendSignInLink(mail: SignInMail): Promise<void>;
|
|
38
53
|
sendInvitation(mail: InvitationMail): Promise<void>;
|
|
54
|
+
/** One email that says the settings work. It carries no link and no secret. */
|
|
55
|
+
sendTest(mail: TestMail): Promise<void>;
|
|
39
56
|
sendSubmissionNotice(mail: SubmissionNotice): Promise<void>;
|
|
40
57
|
}
|
|
41
58
|
/**
|
|
42
59
|
* The mailer a site gets from its settings alone: Resend when `VELOCITY_CMS_RESEND_API_KEY` and
|
|
43
60
|
* `VELOCITY_CMS_EMAIL_FROM` are both set, otherwise none.
|
|
44
61
|
*/
|
|
45
|
-
export declare function mailerFromEnv(env?: Readonly<Record<string, string | undefined
|
|
62
|
+
export declare function mailerFromEnv(env?: Readonly<Record<string, string | undefined>>, fetch?: typeof globalThis.fetch): ResendMailer | undefined;
|
|
46
63
|
//# sourceMappingURL=resend-mailer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resend-mailer.d.ts","sourceRoot":"","sources":["../src/resend-mailer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAErE,+EAA+E;AAC/E,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IACrD,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAClD,QAAQ,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;IACnE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IACzD,QAAQ,CAAC,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IACtD,QAAQ,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IACrE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,4EAA4E;IAC5E,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IACxE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IACtE,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"resend-mailer.d.ts","sourceRoot":"","sources":["../src/resend-mailer.ts"],"names":[],"mappings":"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"}
|
package/dist/resend-mailer.js
CHANGED
|
@@ -12,8 +12,24 @@ export const englishMailWords = {
|
|
|
12
12
|
noticeIntro: (formName, siteName) => `Someone filled in "${formName}" on ${siteName}.`,
|
|
13
13
|
noticeSentFrom: 'Sent from',
|
|
14
14
|
noticeReply: 'Reply to this email to answer them. The message is also kept in the CMS.',
|
|
15
|
+
testSubject: (siteName) => `Email works for ${siteName}`,
|
|
16
|
+
testGreeting: (name) => `Hi ${name},`,
|
|
17
|
+
testBody: (siteName) => `This is a test from ${siteName}. If you are reading it, sign-in links, invitations and notices from forms will arrive too.`,
|
|
15
18
|
};
|
|
19
|
+
/** The provider answered and refused. `status` is its answer; the message holds its own words, for the server's log. */
|
|
20
|
+
export class MailRefusedError extends Error {
|
|
21
|
+
status;
|
|
22
|
+
constructor(status, detail) {
|
|
23
|
+
super(`Resend refused an email (${status}). ${detail}`);
|
|
24
|
+
this.status = status;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
16
27
|
const escaped = (text) => text.replace(/[&<>"']/g, (character) => `&#${character.charCodeAt(0)};`);
|
|
28
|
+
/** Paragraphs and nothing else. */
|
|
29
|
+
function plain(...paragraphs) {
|
|
30
|
+
const html = `<div style="max-width:480px;margin:0 auto;padding:32px 16px">${paragraphs.map((words) => `<p style="margin:0 0 16px;font:16px/1.5 system-ui,sans-serif;color:#1a1a1a">${escaped(words)}</p>`).join('')}</div>`;
|
|
31
|
+
return { html, text: paragraphs.join('\n\n') };
|
|
32
|
+
}
|
|
17
33
|
/** One paragraph of greeting, one of explanation, one button, and the address in full under it. */
|
|
18
34
|
function layout(greeting, body, button, url, note) {
|
|
19
35
|
const paragraph = (words) => `<p style="margin:0 0 16px;font:16px/1.5 system-ui,sans-serif;color:#1a1a1a">${escaped(words)}</p>`;
|
|
@@ -48,6 +64,11 @@ export class ResendMailer {
|
|
|
48
64
|
const words = this.#words;
|
|
49
65
|
return this.#send(mail.email, words.invitationSubject(mail.siteName), layout(words.invitationGreeting(mail.name), words.invitationBody(mail.siteName, mail.email), words.invitationButton, mail.url));
|
|
50
66
|
}
|
|
67
|
+
/** One email that says the settings work. It carries no link and no secret. */
|
|
68
|
+
sendTest(mail) {
|
|
69
|
+
const words = { ...englishMailWords, ...this.#words };
|
|
70
|
+
return this.#send(mail.email, words.testSubject?.(mail.siteName) ?? mail.siteName, plain(words.testGreeting?.(mail.name) ?? '', words.testBody?.(mail.siteName) ?? ''));
|
|
71
|
+
}
|
|
51
72
|
sendSubmissionNotice(mail) {
|
|
52
73
|
const words = { ...englishMailWords, ...this.#words };
|
|
53
74
|
const intro = words.noticeIntro?.(mail.formName, mail.siteName) ?? '';
|
|
@@ -79,7 +100,7 @@ export class ResendMailer {
|
|
|
79
100
|
// The provider's own words go to the server's log through whoever catches this. The address
|
|
80
101
|
// is left out: a log is not the place for who works on a site.
|
|
81
102
|
const detail = (await response.text().catch(() => '')).slice(0, 300);
|
|
82
|
-
throw new
|
|
103
|
+
throw new MailRefusedError(response.status, detail);
|
|
83
104
|
}
|
|
84
105
|
}
|
|
85
106
|
}
|
|
@@ -87,9 +108,9 @@ export class ResendMailer {
|
|
|
87
108
|
* The mailer a site gets from its settings alone: Resend when `VELOCITY_CMS_RESEND_API_KEY` and
|
|
88
109
|
* `VELOCITY_CMS_EMAIL_FROM` are both set, otherwise none.
|
|
89
110
|
*/
|
|
90
|
-
export function mailerFromEnv(env = process.env) {
|
|
111
|
+
export function mailerFromEnv(env = process.env, fetch) {
|
|
91
112
|
const apiKey = env['VELOCITY_CMS_RESEND_API_KEY'];
|
|
92
113
|
const from = env['VELOCITY_CMS_EMAIL_FROM'];
|
|
93
|
-
return apiKey && from ? new ResendMailer({ apiKey, from }) : undefined;
|
|
114
|
+
return apiKey && from ? new ResendMailer({ apiKey, from, ...(fetch && { fetch }) }) : undefined;
|
|
94
115
|
}
|
|
95
116
|
//# sourceMappingURL=resend-mailer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resend-mailer.js","sourceRoot":"","sources":["../src/resend-mailer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resend-mailer.js","sourceRoot":"","sources":["../src/resend-mailer.ts"],"names":[],"mappings":"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"}
|
package/dist/site-editor.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Mailer } from '@velocity-astro/cms-auth';
|
|
2
|
-
import type
|
|
2
|
+
import { type ImageLibrary } from '@velocity-astro/cms-core';
|
|
3
3
|
import { EditorHost } from './editor.js';
|
|
4
4
|
/** What the integration tells the editor's routes about the site. */
|
|
5
5
|
export interface SiteEditorSettings {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-editor.d.ts","sourceRoot":"","sources":["../src/site-editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"site-editor.d.ts","sourceRoot":"","sources":["../src/site-editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAiB,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAa,MAAM,aAAa,CAAC;AAMpD,qEAAqE;AACrE,MAAM,WAAW,kBAAkB;IACjC,kDAAkD;IAClD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,mCAAmC;IACnC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,yFAAyF;IACzF,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,uFAAuF;IACvF,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CAC5C;AAED,iGAAiG;AACjG,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AAEjD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,KAAK,CAAC,GAAG,MAAM,CAezG;AAWD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,KAAK,CAAC,GAAG,MAAM,GAAG,IAAI,CAa/G;AAgDD,gFAAgF;AAChF,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,CAUlG;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,kBAAkB,EAC5B,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GACzD,OAAO,CAAC,QAAQ,CAAC,CAUnB"}
|
package/dist/site-editor.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { AuthSetupError } from '@velocity-astro/cms-auth';
|
|
2
|
+
import { ConflictError } from '@velocity-astro/cms-core';
|
|
2
3
|
import { sharedConnection } from './connection.js';
|
|
3
4
|
import { EditorHost, LogMailer } from './editor.js';
|
|
4
5
|
import { currentSite } from './hosted.js';
|
|
5
|
-
import {
|
|
6
|
+
import { SiteMail } from './site-mail.js';
|
|
7
|
+
import { siteNameNow } from './site-name.js';
|
|
6
8
|
import { siteSecret } from './secret.js';
|
|
7
9
|
/** The editor cannot be served until the site's settings are completed. The message says how. */
|
|
8
10
|
export class EditorNotSetUpError extends Error {
|
|
@@ -67,17 +69,37 @@ async function createHost(origin, settings) {
|
|
|
67
69
|
throw new EditorNotSetUpError('The editor is off because VELOCITY_CMS_SECRET is not set. Set it to at least 32 random characters, for example from `openssl rand -base64 32`.');
|
|
68
70
|
}
|
|
69
71
|
try {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
+
const connection = await sharedConnection({});
|
|
73
|
+
const hosted = currentSite();
|
|
74
|
+
// A host names its sites. Otherwise the name an owner saved, then the one the site's code gives.
|
|
75
|
+
const named = hosted ? undefined : () => siteNameNow(connection.cms);
|
|
76
|
+
const siteName = hosted?.name ?? (await named?.()) ?? settings.siteName;
|
|
77
|
+
// The site's own mailer first, then Resend from the server's settings, then what an owner set up in the editor, then the server's log.
|
|
78
|
+
const mail = new SiteMail({ settings: connection.cms.settings, own: settings.mailer, fallback: new LogMailer(), hosted: hosted !== undefined, ...(named && { siteName: named }) });
|
|
79
|
+
connection.cms.settings.useSite({ defaultName: hosted?.name ?? settings.siteName, fixedBy: hosted ? 'host' : null });
|
|
80
|
+
const host = new EditorHost({
|
|
81
|
+
connection,
|
|
72
82
|
secret,
|
|
73
83
|
origin,
|
|
74
|
-
siteName
|
|
84
|
+
siteName,
|
|
85
|
+
...(named && { siteNameNow: named }),
|
|
75
86
|
adminPath: settings.adminPath,
|
|
76
|
-
|
|
77
|
-
mailer: settings.mailer ?? mailerFromEnv() ?? new LogMailer(),
|
|
87
|
+
mailer: mail,
|
|
78
88
|
...(settings.images && { images: settings.images }),
|
|
79
89
|
onFault: (error) => console.error('[velocity-cms]', error),
|
|
80
90
|
});
|
|
91
|
+
connection.cms.settings.useMail({
|
|
92
|
+
fixedBy: () => mail.fixedBy(),
|
|
93
|
+
canTest: () => mail.canTest(),
|
|
94
|
+
// The test goes to the address the person signs in with, which only sign-in knows.
|
|
95
|
+
sendTest: async (actor) => {
|
|
96
|
+
const person = (await host.auth.listUsers(actor)).find((user) => user.id === actor.id);
|
|
97
|
+
if (!person)
|
|
98
|
+
throw new ConflictError('A test email goes to the person who asks for it, and only someone signed in has an address to send it to.');
|
|
99
|
+
await mail.sendTest({ email: person.email, name: person.name, siteName: hosted?.name ?? settings.siteName });
|
|
100
|
+
},
|
|
101
|
+
});
|
|
102
|
+
return host;
|
|
81
103
|
}
|
|
82
104
|
catch (error) {
|
|
83
105
|
if (error instanceof AuthSetupError)
|
package/dist/site-editor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-editor.js","sourceRoot":"","sources":["../src/site-editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAe,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"site-editor.js","sourceRoot":"","sources":["../src/site-editor.ts"],"names":[],"mappings":"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"}
|
package/dist/site-forms.d.ts
CHANGED
|
@@ -15,6 +15,17 @@ export interface SiteForm extends PublicForm {
|
|
|
15
15
|
* screen readers). A person leaves it alone; a script that fills in everything gives itself away.
|
|
16
16
|
*/
|
|
17
17
|
readonly trap: string;
|
|
18
|
+
/**
|
|
19
|
+
* The challenge a sender must pass, when an owner set one up. The form's script (`FORM_SCRIPT`)
|
|
20
|
+
* draws it where the form has a `[data-cms-form-challenge]`, or above the submit button. A
|
|
21
|
+
* site with a content security policy allows `host` for scripts and frames.
|
|
22
|
+
*/
|
|
23
|
+
readonly challenge?: {
|
|
24
|
+
readonly provider: 'turnstile';
|
|
25
|
+
readonly siteKey: string;
|
|
26
|
+
readonly script: string;
|
|
27
|
+
readonly host: string;
|
|
28
|
+
};
|
|
18
29
|
}
|
|
19
30
|
/** The address of the script that sends a form without leaving its page (`data-cms-form`). */
|
|
20
31
|
export declare const FORM_SCRIPT = "/cms-form.js";
|
package/dist/site-forms.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-forms.d.ts","sourceRoot":"","sources":["../src/site-forms.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,
|
|
1
|
+
{"version":3,"file":"site-forms.d.ts","sourceRoot":"","sources":["../src/site-forms.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAG3D,OAAO,EAAqH,SAAS,EAA2C,MAAM,gBAAgB,CAAC;AACvM,OAAO,EAAU,KAAK,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAOxD,OAAO,EAAgB,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAczE,wFAAwF;AACxF,wBAAgB,aAAa,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAC,CAgC9E;AAED,2FAA2F;AAC3F,MAAM,WAAW,QAAS,SAAQ,UAAU;IAC1C,wEAAwE;IACxE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,wEAAwE;IACxE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAClD;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE;QAAE,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACnI;AAED,8FAA8F;AAC9F,eAAO,MAAM,WAAW,iBAAiB,CAAC;AAE1C,oGAAoG;AACpG,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,mDAAmD;AACnD,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7F;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAE,eAAoB,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAgC3H"}
|
package/dist/site-forms.js
CHANGED
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { isLiveType } from '@velocity-astro/cms-core';
|
|
2
2
|
import { sharedConnection, SITE } from './connection.js';
|
|
3
|
-
import { FORM_ABOUT_FIELD, FORM_LOCALE_FIELD, FORM_PAGE_FIELD, FORM_TOKEN_FIELD, FORM_TRAP_FIELD, FormPosts, aboutMark, formToken } from './form-post.js';
|
|
3
|
+
import { FORM_ABOUT_FIELD, FORM_CHALLENGE_KEY_FIELD, FORM_LOCALE_FIELD, FORM_PAGE_FIELD, FORM_TOKEN_FIELD, FORM_TRAP_FIELD, FormPosts, MemoryRateLimiter, aboutMark, formToken } from './form-post.js';
|
|
4
4
|
import { pageAt } from './page-head.js';
|
|
5
5
|
import { currentSite, siteKey } from './hosted.js';
|
|
6
|
-
import {
|
|
6
|
+
import { LogMailer } from './editor.js';
|
|
7
|
+
import { SiteMail } from './site-mail.js';
|
|
8
|
+
import { siteNameNow } from './site-name.js';
|
|
9
|
+
import { SiteChallenge, TURNSTILE_HOST, TURNSTILE_SCRIPT } from './challenge.js';
|
|
7
10
|
import { siteSecret } from './secret.js';
|
|
8
11
|
import { editorOrigin } from './site-editor.js';
|
|
9
12
|
/** One taker of form posts for each site this server runs. */
|
|
10
13
|
const takers = new Map();
|
|
11
|
-
const takesNotices = (mailer) => typeof mailer === 'object' && mailer !== null && typeof mailer.sendSubmissionNotice === 'function';
|
|
12
14
|
/** The site's address for forms. A site that has not said its address yet is taken at the request's word. */
|
|
13
15
|
function originOf(request, settings) {
|
|
14
16
|
try {
|
|
@@ -23,19 +25,27 @@ export function siteFormPosts(settings) {
|
|
|
23
25
|
const key = siteKey();
|
|
24
26
|
let posts = takers.get(key);
|
|
25
27
|
if (!posts) {
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
28
|
+
const onFault = (error) => console.error('[velocity-cms]', error instanceof Error ? error.message : error);
|
|
29
|
+
const made = sharedConnection({}).then(({ cms }) => {
|
|
30
|
+
const challenge = new SiteChallenge({ account: () => cms.settings.challengeAccount(), onFault });
|
|
31
|
+
const counted = new MemoryRateLimiter();
|
|
32
|
+
return new FormPosts({
|
|
33
|
+
cms,
|
|
34
|
+
origin: (request) => originOf(request, settings),
|
|
35
|
+
siteName: currentSite()?.name ?? settings.siteName,
|
|
36
|
+
secret: siteSecret(),
|
|
37
|
+
entryAt: async (path) => {
|
|
38
|
+
const { type, entry } = await pageAt(cms, await cms.schema.list(), path);
|
|
39
|
+
return type && entry ? { typeId: type.id, entry: entry.translationGroup } : undefined;
|
|
40
|
+
},
|
|
41
|
+
// The site's own mailer when it sends notices, then Resend from the server's settings, then what an owner set up in the editor.
|
|
42
|
+
mailer: new SiteMail({ settings: cms.settings, own: settings.mailer, fallback: new LogMailer(), hosted: currentSite() !== undefined, ...(currentSite() === undefined && { siteName: () => siteNameNow(cms) }) }),
|
|
43
|
+
challenge,
|
|
44
|
+
// What an owner set under Settings, Forms and spam. Settings that cannot be read leave the limit the CMS comes with.
|
|
45
|
+
limiter: { take: async (address) => counted.take(address, await cms.settings.formPostsPerAddress().catch(() => undefined)) },
|
|
46
|
+
onFault,
|
|
47
|
+
});
|
|
48
|
+
});
|
|
39
49
|
posts = made;
|
|
40
50
|
takers.set(key, made);
|
|
41
51
|
made.catch(() => {
|
|
@@ -59,6 +69,7 @@ export async function siteForm(page, choice, options = {}) {
|
|
|
59
69
|
return null;
|
|
60
70
|
const token = await formToken(siteSecret(), form.key);
|
|
61
71
|
const locale = page.currentLocale;
|
|
72
|
+
const siteKey = await cms.settings.challengeSiteKey();
|
|
62
73
|
let about;
|
|
63
74
|
if (options.about) {
|
|
64
75
|
// An entry that is not there, or not published, leaves the form as one about nothing.
|
|
@@ -75,8 +86,10 @@ export async function siteForm(page, choice, options = {}) {
|
|
|
75
86
|
...(locale !== undefined && { [FORM_LOCALE_FIELD]: locale }),
|
|
76
87
|
...(token !== undefined && { [FORM_TOKEN_FIELD]: token }),
|
|
77
88
|
...(about !== undefined && { [FORM_ABOUT_FIELD]: about }),
|
|
89
|
+
...(siteKey !== null && { [FORM_CHALLENGE_KEY_FIELD]: siteKey }),
|
|
78
90
|
},
|
|
79
91
|
trap: FORM_TRAP_FIELD,
|
|
92
|
+
...(siteKey !== null && { challenge: { provider: 'turnstile', siteKey, script: TURNSTILE_SCRIPT, host: TURNSTILE_HOST } }),
|
|
80
93
|
};
|
|
81
94
|
}
|
|
82
95
|
catch (error) {
|
package/dist/site-forms.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site-forms.js","sourceRoot":"","sources":["../src/site-forms.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"site-forms.js","sourceRoot":"","sources":["../src/site-forms.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import type { InvitationMail, Mailer, SignInMail } from '@velocity-astro/cms-auth';
|
|
2
|
+
import { type Cms, type MailFixedBy } from '@velocity-astro/cms-core';
|
|
3
|
+
import type { NoticeMailer, SubmissionNotice } from './form-post.js';
|
|
4
|
+
import { type TestMail } from './resend-mailer.js';
|
|
5
|
+
export interface SiteMailOptions {
|
|
6
|
+
/** The site's settings, where an owner may have said how email is sent. */
|
|
7
|
+
readonly settings: Cms['settings'];
|
|
8
|
+
/** The site's own mailer, from its code (`velocityCms({ mailer })`). It wins over everything. */
|
|
9
|
+
readonly own?: Mailer | undefined;
|
|
10
|
+
/** What sign-in links go to when nothing sends email: the server's log. */
|
|
11
|
+
readonly fallback: Mailer;
|
|
12
|
+
/** What an owner called the site in the editor, or `null`. It is what an email calls the site, when there is one. */
|
|
13
|
+
readonly siteName?: () => Promise<string | null>;
|
|
14
|
+
/** Whether a host runs this site among many, so what is fixed is fixed by the host. */
|
|
15
|
+
readonly hosted?: boolean;
|
|
16
|
+
/** Defaults to the server's own environment. */
|
|
17
|
+
readonly env?: Readonly<Record<string, string | undefined>>;
|
|
18
|
+
/** Defaults to the platform's own `fetch`. */
|
|
19
|
+
readonly fetch?: typeof globalThis.fetch;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* How one site's email leaves, decided each time one is sent: the site's own mailer from its
|
|
23
|
+
* code, then Resend from the server's settings, then what an owner set up in the editor, and
|
|
24
|
+
* for sign-in links with none of the three, the server's log. The editor's settings are read
|
|
25
|
+
* from the database for every email, so every running copy follows a change at once, and the
|
|
26
|
+
* key is held only for as long as the email takes.
|
|
27
|
+
*/
|
|
28
|
+
export declare class SiteMail implements Mailer, NoticeMailer {
|
|
29
|
+
#private;
|
|
30
|
+
constructor(options: SiteMailOptions);
|
|
31
|
+
/** Who decides how email is sent when the editor's settings do not. */
|
|
32
|
+
fixedBy(): MailFixedBy | null;
|
|
33
|
+
sendSignInLink(mail: SignInMail): Promise<void>;
|
|
34
|
+
sendInvitation(mail: InvitationMail): Promise<void>;
|
|
35
|
+
/** A notice goes through the site's own mailer when it sends notices, and otherwise as the settings say. */
|
|
36
|
+
sendSubmissionNotice(mail: SubmissionNotice): Promise<void>;
|
|
37
|
+
/** Whether email is sent in a way that can send a test. */
|
|
38
|
+
canTest(): Promise<boolean>;
|
|
39
|
+
/**
|
|
40
|
+
* Sends the test. What the provider said goes nowhere but into the words for the owner who
|
|
41
|
+
* asked: which of the two things they typed to look at again.
|
|
42
|
+
*/
|
|
43
|
+
sendTest(mail: TestMail): Promise<void>;
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=site-mail.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"site-mail.d.ts","sourceRoot":"","sources":["../src/site-mail.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAiB,KAAK,GAAG,EAAE,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACrF,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAiD,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAElG,MAAM,WAAW,eAAe;IAC9B,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;IACnC,iGAAiG;IACjG,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,qHAAqH;IACrH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACjD,uFAAuF;IACvF,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,gDAAgD;IAChD,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAC5D,8CAA8C;IAC9C,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;CAC1C;AAQD;;;;;;GAMG;AACH,qBAAa,QAAS,YAAW,MAAM,EAAE,YAAY;;gBAGvC,OAAO,EAAE,eAAe;IAIpC,uEAAuE;IACvE,OAAO,IAAI,WAAW,GAAG,IAAI;IAKvB,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,cAAc,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzD,4GAA4G;IACtG,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjE,2DAA2D;IACrD,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAIjC;;;OAGG;IACG,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAyC9C"}
|