@easy-cms/core 0.29.0 → 0.31.0

package/dist/index.d.ts

@@ -245,6 +245,25 @@ interface EmailAdapter {
     send(message: EmailMessage & {
         readonly from: string;
     }): Promise<void>;
+    /**
+     * The settings in use, shown to admins on Settings → Email. Never return secrets: say whether
+     * a password is set, not what it is.
+     */
+    describe?(): readonly EmailSetting[];
+    /** Checks the connection without sending (Settings → Email); throws with the reason. */
+    verify?(): Promise<void>;
+}
+/** One setting an email adapter shows to admins (`describe()`). */
+interface EmailSetting {
+    /**
+     * `host`, `port`, `secure`, `user`, `password`, `from` and `delivery` (`log`: printed, not sent)
+     * are translated in the admin; others are shown as they are.
+     */
+    readonly key: string;
+    /** `null`: not set. */
+    readonly value: string | null;
+    /** Where it comes from, e.g. `SMTP_HOST` or `smtp({ host })`. */
+    readonly source?: string;
 }
 /** Prints emails to the log instead of sending them: for development and tests. */
 declare function consoleEmail(options?: {
@@ -1065,6 +1084,18 @@ declare class EasyCMS<C extends Config = Config> {
     })[]>;
     private pendingJobs;
     private removeJob;
+    /**
+     * @internal One attempt now for a saved webhook delivery or email (the admin's Retry): removed
+     * when it is sent, otherwise kept as failed with the new error.
+     */
+    retryDelivery(kind: 'webhook' | 'email', id: ID): Promise<{
+        ok: true;
+    } | {
+        ok: false;
+        error: string;
+    }>;
+    /** Removes webhook deliveries and emails that failed more than 30 days ago. */
+    private pruneFailedDeliveries;
     /** @internal */
     collection(slug: string): CollectionConfig;
     private global;
@@ -2027,6 +2058,67 @@ declare function applyPlugins(input: Config): Promise<Config>;
  */
 declare function resolveConfig(input: Config | ResolvedConfig): Promise<ResolvedConfig>;
 
+type DeliveryKind = 'webhook' | 'email';
+type DeliveryState = 'failed' | 'pending';
+interface DeliveryBase {
+    id: ID;
+    state: DeliveryState;
+    attempts: number;
+    /** The last attempt's error. */
+    error: string | null;
+    createdAt: string;
+    updatedAt: string;
+    /** When a pending one is tried again. */
+    nextAttemptAt: string;
+}
+/** A webhook delivery as the admin shows it (`GET <api>/admin/deliveries?kind=webhook`). */
+interface AdminWebhookDelivery extends DeliveryBase {
+    kind: 'webhook';
+    url: string;
+    event: string;
+    /** What changed: a document of a collection, or a global. */
+    collection?: string;
+    doc?: ID;
+    global?: string;
+    /** The JSON body as sent. */
+    body: string;
+}
+/** An email as the admin shows it: who to and the subject, not the content. */
+interface AdminEmailDelivery extends DeliveryBase {
+    kind: 'email';
+    to: string[];
+    subject: string;
+}
+type AdminDelivery = AdminWebhookDelivery | AdminEmailDelivery;
+interface AdminDeliveries {
+    docs: AdminDelivery[];
+    totalDocs: number;
+    page: number;
+    totalPages: number;
+    /** How many there are of each state, for the filter. */
+    counts: Record<DeliveryState, number>;
+}
+
+/** Settings → Email in the admin (`GET <api>/admin/email`). */
+interface AdminEmail {
+    /** An `email` adapter is set in the config. */
+    configured: boolean;
+    /** The adapter's name, e.g. `smtp`; `custom` when it has none. */
+    name: string | null;
+    /** The default sender. */
+    from: string | null;
+    /** What the adapter tells about itself (`describe()`), never secrets. */
+    settings: EmailSetting[];
+    /** The adapter can check its connection without sending (`verify()`). */
+    canVerify: boolean;
+}
+type EmailCheck = {
+    ok: true;
+} | {
+    ok: false;
+    error: string;
+};
+
 /**
  * Finds the file of an admin module (`admin.modules`): a package export or a path relative to
  * the project root. Looks from the project root first, then from the server's entry file
@@ -2170,6 +2262,11 @@ interface AdminSchema {
     modules: string[];
     /** Files can be uploaded from links (`upload.fromURL`). */
     uploadFromURL: boolean;
+    /** For admins: which saved deliveries the admin can show (webhooks, emails). */
+    deliveries?: {
+        webhook: boolean;
+        email: boolean;
+    };
     /** Pages this user may open (`admin.pages`). */
     pages: AdminPageRef[];
     /** Dashboard panels this user may see (`admin.dashboard`). */
@@ -2262,4 +2359,4 @@ declare function validateConfig(config: Config): ConfigIssue[];
 /** The version of `@easy-cms/core`, set when the package is built. */
 declare const VERSION: string;
 
-export { ADMIN_ICONS, API_KEYS, API_KEY_GLOBAL_OPERATIONS, API_KEY_OPERATIONS, type Access, type AccessArgs, type AccessOptions, type AdminAttention, type AdminBrand, type AdminCollection, type AdminComponent, type AdminComponentRef, type AdminConfig, type AdminField, type AdminGlobal, type AdminIcon, type AdminLocale, type AdminPage, type AdminPageRef, type AdminSchema, type AdminStatus, type AdminViewAccess, type AdminWidgetRef, type AfterChangeHook, type AfterDeleteHook, type AfterReadHook, type ApiKeyContext, type ApiKeyGlobalOperation, type ApiKeyOperation, type ApiKeyPermissions, type ArrayField, Auth, type AuthConfig, type AuthUser, BUILTIN_COLLECTIONS, type BeforeChangeHook, type BeforeDeleteHook, type BeforeValidateHook, type Block, type BlocksField, type BooleanField, type BuiltinApiKeysCollection, type BuiltinMediaCollection, type BuiltinUsersCollection, type BundleHints, CONFIG_FILE_NAMES, CSRF_COOKIE, CSRF_HEADER, type CliCommand, type CollectionAccess, type CollectionAdmin, type CollectionConfig, type CollectionDocument, type CollectionHooks, type CollectionListAdmin, type CollectionSlug, type Config, ConfigError, type ConfigIssue, type ContainerAdmin, type CopyProgress, type CopyResult, type CreateEasyCMSOptions, type CreateInput, type CreateMigrationResult, type CustomField, type CustomFieldTypes, DEFAULT_ADMIN_PATH, DEFAULT_API_PATH, DEFAULT_DEPTH, DEFAULT_MAX_FILE_SIZE, DEFAULT_MAX_VERSIONS, DEFAULT_PASSWORD_EMAILS, DEFAULT_TOKEN_EXPIRATION, type DashboardWidget, type Database, type DatabaseAdapter, type DatabaseInitArgs, type DatabaseTransfer, type DateField, type DepthOptions, type DocumentOf, EXTENSIONS, EasyCMS, EasyCMSError, type EmailAdapter, type EmailField, type EmailMessage, type Endpoint, type EndpointRequest, FIELD_TYPES, FIELD_TYPE_BASES, type Field, type FieldAccess, type FieldAccessFn, type FieldAdmin, type FieldError, type FieldType, type FieldTypeBase, type FieldTypeDefinition, type FieldTypeValidateContext, type FieldValidate, type FieldValidateContext, type FieldValue, type FieldsInput, type FieldsValue, type FilterOptions, type FilterOptionsArgs, type FindArgs, type FindOptions, ForbiddenError, type GlobalAccess, type GlobalConfig, type GlobalDocument, type GlobalHooks, type GlobalInput, type GlobalSlug, type GroupField, type ID, INTERNAL_COLLECTIONS, type ImageSize, type InferCollection, type InferGlobal, type JsonField, type Label, type LivePreview, type LoadConfigOptions, type LocalStorageOptions, type LocalizationConfig, type Logger, type LoginArgs, MAX_DEPTH, MEDIA, MIN_PASSWORD_LENGTH, MIN_SECRET_LENGTH, type MediaDocument, type MediaSize, type MigrationInfo, NotFoundError, type NumberField, type Operation, type PaginatedDocs, type PasswordEmail, type PasswordEmailArgs, type PasswordEmailFn, type PasswordLinkOptions, PayloadTooLargeError, type Plugin, type PluginInfo, type PluginTypes, type PreviewTarget, type PreviewURL, QueryError, type RawDocument, type ReadOptions, type RelationshipField, type ResolvedConfig, type RestHandler, type RestHandlerOptions, type RichTextDocument, type RichTextField, type Role, type RoutesConfig, SESSION_COOKIE, type ScheduledJob, SchemaError, type SchemaMode, type SelectField, type SelectOption, type Session, type SlugField, type SlugOf, type StorageAdapter, type StoredFile, type TextField, type TextareaField, TooManyRequestsError, type TypedPlugin, UnauthorizedError, type UpdateInput, type UpdateOptions, type UploadConfig, type UploadField, type UploadFromURLConfig, VERSION, ValidationError, type Version, type VersionSummary, type VersionsConfig, WEBHOOK_EVENTS, type WebhookConfig, type WebhookEvent, type WebhookPayload, type Where, type WhereOperators, anyone, applyDefaults, applyPlugins, configSignature, consoleEmail, consoleLogger, copyDatabase, createEasyCMS, createRestHandler, createRootEndpointHandler, defineConfig, defineFieldType, definePlugin, fillMissing, findConfigFile, generateSlugs, generateTypes, hasRows, hashPassword, imageDimensions, importConfig, isAdmin, isHasMany, isLoggedIn, keyAllows, loadConfig, localStorage, mergeForUpdate, mimeAllowed, mimeAllowedBy, parseId, populate, readCookie, resolveAdminModule, resolveConfig, rowFields, silentLogger, singularize, slugify, sniffMimeType, validateConfig, validateFields, verifyPassword };
+export { ADMIN_ICONS, API_KEYS, API_KEY_GLOBAL_OPERATIONS, API_KEY_OPERATIONS, type Access, type AccessArgs, type AccessOptions, type AdminAttention, type AdminBrand, type AdminCollection, type AdminComponent, type AdminComponentRef, type AdminConfig, type AdminDeliveries, type AdminDelivery, type AdminEmail, type AdminEmailDelivery, type AdminField, type AdminGlobal, type AdminIcon, type AdminLocale, type AdminPage, type AdminPageRef, type AdminSchema, type AdminStatus, type AdminViewAccess, type AdminWebhookDelivery, type AdminWidgetRef, type AfterChangeHook, type AfterDeleteHook, type AfterReadHook, type ApiKeyContext, type ApiKeyGlobalOperation, type ApiKeyOperation, type ApiKeyPermissions, type ArrayField, Auth, type AuthConfig, type AuthUser, BUILTIN_COLLECTIONS, type BeforeChangeHook, type BeforeDeleteHook, type BeforeValidateHook, type Block, type BlocksField, type BooleanField, type BuiltinApiKeysCollection, type BuiltinMediaCollection, type BuiltinUsersCollection, type BundleHints, CONFIG_FILE_NAMES, CSRF_COOKIE, CSRF_HEADER, type CliCommand, type CollectionAccess, type CollectionAdmin, type CollectionConfig, type CollectionDocument, type CollectionHooks, type CollectionListAdmin, type CollectionSlug, type Config, ConfigError, type ConfigIssue, type ContainerAdmin, type CopyProgress, type CopyResult, type CreateEasyCMSOptions, type CreateInput, type CreateMigrationResult, type CustomField, type CustomFieldTypes, DEFAULT_ADMIN_PATH, DEFAULT_API_PATH, DEFAULT_DEPTH, DEFAULT_MAX_FILE_SIZE, DEFAULT_MAX_VERSIONS, DEFAULT_PASSWORD_EMAILS, DEFAULT_TOKEN_EXPIRATION, type DashboardWidget, type Database, type DatabaseAdapter, type DatabaseInitArgs, type DatabaseTransfer, type DateField, type DeliveryKind, type DeliveryState, type DepthOptions, type DocumentOf, EXTENSIONS, EasyCMS, EasyCMSError, type EmailAdapter, type EmailCheck, type EmailField, type EmailMessage, type EmailSetting, type Endpoint, type EndpointRequest, FIELD_TYPES, FIELD_TYPE_BASES, type Field, type FieldAccess, type FieldAccessFn, type FieldAdmin, type FieldError, type FieldType, type FieldTypeBase, type FieldTypeDefinition, type FieldTypeValidateContext, type FieldValidate, type FieldValidateContext, type FieldValue, type FieldsInput, type FieldsValue, type FilterOptions, type FilterOptionsArgs, type FindArgs, type FindOptions, ForbiddenError, type GlobalAccess, type GlobalConfig, type GlobalDocument, type GlobalHooks, type GlobalInput, type GlobalSlug, type GroupField, type ID, INTERNAL_COLLECTIONS, type ImageSize, type InferCollection, type InferGlobal, type JsonField, type Label, type LivePreview, type LoadConfigOptions, type LocalStorageOptions, type LocalizationConfig, type Logger, type LoginArgs, MAX_DEPTH, MEDIA, MIN_PASSWORD_LENGTH, MIN_SECRET_LENGTH, type MediaDocument, type MediaSize, type MigrationInfo, NotFoundError, type NumberField, type Operation, type PaginatedDocs, type PasswordEmail, type PasswordEmailArgs, type PasswordEmailFn, type PasswordLinkOptions, PayloadTooLargeError, type Plugin, type PluginInfo, type PluginTypes, type PreviewTarget, type PreviewURL, QueryError, type RawDocument, type ReadOptions, type RelationshipField, type ResolvedConfig, type RestHandler, type RestHandlerOptions, type RichTextDocument, type RichTextField, type Role, type RoutesConfig, SESSION_COOKIE, type ScheduledJob, SchemaError, type SchemaMode, type SelectField, type SelectOption, type Session, type SlugField, type SlugOf, type StorageAdapter, type StoredFile, type TextField, type TextareaField, TooManyRequestsError, type TypedPlugin, UnauthorizedError, type UpdateInput, type UpdateOptions, type UploadConfig, type UploadField, type UploadFromURLConfig, VERSION, ValidationError, type Version, type VersionSummary, type VersionsConfig, WEBHOOK_EVENTS, type WebhookConfig, type WebhookEvent, type WebhookPayload, type Where, type WhereOperators, anyone, applyDefaults, applyPlugins, configSignature, consoleEmail, consoleLogger, copyDatabase, createEasyCMS, createRestHandler, createRootEndpointHandler, defineConfig, defineFieldType, definePlugin, fillMissing, findConfigFile, generateSlugs, generateTypes, hasRows, hashPassword, imageDimensions, importConfig, isAdmin, isHasMany, isLoggedIn, keyAllows, loadConfig, localStorage, mergeForUpdate, mimeAllowed, mimeAllowedBy, parseId, populate, readCookie, resolveAdminModule, resolveConfig, rowFields, silentLogger, singularize, slugify, sniffMimeType, validateConfig, validateFields, verifyPassword };

package/dist/index.js

@@ -150,8 +150,8 @@ ${lines.join("\n")}`;
 };
 var EasyCMSError = class extends Error {
   status;
-  constructor(message, status) {
-    super(message);
+  constructor(message2, status) {
+    super(message2);
     this.name = "EasyCMSError";
     this.status = status;
   }
@@ -172,38 +172,38 @@ var NotFoundError = class extends EasyCMSError {
   }
 };
 var QueryError = class extends EasyCMSError {
-  constructor(message) {
-    super(message, 400);
+  constructor(message2) {
+    super(message2, 400);
     this.name = "QueryError";
   }
 };
 var SchemaError = class extends EasyCMSError {
-  constructor(message) {
-    super(message, 500);
+  constructor(message2) {
+    super(message2, 500);
     this.name = "SchemaError";
   }
 };
 var UnauthorizedError = class extends EasyCMSError {
-  constructor(message = "You must be logged in") {
-    super(message, 401);
+  constructor(message2 = "You must be logged in") {
+    super(message2, 401);
     this.name = "UnauthorizedError";
   }
 };
 var ForbiddenError = class extends EasyCMSError {
-  constructor(message = "You are not allowed to do this") {
-    super(message, 403);
+  constructor(message2 = "You are not allowed to do this") {
+    super(message2, 403);
     this.name = "ForbiddenError";
   }
 };
 var TooManyRequestsError = class extends EasyCMSError {
-  constructor(message) {
-    super(message, 429);
+  constructor(message2) {
+    super(message2, 429);
     this.name = "TooManyRequestsError";
   }
 };
 var PayloadTooLargeError = class extends EasyCMSError {
-  constructor(message) {
-    super(message, 413);
+  constructor(message2) {
+    super(message2, 413);
     this.name = "PayloadTooLargeError";
   }
 };
@@ -1331,7 +1331,7 @@ async function validateFields(fields, input, options, prefix = "") {
   for (const field of fields) {
     const path = prefix + field.name;
     const raw = input[field.name];
-    const fail = (message) => errors.push({ field: path, message });
+    const fail = (message2) => errors.push({ field: path, message: message2 });
     if (field.type === "group") {
       if (!isEmpty(raw) && !isPlainObject(raw)) {
         fail("must be an object");
@@ -1360,7 +1360,7 @@ async function validateFields(fields, input, options, prefix = "") {
       for (const locale of localization.locales) {
         const own = locale === written;
         const localePath = own ? path : `${path}.${locale}`;
-        const failLocale = (message) => errors.push({ field: localePath, message });
+        const failLocale = (message2) => errors.push({ field: localePath, message: message2 });
         const value2 = map[locale];
         if (isEmpty(value2) || Array.isArray(value2) && value2.length === 0) {
           if (own && field.required && !options.skipRequired) failLocale("is required");
@@ -1543,17 +1543,19 @@ function consoleEmail(options = {}) {
   const sent = [];
   const adapter = {
     name: "console",
+    // `log`: the admin says it prints to the server log instead of sending.
+    describe: () => [{ key: "delivery", value: "log" }],
     from: options.from ?? "Easy CMS <no-reply@localhost>",
     sent,
-    async send(message) {
-      sent.push(message);
+    async send(message2) {
+      sent.push(message2);
       const list = (value) => value === void 0 ? void 0 : typeof value === "string" ? value : value.join(", ");
       const lines = [
-        `Email to ${list(message.to)}${message.cc ? `, cc ${list(message.cc)}` : ""}`,
-        `From: ${message.from}${message.replyTo ? ` (reply to ${message.replyTo})` : ""}`,
-        `Subject: ${message.subject}`,
+        `Email to ${list(message2.to)}${message2.cc ? `, cc ${list(message2.cc)}` : ""}`,
+        `From: ${message2.from}${message2.replyTo ? ` (reply to ${message2.replyTo})` : ""}`,
+        `Subject: ${message2.subject}`,
         "",
-        message.text ?? message.html ?? ""
+        message2.text ?? message2.html ?? ""
       ];
       (options.log ?? console.log)(lines.join("\n"));
     }
@@ -1581,14 +1583,14 @@ var Mailer = class {
    * for the sending too. Without an `email` adapter in the config, the email is skipped with a
    * warning.
    */
-  async send(message) {
+  async send(message2) {
     if (!this.adapter) {
       this.logger.warn(
-        `Email "${message.subject}" not sent: set \`email\` in the config (e.g. consoleEmail() in development)`
+        `Email "${message2.subject}" not sent: set \`email\` in the config (e.g. consoleEmail() in development)`
       );
       return;
     }
