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

Merge pull request #16830 from Snuffleupagus/issue-16777-2

Browse source 
Avoid using the global `workerPort` when destruction has started, but not yet finished (issue 16777)
This commit is contained in:
Tim van der Meij 2023-08-13 12:18:28 +02:00 • committed by GitHub
commit 8cf2f6d352
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 90 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/display/api.js
View file

@ -626,7 +626,17 @@ class PDFDocumentLoadingTask {
*/
async destroy() {
this.destroyed = true;
await this._transport?.destroy();
try {
if (this._worker?.port) {
this._worker._pendingDestroy = true;
}
await this._transport?.destroy();
} catch (ex) {
if (this._worker?.port) {
delete this._worker._pendingDestroy;
}
throw ex;
}
this._transport = null;
if (this._worker) {
@ -2058,10 +2068,6 @@ class PDFWorker {
port = null,
verbosity = getVerbosityLevel(),
} = {}) {
if (port && PDFWorker.#workerPorts.has(port)) {
throw new Error("Cannot use more than one PDFWorker per port.");
}
this.name = name;
this.destroyed = false;
this.verbosity = verbosity;
@ -2072,6 +2078,9 @@ class PDFWorker {
this._messageHandler = null;
if (port) {
if (PDFWorker.#workerPorts.has(port)) {
throw new Error("Cannot use more than one PDFWorker per port.");
}
PDFWorker.#workerPorts.set(port, this);
this._initializeFromPort(port);
return;
@ -2287,11 +2296,21 @@ class PDFWorker {
* @param {PDFWorkerParameters} params - The worker initialization parameters.
*/
static fromPort(params) {
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
throw new Error("Not implemented: fromPort");
}
if (!params?.port) {
throw new Error("PDFWorker.fromPort - invalid method signature.");
}
if (this.#workerPorts.has(params.port)) {
return this.#workerPorts.get(params.port);
const cachedPort = this.#workerPorts.get(params.port);
if (cachedPort) {
if (cachedPort._pendingDestroy) {
throw new Error(
"PDFWorker.fromPort - the worker is being destroyed.\n" +
"Please remember to await `PDFDocumentLoadingTask.destroy()`-calls."
);
}
return cachedPort;
}
return new PDFWorker(params);
}