mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-26 10:08:06 +02:00
Code Activity

Ensure that ReadableStreams are cancelled with actual Errors

Browse source 
There's a number of spots in the current code, and tests, where `cancel` methods are not called with appropriate arguments (leading to Promises not being rejected with Errors as intended).
In some cases the cancel `reason` is implicitly set to `undefined`, and in others the cancel `reason` is just a plain String. To address this inconsistency, the patch changes things such that cancelling is done with `AbortException`s everywhere instead.
This commit is contained in:
Jonas Jenwald 2019-08-01 16:31:32 +02:00
parent d909b86b28
commit a3150166ec
8 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/chunked_stream.js
View file

@ -567,14 +567,13 @@ class ChunkedStreamManager {
return Math.floor((end - 1) / this.chunkSize) + 1;
}
abort() {
abort(reason) {
this.aborted = true;
if (this.pdfNetworkStream) {
this.pdfNetworkStream.cancelAllRequests('abort');
this.pdfNetworkStream.cancelAllRequests(reason);
}
for (const requestId in this.promisesByRequest) {
this.promisesByRequest[requestId].reject(
new Error('Request was aborted'));
this.promisesByRequest[requestId].reject(reason);
}
}
}

8
src/core/pdf_manager.js
View file

@ -97,7 +97,7 @@ class BasePdfManager {
this._password = password;
}
terminate() {
terminate(reason) {
unreachable('Abstract method `terminate` called');
}
}
@ -134,7 +134,7 @@ class LocalPdfManager extends BasePdfManager {
return this._loadedStreamPromise;
}
terminate() {}
terminate(reason) {}
}
class NetworkPdfManager extends BasePdfManager {
@ -188,8 +188,8 @@ class NetworkPdfManager extends BasePdfManager {
return this.streamManager.onLoadedStream();
}
terminate() {
this.streamManager.abort();
terminate(reason) {
this.streamManager.abort(reason);
}
}

18
src/core/worker.js
View file

@ -14,10 +14,10 @@
*/
import {
arrayByteLength, arraysToBytes, createPromiseCapability, getVerbosityLevel,
info, InvalidPDFException, MissingPDFException, PasswordException,
setVerbosityLevel, UnexpectedResponseException, UnknownErrorException,
UNSUPPORTED_FEATURES, VerbosityLevel, warn
AbortException, arrayByteLength, arraysToBytes, createPromiseCapability,
getVerbosityLevel, info, InvalidPDFException, MissingPDFException,
PasswordException, setVerbosityLevel, UnexpectedResponseException,
UnknownErrorException, UNSUPPORTED_FEATURES, VerbosityLevel, warn
} from '../shared/util';
import { clearPrimitiveCaches, Ref } from './primitives';
import { LocalPdfManager, NetworkPdfManager } from './pdf_manager';
@ -274,8 +274,8 @@ var WorkerMessageHandler = {
cancelXHRs = null;
});
cancelXHRs = function () {
pdfStream.cancelAllRequests('abort');
cancelXHRs = function(reason) {
pdfStream.cancelAllRequests(reason);
};
return pdfManagerCapability.promise;
@ -349,7 +349,7 @@ var WorkerMessageHandler = {
if (terminated) {
// We were in a process of setting up the manager, but it got
// terminated in the middle.
newPdfManager.terminate();
newPdfManager.terminate(new AbortException('Worker was terminated.'));
throw new Error('Worker was terminated');
}
pdfManager = newPdfManager;
@ -579,11 +579,11 @@ var WorkerMessageHandler = {
handler.on('Terminate', function wphTerminate(data) {
terminated = true;
if (pdfManager) {
pdfManager.terminate();
pdfManager.terminate(new AbortException('Worker was terminated.'));
pdfManager = null;
}
if (cancelXHRs) {
cancelXHRs();
cancelXHRs(new AbortException('Worker was terminated.'));
}
clearPrimitiveCaches();