nodebb-plugin-pdf-secure2 1.3.6 → 1.3.8

package/lib/controllers.js

@@ -185,20 +185,21 @@ Controllers.handleChat = async function (req, res) {
 		});
 	} catch (err) {
 		console.error('[PDF-Secure] Chat error:', err.message, err.status || '', err.code || '');
+		const quota = { used: rateResult.used, max: rateResult.max };
 
 		if (err.message === 'File not found') {
-			return res.status(404).json({ error: 'PDF bulunamadı.' });
+			return res.status(404).json({ error: 'PDF bulunamadı.', quota });
 		}
 		if (err.message === 'PDF too large for AI chat') {
-			return res.status(413).json({ error: 'Bu PDF çok büyük. AI chat desteklemiyor.' });
+			return res.status(413).json({ error: 'Bu PDF çok büyük. AI chat desteklemiyor.', quota });
 		}
 		if (err.status === 429 || err.message.includes('rate limit') || err.message.includes('quota')) {
-			return res.status(429).json({ error: 'AI servisi şu an yoğun. Lütfen birkaç saniye sonra tekrar deneyin.' });
+			return res.status(429).json({ error: 'AI servisi şu an yoğun. Lütfen birkaç saniye sonra tekrar deneyin.', quota });
 		}
 		if (err.status === 401 || err.status === 403 || err.message.includes('API key')) {
-			return res.status(503).json({ error: 'AI servisi yapılandırma hatası. Yöneticiyle iletişime geçin.' });
+			return res.status(503).json({ error: 'AI servisi yapılandırma hatası. Yöneticiyle iletişime geçin.', quota });
 		}
-		return res.status(500).json({ error: 'AI yanıt veremedi. Lütfen tekrar deneyin.' });
+		return res.status(500).json({ error: 'AI yanıt veremedi. Lütfen tekrar deneyin.', quota });
 	}
 };
 

package/lib/gemini-chat.js

@@ -7,10 +7,14 @@ const GeminiChat = module.exports;
 
 let ai = null;
 
-// In-memory cache for PDF base64 data (avoids re-reading from disk)
+// In-memory cache for PDF base64 data (fallback, avoids re-reading from disk)
 const pdfDataCache = new Map(); // filename -> { base64, cachedAt }
 const PDF_DATA_TTL = 30 * 60 * 1000; // 30 minutes
 
