nodebb-plugin-pdf-secure 1.2.12 → 1.2.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-pdf-secure",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "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

@@ -73,11 +73,13 @@
 			const cached = pdfBufferCache.get(filename);
 			if (cached && event.source) {
 				// Send cached buffer to viewer (transferable for 0-copy)
+				// Clone once: keep original in cache, transfer the copy
+				const copy = cached.slice(0);
 				event.source.postMessage({
 					type: 'pdf-secure-cache-response',
 					filename: filename,
-					buffer: cached
-				}, event.origin, [cached.slice(0)]);  // Clone buffer since we keep original
+					buffer: copy
+				}, event.origin, [copy]);
 				console.log('[PDF-Secure] Cache: Hit -', filename);
 			} else if (event.source) {
 				// No cache, viewer will fetch normally

package/static/viewer.html

@@ -52,6 +52,8 @@
             -moz-user-select: none;
             -ms-user-select: none;
             user-select: none;
+            /* Prevent scroll chaining and browser overscroll gestures (e.g. pull-to-exit-fullscreen) */
+            overscroll-behavior: none;
         }
 
         /* Print Protection - hide everything when printing */
@@ -624,6 +626,9 @@
             overflow: auto;
             background: #525659;
             z-index: 1;
+            /* Prevent scroll chaining and overscroll gestures on touch devices */
+            overscroll-behavior: none;
+            -webkit-overflow-scrolling: touch;
         }
 
         #viewerContainer.withSidebar {
@@ -1524,6 +1529,11 @@
                 width: 56px;
                 height: 56px;
             }
+
+            /* Let our JS handle pinch-to-zoom, but allow browser pan-y for scroll */
+            #viewerContainer {
+                touch-action: manipulation;
+            }
         }
     </style>
 </head>
@@ -2243,8 +2253,10 @@
             }
 
             // Events
+            let initialScale = 1;
             eventBus.on('pagesinit', () => {
                 pdfViewer.currentScaleValue = 'page-width';
+                initialScale = pdfViewer.currentScale;
                 document.getElementById('pageCount').textContent = `/ ${pdfViewer.pagesCount}`;
             });
 
@@ -2688,17 +2700,89 @@
                 svg.addEventListener('mouseleave', () => stopDraw(pageNum), { signal });
 
                 // Touch support for tablets
+                // Uses direction detection: predominantly vertical = scroll, otherwise = draw
+                let touchDrawDecided = false;
+                let touchDrawing = false;
+                let touchStartX = 0;
+                let touchStartYDraw = 0;
+
                 svg.addEventListener('touchstart', (e) => {
-                    // Prevent default to avoid scroll while drawing/selecting
-                    if (currentTool) e.preventDefault();
-                    startDraw(e, pageNum);
+                    if (!currentTool || e.touches.length !== 1) return;
+
+                    // Eraser and select need immediate response
+                    if (currentTool === 'eraser' || currentTool === 'select') {
+                        e.preventDefault();
+                        startDraw(e, pageNum);
+                        touchDrawing = true;
+                        touchDrawDecided = true;
+                        return;
+                    }
+
+                    // For pen/highlight/shape: wait to decide scroll vs draw
+                    touchDrawDecided = false;
+                    touchDrawing = false;
+                    touchStartX = e.touches[0].clientX;
+                    touchStartYDraw = e.touches[0].clientY;
                 }, { passive: false, signal });
+
                 svg.addEventListener('touchmove', (e) => {
-                    if (currentTool) e.preventDefault();
-                    draw(e);
+                    if (!currentTool || e.touches.length !== 1) return;
+
+                    if (touchDrawing) {
+                        // Already decided: drawing
+                        e.preventDefault();
+                        draw(e);
+                        return;
+                    }
+
+                    if (touchDrawDecided) return; // decided scroll, let it through
+
+                    const dx = e.touches[0].clientX - touchStartX;
+                    const dy = e.touches[0].clientY - touchStartYDraw;
+
+                    if (Math.abs(dx) + Math.abs(dy) > 10) {
+                        touchDrawDecided = true;
+
+                        if (Math.abs(dy) > Math.abs(dx) * 2) {
+                            // Predominantly vertical → scroll (don't prevent default)
+                            return;
+                        }
+                        // Horizontal or diagonal → drawing
+                        e.preventDefault();
+                        // Start draw from ORIGINAL touch position (not current 10px-offset position)
+                        const syntheticStart = {
+                            currentTarget: svg,
+                            touches: [{ clientX: touchStartX, clientY: touchStartYDraw }],
+                            preventDefault: () => {}
+                        };
+                        startDraw(syntheticStart, pageNum);
+                        // Then immediately draw to current position for continuity
+                        draw(e);
+                        touchDrawing = true;
+                    }
                 }, { passive: false, signal });
