@c-time/frelio-cms 1.3.5 → 1.3.7

package/workers/file-upload/src/usecase/ListFilesUseCase.ts

@@ -0,0 +1,52 @@
+/**
+ * ListFilesUseCase - ファイル一覧の取得
+ */
+
+import type { FileEntry } from '../domain/FileEntity'
+import { logger } from '../infra/LoggerSingleton'
+import type { R2RepositoryPort } from '../repository/R2RepositoryPort'
+
+export type ListFilesParams = {
+  year?: number
+}
+
+export type ListFilesResult = {
+  year: number
+  availableYears: number[]
+  files: FileEntry[]
+  totalSize: number
+  totalCount: number
+  baseUrl: string
+}
+
+export type GetAvailableYearsResult = {
+  years: number[]
+  currentYear: number
+}
+
+export class ListFilesUseCase {
+  constructor(private r2Repository: R2RepositoryPort) {}
+
+  async execute(params: ListFilesParams): Promise<ListFilesResult> {
+    const year = params.year ?? this.r2Repository.getCurrentYear()
+    logger.debug('ListFilesUseCase.execute', { year })
+
+    const yearFiles = await this.r2Repository.readYearFiles(year)
+    const availableYears = await this.r2Repository.getAvailableYears()
+
+    return {
+      year,
+      availableYears,
+      files: yearFiles.files,
+      totalSize: yearFiles.totalSize,
+      totalCount: yearFiles.totalCount,
+      baseUrl: this.r2Repository.getBaseUrl(),
+    }
+  }
+
+  async getAvailableYears(): Promise<GetAvailableYearsResult> {
+    const years = await this.r2Repository.getAvailableYears()
+    const currentYear = this.r2Repository.getCurrentYear()
+    return { years, currentYear }
+  }
+}

package/workers/file-upload/src/usecase/RebuildIndexUseCase.ts

