overlay: centralize proxy PDF URL helper and bump v0.1.10

Author: joonsoome

.env.portainer.example

@@ -1,8 +1,8 @@
 # Portainer stack environment (example values). Copy to `.env.portainer` for Portainer UI deployment.
 
 # GHCR images to deploy (choose tags built by CI) — default to a pinned release tag
-PDF_PROXY_IMAGE=ghcr.io/joonsoome/on-prem-zotero-webui/pdf-proxy:v0.1.9
-WEB_LIBRARY_IMAGE=ghcr.io/joonsoome/on-prem-zotero-webui/web-library:v0.1.9
+PDF_PROXY_IMAGE=ghcr.io/joonsoome/on-prem-zotero-webui/pdf-proxy:v0.1.10
+WEB_LIBRARY_IMAGE=ghcr.io/joonsoome/on-prem-zotero-webui/web-library:v0.1.10
 
 # Host path for Zotero WebDAV data mounted into the proxy container
 ZOTERO_ROOT_HOST_PATH=/volume1/Reference/zotero

.env.stage.example

@@ -1,8 +1,8 @@
 # Staging/NAS environment configuration (example values). Copy to `.env.stage` on the staging host.
 
 # GHCR images to deploy (choose tags built by CI) — default to a pinned release tag
-PDF_PROXY_IMAGE=ghcr.io/joonsoome/on-prem-zotero-webui/pdf-proxy:v0.1.9
-WEB_LIBRARY_IMAGE=ghcr.io/joonsoome/on-prem-zotero-webui/web-library:v0.1.9
+PDF_PROXY_IMAGE=ghcr.io/joonsoome/on-prem-zotero-webui/pdf-proxy:v0.1.10
+WEB_LIBRARY_IMAGE=ghcr.io/joonsoome/on-prem-zotero-webui/web-library:v0.1.10
 
 # Host path for Zotero WebDAV data mounted into the proxy container
 ZOTERO_ROOT_HOST_PATH=/volume1/Reference/zotero

README.md

@@ -3,7 +3,7 @@
 **Self-hosted Zotero WebUI Opensource Library + WebDAV-based PDF viewer **Avoid storage fees, keep privacy, and still enjoy a full browser-based Zotero library.
 
 ## It is PoC
-It(v0.1.9) is still fully not properly works, please keep on watching to be ready for production.
+It(v0.1.10) is still fully not properly works, please keep on watching to be ready for production.
 
 ---
 

app/web-library-overlay/src/js/actions/attachments.js

@@ -6,6 +6,7 @@ import { PDFWorker } from '../common/pdf-worker.js';
 import { REQUEST_EXPORT_PDF, RECEIVE_EXPORT_PDF, ERROR_EXPORT_PDF  } from '../constants/actions';
 import { saveAs } from 'file-saver';
 import { READER_CONTENT_TYPES } from '../constants/reader';
