@beechcms/api 0.6.2 → 0.6.4

package/dist/index.js

@@ -861,9 +861,15 @@ async function updateHandler(context) {
 // src/shared/storage/upload.ts
 async function deleteR2Objects(c, objectKeys) {
   const { bucket, mediaRepository, systemStatsRepository } = c.var;
+  const untrackFailures = [];
   await Promise.all(
     objectKeys.map(async (key) => {
-      const media = await mediaRepository.getByKey(key).catch(() => null);
+      let media;
+      try {
+        media = await mediaRepository.getByKey(key);
+      } catch (err) {
+        throw new Error(`Media lookup failed for key, not deleted: ${key}`, { cause: err });
+      }
       if (!media) {
         throw new Error(`Media object not found: ${key}`);
       }
@@ -876,9 +882,15 @@ async function deleteR2Objects(c, objectKeys) {
         }
       } catch (err) {
         console.warn(`Failed to untrack media object: ${key}`, err);
+        untrackFailures.push(key);
       }
     })
   );
+  if (untrackFailures.length > 0) {
+    throw new Error(
+      `${untrackFailures.length} media row(s) now out of sync (R2 object deleted but DB untrack/decrement failed): ${untrackFailures.join(", ")}`
+    );
+  }
 }
 
 // src/shared/utils/media-utils.ts
