@beechcms/api 0.4.0-preview.11 → 0.4.0-preview.13

package/src/shared/storage/r2-binding-bucket.ts

@@ -0,0 +1,81 @@
+import { BeechBucket, PutBucketOptions, GetBucketResult } from '@beechcms/core'
+
+/**
+ * Implementation of BeechBucket using Cloudflare R2 native binding.
+ * Used for local development (Miniflare) or native Cloudflare Workers deployment.
+ */
+export class R2BindingBucket implements BeechBucket {
+  constructor(
+    private bucket: R2Bucket,
+    private baseUrl: string
+  ) {}
+
+  async put(key: string, body: ArrayBuffer | Uint8Array | ReadableStream, options?: PutBucketOptions): Promise<void> {
+    await this.bucket.put(key, body, {
+      httpMetadata: { contentType: options?.contentType },
+      customMetadata: options?.metadata
+    })
+  }
+
+  async get(key: string): Promise<GetBucketResult | null> {
+    const object = await this.bucket.get(key)
+    if (!object) return null
+
+    return {
+      body: object.body,
+      contentType: object.httpMetadata?.contentType,
+      size: object.size,
+      metadata: object.customMetadata
+    }
+  }
+
+  async delete(key: string): Promise<void> {
+    await this.bucket.delete(key)
+  }
+
+  async head(key: string): Promise<{ size: number; contentType?: string; metadata?: Record<string, string> } | null> {
+    const object = await this.bucket.head(key)
+    if (!object) return null
+
+    return {
+      size: object.size,
+      contentType: object.httpMetadata?.contentType,
+      metadata: object.customMetadata
+    }
+  }
+
+  getUrl(key: string): string {
+    // If baseUrl is just the origin, we use the proxied route.
+    // If it's a custom CDN/R2 domain, it might not need /api/media/
+    // but for now, we maintain the contract: the provider decides the full URL.
+    if (this.baseUrl.includes('/api/media')) {
+       return `${this.baseUrl}/${encodeURIComponent(key)}`
+    }
+    return `${this.baseUrl}/api/media/${encodeURIComponent(key)}`
+  }
+
+  async getTotalSize(): Promise<number> {
+    let total = 0
+    let cursor: string | undefined
+    do {
+      const result: R2Objects = await this.bucket.list({ cursor })
+      for (const obj of result.objects) {
+        total += obj.size
+      }
+      cursor = result.truncated ? result.cursor : undefined
+    } while (cursor)
+    return total
+  }
+
+  async list(options?: { prefix?: string; limit?: number; cursor?: string }): Promise<{ objects: Array<{ key: string; size: number }>; cursor?: string }> {
+    const result = await this.bucket.list({
+      prefix: options?.prefix,
+      limit: options?.limit,
+      cursor: options?.cursor
+    })
+    return {
+      objects: result.objects.map(obj => ({ key: obj.key, size: obj.size })),
+      cursor: result.truncated ? result.cursor : undefined
+    }
+  }
+}

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

