Merge pull request #10139 from Snuffleupagus/issue-10135

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

src/display/api.js

@@ -45,9 +45,9 @@ const pdfjsFilePath =
   typeof document !== 'undefined' && document.currentScript ?
     document.currentScript.src : null;
 
-var fakeWorkerFilesLoader = null;
+let fakeWorkerFilesLoader = null;
-var useRequireEnsure = false;
 if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('GENERIC')) {
+  let useRequireEnsure = false;
   // For GENERIC build we need to add support for different fake file loaders
   // for different frameworks.
   if (typeof window === 'undefined') {
@@ -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) {
+  fakeWorkerFilesLoader = useRequireEnsure ? (function() {
+    return new Promise(function(resolve, reject) {
       __non_webpack_require__.ensure([], function() {
-      var worker;
+        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');
           }
-      callback(worker.WorkerMessageHandler);
+          resolve(worker.WorkerMessageHandler);
-    }, null, 'pdfjsWorker');
+        } catch (ex) {
-  }) : dynamicLoaderSupported ? (function (callback) {
+          reject(ex);
+        }
+      }, reject, 'pdfjsWorker');
+    });
+  }) : dynamicLoaderSupported ? (function() {
+    return new Promise(function(resolve, reject) {
       requirejs(['pdfjs-dist/build/pdf.worker'], function(worker) {
-      callback(worker.WorkerMessageHandler);
+        try {
+          resolve(worker.WorkerMessageHandler);
+        } catch (ex) {
+          reject(ex);
+        }
+      }, reject);
     });
   }) : null;
 }
@@ -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') {
+        try {
           let worker = require('../core/worker.js');
           fakeWorkerFilesLoadedCapability.resolve(worker.WorkerMessageHandler);
-      } else {
+        } catch (ex) {
-        throw new Error(
+          fakeWorkerFilesLoadedCapability.reject(ex);
-          'SystemJS or CommonJS must be used to load fake worker.');
         }
       } else {
-      let loader = fakeWorkerFilesLoader || function(callback) {
+        fakeWorkerFilesLoadedCapability.reject(new Error(
-        loadScript(getWorkerSrc()).then(function() {
+          'SystemJS or CommonJS must be used to load fake worker.'));
-          callback(window.pdfjsWorker.WorkerMessageHandler);
+      }
+    } else {
+      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;
   }
@@ -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}".`));
       });
     },
 

web/app.js

@@ -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}".`);
+    });
   },
 
   /**
@@ -1464,10 +1466,14 @@ function loadFakeWorker() {
         SystemJS.import('pdfjs/core/worker').then((worker) => {
           window.pdfjsWorker = worker;
           resolve();
-        });
+        }).catch(reject);
       } else if (typeof require === 'function') {
+        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.'));