Attempt to throw MissingPDFException when applicable in `node_strea…

…m.js` (issue 9791)
mozilla · Aug 6, 2018 · f78efd8 · f78efd8
1 parent c8ee633
commit f78efd8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/src/display/node_stream.js b/src/display/node_stream.js
@@ -20,7 +20,7 @@ let https = __non_webpack_require__('https');
 let url = __non_webpack_require__('url');
 
 import {
-  AbortException, assert, createPromiseCapability
+  AbortException, assert, createPromiseCapability, MissingPDFException
 } from '../shared/util';
 import {
   extractFilenameFromHeader, validateRangeRequestCapabilities
@@ -300,6 +300,12 @@ class PDFNodeStreamFullReader extends BaseFullReader {
     super(stream);
 
     let handleResponse = (response) => {
+      if (response.statusCode === 404) {
+        const error = new MissingPDFException(`Missing PDF "${this._url}".`);
+        this._storedError = error;
+        this._headersCapability.reject(error);
+        return;
+      }
       this._headersCapability.resolve();
       this._setReadableStream(response);
 
@@ -359,17 +365,24 @@ class PDFNodeStreamRangeReader extends BaseRangeReader {
     }
     this._httpHeaders['Range'] = `bytes=${start}-${end - 1}`;
 
+    let handleResponse = (response) => {
+      if (response.statusCode === 404) {
+        const error = new MissingPDFException(`Missing PDF "${this._url}".`);
+        this._storedError = error;
+        return;
+      }
+      this._setReadableStream(response);
+    };
+
     this._request = null;
     if (this._url.protocol === 'http:') {
-      this._request = http.request(createRequestOptions(
-        this._url, this._httpHeaders), (response) => {
-          this._setReadableStream(response);
-        });
+      this._request = http.request(
+        createRequestOptions(this._url, this._httpHeaders),
+        handleResponse);
     } else {
-      this._request = https.request(createRequestOptions(
-        this._url, this._httpHeaders), (response) => {
-          this._setReadableStream(response);
-        });
+      this._request = https.request(
+        createRequestOptions(this._url, this._httpHeaders),
+        handleResponse);
     }
 
     this._request.on('error', (reason) => {
@@ -392,6 +405,9 @@ class PDFNodeStreamFsFullReader extends BaseFullReader {
 
     fs.lstat(path, (error, stat) => {
       if (error) {
+        if (error.code === 'ENOENT') {
+          error = new MissingPDFException(`Missing PDF "${path}".`);
+        }
         this._storedError = error;
         this._headersCapability.reject(error);
         return;

diff --git a/test/unit/api_spec.js b/test/unit/api_spec.js
@@ -164,11 +164,6 @@ describe('api', function() {
       });
     });
     it('creates pdf doc from non-existent URL', function(done) {
-      if (isNodeJS()) {
-        pending('Fix `src/display/node_stream.js` to actually throw ' +
-                'a `MissingPDFException` in all cases where a PDF file ' +
-                'cannot be found, such that this test-case can be enabled.');
-      }
       var loadingTask = getDocument(
         buildGetDocumentParams('non-existent.pdf'));
       loadingTask.promise.then(function(error) {