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

Merge pull request #13937 from overleaf/jpa-fix-error-handling

Browse Source 
Fix handling of fetch errors
This commit is contained in:
Jonas Jenwald 2021-08-30 15:50:03 +02:00 committed by GitHub
commit cf0ccc4bab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/chunked_stream.js
View File

@ -290,7 +290,7 @@ class ChunkedStreamManager {
let chunks = [], let chunks = [],
loaded = 0; loaded = 0;
const promise = new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const readChunk = chunk => { const readChunk = chunk => {
try { try {
if (!chunk.done) { if (!chunk.done) {
@ -311,14 +311,12 @@ class ChunkedStreamManager {
} }
}; };
rangeReader.read().then(readChunk, reject); rangeReader.read().then(readChunk, reject);
}); }).then(data => {
promise.then(data => {
if (this.aborted) { if (this.aborted) {
return; // Ignoring any data after abort. return; // Ignoring any data after abort.
} }
this.onReceiveData({ chunk: data, begin }); this.onReceiveData({ chunk: data, begin });
}); });
// TODO check errors
} }
/** /**
@ -369,7 +367,7 @@ class ChunkedStreamManager {
groupedChunk.endChunk * this.chunkSize, groupedChunk.endChunk * this.chunkSize,
this.length this.length
); );
this.sendRequest(begin, end); this.sendRequest(begin, end).catch(capability.reject);
} }
} }

7
src/display/fetch_stream.js
View File

@ -247,12 +247,7 @@ class PDFFetchStreamRangeReader {
this._readCapability.resolve(); this._readCapability.resolve();
this._reader = response.body.getReader(); this._reader = response.body.getReader();
}) })
.catch(reason => { .catch(this._readCapability.reject);
if (reason?.name === "AbortError") {
return;
}
throw reason;
});
this.onProgress = null; this.onProgress = null;
} }