nodebb-plugin-pdf-secure 1.0.5 → 1.0.6

package/library.js

@@ -43,12 +43,8 @@ plugin.addRoutes = async ({ router, middleware, helpers }) => {
 			return helpers.formatApiResponse(400, res, new Error('Invalid file'));
 		}
 
-		// Get premium group name from settings (default: 'Premium')
-		const settings = await meta.settings.get('pdf-secure');
-		const premiumGroup = settings.premiumGroup || 'Premium';
-
-		// Check if user is in premium group
-		const isPremium = await groups.isMember(req.uid, premiumGroup);
+		// Premium check disabled for testing — everyone gets full PDF
+		const isPremium = true;
 
 		const nonce = nonceStore.generate(req.uid, safeName, isPremium);
 

package/package.json

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

package/static/lib/main.js

@@ -1,144 +1,14 @@
 'use strict';
 
-console.log('[PDF-Secure] main.js loaded');
-
-(async () => {
-	try {
-		console.log('[PDF-Secure] Requesting hooks from app...');
-		const hooks = await app.require('hooks');
-		console.log('[PDF-Secure] Hooks loaded successfully');
-
-		hooks.on('action:ajaxify.end', () => {
-			console.log('[PDF-Secure] action:ajaxify.end fired');
-			interceptPdfLinks();
-		});
-	} catch (err) {
-		console.error('[PDF-Secure] Failed to initialize:', err);
-	}
-
-	function interceptPdfLinks() {
-		const postContents = document.querySelectorAll('[component="post/content"]');
-		console.log('[PDF-Secure] Found ' + postContents.length + ' post content areas');
-
-		postContents.forEach((content, idx) => {
-			const pdfLinks = content.querySelectorAll('a[href$=".pdf"], a[href$=".PDF"]');
-			console.log('[PDF-Secure] Post #' + idx + ': found ' + pdfLinks.length + ' PDF links');
-
-			pdfLinks.forEach((link) => {
-				if (link.dataset.pdfSecure) {
-					console.log('[PDF-Secure] Skipping already processed link:', link.href);
-					return;
-				}
-				link.dataset.pdfSecure = 'true';
-
-				const href = link.getAttribute('href');
-				const parts = href.split('/');
-				const filename = parts[parts.length - 1];
-				console.log('[PDF-Secure] Processing link -> filename:', filename, 'href:', href);
-
-				// Create inline viewer container
-				const container = document.createElement('div');
-				container.className = 'pdf-secure-inline';
-				container.innerHTML =
-					'<div class="pdf-secure-inline-header">' +
-						'<i class="fa fa-file-pdf-o"></i> ' +
-						'<span class="pdf-secure-filename">' + escapeHtml(link.textContent || filename) + '</span>' +
-					'</div>' +
-					'<div class="pdf-secure-inline-body">' +
-						'<div class="pdf-secure-loading">Loading PDF...</div>' +
-						'<div class="pdf-secure-error"></div>' +
-						'<canvas class="pdf-secure-canvas"></canvas>' +
-					'</div>' +
-					'<div class="pdf-secure-inline-footer">' +
-						'<button class="pdf-secure-prev" disabled>&#8249; Prev</button>' +
-						'<span class="pdf-secure-page-info"></span>' +
-						'<button class="pdf-secure-next" disabled>Next &#8250;</button>' +
-					'</div>' +
-					'<div class="pdf-secure-premium-banner">' +
-						'This is a preview (page 1 only). Upgrade to Premium for full access.' +
-					'</div>';
-
-				link.replaceWith(container);
-				console.log('[PDF-Secure] Replaced link with inline container for:', filename);
-
-				// Auto-load PDF immediately
-				loadPdf(container, filename);
-			});
-		});
-	}
-
-	async function loadPdf(container, filename) {
-		var loadingEl = container.querySelector('.pdf-secure-loading');
-		var errorEl = container.querySelector('.pdf-secure-error');
-
-		function showError(msg) {
-			console.error('[PDF-Secure] ERROR for ' + filename + ':', msg);
-			loadingEl.style.display = 'none';
-			errorEl.style.display = 'flex';
-			errorEl.textContent = msg;
-		}
-
-		try {
-			// Step 1: Fetch nonce
-			var nonceUrl = config.relative_path + '/api/v3/plugins/pdf-secure/nonce?file=' + encodeURIComponent(filename);
-			console.log('[PDF-Secure] Step 1 - Fetching nonce from:', nonceUrl);
-
-			var nonceRes = await fetch(nonceUrl, {
-				credentials: 'same-origin',
-				headers: { 'x-csrf-token': config.csrf_token },
-			});
-
-			console.log('[PDF-Secure] Step 1 - Nonce response status:', nonceRes.status);
-
-			if (!nonceRes.ok) {
-				showError(nonceRes.status === 401 ? 'Log in to view this PDF.' : 'Failed to load PDF. Status: ' + nonceRes.status);
-				return;
-			}
-
-			var result = await nonceRes.json();
-			console.log('[PDF-Secure] Step 1 - Nonce result:', JSON.stringify(result));
-
-			var nonce = result.response.nonce;
-			var isPremium = result.response.isPremium;
-			console.log('[PDF-Secure] Step 1 - nonce:', nonce, 'isPremium:', isPremium);
-
-			// Step 2: Fetch PDF binary
-			var pdfUrl = config.relative_path + '/api/v3/plugins/pdf-secure/pdf-data?nonce=' + encodeURIComponent(nonce);
-			console.log('[PDF-Secure] Step 2 - Fetching PDF binary from:', pdfUrl);
-
-			var pdfRes = await fetch(pdfUrl, { credentials: 'same-origin' });
-			console.log('[PDF-Secure] Step 2 - PDF response status:', pdfRes.status, 'content-type:', pdfRes.headers.get('content-type'));
-
-			if (!pdfRes.ok) {
-				showError('Failed to load PDF data. Status: ' + pdfRes.status);
-				return;
-			}
-
-			var pdfArrayBuffer = await pdfRes.arrayBuffer();
-			console.log('[PDF-Secure] Step 2 - PDF binary loaded, size:', pdfArrayBuffer.byteLength, 'bytes');
-
-			// Step 3: Dynamic import viewer.js
-			var viewerUrl = config.relative_path + '/plugins/nodebb-plugin-pdf-secure/static/lib/viewer.js';
-			console.log('[PDF-Secure] Step 3 - Importing viewer from:', viewerUrl);
-
-			var viewer = await import(viewerUrl);
-			console.log('[PDF-Secure] Step 3 - Viewer module loaded, exports:', Object.keys(viewer));
-
-			// Step 4: Initialize inline viewer
-			console.log('[PDF-Secure] Step 4 - Calling initInlineViewer...');
-			await viewer.initInlineViewer(container, pdfArrayBuffer, isPremium);
-			console.log('[PDF-Secure] Step 4 - initInlineViewer completed successfully for:', filename);
-
-		} catch (err) {
-			console.error('[PDF-Secure] CATCH error for ' + filename + ':', err);
-			console.error('[PDF-Secure] Error stack:', err.stack);
-			showError('Failed to load PDF.');
-		}
-	}
-
-	function escapeHtml(str) {
-		var div = document.createElement('div');
-		div.textContent = str;
-		return div.innerHTML;
-	}
+// Bootstrapper: NodeBB bundles this into nodebb.min.js (AMD),
+// so dynamic import() won't work here. Instead, inject a real
+// ES module script that can import pdf.min.mjs natively.
+(function () {
+	console.log('[PDF-Secure] main.js bootstrapper loaded');
+	var s = document.createElement('script');
+	s.type = 'module';
+	s.src = (window.config ? config.relative_path : '') +
+		'/plugins/nodebb-plugin-pdf-secure/static/lib/viewer.js';
+	document.head.appendChild(s);
+	console.log('[PDF-Secure] viewer.js module script injected');
 })();

package/static/lib/viewer.js

@@ -1,112 +1,163 @@
-console.log('[PDF-Secure][Viewer] viewer.js module loading...');
-
 import { getDocument, GlobalWorkerOptions } from './pdf.min.mjs';
 
-var workerUrl = new URL('./pdf.worker.min.mjs', import.meta.url).href;
-GlobalWorkerOptions.workerSrc = workerUrl;
-console.log('[PDF-Secure][Viewer] Worker URL set to:', workerUrl);
-
-export async function initInlineViewer(container, pdfArrayBuffer, isPremium) {
-	console.log('[PDF-Secure][Viewer] initInlineViewer called, buffer size:', pdfArrayBuffer.byteLength, 'isPremium:', isPremium);
+GlobalWorkerOptions.workerSrc = new URL('./pdf.worker.min.mjs', import.meta.url).href;
+console.log('[PDF-Secure][Viewer] ES module loaded, worker:', GlobalWorkerOptions.workerSrc);
+
+// Listen for NodeBB SPA navigations (jQuery event)
+$(window).on('action:ajaxify.end', function () {
+	console.log('[PDF-Secure][Viewer] action:ajaxify.end fired');
+	interceptPdfLinks();
+});
+
+// Also run immediately for the current page
+console.log('[PDF-Secure][Viewer] Running initial interceptPdfLinks...');
+interceptPdfLinks();
+
+function interceptPdfLinks() {
+	var postContents = document.querySelectorAll('[component="post/content"]');
+	console.log('[PDF-Secure][Viewer] Found ' + postContents.length + ' post areas');
+
+	postContents.forEach(function (content, idx) {
+		var pdfLinks = content.querySelectorAll('a[href$=".pdf"], a[href$=".PDF"]');
+		console.log('[PDF-Secure][Viewer] Post #' + idx + ': ' + pdfLinks.length + ' PDF links');
+
+		pdfLinks.forEach(function (link) {
+			if (link.dataset.pdfSecure) return;
+			link.dataset.pdfSecure = 'true';
+
+			var href = link.getAttribute('href');
+			var parts = href.split('/');
+			var filename = parts[parts.length - 1];
+			console.log('[PDF-Secure][Viewer] Processing:', filename);
+
+			var container = document.createElement('div');
+			container.className = 'pdf-secure-inline';
+			container.innerHTML =
+				'<div class="pdf-secure-inline-header">' +
+					'<i class="fa fa-file-pdf-o"></i> ' +
+					'<span class="pdf-secure-filename">' + escapeHtml(link.textContent || filename) + '</span>' +
+				'</div>' +
+				'<div class="pdf-secure-inline-body">' +
+					'<div class="pdf-secure-loading">Loading PDF...</div>' +
+					'<div class="pdf-secure-error"></div>' +
+					'<canvas class="pdf-secure-canvas"></canvas>' +
+				'</div>' +
+				'<div class="pdf-secure-inline-footer">' +
+					'<button class="pdf-secure-prev" disabled>&#8249; Prev</button>' +
+					'<span class="pdf-secure-page-info"></span>' +
+					'<button class="pdf-secure-next" disabled>Next &#8250;</button>' +
+				'</div>';
+
+			link.replaceWith(container);
+			console.log('[PDF-Secure][Viewer] Container created for:', filename);
+
+			loadPdf(container, filename);
+		});
+	});
+}
 
-	var canvas = container.querySelector('.pdf-secure-canvas');
-	var ctx = canvas.getContext('2d');
+async function loadPdf(container, filename) {
 	var loadingEl = container.querySelector('.pdf-secure-loading');
 	var errorEl = container.querySelector('.pdf-secure-error');
+	var canvas = container.querySelector('.pdf-secure-canvas');
 	var footer = container.querySelector('.pdf-secure-inline-footer');
 	var prevBtn = container.querySelector('.pdf-secure-prev');
 	var nextBtn = container.querySelector('.pdf-secure-next');
 	var pageInfo = container.querySelector('.pdf-secure-page-info');
-	var premiumBanner = container.querySelector('.pdf-secure-premium-banner');
 	var bodyEl = container.querySelector('.pdf-secure-inline-body');
 
-	console.log('[PDF-Secure][Viewer] DOM elements found:', {
-		canvas: !!canvas,
-		ctx: !!ctx,
-		loadingEl: !!loadingEl,
-		errorEl: !!errorEl,
-		footer: !!footer,
-		prevBtn: !!prevBtn,
-		nextBtn: !!nextBtn,
-		pageInfo: !!pageInfo,
-		premiumBanner: !!premiumBanner,
-		bodyEl: !!bodyEl,
-	});
-
-	var pdfDoc = null;
-	var currentPage = 1;
-	var totalPages = 0;
-	var rendering = false;
-
-	// Security: scoped to container
-	container.addEventListener('contextmenu', function (e) { e.preventDefault(); });
-	container.addEventListener('dragstart', function (e) { e.preventDefault(); });
-	container.addEventListener('selectstart', function (e) { e.preventDefault(); });
-
 	function showError(msg) {
-		console.error('[PDF-Secure][Viewer] showError:', msg);
+		console.error('[PDF-Secure][Viewer] ERROR ' + filename + ':', msg);
 		loadingEl.style.display = 'none';
 		canvas.style.display = 'none';
 		errorEl.style.display = 'flex';
 		errorEl.textContent = msg;
 	}
 
-	async function renderPage(pageNum) {
-		if (rendering) {
-			console.log('[PDF-Secure][Viewer] renderPage skipped, already rendering');
+	try {
+		// Step 1: Fetch nonce
+		var nonceUrl = config.relative_path + '/api/v3/plugins/pdf-secure/nonce?file=' + encodeURIComponent(filename);
+		console.log('[PDF-Secure][Viewer] Step 1 - Nonce request:', nonceUrl);
+
+		var nonceRes = await fetch(nonceUrl, {
+			credentials: 'same-origin',
+			headers: { 'x-csrf-token': config.csrf_token },
+		});
+		console.log('[PDF-Secure][Viewer] Step 1 - Status:', nonceRes.status);
+
+		if (!nonceRes.ok) {
+			showError(nonceRes.status === 401 ? 'Log in to view this PDF.' : 'Failed to load PDF (' + nonceRes.status + ')');
 			return;
 		}
-		rendering = true;
-		console.log('[PDF-Secure][Viewer] renderPage(' + pageNum + ') started');
 
-		try {
-			var page = await pdfDoc.getPage(pageNum);
-			var containerWidth = bodyEl.clientWidth - 20;
-			console.log('[PDF-Secure][Viewer] Container width for scaling:', containerWidth);
+		var result = await nonceRes.json();
+		var nonce = result.response.nonce;
+		console.log('[PDF-Secure][Viewer] Step 1 - Nonce:', nonce);
 
-			var viewport = page.getViewport({ scale: 1 });
-			var scale = Math.min(containerWidth / viewport.width, 2.0);
-			var scaledViewport = page.getViewport({ scale: scale });
+		// Step 2: Fetch PDF binary
+		var pdfUrl = config.relative_path + '/api/v3/plugins/pdf-secure/pdf-data?nonce=' + encodeURIComponent(nonce);
+		console.log('[PDF-Secure][Viewer] Step 2 - PDF request:', pdfUrl);
 
-			console.log('[PDF-Secure][Viewer] Viewport: original=' + viewport.width + 'x' + viewport.height + ' scale=' + scale + ' final=' + scaledViewport.width + 'x' + scaledViewport.height);
+		var pdfRes = await fetch(pdfUrl, { credentials: 'same-origin' });
+		console.log('[PDF-Secure][Viewer] Step 2 - Status:', pdfRes.status);
 
-			canvas.width = scaledViewport.width;
-			canvas.height = scaledViewport.height;
-
-			await page.render({ canvasContext: ctx, viewport: scaledViewport }).promise;
-
-			currentPage = pageNum;
-			pageInfo.textContent = currentPage + ' / ' + totalPages;
-			prevBtn.disabled = currentPage <= 1;
-			nextBtn.disabled = currentPage >= totalPages;
-
-			console.log('[PDF-Secure][Viewer] renderPage(' + pageNum + ') completed successfully');
-		} catch (err) {
-			console.error('[PDF-Secure][Viewer] renderPage error:', err);
-			showError('Error rendering page.');
+		if (!pdfRes.ok) {
+			showError('Failed to load PDF data (' + pdfRes.status + ')');
+			return;
 		}
-		rendering = false;
-	}
 
-	// Load PDF
-	try {
-		console.log('[PDF-Secure][Viewer] Loading PDF document...');
-		var data = new Uint8Array(pdfArrayBuffer);
-		pdfDoc = await getDocument({ data: data }).promise;
-		totalPages = pdfDoc.numPages;
-		console.log('[PDF-Secure][Viewer] PDF loaded, totalPages:', totalPages);
+		var pdfArrayBuffer = await pdfRes.arrayBuffer();
+		console.log('[PDF-Secure][Viewer] Step 2 - PDF loaded:', pdfArrayBuffer.byteLength, 'bytes');
+
+		// Step 3: Render PDF
+		console.log('[PDF-Secure][Viewer] Step 3 - Rendering...');
+		var pdfDoc = await getDocument({ data: new Uint8Array(pdfArrayBuffer) }).promise;
+		var totalPages = pdfDoc.numPages;
+		console.log('[PDF-Secure][Viewer] Step 3 - Pages:', totalPages);
 
 		loadingEl.style.display = 'none';
 		canvas.style.display = 'block';
 
-		if (!isPremium) {
-			premiumBanner.style.display = 'block';
-			console.log('[PDF-Secure][Viewer] Premium banner shown (user is not premium)');
+		// Security: scoped to container
+		container.addEventListener('contextmenu', function (e) { e.preventDefault(); });
+		container.addEventListener('dragstart', function (e) { e.preventDefault(); });
+		container.addEventListener('selectstart', function (e) { e.preventDefault(); });
+
+		var ctx = canvas.getContext('2d');
+		var currentPage = 1;
+		var rendering = false;
+
+		async function renderPage(pageNum) {
+			if (rendering) return;
+			rendering = true;
+			console.log('[PDF-Secure][Viewer] renderPage(' + pageNum + ')');
+
+			try {
+				var page = await pdfDoc.getPage(pageNum);
+				var containerWidth = bodyEl.clientWidth - 20;
+				var vp = page.getViewport({ scale: 1 });
+				var scale = Math.min(containerWidth / vp.width, 2.0);
+				var scaled = page.getViewport({ scale: scale });
+
+				canvas.width = scaled.width;
+				canvas.height = scaled.height;
+
+				await page.render({ canvasContext: ctx, viewport: scaled }).promise;
+
+				currentPage = pageNum;
+				pageInfo.textContent = currentPage + ' / ' + totalPages;
+				prevBtn.disabled = currentPage <= 1;
+				nextBtn.disabled = currentPage >= totalPages;
+				console.log('[PDF-Secure][Viewer] renderPage(' + pageNum + ') done, canvas:', scaled.width + 'x' + scaled.height);
+			} catch (err) {
+				console.error('[PDF-Secure][Viewer] Render error:', err);
+				showError('Error rendering page.');
+			}
+			rendering = false;
 		}
 
 		await renderPage(1);
 
-		// Show navigation if multi-page
 		if (totalPages > 1) {
 			footer.style.display = 'flex';
 			prevBtn.addEventListener('click', function () {
@@ -115,13 +166,19 @@ export async function initInlineViewer(container, pdfArrayBuffer, isPremium) {
 			nextBtn.addEventListener('click', function () {
 				if (currentPage < totalPages) renderPage(currentPage + 1);
 			});
-			console.log('[PDF-Secure][Viewer] Navigation enabled for ' + totalPages + ' pages');
-		} else {
-			console.log('[PDF-Secure][Viewer] Single page PDF, navigation hidden');
+			console.log('[PDF-Secure][Viewer] Navigation enabled (' + totalPages + ' pages)');
 		}
+
+		console.log('[PDF-Secure][Viewer] DONE for:', filename);
 	} catch (err) {
-		console.error('[PDF-Secure][Viewer] PDF load error:', err);
-		console.error('[PDF-Secure][Viewer] Error stack:', err.stack);
+		console.error('[PDF-Secure][Viewer] CATCH:', err);
+		console.error('[PDF-Secure][Viewer] Stack:', err.stack);
 		showError('Failed to load PDF.');
 	}
 }
+
+function escapeHtml(str) {
+	var d = document.createElement('div');
+	d.textContent = str;
+	return d.innerHTML;
+}