nodebb-plugin-pdf-secure2 1.3.0 → 1.3.1

package/lib/controllers.js

@@ -154,7 +154,7 @@ Controllers.handleChat = async function (req, res) {
 		const answer = await geminiChat.chat(safeName, trimmedQuestion, history || []);
 		return res.json({ answer });
 	} catch (err) {
-		console.error('[PDF-Secure] Chat error:', err.message);
+		console.error('[PDF-Secure] Chat error:', err.message, err.status || '', err.code || '');
 
 		if (err.message === 'File not found') {
 			return res.status(404).json({ error: 'PDF not found' });

package/lib/gemini-chat.js

@@ -7,15 +7,9 @@ const GeminiChat = module.exports;
 
 let ai = null;
 
-// Cache maps
-const fileCache = new Map(); // filename -> {fileUri, uploadedAt}
-const contextCache = new Map(); // filename -> {cacheName, expiresAt}
-const uploadPromises = new Map(); // filename -> Promise (deduplication)
-
-const FILE_TTL = 48 * 60 * 60 * 1000; // 48 hours (Gemini Files API limit)
-const CONTEXT_TTL = 30 * 60 * 1000; // 30 minutes
-const CLEANUP_INTERVAL = 10 * 60 * 1000; // 10 minutes
-const SMALL_PDF_THRESHOLD = 8; // pages - skip caching for small PDFs
+// In-memory cache for PDF base64 data (avoids re-reading from disk)
+const pdfDataCache = new Map(); // filename -> { base64, cachedAt }
+const PDF_DATA_TTL = 30 * 60 * 1000; // 30 minutes
 
 const SYSTEM_INSTRUCTION = `You are a helpful assistant that answers questions about the provided PDF document.
 Respond in the same language the user writes their question in.
@@ -23,20 +17,15 @@ Be concise and accurate. When referencing specific information, mention the rele
 
 const MODEL_NAME = 'gemini-2.5-flash';
 
-// Periodic cleanup of expired entries
+// Periodic cleanup
 const cleanupTimer = setInterval(() => {
 	const now = Date.now();
-	for (const [key, entry] of fileCache.entries()) {
-		if (now - entry.uploadedAt > FILE_TTL) {
-			fileCache.delete(key);
-		}
-	}
-	for (const [key, entry] of contextCache.entries()) {
-		if (now > entry.expiresAt) {
-			contextCache.delete(key);
+	for (const [key, entry] of pdfDataCache.entries()) {
+		if (now - entry.cachedAt > PDF_DATA_TTL) {
+			pdfDataCache.delete(key);
 		}
 	}
-}, CLEANUP_INTERVAL);
+}, 10 * 60 * 1000);
 cleanupTimer.unref();
 
 GeminiChat.init = function (apiKey) {
@@ -58,105 +47,31 @@ GeminiChat.isAvailable = function () {
 	return !!ai;
 };
 
-async function uploadFile(filename) {
+// Read PDF and cache base64 in memory
+async function getPdfBase64(filename) {
+	const cached = pdfDataCache.get(filename);
+	if (cached && Date.now() - cached.cachedAt < PDF_DATA_TTL) {
+		return cached.base64;
+	}
+
 	const filePath = pdfHandler.resolveFilePath(filename);
 	if (!filePath || !fs.existsSync(filePath)) {
 		throw new Error('File not found');
 	}
 
 	const fileBuffer = await fs.promises.readFile(filePath);
-	const uploadResult = await ai.files.upload({
-		file: new Blob([fileBuffer], { type: 'application/pdf' }),
-		config: { displayName: filename },
-	});
-
-	// Wait for file processing
-	let file = uploadResult;
-	while (file.state === 'PROCESSING') {
-		await new Promise(r => setTimeout(r, 2000));
-		file = await ai.files.get({ name: file.name });
-	}
+	const base64 = fileBuffer.toString('base64');
 
-	if (file.state === 'FAILED') {
-		throw new Error('File processing failed');
-	}
-
-	return file;
+	pdfDataCache.set(filename, { base64, cachedAt: Date.now() });
+	return base64;
 }
 
-async function getPageCount(filename) {
-	try {
-		return await pdfHandler.getTotalPages(filename);
-	} catch {
-		return 0;
-	}
-}
-
-GeminiChat.ensureCache = async function (filename) {
-	// Check existing context cache
-	const cached = contextCache.get(filename);
-	if (cached && Date.now() < cached.expiresAt) {
-		return { cacheName: cached.cacheName, useCache: true };
-	}
-
-	// Check if PDF is small enough to skip caching
-	const pageCount = await getPageCount(filename);
-	if (pageCount > 0 && pageCount < SMALL_PDF_THRESHOLD) {
-		// Small PDF: use inline approach
-		return { filename, useCache: false };
-	}
-
-	// Deduplicate concurrent upload requests for the same file
-	if (uploadPromises.has(filename)) {
-		return uploadPromises.get(filename);
-	}
-
-	const promise = (async () => {
-		try {
-			// Ensure file is uploaded
-			let fileEntry = fileCache.get(filename);
-			if (!fileEntry || Date.now() - fileEntry.uploadedAt > FILE_TTL) {
-				const uploaded = await uploadFile(filename);
-				fileEntry = { fileUri: uploaded.uri, uploadedAt: Date.now() };
-				fileCache.set(filename, fileEntry);
-				console.log('[PDF-Secure] File uploaded to Gemini:', filename);
-			}
-
-			// Create context cache
-			const cache = await ai.caches.create({
-				model: MODEL_NAME,
-				config: {
-					contents: [{
-						role: 'user',
-						parts: [{ fileData: { fileUri: fileEntry.fileUri, mimeType: 'application/pdf' } }],
-					}],
-					systemInstruction: SYSTEM_INSTRUCTION,
-					ttl: `${CONTEXT_TTL / 1000}s`,
-				},
-			});
-
-			const cacheEntry = {
-				cacheName: cache.name,
-				expiresAt: Date.now() + CONTEXT_TTL,
-			};
-			contextCache.set(filename, cacheEntry);
-			console.log('[PDF-Secure] Context cache created for:', filename);
-			return { cacheName: cache.name, useCache: true };
-		} finally {
-			uploadPromises.delete(filename);
-		}
-	})();
-
-	uploadPromises.set(filename, promise);
-	return promise;
-};
-
 GeminiChat.chat = async function (filename, question, history) {
 	if (!ai) {
 		throw new Error('AI chat is not configured');
 	}
 
-	const cacheInfo = await GeminiChat.ensureCache(filename);
+	const base64Data = await getPdfBase64(filename);
 
 	// Build conversation contents from history
 	const contents = [];
@@ -177,50 +92,29 @@ GeminiChat.chat = async function (filename, question, history) {
 		parts: [{ text: question }],
 	});
 
-	let response;
-
-	if (cacheInfo.useCache) {
-		// Use cached context
-		response = await ai.models.generateContent({
-			model: MODEL_NAME,
-			contents,
-			config: {
-				cachedContent: cacheInfo.cacheName,
-			},
-		});
-	} else {
-		// Inline PDF for small files
-		const filePath = pdfHandler.resolveFilePath(filename);
-		if (!filePath || !fs.existsSync(filePath)) {
-			throw new Error('File not found');
-		}
-		const fileBuffer = await fs.promises.readFile(filePath);
-		const base64Data = fileBuffer.toString('base64');
-
-		// Prepend PDF as first message
-		const inlineContents = [
-			{
-				role: 'user',
-				parts: [
-					{ inlineData: { mimeType: 'application/pdf', data: base64Data } },
-					{ text: 'I am sharing a PDF document with you. Please use it to answer my questions.' },
-				],
-			},
-			{
-				role: 'model',
-				parts: [{ text: 'I have received the PDF document. I am ready to answer your questions about it.' }],
-			},
-			...contents,
-		];
-
-		response = await ai.models.generateContent({
-			model: MODEL_NAME,
-			contents: inlineContents,
-			config: {
-				systemInstruction: SYSTEM_INSTRUCTION,
-			},
-		});
-	}
+	// Always use inline PDF — single API call, no upload/cache overhead
+	const inlineContents = [
+		{
+			role: 'user',
+			parts: [
+				{ inlineData: { mimeType: 'application/pdf', data: base64Data } },
+				{ text: 'I am sharing a PDF document with you. Please use it to answer my questions.' },
+			],
+		},
+		{
+			role: 'model',
+			parts: [{ text: 'I have received the PDF document. I am ready to answer your questions about it.' }],
+		},
+		...contents,
+	];
+
+	const response = await ai.models.generateContent({
+		model: MODEL_NAME,
+		contents: inlineContents,
+		config: {
+			systemInstruction: SYSTEM_INSTRUCTION,
+		},
+	});
 
 	const text = response?.candidates?.[0]?.content?.parts?.[0]?.text;
 	if (!text) {

package/library.js

@@ -132,7 +132,7 @@ plugin.init = async (params) => {
 			'Expires': '0',
 			'Referrer-Policy': 'no-referrer',
 			'Permissions-Policy': 'accelerometer=(), camera=(), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), payment=(), usb=()',
-			'Content-Security-Policy': "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdnjs.cloudflare.com; style-src 'self' 'unsafe-inline' https://cdnjs.cloudflare.com; img-src 'self' data: blob: https://i.ibb.co; connect-src 'self'; frame-ancestors 'self'",
+			'Content-Security-Policy': "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdnjs.cloudflare.com; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' https://cdnjs.cloudflare.com; img-src 'self' data: blob: https://cdnjs.cloudflare.com https://i.ibb.co; connect-src 'self'; frame-ancestors 'self'",
 		});
 
 		// Inject the filename, nonce, and key into the cached viewer

package/package.json

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