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

Merge pull request #19936 from Snuffleupagus/workerPort-firefox

Browse Source 
Allow using the `workerPort` option in Firefox
This commit is contained in:
Jonas Jenwald 2025-05-15 21:09:08 +02:00 committed by GitHub
commit b3ccc55c1d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/display/api.js
View File

@ -688,20 +688,16 @@ class PDFDocumentLoadingTask {
async destroy() { async destroy() {
this.destroyed = true; this.destroyed = true;
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) { try {
await this._transport?.destroy(); if (this._worker?.port) {
} else { this._worker._pendingDestroy = true;
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;
} }
await this._transport?.destroy();
} catch (ex) {
if (this._worker?.port) {
delete this._worker._pendingDestroy;
}
throw ex;
} }
this._transport = null; this._transport = null;
@ -2101,7 +2097,7 @@ class PDFWorker {
static #isWorkerDisabled = false; static #isWorkerDisabled = false;
static #workerPorts; static #workerPorts = new WeakMap();
static { static {
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) { if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
@ -2159,14 +2155,11 @@ class PDFWorker {
this._webWorker = null; this._webWorker = null;
this._messageHandler = null; this._messageHandler = null;
if ( if (port) {
(typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) && if (PDFWorker.#workerPorts.has(port)) {
port
) {
if (PDFWorker.#workerPorts?.has(port)) {
throw new Error("Cannot use more than one PDFWorker per port."); throw new Error("Cannot use more than one PDFWorker per port.");
} }
(PDFWorker.#workerPorts ||= new WeakMap()).set(port, this); PDFWorker.#workerPorts.set(port, this);
this._initializeFromPort(port); this._initializeFromPort(port);
return; return;
} }
@ -2206,9 +2199,6 @@ class PDFWorker {
} }
_initializeFromPort(port) { _initializeFromPort(port) {
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
throw new Error("Not implemented: _initializeFromPort");
}
this._port = port; this._port = port;
this._messageHandler = new MessageHandler("main", "worker", port); this._messageHandler = new MessageHandler("main", "worker", port);
this._messageHandler.on("ready", function () { this._messageHandler.on("ready", function () {
@ -2363,7 +2353,7 @@ class PDFWorker {
this._webWorker?.terminate(); this._webWorker?.terminate();
this._webWorker = null; this._webWorker = null;
PDFWorker.#workerPorts?.delete(this._port); PDFWorker.#workerPorts.delete(this._port);
this._port = null; this._port = null;
this._messageHandler?.destroy(); this._messageHandler?.destroy();
@ -2375,13 +2365,10 @@ class PDFWorker {
* @returns {PDFWorker} * @returns {PDFWorker}
*/ */
static fromPort(params) { static fromPort(params) {
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
throw new Error("Not implemented: fromPort");
}
if (!params?.port) { if (!params?.port) {
throw new Error("PDFWorker.fromPort - invalid method signature."); throw new Error("PDFWorker.fromPort - invalid method signature.");
} }
const cachedPort = this.#workerPorts?.get(params.port); const cachedPort = this.#workerPorts.get(params.port);
if (cachedPort) { if (cachedPort) {
if (cachedPort._pendingDestroy) { if (cachedPort._pendingDestroy) {
throw new Error( throw new Error(