@beechcms/api 0.4.3 → 0.6.0-preview.1

package/src/shared/seed.repository.d1.ts

@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
+/// <reference types="@cloudflare/workers-types" />
+import type { ISeedRepository, SeedRecord, Seed } from '@beechcms/core'
+
+export class D1SeedRepository implements ISeedRepository {
+  constructor(private readonly db: D1Database) {}
+
+  async listActive(): Promise<Seed[]> {
+    const rs = await this.db
+      .prepare(`SELECT definition FROM seeds WHERE status = 'active' ORDER BY created_at ASC`)
+      .all<{ definition: string }>()
+    const seeds: Seed[] = []
+    for (const r of rs.results ?? []) {
+      try { seeds.push(JSON.parse(r.definition) as Seed) } catch { /* skip corrupt */ }
+    }
+    return seeds
+  }
+
+  async listAll(): Promise<SeedRecord[]> {
+    const rs = await this.db
+      .prepare(`SELECT slug, definition, status, source, created_at, updated_at FROM seeds ORDER BY created_at ASC`)
+      .all<{ slug: string; definition: string; status: string; source: string; created_at: number; updated_at: number }>()
+    const out: SeedRecord[] = []
+    for (const r of rs.results ?? []) {
+      try {
+        out.push({
+          slug: r.slug,
+          definition: JSON.parse(r.definition) as Seed,
+          status: r.status as 'active' | 'deleted',
+          source: r.source as 'code' | 'runtime',
+          createdAt: r.created_at,
+          updatedAt: r.updated_at,
+        })
+      } catch { /* skip corrupt */ }
+    }
+    return out
+  }
+
+  async get(slug: string): Promise<SeedRecord | null> {
+    const r = await this.db
+      .prepare(`SELECT slug, definition, status, source, created_at, updated_at FROM seeds WHERE slug = ? LIMIT 1`)
+      .bind(slug)
+      .first<{ slug: string; definition: string; status: string; source: string; created_at: number; updated_at: number }>()
+    if (!r) return null
+    return {
+      slug: r.slug,
+      definition: JSON.parse(r.definition) as Seed,
+      status: r.status as 'active' | 'deleted',
+      source: r.source as 'code' | 'runtime',
+      createdAt: r.created_at,
+      updatedAt: r.updated_at,
+    }
+  }
+
+  async upsert(slug: string, definition: Seed, source: 'code' | 'runtime' = 'runtime'): Promise<void> {
+    const now = Math.floor(Date.now() / 1000)
+    await this.db
+      .prepare(`
+        INSERT INTO seeds (slug, definition, status, source, created_at, updated_at)
+        VALUES (?, ?, 'active', ?, ?, ?)
+        ON CONFLICT(slug) DO UPDATE SET
+          definition = excluded.definition,
+          status     = 'active',
+          updated_at = excluded.updated_at
+      `)
+      .bind(slug, JSON.stringify(definition), source, now, now)
+      .run()
+  }
+
+  async softDelete(slug: string): Promise<void> {
+    const now = Math.floor(Date.now() / 1000)
+    await this.db
+      .prepare(`UPDATE seeds SET status = 'deleted', updated_at = ? WHERE slug = ?`)
+      .bind(now, slug)
+      .run()
+  }
+
+  async hardDelete(slug: string): Promise<void> {
+    await this.db.prepare(`DELETE FROM seeds WHERE slug = ?`).bind(slug).run()
+  }
+
+  async getRegistryVersion(): Promise<number> {
+    const r = await this.db
+      .prepare(`SELECT value FROM seed_meta WHERE id = 'registry_version' LIMIT 1`)
+      .first<{ value: string }>()
+    return r ? parseInt(r.value, 10) || 1 : 1
+  }
+
+  async bumpRegistryVersion(): Promise<number> {
+    const r = await this.db
+      .prepare(`UPDATE seed_meta SET value = CAST(CAST(value AS INTEGER) + 1 AS TEXT) WHERE id = 'registry_version' RETURNING value`)
+      .first<{ value: string }>()
+    return r ? parseInt(r.value, 10) : 1
+  }
+}

package/src/shared/sequential-id-generator.ts

@@ -1,7 +1,14 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
 import type { IIdGenerator } from '@beechcms/core'
 
 const ID_PADDING_WIDTH = 4
 