@@ -0,0 +1,182 @@
+/**
+ * RebuildIndexUseCase - files.json の再構築（既存ファイルの移行も行う）
+ */
+
+import type { FileEntry, YearFiles } from '../domain/FileEntity'
+import { logger } from '../infra/LoggerSingleton'
+import type { R2ObjectInfo, R2RepositoryPort } from '../repository/R2RepositoryPort'
+
+export type RebuildIndexParams = {
+  year: number
+}
+
+export type RebuildIndexResult = {
+  success: boolean
+  year: number
+  totalCount: number
+  movedFiles: number
+  movedFilesList: string[]
+}
+
+export class RebuildIndexUseCase {
+  constructor(private r2Repository: R2RepositoryPort) {}
+
+  async execute(params: RebuildIndexParams): Promise<RebuildIndexResult> {
+    const { year } = params
+    logger.info('RebuildIndexUseCase.execute', { year })
+
+    const files: FileEntry[] = []
+    const movedFiles: string[] = []
+
+    // 1. 指定年のファイルを収集
+    const yearObjects = await this.r2Repository.list(`${year}/`)
+    const grouped = this.groupObjectsByUuid(yearObjects, year)
+
+    // 2. 旧形式ファイルを検索し、指定年に移行
+    const allObjects = await this.r2Repository.listAll()
+    const oldFormatGrouped = this.findOldFormatFiles(allObjects, year)
+
+    // 3. 旧形式ファイルを新形式に移行
+    for (const [uuid, objects] of oldFormatGrouped) {
+      for (const obj of objects) {
+        const oldKey = obj.key
+        const correctNewKey = `${year}/${obj.key}`
+
+        // コピーして削除
+        const content = await this.r2Repository.get(oldKey)
+        if (content) {
+          await this.r2Repository.upload({
+            key: correctNewKey,
+            content: content.body,
+            contentType: content.info.httpMetadata?.contentType || 'application/octet-stream',
+            customMetadata: content.info.customMetadata,
+          })
+          await this.r2Repository.delete(oldKey)
+          movedFiles.push(`${oldKey} -> ${correctNewKey}`)
+        }
+      }
+
+      // 移行したファイルを grouped に追加
+      const movedObjects = await this.r2Repository.list(`${year}/${uuid}`)
+      if (movedObjects.length > 0) {
+        grouped.set(uuid, movedObjects)
+      }
+    }
+
+    // 4. ファイルエントリを構築
+    for (const [uuid, objects] of grouped) {
+      const entry = this.buildFileEntry(uuid, objects, year)
+      if (entry) {
+        files.push(entry)
+      }
+    }
+
+    // 5. files.json を書き込み
+    const yearFiles: YearFiles = {
+      year,
+      updatedAt: new Date().toISOString(),
+      totalCount: files.length,
+      totalSize: files.reduce((sum, f) => sum + f.size, 0),
+      files,
+    }
+    await this.r2Repository.writeYearFiles(year, yearFiles)
+
+    logger.info('RebuildIndexUseCase.execute completed', {
+      year,
+      totalCount: files.length,
+      movedFilesCount: movedFiles.length,
+    })
+
+    return {
+      success: true,
+      year,
+      totalCount: files.length,
+      movedFiles: movedFiles.length,
+      movedFilesList: movedFiles,
+    }
+  }
+
+  private groupObjectsByUuid(objects: R2ObjectInfo[], year: number): Map<string, R2ObjectInfo[]> {
+    const grouped = new Map<string, R2ObjectInfo[]>()
+
+    for (const obj of objects) {
+      // files.json は除外
+      if (obj.key === `${year}/files.json`) continue
+
+      const pathAfterYear = obj.key.slice(`${year}/`.length)
+      const uuid = pathAfterYear.includes('/') ? pathAfterYear.split('/')[0] : pathAfterYear.split('.')[0]
+
+      if (!grouped.has(uuid)) grouped.set(uuid, [])
+      grouped.get(uuid)!.push(obj)
+    }
+
+    return grouped
+  }
+
+  private findOldFormatFiles(objects: R2ObjectInfo[], year: number): Map<string, R2ObjectInfo[]> {
+    const grouped = new Map<string, R2ObjectInfo[]>()
+
+    for (const obj of objects) {
+      // 既に年フォルダに入っているものは除外
+      if (/^\d{4}\//.test(obj.key)) continue
+
+      const uuid = obj.key.includes('/') ? obj.key.split('/')[0] : obj.key.split('.')[0]
+      const fileYear = obj.uploaded.getFullYear()
+
+      // 指定年のファイルのみ処理
+      if (fileYear === year) {
+        if (!grouped.has(uuid)) grouped.set(uuid, [])
+        grouped.get(uuid)!.push(obj)
+      }
+    }
+
+    return grouped
+  }
+
+  private buildFileEntry(uuid: string, objects: R2ObjectInfo[], year: number): FileEntry | null {
+    const isImageSet = objects.some((o) => {
+      const pathAfterYear = o.key.slice(`${year}/`.length)
+      return pathAfterYear.includes('/')
+    })
+
+    if (isImageSet) {
+      const variants: Record<string, string> = {}
+      let totalSize = 0
+      let uploadedAt = ''
+      let originalName = ''
+      let uploadedBy = 'unknown'
+
+      for (const obj of objects) {
+        const pathAfterYear = obj.key.slice(`${year}/`.length)
+        const preset = pathAfterYear.split('/')[1]?.replace('.webp', '')
+        if (preset) variants[preset] = obj.key
+        totalSize += obj.size
+        uploadedAt = obj.uploaded.toISOString()
+        originalName = obj.customMetadata?.originalName || uuid
+        uploadedBy = obj.customMetadata?.uploadedBy || 'unknown'
+      }
+
+      return {
+        uuid,
+        originalName,
+        contentType: 'image/webp',
+        size: totalSize,
+        uploadedBy,
+        uploadedAt,
+        url: variants.thumbnail || variants.small || variants.medium || variants.large || variants.original || '',
+        variants,
+      }
+    } else {
+      const obj = objects[0]
+      return {
+        uuid,
+        originalName: obj.customMetadata?.originalName || obj.key,
+        contentType: obj.httpMetadata?.contentType || 'application/octet-stream',
+        size: obj.size,
+        uploadedBy: obj.customMetadata?.uploadedBy || 'unknown',
+        uploadedAt: obj.uploaded.toISOString(),
+        url: obj.key,
+      }
+    }
+  }
+}

package/workers/file-upload/src/usecase/UpdateFileMetadataUseCase.ts

@@ -0,0 +1,43 @@
+/**
+ * UpdateFileMetadataUseCase - ファイルメタデータの更新（alt等）
+ */
+
+import type { FileEntry } from '../domain/FileEntity'
+import { logger } from '../infra/LoggerSingleton'
+import type { R2RepositoryPort } from '../repository/R2RepositoryPort'
+
+export type UpdateFileMetadataParams = {
+  uuid: string
+  year: number
+  alt?: string
+}
+
+export type UpdateFileMetadataResult = FileEntry
+
+export class UpdateFileMetadataUseCase {
+  constructor(private r2Repository: R2RepositoryPort) {}
+
+  async execute(params: UpdateFileMetadataParams): Promise<UpdateFileMetadataResult> {
+    logger.info('UpdateFileMetadataUseCase.execute', params)
+
+    const yearFiles = await this.r2Repository.readYearFiles(params.year)
+    const fileIndex = yearFiles.files.findIndex((f) => f.uuid === params.uuid)
+
+    if (fileIndex === -1) {
+      logger.warn('UpdateFileMetadataUseCase.execute', 'File not found', { uuid: params.uuid })
+      throw new Error('File not found')
+    }
+
+    // alt を更新（空文字は undefined にする）
+    if (params.alt !== undefined) {
+      yearFiles.files[fileIndex].alt = params.alt || undefined
+    }
+
+    yearFiles.updatedAt = new Date().toISOString()
+    await this.r2Repository.writeYearFiles(params.year, yearFiles)
+
+    logger.info('UpdateFileMetadataUseCase.execute completed', { uuid: params.uuid })
+
+    return yearFiles.files[fileIndex]
+  }
+}

package/workers/file-upload/src/usecase/UploadFileUseCase.ts

@@ -0,0 +1,62 @@
+/**
+ * UploadFileUseCase - 単一ファイルのアップロード
+ */
+
+import { createFileEntry, recalculateYearFilesStats, type FileEntry } from '../domain/FileEntity'
+import { logger } from '../infra/LoggerSingleton'
+import type { R2RepositoryPort } from '../repository/R2RepositoryPort'
+
+export type UploadFileParams = {
+  file: File
+  uploadedBy: string
+}
+
+export type UploadFileResult = FileEntry
+
+export class UploadFileUseCase {
+  constructor(private r2Repository: R2RepositoryPort) {}
+
+  async execute(params: UploadFileParams): Promise<UploadFileResult> {
+    logger.info('UploadFileUseCase.execute', {
+      fileName: params.file.name,
+      uploadedBy: params.uploadedBy,
+    })
+
+    const uuid = crypto.randomUUID()
+    const year = this.r2Repository.getCurrentYear()
+    const extension = params.file.name.split('.').pop() || ''
+    const key = extension ? `${year}/${uuid}.${extension}` : `${year}/${uuid}`
+    const uploadedAt = new Date().toISOString()
+
+    // R2 にアップロード
+    await this.r2Repository.upload({
+      key,
+      content: params.file.stream(),
+      contentType: params.file.type,
+      customMetadata: {
+        originalName: params.file.name,
+        uploadedBy: params.uploadedBy,
+      },
+    })
+
+    // files.json を更新（url にはキーのみ保存）
+    const yearFiles = await this.r2Repository.readYearFiles(year)
+    const newEntry = createFileEntry({
+      uuid,
+      originalName: params.file.name,
+      contentType: params.file.type,
+      size: params.file.size,
+      uploadedBy: params.uploadedBy,
+      uploadedAt,
+      publicUrl: key,
+    })
+
+    yearFiles.files.push(newEntry)
+    const updatedYearFiles = recalculateYearFilesStats(yearFiles)
+    await this.r2Repository.writeYearFiles(year, updatedYearFiles)
+
+    logger.info('UploadFileUseCase.execute completed', { uuid })
+
+    return newEntry
+  }
+}

package/workers/file-upload/src/usecase/UploadImageSetUseCase.ts

@@ -0,0 +1,95 @@
+/**
+ * UploadImageSetUseCase - 画像セット（複数プリセット）のアップロード
+ */
+
+import {
+  createFileEntry,
+  PRESET_NAMES,
+  recalculateYearFilesStats,
+  selectThumbnailUrl,
+  type FileEntry,
+  type PresetName,
+} from '../domain/FileEntity'
+import { logger } from '../infra/LoggerSingleton'
+import type { R2RepositoryPort } from '../repository/R2RepositoryPort'
+
+export type UploadImageSetParams = {
+  originalName: string
+  uploadedBy: string
+  files: Map<PresetName, File>
+  width?: number
+  height?: number
+}
+
+export type UploadImageSetResult = FileEntry & {
+  variants: Record<string, string>
+}
+
+export class UploadImageSetUseCase {
+  constructor(private r2Repository: R2RepositoryPort) {}
+
+  async execute(params: UploadImageSetParams): Promise<UploadImageSetResult> {
+    logger.info('UploadImageSetUseCase.execute', {
+      originalName: params.originalName,
+      uploadedBy: params.uploadedBy,
+      presetCount: params.files.size,
+    })
+
+    const uuid = crypto.randomUUID()
+    const year = this.r2Repository.getCurrentYear()
+    const uploadedAt = new Date().toISOString()
+    const variants: Record<string, string> = {}
+    let totalSize = 0
+
+    // 各プリセットをアップロード
+    for (const name of PRESET_NAMES) {
+      const file = params.files.get(name)
+      if (file) {
+        const key = `${year}/${uuid}/${name}.webp`
+        await this.r2Repository.upload({
+          key,
+          content: file.stream(),
+          contentType: 'image/webp',
+          customMetadata: {
+            originalName: params.originalName,
+            uploadedBy: params.uploadedBy,
+          },
+        })
+        variants[name] = key
+        totalSize += file.size
+      }
+    }
+
+    const thumbnailUrl = selectThumbnailUrl(variants)
+
+    // files.json を更新
+    const yearFiles = await this.r2Repository.readYearFiles(year)
+    const newEntry = createFileEntry({
+      uuid,
+      originalName: params.originalName,
+      contentType: 'image/webp',
+      size: totalSize,
+      uploadedBy: params.uploadedBy,
+      uploadedAt,
+      publicUrl: thumbnailUrl,
+      width: params.width,
+      height: params.height,
+      variants,
+    })
+
+    yearFiles.files.push(newEntry)
+    const updatedYearFiles = recalculateYearFilesStats(yearFiles)
+    await this.r2Repository.writeYearFiles(year, updatedYearFiles)
+
+    logger.info('UploadImageSetUseCase.execute completed', { uuid, variantCount: Object.keys(variants).length })
+
+    return newEntry as UploadImageSetResult
+  }
+
+  /**
+   * プリウォーム用の URL 一覧を取得
+   */
+  getPrewarmUrls(variants: Record<string, string>): string[] {
+    return Object.values(variants)
+  }
+}

package/workers/file-upload/src/usecase/ValidateAuthUseCase.ts

@@ -0,0 +1,26 @@
+/**
+ * ValidateAuthUseCase - Authorization ヘッダーからトークンを検証する
+ */
+
+import { AuthError } from '../domain/AuthEntity'
+import type { GitHubUser } from '../domain/AuthEntity'
+import type { AuthRepositoryPort } from '../repository/AuthRepositoryPort'
+
+export class ValidateAuthUseCase {
+  constructor(private authRepository: AuthRepositoryPort) {}
+
+  async execute(authHeader: string | null): Promise<GitHubUser> {
+    if (!authHeader || !authHeader.startsWith('Bearer ')) {
+      throw new AuthError('Missing or invalid Authorization header', 401)
+    }
+
+    const token = authHeader.slice(7)
+    const user = await this.authRepository.validateToken(token)
+
+    if (!user) {
+      throw new AuthError('Invalid token', 401)
+    }
+
+    return user
+  }
+}

package/workers/file-upload/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "lib": ["ES2022"],
+    "types": ["@cloudflare/workers-types"],
+    "strict": true,
+    "noEmit": true,
+    "skipLibCheck": true
+  },
+  "include": ["src/**/*"]
+}

package/workers/file-upload/wrangler.toml.example

@@ -0,0 +1,11 @@
+name = "frelio-file-upload"
+main = "src/index.ts"
+compatibility_date = "2024-02-08"
+
+[[r2_buckets]]
+binding = "R2"
+bucket_name = "<your-r2-bucket-name>"
+
+[vars]
+R2_PUBLIC_URL = "<your-r2-public-url>"
+ALLOWED_ORIGINS = "<comma-separated-allowed-origins>"