@@ -1863,7 +1875,7 @@ function resolveEmailLocale(raw) {
 import { sha256hex as sha256hex3 } from "@beechcms/core";
 var PASSWORD_RESET_TOKEN_EXPIRY_SECONDS = 30 * 60;
 async function requestPasswordReset(context) {
-  const { env, req } = context;
+  const { env, req, executionCtx } = context;
   const useSmtp = env.EMAIL_PROVIDER === "smtp";
   if (!useSmtp && !env.RESEND_API_KEY) {
     return context.json({ error: "Service not available" }, 503);
@@ -1906,21 +1918,28 @@ async function requestPasswordReset(context) {
   const baseUrl = (env.APP_URL ?? new URL(req.url).origin).replace(/\/$/, "");
   const resetUrl = `${baseUrl}/admin/reset-password?token=${resetToken}`;
   const smtpBaseUrl = env.SMTP_HOST ? `http://${env.SMTP_HOST}:${env.SMTP_PORT ?? "8025"}` : void 0;
-  try {
-    await sendPasswordResetEmail({
-      to: normalizedEmail,
-      resetUrl,
-      locale: emailLocale,
-      apiKey: env.RESEND_API_KEY ?? "",
-      from: env.EMAIL_FROM,
-      isDev: env.ENV !== "production",
-      provider: env.EMAIL_PROVIDER,
-      smtpBaseUrl
-    });
-  } catch (error) {
-    if (env.ENV !== "production") {
-      console.error("[password-reset] Failed to send email:", error);
+  const sendNotification = async () => {
+    try {
+      await sendPasswordResetEmail({
+        to: normalizedEmail,
+        resetUrl,
+        locale: emailLocale,
+        apiKey: env.RESEND_API_KEY ?? "",
+        from: env.EMAIL_FROM,
+        isDev: env.ENV !== "production",
+        provider: env.EMAIL_PROVIDER,
+        smtpBaseUrl
+      });
+    } catch (error) {
+      if (env.ENV !== "production") {
+        console.error("[password-reset] Failed to send email:", error);
+      }
     }
+  };
+  try {
+    executionCtx.waitUntil(sendNotification());
+  } catch {
+    void sendNotification();
   }
   return context.json({ success: true });
 }
@@ -2157,6 +2176,26 @@ setupApp.post("/auth/setup", async (context) => {
       });
     }
   }
+  const passwordHash = await context.get("hashProvider").hash(password);
+  const normalizedEmail = email.trim().toLowerCase();
+  const normalizedName = typeof name === "string" ? name.trim() : null;
+  const normalizedSurname = typeof surname === "string" ? surname.trim() : null;
+  const created = await context.get("userRepository").createInitialAdmin({
+    id: context.get("idGenerator").uuid(),
+    email: normalizedEmail,
+    passwordHash,
+    role: "admin",
+    name: normalizedName,
+    surname: normalizedSurname
+  });
+  if (!created) {
+    return publicProblem(context, {
+      type: "setup-already-done",
+      title: "Setup already completed",
+      status: 403,
+      detail: "An administrator account already exists. Initial setup can only be performed once."
+    });
+  }
   if (track === "developer" && loadDemoData === true) {
     await context.get("demoDataRepository").loadDemoData();
     const layout = {
@@ -2242,18 +2281,6 @@ setupApp.post("/auth/setup", async (context) => {
     };
     await context.get("dashboardLayoutRepository").upsert("default", layout, "system");
   }
-  const passwordHash = await context.get("hashProvider").hash(password);
-  const normalizedEmail = email.trim().toLowerCase();
-  const normalizedName = typeof name === "string" ? name.trim() : null;
-  const normalizedSurname = typeof surname === "string" ? surname.trim() : null;
-  await context.get("userRepository").create({
-    id: context.get("idGenerator").uuid(),
-    email: normalizedEmail,
-    passwordHash,
-    role: "admin",
-    name: normalizedName,
-    surname: normalizedSurname
-  });
   if (track === "normal" && company && typeof company === "object") {
     const c = company;
     const companyName = c.name.trim();
@@ -3135,7 +3162,8 @@ async function deleteSeedMediaObjects(context, slug, seed, schemaMutator) {
       }
     }
     if (r2Keys.length > 0) {
-      await deleteR2Objects(context, r2Keys).catch(() => {
+      await deleteR2Objects(context, r2Keys).catch((error) => {
+        console.warn(`Seed drop for '${slug}' left media rows out of sync:`, error);
       });
     }
   } catch {
@@ -3624,10 +3652,13 @@ function interpolate(template, context, defaultValue = "", onMissing) {
     if (val == null || val === "") {
       return defaultValue;
     }
-    return String(val);
+    return escapeHtml(String(val));
   };
   return template.replace(/\{\{\s*([^{}]+?)\s*\}\}/g, replacer);
 }
+function escapeHtml(input) {
+  return input.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+}
 function resolvePath(obj, path) {
   if (path in obj && obj[path] !== void 0) {
     return obj[path];
@@ -5050,7 +5081,8 @@ webhooksApp.post("/qstash", async (context) => {
   try {
     const isValid = await receiver.verify({
       signature,
-      body
+      body,
+      url: context.req.url
     });
     if (!isValid) {
       return context.text("Invalid signature", 401);
@@ -5308,7 +5340,7 @@ function publicRateLimitMiddleware() {
       const remaining = path.slice("/api/v1/public/".length);
       const firstSegment = remaining.split("/")[0];
       if (firstSegment && firstSegment !== "health" && firstSegment !== "schema" && firstSegment !== "schema.html") {
-        seed = firstSegment;
+        seed = c.get("seedRegistry").get(firstSegment) ? firstSegment : "invalid-seed";
       }
     }
     const key = `${getClientIp(c.req)}:${seed}:${limiterName}`;
@@ -7332,6 +7364,18 @@ var D1UserRepository = class {
   async create(user) {
     await this.db.prepare("INSERT INTO users (id, email, password_hash, role, name, surname) VALUES (?, ?, ?, ?, ?, ?)").bind(user.id, user.email, user.passwordHash, user.role, user.name, user.surname).run();
   }
+  async createInitialAdmin(user) {
+    try {
+      await this.db.batch([
+        this.db.prepare("INSERT INTO setup_completed (id) VALUES (1)"),
+        this.db.prepare("INSERT INTO users (id, email, password_hash, role, name, surname) VALUES (?, ?, ?, ?, ?, ?)").bind(user.id, user.email, user.passwordHash, user.role, user.name, user.surname)
+      ]);
+      return true;
+    } catch (err) {
+      if (err instanceof Error && err.message.includes("UNIQUE constraint failed")) return false;
+      throw err;
+    }
+  }
   async updateProfile(userId, fields) {
     const columnAssignments = [];
     const boundValues = [];
@@ -10073,8 +10117,10 @@ var CloudflareQueueService = class {
   async enqueue(name, payload) {
     try {
       await this.queue.send({ name, payload });
+      return true;
     } catch (error) {
       console.error(`CloudflareQueueService: failed to enqueue "${name}"`, error);
+      return false;
     }
   }
 };
@@ -10090,19 +10136,27 @@ var InMemoryQueueService = class {
   context;
   scheduleBackgroundTask;
   async enqueue(name, payload) {
-    const handler = this.jobs[name];
+    const handler = Object.hasOwn(this.jobs, name) ? this.jobs[name] : void 0;
     if (!handler) {
       console.error(`InMemoryQueueService: no handler registered for "${name}"`);
-      return;
+      return false;
+    }
+    let run;
+    try {
+      const result = handler(payload, this.context);
+      run = Promise.resolve(result).catch((error) => {
+        console.error(`InMemoryQueueService: job "${name}" failed`, error);
+      });
+    } catch (error) {
+      console.error(`InMemoryQueueService: job "${name}" failed synchronously`, error);
+      return false;
     }
-    const run = handler(payload, this.context).catch((error) => {
-      console.error(`InMemoryQueueService: job "${name}" failed`, error);
-    });
     if (this.scheduleBackgroundTask) {
       this.scheduleBackgroundTask(run);
-      return;
+      return true;
     }
     await run;
+    return true;
   }
 };
 

package/dist/shared/db/repositories/d1-user.repository.d.ts

@@ -6,6 +6,7 @@ export declare class D1UserRepository implements IUserRepository {
     findById(userId: string): Promise<UserRecord | null>;
     findByEmail(email: string): Promise<UserRecord | null>;
     create(user: NewUserInput): Promise<void>;
+    createInitialAdmin(user: NewUserInput): Promise<boolean>;
     updateProfile(userId: string, fields: {
         name?: string;
         surname?: string;

package/dist/shared/email/templates/automation-mail.d.ts

@@ -1,5 +1,4 @@
 import type { AutomationMailParams } from '../email.types';
-/** Identity builder: automation payloads are already user-authored. */
 export declare function buildAutomationEmail(params: AutomationMailParams): {
     to: string;
     subject: string;

package/dist/shared/services/queue/cloudflare-queue-service.d.ts

@@ -2,10 +2,13 @@ import type { IQueueService, QueueMessage } from '@beechcms/core';
 /**
  * Production producer. Sends a QueueMessage envelope onto the Cloudflare Queue
  * binding. Cloudflare guarantees at-least-once delivery + retries on the
- * consumer side, so enqueue only needs to hand off the message.
+ * consumer side once a message is accepted, but `send()` itself rejects
+ * outright for transport-level failures (e.g. the 128 KiB per-message size
+ * limit) — those never reach the consumer, so callers MUST be told the
+ * message was dropped instead of assuming it was scheduled.
  */
 export declare class CloudflareQueueService implements IQueueService {
     private readonly queue;
     constructor(queue: Queue<QueueMessage>);
-    enqueue<T>(name: string, payload: T): Promise<void>;
+    enqueue<T>(name: string, payload: T): Promise<boolean>;
 }

package/dist/shared/services/queue/in-memory-queue-service.d.ts

@@ -11,6 +11,6 @@ export declare class InMemoryQueueService implements IQueueService {
     private readonly context;
     private readonly scheduleBackgroundTask?;
     constructor(jobs: JobRegistry, context: JobContext, scheduleBackgroundTask?: ScheduleBackgroundTask | undefined);
-    enqueue<T>(name: string, payload: T): Promise<void>;
+    enqueue<T>(name: string, payload: T): Promise<boolean>;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beechcms/api",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/factory.d.ts",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.995.0",
     "@aws-sdk/s3-request-presigner": "^3.995.0",
-    "@beechcms/core": "^0.6.2",
+    "@beechcms/core": "^0.6.4",
     "@upstash/qstash": "^2.11.0",
     "bcryptjs": "^2.4.3",
     "hono": "^4.12.21",