-    const body = JSON.stringify(message);
+    const body = JSON.stringify(message2);
     let id;
     try {
       id = await this.queue?.add({
@@ -1601,7 +1603,7 @@ var Mailer = class {
     } catch (error) {
       this.logger.error(`Could not save email: ${error.message}`);
     }
-    this.track(this.deliver(message, body, id));
+    this.track(this.deliver(message2, body, id));
   }
   /** Waits for emails being sent, e.g. before a serverless function returns. */
   async flush() {
@@ -1636,21 +1638,26 @@ var Mailer = class {
     }
     return { sent, failed };
   }
+  /** One attempt now for a saved email (the admin's Retry): `undefined` when sent, else the error. */
+  async sendNow(message2) {
+    if (!this.adapter) return "email is not set up (`email` in the config)";
+    return this.attempt(JSON.parse(message2));
+  }
   track(delivery) {
     const tracked = delivery.catch((error) => this.logger.error(`Email queue failed: ${error.message}`)).finally(() => this.pending.delete(tracked));
     this.pending.add(tracked);
   }
-  async deliver(message, body, id) {
-    const error = await this.attempt(message);
+  async deliver(message2, body, id) {
+    const error = await this.attempt(message2);
     if (!error) {
       if (id !== void 0) await this.queue?.remove(id);
       return;
     }
     if (id === void 0 || !this.queue) {
-      this.logger.error(`Email "${message.subject}" failed: ${error}`);
+      this.logger.error(`Email "${message2.subject}" failed: ${error}`);
       return;
     }
-    this.logger.warn(`Email "${message.subject}" failed, retrying later: ${error}`);
+    this.logger.warn(`Email "${message2.subject}" failed, retrying later: ${error}`);
     await this.queue.update(id, {
       message: body,
       attempts: 1,
@@ -1660,12 +1667,12 @@ var Mailer = class {
     });
   }
   /** `undefined` when sent, else the error. */
-  async attempt(message) {
+  async attempt(message2) {
     const adapter = this.adapter;
-    const from = message.from ?? adapter.from;
+    const from = message2.from ?? adapter.from;
     if (!from) return "no sender: set `from` on the message or the email adapter";
     try {
-      await adapter.send({ ...message, from });
+      await adapter.send({ ...message2, from });
       return void 0;
     } catch (error) {
       return error.message || String(error);
@@ -1876,6 +1883,15 @@ var Webhooks = class {
     }
     return { sent, failed };
   }
+  /**
+   * One attempt now for a saved delivery (the admin's Retry), with the webhook's current headers
+   * and secret.
+   */
+  async sendNow(delivery) {
+    const hook = this.hooks.find((h) => h.url === delivery.url);
+    if (!hook) return { ok: false, error: "this webhook is no longer in the config" };
+    return this.attempt(hook, delivery.event, delivery.body, delivery.delivery);
+  }
   track(delivery) {
     const tracked = delivery.catch((error) => this.logger.error(`Webhook queue failed: ${error.message}`)).finally(() => this.pending.delete(tracked));
     this.pending.add(tracked);
@@ -1988,7 +2004,7 @@ var SLUG_PATTERN = /^[a-z][a-z0-9_-]*$/;
 var FIELD_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 function validateConfig(config) {
   const issues = [];
-  const add = (path, message, hint) => issues.push(hint ? { path, message, hint } : { path, message });
+  const add = (path, message2, hint) => issues.push(hint ? { path, message: message2, hint } : { path, message: message2 });
   if (typeof config !== "object" || config === null) {
     add("config", "must be an object", "export default defineConfig({ ... })");
     return issues;
@@ -3053,9 +3069,9 @@ function localizeSort(fields, sort, locale, locales = []) {
 
 // src/logger.ts
 var consoleLogger = {
-  info: (message) => console.info(`[easy-cms] ${message}`),
-  warn: (message) => console.warn(`[easy-cms] ${message}`),
-  error: (message) => console.error(`[easy-cms] ${message}`)
+  info: (message2) => console.info(`[easy-cms] ${message2}`),
+  warn: (message2) => console.warn(`[easy-cms] ${message2}`),
+  error: (message2) => console.error(`[easy-cms] ${message2}`)
 };
 var silentLogger = { info() {
 }, warn() {
@@ -3234,8 +3250,8 @@ import { BlockList, isIP } from "net";
 var RemoteFileError = class extends Error {
   /** `413` when the file is too large, otherwise `400`. */
   status;
-  constructor(message, status = 400) {
-    super(message);
+  constructor(message2, status = 400) {
+    super(message2);
     this.name = "RemoteFileError";
     this.status = status;
   }
@@ -4356,8 +4372,8 @@ var EasyCMS = class {
    * the email is queued; it is sent in the background and retried from the queue if sending
    * fails. Without `email` in the config, the email is skipped with a warning.
    */
-  sendEmail(message) {
-    return this.mailer.send(message);
+  sendEmail(message2) {
+    return this.mailer.send(message2);
   }
   /** Waits for emails being sent, e.g. before a serverless function returns. */
   flushEmails() {
@@ -4425,6 +4441,7 @@ var EasyCMS = class {
    */
   async runJobs(now = /* @__PURE__ */ new Date()) {
     const scheduled = await this.runScheduled(now);
+    await this.pruneFailedDeliveries(now);
     return {
       ...scheduled,
       webhooks: await this.retryWebhooks(now),
@@ -4515,12 +4532,12 @@ var EasyCMS = class {
         });
       } catch (error) {
         failed++;
-        const message = error.message;
-        this.logger.error(`Scheduled ${action} of ${parent} ${row.doc} failed: ${message}`);
+        const message2 = error.message;
+        this.logger.error(`Scheduled ${action} of ${parent} ${row.doc} failed: ${message2}`);
         await this.db.update({
           collection: SCHEDULED_JOBS,
           id: row.id,
-          data: { ...row, state: "failed", error: message.slice(0, 500) }
+          data: { ...row, state: "failed", error: message2.slice(0, 500) }
         });
       }
     }
@@ -4653,6 +4670,51 @@ var EasyCMS = class {
     if (!job) throw new NotFoundError("scheduled job", jobId);
     await this.db.delete({ collection: SCHEDULED_JOBS, id: job.id });
   }
+  /**
+   * @internal One attempt now for a saved webhook delivery or email (the admin's Retry): removed
+   * when it is sent, otherwise kept as failed with the new error.
+   */
+  async retryDelivery(kind, id) {
+    const collection2 = kind === "webhook" ? WEBHOOK_DELIVERIES : EMAIL_DELIVERIES;
+    const row = await this.db.findById({ collection: collection2, id });
+    if (!row) throw new NotFoundError(collection2, id);
+    const error = kind === "webhook" ? await this.webhooks.sendNow(row).then((result) => result.ok ? void 0 : result.error) : await this.mailer.sendNow(String(row.message));
+    if (error === void 0) {
+      await this.db.delete({ collection: collection2, id });
+      return { ok: true };
+    }
+    const { id: _id, ...data } = row;
+    await this.db.update({
+      collection: collection2,
+      id,
+      data: {
+        ...data,
+        attempts: Number(row.attempts ?? 0) + 1,
+        state: "failed",
+        error,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      }
+    });
+    return { ok: false, error };
+  }
+  /** Removes webhook deliveries and emails that failed more than 30 days ago. */
+  async pruneFailedDeliveries(now) {
+    const before = new Date(now.getTime() - 30 * 864e5).toISOString();
+    for (const collection2 of [WEBHOOK_DELIVERIES, EMAIL_DELIVERIES]) {
+      if (!this.config.collections.some((c) => c.slug === collection2)) continue;
+      for (; ; ) {
+        const { docs } = await this.db.find({
+          collection: collection2,
+          where: { and: [{ state: { equals: "failed" } }, { updatedAt: { lt: before } }] },
+          sort: ["updatedAt"],
+          limit: 100,
+          page: 1
+        });
+        for (const doc of docs) await this.db.delete({ collection: collection2, id: doc.id });
+        if (docs.length < 100) break;
+      }
+    }
+  }
   // -------------------------------------------------------------------------
   /** @internal */
   collection(slug) {
@@ -5204,6 +5266,199 @@ async function readAdminModule(cms, index) {
   return { body, etag: `"${createHash3("sha1").update(body).digest("base64url")}"` };
 }
 
+// src/rest/admin-deliveries.ts
+var PER_PAGE = 50;
+var collectionOf = (kind) => kind === "webhook" ? WEBHOOK_DELIVERIES : EMAIL_DELIVERIES;
+var exists = (cms, kind) => cms.config.collections.some((c) => c.slug === collectionOf(kind));
+var isDeliveryKind = (value) => value === "webhook" || value === "email";
+function parse(text) {
+  try {
+    const value = JSON.parse(String(text ?? ""));
+    return typeof value === "object" && value !== null ? value : {};
+  } catch {
+    return {};
+  }
+}
+function toAdmin(kind, row) {
+  const base = {
+    id: row.id,
+    state: row.state === "failed" ? "failed" : "pending",
+    attempts: Number(row.attempts ?? 0),
+    error: typeof row.error === "string" ? row.error : null,
+    createdAt: String(row.createdAt ?? ""),
+    updatedAt: String(row.updatedAt ?? ""),
+    nextAttemptAt: String(row.nextAttemptAt ?? "")
+  };
+  if (kind === "webhook") {
+    const payload = parse(row.body);
+    return {
+      ...base,
+      kind,
+      url: String(row.url ?? ""),
+      event: String(row.event ?? ""),
+      ...typeof payload.collection === "string" ? { collection: payload.collection } : {},
+      ...typeof payload.id === "string" || typeof payload.id === "number" ? { doc: payload.id } : {},
+      ...typeof payload.global === "string" ? { global: payload.global } : {},
+      body: String(row.body ?? "")
+    };
+  }
+  const message2 = parse(row.message);
+  const to = message2.to;
+  return {
+    ...base,
+    kind,
+    to: Array.isArray(to) ? to.map(String) : typeof to === "string" ? [to] : [],
+    subject: String(message2.subject ?? "")
+  };
+}
+async function listDeliveries(cms, kind, state, page) {
+  if (!exists(cms, kind))
+    return { docs: [], totalDocs: 0, page: 1, totalPages: 0, counts: { failed: 0, pending: 0 } };
+  const collection2 = collectionOf(kind);
+  const [found, failed, pending] = await Promise.all([
+    cms.db.find({
+      collection: collection2,
+      where: { state: { equals: state } },
+      sort: ["-updatedAt"],
+      limit: PER_PAGE,
+      page
+    }),
+    cms.db.count({ collection: collection2, where: { state: { equals: "failed" } } }),
+    cms.db.count({ collection: collection2, where: { state: { equals: "pending" } } })
+  ]);
+  return {
+    docs: found.docs.map((row) => toAdmin(kind, row)),
+    totalDocs: found.totalDocs,
+    page: found.page,
+    totalPages: found.totalPages,
+    counts: { failed, pending }
+  };
+}
+async function retryFailedDeliveries(cms, kind) {
+  if (!exists(cms, kind)) return { sent: 0, failed: 0 };
+  const collection2 = collectionOf(kind);
+  const ids = [];
+  for (let page = 1; ; page++) {
+    const { docs, hasNextPage } = await cms.db.find({
+      collection: collection2,
+      where: { state: { equals: "failed" } },
+      sort: ["updatedAt"],
+      limit: 500,
+      page
+    });
+    ids.push(...docs.map((row) => row.id));
+    if (!hasNextPage) break;
+  }
+  let sent = 0;
+  let failed = 0;
+  for (const id of ids) {
+    const result = await cms.retryDelivery(kind, id);
+    if (result.ok) sent++;
+    else failed++;
+  }
+  return { sent, failed };
+}
+async function deleteDelivery(cms, kind, id) {
+  const collection2 = collectionOf(kind);
+  if (!exists(cms, kind) || !await cms.db.findById({ collection: collection2, id }))
+    throw new NotFoundError(collection2, id);
+  await cms.db.delete({ collection: collection2, id });
+}
+async function deleteFailedDeliveries(cms, kind) {
+  if (!exists(cms, kind)) return { deleted: 0 };
+  const collection2 = collectionOf(kind);
+  let deleted = 0;
+  for (; ; ) {
+    const { docs } = await cms.db.find({
+      collection: collection2,
+      where: { state: { equals: "failed" } },
+      sort: ["updatedAt"],
+      limit: 100,
+      page: 1
+    });
+    for (const row of docs) await cms.db.delete({ collection: collection2, id: row.id });
+    deleted += docs.length;
+    if (docs.length < 100) break;
+  }
+  return { deleted };
+}
+
+// src/rest/admin-email.ts
+var EMAIL = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+var LIMIT = 5;
+var WINDOW = 10 * 6e4;
+var sentAt = /* @__PURE__ */ new WeakMap();
+var message = (error) => error instanceof Error ? error.message || error.name : String(error);
+function adminEmail(cms) {
+  const adapter = cms.config.email;
+  if (!adapter) return { configured: false, name: null, from: null, settings: [], canVerify: false };
+  let settings = [];
+  try {
+    settings = [...adapter.describe?.() ?? []].map((s) => ({
+      key: String(s.key),
+      value: s.value === null || s.value === void 0 ? null : String(s.value),
+      ...s.source ? { source: String(s.source) } : {}
+    }));
+  } catch {
+  }
+  return {
+    configured: true,
+    name: adapter.name ?? "custom",
+    from: adapter.from ?? null,
+    settings,
+    canVerify: typeof adapter.verify === "function"
+  };
+}
+async function verifyEmail(cms) {
+  const adapter = cms.config.email;
+  if (!adapter?.verify)
+    return { ok: false, error: "This email adapter cannot check its connection" };
+  try {
+    await adapter.verify();
+    return { ok: true };
+  } catch (error) {
+    return { ok: false, error: message(error) };
+  }
+}
+async function sendTestEmail(cms, user, to, locale) {
+  const adapter = cms.config.email;
+  if (!adapter) return { ok: false, error: "Email is not set up (`email` in the config)" };
+  const address = typeof to === "string" && to.trim() ? to.trim() : user.email;
+  if (!EMAIL.test(address))
+    throw new ValidationError("email", [{ field: "to", message: "must be an email address" }]);
+  const times = sentAt.get(cms) ?? /* @__PURE__ */ new Map();
+  sentAt.set(cms, times);
+  const key2 = String(user.id);
+  const now = Date.now();
+  const recent = (times.get(key2) ?? []).filter((t) => now - t < WINDOW);
+  if (recent.length >= LIMIT)
+    throw new TooManyRequestsError("Too many test emails: try again in a few minutes");
+  times.set(key2, [...recent, now]);
+  const from = adapter.from;
+  if (!from) return { ok: false, error: "No sender: set `from` on the email adapter" };
+  const site = cms.config.admin.brand.name || "Easy CMS";
+  const th = locale === "th" || locale !== "en" && cms.config.admin.locale === "th";
+  const time = (/* @__PURE__ */ new Date()).toISOString();
+  const subject = th ? `\u0E2D\u0E35\u0E40\u0E21\u0E25\u0E17\u0E14\u0E2A\u0E2D\u0E1A\u0E08\u0E32\u0E01 ${site}` : `Test email from ${site}`;
+  const text = th ? `\u0E2D\u0E35\u0E40\u0E21\u0E25\u0E19\u0E35\u0E49\u0E2A\u0E48\u0E07\u0E08\u0E32\u0E01\u0E2B\u0E19\u0E49\u0E32 \u0E15\u0E31\u0E49\u0E07\u0E04\u0E48\u0E32 \u2192 \u0E2D\u0E35\u0E40\u0E21\u0E25 \u0E02\u0E2D\u0E07 ${site} \u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E17\u0E14\u0E2A\u0E2D\u0E1A\u0E01\u0E32\u0E23\u0E15\u0E31\u0E49\u0E07\u0E04\u0E48\u0E32
+
+\u0E2A\u0E48\u0E07\u0E42\u0E14\u0E22: ${user.email}
+Adapter: ${adapter.name ?? "custom"}
+\u0E1C\u0E39\u0E49\u0E2A\u0E48\u0E07: ${from}
+\u0E40\u0E27\u0E25\u0E32: ${time}` : `This email was sent from Settings \u2192 Email in ${site} to test the settings.
+
+Sent by: ${user.email}
+Adapter: ${adapter.name ?? "custom"}
+From: ${from}
+Time: ${time}`;
+  try {
+    await adapter.send({ to: address, subject, text, from });
+    return { ok: true };
+  } catch (error) {
+    return { ok: false, error: message(error) };
+  }
+}
+
 // src/rest/admin-schema.ts
 var SETTINGS = /* @__PURE__ */ new Set([USERS, API_KEYS]);
 function componentRef(component) {
@@ -5355,6 +5610,12 @@ async function adminSchema(cms, user, origin) {
     globals: await Promise.all(cms.config.globals.map((g) => global(g, user, localized))),
     modules: adminModuleUrls(cms),
     uploadFromURL: cms.config.upload.fromURL !== void 0,
+    ...user.role === "admin" && !user.apiKey ? {
+      deliveries: {
+        webhook: cms.config.collections.some((c) => c.slug === WEBHOOK_DELIVERIES),
+        email: cms.config.collections.some((c) => c.slug === EMAIL_DELIVERIES)
+      }
+    } : {},
     pages: await pages(cms, user),
     dashboard: await widgets(cms, user)
   };
@@ -5391,7 +5652,7 @@ async function widgets(cms, user) {
 }
 
 // src/version.ts
-var VERSION = true ? "0.29.0" : "0.0.0-dev";
+var VERSION = true ? "0.31.0" : "0.0.0-dev";
 
 // src/rest/admin-status.ts
 var DAY = 864e5;
@@ -5831,6 +6092,55 @@ async function route(cms, ctx, method, segments, options) {
     }
     return { body: await cms.runJobs() };
   }
+  if (first === "admin" && second === "email") {
+    if (!ctx.user) throw new UnauthorizedError();
+    if (ctx.user.role !== "admin" || ctx.user.apiKey) throw new ForbiddenError();
+    const [, , action, extra] = segments;
+    if (extra !== void 0) throw new HttpError("Not found", 404);
+    if (action === void 0) {
+      if (method !== "GET") throw methodNotAllowed(ctx, "GET");
+      return { body: adminEmail(cms) };
+    }
+    if (method !== "POST") throw methodNotAllowed(ctx, "POST");
+    if (action === "verify") return { body: await verifyEmail(cms) };
+    if (action === "test") {
+      const body = await readJson(ctx.request);
+      return { body: await sendTestEmail(cms, ctx.user, body.to, body.locale) };
+    }
+    throw new HttpError("Not found", 404);
+  }
+  if (first === "admin" && second === "deliveries") {
+    if (!ctx.user) throw new UnauthorizedError();
+    if (ctx.user.role !== "admin" || ctx.user.apiKey) throw new ForbiddenError();
+    const [, , kind, id2, action, extra] = segments;
+    if (kind === void 0) {
+      if (method !== "GET") throw methodNotAllowed(ctx, "GET");
+      const k = ctx.url.searchParams.get("kind") ?? "webhook";
+      const state = ctx.url.searchParams.get("state") === "pending" ? "pending" : "failed";
+      if (!isDeliveryKind(k)) throw new HttpError("kind must be webhook or email", 400);
+      const page = Math.max(1, Number.parseInt(ctx.url.searchParams.get("page") ?? "1", 10) || 1);
+      return { body: await listDeliveries(cms, k, state, page) };
+    }
+    if (!isDeliveryKind(kind) || extra !== void 0) throw new HttpError("Not found", 404);
+    if (id2 === "retry" && action === void 0) {
+      if (method !== "POST") throw methodNotAllowed(ctx, "POST");
+      return { body: await retryFailedDeliveries(cms, kind) };
+    }
+    if (id2 === void 0) {
+      if (method !== "DELETE") throw methodNotAllowed(ctx, "DELETE");
+      return { body: await deleteFailedDeliveries(cms, kind) };
+    }
+    const parsed = parseId(id2);
+    if (parsed === void 0) throw new HttpError("Not found", 404);
+    if (action === "retry") {
+      if (method !== "POST") throw methodNotAllowed(ctx, "POST");
+      return { body: await cms.retryDelivery(kind, parsed) };
+    }
+    if (action !== void 0) throw new HttpError("Not found", 404);
+    if (method !== "DELETE") throw methodNotAllowed(ctx, "DELETE");
+    await deleteDelivery(cms, kind, parsed);
+    return { body: { deleted: 1 } };
+  }
   if (first === "admin") {
     if (method !== "GET") throw methodNotAllowed(ctx, "GET");
     if (!ctx.user) throw new UnauthorizedError();
@@ -6256,11 +6566,11 @@ function errorResponse(cms, error, headers, production) {
     if (error instanceof UnauthorizedError) headers.set("www-authenticate", "Bearer");
     return new Response(JSON.stringify({ errors }), { status: error.status, headers });
   }
-  const message = error instanceof Error ? error.message : String(error);
+  const message2 = error instanceof Error ? error.message : String(error);
   cms.logger.error(
-    `REST request failed: ${error instanceof Error ? error.stack ?? message : message}`
+    `REST request failed: ${error instanceof Error ? error.stack ?? message2 : message2}`
   );
-  const body = { errors: [{ message: production ? "Internal Server Error" : message }] };
+  const body = { errors: [{ message: production ? "Internal Server Error" : message2 }] };
   return new Response(JSON.stringify(body), { status: 500, headers });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/core",
-  "version": "0.29.0",
+  "version": "0.31.0",
   "description": "Embedded, code-first headless CMS for Nuxt and Next.js",
   "license": "MIT",
   "type": "module",