@@ -0,0 +1,163 @@
+import { S3Client, PutObjectCommand, GetObjectCommand, DeleteObjectCommand, HeadObjectCommand, ListObjectsV2Command } from '@aws-sdk/client-s3'
+import { BeechBucket, PutBucketOptions, GetBucketResult } from '@beechcms/core'
+
+/**
+ * Implementation of BeechBucket using S3-compatible API (AWS SDK).
+ * Used for production when connecting to R2 or any other S3 provider via HTTP.
+ */
+export class S3Bucket implements BeechBucket {
+  private client: S3Client
+  private bucketName: string
+  private baseUrl: string
+
+  private cdnUrl: string | null
+
+  constructor(config: {
+    endpoint: string,
+    accessKeyId: string,
+    secretAccessKey: string,
+    bucketName: string,
+    baseUrl: string,
+    cdnUrl?: string,
+  }) {
+    this.client = new S3Client({
+      region: 'auto',
+      endpoint: config.endpoint,
+      credentials: {
+        accessKeyId: config.accessKeyId,
+        secretAccessKey: config.secretAccessKey,
+      },
+      forcePathStyle: true,
+    })
+    this.bucketName = config.bucketName
+    this.baseUrl = config.baseUrl
+    this.cdnUrl = config.cdnUrl ?? null
+  }
+
+  async put(key: string, body: ArrayBuffer | Uint8Array | ReadableStream, options?: PutBucketOptions): Promise<void> {
+    const command = new PutObjectCommand({
+      Bucket: this.bucketName,
+      Key: key,
+      Body: body instanceof ReadableStream ? await this.streamToUint8Array(body) : new Uint8Array(body as ArrayBuffer),
+      ContentType: options?.contentType,
+      Metadata: options?.metadata
+    })
+    await this.client.send(command)
+  }
+
+  private async streamToUint8Array(stream: ReadableStream): Promise<Uint8Array> {
+    const reader = stream.getReader()
+    const chunks: Uint8Array[] = []
+    let totalLength = 0
+    while (true) {
+      const { done, value } = await reader.read()
+      if (done) break
+      chunks.push(value)
+      totalLength += value.length
+    }
+    const result = new Uint8Array(totalLength)
+    let offset = 0
+    for (const chunk of chunks) {
+      result.set(chunk, offset)
+      offset += chunk.length
+    }
+    return result
+  }
+
+  async get(key: string): Promise<GetBucketResult | null> {
+    try {
+      const command = new GetObjectCommand({
+        Bucket: this.bucketName,
+        Key: key
+      })
+      const response = await this.client.send(command)
+      
+      if (!response.Body) return null
+
+      const rawBody = response.Body as any
+      const body: ReadableStream = typeof rawBody.transformToWebStream === 'function'
+        ? rawBody.transformToWebStream()
+        : rawBody as ReadableStream
+
+      return {
+        body,
+        contentType: response.ContentType,
+        size: response.ContentLength ?? 0,
+        metadata: response.Metadata
+      }
+    } catch (err: any) {
+      if (err.name === 'NoSuchKey' || err.name === 'NotFound' || err.message === 'NoSuchKey') {
+        return null
+      }
+      // Rethrow other errors (AccessDenied, Timeout, etc.)
+      throw err
+    }
+  }
+
+  async delete(key: string): Promise<void> {
+    const command = new DeleteObjectCommand({
+      Bucket: this.bucketName,
+      Key: key
+    })
+    await this.client.send(command)
+  }
+
+  async head(key: string): Promise<{ size: number; contentType?: string; metadata?: Record<string, string> } | null> {
+    try {
+      const command = new HeadObjectCommand({
+        Bucket: this.bucketName,
+        Key: key
+      })
+      const response = await this.client.send(command)
+      return {
+        size: response.ContentLength ?? 0,
+        contentType: response.ContentType,
+        metadata: response.Metadata
+      }
+    } catch (err: any) {
+      if (err.name === 'NoSuchKey' || err.name === 'NotFound') return null
+      throw err
+    }
+  }
+
+  getUrl(key: string): string {
+    if (this.cdnUrl) {
+      return `${this.cdnUrl}/${encodeURIComponent(key)}`
+    }
+    return `${this.baseUrl}/api/media/${encodeURIComponent(key)}`
+  }
+
+  async getTotalSize(): Promise<number> {
+    let total = 0
+    let token: string | undefined
+    do {
+      const command = new ListObjectsV2Command({
+        Bucket: this.bucketName,
+        ContinuationToken: token
+      })
+      const response = await this.client.send(command)
+      for (const obj of response.Contents ?? []) {
+        total += obj.Size ?? 0
+      }
+      token = response.NextContinuationToken
+    } while (token)
+    return total
+  }
+
+  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,
+      Prefix: options?.prefix,
+      MaxKeys: options?.limit,
+      ContinuationToken: options?.cursor
+    })
+    const response = await this.client.send(command)
+    return {
+      objects: (response.Contents ?? []).map(obj => ({
+        key: obj.Key ?? '',
+        size: obj.Size ?? 0
+      })),
+      cursor: response.NextContinuationToken
+    }
+  }
+}

package/src/shared/storage-utils.ts

