refactor(s3): replace AWS SDK S3 types with custom S3ObjectLike interface

- Removed dependencies on AWS SDK's S3 types in favor of a custom S3ObjectLike interface for better type management.
- Updated various services and components to utilize the new S3ObjectLike type, enhancing code clarity and maintainability.
- Introduced a SimpleS3Client interface to streamline S3 client interactions and improve fetch handling.
- Added fast-xml-parser for XML response parsing in S3 operations, enhancing object listing functionality.

Signed-off-by: Innei <tukon479@gmail.com>

Author: Innei

be/apps/core/src/modules/content/photo/builder/photo-builder.service.ts

@@ -4,6 +4,7 @@ import type {
   PhotoManifestItem,
   PhotoProcessingContext,
   PhotoProcessorOptions,
+  S3ObjectLike,
   StorageConfig,
   StorageObject,
 } from '@afilmory/builder'
@@ -19,7 +20,6 @@ import {
   createStorageKeyNormalizer,
   runWithPhotoExecutionContext,
 } from '@afilmory/builder/photo/index.js'
-import type { _Object } from '@aws-sdk/client-s3'
 import { logger as coreLogger } from 'core/helpers/logger.helper'
 import { injectable } from 'tsyringe'
 
@@ -126,7 +126,7 @@ export class PhotoBuilderService {
     }
   }
 
-  private toLegacyObject(object: StorageObject): _Object {
+  private toLegacyObject(object: StorageObject): S3ObjectLike {
     return {
       Key: object.key,
       Size: object.size,
@@ -135,12 +135,12 @@ export class PhotoBuilderService {
     }
   }
 
-  private toLegacyLivePhotoMap(livePhotoMap?: Map<string, StorageObject>): Map<string, _Object> {
+  private toLegacyLivePhotoMap(livePhotoMap?: Map<string, StorageObject>): Map<string, S3ObjectLike> {
     if (!livePhotoMap) {
       return new Map()
     }
 
-    const result = new Map<string, _Object>()
+    const result = new Map<string, S3ObjectLike>()
 
     for (const [key, value] of livePhotoMap) {
       result.set(key, this.toLegacyObject(value))

be/apps/dashboard/src/modules/photos/components/sync/PhotoSyncResultPanel.tsx

@@ -342,11 +342,14 @@ export function PhotoSyncResultPanel({
                 type="button"
                 size="xs"
                 variant={selectedActionType === filter.type ? 'primary' : 'ghost'}
-                className="gap-1"
+                className="gap-1 group"
+                data-selected={selectedActionType === filter.type}
                 onClick={() => handleSelectActionType(filter.type)}
               >
                 <span>{filter.label}</span>
-                <span className="text-text-tertiary text-[11px]">{filter.count}</span>
+                <span className="text-text-tertiary text-[11px] group-data-[selected=true]:text-text">
+                  {filter.count}
+                </span>
               </Button>
             ))}
           </div>

packages/builder/package.json

@@ -12,15 +12,13 @@
     "cli": "tsx src/cli.ts"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.929.0",
-    "@aws-sdk/node-http-handler": "3.374.0",
-    "@aws-sdk/s3-request-presigner": "3.929.0",
     "@vingle/bmp-js": "^0.2.5",
     "blurhash": "2.0.5",
     "c12": "^3.3.2",
     "dotenv-expand": "catalog:",
     "execa": "9.6.0",
     "exiftool-vendored": "31.1.0",
+    "fast-xml-parser": "4.4.1",
     "heic-convert": "2.1.0",
     "heic-to": "1.3.0",
     "sharp": "0.34.5",
@@ -44,4 +42,4 @@
       }
     }
   }
-}
+}

packages/builder/src/index.ts

@@ -39,3 +39,4 @@ export { StorageFactory, StorageManager } from './storage/index.js'
 export type { BuilderConfig, BuilderConfigInput } from './types/config.js'
 export type { AfilmoryManifest, CameraInfo, LensInfo } from './types/manifest.js'
 export type { FujiRecipe, PhotoManifestItem, PickedExif, ToneAnalysis } from './types/photo.js'
