djoka/bentopdf
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

feat: add PDF password prompt and centralized pdf-lib loader with auto-repair

Browse Source
This commit is contained in:
alam00000
2026-03-26 14:42:48 +05:30
parent 9278774b8a
commit bd44108296
19 changed files with 89 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/logic/add-blank-page-page.ts
View File

@@ -85,9 +85,7 @@ async function updateUI() {
}
showLoader('Loading PDF...');
pageState.file = result.file;
pageState.pdfDoc = await loadPdfDocument(result.bytes, {
throwOnInvalidObject: false,
});
pageState.pdfDoc = await loadPdfDocument(result.bytes);
result.pdf.destroy();
hideLoader();

4
src/js/logic/add-page-labels-page.ts
View File

@@ -174,9 +174,7 @@ async function handleFiles(files: FileList) {
showLoader(translate('tools:addPageLabels.loadingPdf', 'Loading PDF...'));
try {
const arrayBuffer = await readFileAsArrayBuffer(file);
const pdfDoc = await loadPdfDocument(arrayBuffer as ArrayBuffer, {
throwOnInvalidObject: false,
});
const pdfDoc = await loadPdfDocument(arrayBuffer as ArrayBuffer);
if (pdfDoc.isEncrypted) {
showAlert(

4
src/js/logic/combine-single-page-page.ts
View File

@@ -82,9 +82,7 @@ async function updateUI() {
showLoader('Loading PDF...');
result.pdf.destroy();
pageState.file = result.file;
pageState.pdfDoc = await loadPdfDocument(result.bytes, {
throwOnInvalidObject: false,
});
pageState.pdfDoc = await loadPdfDocument(result.bytes);
hideLoader();
const pageCount = pageState.pdfDoc.getPageCount();

7
src/js/logic/crop-pdf-page.ts
View File

@@ -306,9 +306,7 @@ async function performCrop() {
async function performMetadataCrop(
cropData: Record<number, any>
): Promise<Uint8Array> {
const pdfToModify = await loadPdfDocument(cropperState.originalPdfBytes!, {
throwOnInvalidObject: false,
});
const pdfToModify = await loadPdfDocument(cropperState.originalPdfBytes!);
for (const pageNum in cropData) {
const pdfJsPage = await cropperState.pdfDoc.getPage(Number(pageNum));
@@ -350,8 +348,7 @@ async function performFlatteningCrop(
): Promise<Uint8Array> {
const newPdfDoc = await PDFLibDocument.create();
const sourcePdfDocForCopying = await loadPdfDocument(
cropperState.originalPdfBytes!,
{ throwOnInvalidObject: false }
cropperState.originalPdfBytes!
);
const totalPages = cropperState.pdfDoc.numPages;

6
src/js/logic/cropper.ts
View File

@@ -188,8 +188,7 @@ async function performFlatteningCrop(cropData: any) {
// Load the original PDF with pdf-lib to copy un-cropped pages from
const sourcePdfDocForCopying = await loadPdfDocument(
cropperState.originalPdfBytes,
{ ignoreEncryption: true, throwOnInvalidObject: false }
cropperState.originalPdfBytes
);
const totalPages = cropperState.pdfDoc.numPages;
@@ -332,8 +331,7 @@ export async function setupCropperTool() {
finalPdfBytes = await newPdfDoc.save();
} else {
const pdfToModify = await loadPdfDocument(
cropperState.originalPdfBytes,
{ ignoreEncryption: true, throwOnInvalidObject: false }
cropperState.originalPdfBytes
);
await performMetadataCrop(pdfToModify, finalCropData);
finalPdfBytes = await pdfToModify.save();

4
src/js/logic/delete-pages-page.ts
View File

@@ -94,9 +94,7 @@ async function handleFile(file: File) {
}
showLoader('Loading PDF...');
deleteState.file = result.file;
deleteState.pdfDoc = await loadPdfDocument(result.bytes, {
throwOnInvalidObject: false,
});
deleteState.pdfDoc = await loadPdfDocument(result.bytes);
deleteState.pdfJsDoc = result.pdf;
deleteState.totalPages = deleteState.pdfDoc.getPageCount();
deleteState.pagesToDelete = new Set();

4
src/js/logic/edit-metadata-page.ts
View File

@@ -229,9 +229,7 @@ async function updateUI() {
showLoader('Loading PDF...');
result.pdf.destroy();
pageState.file = result.file;
pageState.pdfDoc = await loadPdfDocument(result.bytes, {
throwOnInvalidObject: false,
});
pageState.pdfDoc = await loadPdfDocument(result.bytes);
hideLoader();
const pageCount = pageState.pdfDoc.getPageCount();

4
src/js/logic/extract-pages-page.ts
View File

@@ -100,9 +100,7 @@ async function handleFile(file: File) {
showLoader('Loading PDF...');
extractState.file = result.file;
result.pdf.destroy();
extractState.pdfDoc = await loadPdfDocument(result.bytes, {
throwOnInvalidObject: false,
});
extractState.pdfDoc = await loadPdfDocument(result.bytes);
extractState.totalPages = extractState.pdfDoc.getPageCount();
updateFileDisplay();

4
src/js/logic/n-up-pdf-page.ts
View File

@@ -75,9 +75,7 @@ async function updateUI() {
showLoader('Loading PDF...');
result.pdf.destroy();
pageState.file = result.file;
pageState.pdfDoc = await loadPdfDocument(result.bytes, {
throwOnInvalidObject: false,
});
pageState.pdfDoc = await loadPdfDocument(result.bytes);
hideLoader();
const pageCount = pageState.pdfDoc.getPageCount();

4
src/js/logic/organize-pdf-page.ts
View File

@@ -177,9 +177,7 @@ async function handleFile(file: File) {
if (!result) return;
showLoader('Loading PDF...');
organizeState.pdfDoc = await loadPdfDocument(result.bytes, {
throwOnInvalidObject: false,
});
organizeState.pdfDoc = await loadPdfDocument(result.bytes);
organizeState.pdfJsDoc = result.pdf;
organizeState.file = result.file;
organizeState.totalPages = organizeState.pdfDoc.getPageCount();

4
src/js/logic/pdf-booklet-page.ts
View File

@@ -99,9 +99,7 @@ async function updateUI() {
pageState.pdfBytes = new Uint8Array(result.bytes);
pageState.pdfjsDoc = result.pdf;
pageState.pdfDoc = await loadPdfDocument(pageState.pdfBytes, {
throwOnInvalidObject: false,
});
pageState.pdfDoc = await loadPdfDocument(pageState.pdfBytes);
hideLoader();

8
src/js/logic/pdf-multi-tool.ts
View File

@@ -436,9 +436,7 @@ async function loadPdfs(files: File[]) {
pwResult.pdf.destroy();
arrayBuffer = pwResult.bytes as ArrayBuffer;
const pdfDoc = await loadPdfDocument(arrayBuffer, {
throwOnInvalidObject: false,
});
const pdfDoc = await loadPdfDocument(arrayBuffer);
currentPdfDocs.push(pdfDoc);
const pdfIndex = currentPdfDocs.length - 1;
@@ -859,9 +857,7 @@ async function handleInsertPdf(e: Event) {
if (!pwResult) return;
pwResult.pdf.destroy();
const pdfDoc = await loadPdfDocument(pwResult.bytes, {
throwOnInvalidObject: false,
});
const pdfDoc = await loadPdfDocument(pwResult.bytes);
currentPdfDocs.push(pdfDoc);
const pdfIndex = currentPdfDocs.length - 1;

4
src/js/logic/rotate-custom-page.ts
View File

@@ -236,9 +236,7 @@ async function updateUI() {
}
showLoader('Loading PDF...');
pageState.pdfDoc = await loadPdfDocument(result.bytes, {
throwOnInvalidObject: false,
});
pageState.pdfDoc = await loadPdfDocument(result.bytes);
pageState.pdfJsDoc = result.pdf;

4
src/js/logic/rotate-pdf-page.ts
View File

@@ -208,9 +208,7 @@ async function updateUI() {
}
showLoader('Loading PDF...');
pageState.pdfDoc = await loadPdfDocument(result.bytes, {
throwOnInvalidObject: false,
});
pageState.pdfDoc = await loadPdfDocument(result.bytes);
pageState.pdfJsDoc = result.pdf;

22
src/js/logic/split-pdf-page.ts
View File

@@ -90,19 +90,17 @@ document.addEventListener('DOMContentLoaded', () => {
// Load PDF Document
try {
if (!state.pdfDoc) {
const result = await loadPdfWithPasswordPrompt(file);
if (!result) {
state.files = [];
updateUI();
return;
}
result.pdf.destroy();
state.files[0] = result.file;
state.pdfDoc = await loadPdfDocument(result.bytes);
const result = await loadPdfWithPasswordPrompt(file);
if (!result) {
state.files = [];
updateUI();
return;
}
// Update page count
metaSpan.textContent = `${formatBytes(file.size)} • ${state.pdfDoc.getPageCount()} pages`;
const pageCount = result.pdf.numPages;
result.pdf.destroy();
state.files[0] = result.file;
state.pdfDoc = await loadPdfDocument(result.bytes);
metaSpan.textContent = `${formatBytes(file.size)} • ${pageCount} pages`;
} catch (error) {
console.error('Error loading PDF:', error);
showAlert('Error', 'Failed to load PDF file.');

58
src/js/utils/load-pdf-document.ts
View File

@@ -1,14 +1,68 @@
import { PDFDocument } from 'pdf-lib';
import { initializeQpdf } from './helpers.js';
type LoadOptions = Parameters<typeof PDFDocument.load>[1];
type PDFDocumentInstance = Awaited<ReturnType<typeof PDFDocument.load>>;
async function repairPdfBytes(pdf: Uint8Array): Promise<Uint8Array | null> {
try {
const qpdf = await initializeQpdf();
qpdf.FS.writeFile('/input.pdf', pdf);
try {
qpdf.callMain(['/input.pdf', '--decrypt', '/output.pdf']);
} catch (e) {
console.warn('[loadPdfDocument] qpdf repair warning:', e);
}
let repaired: Uint8Array | null = null;
try {
repaired = qpdf.FS.readFile('/output.pdf', { encoding: 'binary' });
} catch (e) {
console.warn('[loadPdfDocument] Failed to read repaired output:', e);
}
try {
qpdf.FS.unlink('/input.pdf');
} catch (e) {
console.warn('[loadPdfDocument] Cleanup error:', e);
}
try {
qpdf.FS.unlink('/output.pdf');
} catch (e) {
console.warn('[loadPdfDocument] Cleanup error:', e);
}
return repaired;
} catch (e) {
console.warn('[loadPdfDocument] qpdf not available for repair:', e);
return null;
}
}
export async function loadPdfDocument(
pdf: Uint8Array | ArrayBuffer,
options?: LoadOptions
): Promise<PDFDocumentInstance> {
return PDFDocument.load(pdf, {
const loadOpts = {
ignoreEncryption: true,
throwOnInvalidObject: false,
...options,
});
};
const inputBytes = pdf instanceof Uint8Array ? pdf : new Uint8Array(pdf);
const repaired = await repairPdfBytes(inputBytes);
if (repaired) {
try {
return await PDFDocument.load(repaired, loadOpts);
} catch (e) {
console.warn(
'[loadPdfDocument] Failed to load repaired PDF, falling back to original:',
e
);
}
}
return PDFDocument.load(pdf, loadOpts);
}

4
src/js/workflow/nodes/decrypt-node.ts
View File

@@ -37,9 +37,7 @@ export class DecryptNode extends BaseWorkflowNode {
input.bytes,
password
);
const document = await loadPdfDocument(resultBytes, {
throwOnInvalidObject: false,
});
const document = await loadPdfDocument(resultBytes);
return {
type: 'pdf',

14
src/js/workflow/nodes/pdf-input-node.ts
View File

@@ -31,16 +31,14 @@ export class PDFInputNode extends BaseWorkflowNode {
let isEncrypted = false;
try {
await loadPdfDocument(bytes, { throwOnInvalidObject: false });
await loadPdfDocument(bytes);
} catch {
isEncrypted = true;
}
if (isEncrypted) {
try {
await loadPdfDocument(bytes, {
throwOnInvalidObject: false,
});
await loadPdfDocument(bytes);
} catch {
throw new Error(
`Failed to load "${file.name}" - file may be corrupted`
@@ -49,9 +47,7 @@ export class PDFInputNode extends BaseWorkflowNode {
throw new EncryptedPDFError(file.name);
}
const document = await loadPdfDocument(bytes, {
throwOnInvalidObject: false,
});
const document = await loadPdfDocument(bytes);
this.files.push({
type: 'pdf',
document,
@@ -64,9 +60,7 @@ export class PDFInputNode extends BaseWorkflowNode {
const arrayBuffer = await readFileAsArrayBuffer(file);
const bytes = new Uint8Array(arrayBuffer as ArrayBuffer);
const { bytes: decryptedBytes } = await decryptPdfBytes(bytes, password);
const document = await loadPdfDocument(decryptedBytes, {
throwOnInvalidObject: false,
});
const document = await loadPdfDocument(decryptedBytes);
this.files.push({
type: 'pdf',
document,

4
src/js/workflow/nodes/repair-node.ts
View File

@@ -49,9 +49,7 @@ export class RepairNode extends BaseWorkflowNode {
}
const resultBytes = new Uint8Array(repairedData);
const resultDoc = await loadPdfDocument(resultBytes, {
throwOnInvalidObject: false,
});
const resultDoc = await loadPdfDocument(resultBytes);
return {
type: 'pdf',