+// Matches the format emitted by uuid() → 'test-id-XXXX'
+const TEST_ID_REGEX = /^test-id-\d{4}$/
+
 /**
  * Test-only IIdGenerator implementation. Each call returns a stable,
  * monotonically increasing identifier (`test-id-0001`, `test-id-0002`, …)
@@ -16,6 +23,10 @@ export class SequentialIdGenerator implements IIdGenerator {
     return `test-id-${String(this.counter).padStart(ID_PADDING_WIDTH, '0')}`
   }
 
+  isValid(value: unknown): value is string {
+    return typeof value === 'string' && TEST_ID_REGEX.test(value)
+  }
+
   reset(): void {
     this.counter = 0
   }

package/src/shared/site-settings.repository.d1.ts

@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
+/// <reference types="@cloudflare/workers-types" />
+import type { ISiteSettingsRepository, SiteSettings } from '@beechcms/core'
+
+const DEFAULTS: SiteSettings = {
+  siteTitle: 'Beech CMS',
+  defaultLanguage: 'en',
+  timezone: 'Europe/Rome',
+  currency: 'EUR',
+  companyName: null,
+  companyWebsite: null,
+  companyAbbreviation: null,
+}
+
+export class D1SiteSettingsRepository implements ISiteSettingsRepository {
+  constructor(private readonly db: D1Database) {}
+
+  async getAll(): Promise<SiteSettings> {
+    const { results } = await this.db
+      .prepare('SELECT key, value FROM site_settings')
+      .all<{ key: string; value: string }>()
+
+    const map = new Map(results.map((r) => [r.key, r.value]))
+
+    return {
+      siteTitle: map.get('siteTitle') ?? DEFAULTS.siteTitle,
+      defaultLanguage: map.get('defaultLanguage') ?? DEFAULTS.defaultLanguage,
+      timezone: map.get('timezone') ?? DEFAULTS.timezone,
+      currency: map.get('currency') ?? DEFAULTS.currency,
+      companyName: map.get('companyName') ?? null,
+      companyWebsite: map.get('companyWebsite') ?? null,
+      companyAbbreviation: map.get('companyAbbreviation') ?? null,
+    }
+  }
+
+  async setMany(values: Partial<SiteSettings>): Promise<void> {
+    const entries = Object.entries(values).filter(([, v]) => v !== undefined) as [string, string | null][]
+    if (entries.length === 0) return
+
+    const stmts = entries.map(([key, value]) =>
+      this.db
+        .prepare(
+          'INSERT INTO site_settings (key, value) VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value',
+        )
+        .bind(key, value),
+    )
+
+    await this.db.batch(stmts)
+  }
+}

package/src/shared/storage/factory.ts

@@ -1,30 +1,32 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
 import { BeechBucket, PutBucketOptions, GetBucketResult } from '@beechcms/core'
 import { Env } from '../../types'
-import { R2BindingBucket } from './r2-binding-bucket'
 import { S3Bucket } from './s3-bucket'
 
 class NullBucket implements BeechBucket {
   private fail(): never {
-    throw new Error('No storage provider configured. Set MEDIA_BUCKET or R2 credentials.')
+    throw new Error('Storage not configured. Set R2_ENDPOINT, R2_ACCESS_KEY_ID, R2_SECRET_ACCESS_KEY, R2_BUCKET_NAME.')
   }
-  put(_key: string, _body: ArrayBuffer | Uint8Array | ReadableStream, _options?: PutBucketOptions): Promise<void> { return this.fail() }
-  get(_key: string): Promise<GetBucketResult | null> { return this.fail() }
-  delete(_key: string): Promise<void> { return this.fail() }
-  head(_key: string): Promise<{ size: number; contentType?: string; metadata?: Record<string, string> } | null> { return this.fail() }
-  getUrl(_key: string): string { return this.fail() }
+  put(): Promise<void> { return this.fail() }
+  get(): Promise<GetBucketResult | null> { return this.fail() }
+  delete(): Promise<void> { return this.fail() }
+  head(): Promise<{ size: number } | null> { return this.fail() }
+  getUrl(): string { return this.fail() }
   getTotalSize(): Promise<number> { return this.fail() }
-  list(_options?: { prefix?: string; limit?: number; cursor?: string }): Promise<{ objects: Array<{ key: string; size: number }>; cursor?: string }> { return this.fail() }
+  list(): Promise<{ objects: Array<{ key: string; size: number }>; cursor?: string }> { return this.fail() }
+  presignPut(): Promise<string> { return this.fail() }
+  presignGet(): Promise<string> { return this.fail() }
 }
 
 /**
- * Creates the appropriate BeechBucket based on available bindings/credentials.
- * Uses capability detection: R2 binding takes precedence over S3-compatible credentials.
+ * Single storage path: S3-compatible HTTP API.
+ * Prod → Cloudflare R2 with S3 API token.
+ * Dev  → MinIO container (or R2 staging bucket).
  */
 export function createBucketProvider(env: Env, baseUrl: string): BeechBucket {
-  if (env.MEDIA_BUCKET) {
-    return new R2BindingBucket(env.MEDIA_BUCKET, baseUrl)
-  }
-
   if (env.R2_ACCESS_KEY_ID && env.R2_SECRET_ACCESS_KEY && env.R2_ENDPOINT && env.R2_BUCKET_NAME) {
     return new S3Bucket({
       endpoint: env.R2_ENDPOINT,
@@ -35,6 +37,5 @@ export function createBucketProvider(env: Env, baseUrl: string): BeechBucket {
       cdnUrl: env.MEDIA_CDN_URL?.trim().replace(/\/$/, '') || undefined,
     })
   }
-
   return new NullBucket()
 }

package/src/shared/storage/s3-bucket.ts

@@ -1,5 +1,10 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
 import { S3Client, PutObjectCommand, GetObjectCommand, DeleteObjectCommand, HeadObjectCommand, ListObjectsV2Command } from '@aws-sdk/client-s3'
-import { BeechBucket, PutBucketOptions, GetBucketResult } from '@beechcms/core'
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
+import { BeechBucket, PutBucketOptions, GetBucketResult, PresignOptions } from '@beechcms/core'
 
 /**
  * Implementation of BeechBucket using S3-compatible API (AWS SDK).
@@ -20,6 +25,10 @@ export class S3Bucket implements BeechBucket {
     baseUrl: string,
     cdnUrl?: string,
   }) {
+    // requestChecksumCalculation/responseChecksumValidation exist at runtime in AWS SDK v3
+    // but are not yet in the TypeScript types for this version. Casting via unknown to pass them
+    // through: without them the SDK adds x-amz-checksum-crc32 to presigned URLs, which causes
+    // R2 to reject PUT requests when the CRC32 of the uploaded file doesn't match.
     this.client = new S3Client({
       region: 'auto',
       endpoint: config.endpoint,
@@ -28,7 +37,9 @@ export class S3Bucket implements BeechBucket {
         secretAccessKey: config.secretAccessKey,
       },
       forcePathStyle: true,
-    })
+      requestChecksumCalculation: 'when_required',
+      responseChecksumValidation: 'when_required',
+    } as unknown as import('@aws-sdk/client-s3').S3ClientConfig)
     this.bucketName = config.bucketName
     this.baseUrl = config.baseUrl
     this.cdnUrl = config.cdnUrl ?? null
@@ -144,6 +155,27 @@ export class S3Bucket implements BeechBucket {
     return total
   }
 
+  async presignPut(key: string, options: PresignOptions): Promise<string> {
+    // ContentLength intentionally excluded: including it adds content-length to
+    // X-Amz-SignedHeaders, requiring the uploading client to send an exact
+    // Content-Length header. Some fetch implementations omit it, causing MinIO/R2
+    // to reject the PUT with 400. Size validation already happened server-side.
+    const command = new PutObjectCommand({
+      Bucket: this.bucketName,
+      Key: key,
+      ContentType: options.contentType,
+    })
+    return getSignedUrl(this.client, command, { expiresIn: options.expiresIn })
+  }
+
+  async presignGet(key: string, options: PresignOptions): Promise<string> {
+    const command = new GetObjectCommand({
+      Bucket: this.bucketName,
+      Key: key,
+    })
+    return getSignedUrl(this.client, command, { expiresIn: options.expiresIn })
+  }
+
   async list(options?: { prefix?: string; limit?: number; cursor?: string }): Promise<{ objects: Array<{ key: string; size: number }>; cursor?: string }> {
     const command = new ListObjectsV2Command({
       Bucket: this.bucketName,

package/src/shared/storage-utils.ts

@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
 import { S3Client, ListObjectsV2Command, ListObjectsV2CommandOutput } from '@aws-sdk/client-s3'
 
 /**

package/src/shared/system-stats.repository.d1.test.ts

@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
 import { describe, it, expect, vi } from 'vitest'
 import { D1SystemStatsRepository } from './system-stats.repository.d1'
 

package/src/shared/system-stats.repository.d1.ts

@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
 import { SystemStatsRepository } from '@beechcms/core'
 
 /**
@@ -39,6 +43,6 @@ export class D1SystemStatsRepository implements SystemStatsRepository {
    */
   async getStorageUsage(): Promise<number> {
     const statsRecordResult = await this.database.prepare("SELECT value FROM system_stats WHERE id = 'total_storage_bytes'").first<{ value: string }>()
-    return statsRecordResult ? parseInt(statsRecordResult.value, 10) : 0
+    return statsRecordResult ? Number.parseInt(statsRecordResult.value, 10) : 0
   }
 }

