@easy-cms/core 0.7.0 → 0.8.0

package/dist/index.d.ts

@@ -1008,14 +1008,14 @@ declare class EasyCMS<C extends Config = Config> {
         };
     }>;
     /**
-     * Tries webhook deliveries that failed earlier and are due for another attempt. Failed
-     * deliveries are kept in the database, so they survive restarts.
+     * Tries webhook deliveries that are due for another attempt. Deliveries are kept in the
+     * database until they succeed, so they survive restarts.
      */
     retryWebhooks(now?: Date): Promise<{
         sent: number;
         failed: number;
     }>;
-    /** Failed webhook deliveries, stored in `webhook-deliveries`. */
+    /** Webhook deliveries until they succeed, stored in `webhook-deliveries`. */
     private webhookQueue;
     /**
      * Publishes or unpublishes documents whose scheduled time has come. Safe to call often, e.g.

package/dist/index.js

@@ -1044,6 +1044,8 @@ var Webhooks = class {
   fetcher;
   retryDelays;
   pending = /* @__PURE__ */ new Set();
+  /** Deliveries are saved one after another, so they are first sent in the order of events. */
+  saving = Promise.resolve();
   emit(event, target, doc) {
     if (this.hooks.length === 0) return;
     const payload = { event, ...target, doc, timestamp: (/* @__PURE__ */ new Date()).toISOString() };
@@ -1079,7 +1081,7 @@ var Webhooks = class {
         sent++;
         continue;
       }
-      const delay = QUEUE_DELAYS[attempts - this.retryDelays.length - 1];
+      const delay = QUEUE_DELAYS[Math.max(0, attempts - this.retryDelays.length - 1)];
       if (delay === void 0) failed++;
       await this.queue.update(id, {
         ...queued,
@@ -1100,37 +1102,43 @@ var Webhooks = class {
     const delivery = randomUUID2();
     const body = JSON.stringify(payload);
     const { event } = payload;
+    const entry = (attempts, nextAttemptAt, error) => ({
+      url: hook.url,
+      event,
+      body,
+      delivery,
+      attempts,
+      nextAttemptAt,
+      state: "pending",
+      error
+    });
+    const { queue } = this;
+    const saved = queue ? this.saving.then(() => queue.add(entry(0, later(/* @__PURE__ */ new Date(), CLAIM), null))) : Promise.resolve(void 0);
+    this.saving = saved.catch(() => {
+    });
     let queued;
+    try {
+      queued = await saved;
+    } catch (error) {
+      this.logger.error(`Could not save webhook delivery: ${error.message}`);
+    }
     for (let attempt = 0; ; attempt++) {
       const result = await this.attempt(hook, event, body, delivery);
       if (result.ok) {
         if (queued !== void 0) await this.queue?.remove(queued);
         return;
       }
-      const entry = (nextAttemptAt) => ({
-        url: hook.url,
-        event,
-        body,
-        delivery,
-        attempts: attempt + 1,
-        nextAttemptAt,
-        state: "pending",
-        error: result.error
-      });
       const delay = this.retryDelays[attempt];
       if (delay === void 0) {
-        if (!this.queue) return this.giveUp(hook, event, result.error, attempt + 1);
-        const next = entry(later(/* @__PURE__ */ new Date(), QUEUE_DELAYS[0]));
-        if (queued === void 0) await this.queue.add(next);
-        else await this.queue.update(queued, next);
+        if (queued === void 0 || !this.queue)
+          return this.giveUp(hook, event, result.error, attempt + 1);
+        const next = later(/* @__PURE__ */ new Date(), QUEUE_DELAYS[0]);
+        await this.queue.update(queued, entry(attempt + 1, next, result.error));
         this.logger.warn(
           `Webhook ${hook.url} failed for ${event} (${result.error}); will retry later`
         );
         return;
       }
-      if (this.queue && queued === void 0) {
-        queued = await this.queue.add(entry(later(/* @__PURE__ */ new Date(), CLAIM)));
-      }
       await new Promise((resolve3) => setTimeout(resolve3, delay));
     }
   }
@@ -2870,13 +2878,13 @@ var EasyCMS = class {
     return { ...scheduled, webhooks: await this.retryWebhooks(now) };
   }
   /**
-   * Tries webhook deliveries that failed earlier and are due for another attempt. Failed
-   * deliveries are kept in the database, so they survive restarts.
+   * Tries webhook deliveries that are due for another attempt. Deliveries are kept in the
+   * database until they succeed, so they survive restarts.
    */
   retryWebhooks(now = /* @__PURE__ */ new Date()) {
     return this.webhooks.retry(now);
   }
-  /** Failed webhook deliveries, stored in `webhook-deliveries`. */
+  /** Webhook deliveries until they succeed, stored in `webhook-deliveries`. */
   webhookQueue() {
     const collection2 = WEBHOOK_DELIVERIES;
     const toRow = (d, createdAt) => {

package/package.json

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