gemini-reverse 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemini-reverse",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Unofficial Node.js client for gemini.google.com — inspired by Gemini-API (Python). Supports streaming, chat sessions, gems, file uploads, and TypeScript.",
   "main": "index.js",
   "types": "index.d.ts",

package/types/image.js

@@ -3,6 +3,7 @@
 const axios = require('axios');
 const fs = require('fs');
 const path = require('path');
+const crypto = require('crypto');
 
 class Image {
     constructor({ url, title = '[Image]', alt = '', proxy = null } = {}) {
@@ -12,43 +13,76 @@ class Image {
         this.proxy = proxy;
     }
 
+    _getUrlForHash() {
+        return this.url;
+    }
+
     toString() {
         const short = this.url.length <= 20 ? this.url : this.url.slice(0, 8) + '...' + this.url.slice(-12);
         return `Image(title='${this.title}', alt='${this.alt}', url='${short}')`;
     }
 
-    async save({ path: savePath = 'temp', filename = null, cookies = null, verbose = false, skipInvalidFilename = false } = {}) {
-        let fname = filename || this.url.split('/').pop().split('?')[0];
-        const match = fname.match(/^(.*\.\w+)/);
-        if (match) {
-            fname = match[1];
-        } else {
-            if (verbose) console.warn(`Invalid filename: ${fname}`);
-            if (skipInvalidFilename) return null;
+    async save({ path: savePath = 'temp', filename = null, verbose = false } = {}) {
+        if (!filename || !path.extname(filename)) {
+            const timestamp = new Date().toISOString().replace(/[-:.TZ]/g, '').slice(0, 14);
+            const urlHash = crypto.createHash('sha256').update(this._getUrlForHash()).digest('hex').slice(0, 10);
+            const baseName = filename ? path.parse(filename).name : 'image';
+            filename = `${timestamp}_${urlHash}_${baseName}`;
         }
 
-        const proxyConfig = this.proxy ? (() => { try { const u = new URL(this.proxy); return { protocol: u.protocol.replace(':', ''), host: u.hostname, port: parseInt(u.port) }; } catch { return undefined; } })() : undefined;
+        fs.mkdirSync(savePath, { recursive: true });
+        return await this._performSave(savePath, filename, verbose);
+    }
+
+    async _performSave(savePath, filename, verbose) {
+        const imgUrl = this.url;
+        const proxyConfig = this._parseProxy(this.proxy);
+        const clientRef = this.client_ref || null;
+        const cookies = clientRef ? clientRef.cookies : null;
 
-        const res = await axios.get(this.url, {
+        const res = await axios.get(imgUrl, {
             responseType: 'arraybuffer',
-            headers: cookies ? { 'Cookie': Object.entries(cookies).map(([k, v]) => `${k}=${v}`).join('; ') } : {},
+            headers: {
+                'Origin': 'https://gemini.google.com',
+                'Referer': 'https://gemini.google.com/',
+                ...(cookies ? { 'Cookie': Object.entries(cookies).map(([k, v]) => `${k}=${v}`).join('; ') } : {}),
+            },
             maxRedirects: 5,
             ...(proxyConfig ? { proxy: proxyConfig } : {}),
         });
 
-        if (res.status !== 200) throw new Error(`Error downloading image: ${res.status}`);
+        if (verbose) console.debug(`HTTP Request: GET ${imgUrl} [${res.status}]`);
 
-        const contentType = res.headers['content-type'] || '';
-        if (contentType && !contentType.includes('image')) {
-            console.warn(`Content type of ${fname} is not image, but ${contentType}.`);
+        if (res.status !== 200) {
+            throw new Error(`Error downloading image: ${res.status}`);
         }
 
-        fs.mkdirSync(savePath, { recursive: true });
-        const dest = path.join(savePath, fname);
+        const contentType = (res.headers['content-type'] || '').split(';')[0].trim().toLowerCase();
+        let ext = path.extname(filename);
+        if (!ext) {
+            if (contentType.includes('jpeg') || contentType.includes('jpg')) ext = '.jpg';
+            else if (contentType.includes('png')) ext = '.png';
+            else if (contentType.includes('webp')) ext = '.webp';
+            else if (contentType.includes('gif')) ext = '.gif';
+            else ext = '.png';
+            filename = filename + ext;
+        }
+
+        const dest = path.join(savePath, filename);
         fs.writeFileSync(dest, Buffer.from(res.data));
-        if (verbose) console.log(`Image saved as ${path.resolve(dest)}`);
+        if (verbose) console.info(`Image saved as ${path.resolve(dest)}`);
         return path.resolve(dest);
     }
+
+    _parseProxy(proxyStr) {
+        if (!proxyStr) return undefined;
+        try {
+            const u = new URL(proxyStr);
+            return { protocol: u.protocol.replace(':', ''), host: u.hostname, port: parseInt(u.port) };
+        } catch {
+            return undefined;
+        }
+    }
 }
 
 class WebImage extends Image {
@@ -56,19 +90,72 @@ class WebImage extends Image {
 }
 
 class GeneratedImage extends Image {
-    constructor({ cookies, ...opts } = {}) {
-        super(opts);
-        if (!cookies || Object.keys(cookies).length === 0)
-            throw new Error('GeneratedImage requires cookies from GeminiClient.');
-        this.cookies = cookies;
+    constructor({ url, title = '[Image]', alt = '', proxy = null, client_ref = null, cid = '', rid = '', rcid = '', image_id = '' } = {}) {
+        super({ url, title, alt, proxy });
+        this.client_ref = client_ref;
+        this.cid = cid;
+        this.rid = rid;
+        this.rcid = rcid;
+        this.image_id = image_id;
     }
 
-    async save({ path: savePath = 'temp', filename = null, cookies = null, verbose = false, skipInvalidFilename = false, fullSize = true } = {}) {
-        if (fullSize) this.url += '=s2048';
-        const ts = new Date().toISOString().replace(/[-:T]/g, '').slice(0, 14);
-        const fname = filename || `${ts}_${this.url.slice(-10)}.png`;
-        return super.save({ path: savePath, filename: fname, cookies: cookies || this.cookies, verbose, skipInvalidFilename });
+    async _performSave(savePath, filename, verbose, fullSize = true) {
+        if (fullSize) {
+            if (this.client_ref && this.cid && this.rid && this.rcid && this.image_id) {
+                try {
+                    const originalUrl = await this.client_ref._getFullSizeImage(
+                        this.cid, this.rid, this.rcid, this.image_id,
+                    );
+                    if (originalUrl) {
+                        const proxyConfig = this._parseProxy(this.proxy);
+                        const cookies = this.client_ref ? this.client_ref.cookies : null;
+                        const headers = {
+                            'Origin': 'https://gemini.google.com',
+                            'Referer': 'https://gemini.google.com/',
+                            ...(cookies ? { 'Cookie': Object.entries(cookies).map(([k, v]) => `${k}=${v}`).join('; ') } : {}),
+                        };
+
+                        const r1 = await axios.get(`${originalUrl}=d-I?alr=yes`, {
+                            headers, maxRedirects: 5, ...(proxyConfig ? { proxy: proxyConfig } : {}),
+                        });
+                        const r2 = await axios.get(r1.data.trim(), {
+                            headers, maxRedirects: 5, ...(proxyConfig ? { proxy: proxyConfig } : {}),
+                        });
+                        this.url = r2.data.trim();
+                        return await super._performSave(savePath, filename, verbose);
+                    }
+                } catch (e) {
+                    if (verbose) console.debug(`Failed to fetch full size image via RPC: ${e.message}, falling back.`);
+                }
+            }
+
+            if (this.url.includes('=s1024-rj')) {
+                this.url = this.url.replace('=s1024-rj', '=s2048-rj');
+            } else if (!this.url.includes('=s2048-rj')) {
+                this.url += '=s2048-rj';
+            }
+        } else {
+            if (this.url.includes('=s2048-rj')) {
+                this.url = this.url.replace('=s2048-rj', '=s1024-rj');
+            } else if (!this.url.includes('=s1024-rj')) {
+                this.url += '=s1024-rj';
+            }
+        }
+
+        return await super._performSave(savePath, filename, verbose);
+    }
+
+    async save({ path: savePath = 'temp', filename = null, verbose = false, fullSize = true } = {}) {
+        if (!filename || !path.extname(filename)) {
+            const timestamp = new Date().toISOString().replace(/[-:.TZ]/g, '').slice(0, 14);
+            const urlHash = crypto.createHash('sha256').update(this._getUrlForHash()).digest('hex').slice(0, 10);
+            const baseName = filename ? path.parse(filename).name : 'image';
+            filename = `${timestamp}_${urlHash}_${baseName}`;
+        }
+
+        fs.mkdirSync(savePath, { recursive: true });
+        return await this._performSave(savePath, filename, verbose, fullSize);
     }
 }
 
-module.exports = { Image, WebImage, GeneratedImage };
+module.exports = { Image, WebImage, GeneratedImage };