+import { getProxyPdfUrl } from '../common/proxy';
 
 const tryGetFirstLink = itemKey => {
 	return async (dispatch, getState) => {
@@ -32,16 +33,16 @@ const tryGetAttachmentURL = attachmentItemKey => {
 	return async (dispatch, getState) => {
 		const state = getState();
 		const item = get(state, ['libraries', state.current.libraryKey, 'items', attachmentItemKey], null);
-		const proxyBase = state.config?.pdfProxyBaseUrl;
+		const proxyUrl = getProxyPdfUrl(state, attachmentItemKey);
 
-		// If a proxy base URL is configured, bypass Storage/enclosure links and use the proxy.
-		if (proxyBase) {
+		// If a proxy URL is available, bypass Storage/enclosure links and use the proxy.
+		if (proxyUrl) {
 			// Debug: trace when proxy URL is requested.
 			console.log('[proxy-debug] tryGetAttachmentURL using proxy', {
 				attachmentItemKey,
 				linkMode: item?.linkMode,
 				contentType: item?.contentType,
-				proxyBase,
+				proxyUrl,
 			});
 			return dispatch(getAttachmentUrl(attachmentItemKey));
 		}
@@ -119,29 +120,29 @@ const pickBestItemAction = itemKey => {
 const pickBestAttachmentItemAction = attachmentItemKey => {
 	return async (dispatch, getState) => {
 		const state = getState();
-	const current = state.current;
-	const item = get(state, ['libraries', state.current.libraryKey, 'items', attachmentItemKey], null);
-	const proxyBase = state.config?.pdfProxyBaseUrl;
-
-	const isFile = item && item.linkMode && item.linkMode.startsWith('imported') && item[Symbol.for('links')].enclosure;
-	const isLink = item && item.linkMode && item.linkMode === 'linked_url';
-
-	if (isFile) {
-		if (Object.keys(READER_CONTENT_TYPES).includes(item.contentType)) {
-			// If proxy is available, prefer proxy URL to force PDF fetch even when reader path is used.
-			if (proxyBase) {
-				console.log('[proxy-debug] pickBestAttachmentItemAction -> proxy open', {
-					attachmentItemKey,
-					linkMode: item.linkMode,
-					contentType: item.contentType,
-					proxyBase,
-				});
-				return openDelayedURL(dispatch(getAttachmentUrl(attachmentItemKey)));
-			}
+		const current = state.current;
+		const item = get(state, ['libraries', state.current.libraryKey, 'items', attachmentItemKey], null);
+		const proxyUrl = getProxyPdfUrl(state, attachmentItemKey);
 
-			const readerPath = makePath(state.config, {
-				attachmentKey: null,
-				collection: current.collectionKey,
+		const isFile = item && item.linkMode && item.linkMode.startsWith('imported') && item[Symbol.for('links')].enclosure;
+		const isLink = item && item.linkMode && item.linkMode === 'linked_url';
+
+		if (isFile) {
+			if (Object.keys(READER_CONTENT_TYPES).includes(item.contentType)) {
+				// If proxy URL is available, prefer it to force PDF fetch even when reader path is used.
+				if (proxyUrl) {
+					console.log('[proxy-debug] pickBestAttachmentItemAction -> proxy open', {
+						attachmentItemKey,
+						linkMode: item.linkMode,
+						contentType: item.contentType,
+						proxyUrl,
+					});
+					return openDelayedURL(dispatch(getAttachmentUrl(attachmentItemKey)));
+				}
+
+				const readerPath = makePath(state.config, {
+					attachmentKey: null,
+					collection: current.collectionKey,
 					items: [attachmentItemKey],
 					library: current.libraryKey,
 					noteKey: null,

app/web-library-overlay/src/js/actions/items-read.js

@@ -5,6 +5,7 @@ import { getItemKeysPath } from '../common/state';
 import { get, getAbortController, mapRelationsToItemKeys } from '../utils';
 import columnProperties from '../constants/column-properties';
 import { connectionIssues, requestTracker, requestWithBackoff } from '.';
+import { getProxyPdfUrl } from '../common/proxy';
 
 const fetchItems = (
 	type,
@@ -241,29 +242,25 @@ const getAttachmentUrl = (itemKey, forceFresh = false) => {
 		const { libraryKey } = state.current;
 
 		// On-prem overlay hook:
-		// If a pdfProxyBaseUrl is configured, bypass the Zotero API attachment URL
-		// and instead point directly at the on-prem PDF proxy.
-		const pdfProxyBaseUrl = state.config?.pdfProxyBaseUrl;
-		if(pdfProxyBaseUrl) {
-			const base = pdfProxyBaseUrl.replace(/\/$/, '');
-			const url = `${base}/${itemKey}`;
-
+		// Use centralized helper to resolve proxy URL for PDFs when configured.
+		const proxyUrl = getProxyPdfUrl(state, itemKey);
+		if(proxyUrl) {
 			console.log('[proxy-debug] getAttachmentUrl', {
 				itemKey,
-				pdfProxyBaseUrl,
 				libraryKey,
 				forceFresh,
+				proxyUrl,
 			});
 
 			dispatch({
 				type: RECEIVE_ATTACHMENT_URL,
 				libraryKey,
 				itemKey,
 				forceFresh,
-				url,
+				url: proxyUrl,
 			});
 
-			return url;
+			return proxyUrl;
 		}
 
 		const attachmentURLdata = state.libraries[state.current.libraryKey]?.attachmentsUrl[itemKey];

app/web-library-overlay/src/js/common/proxy.js

@@ -0,0 +1,16 @@
+const getProxyPdfUrl = (state, attachmentKey) => {
+	const base = state?.config?.pdfProxyBaseUrl;
+	if (!base || !attachmentKey) {
+		return null;
+	}
+	const items = state.libraries?.[state.current?.libraryKey]?.items ?? {};
+	const item = items[attachmentKey];
+	const contentType = item?.contentType;
+	if (contentType !== 'application/pdf') {
+		return null;
+	}
+	return `${base.replace(/\/$/, '')}/${attachmentKey}`;
+};
+
+export { getProxyPdfUrl };
+

app/web-library-overlay/src/js/component/item-details/attachments.jsx

@@ -23,6 +23,7 @@ import { getFileData } from '../../common/event';
 import { pluralize } from '../../common/format';
 import { Toolbar, ToolGroup } from '../ui/toolbars';
 import { makePath } from '../../common/navigation';
+import { getProxyPdfUrl } from '../../common/proxy';
 import { useItemsState } from '../../hooks';
 
 const AttachmentIcon = memo(({ isActive, item, size }) => {
@@ -77,12 +78,11 @@ const AttachmentActions = memo(props => {
 	const search = useSelector(state => state.current.search);
 	const tags = useSelector(state => state.current.tags);
 	const config = useSelector(state => state.config);
-	const pdfProxyBaseUrl = config?.pdfProxyBaseUrl;
 	const [isDropdownOpen, setDropdownOpen] = useState(false);
 	const canReparent = !isReadOnly && !isTrash && !isMyPublications;
 	const isReaderCompatible = Object.keys(READER_CONTENT_TYPES).includes(attachment.contentType);
 	const isPDF = attachment.contentType === 'application/pdf';
-	const proxyHref = pdfProxyBaseUrl ? `${pdfProxyBaseUrl.replace(/\/$/, '')}/${itemKey}` : null;
+	const proxyHref = useSelector(state => getProxyPdfUrl(state, itemKey));
 	const canDownload = (
 		(proxyHref && isPDF) ||
 		(attachment.linkMode.startsWith('imported') && attachment[Symbol.for('links')].enclosure)
@@ -294,7 +294,6 @@ const Attachment = memo(props => {
 	);
 
 	const libraryKey = useSelector(state => state.current.libraryKey);
-	const pdfProxyBaseUrl = useSelector(state => state.config?.pdfProxyBaseUrl);
 	const attachmentKey = useSelector(state => state.current.attachmentKey);
 	const isTouchOrSmall = useSelector(state => state.device.isTouchOrSmall);
 
@@ -319,7 +318,7 @@ const Attachment = memo(props => {
 	const isFile = attachment.linkMode.startsWith('imported') &&
 		attachment[Symbol.for('links')].enclosure;
 	const isLink = attachment.linkMode === 'linked_url';
-	const hasLink = isFile || isLink || Boolean(pdfProxyBaseUrl);
+	const hasLink = isFile || isLink || Boolean(useSelector(state => getProxyPdfUrl(state, attachment.key)));
 
 	const handleKeyDown = useCallback(ev => {
 		if (ev.key === 'ArrowRight') {
@@ -358,14 +357,12 @@ const Attachment = memo(props => {
 
 	dragRef(ref);
 
-	const proxyHref = pdfProxyBaseUrl ? `${pdfProxyBaseUrl.replace(/\/$/, '')}/${attachment.key}` : null;
-
 	const handleDoubleClick = useCallback(ev => {
 		ev.stopPropagation();
 		ev.preventDefault();
 		console.log('[proxy-debug] row double-click', {
 			key: attachment.key,
-			proxyHref,
+			proxyHref: getProxyPdfUrl({ ...state }, attachment.key), // log helper result
 			linkMode: attachment.linkMode,
 			contentType: attachment.contentType,
 		});