Upload 13 files

index.html

@@ -230,13 +230,15 @@
                 const store = tx.objectStore(STORE_NAME);
                 
                 // 直接存储完整对象，不做任何转换
-                const record = {
-                    prompt: item.prompt,
-                    image: item.image,           // 完整的 data:image/... 字符串
-                    thumb: item.thumb || null,   // 缩略图（用于加速列表渲染）
-                    inputImages: item.inputImages || [],
-                    timestamp: Date.now()
-                };
+                const record = {
+                    prompt: item.prompt,
+                    image: item.image,           // data:image/... 或 /generated/... URL
+                    imageUrl: item.imageUrl || null,
+                    imageId: item.imageId || null,
+                    thumb: item.thumb || null,   // 缩略图（用于加速列表渲染）
+                    inputImages: item.inputImages || [],
+                    timestamp: Date.now()
+                };
                 
                 const request = store.add(record);
                 request.onsuccess = () => resolve(request.result);
@@ -689,8 +691,8 @@
             img.loading = 'lazy';
             img.decoding = 'async';
             img.fetchPriority = 'low';
-            const displaySrc = item.thumb || item.image;
-            LazyImageLoader.observe(img, displaySrc);
+            const displaySrc = item.thumb || item.image || item.imageUrl;
+            LazyImageLoader.observe(img, displaySrc);
             img.alt = `作品 ${item.id}`;
             img.onerror = () => {
                 console.error('图片加载失败, ID:', item.id);
@@ -777,14 +779,14 @@
             }
         },
 
-        downloadImage(item) {
-            const link = document.createElement('a');
-            link.href = item.image || item.thumb;
-            link.download = `banana-pro-${item.id}-${Date.now()}.png`;
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-        },
+        downloadImage(item) {
+            const link = document.createElement('a');
+            link.href = item.image || item.imageUrl || item.thumb;
+            link.download = `banana-pro-${item.id}-${Date.now()}.png`;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+        },
         
         async deleteItem(id) {
             if (!confirm('确定要删除这张图片吗？')) return;
@@ -837,7 +839,7 @@
             AppState.currentModalItem = item;
             
             // 设置主图 - 直接赋值
-            this.imgEl.src = item.image || item.thumb || '';
+            this.imgEl.src = item.image || item.imageUrl || item.thumb || '';
             
             // 设置提示词
             this.promptEl.textContent = item.prompt;
@@ -1094,7 +1096,8 @@
             img.loading = 'lazy';
             img.decoding = 'async';
             img.fetchPriority = 'low';
-            LazyImageLoader.observe(img, item.image);
+            const imageSrc = item.image || item.imageUrl;
+            LazyImageLoader.observe(img, imageSrc);
             img.alt = item.prompt || '创意作品';
             card.appendChild(img);
 
@@ -1173,15 +1176,29 @@
             }
 
             try {
-                const res = await fetch('/api/public-gallery', {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                        prompt: item.prompt,
-                        image: item.image,
-                        inputImages: item.inputImages || []
-                    })
-                });
+                const payload = {
+                    prompt: item.prompt,
+                    inputImages: item.inputImages || []
+                };
+
+                const sourceImage = item.image || item.imageUrl;
+                if (sourceImage && typeof sourceImage === 'string') {
+                    if (sourceImage.startsWith('data:image')) {
+                        payload.image = sourceImage;
+                    } else {
+                        payload.imageUrl = sourceImage;
+                    }
+                }
+
+                if (item.imageId) {
+                    payload.imageId = item.imageId;
+                }
+
+                const res = await fetch('/api/public-gallery', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(payload)
+                });
 
                 const data = await res.json();
 
@@ -1340,10 +1357,11 @@
                 const response = await fetch('/api/generate', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                        prompt: prompt,
-                        images: AppState.currentImages
-                    }),
+                    body: JSON.stringify({
+                        prompt: prompt,
+                        images: AppState.currentImages,
+                        preferUrl: Device.isMobile
+                    }),
                     signal: controller.signal
                 });
                 clearTimeout(timeoutId);
@@ -1354,19 +1372,23 @@
                     throw new Error(data.message || "\u751f\u6210\u5931\u8d25");
                 }
 