-                svg.addEventListener('touchend', () => stopDraw(pageNum), { signal });
-                svg.addEventListener('touchcancel', () => stopDraw(pageNum), { signal });
+
+                svg.addEventListener('touchend', (e) => {
+                    if (!touchDrawDecided && currentTool && currentTool !== 'eraser' && currentTool !== 'select') {
+                        // Tap without moving > 10px → draw a dot at touch position
+                        const syntheticStart = {
+                            currentTarget: svg,
+                            touches: [{ clientX: touchStartX, clientY: touchStartYDraw }],
+                            preventDefault: () => {}
+                        };
+                        startDraw(syntheticStart, pageNum);
+                        stopDraw(pageNum);
+                    } else if (touchDrawing) {
+                        stopDraw(pageNum);
+                    }
+                    touchDrawDecided = false;
+                    touchDrawing = false;
+                }, { signal });
+                svg.addEventListener('touchcancel', () => {
+                    if (touchDrawing) stopDraw(pageNum);
+                    touchDrawDecided = false;
+                    touchDrawing = false;
+                }, { signal });
 
                 svg.classList.toggle('active', annotationMode);
             }
@@ -2894,7 +2978,7 @@
                 // Save current state to undo stack with rotation
                 if (!undoStacks.has(pageNum)) undoStacks.set(pageNum, []);
                 const stack = undoStacks.get(pageNum);
-                stack.push({ html: svg.innerHTML, rotation: pdfViewer.pagesRotation || 0 });
+                stack.push({ html: getCleanSvgInnerHTML(svg), rotation: pdfViewer.pagesRotation || 0 });
                 if (stack.length > MAX_HISTORY) stack.shift();
 
                 // Clear redo stack
@@ -4385,7 +4469,7 @@
                     else if (document.webkitExitFullscreen) document.webkitExitFullscreen();
                 } else {
                     const el = document.documentElement;
-                    if (el.requestFullscreen) el.requestFullscreen().catch(() => {});
+                    if (el.requestFullscreen) el.requestFullscreen().catch(() => { });
                     else if (el.webkitRequestFullscreen) el.webkitRequestFullscreen();
                 }
             }
@@ -4502,11 +4586,17 @@
             });
 
             // ==========================================
-            // PINCH-TO-ZOOM (Touch devices)
+            // PINCH-TO-ZOOM (Touch devices) - Smooth CSS Transform
             // ==========================================
             let pinchStartDistance = 0;
             let pinchStartScale = 1;
             let isPinching = false;
+            let pinchMidX = 0;
+            let pinchMidY = 0;
+            let pinchVisualRatio = 1;
+
+            // The viewer div that holds PDF pages
+            const viewerDiv = document.getElementById('viewer');
 
             function getTouchDistance(touches) {
                 const dx = touches[0].clientX - touches[1].clientX;
@@ -4514,11 +4604,18 @@
                 return Math.sqrt(dx * dx + dy * dy);
             }
 
