Upload 13 files

index.html

@@ -1653,8 +1653,8 @@
             if (queue.length === 0) return;
 
             this.thumbProcessing = true;
-            const maxWidth = Device.isMobile ? 360 : 768;
-            const quality = Device.isMobile ? 0.6 : 0.76;
+            const maxWidth = Device.isMobile ? 640 : 768;
+            const quality = Device.isMobile ? 0.75 : 0.76;
             const processNext = async () => {
                 const item = queue.shift();
                 if (!item) {
@@ -1667,14 +1667,7 @@
                     return;
                 }
                 const source = item.image || item.imageUrl;
-                let sourceForThumb = source;
-                if (Device.isMobile && sourceForThumb && sourceForThumb.startsWith('data:image') && sourceForThumb.length > 900000) {
-                    const reduced = await ImageHandler.reduceImageForMobile(sourceForThumb);
-                    if (reduced) {
-                        sourceForThumb = reduced;
-                    }
-                }
-                const thumb = await ImageHandler.createThumbnail(sourceForThumb, maxWidth, quality);
+                const thumb = await ImageHandler.createThumbnail(source, maxWidth, quality);
                 if (thumb && thumb !== source) {
                     item.thumb = thumb;
                     Database.update(item.id, { thumb }).catch(() => {});
@@ -2390,8 +2383,8 @@
             if (queue.length === 0) return;
 
             this.thumbProcessing = true;
-            const maxWidth = 360;
-            const quality = 0.6;
+            const maxWidth = 640;
+            const quality = 0.75;
             const processNext = async () => {
                 const item = queue.shift();
                 if (!item) {
@@ -2404,14 +2397,7 @@
                     return;
                 }
                 const source = item.image || item.imageUrl;
-                let sourceForThumb = source;
-                if (sourceForThumb && sourceForThumb.startsWith('data:image') && sourceForThumb.length > 900000) {
-                    const reduced = await ImageHandler.reduceImageForMobile(sourceForThumb);
-                    if (reduced) {
-                        sourceForThumb = reduced;
-                    }
-                }
-                const thumb = await ImageHandler.createThumbnail(sourceForThumb, maxWidth, quality);
+                const thumb = await ImageHandler.createThumbnail(source, maxWidth, quality);
                 if (thumb && thumb !== source) {
                     item.thumb = thumb;
                 }
@@ -2960,7 +2946,7 @@
                     prompt: prompt,
                     images: AppState.currentImages,
                     preferUrl: false,
-                    imageSize: Device.isMobile ? '1K' : '4K'
+                    imageSize: '4K'
                 };
 
                 const response = await apiFetch('/api/generate', {
@@ -3025,14 +3011,9 @@
                 if (Device.isMobile && previewImage.startsWith('data:image') && previewImage.length > 900000) {
                     const reduceTask = async () => {
                         try {
-                            let sourceForThumb = previewImage;
-                            const reduced = await ImageHandler.reduceImageForMobile(sourceForThumb);
-                            if (reduced) {
-                                sourceForThumb = reduced;
-                            }
                             if (!newItem.thumb) {
-                                const newThumb = await ImageHandler.createThumbnail(sourceForThumb, 360, 0.6);
-                                if (newThumb && newThumb !== sourceForThumb) {
+                                const newThumb = await ImageHandler.createThumbnail(previewImage, 640, 0.75);
+                                if (newThumb && newThumb !== previewImage) {
                                     newItem.thumb = newThumb;
                                 }
                             }

server.js

@@ -87,12 +87,12 @@ const authMiddleware = (req, res, next) => {
 // ============================================
 // 图片数据解析模块
 // ============================================
-const ImageParser = {
+const ImageParser = {
     /**
      * 从 assistant content 中提取 base64 图片数据
      * 格式: ![Generated Image](data:image/png;base64,xxxxx)
      */
-    extractBase64FromMarkdown(content) {
+    extractBase64FromMarkdown(content) {
         if (!content || typeof content !== 'string') {
             return null;
         }
@@ -116,13 +116,30 @@ const ImageParser = {
         }
 
         return null;
-    },
-
-    isValidBase64Image(base64Data) {
-        if (!base64Data) return false;
-        return base64Data.startsWith('data:image/');
-    }
-};
+    },
+
+    normalizeBase64Image(value) {
+        if (!value || typeof value !== 'string') return null;
+        const trimmed = value.trim();
+        if (!trimmed) return null;
+        if (trimmed.startsWith('data:image/')) {
+            return trimmed;
+        }
+        if (/^https?:\/\//i.test(trimmed)) {
+            return trimmed;
+        }
+        const cleaned = trimmed.replace(/\s+/g, '');
+        if (/^[A-Za-z0-9+/=_-]+$/.test(cleaned) && cleaned.length > 2000) {
+            return `data:image/png;base64,${cleaned}`;
+        }
+        return null;
+    },
+
+    isValidBase64Image(base64Data) {
+        if (!base64Data) return false;
+        return base64Data.startsWith('data:image/');
+    }
+};
 
 // ============================================
 // 消息构建模块
@@ -214,7 +231,7 @@ const APIService = {
     /**
      * Extract image from Gemini response
      */
-    extractImageFromResponse(data) {
+    extractImageFromResponse(data) {
         console.log(`[${new Date().toISOString()}] API response type:`, typeof data);
         console.log(`[${new Date().toISOString()}] API response keys:`, Object.keys(data || {}));
 
@@ -225,34 +242,89 @@ const APIService = {
             throw new Error(`API returned error: ${message}`);
         }
 
-        const candidates = Array.isArray(data.candidates) ? data.candidates : [];
-        for (const candidate of candidates) {
-            const parts = candidate?.content?.parts || [];
-            for (const part of parts) {
-                const inlineData = part.inlineData || part.inline_data;
-                if (inlineData && inlineData.data) {
-                    const mimeType = inlineData.mimeType || inlineData.mime_type || 'image/png';
-                    return `data:${mimeType};base64,${inlineData.data}`;
-                }
-                if (part.text) {
-                    const imageData = ImageParser.extractBase64FromMarkdown(part.text);
-                    if (imageData && ImageParser.isValidBase64Image(imageData)) {
-                        return imageData;
-                    }
-                }
-            }
-        }
-
-        if (data.data && data.data[0]) {
-            if (data.data[0].b64_json) {
-                console.log(`[${new Date().toISOString()}] Using DALL-E b64_json format`);
-                return `data:image/png;base64,${data.data[0].b64_json}`;
-            }
-            if (data.data[0].url) {
-                console.log(`[${new Date().toISOString()}] Using DALL-E URL format`);
-                return data.data[0].url;
-            }
-        }
+        const candidates = Array.isArray(data.candidates) ? data.candidates : [];
+        for (const candidate of candidates) {
+            const parts = candidate?.content?.parts || [];
+            for (const part of parts) {
+                const inlineData = part.inlineData || part.inline_data;
+                if (inlineData && inlineData.data) {
+                    const mimeType = inlineData.mimeType || inlineData.mime_type || 'image/png';
+                    return `data:${mimeType};base64,${inlineData.data}`;
+                }
+                if (part.text) {
+                    const imageData = ImageParser.extractBase64FromMarkdown(part.text);
+                    if (imageData && ImageParser.isValidBase64Image(imageData)) {
+                        return imageData;
+                    }
+                    const normalizedText = ImageParser.normalizeBase64Image(part.text);
+                    if (normalizedText) {
+                        return normalizedText;
+                    }
+                }
+            }
+        }
+
+        const extractFromValue = (value) => {
+            if (!value) return null;
+            if (typeof value === 'string') {
+                return ImageParser.normalizeBase64Image(value);
+            }
+            if (typeof value === 'object') {
+                if (value.data) {
+                    const mimeType = value.mimeType || value.mime_type || 'image/png';
+                    return `data:${mimeType};base64,${value.data}`;
+                }
+                if (value.b64_json) {
+                    return `data:image/png;base64,${value.b64_json}`;
+                }
+                if (value.url) {
+                    return value.url;
+                }
+            }
+            return null;
+        };
+
+        const directCandidates = [
+            data.image,
+            data.image_base64,
+            data.imageBase64,
+            data.base64,
+            data.b64_json,
+            data.result,
+            data.output
+        ];
+        for (const entry of directCandidates) {
+            const extracted = extractFromValue(entry);
+            if (extracted) return extracted;
+        }
+
+        if (Array.isArray(data.images)) {
+            for (const entry of data.images) {
+                const extracted = extractFromValue(entry);
+                if (extracted) return extracted;
+            }
+        }
+
+        if (Array.isArray(data.output)) {
+            for (const output of data.output) {
+                const content = Array.isArray(output?.content) ? output.content : [];
+                for (const part of content) {
+                    const extracted = extractFromValue(part?.image || part?.image_url || part?.b64_json || part);
+                    if (extracted) return extracted;
+                }
+            }
+        }
+
+        if (data.data && data.data[0]) {
+            if (data.data[0].b64_json) {
+                console.log(`[${new Date().toISOString()}] Using DALL-E b64_json format`);
+                return `data:image/png;base64,${data.data[0].b64_json}`;
+            }
+            if (data.data[0].url) {
+                console.log(`[${new Date().toISOString()}] Using DALL-E URL format`);
+                return data.data[0].url;
+            }
+        }
 
         console.log(`[${new Date().toISOString()}] Full API response:`, JSON.stringify(data, null, 2));
         throw new Error('Unable to extract image data from API response.');