-                if (!data.image || !data.image.startsWith('data:image')) {
-                    throw new Error("\u8fd4\u56de\u7684\u56fe\u7247\u6570\u636e\u65e0\u6548");
-                }
-
+                const imageSrc = data.imageUrl || data.image;
+                if (!imageSrc || typeof imageSrc !== 'string') {
+                    throw new Error("\u8fd4\u56de\u7684\u56fe\u7247\u6570\u636e\u65e0\u6548");
+                }
+
+                const imageUrl = data.imageUrl || (imageSrc && !imageSrc.startsWith('data:image') ? imageSrc : null);
                 let thumb = null;
                 if (!Device.isMobile) {
-                    thumb = await ImageHandler.createThumbnail(data.image, 768);
+                    thumb = await ImageHandler.createThumbnail(imageSrc, 768);
                 }
 
                 const newItem = {
                     id: `temp-${Date.now()}`,
                     prompt: prompt,
-                    image: data.image,
+                    image: imageSrc,
+                    imageUrl: imageUrl,
+                    imageId: data.imageId || null,
                     thumb: thumb,
                     inputImages: [...AppState.currentImages],
                     timestamp: Date.now()
@@ -1377,7 +1399,9 @@
 
                 const savePayload = {
                     prompt: prompt,
-                    image: data.image,
+                    image: imageSrc,
+                    imageUrl: imageUrl,
+                    imageId: data.imageId || null,
                     thumb: thumb,
                     inputImages: [...AppState.currentImages]
                 };

server.js

@@ -52,19 +52,21 @@ console.log('[DEBUG] GEMINI_API_URL:', process.env.GEMINI_API_URL || process.env
 console.log(`[DEBUG] 最终 CONFIG.apiUrl:`, CONFIG.apiUrl);
 console.log('[DEBUG] Model:', CONFIG.modelName);
 
-const DATA_DIR = path.join(__dirname, 'data');
-const PUBLIC_GALLERY_FILE = path.join(DATA_DIR, 'public-gallery.json');
-const STATS_FILE = path.join(DATA_DIR, 'usage-stats.json');
+const DATA_DIR = path.join(__dirname, 'data');
+const PUBLIC_GALLERY_FILE = path.join(DATA_DIR, 'public-gallery.json');
+const STATS_FILE = path.join(DATA_DIR, 'usage-stats.json');
+const GENERATED_DIR = path.join(DATA_DIR, 'generated');
 
 // ============================================
 // Express 应用初始化
 // ============================================
 const app = express();
 
-app.use(express.json({ limit: '200mb' }));
-app.use(express.urlencoded({ extended: true, limit: '200mb' }));
-app.use(cookieParser());
-app.use(express.static(__dirname));
+app.use(express.json({ limit: '200mb' }));
+app.use(express.urlencoded({ extended: true, limit: '200mb' }));
+app.use(cookieParser());
+app.use(express.static(__dirname));
+app.use('/generated', express.static(GENERATED_DIR));
 
 // ============================================
 // 认证中间件
@@ -256,8 +258,56 @@ const generateId = () => {
     return crypto.randomBytes(16).toString('hex');
 };
 
-const generateDeleteToken = () => crypto.randomBytes(24).toString('hex');
-
+const generateDeleteToken = () => crypto.randomBytes(24).toString('hex');
+
+const mimeToExt = (mimeType) => {
+    const normalized = String(mimeType || '').toLowerCase();
+    if (normalized === 'image/jpeg' || normalized === 'image/jpg') return 'jpg';
+    if (normalized === 'image/webp') return 'webp';
+    if (normalized === 'image/gif') return 'gif';
+    return 'png';
+};
+
+const GeneratedImageStore = {
+    async ensureDir() {
+        await fs.mkdir(GENERATED_DIR, { recursive: true });
+    },
+
+    async saveDataUrl(dataUrl) {
+        if (!dataUrl || typeof dataUrl !== 'string') return null;
+        const match = dataUrl.match(/^data:(image\/[a-zA-Z0-9.+-]+);base64,(.+)$/);
+        if (!match) return null;
+
+        const mimeType = match[1];
+        const base64Data = match[2];
+        const ext = mimeToExt(mimeType);
+        const id = generateId();
+        const filename = `${id}.${ext}`;
+        const filePath = path.join(GENERATED_DIR, filename);
+
+        await this.ensureDir();
+        await fs.writeFile(filePath, Buffer.from(base64Data, 'base64'));
+
+        return {
+            id: filename,
+            url: `/generated/${filename}`,
+            mimeType
+        };
+    },
+
+    async resolveUrl(id) {
+        if (!id || typeof id !== 'string') return null;
+        const safeName = path.basename(id);
+        const filePath = path.join(GENERATED_DIR, safeName);
+        try {
+            await fs.access(filePath);
+            return `/generated/${safeName}`;
+        } catch {
+            return null;
+        }
+    }
+};
+
 const PublicGalleryStore = {
     async ensureFile() {
         await fs.mkdir(DATA_DIR, { recursive: true });
@@ -514,11 +564,11 @@ app.get('/api/check-auth', (req, res) => {
 });
 
 // Generate image (multi-image)
-app.post('/api/generate', authMiddleware, async (req, res) => {
-    const { prompt, images } = req.body;
-    const requestStart = Date.now();
-    StatsStore.activeRequests += 1;
-    let recorded = false;
+app.post('/api/generate', authMiddleware, async (req, res) => {
+    const { prompt, images, preferUrl } = req.body;
+    const requestStart = Date.now();
+    StatsStore.activeRequests += 1;
+    let recorded = false;
 
     const recordOnce = (ok, errorMessage) => {
         if (recorded) return;
@@ -566,19 +616,45 @@ app.post('/api/generate', authMiddleware, async (req, res) => {
         console.log('[DEBUG] Model:', CONFIG.modelName);
         console.log(`[${new Date().toISOString()}] API key: ${CONFIG.apiKey.substring(0, 10)}...`);
 
-        const apiResponse = await APIService.generateImage(trimmedPrompt, uploadedImages);
-        const imageData = APIService.extractImageFromResponse(apiResponse);
-
-        console.log(`[${new Date().toISOString()}] Image generated`);
-
-        recordOnce(true);
-        res.json({
-            success: true,
-            image: imageData,
-            prompt: trimmedPrompt,
-            inputImages: uploadedImages,
-            timestamp: new Date().toISOString()
-        });
+        const apiResponse = await APIService.generateImage(trimmedPrompt, uploadedImages);
+        const imageData = APIService.extractImageFromResponse(apiResponse);
+        const wantsUrl = Boolean(preferUrl);
+        let imageUrl = null;
+        let imageId = null;
+
+        if (typeof imageData === 'string' && imageData.startsWith('data:image/')) {
+            if (wantsUrl) {
+                try {
+                    const saved = await GeneratedImageStore.saveDataUrl(imageData);
+                    if (saved) {
+                        imageUrl = saved.url;
+                        imageId = saved.id;
+                    }
+                } catch (saveError) {
+                    console.error(`[${new Date().toISOString()}] Save generated image failed:`, saveError);
+                }
+            }
+        } else if (typeof imageData === 'string') {
+            imageUrl = imageData;
+        }
+
+        console.log(`[${new Date().toISOString()}] Image generated`);
+
+        recordOnce(true);
+        const responsePayload = {
+            success: true,
+            imageUrl,
+            imageId,
+            prompt: trimmedPrompt,
+            inputImages: uploadedImages,
+            timestamp: new Date().toISOString()
+        };
+
+        if (!wantsUrl || !imageUrl) {
+            responsePayload.image = imageData;
+        }
+
+        res.json(responsePayload);
 
     } catch (error) {
         recordOnce(false, error.message);
@@ -627,9 +703,9 @@ app.get('/api/public-gallery', async (req, res) => {
 });
 
 // Public gallery - publish
-app.post('/api/public-gallery', authMiddleware, async (req, res) => {
-    const { prompt, image, inputImages } = req.body;
-    let shareRecorded = false;
+app.post('/api/public-gallery', authMiddleware, async (req, res) => {
+    const { prompt, image, imageUrl, imageId, inputImages } = req.body;
+    let shareRecorded = false;
 
     const recordShareOnce = (ok, errorMessage) => {
         if (shareRecorded) return;
@@ -649,9 +725,18 @@ app.post('/api/public-gallery', authMiddleware, async (req, res) => {
         return failShare(400, '\u8bf7\u8f93\u5165\u6709\u6548\u7684\u63d0\u793a\u8bcd');
     }
 
-    if (!image || typeof image !== 'string' || !ImageParser.isValidBase64Image(image)) {
-        return failShare(400, '\u8bf7\u63d0\u4f9b\u6709\u6548\u7684\u56fe\u7247\u6570\u636e');
-    }
+    let finalImage = null;
+    if (image && typeof image === 'string' && ImageParser.isValidBase64Image(image)) {
+        finalImage = image;
+    } else if (imageUrl && typeof imageUrl === 'string') {
+        finalImage = imageUrl.trim();
+    } else if (imageId && typeof imageId === 'string') {
+        finalImage = await GeneratedImageStore.resolveUrl(imageId);
+    }
+
+    if (!finalImage) {
+        return failShare(400, '\u8bf7\u63d0\u4f9b\u6709\u6548\u7684\u56fe\u7247\u6570\u636e');
+    }
 
     const sanitizedRefs = Array.isArray(inputImages)
         ? inputImages
@@ -659,14 +744,14 @@ app.post('/api/public-gallery', authMiddleware, async (req, res) => {
             .slice(0, CONFIG.maxImages)
         : [];
 
-    const entry = {
-        id: generateId(),
-        prompt: prompt.trim(),
-        image,
-        inputImages: sanitizedRefs,
-        timestamp: new Date().toISOString(),
-        deleteToken: generateDeleteToken()
-    };
+    const entry = {
+        id: generateId(),
+        prompt: prompt.trim(),
+        image: finalImage,
+        inputImages: sanitizedRefs,
+        timestamp: new Date().toISOString(),
+        deleteToken: generateDeleteToken()
+    };
 
     try {
         await PublicGalleryStore.add(entry);