Skip to content

Inline the _fetchDocument helper function in getDocument #18091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2024
Merged

Inline the _fetchDocument helper function in getDocument #18091

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbb8748
Inline the `_fetchDocument` helper function in `getDocument`
Snuffleupagus May 14, 2024
6b17154
Initialize the `networkStream` synchronously in `getDocument`
Snuffleupagus May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 13 additions & 28 deletions src/display/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ function getDocument(src) {
task._worker = worker;
}

const fetchDocParams = {
const docParams = {
docId,
apiVersion:
typeof PDFJSDev !== "undefined" && !PDFJSDev.test("TESTING")
Expand Down Expand Up @@ -398,9 +398,16 @@ function getDocument(src) {
if (task.destroyed) {
throw new Error("Loading aborted");
}
if (worker.destroyed) {
throw new Error("Worker was destroyed");
}

const workerIdPromise = _fetchDocument(worker, fetchDocParams);
const networkStreamPromise = new Promise(function (resolve) {
const workerIdPromise = worker.messageHandler.sendWithPromise(
"GetDocRequest",
docParams,
data ? [data.buffer] : null
);
const networkStreamPromise = new Promise(resolve => {
let networkStream;
if (rangeTransport) {
networkStream = new PDFDataTransportStream(rangeTransport, {
Expand Down Expand Up @@ -451,6 +458,9 @@ function getDocument(src) {
if (task.destroyed) {
throw new Error("Loading aborted");
}
if (worker.destroyed) {
throw new Error("Worker was destroyed");
}

const messageHandler = new MessageHandler(
docId,
Expand All @@ -474,31 +484,6 @@ function getDocument(src) {
return task;
}

/**
* Starts fetching of specified PDF document/data.
*
* @param {PDFWorker} worker
* @param {Object} source
* @returns {Promise<string>} A promise that is resolved when the worker ID of
* the `MessageHandler` is known.
* @private
*/
async function _fetchDocument(worker, source) {
if (worker.destroyed) {
throw new Error("Worker was destroyed");
}
const workerId = await worker.messageHandler.sendWithPromise(
"GetDocRequest",
source,
source.data ? [source.data.buffer] : null
);

if (worker.destroyed) {
throw new Error("Worker was destroyed");
}
return workerId;
}

function getUrlProp(val) {
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
return null; // The 'url' is unused with `PDFDataRangeTransport`.
Expand Down