Marmelator/pdf.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve the promise-caching in the PDFDocument.fieldObjects getter

Browse Source 
After PR 18845 we're accessing this getter more, hence it seems like a good idea to ensure that the initial `formInfo` access is covered as well.
While unlikely to be a problem in practice, at least theoretically that data may not be available and the code in `fieldObjects` could thus currently be *unintentionally* invoked more than once.
This commit is contained in:
Jonas Jenwald 2024-10-08 12:15:04 +02:00
parent 81cf42df47
commit e3b5ed2e40
1 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/core/document.js
View File

@ -1871,49 +1871,52 @@ class PDFDocument {
} }
get fieldObjects() { get fieldObjects() {
if (!this.formInfo.hasFields) { const promise = this.pdfManager
return shadow(this, "fieldObjects", Promise.resolve(null)); .ensureDoc("formInfo")
} .then(async formInfo => {
if (!formInfo.hasFields) {
return null;
}
const promise = Promise.all([ const [annotationGlobals, acroForm] = await Promise.all([
this.pdfManager.ensureDoc("annotationGlobals"), this.pdfManager.ensureDoc("annotationGlobals"),
this.pdfManager.ensureCatalog("acroForm"), this.pdfManager.ensureCatalog("acroForm"),
]).then(async ([annotationGlobals, acroForm]) => { ]);
if (!annotationGlobals) { if (!annotationGlobals) {
return null; return null;
} }
const visitedRefs = new RefSet(); const visitedRefs = new RefSet();
const allFields = Object.create(null); const allFields = Object.create(null);
const fieldPromises = new Map(); const fieldPromises = new Map();
const orphanFields = new RefSetCache(); const orphanFields = new RefSetCache();
for (const fieldRef of await acroForm.getAsync("Fields")) { for (const fieldRef of await acroForm.getAsync("Fields")) {
await this.#collectFieldObjects( await this.#collectFieldObjects(
"", "",
null, null,
fieldRef, fieldRef,
fieldPromises, fieldPromises,
annotationGlobals, annotationGlobals,
visitedRefs, visitedRefs,
orphanFields orphanFields
); );
} }
const allPromises = []; const allPromises = [];
for (const [name, promises] of fieldPromises) { for (const [name, promises] of fieldPromises) {
allPromises.push( allPromises.push(
Promise.all(promises).then(fields => { Promise.all(promises).then(fields => {
fields = fields.filter(field => !!field); fields = fields.filter(field => !!field);
if (fields.length > 0) { if (fields.length > 0) {
allFields[name] = fields; allFields[name] = fields;
} }
}) })
); );
} }
await Promise.all(allPromises); await Promise.all(allPromises);
return { allFields, orphanFields }; return { allFields, orphanFields };
}); });
return shadow(this, "fieldObjects", promise); return shadow(this, "fieldObjects", promise);
} }