+export type { S3ObjectLike } from './types/s3.js'

packages/builder/src/manifest/manager.ts

@@ -2,11 +2,11 @@ import fs from 'node:fs/promises'
 import path, { basename } from 'node:path'
 
 import { workdir } from '@afilmory/builder/path.js'
-import type { _Object } from '@aws-sdk/client-s3'
 
 import { logger } from '../logger/index.js'
 import type { AfilmoryManifest, CameraInfo, LensInfo } from '../types/manifest.js'
 import type { PhotoManifestItem } from '../types/photo.js'
+import type { S3ObjectLike } from '../types/s3.js'
 import { migrateManifestFileIfNeeded } from './migrate.js'
 import { CURRENT_MANIFEST_VERSION } from './version.js'
 
@@ -45,7 +45,7 @@ export async function loadExistingManifest(): Promise<AfilmoryManifest> {
 }
 
 // 检查照片是否需要更新（基于最后修改时间）
-export function needsUpdate(existingItem: PhotoManifestItem | undefined, s3Object: _Object): boolean {
+export function needsUpdate(existingItem: PhotoManifestItem | undefined, s3Object: S3ObjectLike): boolean {
   if (!existingItem) return true
   if (!s3Object.LastModified) return true
 

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

@@ -2,7 +2,6 @@ import crypto from 'node:crypto'
 import path from 'node:path'
 
 import { compressUint8Array } from '@afilmory/utils'
-import type { _Object } from '@aws-sdk/client-s3'
 import sharp from 'sharp'
 
 import type { BuilderOptions } from '../builder/builder.js'
@@ -15,6 +14,7 @@ import {
 import type { PluginRunState } from '../plugins/manager.js'
 import { THUMBNAIL_PLUGIN_DATA_KEY } from '../plugins/thumbnail-storage/shared.js'
 import type { PhotoManifestItem, ProcessPhotoResult } from '../types/photo.js'
+import type { S3ObjectLike } from '../types/s3.js'
 import { shouldProcessPhoto } from './cache-manager.js'
 import { processExifData, processThumbnailAndBlurhash, processToneAnalysis } from './data-processors.js'
 import { getPhotoExecutionContext } from './execution-context.js'
@@ -32,9 +32,9 @@ export interface ProcessedImageData {
 
 export interface PhotoProcessingContext {
   photoKey: string
-  obj: _Object
+  obj: S3ObjectLike
   existingItem: PhotoManifestItem | undefined
-  livePhotoMap: Map<string, _Object>
+  livePhotoMap: Map<string, S3ObjectLike>
   options: PhotoProcessorOptions
   pluginData: Record<string, unknown>
 }

packages/builder/src/photo/live-photo-handler.ts

@@ -1,7 +1,6 @@
-import type { _Object } from '@aws-sdk/client-s3'
-
 import type { StorageManager } from '../storage/index.js'
 import type { StorageObject } from '../storage/interfaces.js'
+import type { S3ObjectLike } from '../types/s3.js'
 import { getGlobalLoggers } from './logger-adapter.js'
 
 export interface LivePhotoResult {
@@ -19,7 +18,7 @@ export interface LivePhotoResult {
  */
 export async function processLivePhoto(
   photoKey: string,
-  livePhotoMap: Map<string, _Object | StorageObject>,
+  livePhotoMap: Map<string, S3ObjectLike | StorageObject>,
   storageManager: StorageManager,
 ): Promise<LivePhotoResult> {
   const loggers = getGlobalLoggers()
@@ -32,10 +31,10 @@ export async function processLivePhoto(
 
   // 处理不同类型的视频对象
   let videoKey: string
-  if ('Key' in livePhotoVideo && livePhotoVideo.Key) {
+  if ('Key' in livePhotoVideo && typeof livePhotoVideo.Key === 'string') {
     // _Object 类型
     videoKey = livePhotoVideo.Key
-  } else if ('key' in livePhotoVideo && livePhotoVideo.key) {
+  } else if ('key' in livePhotoVideo && typeof livePhotoVideo.key === 'string') {
     // StorageObject 类型
     videoKey = livePhotoVideo.key
   } else {
@@ -59,7 +58,7 @@ export async function processLivePhoto(
  * @param objects S3 对象列表
  * @returns Live Photo 映射表
  */
-export function createLivePhotoMap(objects: _Object[]): Map<string, _Object>
+export function createLivePhotoMap(objects: S3ObjectLike[]): Map<string, S3ObjectLike>
 
 /**
  * 创建 Live Photo 映射表 (兼容 StorageObject 类型)
@@ -69,16 +68,18 @@ export function createLivePhotoMap(objects: _Object[]): Map<string, _Object>
  */
 export function createLivePhotoMap(objects: StorageObject[]): Map<string, StorageObject>
 
-export function createLivePhotoMap(objects: _Object[] | StorageObject[]): Map<string, _Object | StorageObject> {
-  const livePhotoMap = new Map<string, _Object | StorageObject>()
+export function createLivePhotoMap(
+  objects: S3ObjectLike[] | StorageObject[],
+): Map<string, S3ObjectLike | StorageObject> {
+  const livePhotoMap = new Map<string, S3ObjectLike | StorageObject>()
 
   // 分离照片和视频文件
-  const photos: (_Object | StorageObject)[] = []
-  const videos: (_Object | StorageObject)[] = []
+  const photos: (S3ObjectLike | StorageObject)[] = []
+  const videos: (S3ObjectLike | StorageObject)[] = []
 
   for (const obj of objects) {
     // 获取 key，兼容两种类型
-    const key = 'Key' in obj ? obj.Key : (obj as StorageObject).key
+    const key = 'Key' in obj ? (typeof obj.Key === 'string' ? obj.Key : undefined) : (obj as StorageObject).key
     if (!key) continue
 
     const ext = key.toLowerCase().split('.').pop()
@@ -91,14 +92,16 @@ export function createLivePhotoMap(objects: _Object[] | StorageObject[]): Map<st
 
   // 匹配 Live Photo
   for (const photo of photos) {
-    const photoKey = 'Key' in photo ? photo.Key : (photo as StorageObject).key
+    const photoKey =
+      'Key' in photo ? (typeof photo.Key === 'string' ? photo.Key : undefined) : (photo as StorageObject).key
     if (!photoKey) continue
 
     const photoBaseName = photoKey.replace(/\.[^/.]+$/, '')
 
     // 查找对应的视频文件
     const matchingVideo = videos.find((video) => {
-      const videoKey = 'Key' in video ? video.Key : (video as StorageObject).key
+      const videoKey =
+        'Key' in video ? (typeof video.Key === 'string' ? video.Key : undefined) : (video as StorageObject).key
       if (!videoKey) return false
       const videoBaseName = videoKey.replace(/\.[^/.]+$/, '')
       return videoBaseName === photoBaseName

packages/builder/src/photo/processor.ts

@@ -1,9 +1,8 @@
-import type { _Object } from '@aws-sdk/client-s3'
-
 import type { AfilmoryBuilder, BuilderOptions } from '../builder/builder.js'
 import { logger } from '../logger/index.js'
 import type { PluginRunState } from '../plugins/manager.js'
 import type { PhotoManifestItem, ProcessPhotoResult } from '../types/photo.js'
+import type { S3ObjectLike } from '../types/s3.js'
 import { createStorageKeyNormalizer, runWithPhotoExecutionContext } from './execution-context.js'
 import type { PhotoProcessingContext } from './image-pipeline.js'
 import { processPhotoWithPipeline } from './image-pipeline.js'
@@ -17,12 +16,12 @@ export interface PhotoProcessorOptions {
 
 // 处理单张照片
 export async function processPhoto(
-  obj: _Object,
+  obj: S3ObjectLike,
   index: number,
   workerId: number,
   totalImages: number,
   existingManifestMap: Map<string, PhotoManifestItem>,
-  livePhotoMap: Map<string, _Object>,
+  livePhotoMap: Map<string, S3ObjectLike>,
   options: PhotoProcessorOptions,
   builder: AfilmoryBuilder,
   pluginRuntime: {