package/src/types.ts

@@ -1,6 +1,11 @@
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
 /// <reference types="@cloudflare/workers-types" />
-import type { Seed, ContentRepository, IdempotencyRepository, BeechBucket, MediaRepository, SystemStatsRepository, IHashProvider, ITokenService, IUserRepository, ISessionRepository, IPasswordResetTokenRepository, IActivityLogger, IActivityLogRepository, INotificationRepository, INotificationService, IWidgetRepository, ISearchRepository, IAnalyticsRepository, IContentScanRepository, ISeedRegistry, IClock, IIdGenerator, IAutomationRunner, IAutomationRepository, IScheduler } from '@beechcms/core'
+import type { Seed, ContentRepository, IdempotencyRepository, BeechBucket, MediaRepository, SystemStatsRepository, IHashProvider, ITokenService, IUserRepository, ISessionRepository, IPasswordResetTokenRepository, IActivityLogger, IActivityLogRepository, INotificationRepository, INotificationService, IWidgetRepository, ISearchRepository, IAnalyticsRepository, IContentScanRepository, ISeedRegistry, IClock, IIdGenerator, IAutomationRunner, IAutomationRepository, IScheduler, BackrefMap, ISiteSettingsRepository, IDemoDataRepository, JwtClaims, ISeedLayoutRepository, ISeedRepository, ISchemaMutator } from '@beechcms/core'
 import type { IRateLimiterRegistry } from './middleware/rate-limit.middleware'
