fix: thumbnails cache not working when digest suffix is enabled

Author: woolen-sheep

packages/builder/src/photo/cache-manager.ts

@@ -1,4 +1,3 @@
-import path from 'node:path'
 
 import { thumbnailExists } from '../image/thumbnail.js'
 import type { PhotoManifestItem } from '../types/photo.js'
@@ -19,13 +18,11 @@ export interface CacheableData {
  * 考虑文件更新状态和缓存存在性
  */
 export async function shouldProcessPhoto(
-  photoKey: string,
+  photoId: string,
   existingItem: PhotoManifestItem | undefined,
   obj: { LastModified?: Date; ETag?: string },
   options: PhotoProcessorOptions,
 ): Promise<{ shouldProcess: boolean; reason: string }> {
-  const photoId = path.basename(photoKey, path.extname(photoKey))
-
   // 强制模式下总是处理
   if (options.isForceMode) {
     return { shouldProcess: true, reason: '强制模式' }

packages/builder/src/photo/image-pipeline.ts

@@ -133,7 +133,7 @@ export async function processImageWithSharp(
  * @param s3Key S3键
  * @returns 带摘要后缀的ID
  */
-function generatePhotoId(s3Key: string): string {
+async function generatePhotoId(s3Key: string): Promise<string> {
   const { options } = defaultBuilder.getConfig()
   const { digestSuffixLength } = options
   if (!digestSuffixLength || digestSuffixLength <= 0) {
@@ -157,7 +157,7 @@ export async function executePhotoProcessingPipeline(
   const loggers = getGlobalLoggers()
 
   // Generate the actual photo ID with digest suffix
-  const photoId = generatePhotoId(photoKey)
+  const photoId = await generatePhotoId(photoKey)
 
   try {
     // 1. 预处理图片
@@ -256,9 +256,11 @@ export async function processPhotoWithPipeline(
   const { photoKey, existingItem, obj, options } = context
   const loggers = getGlobalLoggers()
 
+  const photoId = await generatePhotoId(photoKey)
+
   // 检查是否需要处理
   const { shouldProcess, reason } = await shouldProcessPhoto(
-    photoKey,
+    photoId,
     existingItem,
     obj,
     options,