Skip to content
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

Ensure that the PDFDocumentLoadingTask is rejected when "setting up fake worker" failed (issue 10135) #10139

Merged
merged 1 commit into from
Oct 7, 2018
Merged

Ensure that the PDFDocumentLoadingTask is rejected when "setting up fake worker" failed (issue 10135) #10139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 45 additions & 25 deletions src/display/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ const pdfjsFilePath =
typeof document !== 'undefined' && document.currentScript ?
document.currentScript.src : null;

var fakeWorkerFilesLoader = null;
var useRequireEnsure = false;
let fakeWorkerFilesLoader = null;
if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('GENERIC')) {
let useRequireEnsure = false;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latest update only moved this definition here, since it's unused in e.g. mozilla-central and this way it gets removed from the output.

// For GENERIC build we need to add support for different fake file loaders
// for different frameworks.
if (typeof window === 'undefined') {
Expand All @@ -64,21 +64,33 @@ if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('GENERIC')) {
if (typeof requirejs !== 'undefined' && requirejs.toUrl) {
workerSrc = requirejs.toUrl('pdfjs-dist/build/pdf.worker.js');
}
var dynamicLoaderSupported =
const dynamicLoaderSupported =
typeof requirejs !== 'undefined' && requirejs.load;
fakeWorkerFilesLoader = useRequireEnsure ? (function (callback) {
__non_webpack_require__.ensure([], function () {
var worker;
if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('LIB')) {
worker = __non_webpack_require__('../pdf.worker.js');
} else {
worker = __non_webpack_require__('./pdf.worker.js');
}
callback(worker.WorkerMessageHandler);
}, null, 'pdfjsWorker');
}) : dynamicLoaderSupported ? (function (callback) {
requirejs(['pdfjs-dist/build/pdf.worker'], function (worker) {
callback(worker.WorkerMessageHandler);
fakeWorkerFilesLoader = useRequireEnsure ? (function() {
return new Promise(function(resolve, reject) {
__non_webpack_require__.ensure([], function() {
try {
let worker;
if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('LIB')) {
worker = __non_webpack_require__('../pdf.worker.js');
} else {
worker = __non_webpack_require__('./pdf.worker.js');
}
resolve(worker.WorkerMessageHandler);
} catch (ex) {
reject(ex);
}
}, reject, 'pdfjsWorker');
});
}) : dynamicLoaderSupported ? (function() {
return new Promise(function(resolve, reject) {
requirejs(['pdfjs-dist/build/pdf.worker'], function(worker) {
try {
resolve(worker.WorkerMessageHandler);
} catch (ex) {
reject(ex);
}
}, reject);
});
}) : null;
}
Expand Down Expand Up @@ -1374,21 +1386,26 @@ var PDFWorker = (function PDFWorkerClosure() {
if (typeof SystemJS === 'object') {
SystemJS.import('pdfjs/core/worker').then((worker) => {
fakeWorkerFilesLoadedCapability.resolve(worker.WorkerMessageHandler);
});
}).catch(fakeWorkerFilesLoadedCapability.reject);
} else if (typeof require === 'function') {
let worker = require('../core/worker.js');
fakeWorkerFilesLoadedCapability.resolve(worker.WorkerMessageHandler);
try {
let worker = require('../core/worker.js');
fakeWorkerFilesLoadedCapability.resolve(worker.WorkerMessageHandler);
} catch (ex) {
fakeWorkerFilesLoadedCapability.reject(ex);
}
} else {
throw new Error(
'SystemJS or CommonJS must be used to load fake worker.');
fakeWorkerFilesLoadedCapability.reject(new Error(
'SystemJS or CommonJS must be used to load fake worker.'));
}
} else {
let loader = fakeWorkerFilesLoader || function(callback) {
loadScript(getWorkerSrc()).then(function() {
callback(window.pdfjsWorker.WorkerMessageHandler);
const loader = fakeWorkerFilesLoader || function() {
return loadScript(getWorkerSrc()).then(function() {
return window.pdfjsWorker.WorkerMessageHandler;
});
};
loader(fakeWorkerFilesLoadedCapability.resolve);
loader().then(fakeWorkerFilesLoadedCapability.resolve,
fakeWorkerFilesLoadedCapability.reject);
}
return fakeWorkerFilesLoadedCapability.promise;
}
Expand Down Expand Up @@ -1592,6 +1609,9 @@ var PDFWorker = (function PDFWorkerClosure() {
var messageHandler = new MessageHandler(id, id + '_worker', port);
this._messageHandler = messageHandler;
this._readyCapability.resolve();
}).catch((reason) => {
this._readyCapability.reject(
new Error(`Setting up fake worker failed: "${reason.message}".`));
});
},

Expand Down
14 changes: 10 additions & 4 deletions web/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,9 @@ let PDFViewerApplication = {
AppOptions.set('locale', hashParams['locale']);
}

return Promise.all(waitOn);
return Promise.all(waitOn).catch((reason) => {
console.error(`_parseHashParameters: "${reason.message}".`);
});
},

/**
Expand Down Expand Up @@ -1464,10 +1466,14 @@ function loadFakeWorker() {
SystemJS.import('pdfjs/core/worker').then((worker) => {
window.pdfjsWorker = worker;
resolve();
});
}).catch(reject);
} else if (typeof require === 'function') {
window.pdfjsWorker = require('../src/core/worker.js');
resolve();
try {
window.pdfjsWorker = require('../src/core/worker.js');
resolve();
} catch (ex) {
reject(ex);
}
} else {
reject(new Error(
'SystemJS or CommonJS must be used to load fake worker.'));
Expand Down