Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-06-13 05:31:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Re-use the getPassword helper function more in the src/core/worker.js file

Browse Source 
Currently the same code, for requesting the password from the main-thread, is now duplicated three times.
Let's avoid that by moving the new `getPassword` helper function, added in the previous commit, and re-use that everywhere instead.
This commit is contained in:
Jonas Jenwald 2026-06-11 10:07:39 +02:00
parent f3f5acc418
commit 587abf0ef4
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/core/worker.js
View File

@ -308,6 +308,27 @@ class WorkerMessageHandler {
return promise;
}
async function getPassword(ex) {
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) {
assert(
ex instanceof PasswordException,
"getPassword - must be a `PasswordException`."
);
}
const task = new WorkerTask(`PasswordException: response ${ex.code}`);
startWorkerTask(task);
try {
const res = await handler.sendWithPromise("PasswordRequest", ex);
return res.password;
} finally {
// Ensure that any `catch` handler runs *before* removing the task.
Promise.resolve().then(() => {
finishWorkerTask(task);
});
}
}
function setupDoc(data) {
function onSuccess(doc) {
ensureNotTerminated();
@ -320,18 +341,12 @@ class WorkerMessageHandler {
}
if (ex instanceof PasswordException) {
const task = new WorkerTask(`PasswordException: response ${ex.code}`);
startWorkerTask(task);
handler
.sendWithPromise("PasswordRequest", ex)
.then(function ({ password }) {
finishWorkerTask(task);
getPassword(ex)
.then(password => {
pdfManager.updatePassword(password);
pdfManagerReady();
})
.catch(function () {
finishWorkerTask(task);
.catch(() => {
handler.send("DocException", ex);
});
} else {
@ -448,17 +463,6 @@ class WorkerMessageHandler {
* Unique attachment identifier (required).
*/
async function (id) {
async function getPassword(ex) {
const task = new WorkerTask(`PasswordException: response ${ex.code}`);
startWorkerTask(task);
try {
const res = await handler.sendWithPromise("PasswordRequest", ex);
return res.password;
} finally {
finishWorkerTask(task);
}
}
let passwordEx;
// Loop to prompt again after an incorrect password.
@ -646,23 +650,12 @@ class WorkerMessageHandler {
warn("extractPages: XRefParseException.");
}
} else if (e instanceof PasswordException) {
const task = new WorkerTask(
`PasswordException: response ${e.code}`
);
startWorkerTask(task);
try {
const { password } = await handler.sendWithPromise(
"PasswordRequest",
e
);
const password = await getPassword(e);
manager.updatePassword(password);
} catch {
isValid = false;
warn("extractPages: invalid password.");
} finally {
finishWorkerTask(task);
}
} else {
isValid = false;