Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-08-02 12:27:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20662 from Snuffleupagus/getPdfManager-async-read

Browse Source 
Convert the data reading in `getPdfManager` to be asynchronous
This commit is contained in:
Tim van der Meij 2026-03-07 13:16:22 +01:00 committed by GitHub
commit d34a15e03f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 61 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/core/worker.js
View File

@ -222,13 +222,13 @@ class WorkerMessageHandler {
const pdfStream = new PDFWorkerStream({ msgHandler: handler }), const pdfStream = new PDFWorkerStream({ msgHandler: handler }),
fullReader = pdfStream.getFullReader(); fullReader = pdfStream.getFullReader();
const pdfManagerCapability = Promise.withResolvers(); const { promise, resolve, reject } = Promise.withResolvers();
let newPdfManager, let newPdfManager,
cachedChunks = [], cachedChunks = [];
loaded = 0; cancelXHRs = reason => pdfStream.cancelAllRequests(reason);
fullReader.headersReady fullReader.headersReady
.then(function () { .then(() => {
if (!fullReader.isRangeSupported) { if (!fullReader.isRangeSupported) {
return; return;
} }
@ -239,77 +239,73 @@ class WorkerMessageHandler {
newPdfManager = new NetworkPdfManager(pdfManagerArgs); newPdfManager = new NetworkPdfManager(pdfManagerArgs);
// There may be a chance that `newPdfManager` is not initialized for // There may be a chance that `newPdfManager` is not initialized for
// the first few runs of `readchunk` block of code. Be sure to send // the first few iterations of the `readData` code. Be sure to send
// all cached chunks, if any, to chunked_stream via pdf_manager. // all cached chunks, if any, to chunked_stream via pdf_manager.
for (const chunk of cachedChunks) { for (const chunk of cachedChunks) {
newPdfManager.sendProgressiveData(chunk); newPdfManager.sendProgressiveData(chunk);
} }
cachedChunks = null;
cachedChunks = []; resolve(newPdfManager);
pdfManagerCapability.resolve(newPdfManager);
cancelXHRs = null; cancelXHRs = null;
}) })
.catch(function (reason) { .catch(reason => {
pdfManagerCapability.reject(reason); reject(reason);
cancelXHRs = null; cancelXHRs = null;
}); });
new Promise(function (resolve, reject) { async function readData() {
const readChunk = function ({ value, done }) { let loaded = 0;
try {
ensureNotTerminated();
if (done) {
if (!newPdfManager) {
const pdfFile = arrayBuffersToBytes(cachedChunks);
cachedChunks = [];
if (length && pdfFile.length !== length) { while (true) {
warn("reported HTTP length is different from actual"); const { value, done } = await fullReader.read();
} ensureNotTerminated();
pdfManagerArgs.source = pdfFile;
newPdfManager = new LocalPdfManager(pdfManagerArgs); if (done) {
pdfManagerCapability.resolve(newPdfManager); break;
}
cancelXHRs = null;
return;
}
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) {
assert(
value instanceof ArrayBuffer,
"readChunk (getPdfManager) - expected an ArrayBuffer."
);
}
loaded += value.byteLength;
if (!fullReader.isStreamingSupported) {
handler.send("DocProgress", {
loaded,
total: Math.max(loaded, fullReader.contentLength || 0),
});
}
if (newPdfManager) {
newPdfManager.sendProgressiveData(value);
} else {
cachedChunks.push(value);
}
fullReader.read().then(readChunk, reject);
} catch (e) {
reject(e);
} }
}; if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) {
fullReader.read().then(readChunk, reject); assert(
}).catch(function (e) { value instanceof ArrayBuffer,
pdfManagerCapability.reject(e); "readData (getPdfManager) - expected an ArrayBuffer."
);
}
loaded += value.byteLength;
if (!fullReader.isStreamingSupported) {
handler.send("DocProgress", {
loaded,
total: Math.max(loaded, fullReader.contentLength || 0),
});
}
if (newPdfManager) {
newPdfManager.sendProgressiveData(value);
} else {
cachedChunks.push(value);
}
}
if (!newPdfManager) {
const pdfFile = arrayBuffersToBytes(cachedChunks);
cachedChunks = null;
if (length && pdfFile.length !== length) {
warn("reported HTTP length is different from actual");
}
pdfManagerArgs.source = pdfFile;
newPdfManager = new LocalPdfManager(pdfManagerArgs);
resolve(newPdfManager);
}
cancelXHRs = null;
}
readData().catch(reason => {
reject(reason);
cancelXHRs = null; cancelXHRs = null;
}); });
cancelXHRs = reason => { return promise;
pdfStream.cancelAllRequests(reason);
};
return pdfManagerCapability.promise;
} }
function setupDoc(data) { function setupDoc(data) {
@ -960,7 +956,7 @@ class WorkerMessageHandler {
return pdfManager.cleanup(/* manuallyTriggered = */ true); return pdfManager.cleanup(/* manuallyTriggered = */ true);
}); });
handler.on("Terminate", function (data) { handler.on("Terminate", async function (data) {
terminated = true; terminated = true;
const waitOn = []; const waitOn = [];
@ -981,12 +977,11 @@ class WorkerMessageHandler {
task.terminate(); task.terminate();
} }
return Promise.all(waitOn).then(function () { await Promise.all(waitOn);
// Notice that even if we destroying handler, resolved response promise // Notice that even if we destroying handler, resolved response promise
// must be sent back. // must be sent back.
handler.destroy(); handler.destroy();
handler = null; handler = null;
});
}); });
handler.on("Ready", function (data) { handler.on("Ready", function (data) {