+// Gemini File API upload cache — upload once, reference many times
+// Saves ~3M+ tokens per request by not sending inline base64 every time
+const fileUploadCache = new Map(); // filename -> { fileUri, mimeType, cachedAt }
+
 const SYSTEM_INSTRUCTION = `Sen bir PDF döküman asistanısın. Kurallar:
 - Kullanıcının yazdığı dilde cevap ver
 - Önce kısa ve net cevapla, gerekirse detay ekle
@@ -82,7 +86,7 @@ const TIER_CONFIG = {
 
 const MODEL_NAME = 'gemini-2.5-flash';
 
-// Periodic cleanup
+// Periodic cleanup of all caches
 const cleanupTimer = setInterval(() => {
 	const now = Date.now();
 	for (const [key, entry] of pdfDataCache.entries()) {
@@ -90,6 +94,11 @@ const cleanupTimer = setInterval(() => {
 			pdfDataCache.delete(key);
 		}
 	}
+	for (const [key, entry] of fileUploadCache.entries()) {
+		if (now - entry.cachedAt > PDF_DATA_TTL) {
+			fileUploadCache.delete(key);
+		}
+	}
 }, 10 * 60 * 1000);
 cleanupTimer.unref();
 
@@ -112,7 +121,104 @@ GeminiChat.isAvailable = function () {
 	return !!ai;
 };
 
-// Read PDF and cache base64 in memory
+// Upload PDF to Gemini File API (or return cached reference)
+// Returns { type: 'fileData', fileUri, mimeType } or { type: 'inlineData', mimeType, data }
+async function getOrUploadPdf(filename) {
+	// Check file upload cache first
+	const cached = fileUploadCache.get(filename);
+	if (cached && Date.now() - cached.cachedAt < PDF_DATA_TTL) {
+		return { type: 'fileData', fileUri: cached.fileUri, mimeType: cached.mimeType };
+	}
+
+	const filePath = pdfHandler.resolveFilePath(filename);
+	if (!filePath || !fs.existsSync(filePath)) {
+		throw new Error('File not found');
+	}
+
+	const stats = await fs.promises.stat(filePath);
+	if (stats.size > MAX_FILE_SIZE) {
+		throw new Error('PDF too large for AI chat');
+	}
+
+	// Upload to Gemini File API — file is stored server-side, only URI is sent per request
+	console.log('[PDF-Secure] === FILE API UPLOAD START ===');
+	console.log('[PDF-Secure] Filename:', filename);
+	console.log('[PDF-Secure] FilePath:', filePath);
+	console.log('[PDF-Secure] FileSize:', stats.size, 'bytes');
+	console.log('[PDF-Secure] ai.files exists:', !!ai.files);
+	console.log('[PDF-Secure] ai.files.upload exists:', typeof (ai.files && ai.files.upload));
+
+	const fileBuffer = await fs.promises.readFile(filePath);
+	console.log('[PDF-Secure] File read OK, buffer size:', fileBuffer.length);
+
+	// Try upload with multiple approaches
+	let uploadResult;
+	const uploadErrors = [];
+
+	// Approach 1: file path string
+	console.log('[PDF-Secure] Trying approach 1: file path string...');
+	try {
+		uploadResult = await ai.files.upload({
+			file: filePath,
+			config: { mimeType: 'application/pdf', displayName: filename },
+		});
+		console.log('[PDF-Secure] Approach 1 SUCCESS! Result:', JSON.stringify(uploadResult).slice(0, 500));
+	} catch (err1) {
+		console.error('[PDF-Secure] Approach 1 FAILED:', err1.message);
+		console.error('[PDF-Secure] Approach 1 error detail:', err1.status || '', err1.code || '', err1.stack?.split('\n').slice(0, 3).join(' | '));
+		uploadErrors.push('path: ' + err1.message);
+	}
+
+	// Approach 2: Blob (Node 18+)
+	if (!uploadResult) {
+		console.log('[PDF-Secure] Trying approach 2: Blob...');
+		console.log('[PDF-Secure] Blob available:', typeof Blob !== 'undefined');
+		try {
+			const blob = new Blob([fileBuffer], { type: 'application/pdf' });
+			uploadResult = await ai.files.upload({
+				file: blob,
+				config: { mimeType: 'application/pdf', displayName: filename },
+			});
+			console.log('[PDF-Secure] Approach 2 SUCCESS! Result:', JSON.stringify(uploadResult).slice(0, 500));
+		} catch (err2) {
+			console.error('[PDF-Secure] Approach 2 FAILED:', err2.message);
+			uploadErrors.push('blob: ' + err2.message);
+		}
+	}
+
+	// Approach 3: Buffer directly
+	if (!uploadResult) {
+		console.log('[PDF-Secure] Trying approach 3: Buffer...');
+		try {
+			uploadResult = await ai.files.upload({
+				file: fileBuffer,
+				config: { mimeType: 'application/pdf', displayName: filename },
+			});
+			console.log('[PDF-Secure] Approach 3 SUCCESS! Result:', JSON.stringify(uploadResult).slice(0, 500));
+		} catch (err3) {
+			console.error('[PDF-Secure] Approach 3 FAILED:', err3.message);
+			uploadErrors.push('buffer: ' + err3.message);
+		}
+	}
+
+	if (uploadResult && uploadResult.uri) {
+		const fileUri = uploadResult.uri;
+		const mimeType = uploadResult.mimeType || 'application/pdf';
+		console.log('[PDF-Secure] === UPLOAD FINAL: SUCCESS ===', fileUri);
+
+		fileUploadCache.set(filename, { fileUri, mimeType, cachedAt: Date.now() });
+		return { type: 'fileData', fileUri, mimeType };
+	}
+
+	// All upload methods failed
+	console.error('[PDF-Secure] === UPLOAD FINAL: ALL FAILED ===');
+	console.error('[PDF-Secure] Errors:', uploadErrors.join(' | '));
+	console.error('[PDF-Secure] Falling back to inline base64 (will use many tokens!)');
+	const base64 = fileBuffer.toString('base64');
+	return { type: 'inlineData', mimeType: 'application/pdf', data: base64 };
+}
+
+// Read PDF and cache base64 in memory (fallback for File API failure)
 async function getPdfBase64(filename) {
 	const cached = pdfDataCache.get(filename);
 	if (cached && Date.now() - cached.cachedAt < PDF_DATA_TTL) {
@@ -142,7 +248,7 @@ GeminiChat.chat = async function (filename, question, history, tier) {
 	}
 
 	const config = TIER_CONFIG[tier] || TIER_CONFIG.premium;
-	const base64Data = await getPdfBase64(filename);
+	const pdfRef = await getOrUploadPdf(filename);
 
 	// Build conversation contents from history (trimmed to last N entries)
 	const contents = [];
@@ -170,12 +276,16 @@ GeminiChat.chat = async function (filename, question, history, tier) {
 		parts: [{ text: sanitizeHistoryText(question) }],
 	});
 
-	// Always use inline PDF — single API call, no upload/cache overhead
-	const inlineContents = [
+	// Build PDF part — File API reference (lightweight) or inline base64 (fallback)
+	const pdfPart = pdfRef.type === 'fileData'
+		? { fileData: { fileUri: pdfRef.fileUri, mimeType: pdfRef.mimeType } }
+		: { inlineData: { mimeType: pdfRef.mimeType, data: pdfRef.data } };
+
+	const fullContents = [
 		{
 			role: 'user',
 			parts: [
-				{ inlineData: { mimeType: 'application/pdf', data: base64Data } },
+				pdfPart,
 				{ text: 'I am sharing a PDF document with you. Please use it to answer my questions.' },
 			],
 		},
@@ -188,7 +298,7 @@ GeminiChat.chat = async function (filename, question, history, tier) {
 
 	const response = await ai.models.generateContent({
 		model: MODEL_NAME,
-		contents: inlineContents,
+		contents: fullContents,
 		config: {
 			systemInstruction: SYSTEM_INSTRUCTION,
 			maxOutputTokens: config.maxOutputTokens,
@@ -215,7 +325,10 @@ GeminiChat.generateSuggestions = async function (filename) {
 		return cached.suggestions;
 	}
 
-	const base64Data = await getPdfBase64(filename);
+	const pdfRef = await getOrUploadPdf(filename);
+	const pdfPart = pdfRef.type === 'fileData'
+		? { fileData: { fileUri: pdfRef.fileUri, mimeType: pdfRef.mimeType } }
+		: { inlineData: { mimeType: pdfRef.mimeType, data: pdfRef.data } };
 
 	const response = await ai.models.generateContent({
 		model: MODEL_NAME,
@@ -223,7 +336,7 @@ GeminiChat.generateSuggestions = async function (filename) {
 			{
 				role: 'user',
 				parts: [
-					{ inlineData: { mimeType: 'application/pdf', data: base64Data } },
+					pdfPart,
 					{ text: 'Bu PDF dokümanı için kullanıcının sorabileceği 5 adet akıllı ve spesifik soru öner. Soruları JSON array formatında döndür, başka hiçbir şey yazma. Örnek: ["Soru 1?", "Soru 2?"]' },
 				],
 			},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-pdf-secure2",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "Secure PDF viewer plugin for NodeBB - prevents downloading, enables canvas-only rendering with Premium group support",
   "main": "library.js",
   "repository": {