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

Ensure that the viewer handles BaseViewer initialization failures

Browse Source 
*This patch can be tested e.g. with the `poppler-85140-0.pdf` document from the test-suite.*

For some sufficiently corrupt documents the `getDocument` call will succeed, but fetching even the very first page fails. Currently we only print error messages (in the console) from the `{BaseViewer, PDFThumbnailViewer}.setDocument` methods, but don't actually provide these errors to allow the viewer to handle them properly.
In practice this means that the GENERIC viewer won't display the `errorWrapper`, and in the MOZCENTRAL viewer the *browser* loading indicator is never hidden (since we never unblock the "load" event).
This commit is contained in:
Jonas Jenwald 2021-12-04 16:40:48 +01:00
parent dc455c836e
commit 9de30c4ff0
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
web/app.js
View File

@ -949,22 +949,22 @@ const PDFViewerApplication = {
pdfDocument => { pdfDocument => {
this.load(pdfDocument); this.load(pdfDocument);
}, },
exception => { reason => {
if (loadingTask !== this.pdfLoadingTask) { if (loadingTask !== this.pdfLoadingTask) {
return undefined; // Ignore errors for previously opened PDF files. return undefined; // Ignore errors for previously opened PDF files.
} }
let key = "loading_error"; let key = "loading_error";
if (exception instanceof InvalidPDFException) { if (reason instanceof InvalidPDFException) {
key = "invalid_file_error"; key = "invalid_file_error";
} else if (exception instanceof MissingPDFException) { } else if (reason instanceof MissingPDFException) {
key = "missing_file_error"; key = "missing_file_error";
} else if (exception instanceof UnexpectedResponseException) { } else if (reason instanceof UnexpectedResponseException) {
key = "unexpected_response_error"; key = "unexpected_response_error";
} }
return this.l10n.get(key).then(msg => { return this.l10n.get(key).then(msg => {
this._documentError(msg, { message: exception?.message }); this._documentError(msg, { message: reason?.message });
throw exception; throw reason;
}); });
} }
); );
@ -1368,11 +1368,18 @@ const PDFViewerApplication = {
}); });
}); });
pagesPromise.then(() => { pagesPromise.then(
this._unblockDocumentLoadEvent(); () => {
this._unblockDocumentLoadEvent();
this._initializeAutoPrint(pdfDocument, openActionPromise); this._initializeAutoPrint(pdfDocument, openActionPromise);
}); },
reason => {
this.l10n.get("loading_error").then(msg => {
this._documentError(msg, { message: reason?.message });
});
}
);
onePageRendered.then(data => { onePageRendered.then(data => {
this.externalServices.reportTelemetry({ this.externalServices.reportTelemetry({

16
web/base_viewer.js
View File

@ -530,12 +530,14 @@ class BaseViewer {
this.eventBus.dispatch("scrollmodechanged", { source: this, mode }); this.eventBus.dispatch("scrollmodechanged", { source: this, mode });
} }
this._pagesCapability.promise.then(() => { this._pagesCapability.promise.then(
this.eventBus.dispatch("pagesloaded", { () => {
source: this, this.eventBus.dispatch("pagesloaded", { source: this, pagesCount });
pagesCount, },
}); () => {
}); /* Prevent "Uncaught (in promise)"-messages in the console. */
}
);
this._onBeforeDraw = evt => { this._onBeforeDraw = evt => {
const pageView = this._pages[evt.pageNumber - 1]; const pageView = this._pages[evt.pageNumber - 1];
@ -680,6 +682,8 @@ class BaseViewer {
}) })
.catch(reason => { .catch(reason => {
console.error("Unable to initialize viewer", reason); console.error("Unable to initialize viewer", reason);
this._pagesCapability.reject(reason);
}); });
} }