+            function getTouchMidpoint(touches) {
+                return {
+                    x: (touches[0].clientX + touches[1].clientX) / 2,
+                    y: (touches[0].clientY + touches[1].clientY) / 2
+                };
+            }
+
             container.addEventListener('touchstart', (e) => {
                 if (e.touches.length === 2) {
                     // Cancel any active drawing and clean up
                     if (isDrawing && currentDrawingPage) {
-                        // Remove incomplete path
+                        const savePage = currentDrawingPage;
                         if (currentPath && currentPath.parentNode) currentPath.remove();
                         currentPath = null;
                         pathSegments = [];
@@ -4526,10 +4623,23 @@
                         isDrawing = false;
                         currentSvg = null;
                         currentDrawingPage = null;
+                        saveAnnotations(savePage);
                     }
                     isPinching = true;
                     pinchStartDistance = getTouchDistance(e.touches);
                     pinchStartScale = pdfViewer.currentScale;
+                    pinchVisualRatio = 1;
+
+                    // Get midpoint relative to container
+                    const mid = getTouchMidpoint(e.touches);
+                    const rect = container.getBoundingClientRect();
+                    pinchMidX = mid.x - rect.left + container.scrollLeft;
+                    pinchMidY = mid.y - rect.top + container.scrollTop;
+
+                    // Prepare for CSS transform - use will-change for GPU acceleration
+                    viewerDiv.style.willChange = 'transform';
+                    viewerDiv.style.transformOrigin = pinchMidX + 'px ' + pinchMidY + 'px';
+
                     e.preventDefault();
                 }
             }, { passive: false });
@@ -4538,18 +4648,177 @@
                 if (isPinching && e.touches.length === 2) {
                     const dist = getTouchDistance(e.touches);
                     const ratio = dist / pinchStartDistance;
-                    const newScale = Math.min(Math.max(pinchStartScale * ratio, 0.5), 5.0);
-                    pdfViewer.currentScale = newScale;
+                    // Clamp the target scale
+                    const targetScale = pinchStartScale * ratio;
+                    const clampedScale = Math.min(Math.max(targetScale, 0.5), 5.0);
+                    pinchVisualRatio = clampedScale / pinchStartScale;
+
+                    // Apply CSS transform for instant smooth visual feedback (no re-render)
+                    viewerDiv.style.transform = 'scale(' + pinchVisualRatio + ')';
+
                     e.preventDefault();
                 }
             }, { passive: false });
 