+import type { ISetupChecklistRepository } from './shared/d1-setup-checklist.repository'
 
 export interface Env {
   DB: D1Database
@@ -22,20 +27,28 @@ export interface Env {
   PUBLIC_IDEMPOTENCY_TTL_SECONDS?: string
   MEDIA_BASE_URL?: string
   MEDIA_CDN_URL?: string
+  MAX_UPLOAD_BYTES?: string
   RESEND_API_KEY?: string
   EMAIL_API_KEY?: string
   APP_URL?: string
   EMAIL_FROM?: string
+  EMAIL_PROVIDER?: string
+  SMTP_HOST?: string
+  SMTP_PORT?: string
+  WEBHOOK_TESTER_URL?: string
   FORGOT_PASSWORD_RATE_LIMITER?: RateLimit
   RESET_PASSWORD_RATE_LIMITER?: RateLimit
   ENV?: string
   DATE_FORMAT?: string
   ASSETS?: Fetcher
-  MEDIA_BUCKET?: R2Bucket
+  QSTASH_TOKEN?: string
+  QSTASH_URL?: string
+  QSTASH_CURRENT_SIGNING_KEY?: string
+  QSTASH_NEXT_SIGNING_KEY?: string
 }
 
 export interface Variables {
-  jwtPayload: { sub: string; email?: string; name?: string | null }
+  jwtPayload: JwtClaims
   getSeed: (slug: string) => Seed | null
   seedRegistry: ISeedRegistry
   repository: ContentRepository
@@ -62,6 +75,13 @@ export interface Variables {
   automationRepository: IAutomationRepository
   automationRunner: IAutomationRunner
   scheduler: IScheduler
+  backrefMap: BackrefMap
+  siteSettingsRepository: ISiteSettingsRepository
+  demoDataRepository: IDemoDataRepository
+  setupChecklistRepository: ISetupChecklistRepository
+  seedLayoutRepository: ISeedLayoutRepository
+  seedRepository: ISeedRepository
+  schemaMutator: ISchemaMutator
 }
 
 export type AppEnv = { Bindings: Env; Variables: Variables }