@@ -1,36 +1,36 @@
-import { S3Client, ListObjectsV2Command, ListObjectsV2CommandOutput } from '@aws-sdk/client-s3'
-
-/**
- * Calcola la dimensione totale occupata in un bucket R2 (in byte).
- * Nota: esegue una scansione completa del bucket. Per bucket molto grandi 
- * andrebbe implementata una cache o usato Cloudflare Logpush/Analytics.
- */
-export async function getBucketSize(client: S3Client, bucketName: string): Promise<number> {
-  let totalSize = 0
-  let isTruncatedFlag = true
-  let continuationToken: string | undefined = undefined
-
-  try {
-    while (isTruncatedFlag) {
-      const command = new ListObjectsV2Command({
-        Bucket: bucketName,
-        ContinuationToken: continuationToken,
-      })
-
-      const response = (await client.send(command)) as ListObjectsV2CommandOutput
-      
-      if (response.Contents) {
-        for (const obj of response.Contents) {
-          totalSize += obj.Size ?? 0
-        }
-      }
-
-      isTruncatedFlag = response.IsTruncated ?? false
-      continuationToken = response.NextContinuationToken
-    }
-    return totalSize
-  } catch (err) {
-    console.error('Error calculating bucket size:', err)
-    return 0
-  }
-}
+import { S3Client, ListObjectsV2Command, ListObjectsV2CommandOutput } from '@aws-sdk/client-s3'
+
+/**
+ * Calcola la dimensione totale occupata in un bucket R2 (in byte).
+ * Nota: esegue una scansione completa del bucket. Per bucket molto grandi 
+ * andrebbe implementata una cache o usato Cloudflare Logpush/Analytics.
+ */
+export async function getBucketSize(client: S3Client, bucketName: string): Promise<number> {
+  let totalSize = 0
+  let isTruncatedFlag = true
+  let continuationToken: string | undefined = undefined
+
+  try {
+    while (isTruncatedFlag) {
+      const command = new ListObjectsV2Command({
+        Bucket: bucketName,
+        ContinuationToken: continuationToken,
+      })
+
+      const response = (await client.send(command)) as ListObjectsV2CommandOutput
+      
+      if (response.Contents) {
+        for (const obj of response.Contents) {
+          totalSize += obj.Size ?? 0
+        }
+      }
+
+      isTruncatedFlag = response.IsTruncated ?? false
+      continuationToken = response.NextContinuationToken
+    }
+    return totalSize
+  } catch (err) {
+    console.error('Error calculating bucket size:', err)
+    throw new Error('Failed to calculate bucket size. Check your R2/S3 credentials and endpoint.')
+  }
+}

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

@@ -0,0 +1,44 @@
+import { SystemStatsRepository } from '@beechcms/core'
+
+/**
+ * Implementation of SystemStatsRepository using Cloudflare D1.
+ * Manages global system statistics such as total storage usage.
+ */
+export class D1SystemStatsRepository implements SystemStatsRepository {
+  constructor(private database: D1Database) {}
+
+  /**
+   * Increments the total storage usage count.
+   */
+  async incrementStorage(byteCount: number): Promise<void> {
+    await this.database.prepare(
+      "UPDATE system_stats SET value = CAST(value AS INTEGER) + ? WHERE id = 'total_storage_bytes'"
+    ).bind(byteCount).run()
+  }
+
+  /**
+   * Decrements the total storage usage count, ensuring it doesn't fall below zero.
+   */
+  async decrementStorage(byteCount: number): Promise<void> {
+    await this.database.prepare(
+      "UPDATE system_stats SET value = MAX(0, CAST(value AS INTEGER) - ?) WHERE id = 'total_storage_bytes'"
+    ).bind(byteCount).run()
+  }
+
+  /**
+   * Sets the total storage usage count to a specific value.
+   */
+  async setStorage(byteCount: number): Promise<void> {
+    await this.database.prepare(
+      "UPDATE system_stats SET value = ? WHERE id = 'total_storage_bytes'"
+    ).bind(String(byteCount)).run()
+  }
+
+  /**
+   * Retrieves the current total storage usage in bytes.
+   */
+  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
+  }
+}

