Upload uploader.js

src/lib/uploader.js

@@ -16,7 +16,7 @@ class ImageUploader {
     return crypto.createHash('sha256').update(buffer).digest('hex')
   }
 
-  async uploadImage(imageBuffer, imageName) {
+  async uploadImage(imageBuffer, imageName, forceUpload = false) {
     // 确保参数有效
     if (!imageBuffer || !Buffer.isBuffer(imageBuffer)) {
       throw new Error('无效的图片数据')
@@ -28,14 +28,16 @@ class ImageUploader {
 
     // 生成图片数据的哈希值作为缓存key
     const imageHash = this.generateHash(imageBuffer)
-    
-    // 检查缓存中是否已存在该图片的上传结果
-    if (this.imageCache.has(imageHash)) {
-      console.log(`图片缓存命中: ${imageHash.substring(0, 8)}...`)
-      return this.imageCache.get(imageHash)
+
+    // 检查缓存中是否已存在该图片的上传结果（除非强制上传）
+    if (!forceUpload && this.imageCache.has(imageHash)) {
+      console.log(`[缓存命中] 图片哈希: ${imageHash.substring(0, 8)}...`)
+      const cachedUrl = this.imageCache.get(imageHash)
+      console.log(`[缓存返回] URL: ${cachedUrl}`)
+      return cachedUrl
     }
-    
-    console.log(`图片缓存未命中，开始上传: ${imageHash.substring(0, 8)}...`)
+
+    console.log(`[开始上传] 图片哈希: ${imageHash.substring(0, 8)}... ${forceUpload ? '(强制上传)' : '(缓存未命中)'}`)
 
     // 获取一个可用的cookie
     const cookieValue = accountManager.getNextAvailableCookie()
@@ -66,11 +68,11 @@ class ImageUploader {
       // 检查响应
       if (response.data && response.data.location) {
         const imageUrl = response.data.location
-        
+
         // 将结果保存到缓存
         this.imageCache.set(imageHash, imageUrl)
-        console.log(`图片上传成功并缓存: ${imageHash.substring(0, 8)}... -> ${imageUrl}`)
-        
+        console.log(`[上传成功] 图片哈希: ${imageHash.substring(0, 8)}... -> ${imageUrl}`)
+
         return imageUrl
       } else {
         throw new Error('上传成功但返回格式不正确')
@@ -80,9 +82,9 @@ class ImageUploader {
       if (error.response && error.response.status === 403) {
         accountManager.markAsUnavailable(cookieValue)
         // 递归尝试使用新账号
-        return this.uploadImage(imageBuffer, imageName)
+        return this.uploadImage(imageBuffer, imageName, forceUpload)
       }
-      
+
       throw new Error(`图片上传失败: ${error.message}`)
     }
   }
@@ -156,10 +158,13 @@ class ImageUploader {
    * @param {string} imageName - 图片名称
    * @param {string} requestId - 请求ID（用于日志）
    * @param {number} imageIndex - 图片索引（用于日志）
+   * @param {boolean} preserveOrder - 是否保持顺序（禁用缓存优化）
    * @returns {Promise<Array<string>>} 上传后的URL数组
    */
-  async uploadImageSmart(imageBuffer, imageName, requestId = null, imageIndex = 0) {
+  async uploadImageSmart(imageBuffer, imageName, requestId = null, imageIndex = 0, preserveOrder = false) {
     try {
+      console.log(`[智能上传] 开始处理图片${imageIndex + 1}，保持顺序: ${preserveOrder}`)
+
       // 检测是否为长图
       const detection = await imageProcessor.detectLongImage(imageBuffer)
 
@@ -169,12 +174,16 @@ class ImageUploader {
 
       if (!detection.isLongImage) {
         // 不是长图，使用原有方式上传
-        const url = await this.uploadImage(imageBuffer, imageName)
+        console.log(`[智能上传] 图片${imageIndex + 1}为普通图片，开始上传`)
+
+        // 如果需要保持顺序，则禁用缓存优化
+        const url = await this.uploadImage(imageBuffer, imageName, preserveOrder)
 
         if (requestId) {
           logger.logImageUpload(requestId, imageIndex, 0, true, url)
         }
 
+        console.log(`[智能上传] 图片${imageIndex + 1}上传完成: ${url}`)
         return [url]
       }
 
@@ -262,9 +271,10 @@ class ImageUploader {
    * @param {string} imageName - 图片名称
    * @param {string} requestId - 请求ID（用于日志）
    * @param {number} imageIndex - 图片索引（用于日志）
+   * @param {boolean} preserveOrder - 是否保持顺序（禁用缓存优化）
    * @returns {Promise<Array<string>>} 上传后的URL数组
    */
-  async uploadFromBase64Smart(base64String, imageName, requestId = null, imageIndex = 0) {
+  async uploadFromBase64Smart(base64String, imageName, requestId = null, imageIndex = 0, preserveOrder = false) {
     // 处理base64字符串，移除可能的前缀
     const base64Data = base64String.replace(/^data:image\/\w+;base64,/, '')
     const buffer = Buffer.from(base64Data, 'base64')
@@ -282,7 +292,7 @@ class ImageUploader {
       imageName = `image_${hash}_${Date.now()}.${fileExt}`
     }
 
-    return this.uploadImageSmart(buffer, imageName, requestId, imageIndex)
+    return this.uploadImageSmart(buffer, imageName, requestId, imageIndex, preserveOrder)
   }
 
   /**
@@ -291,9 +301,10 @@ class ImageUploader {
    * @param {string} imageName - 图片名称
    * @param {string} requestId - 请求ID（用于日志）
    * @param {number} imageIndex - 图片索引（用于日志）
+   * @param {boolean} preserveOrder - 是否保持顺序（禁用缓存优化）
    * @returns {Promise<Array<string>>} 上传后的URL数组
    */
-  async uploadFromUrlSmart(imageUrl, imageName, requestId = null, imageIndex = 0) {
+  async uploadFromUrlSmart(imageUrl, imageName, requestId = null, imageIndex = 0, preserveOrder = false) {
     try {
       // 下载图片
       const response = await axios.get(imageUrl, {
@@ -316,7 +327,7 @@ class ImageUploader {
         imageName = `image_${hash}_${Date.now()}.${fileExt}`
       }
 
-      return this.uploadImageSmart(buffer, imageName, requestId, imageIndex)
+      return this.uploadImageSmart(buffer, imageName, requestId, imageIndex, preserveOrder)
     } catch (error) {
       throw new Error(`从URL获取图片失败: ${error.message}`)
     }