+            let pinchJustEnded = false;
+
             container.addEventListener('touchend', (e) => {
-                if (e.touches.length < 2) {
+                if (isPinching && e.touches.length < 2) {
                     isPinching = false;
+
+                    // Prevent double-tap false positive right after pinch ends
+                    pinchJustEnded = true;
+                    setTimeout(() => { pinchJustEnded = false; }, 400);
+
+                    // Remove CSS transform
+                    viewerDiv.style.transform = '';
+                    viewerDiv.style.willChange = '';
+                    viewerDiv.style.transformOrigin = '';
+
+                    // Apply actual scale with scroll position preservation
+                    const finalScale = Math.min(Math.max(pinchStartScale * pinchVisualRatio, 0.5), 5.0);
+                    if (Math.abs(finalScale - pdfViewer.currentScale) > 0.01) {
+                        const scrollRatio = finalScale / pdfViewer.currentScale;
+                        const midRect = container.getBoundingClientRect();
+                        const viewCenterX = midRect.width / 2;
+                        const viewCenterY = midRect.height / 2;
+                        const oldScrollLeft = container.scrollLeft;
+                        const oldScrollTop = container.scrollTop;
+
+                        pdfViewer.currentScale = finalScale;
+
+                        // Adjust scroll after PDF.js re-render to keep view centered
+                        requestAnimationFrame(() => {
+                            container.scrollLeft = (oldScrollLeft + viewCenterX) * scrollRatio - viewCenterX;
+                            container.scrollTop = (oldScrollTop + viewCenterY) * scrollRatio - viewCenterY;
+                        });
+                    }
+                    pinchVisualRatio = 1;
                 }
             });
 
+            container.addEventListener('touchcancel', (e) => {
+                if (isPinching) {
+                    isPinching = false;
+                    viewerDiv.style.transform = '';
+                    viewerDiv.style.willChange = '';
+                    viewerDiv.style.transformOrigin = '';
+                    pinchVisualRatio = 1;
+                }
+            });
+
+            // ==========================================
+            // DOUBLE-TAP TO ZOOM (Tablet)
+            // ==========================================
+            let lastTapTime = 0;
+            let lastTapX = 0;
+            let lastTapY = 0;
+
+            container.addEventListener('touchend', (e) => {
+                // Skip during pinch, multi-touch, annotation mode, or right after pinch ends
+                if (isPinching || e.touches.length !== 0 || pinchJustEnded) return;
+                if (annotationMode && currentTool) return;
+
+                const now = Date.now();
+                const touch = e.changedTouches[0];
+                const dx = touch.clientX - lastTapX;
+                const dy = touch.clientY - lastTapY;
+                const dist = Math.sqrt(dx * dx + dy * dy);
+
+                if (now - lastTapTime < 300 && dist < 30) {
+                    // Double-tap detected
+                    e.preventDefault();
+
+                    if (pdfViewer.currentScaleValue === 'page-width' ||
+                        Math.abs(pdfViewer.currentScale - initialScale) < 0.01) {
+                        // Zoom in 2x, centered on tap point
+                        const rect = container.getBoundingClientRect();
+                        const tapX = touch.clientX - rect.left;
+                        const tapY = touch.clientY - rect.top;
+
+                        pdfViewer.currentScale = initialScale * 2;
+
+                        // Scroll to keep tap point centered
+                        container.scrollLeft = (tapX + container.scrollLeft) * 2 - tapX;
+                        container.scrollTop = (tapY + container.scrollTop) * 2 - tapY;
+                    } else {
+                        // Reset to page-width
+                        pdfViewer.currentScaleValue = 'page-width';
+                    }
+
+                    lastTapTime = 0;
+                    return;
+                }
+
+                lastTapTime = now;
+                lastTapX = touch.clientX;
+                lastTapY = touch.clientY;
+            });
+
+            // ==========================================
+            // TOUCH SCROLL BOUNDARY (Prevent exit on tablet)
+            // ==========================================
+            // On touch devices, prevent scroll from escaping the container
+            // when at the top/bottom boundary. Only fullscreen button should exit.
+            (function initTouchScrollBoundary() {
+                if (!isTouch()) return;
+
+                // Ensure html element also blocks overscroll
+                document.documentElement.style.overscrollBehavior = 'none';
+
+                let touchStartY = 0;
+
+                container.addEventListener('touchstart', (e) => {
+                    if (e.touches.length === 1) {
+                        touchStartY = e.touches[0].clientY;
+                    }
+                }, { passive: true });
+
+                // Container-level boundary prevention
+                container.addEventListener('touchmove', (e) => {
+                    if (isPinching || e.touches.length !== 1) return;
+
+                    const touchY = e.touches[0].clientY;
+                    const deltaY = touchStartY - touchY; // positive = scrolling down
+
+                    const atTop = container.scrollTop <= 0;
+                    const atBottom = container.scrollTop + container.clientHeight >= container.scrollHeight - 1;
+
+                    if ((atTop && deltaY < 0) || (atBottom && deltaY > 0)) {
+                        e.preventDefault();
+                    }
+                    touchStartY = touchY;
+                }, { passive: false });
+
+                // Document-level capture handler: catch overscroll gestures
+                // that escape the container (e.g. browser pull-to-exit-fullscreen)
+                let docTouchStartY = 0;
+                document.addEventListener('touchstart', (e) => {
+                    if (e.touches.length === 1) {
+                        docTouchStartY = e.touches[0].clientY;
+                    }
+                }, { passive: true, capture: true });
+
+                document.addEventListener('touchmove', (e) => {
+                    if (e.touches.length !== 1) return;
+
+                    // Only prevent when in fullscreen
+                    const fsEl = document.fullscreenElement || document.webkitFullscreenElement;
+                    if (!fsEl) return;
+
+                    const touchY = e.touches[0].clientY;
+                    const deltaY = docTouchStartY - touchY;
+                    const atTop = container.scrollTop <= 0;
+                    const atBottom = container.scrollTop + container.clientHeight >= container.scrollHeight - 1;
+
+                    // Block pull-down at top and pull-up at bottom in fullscreen
+                    if ((atTop && deltaY < 0) || (atBottom && deltaY > 0)) {
+                        e.preventDefault();
+                    }
+                    docTouchStartY = touchY;
+                }, { passive: false, capture: true });
+            })();
+
             // ==========================================
             // CONTEXT MENU TOUCH HANDLING
             // ==========================================