package/src/types.ts

@@ -1,41 +1,46 @@
-/// <reference types="@cloudflare/workers-types" />
-import type { Seed, ContentRepository, IdempotencyRepository } from '@beechcms/core'
-
-export interface Env {
-  DB: D1Database
-  JWT_SECRET: string
-  JWT_ISSUER?: string
-  JWT_AUDIENCE?: string
-  R2_ACCESS_KEY_ID?: string
-  R2_SECRET_ACCESS_KEY?: string
-  R2_ENDPOINT?: string
-  R2_BUCKET_NAME?: string
-  LOGIN_RATE_LIMITER?: RateLimit
-  REFRESH_RATE_LIMITER?: RateLimit
-  PUBLIC_READ_RATE_LIMITER?: RateLimit
-  PUBLIC_WRITE_RATE_LIMITER?: RateLimit
-  CORS_ORIGINS?: string
-  PUBLIC_READ_API_KEY?: string
-  PUBLIC_WRITE_API_KEY?: string
-  PUBLIC_PUBLISHED_ONLY?: string
-  PUBLIC_IDEMPOTENCY_TTL_SECONDS?: string
-  MEDIA_BASE_URL?: string
-  RESEND_API_KEY?: string
-  APP_URL?: string
-  EMAIL_FROM?: string
-  FORGOT_PASSWORD_RATE_LIMITER?: RateLimit
-  RESET_PASSWORD_RATE_LIMITER?: RateLimit
-  ENV?: string
-  DATE_FORMAT?: string
-  ASSETS?: Fetcher
-}
-
-export interface Variables {
-  jwtPayload: { sub: string; email?: string }
-  getSeed: (slug: string) => Seed | null
-  seedRegistry: Record<string, Seed>
-  repository: ContentRepository
-  idempotencyRepository: IdempotencyRepository
-}
-
-export type AppEnv = { Bindings: Env; Variables: Variables }
+/// <reference types="@cloudflare/workers-types" />
+import type { Seed, ContentRepository, IdempotencyRepository, BeechBucket, MediaRepository, SystemStatsRepository } from '@beechcms/core'
+
+export interface Env {
+  DB: D1Database
+  JWT_SECRET: string
+  JWT_ISSUER?: string
+  JWT_AUDIENCE?: string
+  R2_ACCESS_KEY_ID?: string
+  R2_SECRET_ACCESS_KEY?: string
+  R2_ENDPOINT?: string
+  R2_BUCKET_NAME?: string
+  LOGIN_RATE_LIMITER?: RateLimit
+  REFRESH_RATE_LIMITER?: RateLimit
+  PUBLIC_READ_RATE_LIMITER?: RateLimit
+  PUBLIC_WRITE_RATE_LIMITER?: RateLimit
+  CORS_ORIGINS?: string
+  PUBLIC_READ_API_KEY?: string
+  PUBLIC_WRITE_API_KEY?: string
+  PUBLIC_PUBLISHED_ONLY?: string
+  PUBLIC_IDEMPOTENCY_TTL_SECONDS?: string
+  MEDIA_BASE_URL?: string
+  MEDIA_CDN_URL?: string
+  RESEND_API_KEY?: string
+  APP_URL?: string
+  EMAIL_FROM?: string
+  FORGOT_PASSWORD_RATE_LIMITER?: RateLimit
+  RESET_PASSWORD_RATE_LIMITER?: RateLimit
+  ENV?: string
+  DATE_FORMAT?: string
+  ASSETS?: Fetcher
+  MEDIA_BUCKET?: R2Bucket
+}
+
+export interface Variables {
+  jwtPayload: { sub: string; email?: string }
+  getSeed: (slug: string) => Seed | null
+  seedRegistry: Record<string, Seed>
+  repository: ContentRepository
+  idempotencyRepository: IdempotencyRepository
+  bucket: BeechBucket
+  mediaRepository: MediaRepository
+  systemStatsRepository: SystemStatsRepository
+}
+
+export type AppEnv = { Bindings: Env; Variables: Variables }